From f32fa315dd417384db63b11e908c7b10de10ef46 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Fri, 17 Sep 2010 14:47:20 +1000
Subject: Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if
 the query has already quit

Task-number: QTBUG-13041
Reviewed-by: Aaron Kennedy
(cherry picked from commit 0c971a9801766a6d7646d1c1c413354f74db41e4)
---
 src/declarative/util/qdeclarativexmllistmodel.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 47b502d..f0ed80b 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -209,8 +209,9 @@ Q_SIGNALS:
 
 protected:
     void run() {
+        m_mutex.lock();
+
         while (!m_quit) {
-            m_mutex.lock();
             if (!m_jobs.isEmpty())
                 m_currentJob = m_jobs.dequeue();
             m_mutex.unlock();
@@ -230,12 +231,13 @@ protected:
             m_mutex.lock();
             if (m_currentJob.queryId != -1 && m_abortQueryId != m_currentJob.queryId)
                 emit queryCompleted(r);
-            if (m_jobs.isEmpty())
+            if (m_jobs.isEmpty() && !m_quit)
                 m_condition.wait(&m_mutex);
             m_currentJob.queryId = -1;
             m_abortQueryId = -1;
-            m_mutex.unlock();
         }
+
+        m_mutex.unlock();
     }
 
 private:
-- 
cgit v0.12


From 4b818b1d2e87dd09d3c267e8c486793033b2e1b1 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Mon, 20 Sep 2010 16:23:15 +0300
Subject: Fixed memory leak in Symbian when Options menu was launched.

Task-number: QTBUG-13437
Reviewed-by: Janne Koskinen
(cherry picked from commit 0cbb1a488c4199ad06b8ab63a9d6bf09fc8a6911)
---
 src/gui/widgets/qmenu_symbian.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index ab2bdea..83ba15a 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -168,11 +168,11 @@ static void qt_symbian_insert_action(QSymbianMenuAction* action, QList<SymbianMe
 
             if (action->action->menu()->actions().size() > 0) {
                 for (int c2= 0; c2 < action->action->menu()->actions().size(); ++c2) {
-                    QSymbianMenuAction *symbianAction2 = new QSymbianMenuAction;
+                    QScopedPointer<QSymbianMenuAction> symbianAction2(new QSymbianMenuAction);
                     symbianAction2->action = action->action->menu()->actions().at(c2);
                     QMenu * menu = symbianAction2->action->menu();
                     symbianAction2->command = qt_symbian_menu_static_cmd_id++;
-                    qt_symbian_insert_action(symbianAction2, &(menuItem->children));
+                    qt_symbian_insert_action(symbianAction2.data(), &(menuItem->children));
                 }
             }
 
@@ -432,11 +432,11 @@ void QMenuBarPrivate::QSymbianMenuBarPrivate::removeAction(QSymbianMenuAction *a
 void QMenuBarPrivate::QSymbianMenuBarPrivate::insertNativeMenuItems(const QList<QAction*> &actions)
 {
     for (int i = 0; i <actions.size(); ++i) {
-        QSymbianMenuAction *symbianActionTopLevel = new QSymbianMenuAction;
+        QScopedPointer<QSymbianMenuAction> symbianActionTopLevel(new QSymbianMenuAction);
         symbianActionTopLevel->action = actions.at(i);
         symbianActionTopLevel->parent = 0;
         symbianActionTopLevel->command = qt_symbian_menu_static_cmd_id++;
-        qt_symbian_insert_action(symbianActionTopLevel, &symbianMenus);
+        qt_symbian_insert_action(symbianActionTopLevel.data(), &symbianMenus);
     }
 }
 
-- 
cgit v0.12


From 2544544fd63f49c16aa5835bd47b2c39518ebbd9 Mon Sep 17 00:00:00 2001
From: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
Date: Mon, 20 Sep 2010 12:39:27 +0200
Subject: Fixed infinite loop when loading jpeg without EOI from memory.

Task-number: QTBUG-13653
Reviewed-by: aavit
(cherry picked from commit 5220c371176951e12d525ac7908861d111c367d0)
---
 src/gui/image/qjpeghandler.cpp                       |  19 ++++++++-----------
 tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg | Bin 0 -> 8250 bytes
 tests/auto/qimagereader/qimagereader.qrc             |   1 +
 tests/auto/qimagereader/tst_qimagereader.cpp         |   5 +++++
 4 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg

diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index eda5efb..e685694 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -134,15 +134,18 @@ static void qt_init_source(j_decompress_ptr)
 static boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
 {
     my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src;
+    qint64 num_read = 0;
     if (src->memDevice) {
         src->next_input_byte = (const JOCTET *)(src->memDevice->data().constData() + src->memDevice->pos());
-        src->bytes_in_buffer = (size_t)(src->memDevice->data().size() - src->memDevice->pos());
-        return true;
+        num_read = src->memDevice->data().size() - src->memDevice->pos();
+        src->device->seek(src->memDevice->data().size());
+    } else {
+        src->next_input_byte = src->buffer;
+        num_read = src->device->read((char*)src->buffer, max_buf);
     }
-    src->next_input_byte = src->buffer;
-    int num_read = src->device->read((char*)src->buffer, max_buf);
     if (num_read <= 0) {
         // Insert a fake EOI marker - as per jpeglib recommendation
+        src->next_input_byte = src->buffer;
         src->buffer[0] = (JOCTET) 0xFF;
         src->buffer[1] = (JOCTET) JPEG_EOI;
         src->bytes_in_buffer = 2;
@@ -183,13 +186,7 @@ static void qt_term_source(j_decompress_ptr cinfo)
 {
     my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src;
     if (!src->device->isSequential())
-    {
-        // read() isn't used for memDevice, so seek past everything that was used
-        if (src->memDevice)
-            src->device->seek(src->device->pos() + (src->memDevice->data().size() - src->memDevice->pos() - src->bytes_in_buffer));
-        else
-            src->device->seek(src->device->pos() - src->bytes_in_buffer);
-    }
+        src->device->seek(src->device->pos() - src->bytes_in_buffer);
 }
 
 #if defined(Q_C_CALLBACKS)
diff --git a/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg b/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg
new file mode 100644
index 0000000..605e8a8
Binary files /dev/null and b/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg differ
diff --git a/tests/auto/qimagereader/qimagereader.qrc b/tests/auto/qimagereader/qimagereader.qrc
index 1acc82f..5536b38 100644
--- a/tests/auto/qimagereader/qimagereader.qrc
+++ b/tests/auto/qimagereader/qimagereader.qrc
@@ -63,5 +63,6 @@
         <file>images/rect.svgz</file>
         <file>images/corrupt.svg</file>
         <file>images/corrupt.svgz</file>
+        <file>images/qtbug13653-no_eoi.jpg</file>
     </qresource>
 </RCC>
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index 5b30b04..3bee5d9 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -239,6 +239,7 @@ void tst_QImageReader::readImage_data()
 
 #if defined QTEST_HAVE_JPEG
     QTest::newRow("JPEG: beavis") << QString("beavis.jpg") << true << QByteArray("jpeg");
+    QTest::newRow("JPEG: qtbug13653") << QString("qtbug13653-no_eoi.jpg") << true << QByteArray("jpeg");
 #endif
 #if defined QTEST_HAVE_GIF
     QTest::newRow("GIF: earth") << QString("earth.gif") << true << QByteArray("gif");
@@ -1039,6 +1040,7 @@ void tst_QImageReader::readFromDevice_data()
     QTest::newRow("jpeg-1") << QString("beavis.jpg") << QByteArray("jpeg");
     QTest::newRow("jpeg-2") << QString("YCbCr_cmyk.jpg") << QByteArray("jpeg");
     QTest::newRow("jpeg-3") << QString("YCbCr_rgb.jpg") << QByteArray("jpeg");
+    QTest::newRow("jpeg-4") << QString("qtbug13653-no_eoi.jpg") << QByteArray("jpeg");
 #endif // QTEST_HAVE_JPEG
 #ifdef QTEST_HAVE_GIF
     QTest::newRow("gif-1") << QString("earth.gif") << QByteArray("gif");
@@ -1314,6 +1316,9 @@ void tst_QImageReader::readFromResources_data()
     QTest::newRow("YCbCr_rgb.jpg") << QString("YCbCr_rgb.jpg")
                                           << QByteArray("jpg") << QSize(75, 50)
                                           << QString("");
+    QTest::newRow("qtbug13653-no_eoi.jpg") << QString("qtbug13653-no_eoi.jpg")
+                                        << QByteArray("jpg") << QSize(240, 180)
+                                        << QString("");
 #endif
 #ifdef QTEST_HAVE_MNG
     QTest::newRow("corrupt.mng") << QString("corrupt.mng")
-- 
cgit v0.12


From c13d3906af8936ab7c1f4cca16edf41822b23ac9 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 17 Sep 2010 10:31:04 +1000
Subject: Fix worker agent to emit ListModel itemsChanged() correctly when
 set() and setProperty() are called

Task-number: QTBUG-13666
(cherry picked from commit ff075380d7ec1472fcdff06b3f39ffdc02b7f112)
---
 src/declarative/util/qdeclarativelistmodelworkeragent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
index d9df169..4392bed 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
@@ -232,7 +232,7 @@ bool QDeclarativeListModelWorkerAgent::event(QEvent *e)
                     emit m_orig->itemsMoved(change.index, change.to, change.count);
                     break;
                 case Change::Changed:
-                    emit m_orig->itemsChanged(change.index, change.to, orig->m_roles.keys());
+                    emit m_orig->itemsChanged(change.index, change.count, orig->m_roles.keys());
                     break;
                 }
             }
-- 
cgit v0.12


From 6c1f0aeeeb589280adaec940844fc2af17cf1bd1 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 17 Sep 2010 14:53:40 +1000
Subject: PathView didn't accept mouse events, preventing it from working in a
 Flickable. Since it didn't accept the press it didn't get a grab, so its
 events were always filtered away by Flickable. Use the same implementation as
 Flickable, i.e. create private handler functions for mouse events and accept
 normal events in the mouse*Event() methods.

Task-number: QTBUG-13687
Reviewed-by: Michael Brasser
(cherry picked from commit a4cadd1b1fd30a1989d56f6c06deb8fed4f79882)
---
 .../graphicsitems/qdeclarativepathview.cpp         | 183 ++++++++++++---------
 .../graphicsitems/qdeclarativepathview_p_p.h       |   4 +
 2 files changed, 112 insertions(+), 75 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index dad547f..119ac3e 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -1033,103 +1033,138 @@ QPointF QDeclarativePathViewPrivate::pointNear(const QPointF &point, qreal *near
     return nearPoint;
 }
 
-
 void QDeclarativePathView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativePathView);
-    if (!d->interactive || !d->items.count())
+    if (d->interactive) {
+        d->handleMousePressEvent(event);
+        event->accept();
+    } else {
+        QDeclarativeItem::mousePressEvent(event);
+    }
+}
+
+void QDeclarativePathViewPrivate::handleMousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_Q(QDeclarativePathView);
+    if (!interactive || !items.count())
         return;
-    QPointF scenePoint = mapToScene(event->pos());
+    QPointF scenePoint = q->mapToScene(event->pos());
     int idx = 0;
-    for (; idx < d->items.count(); ++idx) {
-        QRectF rect = d->items.at(idx)->boundingRect();
-        rect = d->items.at(idx)->mapToScene(rect).boundingRect();
+    for (; idx < items.count(); ++idx) {
+        QRectF rect = items.at(idx)->boundingRect();
+        rect = items.at(idx)->mapToScene(rect).boundingRect();
         if (rect.contains(scenePoint))
             break;
     }
-    if (idx == d->items.count() && d->dragMargin == 0.)  // didn't click on an item
+    if (idx == items.count() && dragMargin == 0.)  // didn't click on an item
         return;
 
-    d->startPoint = d->pointNear(event->pos(), &d->startPc);
-    if (idx == d->items.count()) {
-        qreal distance = qAbs(event->pos().x() - d->startPoint.x()) + qAbs(event->pos().y() - d->startPoint.y());
-        if (distance > d->dragMargin)
+    startPoint = pointNear(event->pos(), &startPc);
+    if (idx == items.count()) {
+        qreal distance = qAbs(event->pos().x() - startPoint.x()) + qAbs(event->pos().y() - startPoint.y());
+        if (distance > dragMargin)
             return;
     }
 
-    if (d->tl.isActive() && d->flicking)
-        d->stealMouse = true; // If we've been flicked then steal the click.
+    if (tl.isActive() && flicking)
+        stealMouse = true; // If we've been flicked then steal the click.
     else
-        d->stealMouse = false;
+        stealMouse = false;
 
-    d->lastElapsed = 0;
-    d->lastDist = 0;
-    QDeclarativeItemPrivate::start(d->lastPosTime);
-    d->tl.clear();
+    lastElapsed = 0;
+    lastDist = 0;
+    QDeclarativeItemPrivate::start(lastPosTime);
+    tl.clear();
 }
 
 void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativePathView);
-    if (!d->interactive || !d->lastPosTime.isValid())
+    if (d->interactive) {
+        d->handleMouseMoveEvent(event);
+        if (d->stealMouse)
+            setKeepMouseGrab(true);
+        event->accept();
+    } else {
+        QDeclarativeItem::mouseMoveEvent(event);
+    }
+}
+
+void QDeclarativePathViewPrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_Q(QDeclarativePathView);
+    if (!interactive || !lastPosTime.isValid())
         return;
 
-    if (!d->stealMouse) {
-        QPointF delta = event->pos() - d->startPoint;
+    if (!stealMouse) {
+        QPointF delta = event->pos() - startPoint;
         if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance())
-            d->stealMouse = true;
+            stealMouse = true;
     }
 
-    if (d->stealMouse) {
-        d->moveReason = QDeclarativePathViewPrivate::Mouse;
+    if (stealMouse) {
+        moveReason = QDeclarativePathViewPrivate::Mouse;
         qreal newPc;
-        d->pointNear(event->pos(), &newPc);
-        qreal diff = (newPc - d->startPc)*d->modelCount*d->mappedRange;
+        pointNear(event->pos(), &newPc);
+        qreal diff = (newPc - startPc)*modelCount*mappedRange;
         if (diff) {
-            setOffset(d->offset + diff);
+            setOffset(offset + diff);
 
-            if (diff > d->modelCount/2)
-                diff -= d->modelCount;
-            else if (diff < -d->modelCount/2)
-                diff += d->modelCount;
+            if (diff > modelCount/2)
+                diff -= modelCount;
+            else if (diff < -modelCount/2)
+                diff += modelCount;
 
-            d->lastElapsed = QDeclarativeItemPrivate::restart(d->lastPosTime);
-            d->lastDist = diff;
-            d->startPc = newPc;
+            lastElapsed = QDeclarativeItemPrivate::restart(lastPosTime);
+            lastDist = diff;
+            startPc = newPc;
         }
-        if (!d->moving) {
-            d->moving = true;
-            emit movingChanged();
-            emit movementStarted();
+        if (!moving) {
+            moving = true;
+            emit q->movingChanged();
+            emit q->movementStarted();
         }
     }
 }
 
-void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
+void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativePathView);
-    d->stealMouse = false;
-    setKeepMouseGrab(false);
-    if (!d->interactive || !d->lastPosTime.isValid())
+    if (d->interactive) {
+        d->handleMouseReleaseEvent(event);
+        event->accept();
+        ungrabMouse();
+    } else {
+        QDeclarativeItem::mouseReleaseEvent(event);
+    }
+}
+
+void QDeclarativePathViewPrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *)
+{
+    Q_Q(QDeclarativePathView);
+    stealMouse = false;
+    q->setKeepMouseGrab(false);
+    if (!interactive || !lastPosTime.isValid())
         return;
 
-    qreal elapsed = qreal(d->lastElapsed + QDeclarativeItemPrivate::elapsed(d->lastPosTime)) / 1000.;
-    qreal velocity = elapsed > 0. ? d->lastDist / elapsed : 0;
-    if (d->model && d->modelCount && qAbs(velocity) > 1.) {
-        qreal count = d->pathItems == -1 ? d->modelCount : d->pathItems;
+    qreal elapsed = qreal(lastElapsed + QDeclarativeItemPrivate::elapsed(lastPosTime)) / 1000.;
+    qreal velocity = elapsed > 0. ? lastDist / elapsed : 0;
+    if (model && modelCount && qAbs(velocity) > 1.) {
+        qreal count = pathItems == -1 ? modelCount : pathItems;
         if (qAbs(velocity) > count * 2) // limit velocity
             velocity = (velocity > 0 ? count : -count) * 2;
         // Calculate the distance to be travelled
         qreal v2 = velocity*velocity;
-        qreal accel = d->deceleration/10;
+        qreal accel = deceleration/10;
         // + 0.25 to encourage moving at least one item in the flick direction
-        qreal dist = qMin(qreal(d->modelCount-1), qreal(v2 / (accel * 2.0) + 0.25));
-        if (d->haveHighlightRange && d->highlightRangeMode == QDeclarativePathView::StrictlyEnforceRange) {
+        qreal dist = qMin(qreal(modelCount-1), qreal(v2 / (accel * 2.0) + 0.25));
+        if (haveHighlightRange && highlightRangeMode == QDeclarativePathView::StrictlyEnforceRange) {
             // round to nearest item.
             if (velocity > 0.)
-                dist = qRound(dist + d->offset) - d->offset;
+                dist = qRound(dist + offset) - offset;
             else
-                dist = qRound(dist - d->offset) + d->offset;
+                dist = qRound(dist - offset) + offset;
             // Calculate accel required to stop on item boundary
             if (dist <= 0.) {
                 dist = 0.;
@@ -1138,23 +1173,22 @@ void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
                 accel = v2 / (2.0f * qAbs(dist));
             }
         }
-        d->offsetAdj = 0.0;
-        d->moveOffset.setValue(d->offset);
-        d->tl.accel(d->moveOffset, velocity, accel, dist);
-        d->tl.callback(QDeclarativeTimeLineCallback(&d->moveOffset, d->fixOffsetCallback, d));
-        if (!d->flicking) {
-            d->flicking = true;
-            emit flickingChanged();
-            emit flickStarted();
+        offsetAdj = 0.0;
+        moveOffset.setValue(offset);
+        tl.accel(moveOffset, velocity, accel, dist);
+        tl.callback(QDeclarativeTimeLineCallback(&moveOffset, fixOffsetCallback, this));
+        if (!flicking) {
+            flicking = true;
+            emit q->flickingChanged();
+            emit q->flickStarted();
         }
     } else {
-        d->fixOffset();
+        fixOffset();
     }
 
-    d->lastPosTime.invalidate();
-    ungrabMouse();
-    if (!d->tl.isActive())
-        movementEnding();
+    lastPosTime.invalidate();
+    if (!tl.isActive())
+        q->movementEnding();
 }
 
 bool QDeclarativePathView::sendMouseEvent(QGraphicsSceneMouseEvent *event)
@@ -1164,7 +1198,8 @@ bool QDeclarativePathView::sendMouseEvent(QGraphicsSceneMouseEvent *event)
     QRectF myRect = mapToScene(QRectF(0, 0, width(), height())).boundingRect();
     QGraphicsScene *s = scene();
     QDeclarativeItem *grabber = s ? qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem()) : 0;
-    if ((d->stealMouse || myRect.contains(event->scenePos().toPoint())) && (!grabber || !grabber->keepMouseGrab())) {
+    bool stealThisEvent = d->stealMouse;
+    if ((stealThisEvent || myRect.contains(event->scenePos().toPoint())) && (!grabber || !grabber->keepMouseGrab())) {
         mouseEvent.setAccepted(false);
         for (int i = 0x1; i <= 0x10; i <<= 1) {
             if (event->buttons() & i) {
@@ -1179,25 +1214,28 @@ bool QDeclarativePathView::sendMouseEvent(QGraphicsSceneMouseEvent *event)
 
         switch(mouseEvent.type()) {
         case QEvent::GraphicsSceneMouseMove:
-            mouseMoveEvent(&mouseEvent);
+            d->handleMouseMoveEvent(&mouseEvent);
             break;
         case QEvent::GraphicsSceneMousePress:
-            mousePressEvent(&mouseEvent);
+            d->handleMousePressEvent(&mouseEvent);
+            stealThisEvent = d->stealMouse;   // Update stealThisEvent in case changed by function call above
             break;
         case QEvent::GraphicsSceneMouseRelease:
-            mouseReleaseEvent(&mouseEvent);
+            d->handleMouseReleaseEvent(&mouseEvent);
             break;
         default:
             break;
         }
         grabber = qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem());
-        if (grabber && d->stealMouse && !grabber->keepMouseGrab() && grabber != this)
+        if (grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this)
             grabMouse();
 
         return d->stealMouse;
     } else if (d->lastPosTime.isValid()) {
         d->lastPosTime.invalidate();
     }
+    if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease)
+        d->stealMouse = false;
     return false;
 }
 
@@ -1211,12 +1249,7 @@ bool QDeclarativePathView::sceneEventFilter(QGraphicsItem *i, QEvent *e)
     case QEvent::GraphicsSceneMousePress:
     case QEvent::GraphicsSceneMouseMove:
     case QEvent::GraphicsSceneMouseRelease:
-        {
-            bool ret = sendMouseEvent(static_cast<QGraphicsSceneMouseEvent *>(e));
-            if (e->type() == QEvent::GraphicsSceneMouseRelease)
-                return ret;
-            break;
-        }
+        return sendMouseEvent(static_cast<QGraphicsSceneMouseEvent *>(e));
     default:
         break;
     }
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
index dfebe35..b217216 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
@@ -123,6 +123,10 @@ public:
         return model && model->count() > 0 && model->isValid() && path;
     }
 
+    void handleMousePressEvent(QGraphicsSceneMouseEvent *event);
+    void handleMouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *);
+
     int calcCurrentIndex();
     void updateCurrent();
     static void fixOffsetCallback(void*);
-- 
cgit v0.12


From e65aac1dbbeb26575554da10e2531694e8db5ac9 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 17 Sep 2010 13:46:44 +1000
Subject: Moving items in a PathView caused PathView.onPath to be set to false.
 Check that we no longer hold a reference to the item before setting onPath to
 false.

Task-number: QTBUG-13689
Reviewed-by: Michael Brasser
(cherry picked from commit 7e6b2b2b95bc1db77544b898ec45ea4a2683e435)
---
 .../graphicsitems/qdeclarativepathview.cpp         |  8 +++++---
 .../qdeclarativepathview/data/datamodel.qml        |  1 +
 .../tst_qdeclarativepathview.cpp                   | 23 ++++++++++++++--------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 119ac3e..d134929 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -141,11 +141,13 @@ void QDeclarativePathViewPrivate::releaseItem(QDeclarativeItem *item)
 {
     if (!item || !model)
         return;
-    if (QDeclarativePathViewAttached *att = attached(item))
-        att->setOnPath(false);
     QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(item));
     itemPrivate->removeItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
-    model->release(item);
+    if (model->release(item) == 0) {
+        // item was not destroyed, and we no longer reference it.
+        if (QDeclarativePathViewAttached *att = attached(item))
+            att->setOnPath(false);
+    }
 }
 
 QDeclarativePathViewAttached *QDeclarativePathViewPrivate::attached(QDeclarativeItem *item)
diff --git a/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
index a5c3772..fb3c910 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
@@ -21,6 +21,7 @@ PathView {
         Rectangle {
             id: wrapper
             objectName: "wrapper"
+            property bool onPath: PathView.onPath
             width: 20; height: 20; color: name
             Text {
                 objectName: "myText"
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 74d2f0a..cbfbfbd 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -152,27 +152,27 @@ public:
     QString number(int index) const { return list.at(index).second; }
 
     void addItem(const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), list.count(), list.count());
+        beginInsertRows(QModelIndex(), list.count(), list.count());
         list.append(QPair<QString,QString>(name, number));
-        emit endInsertRows();
+        endInsertRows();
     }
 
     void insertItem(int index, const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), index, index);
+        beginInsertRows(QModelIndex(), index, index);
         list.insert(index, QPair<QString,QString>(name, number));
-        emit endInsertRows();
+        endInsertRows();
     }
 
     void removeItem(int index) {
-        emit beginRemoveRows(QModelIndex(), index, index);
+        beginRemoveRows(QModelIndex(), index, index);
         list.removeAt(index);
-        emit endRemoveRows();
+        endRemoveRows();
     }
 
     void moveItem(int from, int to) {
-        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
+        beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
         list.move(from, to);
-        emit endMoveRows();
+        endMoveRows();
     }
 
     void modifyItem(int idx, const QString &name, const QString &number) {
@@ -411,6 +411,13 @@ void tst_QDeclarativePathView::dataModel()
     QVERIFY(text);
     QCOMPARE(text->text(), model.name(3));
 
+    model.moveItem(3, 5);
+    QTRY_COMPARE(findItems<QDeclarativeItem>(pathview, "wrapper").count(), 5);
+    QList<QDeclarativeItem*> items = findItems<QDeclarativeItem>(pathview, "wrapper");
+    foreach (QDeclarativeItem *item, items) {
+        QVERIFY(item->property("onPath").toBool());
+    }
+
     delete canvas;
 }
 
-- 
cgit v0.12


From 78f36a24500f393af53486a3cc1a63b748e982d7 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Mon, 20 Sep 2010 09:35:26 +0200
Subject: qtextcodec_symbian: Add few aliases

Reviewed-by: Denis
(cherry picked from commit 2b230dbc9a784e577c08fa25db3e975952849297)
---
 src/corelib/codecs/qtextcodec_symbian.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/codecs/qtextcodec_symbian.cpp b/src/corelib/codecs/qtextcodec_symbian.cpp
index d59998f..9d7e856 100644
--- a/src/corelib/codecs/qtextcodec_symbian.cpp
+++ b/src/corelib/codecs/qtextcodec_symbian.cpp
@@ -122,8 +122,8 @@ static const QSymbianCodecInitData codecsData[] = {
     { /*271085624*/ 271085624,                                 114, "GB18030\0" },
     { /*536929574*/ 536929574,                                  38, "EUC-KR\0" },
     { /*536936703*/ 536936703,                                   0, "CP949\0" },
-    { /*536936705*/ 536936705,                                  37, "ISO-2022-KR\0" },
-    { /*536941517*/ 536941517,                                  36, "KS_C_5601-1987\0" }
+    { /*536936705*/ 536936705,                                  37, "ISO-2022-KR\0csISO2022KR\0" },
+    { /*536941517*/ 536941517,                                  36, "KS_C_5601-1987\0iso-ir-149\0KS_C_5601-1989\0KSC_5601\0Korean\0csKSC56011987\0" }
     };
 
 
-- 
cgit v0.12


From c2f239dc35a01502ba6157096f4e91d7af624a5e Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 21 Sep 2010 15:22:01 +0300
Subject: Improved output of patch_capabilities.pl script

More detailed output of what was patched reduces user confusion.
Properly prefixed output messages can also be easily parsed by IDEs
like Qt Creator.

Task-number: QTBUG-13760
Reviewed-by: Janne Koskinen
(cherry picked from commit 1eeec88caa45d7c3f6b8371bc84bb8d172b0b02e)
---
 bin/patch_capabilities.pl | 83 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 0c0538c..a85f073 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -46,7 +46,13 @@
 #
 #######################################################################
 
+#
+# Note: Please make sure to output all changes done to the pkg file in a print statements
+#       starting with "Patching: " to ease integration into IDEs!
+#
+
 use File::Copy;
+use File::Spec;
 
 sub Usage() {
     print("This script can be used to set capabilities of all binaries\n");
@@ -142,39 +148,56 @@ if (@ARGV)
         # Parse each line.
         while (<PKG>)
         {
-            # Patch pkg UID
             my $line = $_;
             my $newLine = $line;
-            if ($line =~ m/^\#.*\(0x[0-9|a-f|A-F]*\).*$/)
+
+            # Patch pkg UID if it's in protected range
+            if ($line =~ m/^\#.*\((0x[0-7][0-9|a-f|A-F]*)\).*$/)
             {
-                $newLine =~ s/\(0x./\(0xE/;
+                my $oldUID = $1;
+                my $newUID = $oldUID;
+                $newUID =~ s/0x./0xE/i;
+                $newLine =~ s/$oldUID/$newUID/;
+                print ("Patching: UID $oldUID is not compatible with self-signing! Changed to: $newUID.\n");
             }
 
-            # Patch embedded sis name and UID
-            if ($line =~ m/^@.*\.sis.*\(0x[0-9|a-f|A-F]*\).*$/)
+            # Patch embedded sis name and UID if UID is in protected range
+            if ($line =~ m/^@\"*(.*\.sis).*\((0x[0-7][0-9|a-f|A-F]*)\).*$/)
             {
-                $newLine =~ s/\(0x./\(0xE/;
-                if ($line !~ m/^.*_selfsigned.sis.*$/)
+                my $oldSisName = $1;
+                my $oldUID = $2;
+                my $newUID = $oldUID;
+                $newUID =~ s/0x./0xE/i;
+                $newLine =~ s/$oldUID/$newUID/;
+                print ("Patching: Embedded sis $oldSisName UID $oldUID changed to: $newUID.\n");
+
+                if ($oldSisName !~ m/^.*_selfsigned.sis$/i)
                 {
-                    $newLine =~ s/\.sis/_selfsigned\.sis/i;
+                    my $newSisName = $oldSisName;
+                    $newSisName =~ s/\.sis$/_selfsigned\.sis/i;
+                    $newLine =~ s/$oldSisName/$newSisName/i;
+                    print ("Patching: Embedded sis $oldSisName name changed to: $newSisName.\n");
                 }
             }
 
-            # Remove dependencies to known problem packages (i.e. packages that are likely to be patched, also)
+            # Remove dependencies to known problem packages (i.e. packages that are likely to be patched, too)
             # to reduce unnecessary error messages.
-            if ($line =~ m/^\(0x2002af5f\).*\{.*\}$/)
+            if ($line =~ m/^\((0x2002af5f)\).*\{.*\}$/)
             {
-                $newLine = "\n"
+                $newLine = "\n";
+                print ("Patching: Removed dependency to sqlite3.sis ($1) to avoid installation issues in case sqlite3.sis is also patched.\n");
             }
-            if ($line =~ m/^\(0x2001E61C\).*\{.*\}$/)
+            if ($line =~ m/^\((0x2001E61C)\).*\{.*\}$/)
             {
-                $newLine = "\n"
+                $newLine = "\n";
+                print ("Patching: Removed dependency to qt.sis ($1) to avoid installation issues in case qt.sis is also patched.\n");
             }
 
             # Remove manufacturer ifdef
             if ($line =~ m/^.*\(MANUFACTURER\)\=\(.*\).*$/)
             {
                 $newLine = "\n";
+                print ("Patching: Removed manufacturer check as it is usually not desirable in self-signed packages.\n");
             }
 
             if ($line =~ m/^ELSEIF.*MANUFACTURER$/)
@@ -240,7 +263,9 @@ if (@ARGV)
         foreach my $binaryPath(@binaries)
         {
             # Create the command line for setting the capabilities.
+            my ($binaryVolume, $binaryDirs, $binaryBaseName) = File::Spec->splitpath($binaryPath);
             my $commandToExecute = $baseCommandToExecute;
+            my $executeNeeded = 0;
             if (@capabilitiesSpecified)
             {
                 $commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesSpecified));
@@ -250,34 +275,54 @@ if (@ARGV)
                 my $dllCaps;
                 open($dllCaps, "elftran -dump s $binaryPath |") or die ("Could not execute elftran");
                 my $capsFound = 0;
+                my $originalVid;
                 my @capabilitiesToSet;
                 my $capabilitiesToAllow = join(" ", @capabilitiesToAllow);
+                my @capabilitiesToDrop;
                 while (<$dllCaps>) {
+                    if (/^Vendor ID: (.*)$/) {
+                        $originalVid = "$1";
+                    }
                     if (!$capsFound) {
                         $capsFound = 1 if (/Capabilities:/);
                     } else {
                         $_ = trim($_);
                         if ($capabilitiesToAllow =~ /$_/) {
                             push(@capabilitiesToSet, $_);
+                        } else {
+                            push(@capabilitiesToDrop, $_);
                         }
                     }
                 }
                 close($dllCaps);
+                if ($originalVid !~ "00000000") {
+                    print ("Patching: Vendor ID (0x$originalVid) incompatible with self-signed packages, setting it to zero for \"$binaryBaseName\".\n");
+                    $executeNeeded = 1;
+                }
+                if ($#capabilitiesToDrop) {
+                    my $capsToDropStr = join("\", \"", @capabilitiesToDrop);
+                    $capsToDropStr =~ s/\", \"$//;
+
+                    print ("Patching: The following capabilities used in \"$binaryBaseName\" are not compatible with a self-signed package and will be removed: \"$capsToDropStr\".\n");
+                    $executeNeeded = 1;
+                }
                 $commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesToSet));
             }
             $commandToExecute .= $binaryPath;
 
-            # Actually execute the elftran command to set the capabilities.
-            print ("Executing ".$commandToExecute."\n");
-            system ($commandToExecute." > $nullDevice");
-
+            if ($executeNeeded) {
+                # Actually execute the elftran command to set the capabilities.
+                print ("\n");
+                system ("$commandToExecute > $nullDevice");
+            }
             ## Create another command line to check that the set capabilities are correct.
             #$commandToExecute = "elftran -dump s ".$binaryPath;
         }
 
         print ("\n");
-        print ("NOTE: A patched package may not work as expected due to reduced capabilities.\n");
-        print ("      Therefore it should not be used for any kind of Symbian signing or distribution!\n");
+        print ("NOTE: A patched package may not work as expected due to reduced capabilities and other modifications,\n");
+        print ("      so it should not be used for any kind of Symbian signing or distribution!\n");
+        print ("      Use a proper certificate to avoid the need to patch the package.\n");
         print ("\n");
     }
 }
-- 
cgit v0.12


From f6d61e677db6364cb6e8214531fc442931063a91 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 17 Sep 2010 11:28:23 +1000
Subject: Doc changes (cherry picked from commit
 ee9c9e412fd5467e82be446603e71bee620ff04b)

---
 src/declarative/util/qdeclarativelistmodel.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index cf2eada..f01d9b4 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -154,10 +154,10 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
     handler. You must call sync() or else the changes made to the list from the external
     thread will not be reflected in the list model in the main thread.
 
-    \section1 Limitations
+    \section1 Restrictions
 
-    If a list model is to be accessed from a WorkerScript, it \bold cannot
-    contain list data. So, the following model cannot be used from a WorkerScript
+    If a list model is to be accessed from a WorkerScript, it cannot
+    contain list-type data. So, the following model cannot be used from a WorkerScript
     because of the list contained in the "attributes" property:
 
     \code
@@ -174,7 +174,7 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
     }
     \endcode
 
-    In addition, the WorkerScript cannot add any list data to the model.
+    In addition, the WorkerScript cannot add list-type data to the model.
 
     \sa {qmlmodels}{Data Models}, {declarative/threading/threadedlistmodel}{Threaded ListModel example}, QtDeclarative
 */
-- 
cgit v0.12


From 5ef8bc9393dcd06062bd38d6761e23837d7a86c5 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 17 Sep 2010 14:16:08 +1000
Subject: Remove duplicated move() implementations (cherry picked from commit
 16013f8970471f161db9fcc728a8c263e5bb84a7)

---
 src/declarative/util/qdeclarativelistmodel.cpp | 60 +++++++++++---------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index f01d9b4..401e400 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -58,6 +58,28 @@ Q_DECLARE_METATYPE(QListModelInterface *)
 
 QT_BEGIN_NAMESPACE
 
+template<typename T>
+void qdeclarativelistmodel_move(int from, int to, int n, T *items)
+{
+    if (n == 1) {
+        items->move(from, to);
+    } else {
+        T replaced;
+        int i=0;
+        typename T::ConstIterator it=items->begin(); it += from+n;
+        for (; i<to-from; ++i,++it)
+            replaced.append(*it);
+        i=0;
+        it=items->begin(); it += from;
+        for (; i<n; ++i,++it)
+            replaced.append(*it);
+        typename T::ConstIterator f=replaced.begin();
+        typename T::Iterator t=items->begin(); t += from;
+        for (; f != replaced.end(); ++f, ++t)
+            *t = *f;
+    }
+}
+
 QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListModelData::instructions() const
 {
     return (QDeclarativeListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData));
@@ -947,23 +969,7 @@ void FlatListModel::setProperty(int index, const QString& property, const QVaria
 
 void FlatListModel::move(int from, int to, int n)
 {
-    if (n == 1) {
-        m_values.move(from, to);
-    } else {
-        QList<QHash<int, QVariant> > replaced;
-        int i=0;
-        QList<QHash<int, QVariant> >::ConstIterator it=m_values.begin(); it += from+n;
-        for (; i<to-from; ++i,++it)
-            replaced.append(*it);
-        i=0;
-        it=m_values.begin(); it += from;
-        for (; i<n; ++i,++it)
-            replaced.append(*it);
-        QList<QHash<int, QVariant> >::ConstIterator f=replaced.begin();
-        QList<QHash<int, QVariant> >::Iterator t=m_values.begin(); t += from;
-        for (; f != replaced.end(); ++f, ++t)
-            *t = *f;
-    }
+    qdeclarativelistmodel_move<QList<QHash<int, QVariant> > >(from, to, n, &m_values);
 }
 
 bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *row, QList<int> *roles)
@@ -1130,23 +1136,9 @@ bool NestedListModel::insert(int index, const QScriptValue& valuemap)
 
 void NestedListModel::move(int from, int to, int n)
 {
-    if (n==1) {
-        _root->values.move(from,to);
-    } else {
-        QList<QVariant> replaced;
-        int i=0;
-        QVariantList::const_iterator it=_root->values.begin(); it += from+n;
-        for (; i<to-from; ++i,++it)
-            replaced.append(*it);
-        i=0;
-        it=_root->values.begin(); it += from;
-        for (; i<n; ++i,++it)
-            replaced.append(*it);
-        QVariantList::const_iterator f=replaced.begin();
-        QVariantList::iterator t=_root->values.begin(); t += from;
-        for (; f != replaced.end(); ++f, ++t)
-            *t = *f;
-    }
+    if (!_root)
+        return;
+    qdeclarativelistmodel_move<QVariantList>(from, to, n, &_root->values);
 }
 
 bool NestedListModel::append(const QScriptValue& valuemap)
-- 
cgit v0.12


From 755a82fea47402be5857edf2f882e0135e02267a Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 17 Sep 2010 14:55:52 +1000
Subject: Make it clear that private ListModel constructor is only for worker
 agent. Also set up the worker list copy in the ListModel implementation
 instead of the agent. (cherry picked from commit
 c298ed31f8dfa917e5428820aecd39234b4c9097)

---
 src/declarative/util/qdeclarativelistmodel.cpp     | 37 ++++++++++++++--------
 src/declarative/util/qdeclarativelistmodel_p.h     |  6 ++--
 src/declarative/util/qdeclarativelistmodel_p_p.h   |  2 ++
 .../util/qdeclarativelistmodelworkeragent.cpp      |  8 ++---
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 401e400..0be9122 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -217,17 +217,21 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
 */
 
 QDeclarativeListModel::QDeclarativeListModel(QObject *parent)
-: QListModelInterface(parent), m_agent(0), m_nested(new NestedListModel(this)), m_flat(0), m_isWorkerCopy(false)
+: QListModelInterface(parent), m_agent(0), m_nested(new NestedListModel(this)), m_flat(0)
 {
 }
 
-QDeclarativeListModel::QDeclarativeListModel(bool workerCopy, QObject *parent)
-: QListModelInterface(parent), m_agent(0), m_nested(0), m_flat(0), m_isWorkerCopy(workerCopy)
+QDeclarativeListModel::QDeclarativeListModel(const QDeclarativeListModel *orig, QDeclarativeListModelWorkerAgent *parent)
+: QListModelInterface(parent), m_agent(0), m_nested(0), m_flat(0)
 {
-    if (workerCopy)
-        m_flat = new FlatListModel(this);
-    else
-        m_nested = new NestedListModel(this);
+    m_flat = new FlatListModel(this);
+    m_flat->m_parentAgent = parent;
+
+    if (orig->m_flat) {
+        m_flat->m_roles = orig->m_flat->m_roles;
+        m_flat->m_strings = orig->m_flat->m_strings;
+        m_flat->m_values = orig->m_flat->m_values;
+    }
 }
 
 QDeclarativeListModel::~QDeclarativeListModel()
@@ -269,6 +273,11 @@ bool QDeclarativeListModel::flatten()
     return true;
 }
 
+bool QDeclarativeListModel::inWorkerThread() const
+{
+    return m_flat && m_flat->m_parentAgent;
+}
+
 QDeclarativeListModelWorkerAgent *QDeclarativeListModel::agent()
 {
     if (m_agent)
@@ -333,7 +342,7 @@ void QDeclarativeListModel::clear()
     else
         m_nested->clear();
 
-    if (!m_isWorkerCopy) {
+    if (!inWorkerThread()) {
         emit itemsRemoved(0, cleared);
         emit countChanged();
     }
@@ -358,7 +367,7 @@ void QDeclarativeListModel::remove(int index)
     else
         m_nested->remove(index);
 
-    if (!m_isWorkerCopy) {
+    if (!inWorkerThread()) {
         emit itemsRemoved(index, 1);
         emit countChanged();
     }
@@ -392,7 +401,7 @@ void QDeclarativeListModel::insert(int index, const QScriptValue& valuemap)
     }
 
     bool ok = m_flat ?  m_flat->insert(index, valuemap) : m_nested->insert(index, valuemap);
-    if (ok && !m_isWorkerCopy) {
+    if (ok && !inWorkerThread()) {
         emit itemsInserted(index, 1);
         emit countChanged();
     }
@@ -438,7 +447,7 @@ void QDeclarativeListModel::move(int from, int to, int n)
     else
         m_nested->move(from, to, n);
 
-    if (!m_isWorkerCopy)
+    if (!inWorkerThread())
         emit itemsMoved(origfrom, origto, orign);
 }
 
@@ -529,7 +538,7 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
         else
             m_nested->set(index, valuemap, &roles);
 
-        if (!m_isWorkerCopy)
+        if (!inWorkerThread())
             emit itemsChanged(index, 1, roles);
     }
 }
@@ -560,7 +569,7 @@ void QDeclarativeListModel::setProperty(int index, const QString& property, cons
     else
         m_nested->setProperty(index, property, value, &roles);
 
-    if (!m_isWorkerCopy)
+    if (!inWorkerThread())
         emit itemsChanged(index, 1, roles);
 }
 
@@ -848,7 +857,7 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
 */
 
 FlatListModel::FlatListModel(QDeclarativeListModel *base)
-    : m_scriptEngine(0), m_listModel(base)
+    : m_scriptEngine(0), m_listModel(base), m_parentAgent(0)
 {
 }
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index 6aff9c6..0a5e3ff 100644
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -98,14 +98,16 @@ private:
     friend class QDeclarativeListModelWorkerAgent;
     friend struct ModelNode;
 
+    // Constructs a flat list model for a worker agent
+    QDeclarativeListModel(const QDeclarativeListModel *orig, QDeclarativeListModelWorkerAgent *parent);
+
     QDeclarativeListModel(bool workerCopy, QObject *parent=0);
     bool flatten();
-    bool modifyCheck();
+    bool inWorkerThread() const;
 
     QDeclarativeListModelWorkerAgent *m_agent;
     NestedListModel *m_nested;
     FlatListModel *m_flat;
-    bool m_isWorkerCopy;
 };
 
 // ### FIXME
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index 8231414..1e9513e 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -102,6 +102,8 @@ private:
     QHash<QString, int> m_strings;
     QList<QHash<int, QVariant> > m_values;
     QDeclarativeListModel *m_listModel;
+
+    QDeclarativeListModelWorkerAgent *m_parentAgent;
 };
 
 class NestedListModel
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
index 4392bed..658584e 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
@@ -83,11 +83,11 @@ void QDeclarativeListModelWorkerAgent::Data::changedChange(int index, int count)
 }
 
 QDeclarativeListModelWorkerAgent::QDeclarativeListModelWorkerAgent(QDeclarativeListModel *model)
-: m_engine(0), m_ref(1), m_orig(model), m_copy(new QDeclarativeListModel(true, this))
+    : m_engine(0), 
+      m_ref(1), 
+      m_orig(model), 
+      m_copy(new QDeclarativeListModel(m_orig, this))
 {
-    m_copy->m_flat->m_roles = m_orig->m_flat->m_roles;
-    m_copy->m_flat->m_strings = m_orig->m_flat->m_strings;
-    m_copy->m_flat->m_values = m_orig->m_flat->m_values;
 }
 
 QDeclarativeListModelWorkerAgent::~QDeclarativeListModelWorkerAgent()
-- 
cgit v0.12


From ef414bc0ac9eb0feea57a578757be894abe226c0 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 17 Sep 2010 15:15:15 +1000
Subject: Changes to objects returned from get() should emit itemsChanged() so
 that the view is updated (currently the model data changes but the view does
 not). In flat-model mode, get() now returns a QScriptClass-type object so
 that changes to the returned object are received, and for nested-model mode,
 the fix adds a QDeclarativeOpenMetaObject subclass and ModelNode::listIndex
 so that itemsChanged() can be emitted when the node data changes.

Task-number: QTBUG-12363
(cherry picked from commit c2bbef949126826f0330c69dff1a8c96919f69a5)
---
 src/declarative/util/qdeclarativelistmodel.cpp     | 293 ++++++++++++++++++--
 src/declarative/util/qdeclarativelistmodel_p.h     |   6 +-
 src/declarative/util/qdeclarativelistmodel_p_p.h   | 121 +++++++-
 .../util/qdeclarativelistmodelworkeragent.cpp      |  25 +-
 .../util/qdeclarativelistmodelworkeragent_p.h      |   4 +
 .../tst_qdeclarativelistmodel.cpp                  | 307 +++++++++++++++++++--
 6 files changed, 698 insertions(+), 58 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 0be9122..68e97b0 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -231,6 +231,10 @@ QDeclarativeListModel::QDeclarativeListModel(const QDeclarativeListModel *orig,
         m_flat->m_roles = orig->m_flat->m_roles;
         m_flat->m_strings = orig->m_flat->m_strings;
         m_flat->m_values = orig->m_flat->m_values;
+
+        m_flat->m_nodeData.reserve(m_flat->m_values.count());
+        for (int i=0; i<m_flat->m_values.count(); i++)
+            m_flat->m_nodeData << 0;
     }
 }
 
@@ -267,6 +271,10 @@ bool QDeclarativeListModel::flatten()
         flat->m_strings.insert(s, roles[i]);
     }
 
+    flat->m_nodeData.reserve(flat->m_values.count());
+    for (int i=0; i<flat->m_values.count(); i++)
+        flat->m_nodeData << 0;
+
     m_flat = flat;
     delete m_nested;
     m_nested = 0;
@@ -425,7 +433,7 @@ void QDeclarativeListModel::move(int from, int to, int n)
 {
     if (n==0 || from==to)
         return;
-    if (from+n > count() || to+n > count() || from < 0 || to < 0 || n < 0) {
+    if (!canMove(from, to, n)) {
         qmlInfo(this) << tr("move: out of range");
         return;
     }
@@ -476,11 +484,15 @@ void QDeclarativeListModel::append(const QScriptValue& valuemap)
 /*!
     \qmlmethod object ListModel::get(int index)
 
-    Returns the item at \a index in the list model.
+    Returns the item at \a index in the list model. This allows the item
+    data to be accessed or modified from JavaScript:
 
     \code
-        fruitModel.append({"cost": 5.95, "name":"Jackfruit"})
-        fruitModel.get(0).cost
+    Component.onCompleted: {
+        fruitModel.append({"cost": 5.95, "name":"Jackfruit"});
+        console.log(fruitModel.get(0).cost);
+        fruitModel.get(0).cost = 10.95;
+    }
     \endcode
 
     The \a index must be an element in the list.
@@ -495,6 +507,9 @@ void QDeclarativeListModel::append(const QScriptValue& valuemap)
         fruitModel.get(0).attributes.get(1).value; // == "green"
     \endcode
 
+    \warning The returned object is not guaranteed to remain valid. It
+    should not be used in \l{Property Binding}{property bindings}.
+
     \sa append()
 */
 QScriptValue QDeclarativeListModel::get(int index) const
@@ -736,7 +751,7 @@ void QDeclarativeListModelParser::setCustomData(QObject *obj, const QByteArray &
 {
     QDeclarativeListModel *rv = static_cast<QDeclarativeListModel *>(obj);
 
-    ModelNode *root = new ModelNode;
+    ModelNode *root = new ModelNode(rv->m_nested);
     rv->m_nested->_root = root;
     QStack<ModelNode *> nodes;
     nodes << root;
@@ -753,7 +768,7 @@ void QDeclarativeListModelParser::setCustomData(QObject *obj, const QByteArray &
         case ListInstruction::Push:
             {
                 ModelNode *n = nodes.top();
-                ModelNode *n2 = new ModelNode;
+                ModelNode *n2 = new ModelNode(rv->m_nested);
                 n->values << qVariantFromValue(n2);
                 nodes.push(n2);
                 if (processingSet)
@@ -792,7 +807,7 @@ void QDeclarativeListModelParser::setCustomData(QObject *obj, const QByteArray &
         case ListInstruction::Set:
             {
                 ModelNode *n = nodes.top();
-                ModelNode *n2 = new ModelNode;
+                ModelNode *n2 = new ModelNode(rv->m_nested);
                 n->properties.insert(QString::fromUtf8(data + instr.dataIdx), n2);
                 nodes.push(n2);
                 processingSet = true;
@@ -800,6 +815,13 @@ void QDeclarativeListModelParser::setCustomData(QObject *obj, const QByteArray &
             break;
         }
     }
+
+    ModelNode *rootNode = rv->m_nested->_root;
+    for (int i=0; i<rootNode->values.count(); ++i) {
+        ModelNode *node = qvariant_cast<ModelNode *>(rootNode->values[i]);
+        node->listIndex = i;
+        node->updateListIndexes();
+    }
 }
 
 bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
@@ -814,6 +836,7 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
     return false;
 }
 
+
 /*!
     \qmlclass ListElement QDeclarativeListElement
     \ingroup qml-working-with-data
@@ -857,12 +880,13 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
 */
 
 FlatListModel::FlatListModel(QDeclarativeListModel *base)
-    : m_scriptEngine(0), m_listModel(base), m_parentAgent(0)
+    : m_scriptEngine(0), m_listModel(base), m_scriptClass(0), m_parentAgent(0)
 {
 }
 
 FlatListModel::~FlatListModel()
 {
+    qDeleteAll(m_nodeData);
 }
 
 QHash<int,QVariant> FlatListModel::data(int index, const QList<int> &roles) const
@@ -906,11 +930,15 @@ int FlatListModel::count() const
 void FlatListModel::clear()
 {
     m_values.clear();
+
+    qDeleteAll(m_nodeData);
+    m_nodeData.clear();
 }
 
 void FlatListModel::remove(int index)
 {
     m_values.removeAt(index);
+    removedNode(index);
 }
 
 bool FlatListModel::append(const QScriptValue &value)
@@ -927,6 +955,8 @@ bool FlatListModel::insert(int index, const QScriptValue &value)
         return false;
 
     m_values.insert(index, row);
+    insertedNode(index);
+
     return true;
 }
 
@@ -940,13 +970,17 @@ QScriptValue FlatListModel::get(int index) const
     if (index < 0 || index >= m_values.count())
         return scriptEngine->undefinedValue();
 
-    QScriptValue rv = scriptEngine->newObject();
+    FlatListModel *that = const_cast<FlatListModel*>(this);
+    if (!m_scriptClass)
+        that->m_scriptClass = new FlatListScriptClass(that, scriptEngine);
 
-    QHash<int, QVariant> row = m_values.at(index);
-    for (QHash<int, QVariant>::ConstIterator iter = row.begin(); iter != row.end(); ++iter)
-        rv.setProperty(m_roles.value(iter.key()), qScriptValueFromValue(scriptEngine, iter.value()));
+    FlatNodeData *data = m_nodeData.value(index);
+    if (!data) {
+        data = new FlatNodeData(index);
+        that->m_nodeData.replace(index, data);
+    }
 
-    return rv;
+    return QScriptDeclarativeClass::newObject(scriptEngine, m_scriptClass, new FlatNodeObjectData(data));
 }
 
 void FlatListModel::set(int index, const QScriptValue &value, QList<int> *roles)
@@ -979,6 +1013,7 @@ void FlatListModel::setProperty(int index, const QString& property, const QVaria
 void FlatListModel::move(int from, int to, int n)
 {
     qdeclarativelistmodel_move<QList<QHash<int, QVariant> > >(from, to, n, &m_values);
+    moveNodes(from, to, n);
 }
 
 bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *row, QList<int> *roles)
@@ -1008,6 +1043,139 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *ro
     return true;
 }
 
+void FlatListModel::insertedNode(int index)
+{
+    if (index >= 0 && index <= m_values.count()) {
+        m_nodeData.insert(index, 0);
+
+        for (int i=index + 1; i<m_nodeData.count(); i++) {
+            if (m_nodeData[i])
+                m_nodeData[i]->index = i;
+        }
+    }
+}
+
+void FlatListModel::removedNode(int index)
+{
+    if (index >= 0 && index < m_nodeData.count()) {
+        delete m_nodeData.takeAt(index);
+
+        for (int i=index; i<m_nodeData.count(); i++) {
+            if (m_nodeData[i])
+                m_nodeData[i]->index = i;
+        }
+    }
+}
+
+void FlatListModel::moveNodes(int from, int to, int n)
+{
+    if (!m_listModel->canMove(from, to, n))
+        return;
+
+    qdeclarativelistmodel_move<QList<FlatNodeData *> >(from, to, n, &m_nodeData);
+
+    for (int i=from; i<from + (to-from); i++)  {
+        if (m_nodeData[i]) 
+            m_nodeData[i]->index = i;
+    }
+}
+
+
+
+FlatNodeData::~FlatNodeData()
+{
+    for (QSet<FlatNodeObjectData *>::Iterator iter = objects.begin(); iter != objects.end(); ++iter) {
+        FlatNodeObjectData *data = *iter;
+        data->nodeData = 0;
+    }
+}
+
+void FlatNodeData::addData(FlatNodeObjectData *data) 
+{
+    objects.insert(data);
+}
+
+void FlatNodeData::removeData(FlatNodeObjectData *data)
+{
+    objects.remove(data);
+}
+
+
+FlatListScriptClass::FlatListScriptClass(FlatListModel *model, QScriptEngine *seng)
+    : QScriptDeclarativeClass(seng),
+      m_model(model)
+{
+}
+
+QScriptDeclarativeClass::Value FlatListScriptClass::property(Object *obj, const Identifier &name)
+{
+    FlatNodeObjectData *objData = static_cast<FlatNodeObjectData*>(obj);
+    if (!objData->nodeData) // item at this index has been deleted
+        return QScriptDeclarativeClass::Value(engine(), engine()->undefinedValue());
+
+    int index = objData->nodeData->index;
+    QString propName = toString(name);
+    int role = m_model->m_strings.value(propName, -1);
+
+    if (role >= 0 && index >=0 ) {
+        const QHash<int, QVariant> &row = m_model->m_values[index];
+        QScriptValue sv = engine()->toScriptValue<QVariant>(row[role]);
+        return QScriptDeclarativeClass::Value(engine(), sv);
+    }
+
+    return QScriptDeclarativeClass::Value(engine(), engine()->undefinedValue());
+}
+
+void FlatListScriptClass::setProperty(Object *obj, const Identifier &name, const QScriptValue &value)
+{
+    if (!value.isVariant() && !value.isRegExp() && !value.isDate() && value.isObject()) {
+        qmlInfo(m_model->m_listModel) << "Cannot add nested list values when modifying or after modification from a worker script";
+        return;
+    }
+
+    FlatNodeObjectData *objData = static_cast<FlatNodeObjectData*>(obj);
+    if (!objData->nodeData) // item at this index has been deleted
+        return;
+
+    int index = objData->nodeData->index;
+    QString propName = toString(name);
+
+    int role = m_model->m_strings.value(propName, -1);
+    if (role >= 0 && index >= 0) {
+        QHash<int, QVariant> &row = m_model->m_values[index];
+        row[role] = value.toVariant();
+
+        if (m_model->m_parentAgent) {
+            // This is the list in the worker thread, so tell the agent to
+            // emit itemsChanged() later
+            m_model->m_parentAgent->changedData(index, 1);
+        } else {
+            // This is the list in the main thread, so emit itemsChanged()
+            QList<int> roles;
+            roles << role;
+            emit m_model->m_listModel->itemsChanged(index, 1, roles);
+        }
+    }
+}
+
+QScriptClass::QueryFlags FlatListScriptClass::queryProperty(Object *, const Identifier &, QScriptClass::QueryFlags)
+{
+    return (QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess);
+}
+
+bool FlatListScriptClass::compare(Object *obj1, Object *obj2)
+{
+    FlatNodeObjectData *data1 = static_cast<FlatNodeObjectData*>(obj1);
+    FlatNodeObjectData *data2 = static_cast<FlatNodeObjectData*>(obj2);
+
+    if (!data1->nodeData || !data2->nodeData)
+        return false;
+
+    return data1->nodeData->index == data2->nodeData->index;
+}
+
+
+
 NestedListModel::NestedListModel(QDeclarativeListModel *base)
     : _root(0), m_ownsRoot(false), m_listModel(base), _rolesOk(false)
 {
@@ -1133,11 +1301,12 @@ void NestedListModel::remove(int index)
 bool NestedListModel::insert(int index, const QScriptValue& valuemap)
 {
     if (!_root) {
-        _root = new ModelNode;
+        _root = new ModelNode(this);
         m_ownsRoot = true;
     }
 
-    ModelNode *mn = new ModelNode;
+    ModelNode *mn = new ModelNode(this);
+    mn->listIndex = index;
     mn->setObjectValue(valuemap);
     _root->values.insert(index,qVariantFromValue(mn));
     return true;
@@ -1153,12 +1322,11 @@ void NestedListModel::move(int from, int to, int n)
 bool NestedListModel::append(const QScriptValue& valuemap)
 {
     if (!_root) {
-        _root = new ModelNode;
+        _root = new ModelNode(this);
         m_ownsRoot = true;
     }
-    ModelNode *mn = new ModelNode;
-    mn->setObjectValue(valuemap);
-    _root->values << qVariantFromValue(mn);
+
+    insert(count(), valuemap);
     return true;
 }
 
@@ -1253,8 +1421,8 @@ QString NestedListModel::toString(int role) const
 }
 
 
-ModelNode::ModelNode()
-: modelCache(0), objectCache(0), isArray(false)
+ModelNode::ModelNode(NestedListModel *model)
+: modelCache(0), objectCache(0), isArray(false), m_model(model), listIndex(-1)
 {
 }
 
@@ -1278,18 +1446,18 @@ void ModelNode::clear()
     properties.clear();
 }
 
-void ModelNode::setObjectValue(const QScriptValue& valuemap) {
+void ModelNode::setObjectValue(const QScriptValue& valuemap, bool writeToCache) {
     QScriptValueIterator it(valuemap);
     while (it.hasNext()) {
         it.next();
-        ModelNode *value = new ModelNode;
+        ModelNode *value = new ModelNode(m_model);
         QScriptValue v = it.value();
         if (v.isArray()) {
             value->isArray = true;
             value->setListValue(v);
         } else {
             value->values << v.toVariant();
-            if (objectCache)
+            if (writeToCache && objectCache)
                 objectCache->setValue(it.name().toUtf8(), value->values.last());
         }
         if (properties.contains(it.name()))
@@ -1302,14 +1470,16 @@ void ModelNode::setListValue(const QScriptValue& valuelist) {
     values.clear();
     int size = valuelist.property(QLatin1String("length")).toInt32();
     for (int i=0; i<size; i++) {
-        ModelNode *value = new ModelNode;
+        ModelNode *value = new ModelNode(m_model);
         QScriptValue v = valuelist.property(i);
         if (v.isArray()) {
             value->isArray = true;
             value->setListValue(v);
         } else if (v.isObject()) {
+            value->listIndex = i;
             value->setObjectValue(v);
         } else {
+            value->listIndex = i;
             value->values << v.toVariant();
         }
         values.append(qVariantFromValue(value));
@@ -1321,7 +1491,7 @@ void ModelNode::setProperty(const QString& prop, const QVariant& val) {
     if (it != properties.end()) {
         (*it)->values[0] = val;
     } else {
-        ModelNode *n = new ModelNode;
+        ModelNode *n = new ModelNode(m_model);
         n->values << val;
         properties.insert(prop,n);
     }
@@ -1329,6 +1499,40 @@ void ModelNode::setProperty(const QString& prop, const QVariant& val) {
         objectCache->setValue(prop.toUtf8(), val);
 }
 
+void ModelNode::updateListIndexes()
+{
+    for (QHash<QString, ModelNode *>::ConstIterator iter = properties.begin(); iter != properties.end(); ++iter) {
+        ModelNode *node = iter.value();
+        if (node->isArray) {
+            for (int i=0; i<node->values.count(); ++i) {
+                ModelNode *subNode = qvariant_cast<ModelNode *>(node->values.at(i));
+                if (subNode)
+                    subNode->listIndex = i;
+            }
+        }
+        node->updateListIndexes();
+    }
+}
+
+/*
+    Need to call this to emit itemsChanged() for modifications outside of set()
+    and setProperty(), i.e. if an item returned from get() is modified
+*/
+void ModelNode::changedProperty(const QString &name) const
+{
+    if (listIndex < 0)
+        return;
+
+    m_model->checkRoles();
+    QList<int> roles;
+    int role = m_model->roleStrings.indexOf(name);
+    if (role < 0)
+        roles = m_model->roles();
+    else
+        roles << role;
+    emit m_model->m_listModel->itemsChanged(listIndex, 1, roles);
+}
+
 void ModelNode::dump(ModelNode *node, int ind)
 {
     QByteArray indentBa(ind * 4, ' ');
@@ -1350,16 +1554,47 @@ void ModelNode::dump(ModelNode *node, int ind)
     }
 }
 
-ModelObject::ModelObject()
-: _mo(new QDeclarativeOpenMetaObject(this))
+ModelObject::ModelObject(ModelNode *node, NestedListModel *model, QScriptEngine *seng)
+    : m_model(model),
+      m_node(node),
+      m_meta(new ModelNodeMetaObject(seng, this))
 {
 }
 
 void ModelObject::setValue(const QByteArray &name, const QVariant &val)
 {
-    _mo->setValue(name, val);
+    m_meta->setValue(name, val);
     setProperty(name.constData(), val);
 }
 
+void ModelObject::setNodeUpdatesEnabled(bool enable)
+{
+    m_meta->m_enabled = enable;
+}
+
+
+ModelNodeMetaObject::ModelNodeMetaObject(QScriptEngine *seng, ModelObject *object)
+    : QDeclarativeOpenMetaObject(object),
+      m_enabled(false),
+      m_seng(seng),
+      m_obj(object)
+{
+}
+
+void ModelNodeMetaObject::propertyWritten(int index)
+{
+    if (!m_enabled)
+        return;
+
+    QString propName = QString::fromUtf8(name(index));
+    QVariant value = operator[](index);
+
+    QScriptValue sv = m_seng->newObject();
+    sv.setProperty(propName, m_seng->newVariant(value));
+    m_obj->m_node->setObjectValue(sv, false);
+
+    m_obj->m_node->changedProperty(propName);
+}
+
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index 0a5e3ff..fe42ef6 100644
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -63,6 +63,7 @@ class FlatListModel;
 class NestedListModel;
 class QDeclarativeListModelWorkerAgent;
 struct ModelNode;
+class FlatListScriptClass;
 class Q_DECLARATIVE_EXPORT QDeclarativeListModel : public QListModelInterface
 {
     Q_OBJECT
@@ -96,15 +97,18 @@ Q_SIGNALS:
 private:
     friend class QDeclarativeListModelParser;
     friend class QDeclarativeListModelWorkerAgent;
+    friend class FlatListModel;
+    friend class FlatListScriptClass;
     friend struct ModelNode;
 
     // Constructs a flat list model for a worker agent
     QDeclarativeListModel(const QDeclarativeListModel *orig, QDeclarativeListModelWorkerAgent *parent);
 
-    QDeclarativeListModel(bool workerCopy, QObject *parent=0);
     bool flatten();
     bool inWorkerThread() const;
 
+    inline bool canMove(int from, int to, int n) const { return !(from+n > count() || to+n > count() || from < 0 || to < 0 || n < 0); }
+
     QDeclarativeListModelWorkerAgent *m_agent;
     NestedListModel *m_nested;
     FlatListModel *m_flat;
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index 1e9513e..acf4f3e 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -54,9 +54,11 @@
 //
 
 #include "private/qdeclarativelistmodel_p.h"
-
-#include "qdeclarative.h"
 #include "private/qdeclarativeengine_p.h"
+#include "private/qdeclarativeopenmetaobject_p.h"
+#include "qdeclarative.h"
+
+#include <private/qscriptdeclarativeclass_p.h>
 
 QT_BEGIN_HEADER
 
@@ -68,6 +70,8 @@ class QDeclarativeOpenMetaObject;
 class QScriptEngine;
 class QDeclarativeListModelWorkerAgent;
 struct ModelNode;
+class FlatListScriptClass;
+class FlatNodeData;
 
 class FlatListModel
 {
@@ -94,8 +98,13 @@ public:
 private:    
     friend class QDeclarativeListModelWorkerAgent;
     friend class QDeclarativeListModel;
+    friend class FlatListScriptClass;
+    friend class FlatNodeData;
 
     bool addValue(const QScriptValue &value, QHash<int, QVariant> *row, QList<int> *roles);
+    void insertedNode(int index);
+    void removedNode(int index);
+    void moveNodes(int from, int to, int n);
 
     QScriptEngine *m_scriptEngine;
     QHash<int, QString> m_roles;
@@ -103,9 +112,68 @@ private:
     QList<QHash<int, QVariant> > m_values;
     QDeclarativeListModel *m_listModel;
 
+    FlatListScriptClass *m_scriptClass;
+    QList<FlatNodeData *> m_nodeData;
     QDeclarativeListModelWorkerAgent *m_parentAgent;
 };
 
+
+/*
+    Created when get() is called on a FlatListModel. This allows changes to the
+    object returned by get() to be tracked, and passed onto the model.
+*/
+class FlatListScriptClass : public QScriptDeclarativeClass
+{
+public:
+    FlatListScriptClass(FlatListModel *model, QScriptEngine *seng);
+
+    Value property(Object *, const Identifier &);
+    void setProperty(Object *, const Identifier &name, const QScriptValue &);
+    QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, QScriptClass::QueryFlags flags);
+    bool compare(Object *, Object *);
+
+private:
+    FlatListModel *m_model;
+};
+
+/*
+    FlatNodeData and FlatNodeObjectData allow objects returned by get() to still
+    point to the correct list index if move(), insert() or remove() are called.
+*/
+struct FlatNodeObjectData;
+class FlatNodeData
+{
+public:
+    FlatNodeData(int i)
+        : index(i) {}
+
+    ~FlatNodeData();
+
+    void addData(FlatNodeObjectData *data);
+    void removeData(FlatNodeObjectData *data);
+
+    int index;
+
+private:
+    QSet<FlatNodeObjectData*> objects;
+};
+
+struct FlatNodeObjectData : public QScriptDeclarativeClass::Object
+{
+    FlatNodeObjectData(FlatNodeData *data) : nodeData(data) {
+        nodeData->addData(this);
+    }
+
+    ~FlatNodeObjectData() {
+        if (nodeData)
+            nodeData->removeData(this);
+    }
+
+    FlatNodeData *nodeData;
+};
+
+
+
 class NestedListModel
 {
 public:
@@ -136,25 +204,50 @@ public:
     QDeclarativeListModel *m_listModel;
 
 private:
+    friend struct ModelNode;
     mutable QStringList roleStrings;
     mutable bool _rolesOk;
 };
 
 
+class ModelNodeMetaObject;
 class ModelObject : public QObject
 {
     Q_OBJECT
 public:
-    ModelObject();
+    ModelObject(ModelNode *node, NestedListModel *model, QScriptEngine *seng);
     void setValue(const QByteArray &name, const QVariant &val);
+    void setNodeUpdatesEnabled(bool enable);
+
+    NestedListModel *m_model;
+    ModelNode *m_node;
 
 private:
-    QDeclarativeOpenMetaObject *_mo;
+    ModelNodeMetaObject *m_meta;
 };
 
+class ModelNodeMetaObject : public QDeclarativeOpenMetaObject
+{
+public:
+    ModelNodeMetaObject(QScriptEngine *seng, ModelObject *object);
+
+    bool m_enabled;
+
+protected:
+    void propertyWritten(int index);
+
+private:
+    QScriptEngine *m_seng;
+    ModelObject *m_obj;
+};
+
+
+/*
+    A ModelNode is created for each item in a NestedListModel.
+*/
 struct ModelNode
 {
-    ModelNode();
+    ModelNode(NestedListModel *model);
     ~ModelNode();
 
     QList<QVariant> values;
@@ -167,30 +260,44 @@ struct ModelNode
             modelCache = new QDeclarativeListModel;
             QDeclarativeEngine::setContextForObject(modelCache,QDeclarativeEngine::contextForObject(model->m_listModel));
             modelCache->m_nested->_root = this;  // ListModel defaults to nestable model
+
+            for (int i=0; i<values.count(); ++i) {
+                ModelNode *subNode = qvariant_cast<ModelNode *>(values.at(i));
+                if (subNode)
+                    subNode->m_model = modelCache->m_nested;
+            }
         }
         return modelCache;
     }
 
     ModelObject *object(const NestedListModel *model) {
         if (!objectCache) {
-            objectCache = new ModelObject();
+            objectCache = new ModelObject(this, 
+                    const_cast<NestedListModel*>(model), 
+                    QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(model->m_listModel)));
             QHash<QString, ModelNode *>::iterator it;
             for (it = properties.begin(); it != properties.end(); ++it) {
                 objectCache->setValue(it.key().toUtf8(), model->valueForNode(*it));
             }
+            objectCache->setNodeUpdatesEnabled(true);
         }
         return objectCache;
     }
 
 
-    void setObjectValue(const QScriptValue& valuemap);
+    void setObjectValue(const QScriptValue& valuemap, bool writeToCache = true);
     void setListValue(const QScriptValue& valuelist);
     void setProperty(const QString& prop, const QVariant& val);
+    void changedProperty(const QString &name) const;
+    void updateListIndexes();
     static void dump(ModelNode *node, int ind);
 
     QDeclarativeListModel *modelCache;
     ModelObject *objectCache;
     bool isArray;
+
+    NestedListModel *m_model;
+    int listIndex;  // only used for top-level nodes within a list
 };
 
 
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
index 658584e..6804d4a 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
@@ -86,7 +86,7 @@ QDeclarativeListModelWorkerAgent::QDeclarativeListModelWorkerAgent(QDeclarativeL
     : m_engine(0), 
       m_ref(1), 
       m_orig(model), 
-      m_copy(new QDeclarativeListModel(m_orig, this))
+      m_copy(new QDeclarativeListModel(model, this))
 {
 }
 
@@ -194,6 +194,11 @@ void QDeclarativeListModelWorkerAgent::sync()
     mutex.unlock();
 }
 
+void QDeclarativeListModelWorkerAgent::changedData(int index, int count)
+{
+    data.changedChange(index, count);
+}
+
 bool QDeclarativeListModelWorkerAgent::event(QEvent *e)
 {
     if (e->type() == QEvent::User) {
@@ -216,6 +221,24 @@ bool QDeclarativeListModelWorkerAgent::event(QEvent *e)
             orig->m_strings = copy->m_strings;
             orig->m_values = copy->m_values;
 
+            // update the orig->m_nodeData list
+            for (int ii = 0; ii < changes.count(); ++ii) {
+                const Change &change = changes.at(ii);
+                switch (change.type) {
+                case Change::Inserted:
+                    orig->insertedNode(change.index);
+                    break;
+                case Change::Removed:
+                    orig->removedNode(change.index);
+                    break;
+                case Change::Moved:
+                    orig->moveNodes(change.index, change.to, change.count);
+                    break;
+                case Change::Changed:
+                    break;
+                }
+            }
+
             syncDone.wakeAll();
             locker.unlock();
 
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index 01da374..10c3bca 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -67,6 +67,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeListModel;
+class FlatListScriptClass;
 
 class QDeclarativeListModelWorkerAgent : public QObject
 {
@@ -115,6 +116,7 @@ protected:
 
 private:
     friend class QDeclarativeWorkerScriptEnginePrivate;
+    friend class FlatListScriptClass;
     QScriptEngine *m_engine;
 
     struct Change {
@@ -141,6 +143,8 @@ private:
         QDeclarativeListModel *list;
     };
 
+    void changedData(int index, int count);
+
     QAtomicInt m_ref;
     QDeclarativeListModel *m_orig;
     QDeclarativeListModel *m_copy;
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 10805b4..70ec416 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -49,6 +49,7 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qtranslator.h>
+#include <QSignalSpy>
 
 #include "../../../shared/util.h"
 
@@ -57,6 +58,8 @@
 #define SRCDIR "."
 #endif
 
+Q_DECLARE_METATYPE(QList<int>)
+
 class tst_qdeclarativelistmodel : public QObject
 {
     Q_OBJECT
@@ -64,6 +67,7 @@ public:
     tst_qdeclarativelistmodel() {}
 
 private:
+    int roleFromName(const QDeclarativeListModel *model, const QString &roleName);
     QScriptValue nestedListValue(QScriptEngine *eng) const;
     QDeclarativeItem *createWorkerTest(QDeclarativeEngine *eng, QDeclarativeComponent *component, QDeclarativeListModel *model);
     void waitForWorker(QDeclarativeItem *item);
@@ -78,6 +82,8 @@ private slots:
     void dynamic();
     void dynamic_worker_data();
     void dynamic_worker();
+    void dynamic_worker_sync_data();
+    void dynamic_worker_sync();
     void convertNestedToFlat_fail();
     void convertNestedToFlat_fail_data();
     void convertNestedToFlat_ok();
@@ -86,7 +92,23 @@ private slots:
     void error_data();
     void error();
     void set();
+    void get();
+    void get_data();
+    void get_worker();
+    void get_worker_data();
+    void get_nested();
+    void get_nested_data();
 };
+int tst_qdeclarativelistmodel::roleFromName(const QDeclarativeListModel *model, const QString &roleName)
+{
+    QList<int> roles = model->roles();
+    for (int i=0; i<roles.count(); i++) {
+        if (model->toString(roles[i]) == roleName)
+            return roles[i];
+    }
+    Q_ASSERT(false);
+    return -1;
+}
 
 QScriptValue tst_qdeclarativelistmodel::nestedListValue(QScriptEngine *eng) const
 {
@@ -196,6 +218,10 @@ void tst_qdeclarativelistmodel::dynamic_data()
     QTest::newRow("get1") << "{get(0) === undefined}" << 1 << "";
     QTest::newRow("get2") << "{get(-1) === undefined}" << 1 << "";
     QTest::newRow("get3") << "{append({'foo':123});get(0) != undefined}" << 1 << "";
+    QTest::newRow("get4") << "{append({'foo':123});get(0).foo}" << 123 << "";
+
+    QTest::newRow("get-modify1") << "{append({'foo':123,'bar':456});get(0).foo = 333;get(0).foo}" << 333 << "";
+    QTest::newRow("get-modify2") << "{append({'z':1});append({'foo':123,'bar':456});get(1).bar = 999;get(1).bar}" << 999 << "";
 
     QTest::newRow("append1") << "{append({'foo':123});count}" << 1 << "";
     QTest::newRow("append2") << "{append({'foo':123,'bar':456});count}" << 1 << "";
@@ -310,8 +336,12 @@ void tst_qdeclarativelistmodel::dynamic_worker()
     QFETCH(int, result);
     QFETCH(QString, warning);
 
+    if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
+        return;
+
     // This is same as dynamic() except it applies the test to a ListModel called 
-    // from a WorkerScript (i.e. testing the internal NestedListModel class)
+    // from a WorkerScript (i.e. testing the internal FlatListModel that is created
+    // by the WorkerListModelAgent)
 
     QDeclarativeListModel model;
     QDeclarativeEngine eng;
@@ -330,27 +360,62 @@ void tst_qdeclarativelistmodel::dynamic_worker()
     if (!warning.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
 
-    if (operations.count() == 1) {
-        // test count(), get() return the correct default values in the worker list model
-        QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker",
-                Q_ARG(QVariant, operations)));
-        waitForWorker(item);
-        QCOMPARE(QDeclarativeProperty(item, "result").read().toInt(), result);
-    } else {
-        // execute a set of commands on the worker list model, then check the
-        // changes are reflected in the list model in the main thread
-        if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
-            QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: Cannot add nested list values when modifying or after modification from a worker script");
-
-        QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", 
-                Q_ARG(QVariant, operations.mid(0, operations.length()-1))));
-        waitForWorker(item);
-
-        QDeclarativeExpression e(eng.rootContext(), &model, operations.last().toString());
-        if (!QByteArray(QTest::currentDataTag()).startsWith("nested"))
-            QCOMPARE(e.evaluate().toInt(), result);
+    QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker",
+            Q_ARG(QVariant, operations)));
+    waitForWorker(item);
+    QCOMPARE(QDeclarativeProperty(item, "result").read().toInt(), result);
+
+    delete item;
+    qApp->processEvents();
+}
+
+
+
+void tst_qdeclarativelistmodel::dynamic_worker_sync_data()
+{
+    dynamic_data();
+}
+
+void tst_qdeclarativelistmodel::dynamic_worker_sync()
+{
+    QFETCH(QString, script);
+    QFETCH(int, result);
+    QFETCH(QString, warning);
+
+    // This is the same as dynamic_worker() except that it executes a set of list operations
+    // from the worker script, calls sync(), and tests the changes are reflected in the
+    // list in the main thread
+    
+    QDeclarativeListModel model;
+    QDeclarativeEngine eng;
+    QDeclarativeComponent component(&eng, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeItem *item = createWorkerTest(&eng, &component, &model);
+    QVERIFY(item != 0);
+
+    if (script[0] == QLatin1Char('{') && script[script.length()-1] == QLatin1Char('}'))
+        script = script.mid(1, script.length() - 2);
+    QVariantList operations;
+    foreach (const QString &s, script.split(';')) {
+        if (!s.isEmpty())
+            operations << s;
     }
 
+    if (!warning.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
+
+    // execute a set of commands on the worker list model, then check the
+    // changes are reflected in the list model in the main thread
+    if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: Cannot add nested list values when modifying or after modification from a worker script");
+
+    QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", 
+            Q_ARG(QVariant, operations.mid(0, operations.length()-1))));
+    waitForWorker(item);
+
+    QDeclarativeExpression e(eng.rootContext(), &model, operations.last().toString());
+    if (!QByteArray(QTest::currentDataTag()).startsWith("nested"))
+        QCOMPARE(e.evaluate().toInt(), result);
+
     delete item;
     qApp->processEvents();
 }
@@ -595,6 +660,9 @@ void tst_qdeclarativelistmodel::error()
     }
 }
 
+/*
+    Test model changes from set() are available to the view
+*/
 void tst_qdeclarativelistmodel::set()
 {
     QDeclarativeEngine engine;
@@ -618,6 +686,205 @@ void tst_qdeclarativelistmodel::set()
     QCOMPARE(model.data(0, model.roles()[0]), qVariantFromValue(false)); 
 }
 
+/*
+    Test model changes on values returned by get() are available to the view
+*/
+void tst_qdeclarativelistmodel::get()
+{
+    QFETCH(QString, expression);
+    QFETCH(int, index);
+    QFETCH(QString, roleName);
+    QFETCH(QVariant, roleValue);
+
+    QDeclarativeEngine eng;
+    QDeclarativeComponent component(&eng);
+    component.setData(
+        "import Qt 4.7\n"
+        "ListModel { \n"
+            "ListElement { roleA: 100 }\n"
+            "ListElement { roleA: 200; roleB: 400 } \n"
+            "ListElement { roleA: 200; roleB: 400 } \n"
+         "}", QUrl());
+    QDeclarativeListModel *model = qobject_cast<QDeclarativeListModel*>(component.create());
+    int role = roleFromName(model, roleName);
+
+    QSignalSpy spy(model, SIGNAL(itemsChanged(int, int, QList<int>)));
+    QDeclarativeExpression expr(eng.rootContext(), model, expression);
+    expr.evaluate();
+    QVERIFY(!expr.hasError());
+
+    QCOMPARE(model->data(index, role), roleValue);
+    QCOMPARE(spy.count(), 1);
+
+    QList<QVariant> spyResult = spy.takeFirst();
+    QCOMPARE(spyResult.at(0).toInt(), index);
+    QCOMPARE(spyResult.at(1).toInt(), 1);  // only 1 item is modified at a time
+    QCOMPARE(spyResult.at(2).value<QList<int> >(), (QList<int>() << role));
+}
+
+void tst_qdeclarativelistmodel::get_data()
+{
+    QTest::addColumn<QString>("expression");
+    QTest::addColumn<int>("index");
+    QTest::addColumn<QString>("roleName");
+    QTest::addColumn<QVariant>("roleValue");
+
+    QTest::newRow("simple value") << "get(0).roleA = 500" << 0 << "roleA" << QVariant(500); 
+    QTest::newRow("simple value 2") << "get(1).roleB = 500" << 1 << "roleB" << QVariant(500); 
+
+    QVariantMap map;
+    map["zzz"] = 123;
+    QTest::newRow("object value") << "get(1).roleB = {'zzz':123}" << 1 << "roleB" << QVariant::fromValue(map);
+
+    QVariantList list;
+    map.clear(); map["a"] = 50; map["b"] = 500;
+    list << map;
+    map.clear(); map["c"] = 1000;
+    list << map;
+    QTest::newRow("list of objects") << "get(2).roleB = [{'a': 50, 'b': 500}, {'c': 1000}]" << 2 << "roleB" << QVariant::fromValue(list);
+}
+
+void tst_qdeclarativelistmodel::get_worker()
+{
+    QFETCH(QString, expression);
+    QFETCH(int, index);
+    QFETCH(QString, roleName);
+    QFETCH(QVariant, roleValue);
+
+    QDeclarativeListModel model;
+    QDeclarativeEngine eng;
+    QDeclarativeComponent component(&eng, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeItem *item = createWorkerTest(&eng, &component, &model);
+    QVERIFY(item != 0);
+    QScriptEngine *seng = QDeclarativeEnginePrivate::getScriptEngine(&eng);
+
+    // Add some values like get() test
+    QScriptValue sv = seng->newObject();
+    sv.setProperty(QLatin1String("roleA"), seng->newVariant(QVariant::fromValue(100)));
+    model.append(sv);
+    sv = seng->newObject();
+    sv.setProperty(QLatin1String("roleA"), seng->newVariant(QVariant::fromValue(200)));
+    sv.setProperty(QLatin1String("roleB"), seng->newVariant(QVariant::fromValue(400)));
+    model.append(sv);
+    model.append(sv);
+    int role = roleFromName(&model, roleName);
+
+    const char *warning = "<Unknown File>: QML ListModel: Cannot add nested list values when modifying or after modification from a worker script";
+    if (roleValue.type() == QVariant::List || roleValue.type() == QVariant::Map)
+        QTest::ignoreMessage(QtWarningMsg, warning);
+    QSignalSpy spy(&model, SIGNAL(itemsChanged(int, int, QList<int>)));
+
+    // in the worker thread, change the model data and call sync()
+    QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker",
+            Q_ARG(QVariant, QStringList(expression))));
+    waitForWorker(item);
+
+    // see if we receive the model changes in the main thread's model
+    if (roleValue.type() == QVariant::List || roleValue.type() == QVariant::Map) {
+        QVERIFY(model.data(index, role) != roleValue);
+        QCOMPARE(spy.count(), 0);
+    } else {
+        QCOMPARE(model.data(index, role), roleValue);
+        QCOMPARE(spy.count(), 1);
+
+        QList<QVariant> spyResult = spy.takeFirst();
+        QCOMPARE(spyResult.at(0).toInt(), index);
+        QCOMPARE(spyResult.at(1).toInt(), 1);  // only 1 item is modified at a time
+        QVERIFY(spyResult.at(2).value<QList<int> >().contains(role));
+    }
+}
+
+void tst_qdeclarativelistmodel::get_worker_data()
+{
+    get_data();
+}
+
+/*
+    Test that the tests run in get() also work for nested list data
+*/
+void tst_qdeclarativelistmodel::get_nested()
+{
+    QFETCH(QString, expression);
+    QFETCH(int, index);
+    QFETCH(QString, roleName);
+    QFETCH(QVariant, roleValue);
+
+    QDeclarativeEngine eng;
+    QDeclarativeComponent component(&eng);
+    component.setData(
+        "import Qt 4.7\n"
+        "ListModel { \n"
+            "ListElement {\n"
+                "listRoleA: [\n"
+                    "ListElement { roleA: 100 },\n"
+                    "ListElement { roleA: 200; roleB: 400 },\n"
+                    "ListElement { roleA: 200; roleB: 400 } \n"
+                "]\n"
+            "}\n"
+            "ListElement {\n"
+                "listRoleA: [\n"
+                    "ListElement { roleA: 100 },\n"
+                    "ListElement { roleA: 200; roleB: 400 },\n"
+                    "ListElement { roleA: 200; roleB: 400 } \n"
+                "]\n"
+                "listRoleB: [\n"
+                    "ListElement { roleA: 100 },\n"
+                    "ListElement { roleA: 200; roleB: 400 },\n"
+                    "ListElement { roleA: 200; roleB: 400 } \n"
+                "]\n"
+                "listRoleC: [\n"
+                    "ListElement { roleA: 100 },\n"
+                    "ListElement { roleA: 200; roleB: 400 },\n"
+                    "ListElement { roleA: 200; roleB: 400 } \n"
+                "]\n"
+            "}\n"
+         "}", QUrl());
+    QDeclarativeListModel *model = qobject_cast<QDeclarativeListModel*>(component.create());
+    QVERIFY(component.errorString().isEmpty());
+    QDeclarativeListModel *childModel;
+
+    // Test setting the inner list data for:
+    //  get(0).listRoleA
+    //  get(1).listRoleA
+    //  get(1).listRoleB
+    //  get(1).listRoleC
+
+    QList<QPair<int, QString> > testData;
+    testData << qMakePair(0, QString("listRoleA"));
+    testData << qMakePair(1, QString("listRoleA"));
+    testData << qMakePair(1, QString("listRoleB"));
+    testData << qMakePair(1, QString("listRoleC"));
+
+    for (int i=0; i<testData.count(); i++) {
+        int outerListIndex = testData[i].first;
+        QString outerListRoleName = testData[i].second;
+        int outerListRole = roleFromName(model, outerListRoleName);
+
+        childModel = qobject_cast<QDeclarativeListModel*>(model->data(outerListIndex, outerListRole).value<QObject*>());
+        QVERIFY(childModel);
+
+        QString extendedExpression = QString("get(%1).%2.%3").arg(outerListIndex).arg(outerListRoleName).arg(expression);
+        QDeclarativeExpression expr(eng.rootContext(), model, extendedExpression);
+
+        QSignalSpy spy(childModel, SIGNAL(itemsChanged(int, int, QList<int>)));
+        expr.evaluate();
+        QVERIFY(!expr.hasError());
+
+        int role = roleFromName(childModel, roleName);
+        QCOMPARE(childModel->data(index, role), roleValue);
+        QCOMPARE(spy.count(), 1);
+
+        QList<QVariant> spyResult = spy.takeFirst();
+        QCOMPARE(spyResult.at(0).toInt(), index);
+        QCOMPARE(spyResult.at(1).toInt(), 1);  // only 1 item is modified at a time
+        QCOMPARE(spyResult.at(2).value<QList<int> >(), (QList<int>() << role));
+    }
+}
+
+void tst_qdeclarativelistmodel::get_nested_data()
+{
+    get_data();
+}
 
 QTEST_MAIN(tst_qdeclarativelistmodel)
 
-- 
cgit v0.12


From b811afd001fb89d7815c7167bea7f7814348931f Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 17 Sep 2010 15:33:22 +1000
Subject: Improve error messages (cherry picked from commit
 af29c555a29ebcdb1d962176912478212c9c7e65)

---
 src/declarative/util/qdeclarativelistmodel.cpp                    | 6 +++---
 .../qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp           | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 68e97b0..2d8b946 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -292,7 +292,7 @@ QDeclarativeListModelWorkerAgent *QDeclarativeListModel::agent()
         return m_agent;
 
     if (!flatten()) {
-        qmlInfo(this) << "List contains nested list values and cannot be used from a worker script";
+        qmlInfo(this) << "List contains list-type data and cannot be used from a worker script";
         return 0;
     }
 
@@ -1023,7 +1023,7 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *ro
         it.next();
         QScriptValue value = it.value();
         if (!value.isVariant() && !value.isRegExp() && !value.isDate() && value.isObject()) {
-            qmlInfo(m_listModel) << "Cannot add nested list values when modifying or after modification from a worker script";
+            qmlInfo(m_listModel) << "Cannot add list-type data when modifying or after modification from a worker script";
             return false;
         }
 
@@ -1129,7 +1129,7 @@ QScriptDeclarativeClass::Value FlatListScriptClass::property(Object *obj, const
 void FlatListScriptClass::setProperty(Object *obj, const Identifier &name, const QScriptValue &value)
 {
     if (!value.isVariant() && !value.isRegExp() && !value.isDate() && value.isObject()) {
-        qmlInfo(m_model->m_listModel) << "Cannot add nested list values when modifying or after modification from a worker script";
+        qmlInfo(m_model->m_listModel) << "Cannot add list-type data when modifying or after modification from a worker script";
         return;
     }
 
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 70ec416..f456778 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -406,7 +406,7 @@ void tst_qdeclarativelistmodel::dynamic_worker_sync()
     // execute a set of commands on the worker list model, then check the
     // changes are reflected in the list model in the main thread
     if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: Cannot add nested list values when modifying or after modification from a worker script");
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: Cannot add list-type data when modifying or after modification from a worker script");
 
     QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", 
             Q_ARG(QVariant, operations.mid(0, operations.length()-1))));
@@ -439,7 +439,7 @@ void tst_qdeclarativelistmodel::convertNestedToFlat_fail()
     model.append(nestedListValue(&s_eng));
     QCOMPARE(model.count(), 2);
 
-    QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: List contains nested list values and cannot be used from a worker script");
+    QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: List contains list-type data and cannot be used from a worker script");
     QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", Q_ARG(QVariant, script)));
     waitForWorker(item);
 
@@ -491,7 +491,7 @@ void tst_qdeclarativelistmodel::convertNestedToFlat_ok()
     QCOMPARE(model.count(), count+1);
 
     QScriptValue nested = nestedListValue(&s_eng);
-    const char *warning = "<Unknown File>: QML ListModel: Cannot add nested list values when modifying or after modification from a worker script";
+    const char *warning = "<Unknown File>: QML ListModel: Cannot add list-type data when modifying or after modification from a worker script";
 
     QTest::ignoreMessage(QtWarningMsg, warning);
     model.append(nested);
@@ -769,7 +769,7 @@ void tst_qdeclarativelistmodel::get_worker()
     model.append(sv);
     int role = roleFromName(&model, roleName);
 
-    const char *warning = "<Unknown File>: QML ListModel: Cannot add nested list values when modifying or after modification from a worker script";
+    const char *warning = "<Unknown File>: QML ListModel: Cannot add list-type data when modifying or after modification from a worker script";
     if (roleValue.type() == QVariant::List || roleValue.type() == QVariant::Map)
         QTest::ignoreMessage(QtWarningMsg, warning);
     QSignalSpy spy(&model, SIGNAL(itemsChanged(int, int, QList<int>)));
-- 
cgit v0.12


From e3a5505b05b257c8cf54278f4a226ce967c9ce88 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 20 Sep 2010 10:45:13 +1000
Subject: Make build on Symbian (cherry picked from commit
 68281ec913e2a69682f00bf22c291b15ea4ce542)

---
 src/declarative/util/qdeclarativelistmodel.cpp   | 31 ++++++++++++++++++++++++
 src/declarative/util/qdeclarativelistmodel_p_p.h | 31 ++----------------------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 2d8b946..3263238 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -356,6 +356,37 @@ void QDeclarativeListModel::clear()
     }
 }
 
+QDeclarativeListModel *ModelNode::model(const NestedListModel *model)
+{
+    if (!modelCache) { 
+        modelCache = new QDeclarativeListModel;
+        QDeclarativeEngine::setContextForObject(modelCache,QDeclarativeEngine::contextForObject(model->m_listModel));
+        modelCache->m_nested->_root = this;  // ListModel defaults to nestable model
+
+        for (int i=0; i<values.count(); ++i) {
+            ModelNode *subNode = qvariant_cast<ModelNode *>(values.at(i));
+            if (subNode)
+                subNode->m_model = modelCache->m_nested;
+        }
+    }
+    return modelCache;
+}
+
+ModelObject *ModelNode::object(const NestedListModel *model)
+{
+    if (!objectCache) {
+        objectCache = new ModelObject(this, 
+                const_cast<NestedListModel*>(model), 
+                QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(model->m_listModel)));
+        QHash<QString, ModelNode *>::iterator it;
+        for (it = properties.begin(); it != properties.end(); ++it) {
+            objectCache->setValue(it.key().toUtf8(), model->valueForNode(*it));
+        }
+        objectCache->setNodeUpdatesEnabled(true);
+    }
+    return objectCache;
+}
+
 /*!
     \qmlmethod ListModel::remove(int index)
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index acf4f3e..d2d40ee 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -255,35 +255,8 @@ struct ModelNode
 
     void clear();
 
-    QDeclarativeListModel *model(const NestedListModel *model) {
-        if (!modelCache) { 
-            modelCache = new QDeclarativeListModel;
-            QDeclarativeEngine::setContextForObject(modelCache,QDeclarativeEngine::contextForObject(model->m_listModel));
-            modelCache->m_nested->_root = this;  // ListModel defaults to nestable model
-
-            for (int i=0; i<values.count(); ++i) {
-                ModelNode *subNode = qvariant_cast<ModelNode *>(values.at(i));
-                if (subNode)
-                    subNode->m_model = modelCache->m_nested;
-            }
-        }
-        return modelCache;
-    }
-
-    ModelObject *object(const NestedListModel *model) {
-        if (!objectCache) {
-            objectCache = new ModelObject(this, 
-                    const_cast<NestedListModel*>(model), 
-                    QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(model->m_listModel)));
-            QHash<QString, ModelNode *>::iterator it;
-            for (it = properties.begin(); it != properties.end(); ++it) {
-                objectCache->setValue(it.key().toUtf8(), model->valueForNode(*it));
-            }
-            objectCache->setNodeUpdatesEnabled(true);
-        }
-        return objectCache;
-    }
-
+    QDeclarativeListModel *model(const NestedListModel *model);
+    ModelObject *object(const NestedListModel *model);
 
     void setObjectValue(const QScriptValue& valuemap, bool writeToCache = true);
     void setListValue(const QScriptValue& valuelist);
-- 
cgit v0.12


From cac9110ce6e0b1e1825bf8a425bed61a9ac3cb39 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 21 Sep 2010 23:49:07 +1000
Subject: Bump version to 4.7.1.

Reviewed-by: Trust Me
(cherry picked from commit 63394650e71f23a036edbc0df29a1b6b19366269)
---
 src/corelib/global/qglobal.h                           | 4 ++--
 src/plugins/qpluginbase.pri                            | 2 +-
 src/qbase.pri                                          | 2 +-
 tests/auto/selftests/expected_cmptest.txt              | 2 +-
 tests/auto/selftests/expected_crashes_3.txt            | 2 +-
 tests/auto/selftests/expected_longstring.txt           | 2 +-
 tests/auto/selftests/expected_maxwarnings.txt          | 2 +-
 tests/auto/selftests/expected_skip.txt                 | 2 +-
 tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 +-
 tools/qdoc3/doc/files/qt.qdocconf                      | 8 ++++----
 tools/qdoc3/test/assistant.qdocconf                    | 4 ++--
 tools/qdoc3/test/designer.qdocconf                     | 4 ++--
 tools/qdoc3/test/linguist.qdocconf                     | 4 ++--
 tools/qdoc3/test/qdeclarative.qdocconf                 | 8 ++++----
 tools/qdoc3/test/qmake.qdocconf                        | 4 ++--
 tools/qdoc3/test/qt-build-docs.qdocconf                | 8 ++++----
 tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf          | 8 ++++----
 tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf          | 8 ++++----
 tools/qdoc3/test/qt.qdocconf                           | 8 ++++----
 tools/qdoc3/test/qt_ja_JP.qdocconf                     | 8 ++++----
 tools/qdoc3/test/qt_zh_CN.qdocconf                     | 8 ++++----
 21 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 8f27b03..c906a1c 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -44,11 +44,11 @@
 
 #include <stddef.h>
 
-#define QT_VERSION_STR   "4.7.0"
+#define QT_VERSION_STR   "4.7.1"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x040700
+#define QT_VERSION 0x040701
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
 */
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index 8b119b5..84009d8 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.7.0
+   VERSION=4.7.1
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/src/qbase.pri b/src/qbase.pri
index f6af22f..680693f 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat
 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
 TEMPLATE	= lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.7.0
+   VERSION=4.7.1
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt
index fd5b486..7f3aa9a 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/selftests/expected_cmptest.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Cmptest *********
-Config: Using QTest library 4.7.0, Qt 4.7.0
+Config: Using QTest library 4.7.1, Qt 4.7.1
 PASS   : tst_Cmptest::initTestCase()
 PASS   : tst_Cmptest::compare_boolfuncs()
 PASS   : tst_Cmptest::compare_pointerfuncs()
diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt
index 3aced25..7ded525 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/selftests/expected_crashes_3.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Crashes *********
-Config: Using QTest library 4.7.0, Qt 4.7.0
+Config: Using QTest library 4.7.1, Qt 4.7.1
 PASS   : tst_Crashes::initTestCase()
 QFATAL : tst_Crashes::crash() Received signal 11
 FAIL!  : tst_Crashes::crash() Received a fatal error.
diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt
index 1461bc6..9ad6f56 100644
--- a/tests/auto/selftests/expected_longstring.txt
+++ b/tests/auto/selftests/expected_longstring.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_LongString *********
-Config: Using QTest library 4.7.0, Qt 4.7.0
+Config: Using QTest library 4.7.1, Qt 4.7.1
 PASS   : tst_LongString::initTestCase()
 FAIL!  : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
 
diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt
index 908bd5d..949da13 100644
--- a/tests/auto/selftests/expected_maxwarnings.txt
+++ b/tests/auto/selftests/expected_maxwarnings.txt
@@ -1,5 +1,5 @@
 ********* Start testing of MaxWarnings *********
-Config: Using QTest library 4.7.0, Qt 4.7.0
+Config: Using QTest library 4.7.1, Qt 4.7.1
 PASS   : MaxWarnings::initTestCase()
 QWARN  : MaxWarnings::warn() 0
 QWARN  : MaxWarnings::warn() 1
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt
index e5bf1ff..1f5bf7b 100644
--- a/tests/auto/selftests/expected_skip.txt
+++ b/tests/auto/selftests/expected_skip.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Skip *********
-Config: Using QTest library 4.7.0, Qt 4.7.0
+Config: Using QTest library 4.7.1, Qt 4.7.1
 PASS   : tst_Skip::initTestCase()
 SKIP   : tst_Skip::test() skipping all
    Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)]
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf
index 3b4b5f8..26cdafb 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdocconf
+++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf
@@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
               "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
-              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.7.0</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.7.1</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/qdoc3/doc/files/qt.qdocconf b/tools/qdoc3/doc/files/qt.qdocconf
index 09c112a..4546c7a 100644
--- a/tools/qdoc3/doc/files/qt.qdocconf
+++ b/tools/qdoc3/doc/files/qt.qdocconf
@@ -22,7 +22,7 @@ edition.DesktopLight.groups       = -graphicsview-api
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.namespace           = com.trolltech.qt.471
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
@@ -36,9 +36,9 @@ qhp.Qt.extraFiles          = classic.css \
                              images/dynamiclayouts-example.png \
                              images/stylesheet-coffee-plastique.png
 
-qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes    = qt 4.7.1 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 836c4bf..74b68df 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Assistant
 
 qhp.Assistant.file                = assistant.qhp
-qhp.Assistant.namespace           = com.trolltech.assistant.470
+qhp.Assistant.namespace           = com.trolltech.assistant.471
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
 qhp.Assistant.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.Assistant.extraFiles          = images/bg_l.png \
 			     	    style/style_ie8.css \
 			     	    style/style.css
 
-qhp.Assistant.filterAttributes    = qt 4.7.0 tools assistant
+qhp.Assistant.filterAttributes    = qt 4.7.1 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
 qhp.Assistant.subprojects         = manual examples
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 9136619..ab66792 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Designer
 
 qhp.Designer.file                = designer.qhp
-qhp.Designer.namespace           = com.trolltech.designer.470
+qhp.Designer.namespace           = com.trolltech.designer.471
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
 qhp.Designer.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.Designer.extraFiles          = images/bg_l.png \
 									style/style_ie8.css \
                              	    style/style.css
 
-qhp.Designer.filterAttributes    = qt 4.7.0 tools designer
+qhp.Designer.filterAttributes    = qt 4.7.1 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
 qhp.Designer.subprojects         = manual examples
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 696802a..0d920e2 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Linguist
 
 qhp.Linguist.file                = linguist.qhp
-qhp.Linguist.namespace           = com.trolltech.linguist.470
+qhp.Linguist.namespace           = com.trolltech.linguist.471
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
 qhp.Linguist.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.Linguist.extraFiles          = images/bg_l.png \
 									style/style_ie8.css \
                              	    style/style.css
 
-qhp.Linguist.filterAttributes    = qt 4.7.0 tools linguist
+qhp.Linguist.filterAttributes    = qt 4.7.1 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
 qhp.Linguist.subprojects         = manual examples
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 45f48a6..9aaebcb 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -21,7 +21,7 @@ edition.DesktopLight.groups       = -graphicsview-api
 qhp.projects            = Qml
 
 qhp.Qml.file                = qml.qhp
-qhp.Qml.namespace           = com.trolltech.qml.470
+qhp.Qml.namespace           = com.trolltech.qml.471
 qhp.Qml.virtualFolder       = qdoc
 qhp.Qml.indexTitle          = Qml Reference
 
@@ -61,9 +61,9 @@ qhp.Qml.extraFiles            = images/bg_l.png \
                              style/style_ie8.css \
                              style/style.css
 
-qhp.Qml.filterAttributes    = qt 4.7.0 qtrefdoc
-qhp.Qml.customFilters.Qt.name = Qt 4.7.0
-qhp.Qml.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qml.filterAttributes    = qt 4.7.1 qtrefdoc
+qhp.Qml.customFilters.Qt.name = Qt 4.7.1
+qhp.Qml.customFilters.Qt.filterAttributes = qt 4.7.1
 qhp.Qml.subprojects         = classes
 qhp.Qml.subprojects.classes.title = Elements
 qhp.Qml.subprojects.classes.indexTitle = Qml Elements
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 8125166..be2e9d3 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = qmake
 
 qhp.qmake.file                = qmake.qhp
-qhp.qmake.namespace           = com.trolltech.qmake.470
+qhp.qmake.namespace           = com.trolltech.qmake.471
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.qmake.extraFiles          = images/bg_l.png \
                              style/style_ie8.css \
                              style/style.css
 
-qhp.qmake.filterAttributes    = qt 4.7.0 tools qmake
+qhp.qmake.filterAttributes    = qt 4.7.1 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
 qhp.qmake.subprojects         = manual
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 639585c..dcabeb4 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -15,7 +15,7 @@ naturallanguage         = en_US
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.namespace           = com.trolltech.qt.471
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
@@ -59,9 +59,9 @@ qhp.Qt.extraFiles          = index.html \
 
 
 
-qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes    = qt 4.7.1 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
index c24ddef..7e28fa2 100644
--- a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
@@ -17,15 +17,15 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.namespace           = com.trolltech.qt.471
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = Qt
 qhp.Qt.indexTitle          = Qt
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc ja_JP
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes    = qt 4.7.1 qtrefdoc ja_JP
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
 
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index a983faa..cfcc76d 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -17,15 +17,15 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.namespace           = com.trolltech.qt.471
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = 教程
 qhp.Qt.indexTitle          = 教程
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc zh_CN
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes    = qt 4.7.1 qtrefdoc zh_CN
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
 
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 215e0d6..ea97205 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -17,7 +17,7 @@ naturallanguage         = en_US
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.namespace           = com.trolltech.qt.471
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
@@ -59,9 +59,9 @@ qhp.Qt.extraFiles          = index.html \
                  style/style_ie8.css \
                  style/style.css
 
-qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes    = qt 4.7.1 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
diff --git a/tools/qdoc3/test/qt_ja_JP.qdocconf b/tools/qdoc3/test/qt_ja_JP.qdocconf
index f9ce142..32bba06 100644
--- a/tools/qdoc3/test/qt_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt_ja_JP.qdocconf
@@ -19,15 +19,15 @@ indexes                 = $QTDIR/doc/html/qt.index
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.namespace           = com.trolltech.qt.471
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = Qt
 qhp.Qt.indexTitle          = Qt
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc ja_JP
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes    = qt 4.7.1 qtrefdoc ja_JP
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
 
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index 5bf8171..40d3d5a 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -19,15 +19,15 @@ indexes                 = $QTDIR/doc/html/qt.index
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.namespace           = com.trolltech.qt.471
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = 教程
 qhp.Qt.indexTitle          = 教程
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc zh_CN
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes    = qt 4.7.1 qtrefdoc zh_CN
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
 
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
-- 
cgit v0.12


From c634f8db5872790e90205ef4f41153345b9606c2 Mon Sep 17 00:00:00 2001
From: aavit <qt-info@nokia.com>
Date: Tue, 21 Sep 2010 11:54:02 +0200
Subject: Avoid creating copy of an image in memory when storing as jpeg

Task-number: QT-3871
Reviewed-by: Kim
(cherry picked from commit 7efe816d028876487a6a44d97ed58a807da7d4d8)
---
 src/gui/image/qjpeghandler.cpp | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index e685694..b9eda05 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -515,29 +515,10 @@ inline my_jpeg_destination_mgr::my_jpeg_destination_mgr(QIODevice *device)
     free_in_buffer = max_buf;
 }
 
-static bool can_write_format(QImage::Format fmt)
-{
-    switch (fmt) {
-    case QImage::Format_Mono:
-    case QImage::Format_MonoLSB:
-    case QImage::Format_Indexed8:
-    case QImage::Format_RGB888:
-    case QImage::Format_RGB32:
-    case QImage::Format_ARGB32:
-    case QImage::Format_ARGB32_Premultiplied:
-        return true;
-        break;
-    default:
-        break;
-    }
-    return false;
-}
 
-static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int sourceQuality)
+static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQuality)
 {
     bool success = false;
-    const QImage image = can_write_format(sourceImage.format()) ?
-                         sourceImage : sourceImage.convertToFormat(QImage::Format_RGB888);
     const QVector<QRgb> cmap = image.colorTable();
 
     struct jpeg_compress_struct cinfo;
@@ -614,7 +595,7 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s
             case QImage::Format_Mono:
             case QImage::Format_MonoLSB:
                 if (gray) {
-                    const uchar* data = image.scanLine(cinfo.next_scanline);
+                    const uchar* data = image.constScanLine(cinfo.next_scanline);
                     if (image.format() == QImage::Format_MonoLSB) {
                         for (int i=0; i<w; i++) {
                             bool bit = !!(*(data + (i >> 3)) & (1 << (i & 7)));
@@ -627,7 +608,7 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s
                         }
                     }
                 } else {
-                    const uchar* data = image.scanLine(cinfo.next_scanline);
+                    const uchar* data = image.constScanLine(cinfo.next_scanline);
                     if (image.format() == QImage::Format_MonoLSB) {
                         for (int i=0; i<w; i++) {
                             bool bit = !!(*(data + (i >> 3)) & (1 << (i & 7)));
@@ -647,13 +628,13 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s
                 break;
             case QImage::Format_Indexed8:
                 if (gray) {
-                    const uchar* pix = image.scanLine(cinfo.next_scanline);
+                    const uchar* pix = image.constScanLine(cinfo.next_scanline);
                     for (int i=0; i<w; i++) {
                         *row = qRed(cmap[*pix]);
                         ++row; ++pix;
                     }
                 } else {
-                    const uchar* pix = image.scanLine(cinfo.next_scanline);
+                    const uchar* pix = image.constScanLine(cinfo.next_scanline);
                     for (int i=0; i<w; i++) {
                         *row++ = qRed(cmap[*pix]);
                         *row++ = qGreen(cmap[*pix]);
@@ -663,12 +644,12 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s
                 }
                 break;
             case QImage::Format_RGB888:
-                memcpy(row, image.scanLine(cinfo.next_scanline), w * 3);
+                memcpy(row, image.constScanLine(cinfo.next_scanline), w * 3);
                 break;
             case QImage::Format_RGB32:
             case QImage::Format_ARGB32:
             case QImage::Format_ARGB32_Premultiplied: {
-                QRgb* rgb = (QRgb*)image.scanLine(cinfo.next_scanline);
+                const QRgb* rgb = (const QRgb*)image.constScanLine(cinfo.next_scanline);
                 for (int i=0; i<w; i++) {
                     *row++ = qRed(*rgb);
                     *row++ = qGreen(*rgb);
@@ -678,8 +659,12 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s
                 break;
             }
             default:
-                qWarning("QJpegHandler: unable to write image of format %i",
-                         image.format());
+                for (int i=0; i<w; i++) {
+                    QRgb pix = image.pixel(i, cinfo.next_scanline);
+                    *row++ = qRed(pix);
+                    *row++ = qGreen(pix);
+                    *row++ = qBlue(pix);
+                }
                 break;
             }
             jpeg_write_scanlines(&cinfo, row_pointer, 1);
-- 
cgit v0.12


From b049dbe2efd6001f0496dffdc4fd289fa10ea25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 17 Sep 2010 18:26:53 +0200
Subject: Fixed compilation of MeeGo graphics system without eglext.h

We don't rely on this header, so there's no need to include it.

Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
(cherry picked from commit a65f53a09c2a5950bd8b98fd791dc413bb11f9bf)
---
 src/plugins/graphicssystems/meego/qmeegoextensions.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.h b/src/plugins/graphicssystems/meego/qmeegoextensions.h
index 7f219de..f1a74f5 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.h
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.h
@@ -43,7 +43,6 @@
 #define MEXTENSIONS_H
 
 #include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <private/qgl_p.h>
-- 
cgit v0.12


From 7ce308d589c7dbbe295f2cf2a2975a05dd4d1812 Mon Sep 17 00:00:00 2001
From: Benjamin Poulain <benjamin.poulain@nokia.com>
Date: Tue, 21 Sep 2010 12:47:00 +0200
Subject: Qt headers must be included before X11 headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

X11 symbols are conflicting with some of the Qt ones. Qt headers needs
to be included before the X11 ones in order to compile on Maemo.

Reviewed-by: Samuel Rødal
(cherry picked from commit f1f986dfe40f82fca1a8a27f5f02e1a9f7818fd0)
---
 src/plugins/graphicssystems/meego/qmeegoextensions.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.h b/src/plugins/graphicssystems/meego/qmeegoextensions.h
index f1a74f5..ee20bd8 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.h
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.h
@@ -42,12 +42,12 @@
 #ifndef MEXTENSIONS_H
 #define MEXTENSIONS_H
 
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 #include <private/qgl_p.h>
 #include <private/qeglcontext_p.h>
 #include <private/qpixmapdata_gl_p.h>
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 
 /* Extensions decls */
 
-- 
cgit v0.12


From c573a69b3ff4ec2f7126a86c30c8f110a974937a Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Mon, 20 Sep 2010 17:24:39 +1000
Subject: Update QtCore bwins def file (cherry picked from commit
 580fbb6a48b9cc2fbd0a011449d0c3a73c939ff9)

---
 src/s60installs/bwins/QtCoreu.def | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index 1a79f63..0f66d72 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -1440,8 +1440,8 @@ EXPORTS
 	?d_func@QBuffer@@ABEPBVQBufferPrivate@@XZ @ 1439 NONAME ; class QBufferPrivate const * QBuffer::d_func(void) const
 	?d_func@QCoreApplication@@AAEPAVQCoreApplicationPrivate@@XZ @ 1440 NONAME ; class QCoreApplicationPrivate * QCoreApplication::d_func(void)
 	?d_func@QCoreApplication@@ABEPBVQCoreApplicationPrivate@@XZ @ 1441 NONAME ; class QCoreApplicationPrivate const * QCoreApplication::d_func(void) const
-	?d_func@QDir@@AAEPAVQDirPrivate@@XZ @ 1442 NONAME ; class QDirPrivate * QDir::d_func(void)
-	?d_func@QDir@@ABEPBVQDirPrivate@@XZ @ 1443 NONAME ; class QDirPrivate const * QDir::d_func(void) const
+	?d_func@QDir@@AAEPAVQDirPrivate@@XZ @ 1442 NONAME ABSENT ; class QDirPrivate * QDir::d_func(void)
+	?d_func@QDir@@ABEPBVQDirPrivate@@XZ @ 1443 NONAME ABSENT ; class QDirPrivate const * QDir::d_func(void) const
 	?d_func@QEventDispatcherSymbian@@AAEPAVQAbstractEventDispatcherPrivate@@XZ @ 1444 NONAME ; class QAbstractEventDispatcherPrivate * QEventDispatcherSymbian::d_func(void)
 	?d_func@QEventDispatcherSymbian@@ABEPBVQAbstractEventDispatcherPrivate@@XZ @ 1445 NONAME ; class QAbstractEventDispatcherPrivate const * QEventDispatcherSymbian::d_func(void) const
 	?d_func@QEventLoop@@AAEPAVQEventLoopPrivate@@XZ @ 1446 NONAME ; class QEventLoopPrivate * QEventLoop::d_func(void)
-- 
cgit v0.12


From c2b8b2f7a46dc25ec1a464f72fa301b1176cec8d Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Fri, 17 Sep 2010 10:13:51 +0200
Subject: Make qml debugging work with command line arguments

The environment variables do not work for Symbian devices, so
without this change, QML debugging cannot be done on them.

In addition, configure now contains an option to disable qml
debugging entirely, due to it being a major security risk.

Reviewed-by: kkoehne
(cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
---
 configure                                          |  24 +++++++++++-
 configure.exe                                      | Bin 1321472 -> 1402368 bytes
 src/corelib/kernel/qcoreapplication.cpp            |   3 +-
 .../debugger/qdeclarativedebugservice.cpp          |  41 +++++++++++++++------
 src/gui/kernel/qapplication.cpp                    |   6 +++
 src/gui/kernel/qapplication_p.h                    |   2 +
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |  16 +++++++-
 .../tst_qdeclarativedebugclient.cpp                |  15 +++++++-
 .../tst_qdeclarativedebugservice.cpp               |  16 +++++++-
 tools/configure/configureapp.cpp                   |  11 ++++++
 10 files changed, 114 insertions(+), 20 deletions(-)

diff --git a/configure b/configure
index b933ac1..da6fb0a 100755
--- a/configure
+++ b/configure
@@ -685,6 +685,7 @@ CFG_MULTIMEDIA=auto
 CFG_AUDIO_BACKEND=auto
 CFG_SVG=auto
 CFG_DECLARATIVE=auto
+CFG_DECLARATIVE_DEBUG=yes
 CFG_WEBKIT=auto # (yes|no|auto)
 CFG_JAVASCRIPTCORE_JIT=auto
 
@@ -1997,6 +1998,17 @@ while [ "$#" -gt 0 ]; do
             fi
         fi
 	;;
+    declarative-debug)
+        if [ "$VAL" = "yes" ]; then
+            CFG_DECLARATIVE_DEBUG="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_DECLARATIVE_DEBUG="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
     webkit)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
             CFG_WEBKIT="yes"
@@ -3524,7 +3536,8 @@ Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
         [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend] 
         [-no-openssl] [-openssl] [-openssl-linked]
         [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit]
-        [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative]
+        [-no-script] [-script] [-no-scripttools] [-scripttools] 
+	[-no-declarative] [-declarative][-no-declarative-debug] [-declarative-debug]
 
         [additional platform specific options (see below)]
 
@@ -3687,9 +3700,12 @@ fi
     -no-scripttools .... Do not build the QtScriptTools module.
  +  -scripttools ....... Build the QtScriptTools module.
 
-    -no-declarative .....Do not build the declarative module.
+    -no-declarative ..... Do not build the declarative module.
  +  -declarative ....... Build the declarative module.
 
+    -no-declarative-debug ..... Do not build the declarative debugging support.
+ +  -declarative-debug ....... Build the declarative debugging support.
+
     -platform target ... The operating system and compiler you are building
                          on ($PLATFORM).
 
@@ -7229,6 +7245,9 @@ fi
 
 if [ "$CFG_DECLARATIVE" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG declarative"
+    if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL"
+    fi
 else
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DECLARATIVE"
 fi
@@ -8197,6 +8216,7 @@ if [ "$CFG_WEBKIT" = "yes" ]; then
     fi
 fi
 echo "Declarative module ..... $CFG_DECLARATIVE"
+echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
 echo "Support for S60 ........ $CFG_S60"
 echo "Symbian DEF files ...... $CFG_SYMBIAN_DEFFILES"
 echo "STL support ............ $CFG_STL"
diff --git a/configure.exe b/configure.exe
index 18c9004..e2f4331 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 512e193..d3f399b 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2091,7 +2091,8 @@ QStringList QCoreApplication::arguments()
                 l1arg == "-stylesheet" ||
                 l1arg == "-widgetcount")
                 ;
-            else if (l1arg.startsWith("-style="))
+            else if (l1arg.startsWith("-style=") ||
+                     l1arg.startsWith("-qmljsdebugger="))
                 ;
             else if (l1arg == "-style" ||
                      l1arg == "-session" ||
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 1bbfcf4..1f2bf4f 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -49,6 +49,8 @@
 #include <QtCore/qstringlist.h>
 
 #include <private/qobject_p.h>
+#include <private/qapplication_p.h>
+#include <QtGui/qapplication.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -147,24 +149,41 @@ bool QDeclarativeDebugServer::hasDebuggingClient() const
 
 QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
 {
-    static bool envTested = false;
+    static bool commandLineTested = false;
     static QDeclarativeDebugServer *server = 0;
 
-    if (!envTested) {
-        envTested = true;
-        QByteArray env = qgetenv("QML_DEBUG_SERVER_PORT");
-        QByteArray block = qgetenv("QML_DEBUG_SERVER_BLOCK");
+    if (!commandLineTested) {
+        commandLineTested = true;
 
+#ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL
+        QApplicationPrivate *appD = static_cast<QApplicationPrivate*>(QObjectPrivate::get(qApp));
+        // ### remove port definition when protocol is changed
+        int port = 0;
+        bool block = false;
         bool ok = false;
-        int port = env.toInt(&ok);
 
-        if (ok && port > 1024) {
-            server = new QDeclarativeDebugServer(port);
-            server->listen();
-            if (!block.isEmpty()) {
-                server->waitForConnection();
+        // format: qmljsdebugger=port:3768[,block]
+        if (!appD->qmljsDebugArguments.isEmpty()) {
+
+            if (appD->qmljsDebugArguments.indexOf(QLatin1String("port:")) == 0) {
+                int separatorIndex = appD->qmljsDebugArguments.indexOf(QLatin1Char(','));
+                port = appD->qmljsDebugArguments.mid(5, separatorIndex - 5).toInt(&ok);
+            }
+            block = appD->qmljsDebugArguments.contains(QLatin1String("block"));
+
+            if (ok) {
+                server = new QDeclarativeDebugServer(port);
+                server->listen();
+                if (block) {
+                    server->waitForConnection();
+                }
+            } else {
+                qWarning(QString("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+                                 "Format is -qmljsdebugger=port:<port>[,block]").arg(
+                             appD->qmljsDebugArguments).toAscii().constData());
             }
         }
+#endif
     }
 
     return server;
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 2fd2f46..43d5772 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -494,6 +494,7 @@ bool QApplicationPrivate::fade_tooltip = false;
 bool QApplicationPrivate::animate_toolbox = false;
 bool QApplicationPrivate::widgetCount = false;
 bool QApplicationPrivate::load_testability = false;
+QString QApplicationPrivate::qmljsDebugArguments;
 #ifdef QT_KEYPAD_NAVIGATION
 #  ifdef Q_OS_SYMBIAN
 Qt::NavigationMode QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadDirectional;
@@ -565,6 +566,8 @@ void QApplicationPrivate::process_cmdline()
         QString s;
         if (arg == "-qdevel" || arg == "-qdebug") {
             // obsolete argument
+        } else if (arg.indexOf("-qmljsdebugger=", 0) != -1) {
+            qmljsDebugArguments = QString::fromLocal8Bit(arg.right(arg.length() - 15));
         } else if (arg.indexOf("-style=", 0) != -1) {
             s = QString::fromLocal8Bit(arg.right(arg.length() - 7).toLower());
         } else if (arg == "-style" && i < argc-1) {
@@ -670,6 +673,9 @@ void QApplicationPrivate::process_cmdline()
             Qt::RightToLeft
         \o  -graphicssystem, sets the backend to be used for on-screen widgets
             and QPixmaps. Available options are \c{raster} and \c{opengl}.
+        \o  -qmljsdebugger=, activates the QML/JS debugger with a specified port.
+            The value must be of format port:1234[,block], where block is optional
+            and will make the application wait until a debugger connects to it.
     \endlist
 
     The X11 version of Qt supports some traditional X11 command line options:
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 8dc16e0..aa3a6d5 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -446,6 +446,8 @@ public:
     static bool animate_toolbox;
     static bool widgetCount; // Coupled with -widgetcount switch
     static bool load_testability; // Coupled with -testability switch
+    static QString qmljsDebugArguments; // a string containing arguments for js/qml debugging.
+
 #ifdef Q_WS_MAC
     static bool native_modal_dialog_active;
 #endif
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 20ccccb..adba190 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -279,7 +279,7 @@ void tst_QDeclarativeDebug::initTestCase()
     qRegisterMetaType<QDeclarativeDebugWatch::State>();
 
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768...");
-    qputenv("QML_DEBUG_SERVER_PORT", "3768");
+
     m_engine = new QDeclarativeEngine(this);
 
     QList<QByteArray> qml;
@@ -891,6 +891,18 @@ void tst_QDeclarativeDebug::tst_QDeclarativeDebugPropertyReference()
         compareProperties(r, ref);
 }
 
-QTEST_MAIN(tst_QDeclarativeDebug)
+int main(int argc, char *argv[])
+{
+    int _argc = argc + 1;
+    char **_argv = new char*[_argc];
+    for (int i = 0; i < argc; ++i)
+        _argv[i] = argv[i];
+    _argv[_argc - 1] = "-qmljsdebugger=port:3768";
+
+    QApplication app(_argc, _argv);
+    tst_QDeclarativeDebug tc;
+    return QTest::qExec(&tc, _argc, _argv);
+    delete _argv;
+}
 
 #include "tst_qdeclarativedebug.moc"
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index a19c2c2..7db0e60 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -76,7 +76,6 @@ void tst_QDeclarativeDebugClient::initTestCase()
 {
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3770...");
 
-    qputenv("QML_DEBUG_SERVER_PORT", "3770");
     new QDeclarativeEngine(this);
 
     m_conn = new QDeclarativeDebugConnection(this);
@@ -151,7 +150,19 @@ void tst_QDeclarativeDebugClient::sendMessage()
     QCOMPARE(resp, msg);
 }
 
-QTEST_MAIN(tst_QDeclarativeDebugClient)
+int main(int argc, char *argv[])
+{
+    int _argc = argc + 1;
+    char **_argv = new char*[_argc];
+    for (int i = 0; i < argc; ++i)
+        _argv[i] = argv[i];
+    _argv[_argc - 1] = "-qmljsdebugger=port:3770";
+
+    QApplication app(_argc, _argv);
+    tst_QDeclarativeDebugClient tc;
+    return QTest::qExec(&tc, _argc, _argv);
+    delete _argv;
+}
 
 #include "tst_qdeclarativedebugclient.moc"
 
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 9ebbbaf..4683199 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -77,7 +77,6 @@ private slots:
 void tst_QDeclarativeDebugService::initTestCase()
 {
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3769...");
-    qputenv("QML_DEBUG_SERVER_PORT", "3769");
     new QDeclarativeEngine(this);
 
     m_conn = new QDeclarativeDebugConnection(this);
@@ -184,6 +183,19 @@ void tst_QDeclarativeDebugService::objectToString()
     delete obj;
 }
 
-QTEST_MAIN(tst_QDeclarativeDebugService)
+
+int main(int argc, char *argv[])
+{
+    int _argc = argc + 1;
+    char **_argv = new char*[_argc];
+    for (int i = 0; i < argc; ++i)
+        _argv[i] = argv[i];
+    _argv[_argc - 1] = "-qmljsdebugger=port:3769";
+
+    QApplication app(_argc, _argv);
+    tst_QDeclarativeDebugService tc;
+    return QTest::qExec(&tc, _argc, _argv);
+    delete _argv;
+}
 
 #include "tst_qdeclarativedebugservice.moc"
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6e66742..a2c7fe9 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -279,6 +279,7 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "DIRECTSHOW" ]      = "no";
     dictionary[ "WEBKIT" ]          = "auto";
     dictionary[ "DECLARATIVE" ]     = "auto";
+    dictionary[ "DECLARATIVE_DEBUG" ]= "yes";
     dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
 
     QString version;
@@ -961,6 +962,10 @@ void Configure::parseCmdLine()
             dictionary[ "DECLARATIVE" ] = "no";
         } else if (configCmdLine.at(i) == "-declarative") {
             dictionary[ "DECLARATIVE" ] = "yes";
+        } else if (configCmdLine.at(i) == "-no-declarative-debug") {
+            dictionary[ "DECLARATIVE_DEBUG" ] = "no";
+        } else if (configCmdLine.at(i) == "-declarative-debug") {
+            dictionary[ "DECLARATIVE_DEBUG" ] = "yes";
         } else if (configCmdLine.at(i) == "-no-plugin-manifests") {
             dictionary[ "PLUGIN_MANIFESTS" ] = "no";
         } else if (configCmdLine.at(i) == "-plugin-manifests") {
@@ -1836,6 +1841,8 @@ bool Configure::displayHelp()
         desc("SCRIPTTOOLS", "yes", "-scripttools",      "Build the QtScriptTools module.");
         desc("DECLARATIVE", "no",    "-no-declarative", "Do not build the declarative module");
         desc("DECLARATIVE", "yes",   "-declarative",    "Build the declarative module");
+        desc("DECLARATIVE_DEBUG", "no",    "-no-declarative-debug", "Do not build the declarative debugging support");
+        desc("DECLARATIVE_DEBUG", "yes",   "-declarative-debug",    "Build the declarative debugging support");
 
         desc(                   "-arch <arch>",         "Specify an architecture.\n"
                                                         "Available values for <arch>:");
@@ -2273,6 +2280,8 @@ void Configure::autoDetection()
         dictionary["WEBKIT"] = checkAvailability("WEBKIT") ? "yes" : "no";
     if (dictionary["DECLARATIVE"] == "auto")
         dictionary["DECLARATIVE"] = dictionary["SCRIPT"] == "yes" ? "yes" : "no";
+    if (dictionary["DECLARATIVE_DEBUG"] == "auto")
+        dictionary["DECLARATIVE_DEBUG"] = dictionary["DECLARATIVE"] == "yes" ? "yes" : "no";
     if (dictionary["AUDIO_BACKEND"] == "auto")
         dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no";
     if (dictionary["WMSDK"] == "auto")
@@ -3101,6 +3110,7 @@ void Configure::generateConfigfiles()
         if (dictionary["IPV6"] == "no")              qconfigList += "QT_NO_IPV6";
         if (dictionary["WEBKIT"] == "no")            qconfigList += "QT_NO_WEBKIT";
         if (dictionary["DECLARATIVE"] == "no")       qconfigList += "QT_NO_DECLARATIVE";
+        if (dictionary["DECLARATIVE_DEBUG"] == "no") qconfigList += "QDECLARATIVE_NO_DEBUG_PROTOCOL";
         if (dictionary["PHONON"] == "no")            qconfigList += "QT_NO_PHONON";
         if (dictionary["MULTIMEDIA"] == "no")        qconfigList += "QT_NO_MULTIMEDIA";
         if (dictionary["XMLPATTERNS"] == "no")       qconfigList += "QT_NO_XMLPATTERNS";
@@ -3398,6 +3408,7 @@ void Configure::displayConfig()
     cout << "QtMultimedia support........" << dictionary[ "MULTIMEDIA" ] << endl;
     cout << "WebKit support.............." << dictionary[ "WEBKIT" ] << endl;
     cout << "Declarative support........." << dictionary[ "DECLARATIVE" ] << endl;
+    cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl;
     cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl;
     cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl;
     cout << "Graphics System............." << dictionary[ "GRAPHICS_SYSTEM" ] << endl;
-- 
cgit v0.12


From 5399d494eecb3286e0b3d14204607eae08937e72 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 20 Sep 2010 09:17:20 +0200
Subject: Fix Symbian def file for a9e5329168

Reviewed-by: Thomas Hartmann
(cherry picked from commit a371562d870abb421682dcf83d447e5d5c9e82fa)
---
 src/s60installs/eabi/QtGuiu.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 47e893b..e6b2555 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12094,4 +12094,5 @@ EXPORTS
 	_ZN18QTapAndHoldGesture7timeoutEv @ 12093 NONAME
 	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12094 NONAME ABSENT
 	_ZN20QGraphicsItemPrivate14children_clearEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 12095 NONAME
+	_ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4
 
-- 
cgit v0.12


From 223ef193ff9d333cbd43f8c10e2e7d7612748180 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Mon, 20 Sep 2010 17:25:01 +1000
Subject: Update QtGui def files (cherry picked from commit
 36705197479337ccf341a4c39a6e5f44d3fb2322)

---
 src/s60installs/bwins/QtGuiu.def | 10 ++++++++--
 src/s60installs/eabi/QtGuiu.def  |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index f9e88d7..7805dae 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -2645,7 +2645,7 @@ EXPORTS
 	?childItems@QGraphicsItem@@QBE?AV?$QList@PAVQGraphicsItem@@@@XZ @ 2644 NONAME ; class QList<class QGraphicsItem *> QGraphicsItem::childItems(void) const
 	?children@QGraphicsItem@@QBE?AV?$QList@PAVQGraphicsItem@@@@XZ @ 2645 NONAME ; class QList<class QGraphicsItem *> QGraphicsItem::children(void) const
 	?childrenBoundingRect@QGraphicsItem@@QBE?AVQRectF@@XZ @ 2646 NONAME ; class QRectF QGraphicsItem::childrenBoundingRect(void) const
-	?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@@Z @ 2647 NONAME ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *)
+	?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@@Z @ 2647 NONAME ABSENT ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *)
 	?childrenCheckState@QTreeWidgetItem@@ABE?AVQVariant@@H@Z @ 2648 NONAME ; class QVariant QTreeWidgetItem::childrenCheckState(int) const
 	?childrenClippedToShape@QGraphicsItemPrivate@@QBE_NXZ @ 2649 NONAME ; bool QGraphicsItemPrivate::childrenClippedToShape(void) const
 	?childrenCollapsible@QSplitter@@QBE_NXZ @ 2650 NONAME ; bool QSplitter::childrenCollapsible(void) const
@@ -4078,7 +4078,7 @@ EXPORTS
 	?editorEvent@QAbstractItemDelegate@@UAE_NPAVQEvent@@PAVQAbstractItemModel@@ABVQStyleOptionViewItem@@ABVQModelIndex@@@Z @ 4077 NONAME ; bool QAbstractItemDelegate::editorEvent(class QEvent *, class QAbstractItemModel *, class QStyleOptionViewItem const &, class QModelIndex const &)
 	?editorEvent@QItemDelegate@@MAE_NPAVQEvent@@PAVQAbstractItemModel@@ABVQStyleOptionViewItem@@ABVQModelIndex@@@Z @ 4078 NONAME ; bool QItemDelegate::editorEvent(class QEvent *, class QAbstractItemModel *, class QStyleOptionViewItem const &, class QModelIndex const &)
 	?editorEvent@QStyledItemDelegate@@MAE_NPAVQEvent@@PAVQAbstractItemModel@@ABVQStyleOptionViewItem@@ABVQModelIndex@@@Z @ 4079 NONAME ; bool QStyledItemDelegate::editorEvent(class QEvent *, class QAbstractItemModel *, class QStyleOptionViewItem const &, class QModelIndex const &)
-	?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@XZ @ 4080 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(void) const
+	?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@XZ @ 4080 NONAME ABSENT ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(void) const
 	?effectiveOpacity@QGraphicsItem@@QBEMXZ @ 4081 NONAME ; float QGraphicsItem::effectiveOpacity(void) const
 	?effectiveOpacity@QGraphicsItemPrivate@@QBEMXZ @ 4082 NONAME ; float QGraphicsItemPrivate::effectiveOpacity(void) const
 	?effectiveRectFor@QWidgetPrivate@@QBE?AVQRect@@ABV2@@Z @ 4083 NONAME ; class QRect QWidgetPrivate::effectiveRectFor(class QRect const &) const
@@ -12886,4 +12886,10 @@ EXPORTS
 	?flushDetachedPixmaps@QPixmapCache@@SAXXZ @ 12885 NONAME ; void QPixmapCache::flushDetachedPixmaps(void)
 	?replayLastMouseEvent@QGraphicsViewPrivate@@QAEXXZ @ 12886 NONAME ; void QGraphicsViewPrivate::replayLastMouseEvent(void)
 	?children_clear@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12887 NONAME ; void QGraphicsItemPrivate::children_clear(class QDeclarativeListProperty<class QGraphicsObject> *)
+	?timeout@QTapAndHoldGesture@@SAHXZ @ 12888 NONAME ; int QTapAndHoldGesture::timeout(void)
+	?lastRightBearing@QFontEngine@@IAE?AUQFixed@@ABUQGlyphLayout@@_N@Z @ 12889 NONAME ; struct QFixed QFontEngine::lastRightBearing(struct QGlyphLayout const &, bool)
+	?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@PAVQGraphicsItem@@@Z @ 12890 NONAME ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *, class QGraphicsItem *)
+	?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12891 NONAME ; void QTapAndHoldGesture::setTimeout(int)
+	?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ; class QString QApplicationPrivate::qmljsDebugArguments
+	?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index e6b2555..4442d33 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12095,4 +12095,6 @@ EXPORTS
 	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12094 NONAME ABSENT
 	_ZN20QGraphicsItemPrivate14children_clearEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 12095 NONAME
 	_ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4
+	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFP13QGraphicsItem @ 12097 NONAME
+	_ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME
 
-- 
cgit v0.12


From 50ab865141b97b91ebbeeae9445a4296f378882a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond.kjernasen@nokia.com>
Date: Tue, 21 Sep 2010 17:08:09 +0200
Subject: Fixed drawing a large number of glyphs with the same font under GL.

Our glyph caching system doesn't take GL texture size limitation into
account, and assumes you can create an infinitely large texture.
On top of that, the cache will never create a cache that is wider
than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll
hit the texture size limit even faster. With this patch the entire
texture is utilized. However, to fix in properly we need to support
having multiple texture for each font engine. That will be fixed
shortly (see task QTBUG-13784).

Task-number: QT-3971
Reviewed-by: Eskil
(cherry picked from commit eb2926a2f9607e985b8bca54346e6fdf91343247)
---
 src/gui/painting/qtextureglyphcache.cpp              | 20 ++++++++++++--------
 src/gui/painting/qtextureglyphcache_p.h              |  6 ++++++
 .../gl2paintengineex/qtextureglyphcache_gl.cpp       | 11 ++++++++++-
 .../gl2paintengineex/qtextureglyphcache_gl_p.h       |  2 ++
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 631a9cf..b609f7b 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -47,10 +47,6 @@
 #include "private/qnativeimage_p.h"
 #include "private/qfontengine_ft_p.h"
 
-#ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH
-#define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256
-#endif
-
 QT_BEGIN_NAMESPACE
 
 // #define CACHE_DEBUG
@@ -137,10 +133,18 @@ void QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const
         m_currentRowHeight = qMax(m_currentRowHeight, c.h + margin * 2);
 
         if (m_cx + c.w > m_w) {
-            // no room on the current line, start new glyph strip
-            m_cx = 0;
-            m_cy += m_currentRowHeight + paddingDoubled;
-            m_currentRowHeight = 0; // New row
+            int new_width = m_w*2;
+            while (new_width < m_cx + c.w)
+                new_width *= 2;
+            if (new_width <= maxTextureWidth()) {
+                resizeTextureData(new_width, m_h);
+                m_w = new_width;
+            } else {
+                // no room on the current line, start new glyph strip
+                m_cx = 0;
+                m_cy += m_currentRowHeight + paddingDoubled;
+                m_currentRowHeight = 0; // New row
+            }
         }
         if (m_cy + c.h > m_h) {
             int new_height = m_h*2;
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index a818978..e6d2b22 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -64,6 +64,10 @@
 #  undef m_type
 #endif
 
+#ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH
+#define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256
+#endif
+
 struct glyph_metrics_t;
 typedef unsigned int glyph_t;
 
@@ -113,6 +117,8 @@ public:
     QHash<glyph_t, Coord> coords;
 
     QImage textureMapForGlyph(glyph_t g) const;
+    virtual int maxTextureWidth() const { return QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH; }
+    virtual int maxTextureHeight() const { return 32768; }
 
 protected:
     QFontEngine *m_current_fontengine;
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index 410cf21..f353995 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -129,7 +129,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
 
     GLuint oldTexture = m_texture;
     createTextureData(width, height);
-    
+
     if (ctx->d_ptr->workaround_brokenFBOReadBack) {
         QImageTextureGlyphCache::resizeTextureData(width, height);
         Q_ASSERT(image().depth() == 8);
@@ -281,4 +281,13 @@ int QGLTextureGlyphCache::glyphPadding() const
     return 1;
 }
 
+int QGLTextureGlyphCache::maxTextureWidth() const
+{
+    return ctx->d_ptr->maxTextureSize();
+}
+
+int QGLTextureGlyphCache::maxTextureHeight() const
+{
+    return ctx->d_ptr->maxTextureSize();
+}
 QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
index 6bcd655..eb3693c 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -73,6 +73,8 @@ public:
     virtual void resizeTextureData(int width, int height);
     virtual void fillTexture(const Coord &c, glyph_t glyph);
     virtual int glyphPadding() const;
+    virtual int maxTextureWidth() const;
+    virtual int maxTextureHeight() const;
 
     inline GLuint texture() const { return m_texture; }
 
-- 
cgit v0.12


From c025fda36e767a74cd50df9521819dbdbc1625d8 Mon Sep 17 00:00:00 2001
From: Misha Tyutyunik <Michael.Tyutyunik@nokia.com>
Date: Wed, 22 Sep 2010 10:06:01 +0200
Subject: QNAM: Use QFileNetworkReply for qrc:/ URL schema

Resources do not need network access and can be quicker
loaded with QFileNetworkReply.

Reviewed-by: Markus Goetz
(cherry picked from commit 5120dfec47475dd37f51df4dda9a4ef8494036ab)
---
 src/network/access/qfilenetworkreply.cpp     | 5 ++++-
 src/network/access/qnetworkaccessmanager.cpp | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/network/access/qfilenetworkreply.cpp b/src/network/access/qfilenetworkreply.cpp
index 4ac9a8c..00bd29e 100644
--- a/src/network/access/qfilenetworkreply.cpp
+++ b/src/network/access/qfilenetworkreply.cpp
@@ -97,7 +97,10 @@ QFileNetworkReply::QFileNetworkReply(QObject *parent, const QNetworkRequest &req
 
     QString fileName = url.toLocalFile();
     if (fileName.isEmpty()) {
-        fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
+        if (url.scheme() == QLatin1String("qrc"))
+            fileName = QLatin1Char(':') + url.path();
+        else
+            fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
     }
 
     QFileInfo fi(fileName);
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index b35c318..a637474 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -946,10 +946,10 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 
     // fast path for GET on file:// URLs
     // Also if the scheme is empty we consider it a file.
-    // The QNetworkAccessFileBackend will right now only be used
-    // for PUT or qrc://
+    // The QNetworkAccessFileBackend will right now only be used for PUT
     if ((op == QNetworkAccessManager::GetOperation || op == QNetworkAccessManager::HeadOperation)
          && (req.url().scheme() == QLatin1String("file")
+             || req.url().scheme() == QLatin1String("qrc")
              || req.url().scheme().isEmpty())) {
         return new QFileNetworkReply(this, req, op);
     }
-- 
cgit v0.12


From c4d153c5a5adb78ae577a8c9484d661e39dc6125 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Tue, 21 Sep 2010 16:51:15 +0200
Subject: qmake: fix quoting of moc calls

Task-number: QTBUG-13782
Reviewed-by: ossi
(cherry picked from commit 36fc9e830b828b69c4df775c68c07c25c9bab4cf)
---
 mkspecs/features/moc.prf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index abda78f..15e7fd9 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -45,10 +45,10 @@ defineReplace(mocCmd) {
         if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
             RET += $$mocinclude.commands
         }
-        RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2
+        RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2
         return($$RET)
     }
-    return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2)
+    return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2)
 }
 
 #moc headers
-- 
cgit v0.12


From 28bd899cdcc7dd17be09feb20856b09af2639c0b Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Thu, 23 Sep 2010 12:46:33 +1000
Subject: Rebuild configure.exe.

---
 configure.exe | Bin 1402368 -> 1325568 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/configure.exe b/configure.exe
index e2f4331..c36256e 100755
Binary files a/configure.exe and b/configure.exe differ
-- 
cgit v0.12


From 6d524881d5f1125d7396b9a6e23ed65ce0a5c5eb Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Tue, 21 Sep 2010 16:25:48 +1000
Subject: Fix a crash in QDeclarativeVisualDataModel

Task-number: QTBUG-13754
Reviewed-by: Martin Jones
(cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
---
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  |  6 +++---
 .../qdeclarativelistmodel/data/multipleroles.qml   | 25 ++++++++++++++++++++++
 .../tst_qdeclarativelistmodel.cpp                  | 16 ++++++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml

diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index a70886e..01cd652 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -621,7 +621,7 @@ QDeclarativeVisualDataModelParts::QDeclarativeVisualDataModelParts(QDeclarativeV
 
 QDeclarativeVisualDataModelPrivate::QDeclarativeVisualDataModelPrivate(QDeclarativeContext *ctxt)
 : m_listModelInterface(0), m_abstractItemModel(0), m_visualItemModel(0), m_delegate(0)
-, m_context(ctxt), m_parts(0), m_delegateDataType(0), m_metaDataCreated(false)
+, m_context(ctxt), m_modelDataPropId(-1), m_parts(0), m_delegateDataType(0), m_metaDataCreated(false)
 , m_metaDataCacheable(false), m_delegateValidated(false), m_completePending(false), m_listAccessor(0)
 {
 }
@@ -1202,11 +1202,11 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count,
                     qmlInfo(this) << "Changing role not present in item: " << roleName;
                 }
             }
-            if (roles.count() == 1) {
+            if (d->m_roles.count() == 1) {
                 // Handle the modelData role we add if there is just one role.
                 int propId = data->modelDataPropertyId();
                 if (data->hasValue(propId)) {
-                    int role = roles.at(0);
+                    int role = d->m_roles.at(0);
                     if (d->m_listModelInterface) {
                         data->setValue(propId, d->m_listModelInterface->data(idx, QList<int>() << role).value(role));
                     } else if (d->m_abstractItemModel) {
diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml
new file mode 100644
index 0000000..b8f2f32
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml
@@ -0,0 +1,25 @@
+import Qt 4.7
+ListView {
+    width: 100
+    height: 250
+    delegate: Rectangle { 
+        width: 100
+        height: 50
+        color: black ? "black": "white" 
+    }
+    model: ListModel { 
+        objectName: "listModel"
+        ListElement {
+            black: false
+            rounded: false
+        }
+        ListElement {
+            black: true
+            rounded: false
+        }
+        ListElement {
+            black: true
+            rounded: false
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index f456778..31cb545 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -98,6 +98,7 @@ private slots:
     void get_worker_data();
     void get_nested();
     void get_nested_data();
+    void crash_model_with_multiple_roles();
 };
 int tst_qdeclarativelistmodel::roleFromName(const QDeclarativeListModel *model, const QString &roleName)
 {
@@ -886,6 +887,21 @@ void tst_qdeclarativelistmodel::get_nested_data()
     get_data();
 }
 
+//QTBUG-13754
+void tst_qdeclarativelistmodel::crash_model_with_multiple_roles()
+{
+    QDeclarativeEngine eng;
+    QDeclarativeComponent component(&eng, QUrl::fromLocalFile(SRCDIR "/data/multipleroles.qml"));
+    QObject *rootItem = component.create();
+    QVERIFY(component.errorString().isEmpty());
+    QVERIFY(rootItem != 0);
+    QDeclarativeListModel *model = rootItem->findChild<QDeclarativeListModel*>("listModel");
+    QVERIFY(model != 0);
+
+    // used to cause a crash in QDeclarativeVisualDataModel
+    model->setProperty(0, "black", true);
+}
+
 QTEST_MAIN(tst_qdeclarativelistmodel)
 
 #include "tst_qdeclarativelistmodel.moc"
-- 
cgit v0.12


From 30848f7eaac221e9c8a3e0c73ce268c12ae801e5 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 17 Sep 2010 15:34:44 +1000
Subject: Autotest and small fix for QDeclarativeFontLoader. (cherry picked
 from commit eef26bc8521da62db0dced6796eceb7c27f64160)

---
 src/declarative/util/qdeclarativefontloader.cpp    |   6 +--
 .../qdeclarativefontloader/data/daniel.ttf         | Bin 0 -> 51984 bytes
 .../tst_qdeclarativefontloader.cpp                 |  42 +++++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf

diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 91588b7..6879494 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -210,11 +210,7 @@ void QDeclarativeFontLoader::setSource(const QUrl &url)
                 updateFontInfo(QString(), Error);
             }
         } else {
-            QDeclarativeFontObject *fo = d->fonts[d->url];
-            d->name = QFontDatabase::applicationFontFamilies(fo->id).at(0);
-            emit nameChanged();
-            d->status = QDeclarativeFontLoader::Ready;
-            emit statusChanged();
+            updateFontInfo(QFontDatabase::applicationFontFamilies(d->fonts[d->url]->id).at(0), Ready);
         }
     } else
 #endif
diff --git a/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf b/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf
new file mode 100644
index 0000000..aae50d5
Binary files /dev/null and b/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf differ
diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index ae23017..8765426 100644
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -39,8 +39,10 @@
 **
 ****************************************************************************/
 #include <qtest.h>
+#include <QtTest/QSignalSpy>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativecontext.h>
 #include <private/qdeclarativefontloader_p.h>
 #include "../../../shared/util.h"
 #include "../shared/testhttpserver.h"
@@ -67,6 +69,7 @@ private slots:
     void webFont();
     void redirWebFont();
     void failWebFont();
+    void changeFont();
 
 private slots:
 
@@ -181,6 +184,45 @@ void tst_qdeclarativefontloader::failWebFont()
     QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
 }
 
+void tst_qdeclarativefontloader::changeFont()
+{
+    QString componentStr = "import Qt 4.7\nFontLoader { source: font }";
+    QDeclarativeContext *ctxt = engine.rootContext();
+    ctxt->setContextProperty("font", QUrl::fromLocalFile(SRCDIR "/data/tarzeau_ocr_a.ttf"));
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
+
+    QVERIFY(fontObject != 0);
+
+    QSignalSpy nameSpy(fontObject, SIGNAL(nameChanged()));
+    QSignalSpy statusSpy(fontObject, SIGNAL(statusChanged()));
+
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
+    QCOMPARE(nameSpy.count(), 0);
+    QCOMPARE(statusSpy.count(), 0);
+    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
+
+    ctxt->setContextProperty("font", "http://localhost:14448/daniel.ttf");
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Loading);
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
+    QCOMPARE(nameSpy.count(), 1);
+    QCOMPARE(statusSpy.count(), 2);
+    QTRY_COMPARE(fontObject->name(), QString("Daniel"));
+
+    ctxt->setContextProperty("font", QUrl::fromLocalFile(SRCDIR "/data/tarzeau_ocr_a.ttf"));
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
+    QCOMPARE(nameSpy.count(), 2);
+    QCOMPARE(statusSpy.count(), 2);
+    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
+
+    ctxt->setContextProperty("font", "http://localhost:14448/daniel.ttf");
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
+    QCOMPARE(nameSpy.count(), 3);
+    QCOMPARE(statusSpy.count(), 2);
+    QTRY_COMPARE(fontObject->name(), QString("Daniel"));
+}
+
 QTEST_MAIN(tst_qdeclarativefontloader)
 
 #include "tst_qdeclarativefontloader.moc"
-- 
cgit v0.12


From 1d6298e369a96a2ed1d2af5baa6546bce9b304b6 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 17 Sep 2010 16:34:50 +1000
Subject: Fix example after changes to font.letterSpacing. (cherry picked from
 commit 5372b313127302d94c748732052dd62d0e38a1cd)

---
 examples/declarative/text/fonts/hello.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/declarative/text/fonts/hello.qml b/examples/declarative/text/fonts/hello.qml
index a396ff3..60bd919 100644
--- a/examples/declarative/text/fonts/hello.qml
+++ b/examples/declarative/text/fonts/hello.qml
@@ -56,10 +56,11 @@ Rectangle {
             color: "white"
             text: "Hello world!"
             font.pixelSize: 60
+            smooth: true
 
             SequentialAnimation on font.letterSpacing {
                 loops: Animation.Infinite;
-                NumberAnimation { from: 100; to: 300; easing.type: Easing.InQuad; duration: 3000 }
+                NumberAnimation { from: 0; to: 150; easing.type: Easing.InQuad; duration: 3000 }
                 ScriptAction {
                     script: {
                         container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
-- 
cgit v0.12


From 3e9fd27db4e97de6ba9b7d045ceb48c35e5cefac Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Mon, 20 Sep 2010 17:25:27 +1000
Subject: Update QtDeclarative def files (cherry picked from commit
 90431a96ca0558ac82ccd588faf1b0aed55abbfe)

---
 src/s60installs/bwins/QtDeclarativeu.def | 5 ++++-
 src/s60installs/eabi/QtDeclarativeu.def  | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index 0193381..cf2f325 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -215,7 +215,7 @@ EXPORTS
 	?clear@QDeclarativeListReference@@QBE_NXZ @ 214 NONAME ; bool QDeclarativeListReference::clear(void) const
 	?parentChanged@QDeclarativeItem@@IAEXPAV1@@Z @ 215 NONAME ; void QDeclarativeItem::parentChanged(class QDeclarativeItem *)
 	?columnNumber@QDeclarativeDebugFileReference@@QBEHXZ @ 216 NONAME ; int QDeclarativeDebugFileReference::columnNumber(void) const
-	??0QDeclarativeListModel@@AAE@_NPAVQObject@@@Z @ 217 NONAME ; QDeclarativeListModel::QDeclarativeListModel(bool, class QObject *)
+	??0QDeclarativeListModel@@AAE@_NPAVQObject@@@Z @ 217 NONAME ABSENT ; QDeclarativeListModel::QDeclarativeListModel(bool, class QObject *)
 	?apply@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@PAVQDeclarativeTransition@@PAV1@@Z @ 218 NONAME ; void QDeclarativeState::apply(class QDeclarativeStateGroup *, class QDeclarativeTransition *, class QDeclarativeState *)
 	?isValid@QDeclarativeDomProperty@@QBE_NXZ @ 219 NONAME ; bool QDeclarativeDomProperty::isValid(void) const
 	?trUtf8@QDeclarativeDebugExpressionQuery@@SA?AVQString@@PBD0@Z @ 220 NONAME ; class QString QDeclarativeDebugExpressionQuery::trUtf8(char const *, char const *)
@@ -1712,4 +1712,7 @@ EXPORTS
 	?setScript@QDeclarativeScriptAction@@QAEXABVQDeclarativeScriptString@@@Z @ 1711 NONAME ; void QDeclarativeScriptAction::setScript(class QDeclarativeScriptString const &)
 	?metaObject@QDeclarativeScriptAction@@UBEPBUQMetaObject@@XZ @ 1712 NONAME ; struct QMetaObject const * QDeclarativeScriptAction::metaObject(void) const
 	?getPointer@QDeclarativeAbstractBinding@@SA?AV?$QWeakPointer@VQDeclarativeAbstractBinding@@@@PAV1@@Z @ 1713 NONAME ; class QWeakPointer<class QDeclarativeAbstractBinding> QDeclarativeAbstractBinding::getPointer(class QDeclarativeAbstractBinding *)
+	??0QDeclarativeListModel@@AAE@PBV0@PAVQDeclarativeListModelWorkerAgent@@@Z @ 1714 NONAME ; QDeclarativeListModel::QDeclarativeListModel(class QDeclarativeListModel const *, class QDeclarativeListModelWorkerAgent *)
+	?inWorkerThread@QDeclarativeListModel@@ABE_NXZ @ 1715 NONAME ; bool QDeclarativeListModel::inWorkerThread(void) const
+	?canMove@QDeclarativeListModel@@ABE_NHHH@Z @ 1716 NONAME ; bool QDeclarativeListModel::canMove(int, int, int) const
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 2016ec7..11dee4d 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -552,9 +552,9 @@ EXPORTS
 	_ZN21QDeclarativeListModel6removeEi @ 551 NONAME
 	_ZN21QDeclarativeListModel7flattenEv @ 552 NONAME
 	_ZN21QDeclarativeListModelC1EP7QObject @ 553 NONAME
-	_ZN21QDeclarativeListModelC1EbP7QObject @ 554 NONAME
+	_ZN21QDeclarativeListModelC1EbP7QObject @ 554 NONAME ABSENT
 	_ZN21QDeclarativeListModelC2EP7QObject @ 555 NONAME
-	_ZN21QDeclarativeListModelC2EbP7QObject @ 556 NONAME
+	_ZN21QDeclarativeListModelC2EbP7QObject @ 556 NONAME ABSENT
 	_ZN21QDeclarativeListModelD0Ev @ 557 NONAME
 	_ZN21QDeclarativeListModelD1Ev @ 558 NONAME
 	_ZN21QDeclarativeListModelD2Ev @ 559 NONAME
@@ -1744,4 +1744,7 @@ EXPORTS
 	_ZThn12_N24QDeclarativeScriptActionD1Ev @ 1743 NONAME
 	_ZThn8_N24QDeclarativeScriptActionD0Ev @ 1744 NONAME
 	_ZThn8_N24QDeclarativeScriptActionD1Ev @ 1745 NONAME
+	_ZN21QDeclarativeListModelC1EPKS_P32QDeclarativeListModelWorkerAgent @ 1746 NONAME
+	_ZN21QDeclarativeListModelC2EPKS_P32QDeclarativeListModelWorkerAgent @ 1747 NONAME
+	_ZNK21QDeclarativeListModel14inWorkerThreadEv @ 1748 NONAME
 
-- 
cgit v0.12


From 638face91faa7b6ff8cb85e6228faa1967cc66ac Mon Sep 17 00:00:00 2001
From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Mon, 13 Sep 2010 16:48:39 +0200
Subject: Fix text direction handling in QLabel

For QLabel, text direction should be determined by actual text
(if it's a simple text label) or the textDirection() property
of the defaultTextOption of corresponding QTextDocument.

Task-number: QTBUG-13552
Reviewed-by: Lars Knoll
(cherry picked from commit 9b20aac0ad83b917c46cc44b78dc90fb1d238fe8)
---
 src/gui/widgets/qlabel.cpp | 27 ++++++++++++++++-----------
 src/gui/widgets/qlabel_p.h |  1 +
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp
index bdbd0b0..42be03b 100644
--- a/src/gui/widgets/qlabel.cpp
+++ b/src/gui/widgets/qlabel.cpp
@@ -635,7 +635,7 @@ QSize QLabelPrivate::sizeForWidth(int w) const
         br = movie->currentPixmap().rect();
 #endif
     else if (isTextLabel) {
-        int align = QStyle::visualAlignment(q->layoutDirection(), QFlag(this->align));
+        int align = QStyle::visualAlignment(textDirection(), QFlag(this->align));
         // Add indentation
         int m = indent;
 
@@ -1059,7 +1059,8 @@ void QLabel::paintEvent(QPaintEvent *)
     drawFrame(&painter);
     QRect cr = contentsRect();
     cr.adjust(d->margin, d->margin, -d->margin, -d->margin);
-    int align = QStyle::visualAlignment(layoutDirection(), QFlag(d->align));
+    int align = QStyle::visualAlignment(d->isTextLabel ? d->textDirection()
+                                                       : layoutDirection(), QFlag(d->align));
 
 #ifndef QT_NO_MOVIE
     if (d->movie) {
@@ -1119,7 +1120,8 @@ void QLabel::paintEvent(QPaintEvent *)
             d->control->drawContents(&painter, QRectF(), this);
             painter.restore();
         } else {
-            int flags = align;
+            int flags = align | (d->textDirection() == Qt::LeftToRight ? Qt::TextForceLeftToRight
+                                                                       : Qt::TextForceRightToLeft);
             if (d->hasShortcut) {
                 flags |= Qt::TextShowMnemonic;
                 if (!style->styleHint(QStyle::SH_UnderlineShortcut, &opt, this))
@@ -1447,10 +1449,6 @@ void QLabel::changeEvent(QEvent *ev)
         d->control->setPalette(palette());
     } else if (ev->type() == QEvent::ContentsRectChange) {
         d->updateLabel();
-    } else if (ev->type() == QEvent::LayoutDirectionChange) {
-        if (d->isTextLabel && d->control) {
-            d->sendControlEvent(ev);
-        }
     }
     QFrame::changeEvent(ev);
 }
@@ -1486,6 +1484,15 @@ void QLabel::setScaledContents(bool enable)
     update(contentsRect());
 }
 
+Qt::LayoutDirection QLabelPrivate::textDirection() const
+{
+    if (control) {
+        QTextOption opt = control->document()->defaultTextOption();
+        return opt.textDirection();
+    }
+
+    return text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight;
+}
 
 /*!
     \fn void QLabel::setAlignment(Qt::AlignmentFlag flag)
@@ -1503,7 +1510,8 @@ QRect QLabelPrivate::documentRect() const
     Q_ASSERT_X(isTextLabel, "documentRect", "document rect called for label that is not a text label!");
     QRect cr = q->contentsRect();
     cr.adjust(margin, margin, -margin, -margin);
-    const int align = QStyle::visualAlignment(q->layoutDirection(), QFlag(this->align));
+    const int align = QStyle::visualAlignment(isTextLabel ? textDirection()
+                                                          : q->layoutDirection(), QFlag(this->align));
     int m = indent;
     if (m < 0 && q->frameWidth()) // no indent, but we do have a frame
         m = q->fontMetrics().width(QLatin1Char('x')) / 2 - margin;
@@ -1564,7 +1572,6 @@ void QLabelPrivate::ensureTextLayouted() const
     if (!textLayoutDirty)
         return;
     ensureTextPopulated();
-    Q_Q(const QLabel);
     if (control) {
         QTextDocument *doc = control->document();
         QTextOption opt = doc->defaultTextOption();
@@ -1576,8 +1583,6 @@ void QLabelPrivate::ensureTextLayouted() const
         else
             opt.setWrapMode(QTextOption::ManualWrap);
 
-        opt.setTextDirection(q->layoutDirection());
-
         doc->setDefaultTextOption(opt);
 
         QTextFrameFormat fmt = doc->rootFrame()->frameFormat();
diff --git a/src/gui/widgets/qlabel_p.h b/src/gui/widgets/qlabel_p.h
index fba7224..83624c7 100644
--- a/src/gui/widgets/qlabel_p.h
+++ b/src/gui/widgets/qlabel_p.h
@@ -132,6 +132,7 @@ public:
     QRectF layoutRect() const;
     QRect documentRect() const;
     QPoint layoutPoint(const QPoint& p) const;
+    Qt::LayoutDirection textDirection() const;
 #ifndef QT_NO_CONTEXTMENU
     QMenu *createStandardContextMenu(const QPoint &pos);
 #endif
-- 
cgit v0.12


From 0c63d0ed5417c72056632fc5b4bfc29f889b1cc1 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Wed, 22 Sep 2010 15:10:44 +0200
Subject: Fix text direction setting in QTextBlock layout

QTextControl should no longer inherit the layout direction of
parent widget as its default text direction.

Reviewed-by: Eskil Abrahamsen Blomfeldt
Reviewed-by: Lars Knoll
(cherry picked from commit 6397e5bc49f11e20a9d1838d8d8df46dd9486263)
---
 src/gui/text/qtextcontrol.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 5fe0c0c..7f2c4e9 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -404,12 +404,6 @@ void QTextControlPrivate::init(Qt::TextFormat format, const QString &text, QText
     Q_Q(QTextControl);
     setContent(format, text, document);
 
-    QWidget *parentWidget = qobject_cast<QWidget*>(parent);
-    if (parentWidget) {
-        QTextOption opt = doc->defaultTextOption();
-        opt.setTextDirection(parentWidget->layoutDirection());
-        doc->setDefaultTextOption(opt);
-    }
     doc->setUndoRedoEnabled(interactionFlags & Qt::TextEditable);
     q->setCursorWidth(-1);
 }
-- 
cgit v0.12


From b255a070907cca8a7f6857e24019ea49093a4d36 Mon Sep 17 00:00:00 2001
From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Wed, 22 Sep 2010 10:19:59 +0200
Subject: QTreeView: do not scroll to top if last item is removed

When the last item is the current item and is removed,
QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
viewItems member is cleared. This commit makes sure that viewItems is
restored by calling QTreeView::doItemsLayout() in this case, preventing
that the scroll bar range is set to zero temporarily and the view is
scrolled to the top unexpectedly (this was a regression in 4.7.0:
QTBUG-13567).

Merge-request: 2481
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 6da6b7099d4e0b49329793e4b90703ec3d868048)
---
 src/gui/itemviews/qtreeview.cpp        |  4 ++++
 tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index b797776..40b51fe 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars()
     if (!viewportSize.isValid())
         viewportSize = QSize(0, 0);
 
+    if (viewItems.isEmpty()) {
+        q->doItemsLayout();
+    }
+
     int itemsInViewport = 0;
     if (uniformRowHeights) {
         if (defaultItemHeight <= 0)
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index 7e2e800..c7b53e9 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -240,6 +240,7 @@ private slots:
     void taskQTBUG_6450_selectAllWith1stColumnHidden();
     void taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint();
     void taskQTBUG_11466_keyboardNavigationRegression();
+    void taskQTBUG_13567_removeLastItemRegression();
 };
 
 class QtTestModel: public QAbstractItemModel
@@ -3910,5 +3911,26 @@ void tst_QTreeView::taskQTBUG_11466_keyboardNavigationRegression()
     QTRY_COMPARE(treeView.currentIndex(), treeView.selectionModel()->selection().indexes().first());
 }
 
+void tst_QTreeView::taskQTBUG_13567_removeLastItemRegression()
+{
+    QtTestModel model(200, 1);
+
+    QTreeView view;
+    view.setSelectionMode(QAbstractItemView::ExtendedSelection);
+    view.setModel(&model);
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+
+    view.scrollToBottom();
+    QTest::qWait(10);
+    CHECK_VISIBLE(199, 0);
+
+    view.setCurrentIndex(model.index(199, 0));
+    model.removeLastRow();
+    QTest::qWait(10);
+    QCOMPARE(view.currentIndex(), model.index(198, 0));
+    CHECK_VISIBLE(198, 0);
+}
+
 QTEST_MAIN(tst_QTreeView)
 #include "tst_qtreeview.moc"
-- 
cgit v0.12


From 6fd33c5028632d279646dcd2f6857f0602a07fe5 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 22 Sep 2010 11:35:39 +0200
Subject: Fix a crash with D&d on mingw

The Drag&Drop callbacks need to be correctly aligned to not crash
in the graphics SSE code.

Task-number: QTBUG-13787
Reviewed-by: benjamin poulain
(cherry picked from commit a7c28aa588417c0a75f82d55019814443f889340)
---
 src/gui/kernel/qdnd_win.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/kernel/qdnd_win.cpp
index a164c2a..7083886 100644
--- a/src/gui/kernel/qdnd_win.cpp
+++ b/src/gui/kernel/qdnd_win.cpp
@@ -515,7 +515,7 @@ static inline Qt::MouseButtons keystate_to_mousebutton(DWORD grfKeyState)
 //---------------------------------------------------------------------
 //                    IDropSource Methods
 //---------------------------------------------------------------------
-STDMETHODIMP
+QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
 QOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
 {
 #ifdef QDND_DEBUG
@@ -545,7 +545,7 @@ QOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
     }
 }
 
-STDMETHODIMP
+QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
 QOleDropSource::GiveFeedback(DWORD dwEffect)
 {
     Qt::DropAction action = translateToQDragDropAction(dwEffect);
@@ -626,7 +626,7 @@ QOleDropTarget::Release(void)
 //                    IDropTarget Methods
 //---------------------------------------------------------------------
 
-STDMETHODIMP
+QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
 QOleDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
 {
 #ifdef QDND_DEBUG
@@ -688,7 +688,7 @@ void QOleDropTarget::sendDragEnterEvent(QWidget *dragEnterWidget, DWORD grfKeySt
 
 }
 
-STDMETHODIMP
+QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
 QOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
 {
 #ifdef QDND_DEBUG
@@ -758,7 +758,7 @@ QOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
     return NOERROR;
 }
 
-STDMETHODIMP
+QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
 QOleDropTarget::DragLeave()
 {
 #ifdef QDND_DEBUG
@@ -785,7 +785,7 @@ QOleDropTarget::DragLeave()
 
 #define KEY_STATE_BUTTON_MASK (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)
 
-STDMETHODIMP
+QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
 QOleDropTarget::Drop(LPDATAOBJECT /*pDataObj*/, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
 {
 #ifdef QDND_DEBUG
-- 
cgit v0.12


From 3c68304a73e52a2cca5bfc0e43b379d2857bd92a Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Thu, 23 Sep 2010 13:43:26 +0200
Subject: Incorrect translations for application menu items on Mac OS X.

This is a regression fron 4.6 release. Menu entries with some specific
roles are automatically merged to the application menu. They are now
translated based on the context "MAC_APPLICATION_MENU" instead of
"QMenuBar" context. This patch eanbles the use for both contexts.

Task-number: QTBUG-13878
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 7d878ba53909157cf1911c30ce973378589c2cc0)
---
 src/gui/kernel/qapplication.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 43d5772..185af9a 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -2397,8 +2397,13 @@ static const char *application_menu_strings[] = {
     };
 QString qt_mac_applicationmenu_string(int type)
 {
-    return qApp->translate("MAC_APPLICATION_MENU",
-                           application_menu_strings[type]);
+    QString menuString = QString::fromLatin1(application_menu_strings[type]);
+    QString translated = qApp->translate("QMenuBar", application_menu_strings[type]);
+    if (translated != menuString)
+        return translated;
+    else
+        return qApp->translate("MAC_APPLICATION_MENU",
+                               application_menu_strings[type]);
 }
 #endif
 #endif
-- 
cgit v0.12


From a0dc929adce57da459a27927d66c05c2f22b3560 Mon Sep 17 00:00:00 2001
From: Jason Barron <jason.barron@nokia.com>
Date: Wed, 22 Sep 2010 15:41:40 +0200
Subject: Avoid OpenVG rendering errors when stroking an aliased path.

Stroking a path can sometimes result in inconsistent rendering
especially when combined with a clip. For example, if the logical edge
of a clip rect coincides with the logical edge of a path then it can
happen that the edge is not painted correctly because the stroke lies
outside the bounds of the clip rect. To workaround this problem, we add
the 'aliasedCoordinateDelta' such that the rounding will err on the
side of caution. This improves the correctness when using the raster
engine as a reference.

Task-number: QTBUG-13165
Reviewed-by: Samuel
(cherry picked from commit 74f09c794d5fdcb8f4b547b1c55bcd512ef07b95)
---
 src/openvg/qpaintengine_vg.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 3c2fd3d..74395a2 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -248,7 +248,11 @@ public:
     inline void ensurePathTransform()
     {
         if (!pathTransformSet) {
-            setTransform(VG_MATRIX_PATH_USER_TO_SURFACE, pathTransform);
+            QTransform aliasedTransform = pathTransform;
+            if (renderingQuality == VG_RENDERING_QUALITY_NONANTIALIASED && currentPen != Qt::NoPen)
+                aliasedTransform = aliasedTransform
+                    * QTransform::fromTranslate(aliasedCoordinateDelta, -aliasedCoordinateDelta);
+            setTransform(VG_MATRIX_PATH_USER_TO_SURFACE, aliasedTransform);
             pathTransformSet = true;
         }
     }
@@ -306,6 +310,7 @@ inline void QVGPaintEnginePrivate::setRenderingQuality(VGRenderingQuality mode)
     if (renderingQuality != mode) {
         vgSeti(VG_RENDERING_QUALITY, mode);
         renderingQuality = mode;
+        pathTransformSet = false; // need to tweak transform for aliased stroking
     }
 }
 
-- 
cgit v0.12


From 31f96e8d9a90767aac385a2a9657cabe0c1f3889 Mon Sep 17 00:00:00 2001
From: Andy Shaw <qt-info@nokia.com>
Date: Fri, 24 Sep 2010 09:13:35 +0200
Subject: Fix dependency on the plugins rule for multimedia

When configuring with -no-multimedia then the plugins rule should not
be depending on multimedia, otherwise it will not try and build any
plugins.

Task-number: QTBUG-13912
Reviewed-by: Rohan McGovern
(cherry picked from commit c52224f8010bf90732e5b2ad6cef84f9bd248787)
---
 src/src.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/src.pro b/src/src.pro
index f856a0c..9a8b70fc 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -110,7 +110,8 @@ src_webkit_declarative.target = sub-webkitdeclarative
    contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl
    src_tools_activeqt.depends = src_tools_idc src_gui
    src_declarative.depends = src_gui src_script src_network
-   src_plugins.depends = src_gui src_sql src_svg src_multimedia
+   src_plugins.depends = src_gui src_sql src_svg
+   contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia
    src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
    src_s60installs.depends -= src_s60installs
    src_imports.depends = src_gui src_declarative
-- 
cgit v0.12


From 01de6e56c95e43fbbc8b645afbcf37e01a385740 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Fri, 24 Sep 2010 13:13:29 +0200
Subject: QML Debugging: Documentation fixes

Many things have changed with QML debugging in Qt Creator. Now docs
simply refer to Qt Creator documentation.

Reviewed-by: Leena Miettinen
(cherry picked from commit f61d2d16310aa0a87ec1ba823f903f19575aed7c)
---
 doc/src/declarative/qdeclarativedebugging.qdoc | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/doc/src/declarative/qdeclarativedebugging.qdoc b/doc/src/declarative/qdeclarativedebugging.qdoc
index ea21852..64c312c 100644
--- a/doc/src/declarative/qdeclarativedebugging.qdoc
+++ b/doc/src/declarative/qdeclarativedebugging.qdoc
@@ -79,20 +79,8 @@ QDeclarativeImportDatabase::resolveType "Rectangle" = "QDeclarativeRectangle"
 \section1 Debugging with Qt Creator
 
 \l{http://qt.nokia.com/products/developer-tools}{Qt Creator} provides built-in
-support for QML debugging. Open a QML project in Creator and enter Debug mode,
-or click the "Start Debugging" option from the menu, and Creator will
-show QML debugging information and options for your application, including
-object inspection, property monitoring and application frame-rate analysis.
-
-Creator can be used to debug both local and remote QML applications. To
-enable remote debugging, start the \l {QML Viewer}
-on the remote device with a debugging port defined, like this:
-
-\code
-    QML_DEBUG_SERVER_PORT=3768 qmlviewer myqmlfile.qml
-\endcode
-
-In Creator, open the project settings pane and set the server and port
-details for the remote device, then start debugging.
+support for QML debugging. QML projects and standalone C++ applications that
+utilize QML can be debugged on desktops as well as on remote devices.
+For more information, see the Qt Creator Manual.
 
 */
-- 
cgit v0.12


From 6529e1df5279e44e93c7f18333103658257c92d7 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Date: Sun, 26 Sep 2010 18:38:55 +0200
Subject: QHostInfo: Fix a crash when a new request is pushed while resolving.

The loop looking for posponedLookup in the lookup thread wasn't locking
the mutex before trying to access/modify the list.

Reviewed-by: Andreas Kling
(cherry picked from commit 45c2ac4f1e1218f595b1d21691c8dec4eaa1a021)
---
 src/network/kernel/qhostinfo.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 348b0d2..41a9512 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -468,14 +468,17 @@ void QHostInfoRunnable::run()
     resultEmitter.emitResultsReady(hostInfo);
 
     // now also iterate through the postponed ones
-    QMutableListIterator<QHostInfoRunnable*> iterator(manager->postponedLookups);
-    while (iterator.hasNext()) {
-        QHostInfoRunnable* postponed = iterator.next();
-        if (toBeLookedUp == postponed->toBeLookedUp) {
-            // we can now emit
-            iterator.remove();
-            hostInfo.setLookupId(postponed->id);
-            postponed->resultEmitter.emitResultsReady(hostInfo);
+    {
+        QMutexLocker locker(&manager->mutex);
+        QMutableListIterator<QHostInfoRunnable*> iterator(manager->postponedLookups);
+        while (iterator.hasNext()) {
+            QHostInfoRunnable* postponed = iterator.next();
+            if (toBeLookedUp == postponed->toBeLookedUp) {
+                // we can now emit
+                iterator.remove();
+                hostInfo.setLookupId(postponed->id);
+                postponed->resultEmitter.emitResultsReady(hostInfo);
+            }
         }
     }
 
-- 
cgit v0.12


From f8b96e9bdc488b20aa9ba0a8eec3a7b6edc5b2dd Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 22 Sep 2010 16:32:31 +0300
Subject: Improved Symbian4 platform detection

Now returns correct value for Symbian4 platforms with
QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should
also return correct value even if it doesn't get set in environment.prf.

Task-number: QTBUG-13802
Reviewed-by: Shane Kearns
Reviewed-by: Janne Anttila
(cherry picked from commit 0aad0d2043e061469b7139483c489dc6f823490b)
---
 mkspecs/common/symbian/symbian.conf | 62 ++++++++++++++++------------
 src/corelib/global/global.pri       |  3 ++
 src/corelib/global/qglobal.cpp      | 81 ++++++++++++++++++++++++-------------
 src/corelib/global/qglobal.h        |  4 +-
 4 files changed, 93 insertions(+), 57 deletions(-)

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 679731f..cc5b788 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -132,39 +132,49 @@ exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) {
 }
 
 # Try to detect SDK version if it wasn't set by environment.prf
-isEmpty(S60_VERSION) {
-    # The Symbian^3 PDK does not necessarily contain the required sis files.
-    # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too.
-    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
-        S60_VERSION = 5.2
+isEmpty(SYMBIAN_VERSION) {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Symbianv4.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/Symbianv4.sis) {
+        SYMBIAN_VERSION = Symbian4
     } else {
-        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
-            S60_VERSION = 5.1
+        # The Symbian^3 PDK does not necessarily contain the required sis files.
+        # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too.
+        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
+            SYMBIAN_VERSION = Symbian3
         } else {
-            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
-                S60_VERSION = 5.0
+            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
+                SYMBIAN_VERSION = Symbian2
             } else {
-                exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
-                    S60_VERSION = 3.2
+                exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
+                    SYMBIAN_VERSION = 9.4
                 } else {
-                    S60_VERSION = 3.1
+                    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
+                        SYMBIAN_VERSION = 9.3
+                    } else {
+                        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.1.sis) {
+                            SYMBIAN_VERSION = 9.2
+                        } else {
+                            SYMBIAN_VERSION = Unknown
+                        }
+                    }
                 }
             }
         }
     }
 }
 
-isEmpty(SYMBIAN_VERSION) {
-    contains(S60_VERSION, "3\\.1") {
-        SYMBIAN_VERSION = 9.2
-    } else:contains(S60_VERSION, "3\\.2") {
-        SYMBIAN_VERSION = 9.3
-    } else:contains(S60_VERSION, "5\\.0") {
-        SYMBIAN_VERSION = 9.4
-    } else:contains(S60_VERSION, "5\\.1") {
-        SYMBIAN_VERSION = Symbian2
-    } else:contains(S60_VERSION, "5\\.2") {
-        SYMBIAN_VERSION = Symbian3
+isEmpty(S60_VERSION) {
+    contains(SYMBIAN_VERSION, "9\\.2") {
+        S60_VERSION = 3.1
+    } else:contains(SYMBIAN_VERSION, "9\\.3") {
+        S60_VERSION = 3.2
+    } else:contains(SYMBIAN_VERSION, "9\\.4") {
+        S60_VERSION = 5.0
+    } else:contains(SYMBIAN_VERSION, "Symbian2") {
+        S60_VERSION = 5.1
+    } else:contains(SYMBIAN_VERSION, "Symbian3") {
+        S60_VERSION = 5.2
+    } else {
+        S60_VERSION = Unknown
     }
 }
 
@@ -174,14 +184,14 @@ isEmpty(SYMBIAN_VERSION) {
 
 default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies
 
-# Supports S60 3.0, 3.1, 3.2, 5.0 and Symbian^3 by default
+# Supports S60 3.1, 3.2, 5.0, Symbian^3, and Symbian^4 by default
 pkg_platform_dependencies = \
     "; Default HW/platform dependencies" \
-    "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
     "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
     "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
     "[0x1028315F],0,0,0,{\"S60ProductID\"}" \
-    "[0x20022e6d],0,0,0,{\"S60ProductID\"}" \
+    "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \
+    "[0x20032DE7],0,0,0,{\"S60ProductID\"}" \
     " "
 
 DEPLOYMENT += default_deployment
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 260ed59..4800716 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -24,3 +24,6 @@ linux*:!static:!linux-armcc:!linux-gcce {
    prog=$$quote(if (/program interpreter: (.*)]/) { print $1; })
    DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"
 }
+
+# Compensate for lack of platform defines in Symbian3 and Symbian4
+symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_))
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 401af85..3291fe7 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -86,7 +86,8 @@
 # include "private/qcore_symbian_p.h"
 
 _LIT(qt_S60Filter, "Series60v?.*.sis");
-_LIT(qt_S60SystemInstallDir, "z:\\system\\install\\");
+_LIT(qt_symbianFilter, "Symbianv*.sis");
+_LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\");
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -1813,12 +1814,12 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
 #endif
 
 #ifdef Q_OS_SYMBIAN
-static QSysInfo::S60Version cachedS60Version = QSysInfo::S60Version(-1);
+static QSysInfo::SymbianVersion cachedSymbianVersion = QSysInfo::SymbianVersion(-1);
 
-QSysInfo::S60Version QSysInfo::s60Version()
+QSysInfo::SymbianVersion QSysInfo::symbianVersion()
 {
-    if (cachedS60Version != -1)
-        return cachedS60Version;
+    if (cachedSymbianVersion != -1)
+        return cachedSymbianVersion;
 
     // Use pure Symbian code, because if done using QDir, there will be a call back
     // to this method, resulting doing this expensive operation twice before the cache kicks in.
@@ -1826,7 +1827,22 @@ QSysInfo::S60Version QSysInfo::s60Version()
     RFs rfs = qt_s60GetRFs();
     TFindFile fileFinder(rfs);
     CDir* contents;
-    TInt err = fileFinder.FindWildByDir(qt_S60Filter, qt_S60SystemInstallDir, contents);
+
+    // Check for Symbian4
+    TInt err = fileFinder.FindWildByDir(qt_symbianFilter, qt_symbianSystemInstallDir, contents);
+    if (err == KErrNone) {
+        QScopedPointer<CDir> contentsDeleter(contents);
+        err = contents->Sort(EDescending|ESortByName);
+        if (err == KErrNone && contents->Count() > 0 && (*contents)[0].iName.Length() >= 9) {
+            TInt major = (*contents)[0].iName[8] - '0';
+            if (major == 4) {
+                return cachedSymbianVersion = SV_SF_4;
+            }
+        }
+    }
+
+    // Check for S60 and Symbian3 platforms, which use older .sis naming scheme
+    err = fileFinder.FindWildByDir(qt_S60Filter, qt_symbianSystemInstallDir, contents);
     if (err == KErrNone) {
         QScopedPointer<CDir> contentsDeleter(contents);
         err = contents->Sort(EDescending|ESortByName);
@@ -1835,19 +1851,19 @@ QSysInfo::S60Version QSysInfo::s60Version()
             TInt minor = (*contents)[0].iName[11] - '0';
             if (major == 3) {
                 if (minor == 1) {
-                    return cachedS60Version = SV_S60_3_1;
+                    return cachedSymbianVersion = SV_9_2;
                 } else if (minor == 2) {
-                    return cachedS60Version = SV_S60_3_2;
+                    return cachedSymbianVersion = SV_9_3;
                 }
             } else if (major == 5) {
                 if (minor == 0) {
-                    return cachedS60Version = SV_S60_5_0;
+                    return cachedSymbianVersion = SV_9_4;
                 }
                 else if (minor == 1) {
-                    return cachedS60Version = SV_S60_5_1;
+                    return cachedSymbianVersion = SV_SF_2;
                 }
                 else if (minor == 2) {
-                    return cachedS60Version = SV_S60_5_2;
+                    return cachedSymbianVersion = SV_SF_3;
                 }
             }
         }
@@ -1855,33 +1871,40 @@ QSysInfo::S60Version QSysInfo::s60Version()
 
 #  ifdef Q_CC_NOKIAX86
     // Some emulator environments may not contain the version specific .sis files, so
-    // simply hardcode the version on those environments.
+    // simply hardcode the version on those environments. Note that can't use
+    // SYMBIAN_VERSION_* defines for S60 3.x/5.0 platforms, as they do not define them
+    // right anyway in case .sis files are not found.
 #   if defined(__SERIES60_31__)
-    return cachedS60Version = SV_S60_3_1;
+    return cachedSymbianVersion = SV_9_2;
 #   elif defined(__S60_32__)
-    return cachedS60Version = SV_S60_3_2;
+    return cachedSymbianVersion = SV_9_3;
 #   elif defined(__S60_50__)
-    return cachedS60Version = SV_S60_5_0;
+    return cachedSymbianVersion = SV_9_4;
+#   elif defined(SYMBIAN_VERSION_SYMBIAN3)
+    return cachedSymbianVersion = SV_SF_3;
+#   elif defined(SYMBIAN_VERSION_SYMBIAN4)
+    return cachedSymbianVersion = SV_SF_4;
 #   endif
 #  endif
     //If reaching here, it was not possible to determine the version
-    return cachedS60Version = SV_S60_Unknown;
+    return cachedSymbianVersion = SV_Unknown;
 }
-QSysInfo::SymbianVersion QSysInfo::symbianVersion()
+
+QSysInfo::S60Version QSysInfo::s60Version()
 {
-    switch (s60Version()) {
-    case SV_S60_3_1:
-        return SV_9_2;
-    case SV_S60_3_2:
-        return SV_9_3;
-    case SV_S60_5_0:
-        return SV_9_4;
-    case SV_S60_5_1:
-        return SV_SF_2;
-    case SV_S60_5_2:
-        return SV_SF_3;
+    switch (symbianVersion()) {
+    case SV_9_2:
+        return SV_S60_3_1;
+    case SV_9_3:
+        return SV_S60_3_2;
+    case SV_9_4:
+        return SV_S60_5_0;
+    case SV_SF_2:
+        return SV_S60_5_1;
+    case SV_SF_3:
+        return SV_S60_5_2;
     default:
-        return SV_Unknown;
+        return SV_S60_Unknown;
     }
 }
 #endif // ifdef Q_OS_SYMBIAN
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index c906a1c..3a35aa3 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1515,7 +1515,7 @@ public:
 #endif
 #ifdef Q_OS_SYMBIAN
     enum SymbianVersion {
-        SV_Unknown = 0x0000,
+        SV_Unknown = 1000000, // Assume unknown is something newer than what is supported
         //These are the Symbian Ltd versions 9.2-9.4
         SV_9_2 = 10,
         SV_9_3 = 20,
@@ -1529,7 +1529,7 @@ public:
     static SymbianVersion symbianVersion();
     enum S60Version {
         SV_S60_None = 0,
-        SV_S60_Unknown = 1,
+        SV_S60_Unknown = SV_Unknown,
         SV_S60_3_1 = SV_9_2,
         SV_S60_3_2 = SV_9_3,
         SV_S60_5_0 = SV_9_4,
-- 
cgit v0.12


From 7ad71b986fd9e8854a6eef049eea56cd5569e5fc Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Fri, 24 Sep 2010 11:47:36 +0200
Subject: fix RSS listing example

... by handling HTTP 30X responses and using QNetworkAccessManager
instead of QHttp. The server now sends back a HTTP 302 instead of a 200.

Reviewed-by: Markus Goetz
Task-number: QTBUG-13892
(cherry picked from commit 15ddcea2d15b7d7731e24151b0a30990e77efe74)
---
 examples/xml/rsslisting/main.cpp       |  1 -
 examples/xml/rsslisting/rsslisting.cpp | 89 +++++++++++++++++++---------------
 examples/xml/rsslisting/rsslisting.h   | 16 +++---
 3 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/examples/xml/rsslisting/main.cpp b/examples/xml/rsslisting/main.cpp
index 95c8a89..71ae0eb 100644
--- a/examples/xml/rsslisting/main.cpp
+++ b/examples/xml/rsslisting/main.cpp
@@ -57,7 +57,6 @@ Provides the main function for the RSS news reader example.
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
-    qWarning("The usage of QHttp is not recommended anymore, please use QNetworkAccessManager.");
     RSSListing *rsslisting = new RSSListing;
     rsslisting->show();
     return app.exec();
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index b7c9eb0..48c3062 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -65,21 +65,19 @@ its operation, and also allows very large data sources to be read.
     Constructs an RSSListing widget with a simple user interface, and sets
     up the XML reader to use a custom handler class.
 
-    The user interface consists of a line edit, two push buttons, and a
+    The user interface consists of a line edit, a push button, and a
     list view widget. The line edit is used for entering the URLs of news
-    sources; the push buttons start and abort the process of reading the
+    sources; the push button starts the process of reading the
     news.
 */
 
 RSSListing::RSSListing(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent), currentReply(0)
 {
     lineEdit = new QLineEdit(this);
     lineEdit->setText("http://labs.qt.nokia.com/blogs/feed");
 
     fetchButton = new QPushButton(tr("Fetch"), this);
-    abortButton = new QPushButton(tr("Abort"), this);
-    abortButton->setEnabled(false);
 
     treeWidget = new QTreeWidget(this);
     connect(treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)),
@@ -89,15 +87,11 @@ RSSListing::RSSListing(QWidget *parent)
     treeWidget->setHeaderLabels(headerLabels);
     treeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
 
-    connect(&http, SIGNAL(readyRead(QHttpResponseHeader)),
-             this, SLOT(readData(QHttpResponseHeader)));
-
-    connect(&http, SIGNAL(requestFinished(int,bool)),
-             this, SLOT(finished(int,bool)));
+    connect(&manager, SIGNAL(finished(QNetworkReply*)),
+             this, SLOT(finished(QNetworkReply*)));
 
     connect(lineEdit, SIGNAL(returnPressed()), this, SLOT(fetch()));
     connect(fetchButton, SIGNAL(clicked()), this, SLOT(fetch()));
-    connect(abortButton, SIGNAL(clicked()), &http, SLOT(abort()));
 
     QVBoxLayout *layout = new QVBoxLayout(this);
 
@@ -105,7 +99,6 @@ RSSListing::RSSListing(QWidget *parent)
 
     hboxLayout->addWidget(lineEdit);
     hboxLayout->addWidget(fetchButton);
-    hboxLayout->addWidget(abortButton);
 
     layout->addLayout(hboxLayout);
     layout->addWidget(treeWidget);
@@ -115,34 +108,53 @@ RSSListing::RSSListing(QWidget *parent)
 }
 
 /*
+    Starts the network request and connects the needed signals
+*/
+void RSSListing::get(const QUrl &url)
+{
+    QNetworkRequest request(url);
+    if (currentReply) {
+        currentReply->disconnect(this);
+        currentReply->deleteLater();
+    }
+    currentReply = manager.get(request);
+    connect(currentReply, SIGNAL(readyRead()), this, SLOT(readyRead()));
+    connect(currentReply, SIGNAL(metaDataChanged()), this, SLOT(metaDataChanged()));
+    connect(currentReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
+}
+
+/*
     Starts fetching data from a news source specified in the line
     edit widget.
 
     The line edit is made read only to prevent the user from modifying its
     contents during the fetch; this is only for cosmetic purposes.
-    The fetch button is disabled, and the abort button is enabled to allow
-    the user to interrupt processing. The list view is cleared, and we
+    The fetch button is disabled, the list view is cleared, and we
     define the last list view item to be 0, meaning that there are no
     existing items in the list.
 
-    The HTTP handler is supplied with the raw contents of the line edit and
-    a fetch is initiated. We keep the ID value returned by the HTTP handler
-    for future reference.
+    A URL is created with the raw contents of the line edit and
+    a get is initiated.
 */
 
 void RSSListing::fetch()
 {
     lineEdit->setReadOnly(true);
     fetchButton->setEnabled(false);
-    abortButton->setEnabled(true);
     treeWidget->clear();
 
     xml.clear();
 
     QUrl url(lineEdit->text());
+    get(url);
+}
 
-    http.setHost(url.host());
-    connectionId = http.get(url.path());
+void RSSListing::metaDataChanged()
+{
+    QUrl redirectionTarget = currentReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
+    if (redirectionTarget.isValid()) {
+        get(redirectionTarget);
+    }
 }
 
 /*
@@ -150,16 +162,14 @@ void RSSListing::fetch()
 
     We read all the available data, and pass it to the XML
     stream reader. Then we call the XML parsing function.
-
-    If parsing fails for any reason, we abort the fetch.
 */
 
-void RSSListing::readData(const QHttpResponseHeader &resp)
+void RSSListing::readyRead()
 {
-    if (resp.statusCode() != 200)
-        http.abort();
-    else {
-        xml.addData(http.readAll());
+    int statusCode = currentReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    if (statusCode >= 200 && statusCode < 300) {
+        QByteArray data = currentReply->readAll();
+        xml.addData(data);
         parseXml();
     }
 }
@@ -177,19 +187,11 @@ void RSSListing::readData(const QHttpResponseHeader &resp)
     user interface available to the user for further input.
 */
 
-void RSSListing::finished(int id, bool error)
+void RSSListing::finished(QNetworkReply *reply)
 {
-    if (error) {
-        qWarning("Received error during HTTP fetch.");
-        lineEdit->setReadOnly(false);
-        abortButton->setEnabled(false);
-        fetchButton->setEnabled(true);
-    }
-    else if (id == connectionId) {
-        lineEdit->setReadOnly(false);
-        abortButton->setEnabled(false);
-        fetchButton->setEnabled(true);
-    }
+    Q_UNUSED(reply);
+    lineEdit->setReadOnly(false);
+    fetchButton->setEnabled(true);
 }
 
 
@@ -225,7 +227,6 @@ void RSSListing::parseXml()
     }
     if (xml.error() && xml.error() != QXmlStreamReader::PrematureEndOfDocumentError) {
         qWarning() << "XML ERROR:" << xml.lineNumber() << ": " << xml.errorString();
-        http.abort();
     }
 }
 
@@ -236,3 +237,11 @@ void RSSListing::itemActivated(QTreeWidgetItem * item)
 {
     QDesktopServices::openUrl(QUrl(item->text(1)));
 }
+
+void RSSListing::error(QNetworkReply::NetworkError)
+{
+    qWarning("error retrieving RSS feed");
+    currentReply->disconnect(this);
+    currentReply->deleteLater();
+    currentReply = 0;
+}
diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/xml/rsslisting/rsslisting.h
index 8939dfd..9387222 100644
--- a/examples/xml/rsslisting/rsslisting.h
+++ b/examples/xml/rsslisting/rsslisting.h
@@ -41,10 +41,12 @@
 #ifndef RSSLISTING_H
 #define RSSLISTING_H
 
-#include <QHttp>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 #include <QWidget>
 #include <QBuffer>
 #include <QXmlStreamReader>
+#include <QUrl>
 
 QT_BEGIN_NAMESPACE
 class QLineEdit;
@@ -61,24 +63,26 @@ public:
 
 public slots:
     void fetch();
-    void finished(int id, bool error);
-    void readData(const QHttpResponseHeader &);
+    void finished(QNetworkReply *reply);
+    void readyRead();
+    void metaDataChanged();
     void itemActivated(QTreeWidgetItem * item);
+    void error(QNetworkReply::NetworkError);
 
 private:
     void parseXml();
+    void get(const QUrl &url);
 
     QXmlStreamReader xml;
     QString currentTag;
     QString linkString;
     QString titleString;
 
-    QHttp http;
-    int connectionId;
+    QNetworkAccessManager manager;
+    QNetworkReply *currentReply;
 
     QLineEdit *lineEdit;
     QTreeWidget *treeWidget;
-    QPushButton *abortButton;
     QPushButton *fetchButton;
 };
 
-- 
cgit v0.12


From 645e0a5c1beea5049e72e095ad3b6b126ad4941a Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 22 Sep 2010 09:16:42 +0200
Subject: Mitigate private header problems in QtCreator by adding semi-private
 API

Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.

Aaron Kennedy agreed with the idea.

Task-number: QTCREATORBUG-2179
(cherry picked from commit 63c4c0449361ced03838e51d18e1113740f27fa9)
---
 src/declarative/debugger/debugger.pri              |  6 +-
 src/declarative/debugger/qdeclarativedebug_p.h     |  1 -
 .../debugger/qdeclarativedebughelper.cpp           | 13 +++++
 .../debugger/qdeclarativedebughelper_p.h           | 25 ++++++++
 .../private_headers/qdeclarativedebughelper_p.h    | 25 ++++++++
 .../qdeclarativedebughelper.pro                    |  5 ++
 .../tst_qdeclarativedebughelper.cpp                | 68 ++++++++++++++++++++++
 7 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 src/declarative/debugger/qdeclarativedebughelper.cpp
 create mode 100644 src/declarative/debugger/qdeclarativedebughelper_p.h
 create mode 100644 tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
 create mode 100644 tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro
 create mode 100644 tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp

diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
index 33d0843..25f7687 100644
--- a/src/declarative/debugger/debugger.pri
+++ b/src/declarative/debugger/debugger.pri
@@ -6,7 +6,8 @@ SOURCES += \
     $$PWD/qdeclarativedebugservice.cpp \
     $$PWD/qdeclarativedebugclient.cpp \
     $$PWD/qdeclarativedebug.cpp \
-    $$PWD/qdeclarativedebugtrace.cpp
+    $$PWD/qdeclarativedebugtrace.cpp \
+    $$PWD/qdeclarativedebughelper.cpp
 
 HEADERS += \
     $$PWD/qdeclarativedebuggerstatus_p.h \
@@ -14,4 +15,5 @@ HEADERS += \
     $$PWD/qdeclarativedebugservice_p.h \
     $$PWD/qdeclarativedebugclient_p.h \
     $$PWD/qdeclarativedebug_p.h \
-    $$PWD/qdeclarativedebugtrace_p.h
+    $$PWD/qdeclarativedebugtrace_p.h \
+    $$PWD/qdeclarativedebughelper_p.h
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h
index f0fc488..2b1a115 100644
--- a/src/declarative/debugger/qdeclarativedebug_p.h
+++ b/src/declarative/debugger/qdeclarativedebug_p.h
@@ -365,7 +365,6 @@ private:
     int m_queryId;
     QVariant m_expr;
     QVariant m_result;
-
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp
new file mode 100644
index 0000000..99feff4
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebughelper.cpp
@@ -0,0 +1,13 @@
+#include "private/qdeclarativedebughelper_p.h"
+#include "private/qdeclarativeengine_p.h"
+
+#include <QtScript/QScriptEngine>
+
+QT_BEGIN_NAMESPACE
+
+QScriptEngine *QDeclarativeDebugHelper::getScriptEngine(QDeclarativeEngine *engine)
+{
+    return QDeclarativeEnginePrivate::getScriptEngine(engine);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h
new file mode 100644
index 0000000..a403c45
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebughelper_p.h
@@ -0,0 +1,25 @@
+#ifndef QDECLARATIVEDEBUGHELPER_P_H
+#define QDECLARATIVEDEBUGHELPER_P_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QScriptEngine;
+class QDeclarativeEngine;
+
+// Helper methods to access private API through a stable interface
+// This is used in the qmljsdebugger library of QtCreator.
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
+{
+public:
+    static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGHELPER_P_H
diff --git a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
new file mode 100644
index 0000000..a403c45
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
@@ -0,0 +1,25 @@
+#ifndef QDECLARATIVEDEBUGHELPER_P_H
+#define QDECLARATIVEDEBUGHELPER_P_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QScriptEngine;
+class QDeclarativeEngine;
+
+// Helper methods to access private API through a stable interface
+// This is used in the qmljsdebugger library of QtCreator.
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
+{
+public:
+    static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGHELPER_P_H
diff --git a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro
new file mode 100644
index 0000000..c52c652
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += network declarative script
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativedebughelper.cpp
diff --git a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
new file mode 100644
index 0000000..db62455
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+
+#include <QDeclarativeEngine>
+#include <private/qdeclarativeengine_p.h>
+
+// We have copied the header which is used in the qmljsdebugger (part of QtCreator)
+// to catch BC changes. Don't update it unless you know what you are doing!
+#include "private_headers/qdeclarativedebughelper_p.h"
+
+class tst_qdeclarativedebughelper : public QObject {
+    Q_OBJECT
+private slots:
+    void getScriptEngine();
+};
+
+void tst_qdeclarativedebughelper::getScriptEngine()
+{
+    QDeclarativeEngine engine;
+
+    QScriptEngine *scriptEngine = QDeclarativeDebugHelper::getScriptEngine(&engine);
+    QVERIFY(scriptEngine);
+    QCOMPARE(scriptEngine, QDeclarativeEnginePrivate::getScriptEngine(&engine));
+}
+
+QTEST_MAIN(tst_qdeclarativedebughelper)
+
+#include "tst_qdeclarativedebughelper.moc"
+
-- 
cgit v0.12


From 29dbafd9b4aba15c0e5c7a6f14368c53311edce2 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 22 Sep 2010 09:16:42 +0200
Subject: Mitigate private header problems in QtCreator by adding semi-private
 API

Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.

Aaron Kennedy agreed with the idea.

Task-number: QTCREATORBUG-2179
(cherry picked from commit c1a7deedf1628e0dd3a5fbf92d97c4151d17fb5a)
---
 .../debugger/qdeclarativedebughelper.cpp           | 56 ++++++++++++++++++++++
 .../debugger/qdeclarativedebughelper_p.h           | 42 ++++++++++++++++
 .../private_headers/qdeclarativedebughelper_p.h    | 42 ++++++++++++++++
 .../tst_qdeclarativedebughelper.cpp                | 47 ++++++++++++++++++
 4 files changed, 187 insertions(+)

diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp
index 99feff4..ea621bf 100644
--- a/src/declarative/debugger/qdeclarativedebughelper.cpp
+++ b/src/declarative/debugger/qdeclarativedebughelper.cpp
@@ -3,6 +3,55 @@
 
 #include <QtScript/QScriptEngine>
 
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "private/qdeclarativedebughelper_p.h"
+
+#include <QtCore/QAbstractAnimation>
+#include <QtScript/QScriptEngine>
+
+#include <private/qdeclarativeengine_p.h>
+#include <private/qabstractanimation_p.h>
+
 QT_BEGIN_NAMESPACE
 
 QScriptEngine *QDeclarativeDebugHelper::getScriptEngine(QDeclarativeEngine *engine)
@@ -10,4 +59,11 @@ QScriptEngine *QDeclarativeDebugHelper::getScriptEngine(QDeclarativeEngine *engi
     return QDeclarativeEnginePrivate::getScriptEngine(engine);
 }
 
+void QDeclarativeDebugHelper::setAnimationSlowDownFactor(qreal factor)
+{
+    QUnifiedTimer *timer = QUnifiedTimer::instance();
+    timer->setSlowModeEnabled(factor != 1.0);
+    timer->setSlowdownFactor(factor);
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h
index a403c45..c9cb839 100644
--- a/src/declarative/debugger/qdeclarativedebughelper_p.h
+++ b/src/declarative/debugger/qdeclarativedebughelper_p.h
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #ifndef QDECLARATIVEDEBUGHELPER_P_H
 #define QDECLARATIVEDEBUGHELPER_P_H
 
@@ -16,6 +57,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
 {
 public:
     static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
+    static void setAnimationSlowDownFactor(qreal factor);
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
index a403c45..c9cb839 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
+++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #ifndef QDECLARATIVEDEBUGHELPER_P_H
 #define QDECLARATIVEDEBUGHELPER_P_H
 
@@ -16,6 +57,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
 {
 public:
     static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
+    static void setAnimationSlowDownFactor(qreal factor);
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
index db62455..36f2222 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
+++ b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
@@ -42,6 +42,8 @@
 
 #include <QDeclarativeEngine>
 #include <private/qdeclarativeengine_p.h>
+#include <QAbstractAnimation>
+#include <private/qabstractanimation_p.h>
 
 // We have copied the header which is used in the qmljsdebugger (part of QtCreator)
 // to catch BC changes. Don't update it unless you know what you are doing!
@@ -51,6 +53,21 @@ class tst_qdeclarativedebughelper : public QObject {
     Q_OBJECT
 private slots:
     void getScriptEngine();
+    void setAnimationSlowDownFactor();
+};
+
+class TestAnimation : public QAbstractAnimation {
+public:
+    int updateCalled;
+
+    TestAnimation() : updateCalled(0) {}
+
+    virtual void updateCurrentTime(int /*currentTime*/) {
+        updateCalled++;
+    }
+    virtual int duration() const {
+        return 100;
+    }
 };
 
 void tst_qdeclarativedebughelper::getScriptEngine()
@@ -62,6 +79,36 @@ void tst_qdeclarativedebughelper::getScriptEngine()
     QCOMPARE(scriptEngine, QDeclarativeEnginePrivate::getScriptEngine(&engine));
 }
 
+void tst_qdeclarativedebughelper::setAnimationSlowDownFactor()
+{
+    TestAnimation animation;
+
+    // first check whether setup works
+    QCOMPARE(animation.updateCalled, 0);
+    animation.start();
+    QTest::qWait(animation.totalDuration() + 50);
+#ifdef Q_OS_WIN
+    if (animation.state() != QAbstractAnimation::Stopped)
+        QEXPECT_FAIL("", "On windows, consistent timing is not working properly due to bad timer resolution", Abort);
+#endif
+    QCOMPARE(animation.state(), QAbstractAnimation::Stopped);
+    QVERIFY(animation.updateCalled > 1);
+
+    // check if we can pause all animations
+    animation.updateCalled = 0;
+    QDeclarativeDebugHelper::setAnimationSlowDownFactor(0.0);
+    animation.start();
+    QTest::qWait(animation.totalDuration() + 50);
+    QVERIFY(animation.updateCalled <= 1); // updateCurrentTime seems to be called at  least once
+
+    // now run them again
+    animation.updateCalled = 0;
+    QDeclarativeDebugHelper::setAnimationSlowDownFactor(2.0);
+    animation.start();
+    QTest::qWait(animation.totalDuration() + 50);
+    QVERIFY(animation.updateCalled > 1);
+}
+
 QTEST_MAIN(tst_qdeclarativedebughelper)
 
 #include "tst_qdeclarativedebughelper.moc"
-- 
cgit v0.12


From a8d85de1d10a9cbe74d7b9a509229ee2e7570bde Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 23 Sep 2010 08:50:21 +1000
Subject: Move includes after copyright block (cherry picked from commit
 b750bb085029117497d26a24dcd590fbe34fe281)

---
 src/declarative/debugger/qdeclarativedebughelper.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp
index ea621bf..207ad2b 100644
--- a/src/declarative/debugger/qdeclarativedebughelper.cpp
+++ b/src/declarative/debugger/qdeclarativedebughelper.cpp
@@ -1,8 +1,3 @@
-#include "private/qdeclarativedebughelper_p.h"
-#include "private/qdeclarativeengine_p.h"
-
-#include <QtScript/QScriptEngine>
-
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -44,6 +39,8 @@
 **
 ****************************************************************************/
 
+#include <QtScript/QScriptEngine>
+
 #include "private/qdeclarativedebughelper_p.h"
 
 #include <QtCore/QAbstractAnimation>
-- 
cgit v0.12


From 4cc98be8a3623ec899837e3e424910671c9f9920 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 27 Sep 2010 19:56:07 +1000
Subject: Update QtDeclarative .def files.

---
 src/s60installs/bwins/QtDeclarativeu.def | 2 ++
 src/s60installs/eabi/QtDeclarativeu.def  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index cf2f325..bd2026d 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -1715,4 +1715,6 @@ EXPORTS
 	??0QDeclarativeListModel@@AAE@PBV0@PAVQDeclarativeListModelWorkerAgent@@@Z @ 1714 NONAME ; QDeclarativeListModel::QDeclarativeListModel(class QDeclarativeListModel const *, class QDeclarativeListModelWorkerAgent *)
 	?inWorkerThread@QDeclarativeListModel@@ABE_NXZ @ 1715 NONAME ; bool QDeclarativeListModel::inWorkerThread(void) const
 	?canMove@QDeclarativeListModel@@ABE_NHHH@Z @ 1716 NONAME ; bool QDeclarativeListModel::canMove(int, int, int) const
+	?getScriptEngine@QDeclarativeDebugHelper@@SAPAVQScriptEngine@@PAVQDeclarativeEngine@@@Z @ 1717 NONAME ; class QScriptEngine * QDeclarativeDebugHelper::getScriptEngine(class QDeclarativeEngine *)
+	?setAnimationSlowDownFactor@QDeclarativeDebugHelper@@SAXM@Z @ 1718 NONAME ; void QDeclarativeDebugHelper::setAnimationSlowDownFactor(float)
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 11dee4d..9762c55 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1747,4 +1747,6 @@ EXPORTS
 	_ZN21QDeclarativeListModelC1EPKS_P32QDeclarativeListModelWorkerAgent @ 1746 NONAME
 	_ZN21QDeclarativeListModelC2EPKS_P32QDeclarativeListModelWorkerAgent @ 1747 NONAME
 	_ZNK21QDeclarativeListModel14inWorkerThreadEv @ 1748 NONAME
+	_ZN23QDeclarativeDebugHelper15getScriptEngineEP18QDeclarativeEngine @ 1749 NONAME
+	_ZN23QDeclarativeDebugHelper26setAnimationSlowDownFactorEf @ 1750 NONAME
 
-- 
cgit v0.12


From bcdc043e357d6168663a6fbb4bf2d596d12cab77 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 24 Sep 2010 16:29:46 +0200
Subject: Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2

Includes Jay's fix for the JSC memory consumption on Symbian
https://bugs.webkit.org/show_bug.cgi?id=34349

See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9
(cherry picked from commit dbf1d0339a0cfbe60e6b3e45f39e6c02aa3de0a8)
---
 src/3rdparty/webkit/.tag                           |   2 +-
 src/3rdparty/webkit/ChangeLog                      |   8 ++
 src/3rdparty/webkit/JavaScriptCore/ChangeLog       |  36 +++++++
 .../webkit/JavaScriptCore/JavaScriptCore.pro       |   1 +
 .../JavaScriptCore/interpreter/RegisterFile.cpp    |   2 +
 .../JavaScriptCore/interpreter/RegisterFile.h      |  33 +++++-
 .../wtf/symbian/RegisterFileAllocatorSymbian.cpp   | 111 +++++++++++++++++++++
 .../wtf/symbian/RegisterFileAllocatorSymbian.h     |  69 +++++++++++++
 .../JavaScriptCore/wtf/symbian/SymbianDefines.h    |  42 ++++++++
 src/3rdparty/webkit/VERSION                        |   2 +-
 src/3rdparty/webkit/WebCore/ChangeLog              |  31 ++++++
 11 files changed, 332 insertions(+), 5 deletions(-)
 create mode 100644 src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp
 create mode 100644 src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h
 create mode 100644 src/3rdparty/webkit/JavaScriptCore/wtf/symbian/SymbianDefines.h

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index ae33228..fff71f4 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-715b53069911a31a559aa0b3d94ffc6a5ac20988
+6e15c3404d15a8ab72242152ec966e5e388161a2
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index 14d6da3..f438655 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-24  Romain Pokrzywka  <romain@kdab.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the Wince build.
+
+        * WebKit.pri: Apply msvc flags to wince, too.
+
 2010-07-01  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Rubber-stamped by Laszlo Gombos.
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 9922da6..c7e0fc2 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -1,3 +1,39 @@
+2010-06-18  Tucker Jay  <jay.tucker@nokia.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        [Symbian] Lazy commit of memory required in JSC register file
+        https://bugs.webkit.org/show_bug.cgi?id=34349
+
+        * JavaScriptCore.pro: Added 1 new Symbian source file
+        * interpreter/RegisterFile.cpp:
+        (JSC::RegisterFile::~RegisterFile):
+        * interpreter/RegisterFile.h:
+        (JSC::RegisterFile::):
+        (JSC::RegisterFile::start):
+        (JSC::RegisterFile::end):
+        (JSC::RegisterFile::size):
+        (JSC::RegisterFile::setNumGlobals):
+        (JSC::RegisterFile::numGlobals):
+        (JSC::RegisterFile::maxGlobals):
+        (JSC::RegisterFile::lastGlobal):
+        (JSC::RegisterFile::markGlobals):
+        (JSC::RegisterFile::markCallFrames):
+        (JSC::isPageAligned):
+        (JSC::RegisterFile::RegisterFile):
+        (JSC::RegisterFile::shrink):
+        (JSC::RegisterFile::grow):
+        * wtf/symbian/RegisterFileAllocatorSymbian.cpp: Added.
+        (WTF::RegisterFileAllocator::RegisterFileAllocator):
+        Helper class to allocate memory required by RegisterFile
+        more efficiently.
+        (WTF::RegisterFileAllocator::~RegisterFileAllocator):
+        (WTF::RegisterFileAllocator::buffer):
+        (WTF::RegisterFileAllocator::grow):
+        (WTF::RegisterFileAllocator::shrink):
+        * wtf/symbian/RegisterFileAllocatorSymbian.h: Added.
+        * wtf/symbian/SymbianDefines.h: Added.
+
 2010-06-16  Thiago Macieira <thiago.macieira@nokia.com>
 
         Reviewed by NOBODY (OOPS!).
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
index 3f1ac86..a805170 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -208,6 +208,7 @@ SOURCES += \
     wtf/qt/ThreadingQt.cpp \
     wtf/RandomNumber.cpp \
     wtf/RefCountedLeakCounter.cpp \
+    wtf/symbian/RegisterFileAllocatorSymbian.cpp \
     wtf/symbian/BlockAllocatorSymbian.cpp \
     wtf/ThreadingNone.cpp \
     wtf/Threading.cpp \
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp
index 510effe..4a33c62 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp
@@ -40,6 +40,8 @@ RegisterFile::~RegisterFile()
     VirtualFree(m_buffer, DWORD(m_commitEnd) - DWORD(m_buffer), MEM_DECOMMIT);
 #endif
     VirtualFree(m_buffer, 0, MEM_RELEASE);
+#elif OS(SYMBIAN)
+    delete m_registerFileAllocator;
 #else
     fastFree(m_buffer);
 #endif
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h
index 1fc4f82..80cf991 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h
@@ -41,6 +41,10 @@
 #include <sys/mman.h>
 #endif
 
+#if OS(SYMBIAN)
+#include <wtf/symbian/RegisterFileAllocatorSymbian.h>
+#endif
+
 namespace JSC {
 
 /*
@@ -152,12 +156,21 @@ namespace JSC {
 #if HAVE(VIRTUALALLOC)
         Register* m_commitEnd;
 #endif
+#if OS(SYMBIAN)
+        // Commits and frees a continguous chunk of memory as required
+        WTF::RegisterFileAllocator* m_registerFileAllocator;
+#endif
 
         JSGlobalObject* m_globalObject; // The global object whose vars are currently stored in the register file.
     };
 
     // FIXME: Add a generic getpagesize() to WTF, then move this function to WTF as well.
-    inline bool isPageAligned(size_t size) { return size != 0 && size % (8 * 1024) == 0; }
+    // This is still a hack that should be fixed later. We know that a Symbian page size is 4K.
+    #if OS(SYMBIAN)
+    inline bool isPageAligned(size_t size) { return size && !(size % (4 * 1024)); }
+    #else
+    inline bool isPageAligned(size_t size) { return size && !(size % (8 * 1024)); }
+    #endif
 
     inline RegisterFile::RegisterFile(size_t capacity, size_t maxGlobals)
         : m_numGlobals(0)
@@ -204,7 +217,13 @@ namespace JSC {
             CRASH();
         }
         m_commitEnd = reinterpret_cast<Register*>(reinterpret_cast<char*>(m_buffer) + committedSize);
-    #else 
+    #elif OS(SYMBIAN)
+        m_registerFileAllocator = new WTF::RegisterFileAllocator(bufferLength);
+        m_buffer = (Register*)(m_registerFileAllocator->buffer());
+        // start by committing enough space to hold maxGlobals
+        void* newEnd = (void*)((int)m_buffer + (maxGlobals * sizeof(Register)));
+        m_registerFileAllocator->grow(newEnd);
+    #else
         /* 
          * If neither MMAP nor VIRTUALALLOC are available - use fastMalloc instead.
          *
@@ -226,8 +245,13 @@ namespace JSC {
         if (newEnd >= m_end)
             return;
         m_end = newEnd;
-        if (m_end == m_start && (m_maxUsed - m_start) > maxExcessCapacity)
+        if (m_end == m_start && (m_maxUsed - m_start) > maxExcessCapacity) {
+#if OS(SYMBIAN)
+            m_registerFileAllocator->shrink(newEnd);
+#endif
+
             releaseExcessCapacity();
+        }
     }
 
     inline bool RegisterFile::grow(Register* newEnd)
@@ -252,6 +276,9 @@ namespace JSC {
             m_commitEnd = reinterpret_cast<Register*>(reinterpret_cast<char*>(m_commitEnd) + size);
         }
 #endif
+#if OS(SYMBIAN)
+        m_registerFileAllocator->grow((void*)newEnd);
+#endif
 
         if (newEnd > m_maxUsed)
             m_maxUsed = newEnd;
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp
new file mode 100644
index 0000000..baa7841
--- /dev/null
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if OS(SYMBIAN)
+
+#include "RegisterFileAllocatorSymbian.h"
+
+namespace WTF {
+
+/** Efficiently allocates memory pools of size poolSize.
+ * Primarily designed for JSC RegisterFile's needs.
+ * Not thread-safe.
+ */
+RegisterFileAllocator::RegisterFileAllocator(TUint32 reservationSize, TUint32 poolSize) :
+    m_reserved(reservationSize), m_poolSize(poolSize)
+{
+    // Get system's page size value.
+    SYMBIAN_PAGESIZE(m_pageSize);
+
+    // We only accept multiples of system page size for both initial reservation
+    // and the alignment/pool size
+    m_reserved = SYMBIAN_ROUNDUPTOMULTIPLE(m_reserved, m_pageSize);
+    __ASSERT_ALWAYS(SYMBIAN_ROUNDUPTOMULTIPLE(m_poolSize, m_pageSize),
+                    User::Panic(_L("RegisterFileAllocator1"), KErrArgument));
+
+    // Open a Symbian RChunk, and reserve requested virtual address range
+    // Any thread in this process can operate this RChunk due to EOwnerProcess access rights.
+    TInt ret = m_chunk.CreateDisconnectedLocal(0 , 0, (TInt)m_reserved , EOwnerProcess);
+    if (ret != KErrNone)
+        User::Panic(_L("RegisterFileAllocator2"), ret);
+
+    m_buffer = (void*)m_chunk.Base();
+    m_resEnd = (void*)(m_chunk.Base() + m_chunk.MaxSize());
+    m_comEnd = m_buffer;
+}
+
+RegisterFileAllocator::~RegisterFileAllocator()
+{
+    // release everything!
+    m_chunk.Decommit(0, m_chunk.MaxSize());
+    m_chunk.Close();
+}
+
+void* RegisterFileAllocator::buffer() const
+{
+    return m_buffer;
+}
+
+void RegisterFileAllocator::grow(void* newEnd)
+{
+    // trying to commit more memory than reserved!
+    if (newEnd > m_resEnd)
+        return;
+
+    if (newEnd > m_comEnd) {
+        TInt nBytes = (TInt)(newEnd) - (TInt)(m_comEnd);
+        nBytes = SYMBIAN_ROUNDUPTOMULTIPLE(nBytes, m_poolSize);
+        TInt offset = (TInt)m_comEnd - (TInt)m_buffer;
+
+        TInt ret = m_chunk.Commit(offset, nBytes);
+        if (ret == KErrNone)
+            m_comEnd = (void*)(m_chunk.Base() + m_chunk.Size());
+    }
+}
+
+void RegisterFileAllocator::shrink(void* newEnd)
+{
+    if (newEnd < m_comEnd) {
+        TInt nBytes = (TInt)newEnd - (TInt)m_comEnd;
+        if (nBytes >= m_poolSize) {
+            TInt offset = SYMBIAN_ROUNDUPTOMULTIPLE((TUint)newEnd, m_poolSize) - (TInt)m_buffer;
+            nBytes = (TInt)m_comEnd - offset - (TInt)m_buffer;
+            if (nBytes > 0) {
+                TInt ret = m_chunk.Decommit(offset, nBytes);
+                if (ret == KErrNone)
+                    m_comEnd = (void*)(m_chunk.Base() + m_chunk.Size());
+            }
+        }
+    }
+}
+
+} // end of namespace
+
+#endif // SYMBIAN
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h b/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h
new file mode 100644
index 0000000..4cfc8c5
--- /dev/null
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RegisterFileAllocatorSymbian_h
+#define RegisterFileAllocatorSymbian_h
+
+#include "SymbianDefines.h"
+
+namespace WTF {
+
+/**
+ *  Allocates contiguous regions of size poolSize.
+ *  poolSize must be a multiple of system page size (typically 4K on Symbian/ARM)
+ *
+ *  @param reservationSize Virtual address range to be reserved upon creation of chunk (bytes).
+ *  @param poolSize Size of a single allocation.
+ */
+class RegisterFileAllocator {
+
+public:
+    RegisterFileAllocator(
+            TUint32 reservationSize, TUint32 poolSize = SYMBIAN_REGFILEALLOC_DEFAULTPOOLSIZE);
+    ~RegisterFileAllocator();
+    void* buffer() const;
+    void grow(void* newEnd);
+    void shrink(void* newEnd);
+
+private:
+    RChunk   m_chunk; // Symbian chunk that lets us reserve/commit/decommit
+
+    // all following values are in numbers of bytes
+    TInt     m_pageSize; // cached value of system page size, typically 4K on Symbian
+    TUint32  m_reserved; // total number of reserved bytes in virtual memory
+    TUint32  m_poolSize; // size of one memory pool, set by default to 64K in wtf/symbian/SymbianDefines.h
+
+    void* m_buffer; // pointer to base of the chunk
+    void* m_comEnd; // pointer to end of currently committed memory
+    void* m_resEnd; // pointer to end of reserved memory
+
+};
+
+} // end of namespace
+
+#endif // RegisterFileAllocatorSymbian_h
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/SymbianDefines.h b/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/SymbianDefines.h
new file mode 100644
index 0000000..43e22b3
--- /dev/null
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/SymbianDefines.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SymbianDefines_h
+#define SymbianDefines_h
+
+#include <e32cmn.h>
+#include <e32std.h>
+#include <hal.h>
+
+#define SYMBIAN_PAGESIZE(x) (HAL::Get(HALData::EMemoryPageSize, x));
+#define SYMBIAN_FREERAM(x)  (HAL::Get(HALData::EMemoryRAMFree, x));
+#define SYMBIAN_ROUNDUPTOMULTIPLE(x, multipleof) ( (x + multipleof - 1) & ~(multipleof - 1) )
+
+#define SYMBIAN_REGFILEALLOC_DEFAULTPOOLSIZE 65536 // 64K
+
+#endif // SymbianDefines_h
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index f919bdf..a270d56 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        715b53069911a31a559aa0b3d94ffc6a5ac20988
+        6e15c3404d15a8ab72242152ec966e5e388161a2
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 2d20cbd..ac698e3 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2010-09-24  Romain Pokrzywka  <romain@kdab.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the Wince build.
+
+        * WebCore.pro: Apply msvc flags to wince, too.
+
+2010-09-24  Anders Bakken  <agbakken@gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Enable building Qt/Webkit with debug symbols
+
+        With this patch one can configure with -webkit-debug to build Webkit
+        with debug symbols without having to manually edit WebCore.pro.
+
+        * WebCore.pro:
+
+2010-09-16  Thomas Zander <t.zander@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45878
+
+        [Qt] Fixed incorrect Symbian scoping.
+
+        The missing install functionality is only true for mmp based systems.
+
+        * WebCore.pro: limit functionality to mmp systems.
+
 2010-09-09  Kristian Amlie  <kristian.amlie@nokia.com>
 
         Reviewed by Andreas Kling.
-- 
cgit v0.12


From d6da3caf5692efbf3b927c902888ea679a0ef8f1 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Mon, 27 Sep 2010 17:05:25 +1000
Subject: Connect/Disconnect requests needs to use the same dbus connection to
 ICD for the refcounting to work in ICD.

Fixes NB#188145 -  Network interface doesn't go down after last client disconnects
(cherry picked from commit 4acbb418b1ad093ad848143218a10ee2957db282)
---
 src/plugins/bearer/icd/qnetworksession_impl.cpp | 6 ++----
 src/plugins/bearer/icd/qnetworksession_impl.h   | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index 8013d30..787cc55 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -881,7 +881,6 @@ void QNetworkSessionPrivateImpl::close()
     } else if (isOpen) {
         if ((activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
 	    // We will not wait any disconnect from icd as it might never come
-	    Maemo::Icd icd;
 #ifdef BEARER_MANAGEMENT_DEBUG
 	    qDebug() << "closing session" << publicConfig.identifier();
 #endif
@@ -894,7 +893,7 @@ void QNetworkSessionPrivateImpl::close()
 	    opened = false;
 	    isOpen = false;
 
-	    icd.disconnect(ICD_CONNECTION_FLAG_APPLICATION_EVENT);
+        m_dbusInterface->call(ICD_DBUS_API_DISCONNECT_REQ, ICD_CONNECTION_FLAG_APPLICATION_EVENT);
 	    startTime = QDateTime();
         } else {
 	    opened = false;
@@ -915,7 +914,6 @@ void QNetworkSessionPrivateImpl::stop()
         emit QNetworkSessionPrivate::error(lastError);
     } else {
         if ((activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-	    Maemo::Icd icd;
 #ifdef BEARER_MANAGEMENT_DEBUG
 	    qDebug() << "stopping session" << publicConfig.identifier();
 #endif
@@ -928,7 +926,7 @@ void QNetworkSessionPrivateImpl::stop()
 	    opened = false;
 	    isOpen = false;
 
-	    icd.disconnect(ICD_CONNECTION_FLAG_APPLICATION_EVENT);
+        m_dbusInterface->call(ICD_DBUS_API_DISCONNECT_REQ, ICD_CONNECTION_FLAG_APPLICATION_EVENT);
 	    startTime = QDateTime();
         } else {
 	    opened = false;
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.h b/src/plugins/bearer/icd/qnetworksession_impl.h
index 390e508..a879971 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.h
+++ b/src/plugins/bearer/icd/qnetworksession_impl.h
@@ -58,6 +58,7 @@
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qtimer.h>
+#include <QtCore/quuid.h>
 
 #include <QtDBus/qdbusconnection.h>
 #include <QtDBus/qdbusinterface.h>
@@ -98,7 +99,9 @@ public:
         m_stopTimer.setSingleShot(true);
         connect(&m_stopTimer, SIGNAL(timeout()), this, SLOT(finishStopBySendingClosedSignal()));
 
-        QDBusConnection systemBus = QDBusConnection::systemBus();
+        QDBusConnection systemBus = QDBusConnection::connectToBus(
+            QDBusConnection::SystemBus,
+            QUuid::createUuid().toString());
 
         m_dbusInterface = new QDBusInterface(ICD_DBUS_API_INTERFACE,
                                          ICD_DBUS_API_PATH,
-- 
cgit v0.12


From 45f05e32294680f15257990122ba42ef6049f13b Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Mon, 27 Sep 2010 17:07:55 +1000
Subject: Closes properly the dbus connection in icd backend (cherry picked
 from commit 2ff0dee1b97348a750532223f0a318596c93d412)

---
 src/plugins/bearer/icd/qnetworksession_impl.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/bearer/icd/qnetworksession_impl.h b/src/plugins/bearer/icd/qnetworksession_impl.h
index a879971..9ef9dc3 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.h
+++ b/src/plugins/bearer/icd/qnetworksession_impl.h
@@ -126,6 +126,8 @@ public:
     ~QNetworkSessionPrivateImpl()
     {
         cleanupSession();
+
+        QDBusConnection::disconnectFromBus(m_dbusInterface->connection().name());
     }
 
     //called by QNetworkSession constructor and ensures
-- 
cgit v0.12


From 131327ffc04d9888ce2b820833867d5a18a6f109 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Mon, 27 Sep 2010 17:12:02 +1000
Subject: Removing libconninet 3rdparty component.

The use of libconninet caused Qt to have a cyclic build dependency.
Which was solved by embedding a copy as a 3rd party library. Maemo has
since donated the libconninet code to Qt because (1) it was a private
Maemo API and (2) the Qt ICD plugin is the only user of the library.

This commit moves the relevent code from src/3rdparty/libconninet to
src/plugins/bearer/icd and deletes the rest.

Task-number: QT-3893
(cherry picked from commit f532d8fcd236be9933e4186a95561e1c264de277)
---
 src/3rdparty/libconninet.pri                       |   18 -
 src/3rdparty/libconninet/AUTHORS                   |    0
 src/3rdparty/libconninet/COPYING                   |  510 --------
 src/3rdparty/libconninet/ChangeLog                 |    0
 src/3rdparty/libconninet/INSTALL                   |  229 ----
 src/3rdparty/libconninet/NEWS                      |    0
 src/3rdparty/libconninet/README                    |    0
 src/3rdparty/libconninet/autogen.sh                |    3 -
 src/3rdparty/libconninet/configure.ac              |   86 --
 src/3rdparty/libconninet/conninet.pc.in            |   11 -
 src/3rdparty/libconninet/debian/changelog          |  305 -----
 src/3rdparty/libconninet/debian/compat             |    1 -
 src/3rdparty/libconninet/debian/control            |   39 -
 src/3rdparty/libconninet/debian/copyright          |   19 -
 .../libconninet/debian/libconninet0-dev.dirs       |    2 -
 .../libconninet/debian/libconninet0-dev.files      |    4 -
 src/3rdparty/libconninet/debian/libconninet0.dirs  |    1 -
 src/3rdparty/libconninet/debian/libconninet0.files |    1 -
 src/3rdparty/libconninet/debian/rules              |  123 --
 src/3rdparty/libconninet/doxygen.cfg.in            | 1147 -----------------
 src/3rdparty/libconninet/src/dbusdispatcher.cpp    |  611 ---------
 src/3rdparty/libconninet/src/dbusdispatcher.h      |   91 --
 src/3rdparty/libconninet/src/iapconf.cpp           |  299 -----
 src/3rdparty/libconninet/src/iapconf.h             |   84 --
 src/3rdparty/libconninet/src/iapmonitor.cpp        |  110 --
 src/3rdparty/libconninet/src/iapmonitor.h          |   48 -
 src/3rdparty/libconninet/src/maemo_icd.cpp         | 1316 --------------------
 src/3rdparty/libconninet/src/maemo_icd.h           |  182 ---
 src/3rdparty/libconninet/src/proxyconf.cpp         |  392 ------
 src/3rdparty/libconninet/src/proxyconf.h           |   53 -
 .../libconninet/tests/ut_dbusdispatcher.cpp        |  191 ---
 src/3rdparty/libconninet/tests/ut_iapconf.cpp      |  186 ---
 src/3rdparty/libconninet/tests/ut_iapmonitor.cpp   |  118 --
 src/3rdparty/libconninet/tests/ut_maemo_icd.cpp    |  274 ----
 src/3rdparty/libconninet/tests/ut_proxyconf.cpp    |  400 ------
 src/plugins/bearer/icd/dbusdispatcher.cpp          |  631 ++++++++++
 src/plugins/bearer/icd/dbusdispatcher.h            |  111 ++
 src/plugins/bearer/icd/iapconf.cpp                 |  245 ++++
 src/plugins/bearer/icd/iapconf.h                   |   74 ++
 src/plugins/bearer/icd/iapmonitor.cpp              |  130 ++
 src/plugins/bearer/icd/iapmonitor.h                |   68 +
 src/plugins/bearer/icd/icd.pro                     |   16 +-
 src/plugins/bearer/icd/maemo_icd.cpp               |  849 +++++++++++++
 src/plugins/bearer/icd/maemo_icd.h                 |  174 +++
 src/plugins/bearer/icd/proxyconf.cpp               |  412 ++++++
 src/plugins/bearer/icd/proxyconf.h                 |   73 ++
 src/plugins/bearer/icd/qicdengine.cpp              |   14 +-
 src/plugins/bearer/icd/qicdengine.h                |    2 +-
 src/plugins/bearer/icd/qnetworksession_impl.cpp    |   12 +-
 src/plugins/bearer/icd/wlan-utils.h                |  110 ++
 50 files changed, 2915 insertions(+), 6860 deletions(-)
 delete mode 100644 src/3rdparty/libconninet.pri
 delete mode 100644 src/3rdparty/libconninet/AUTHORS
 delete mode 100644 src/3rdparty/libconninet/COPYING
 delete mode 100644 src/3rdparty/libconninet/ChangeLog
 delete mode 100644 src/3rdparty/libconninet/INSTALL
 delete mode 100644 src/3rdparty/libconninet/NEWS
 delete mode 100644 src/3rdparty/libconninet/README
 delete mode 100755 src/3rdparty/libconninet/autogen.sh
 delete mode 100644 src/3rdparty/libconninet/configure.ac
 delete mode 100644 src/3rdparty/libconninet/conninet.pc.in
 delete mode 100644 src/3rdparty/libconninet/debian/changelog
 delete mode 100644 src/3rdparty/libconninet/debian/compat
 delete mode 100644 src/3rdparty/libconninet/debian/control
 delete mode 100644 src/3rdparty/libconninet/debian/copyright
 delete mode 100644 src/3rdparty/libconninet/debian/libconninet0-dev.dirs
 delete mode 100644 src/3rdparty/libconninet/debian/libconninet0-dev.files
 delete mode 100644 src/3rdparty/libconninet/debian/libconninet0.dirs
 delete mode 100644 src/3rdparty/libconninet/debian/libconninet0.files
 delete mode 100755 src/3rdparty/libconninet/debian/rules
 delete mode 100644 src/3rdparty/libconninet/doxygen.cfg.in
 delete mode 100644 src/3rdparty/libconninet/src/dbusdispatcher.cpp
 delete mode 100644 src/3rdparty/libconninet/src/dbusdispatcher.h
 delete mode 100644 src/3rdparty/libconninet/src/iapconf.cpp
 delete mode 100644 src/3rdparty/libconninet/src/iapconf.h
 delete mode 100644 src/3rdparty/libconninet/src/iapmonitor.cpp
 delete mode 100644 src/3rdparty/libconninet/src/iapmonitor.h
 delete mode 100644 src/3rdparty/libconninet/src/maemo_icd.cpp
 delete mode 100644 src/3rdparty/libconninet/src/maemo_icd.h
 delete mode 100644 src/3rdparty/libconninet/src/proxyconf.cpp
 delete mode 100644 src/3rdparty/libconninet/src/proxyconf.h
 delete mode 100644 src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp
 delete mode 100644 src/3rdparty/libconninet/tests/ut_iapconf.cpp
 delete mode 100644 src/3rdparty/libconninet/tests/ut_iapmonitor.cpp
 delete mode 100644 src/3rdparty/libconninet/tests/ut_maemo_icd.cpp
 delete mode 100644 src/3rdparty/libconninet/tests/ut_proxyconf.cpp
 create mode 100644 src/plugins/bearer/icd/dbusdispatcher.cpp
 create mode 100644 src/plugins/bearer/icd/dbusdispatcher.h
 create mode 100644 src/plugins/bearer/icd/iapconf.cpp
 create mode 100644 src/plugins/bearer/icd/iapconf.h
 create mode 100644 src/plugins/bearer/icd/iapmonitor.cpp
 create mode 100644 src/plugins/bearer/icd/iapmonitor.h
 create mode 100644 src/plugins/bearer/icd/maemo_icd.cpp
 create mode 100644 src/plugins/bearer/icd/maemo_icd.h
 create mode 100644 src/plugins/bearer/icd/proxyconf.cpp
 create mode 100644 src/plugins/bearer/icd/proxyconf.h
 create mode 100644 src/plugins/bearer/icd/wlan-utils.h

diff --git a/src/3rdparty/libconninet.pri b/src/3rdparty/libconninet.pri
deleted file mode 100644
index e041e2b..0000000
--- a/src/3rdparty/libconninet.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDEPATH += $$PWD/libconninet/src
-
-QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-
-HEADERS += \
-    $$PWD/libconninet/src/dbusdispatcher.h \
-    $$PWD/libconninet/src/iapconf.h \
-    $$PWD/libconninet/src/iapmonitor.h \
-    $$PWD/libconninet/src/maemo_icd.h \
-    $$PWD/libconninet/src/proxyconf.h
-
-SOURCES += \
-    $$PWD/libconninet/src/dbusdispatcher.cpp \
-    $$PWD/libconninet/src/iapconf.cpp \
-    $$PWD/libconninet/src/iapmonitor.cpp \
-    $$PWD/libconninet/src/maemo_icd.cpp \
-    $$PWD/libconninet/src/proxyconf.cpp
-
diff --git a/src/3rdparty/libconninet/AUTHORS b/src/3rdparty/libconninet/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/src/3rdparty/libconninet/COPYING b/src/3rdparty/libconninet/COPYING
deleted file mode 100644
index b124cf5..0000000
--- a/src/3rdparty/libconninet/COPYING
+++ /dev/null
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/src/3rdparty/libconninet/ChangeLog b/src/3rdparty/libconninet/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/src/3rdparty/libconninet/INSTALL b/src/3rdparty/libconninet/INSTALL
deleted file mode 100644
index 54caf7c..0000000
--- a/src/3rdparty/libconninet/INSTALL
+++ /dev/null
@@ -1,229 +0,0 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/src/3rdparty/libconninet/NEWS b/src/3rdparty/libconninet/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/src/3rdparty/libconninet/README b/src/3rdparty/libconninet/README
deleted file mode 100644
index e69de29..0000000
diff --git a/src/3rdparty/libconninet/autogen.sh b/src/3rdparty/libconninet/autogen.sh
deleted file mode 100755
index a8fd885..0000000
--- a/src/3rdparty/libconninet/autogen.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-autoreconf --verbose --install --force
diff --git a/src/3rdparty/libconninet/configure.ac b/src/3rdparty/libconninet/configure.ac
deleted file mode 100644
index 72fa98b..0000000
--- a/src/3rdparty/libconninet/configure.ac
+++ /dev/null
@@ -1,86 +0,0 @@
-AC_INIT([libconninet], patsubst(esyscmd([dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}']), [
-]), [jukka.rissanen@nokia.com])
-AM_INIT_AUTOMAKE([foreign])
-
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-AC_ARG_ENABLE(docs,     [ --enable-docs      Build DOXYGEN documentation (requires Doxygen)],enable_docs=$enableval,enable_docs=auto)
-
-AC_PATH_PROG(DOXYGEN, doxygen, no)
-AC_MSG_CHECKING([whether to build Doxygen documentation])
-
-if test x$DOXYGEN = xno ; then
-    have_doxygen=no
-else
-    have_doxygen=yes
-fi
-if test x$enable_docs = xauto ; then
-    if test x$have_doxygen = xno ; then
-        enable_docs=no
-    else
-        enable_docs=yes
-    fi
-fi
-if test x$enable_docs = xyes; then
-    if test x$have_doxygen = xno; then
-        AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found])
-    else 
-	AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
- 
-AM_CONDITIONAL(DOXYGEN_DOCS_ENABLED, test x$enable_docs = xyes)
-AC_SUBST(DOXYGEN)
-
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(QTCORE, QtCore)
-AC_SUBST(QTCORE_CFLAGS)
-AC_SUBST(QTCORE_LIBS)
-
-PKG_CHECK_MODULES(QTNETWORK, QtNetwork)
-AC_SUBST(QTNETWORK_CFLAGS)
-AC_SUBST(QTNETWORK_LIBS)
-
-PKG_CHECK_MODULES(QTDBUS, QtDBus)
-AC_SUBST(QTDBUS_CFLAGS)
-AC_SUBST(QTDBUS_LIBS)
-
-PKG_CHECK_MODULES(QTTEST, QtTest)
-AC_SUBST(QTTEST_CFLAGS)
-AC_SUBST(QTTEST_LIBS)
-
-PKG_CHECK_MODULES(DBUS, dbus-glib-1)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-PKG_CHECK_MODULES(CONNSETTINGS, connsettings)
-AC_SUBST(CONNSETTINGS_CFLAGS)
-AC_SUBST(CONNSETTINGS_LIBS)
-
-PKG_CHECK_MODULES(OSSO_IC, osso-ic)
-AC_SUBST(OSSO_IC_CFLAGS)
-AC_SUBST(OSSO_IC_LIBS)
-
-PKG_CHECK_MODULES(ICD_DEV, icd2)
-AC_SUBST(ICD_DEV_CFLAGS)
-AC_SUBST(ICD_DEV_LIBS)
-
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
-CONCFLAGS="-Wall -Werror -Wmissing-prototypes"
-AC_SUBST(CONCFLAGS)
-
-AC_CONFIG_FILES([Makefile \
-	src/Makefile \
-	tests/Makefile \
-	conninet.pc \
-	doxygen.cfg])
-AC_OUTPUT
diff --git a/src/3rdparty/libconninet/conninet.pc.in b/src/3rdparty/libconninet/conninet.pc.in
deleted file mode 100644
index 68cdee0..0000000
--- a/src/3rdparty/libconninet/conninet.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libconninet
-Description: Internet Connectivity support library
-Version: @VERSION@
-Requires: dbus-1 >= 0.60 glib-2.0 QtCore QtDBus QtGui
-Libs: -lconninet
-Cflags: -I${includedir}/conninet
diff --git a/src/3rdparty/libconninet/debian/changelog b/src/3rdparty/libconninet/debian/changelog
deleted file mode 100644
index 10e9dec..0000000
--- a/src/3rdparty/libconninet/debian/changelog
+++ /dev/null
@@ -1,305 +0,0 @@
-libconninet (0.45) unstable; urgency=low
-
-  * Fixes: NB#187470 - libconninet: add automake to build-deps
-
- -- Markus Silvan <ext-markus.p.silvan@nokia.com>  Wed, 25 Aug 2010 09:02:55 +0300
-
-libconninet (0.44) unstable; urgency=low
-
-  * Added autoconf to build dependencies
-
- -- Markus Silvan <ext-markus.p.silvan@nokia.com>  Wed, 25 Aug 2010 09:02:55 +0300
-
-libconninet (0.43) unstable; urgency=low
-
-  * Fixes: NB#184824 - Getting all proxy variables from gconf in one go
-    which will speedup the HTTP requests done by Qt4.7 webkit
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 12 Aug 2010 10:15:20 +0300
-
-libconninet (0.42) unstable; urgency=low
-
-  * Fixes: NB#180536 - Uploads to online services are not working.
-    This is a regression caused by fix to bug 175098, the timeout was never
-    expiring when waiting reply from icd.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 19 Jul 2010 12:23:30 +0300
-
-libconninet (0.41) unstable; urgency=low
-
-  * Fixes: NB#175098 - Qt4.7 Webkit crashes when bearer API QNetworkSession
-    constructor calls QNetworkSession::syncStateWithInterface() which in turn
-    calls Maemo::state() and Maemo::addrinfo() and webkit expects that event
-    loop is not run but those function process main loop events.
-    Now Maemo::state() and Maemo::addrinfo() are changed to be synchronous
-    and fully blocking functions. The old non-blocking versions are called 
-    Maemo::state_non_blocking() and Maemo::addrinfo_non_blocking().
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Wed, 14 Jul 2010 10:12:47 +0300
-
-libconninet (0.40) unstable; urgency=low
-
-  * Fixes: NB#167465 - Unable to open network connection using libbearer
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Tue, 11 May 2010 10:47:10 +0300
-
-libconninet (0.39) unstable; urgency=low
-
-  * Fixes: NB#167982 - initialize DBus vtable in DBusDispatcher.
-
- -- Aapo Makela <aapo.makela@nokia.com>  Mon, 10 May 2010 14:42:39 +0300
-
-libconninet (0.38) unstable; urgency=low
-
-  * Changing icd2 connect_req to be synchronous as the check for
-    returned connect signal did not work correctly, this caused a
-    long timeout when connect() was called.
-  * Scan sometimes missed results and did not return them to caller.
-  * HTTP proxy settings were not set correctly.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 15 Apr 2010 11:25:06 +0300
-
-libconninet (0.37) unstable; urgency=low
-
-  * Make proxy config reference counting atomic.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Wed,  3 Mar 2010 13:23:08 +0200
-
-libconninet (0.36) unstable; urgency=low
-
-  * Fixes: NB#157586 - Cleanup dbus listener when WLAN scanning object is
-    deleted.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Fri, 26 Feb 2010 13:30:41 +0200
-
-libconninet (0.35) unstable; urgency=low
-
-  * Fixes: NB#156883 - libconninet fails to build under the Platform SDK (SB2)
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 18 Feb 2010 12:14:40 +0200
-
-libconninet (0.34) unstable; urgency=low
-
-  * Coverity fix
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Tue, 16 Feb 2010 16:38:00 +0200
-
-libconninet (0.33) unstable; urgency=low
-
-  * Added API to update Qt proxy config.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Tue, 26 Jan 2010 15:48:36 +0200
-
-libconninet (0.32) unstable; urgency=low
-
-  * Fixed IAPConf to unset value when set value is invalid.
-  * Updated IAPMonitor to use libconnsettings.
-
- -- Aapo Makela <aapo.makela@nokia.com>  Wed, 03 Feb 2010 07:32:45 +0200
-
-libconninet (0.31) unstable; urgency=low
-
-  * Fixes: NB#154892 - Check nulls in IAPConf.
-
- -- Aapo Makela <aapo.makela@nokia.com>  Mon, 01 Feb 2010 09:32:06 +0200
-
-libconninet (0.30) unstable; urgency=low
-
-  * Updated IAPConf to use libconnsettings.
-
- -- Aapo Makela <aapo.makela@nokia.com>  Fri, 29 Jan 2010 12:58:03 +0200
-
-libconninet (0.29) unstable; urgency=low
-
-  * Fixed dependencies
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Fri, 15 Jan 2010 10:16:07 +0200
-
-libconninet (0.28) unstable; urgency=low
-
-  * Get rid of libdui dependency
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Wed, 13 Jan 2010 09:56:26 +0200
-
-libconninet (0.27) unstable; urgency=low
-
-  * Insert new pending calls to the list in DBusDispatcher.
-
- -- Aapo Makela <aapo.makela@nokia.com>  Tue, 22 Dec 2009 14:27:32 +0200
-
-libconninet (0.26) unstable; urgency=low
-
-  * Added possibility to specify different signal path for DBusDispatcher.
-
- -- Aapo Makela <aapo.makela@nokia.com>  Wed, 25 Nov 2009 14:27:34 +0200
-
-libconninet (0.25) unstable; urgency=low
-
-  * Fixes: NB#146450 - All scan results were not returned to the caller.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 16 Nov 2009 17:23:15 +0200
-
-libconninet (0.24) unstable; urgency=low
-
-  * Wait all scan results for all network types in Maemo::Icd::scan()
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Fri,  6 Nov 2009 14:45:23 +0200
-
-libconninet (0.23) unstable; urgency=low
-
-  * Fixes: NB#143361 - Assert failure in session class for GPRS IAP.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 19 Oct 2009 16:00:14 +0300
-
-libconninet (0.22) unstable; urgency=low
-
-  * Fixed the error checking if scan returns 0 results.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Wed,  7 Oct 2009 13:50:27 +0300
-
-libconninet (0.21) unstable; urgency=low
-
-  * Support multiple DBusDispatcher classes at the same time. This is
-    required by Maemo::Icd class so that multiple instances of it can
-    be used the same time.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon,  5 Oct 2009 16:33:43 +0300
-
-libconninet (0.20) unstable; urgency=low
-
-  * Fixed memory leak in IAPConf::setValue()
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Fri,  2 Oct 2009 13:02:21 +0300
-
-libconninet (0.19) unstable; urgency=low
-
-  * Fixed connect_req to one specific IAP in Icd class.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Tue, 29 Sep 2009 17:02:46 +0300
-
-libconninet (0.18) unstable; urgency=low
-
-  * Make sure the library will not abort in Icd class if scan does
-    not return any results.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Tue, 22 Sep 2009 17:00:12 +0300
-
-libconninet (0.17) unstable; urgency=low
-
-  * Added IAP monitoring support.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 21 Sep 2009 16:29:31 +0300
-
-libconninet (0.16) unstable; urgency=low
-
-  * Disabled the old osso-ic dbus interface as it is currently not used.
-  * Fixed the addrinfo request, now addresses are returned correctly to
-    the caller.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 17 Sep 2009 15:56:13 +0300
-
-libconninet (0.15) unstable; urgency=low
-
-  * Enabling state_req, statistics_req and addrinfo_req support
-    functions in Maemo::Icd as the corresponding DBUS API functions are
-    fixed in icd2 v0.89
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Fri, 24 Jul 2009 15:23:02 +0300
-
-libconninet (0.14) unstable; urgency=low
-
-  * Icd statistics support added.
-  * Icd address information support added.
-  * Icd scan method does not return the final (and empty) result any more.
-  * Added initial unit test implementation for Icd class.
-  * Some of the status functions in Icd class disabled because of issues
-    in icd2 and the dbus api.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 23 Jul 2009 11:03:05 +0300
-
-libconninet (0.13) unstable; urgency=low
-
-  * Added API to get all the configured IAPs.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Tue, 21 Jul 2009 09:47:18 +0300
-
-libconninet (0.12) unstable; urgency=low
-
-  * Replaced duivaluespace by Dui in pkg-config file because the
-    duivaluespace is deprecated.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 20 Jul 2009 16:00:10 +0300
-
-libconninet (0.11) unstable; urgency=low
-
-  * Using libdui instead of libduivaluespace because it is deprecated.
-  * The IAPConf::clear() uses native gconf API instead of launching gconftool
-  * Check that state_req call returned list and the list contains entries
-    before trying to access it.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 20 Jul 2009 14:55:15 +0300
-
-libconninet (0.10) unstable; urgency=low
-
-  * connect() did not return ok when connection succeeded.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 25 Jun 2009 09:31:21 +0300
-
-libconninet (0.9) unstable; urgency=low
-
-  * Connection timeout set to 2.5min, same as in fremantle.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Wed, 17 Jun 2009 13:36:40 +0300
-
-libconninet (0.8) unstable; urgency=low
-
-  * Fix state_req signal received from Icd
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 11 Jun 2009 17:19:33 +0300
-
-libconninet (0.7) unstable; urgency=low
-
-  * Icd disconnect and select reqs are made synchronous as we do not
-    wait the return status. The previous async version was causing core
-    dumps if Icd class was destroyed too early.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 11 Jun 2009 11:52:36 +0300
-
-libconninet (0.6) unstable; urgency=low
-
-  * Fixed the libconninet0-dev dependencies.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon,  8 Jun 2009 10:47:56 +0300
-
-libconninet (0.5) unstable; urgency=low
-
-  * Fixed missing QObject connect functions.
-  * Fixed IAPConf to return invalid QVariant if the value does not exist.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 01 Jun 2009 13:58:53 +0300
-
-libconninet (0.4) unstable; urgency=low
-
-  * Fixed QObject signal setting for Maemo::Icd
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Wed, 20 May 2009 13:51:11 +0300
-
-libconninet (0.3) unstable; urgency=low
-
-  * Refactoring classes
-  * Added IAPConf class.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Thu, 14 May 2009 13:24:11 +0300
-
-libconninet (0.2) unstable; urgency=low
-
-  * Fixed pkgconfig file which had wrong dependency
-  * Added DBus array and struct support to DBusDispatcher.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Wed, 13 May 2009 12:11:00 +0300
-
-libconninet (0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Jukka Rissanen <jukka.rissanen@nokia.com>  Tue, 12 May 2009 16:10:27 +0200
diff --git a/src/3rdparty/libconninet/debian/compat b/src/3rdparty/libconninet/debian/compat
deleted file mode 100644
index b8626c4..0000000
--- a/src/3rdparty/libconninet/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/src/3rdparty/libconninet/debian/control b/src/3rdparty/libconninet/debian/control
deleted file mode 100644
index a2343a0..0000000
--- a/src/3rdparty/libconninet/debian/control
+++ /dev/null
@@ -1,39 +0,0 @@
-Source: libconninet
-Priority: optional
-Maintainer: Jukka Rissanen <jukka.rissanen@nokia.com>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib2.0-dev (>= 2.8),
- libdbus-1-dev (>= 0.60), libconnsettings0-dev (>= 0.4), icd2-osso-ic-dev,
- icd2-dev, libqt4-dev, libgconf2-dev (>> 2.6.4), autoconf, automake
-Standards-Version: 3.6.2
-Section: libs
-
-Package: libconninet0-dev
-Section: libdevel
-Architecture: any
-Depends: libconninet0 (= ${Source-Version}), libdbus-1-dev (>= 0.60),
- libglib2.0-dev (>= 2.8), libconnsettings0-dev (>= 0.4), libqt4-dev,
- icd2-osso-ic-dev, icd2-dev, libgconf2-dev (>> 2.6.4)
-Description: Internet Connectivity support library development files
- Internet Connectivity support library (libconninet) provides common
- support functions for connecting to icd2 and accessing configuration
- data.
- .
- This package contains the header files.
-
-Package: libconninet0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Internet Connectivity support library
- Internet Connectivity support library (libconninet) provides common
- support functions for connecting to icd2 and accessing configuration
- data.
- .
- This package contains the shared libraries.
-
-Package: libconninet0-dbg
-Section: libs
-Architecture: any
-Depends: libconninet0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Debug symbols for the Internet Connectivity support library
- Internet Connectivity support library (libconninet) debug symbols.
diff --git a/src/3rdparty/libconninet/debian/copyright b/src/3rdparty/libconninet/debian/copyright
deleted file mode 100644
index 97e8e68..0000000
--- a/src/3rdparty/libconninet/debian/copyright
+++ /dev/null
@@ -1,19 +0,0 @@
-libconninet - Internet Connectivity support library
-
-Copyright (C) 2009 Nokia Corporation. All rights reserved.
-
-Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-This library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License version 2.1 
-as published by the Free Software Foundation.
-
-This library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA
diff --git a/src/3rdparty/libconninet/debian/libconninet0-dev.dirs b/src/3rdparty/libconninet/debian/libconninet0-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/src/3rdparty/libconninet/debian/libconninet0-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/src/3rdparty/libconninet/debian/libconninet0-dev.files b/src/3rdparty/libconninet/debian/libconninet0-dev.files
deleted file mode 100644
index 78bbac8..0000000
--- a/src/3rdparty/libconninet/debian/libconninet0-dev.files
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/share/pkgconfig/*
diff --git a/src/3rdparty/libconninet/debian/libconninet0.dirs b/src/3rdparty/libconninet/debian/libconninet0.dirs
deleted file mode 100644
index 6845771..0000000
--- a/src/3rdparty/libconninet/debian/libconninet0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/src/3rdparty/libconninet/debian/libconninet0.files b/src/3rdparty/libconninet/debian/libconninet0.files
deleted file mode 100644
index d0dbfd1..0000000
--- a/src/3rdparty/libconninet/debian/libconninet0.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff --git a/src/3rdparty/libconninet/debian/rules b/src/3rdparty/libconninet/debian/rules
deleted file mode 100755
index 2a3d395..0000000
--- a/src/3rdparty/libconninet/debian/rules
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure: configure.ac debian/changelog
-	-./autogen.sh
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_movefiles
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip --dbg-package=libconninet0
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff --git a/src/3rdparty/libconninet/doxygen.cfg.in b/src/3rdparty/libconninet/doxygen.cfg.in
deleted file mode 100644
index 80a4c8d..0000000
--- a/src/3rdparty/libconninet/doxygen.cfg.in
+++ /dev/null
@@ -1,1147 +0,0 @@
-# Doxyfile 1.3.7
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = "Internet Connectivity Support Library"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = @VERSION@
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = doc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 2 levels of 10 sub-directories under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of source 
-# files, where putting all generated files in the same directory would otherwise 
-# cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is used 
-# as the annotated text. Otherwise, the brief description is used as-is. If left 
-# blank, the following values are used ("$name" is automatically replaced with the 
-# name of the entity): "The $name class" "The $name widget" "The $name file" 
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = conic/conic.h \
-	conic/conicconnection.h \
-	conic/conicconnectionevent.h \
-	conic/conicevent.h \
-	conic/coniciap.h \
-	conic/conicstatisticsevent.h
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS          = 
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
-
-INPUT_FILTER           = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
-
-PREDEFINED             = 
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.cpp b/src/3rdparty/libconninet/src/dbusdispatcher.cpp
deleted file mode 100644
index 7581982..0000000
--- a/src/3rdparty/libconninet/src/dbusdispatcher.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-/* * This file is part of conninet *
- *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: Aapo Makela <aapo.makela@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <QDebug>
-#include <QtCore>
-#include <poll.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <glib.h>
-#include "dbusdispatcher.h"
-
-namespace Maemo {
-
-/*!
-    \class DBusDispatcher
-
-    \brief DBusDispatcher is a class, which is able to send DBUS method call
-    messages and receive unicast signals from DBUS object.
-*/
-
-class DBusDispatcherPrivate
-{
-public:
-    DBusDispatcherPrivate(const QString& service,
-                          const QString& path,
-                          const QString& interface,
-                          const QString& signalPath)
-        : service(service), path(path), interface(interface),
-          signalPath(signalPath), connection(0)
-    {
-        memset(&signal_vtable, 0, sizeof(signal_vtable));
-    }
-
-    ~DBusDispatcherPrivate()
-    {
-        foreach(DBusPendingCall *call, pending_calls) {
-            dbus_pending_call_cancel(call);
-            dbus_pending_call_unref(call);
-        }
-    }
-
-    QString service;
-    QString path;
-    QString interface;
-    QString signalPath;
-    struct DBusConnection *connection;
-    QList<DBusPendingCall *> pending_calls;
-    struct DBusObjectPathVTable signal_vtable;
-};
-
-static bool constantVariantList(const QVariantList& variantList) {
-    // Special case, empty list == empty struct
-    if (variantList.isEmpty()) {
-        return false;
-    } else {        
-        QVariant::Type type = variantList[0].type();
-        // Iterate items in the list and check if they are same type
-        foreach(QVariant variant, variantList) {
-            if (variant.type() != type) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-static QString variantToSignature(const QVariant& argument,
-                                  bool constantList = true) {
-    switch (argument.type()) {
-        case QVariant::Bool:
-            return "b";
-        case QVariant::ByteArray:
-            return "ay";
-        case QVariant::Char:
-            return "y";
-        case QVariant::Int:
-            return "i";
-        case QVariant::UInt:
-            return "u";
-        case QVariant::StringList:
-            return "as";
-        case QVariant::String:
-            return "s";
-        case QVariant::LongLong:
-            return "x";
-        case QVariant::ULongLong:
-            return "t";
-        case QVariant::List:
-            {
-            QString signature;
-            QVariantList variantList = argument.toList();
-            if (!constantList) {
-                signature += DBUS_STRUCT_BEGIN_CHAR_AS_STRING;
-                foreach(QVariant listItem, variantList) {
-                    signature += variantToSignature(listItem);
-                }
-                signature += DBUS_STRUCT_END_CHAR_AS_STRING;
-            } else {
-                if (variantList.isEmpty())
-                    return "";
-                signature = "a" + variantToSignature(variantList[0]);
-            }
-
-            return signature;
-            }
-        default:
-            qDebug() << "Unsupported variant type: " << argument.type();
-            break;
-    }
-
-    return "";
-}
-
-static bool appendVariantToDBusMessage(const QVariant& argument,
-                                       DBusMessageIter *dbus_iter) {
-    int idx = 0;
-    DBusMessageIter array_iter;
-    QStringList str_list;
-    dbus_bool_t bool_data;
-    dbus_int32_t int32_data;
-    dbus_uint32_t uint32_data;
-    dbus_int64_t int64_data;
-    dbus_uint64_t uint64_data;
-    char *str_data;
-    char char_data;
-
-    switch (argument.type()) {
-
-        case QVariant::Bool:
-            bool_data = argument.toBool();
-            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BOOLEAN, 
-                                           &bool_data);
-            break;
-
-        case QVariant::ByteArray:
-            str_data = argument.toByteArray().data();
-            dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY,
-                                             DBUS_TYPE_BYTE_AS_STRING, &array_iter);
-            dbus_message_iter_append_fixed_array(&array_iter,
-                                                 DBUS_TYPE_BYTE,
-                                                 &str_data,
-                                                 argument.toByteArray().size());
-            dbus_message_iter_close_container(dbus_iter, &array_iter);
-            break;
-
-        case QVariant::Char:
-            char_data = argument.toChar().toAscii();
-            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BYTE, 
-                                           &char_data);
-            break;
-
-        case QVariant::Int:
-            int32_data = argument.toInt();
-            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT32, 
-                                           &int32_data);
-            break;
-
-        case QVariant::String:
-            str_data = argument.toString().toLatin1().data();
-            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_STRING,
-                                           &str_data);
-            break;
-
-        case QVariant::StringList:
-            str_list = argument.toStringList();
-            dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY,
-                                             "s", &array_iter);
-            for (idx = 0; idx < str_list.size(); idx++) {
-                str_data = str_list.at(idx).toLatin1().data();
-                dbus_message_iter_append_basic(&array_iter,
-                                               DBUS_TYPE_STRING,
-                                               &str_data);
-            }
-            dbus_message_iter_close_container(dbus_iter, &array_iter);
-            break;
-
-        case QVariant::UInt:
-            uint32_data = argument.toUInt();
-            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT32, 
-                                           &uint32_data);
-            break;
-
-        case QVariant::ULongLong:
-            uint64_data = argument.toULongLong();
-            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT64, 
-                                           &uint64_data);
-            break;
-
-        case QVariant::LongLong:
-            int64_data = argument.toLongLong();
-            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT64, 
-                                           &int64_data);
-            break;
-
-        case QVariant::List:
-            {
-            QVariantList variantList = argument.toList();
-            bool constantList = constantVariantList(variantList);
-            DBusMessageIter array_iter;
-
-            // List is mapped either as an DBUS array (all items same type)
-            // DBUS struct (variable types) depending on constantList
-            if (constantList) {
-                // Resolve the signature for the first item
-                QString signature = "";
-                if (!variantList.isEmpty()) {
-                    signature = variantToSignature(
-                                variantList[0],
-                                constantVariantList(variantList[0].toList()));
-                }
-
-                // Mapped as DBUS array
-                dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY,
-                                                 signature.toAscii(),
-                                                 &array_iter);
-
-                foreach(QVariant listItem, variantList) {
-                    appendVariantToDBusMessage(listItem, &array_iter);
-                }
-
-                dbus_message_iter_close_container(dbus_iter, &array_iter);
-            } else {
-                // Mapped as DBUS struct
-                dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_STRUCT,
-                                                 NULL,
-                                                 &array_iter);
-
-                foreach(QVariant listItem, variantList) {
-                    appendVariantToDBusMessage(listItem, &array_iter);
-                }
-
-                dbus_message_iter_close_container(dbus_iter, &array_iter);
-            }
-
-            break;
-            }
-        default:
-            qDebug() << "Unsupported variant type: " << argument.type();
-            break;
-    }
-
-    return true;
-}
-
-static QVariant getVariantFromDBusMessage(DBusMessageIter *iter) {
-    dbus_bool_t bool_data;
-    dbus_int32_t int32_data;
-    dbus_uint32_t uint32_data;
-    dbus_int64_t int64_data;
-    dbus_uint64_t uint64_data;
-    char *str_data;
-    char char_data;
-    int argtype = dbus_message_iter_get_arg_type(iter);
-
-    switch (argtype) {
-
-        case DBUS_TYPE_BOOLEAN:
-        {
-            dbus_message_iter_get_basic(iter, &bool_data);
-            QVariant variant((bool)bool_data);
-            return variant;
-        }
-
-        case DBUS_TYPE_ARRAY:
-        {
-            // Handle all arrays here
-            int elem_type = dbus_message_iter_get_element_type(iter);
-            DBusMessageIter array_iter;
-
-            dbus_message_iter_recurse(iter, &array_iter);
-
-            if (elem_type == DBUS_TYPE_BYTE) {
-                QByteArray byte_array;
-                do {
-                    dbus_message_iter_get_basic(&array_iter, &char_data);
-                    byte_array.append(char_data);
-                } while (dbus_message_iter_next(&array_iter));
-                QVariant variant(byte_array);
-                return variant;
-            } else if (elem_type == DBUS_TYPE_STRING) {
-                QStringList str_list;
-                do {
-                    dbus_message_iter_get_basic(&array_iter, &str_data);
-                    str_list.append(str_data);
-                } while (dbus_message_iter_next(&array_iter));
-                QVariant variant(str_list);
-                return variant;
-            } else {
-                QVariantList variantList;
-                do {
-                    variantList << getVariantFromDBusMessage(&array_iter);
-                } while (dbus_message_iter_next(&array_iter));
-                QVariant variant(variantList);
-                return variant;
-            }
-            break;
-        }
-
-        case DBUS_TYPE_BYTE:
-        {
-            dbus_message_iter_get_basic(iter, &char_data);
-            QChar ch(char_data);
-            QVariant variant(ch);
-            return variant;
-        }
-
-        case DBUS_TYPE_INT32:
-        {
-            dbus_message_iter_get_basic(iter, &int32_data);
-            QVariant variant((int)int32_data);
-            return variant;
-        }
-
-        case DBUS_TYPE_UINT32:
-        {
-            dbus_message_iter_get_basic(iter, &uint32_data);
-            QVariant variant((uint)uint32_data);
-            return variant;
-        }
-
-        case DBUS_TYPE_STRING:
-        {
-            dbus_message_iter_get_basic(iter, &str_data);
-            QString str(str_data);
-            QVariant variant(str);
-            return variant;
-        }
-
-        case DBUS_TYPE_INT64:
-        {
-            dbus_message_iter_get_basic(iter, &int64_data);
-            QVariant variant((qlonglong)int64_data);
-            return variant;
-        }
-
-        case DBUS_TYPE_UINT64:
-        {
-            dbus_message_iter_get_basic(iter, &uint64_data);
-            QVariant variant((qulonglong)uint64_data);
-            return variant;
-        }
-
-        case DBUS_TYPE_STRUCT:
-        {
-            // Handle all structs here
-            DBusMessageIter struct_iter;
-            dbus_message_iter_recurse(iter, &struct_iter);
-
-	    QVariantList variantList;
-	    do {
-	      variantList << getVariantFromDBusMessage(&struct_iter);
-	    } while (dbus_message_iter_next(&struct_iter));
-	    QVariant variant(variantList);
-	    return variant;
-        }
-
-        default:
-            qDebug() << "Unsupported DBUS type: " << argtype;
-    }
-
-    return QVariant();
-}
-
-static DBusHandlerResult signalHandler (DBusConnection *connection,
-                                        DBusMessage *message,
-                                        void *object_ref) {
-    (void)connection;
-    QString interface;
-    QString signal;
-    DBusDispatcher *dispatcher = (DBusDispatcher *)object_ref;
-
-    if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL) {
-        interface = dbus_message_get_interface(message);
-        signal = dbus_message_get_member(message);
-        
-        QList<QVariant> arglist;
-        DBusMessageIter dbus_iter;
-
-        if (dbus_message_iter_init(message, &dbus_iter)) {
-            // Read return arguments
-            while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) {
-                arglist << getVariantFromDBusMessage(&dbus_iter);
-                dbus_message_iter_next(&dbus_iter);
-            }
-        }
-
-        dispatcher->emitSignalReceived(interface, signal, arglist);
-        return DBUS_HANDLER_RESULT_HANDLED;
-    }
-    (void)message;
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-DBusDispatcher::DBusDispatcher(const QString& service,
-                               const QString& path,
-                               const QString& interface,
-                               QObject *parent)
- : QObject(parent),
-   d_ptr(new DBusDispatcherPrivate(service, path, interface, path)) {
-    setupDBus();
-}
-
-DBusDispatcher::DBusDispatcher(const QString& service,
-                               const QString& path,
-                               const QString& interface,
-                               const QString& signalPath,
-                               QObject *parent)
- : QObject(parent),
-   d_ptr(new DBusDispatcherPrivate(service, path, interface, signalPath)) {
-    setupDBus();
-}
-
-DBusDispatcher::~DBusDispatcher()
-{
-    if (d_ptr->connection) {
-        dbus_connection_close(d_ptr->connection);
-        dbus_connection_unref(d_ptr->connection);
-    }
-    delete d_ptr;
-}
-
-void DBusDispatcher::setupDBus()
-{
-    d_ptr->connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL);
-
-    if (d_ptr->connection == NULL)
-        qDebug() << "Unable to get DBUS connection!";
-    else {
-        d_ptr->signal_vtable.message_function = signalHandler;
-
-	dbus_connection_set_exit_on_disconnect(d_ptr->connection, FALSE);
-        dbus_connection_setup_with_g_main(d_ptr->connection, NULL);
-        dbus_connection_register_object_path(d_ptr->connection, 
-                                             d_ptr->signalPath.toLatin1(),
-                                             &d_ptr->signal_vtable,
-                                             this);
-    }
-}
-
-static DBusMessage *prepareDBusCall(const QString& service,
-                                    const QString& path,
-                                    const QString& interface,
-                                    const QString& method, 
-                                    const QVariant& arg1 = QVariant(),
-                                    const QVariant& arg2 = QVariant(),
-                                    const QVariant& arg3 = QVariant(),
-                                    const QVariant& arg4 = QVariant(),
-                                    const QVariant& arg5 = QVariant(),
-                                    const QVariant& arg6 = QVariant(),
-                                    const QVariant& arg7 = QVariant(),
-                                    const QVariant& arg8 = QVariant()) 
-{
-    DBusMessage *message = dbus_message_new_method_call(service.toLatin1(),
-                                                        path.toLatin1(),
-                                                        interface.toLatin1(),
-                                                        method.toLatin1());
-    DBusMessageIter dbus_iter;
-
-    // Append variants to DBUS message
-    QList<QVariant> arglist;
-    if (arg1.isValid()) arglist << arg1;
-    if (arg2.isValid()) arglist << arg2;
-    if (arg3.isValid()) arglist << arg3;
-    if (arg4.isValid()) arglist << arg4;
-    if (arg5.isValid()) arglist << arg5;
-    if (arg6.isValid()) arglist << arg6;
-    if (arg7.isValid()) arglist << arg7;
-    if (arg8.isValid()) arglist << arg8;
-
-    dbus_message_iter_init_append (message, &dbus_iter);
-    
-    while (!arglist.isEmpty()) {
-        QVariant argument = arglist.takeFirst();
-        appendVariantToDBusMessage(argument, &dbus_iter);
-    }
-
-    return message;
-}
-
-QList<QVariant> DBusDispatcher::call(const QString& method, 
-                                     const QVariant& arg1,
-                                     const QVariant& arg2,
-                                     const QVariant& arg3,
-                                     const QVariant& arg4,
-                                     const QVariant& arg5,
-                                     const QVariant& arg6,
-                                     const QVariant& arg7,
-                                     const QVariant& arg8) {
-    DBusMessageIter dbus_iter;
-    DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path,
-                                           d_ptr->interface, method,
-                                           arg1, arg2, arg3, arg4, arg5,
-                                           arg6, arg7, arg8);
-    DBusMessage *reply = dbus_connection_send_with_reply_and_block(
-                                                    d_ptr->connection,
-                                                    message, -1, NULL);
-    dbus_message_unref(message);
-
-    QList<QVariant> replylist;
-    if (reply != NULL &&  dbus_message_iter_init(reply, &dbus_iter)) {
-        // Read return arguments
-        while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) {
-            replylist << getVariantFromDBusMessage(&dbus_iter);
-            dbus_message_iter_next(&dbus_iter);
-        }
-    }
-    if (reply != NULL) dbus_message_unref(reply);
-    return replylist;
-}
-
-class PendingCallInfo {
-public:
-    QString method;
-    DBusDispatcher *dispatcher;
-    DBusDispatcherPrivate *priv;
-};
-
-static void freePendingCallInfo(void *memory) {
-    PendingCallInfo *info = (PendingCallInfo *)memory;
-    delete info;
-}
-
-static void pendingCallFunction (DBusPendingCall *pending,
-                                 void *memory) {
-    PendingCallInfo *info = (PendingCallInfo *)memory;
-    QString errorStr;
-    QList<QVariant> replyList;
-    DBusMessage *reply = dbus_pending_call_steal_reply (pending);
-
-    Q_ASSERT(reply != NULL);
-
-    if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
-        errorStr = dbus_message_get_error_name (reply);
-    } else {
-        DBusMessageIter dbus_iter;
-        dbus_message_iter_init(reply, &dbus_iter);
-        // Read return arguments
-        while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) {
-            replyList << getVariantFromDBusMessage(&dbus_iter);
-            dbus_message_iter_next(&dbus_iter);
-        }
-    }
-
-    info->priv->pending_calls.removeOne(pending);
-    info->dispatcher->emitCallReply(info->method, replyList, errorStr);
-    dbus_message_unref(reply);
-    dbus_pending_call_unref(pending);
-}
-
-bool DBusDispatcher::callAsynchronous(const QString& method, 
-                                      const QVariant& arg1,
-                                      const QVariant& arg2,
-                                      const QVariant& arg3,
-                                      const QVariant& arg4,
-                                      const QVariant& arg5,
-                                      const QVariant& arg6,
-                                      const QVariant& arg7,
-                                      const QVariant& arg8) {
-    DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path,
-                                           d_ptr->interface, method,
-                                           arg1, arg2, arg3, arg4, arg5,
-                                           arg6, arg7, arg8);
-    DBusPendingCall *call = NULL;
-    dbus_bool_t ret = dbus_connection_send_with_reply(d_ptr->connection,
-                                                      message, &call, -1);
-    PendingCallInfo *info = new PendingCallInfo;
-    info->method = method;
-    info->dispatcher = this;
-    info->priv = d_ptr;
-
-    dbus_pending_call_set_notify(call, pendingCallFunction, info, freePendingCallInfo);
-    d_ptr->pending_calls.append(call);
-    return (bool)ret;
-}
-
-void DBusDispatcher::emitSignalReceived(const QString& interface, 
-                                        const QString& signal,
-                                        const QList<QVariant>& args) {
-    emit signalReceived(interface, signal, args); }
-
-void DBusDispatcher::emitCallReply(const QString& method,
-                                   const QList<QVariant>& args,
-                                   const QString& error) {
-    emit callReply(method, args, error); }
-
-void DBusDispatcher::synchronousDispatch(int timeout_ms)
-{
-    dbus_connection_read_write_dispatch(d_ptr->connection, timeout_ms);
-}
-
-} // Maemo namespace
-
diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.h b/src/3rdparty/libconninet/src/dbusdispatcher.h
deleted file mode 100644
index 2f71b6f..0000000
--- a/src/3rdparty/libconninet/src/dbusdispatcher.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* * This file is part of conn-dui-settings-inet *
- *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: Aapo Makela <aapo.makela@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef DBUSDISPATCHER_H
-#define DBUSDISPATCHER_H
-
-#include <QObject>
-#include <QVariant>
-
-namespace Maemo {
-
-class DBusDispatcherPrivate;
-class DBusDispatcher : public QObject
-{
-    Q_OBJECT
-
-public:
-    DBusDispatcher(const QString& service,
-                   const QString& path,
-                   const QString& interface,
-                   QObject *parent = 0);
-    DBusDispatcher(const QString& service,
-                   const QString& path,
-                   const QString& interface,
-                   const QString& signalPath,
-                   QObject *parent = 0);
-    ~DBusDispatcher();
-
-    QList<QVariant> call(const QString& method, 
-                         const QVariant& arg1 = QVariant(),
-                         const QVariant& arg2 = QVariant(),
-                         const QVariant& arg3 = QVariant(),
-                         const QVariant& arg4 = QVariant(),
-                         const QVariant& arg5 = QVariant(),
-                         const QVariant& arg6 = QVariant(),
-                         const QVariant& arg7 = QVariant(),
-                         const QVariant& arg8 = QVariant());
-    bool callAsynchronous(const QString& method, 
-                          const QVariant& arg1 = QVariant(),
-                          const QVariant& arg2 = QVariant(),
-                          const QVariant& arg3 = QVariant(),
-                          const QVariant& arg4 = QVariant(),
-                          const QVariant& arg5 = QVariant(),
-                          const QVariant& arg6 = QVariant(),
-                          const QVariant& arg7 = QVariant(),
-                          const QVariant& arg8 = QVariant());
-    void emitSignalReceived(const QString& interface, 
-                            const QString& signal,
-                            const QList<QVariant>& args);
-    void emitCallReply(const QString& method,
-                       const QList<QVariant>& args,
-                       const QString& error = "");
-    void synchronousDispatch(int timeout_ms);
-
-Q_SIGNALS:
-    void signalReceived(const QString& interface, 
-                        const QString& signal,
-                        const QList<QVariant>& args);
-    void callReply(const QString& method,
-                   const QList<QVariant>& args,
-                   const QString& error);
-
-protected:
-    void setupDBus();
-
-private:
-    DBusDispatcherPrivate *d_ptr;
-};
-
-}  // Maemo namespace
-
-#endif
diff --git a/src/3rdparty/libconninet/src/iapconf.cpp b/src/3rdparty/libconninet/src/iapconf.cpp
deleted file mode 100644
index 2e77fa5..0000000
--- a/src/3rdparty/libconninet/src/iapconf.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2009-2010 Nokia Corporation. All rights reserved.
-
-  Contact: Aapo Makela <aapo.makela@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <conn_settings.h>
-
-#include "iapconf.h"
-
-#define QSTRING_TO_CONST_CSTR(str) \
-    str.toUtf8().constData()
-
-namespace Maemo {
-
-class IAPConfPrivate {
-public:
-    ConnSettings *settings;
-
-    ConnSettingsValue *variantToValue(const QVariant &variant);
-    QVariant valueToVariant(ConnSettingsValue *value);
-};
-
-ConnSettingsValue *IAPConfPrivate::variantToValue(const QVariant &variant)
-{
-    // Convert variant to ConnSettingsValue
-    ConnSettingsValue *value = conn_settings_value_new();
-    if (value == 0) {
-        qWarning("IAPConf: Unable to create new ConnSettingsValue");
-        return 0;
-    }
-
-    switch(variant.type()) {
-        
-    case QVariant::Invalid:
-        value->type = CONN_SETTINGS_VALUE_INVALID;
-        break;
-    
-    case QVariant::String: {
-        char *valueStr = strdup(QSTRING_TO_CONST_CSTR(variant.toString()));
-        value->type = CONN_SETTINGS_VALUE_STRING;
-        value->value.string_val = valueStr;
-        break;
-    }
-    
-    case QVariant::Int:
-        value->type = CONN_SETTINGS_VALUE_INT;
-        value->value.int_val = variant.toInt();
-        break;
-    
-    case QMetaType::Float:
-    case QVariant::Double:
-        value->type = CONN_SETTINGS_VALUE_DOUBLE;
-        value->value.double_val = variant.toDouble();
-        break;
-    
-    case QVariant::Bool:
-        value->type = CONN_SETTINGS_VALUE_BOOL;
-        value->value.bool_val = variant.toBool() ? 1 : 0;
-        break;
-    
-    case QVariant::ByteArray: {
-        QByteArray array = variant.toByteArray();
-        value->type = CONN_SETTINGS_VALUE_BYTE_ARRAY;
-        value->value.byte_array.len = array.size();
-        value->value.byte_array.val = (unsigned char *)malloc(array.size());
-        memcpy(value->value.byte_array.val, array.constData(), array.size());
-        break;
-    }
-    
-    case QVariant::List: {
-        QVariantList list = variant.toList();
-        ConnSettingsValue **list_val = (ConnSettingsValue **)malloc(
-            (list.size() + 1) * sizeof(ConnSettingsValue *));
-
-        for (int idx = 0; idx < list.size(); idx++) {
-            list_val[idx] = variantToValue(list.at(idx));
-        }
-        list_val[list.size()] = 0;
-
-        value->type = CONN_SETTINGS_VALUE_LIST;
-        value->value.list_val = list_val;
-        break;
-    }
-    
-    default:
-        qWarning("IAPConf: Can not handle QVariant of type %d",
-                 variant.type());
-        conn_settings_value_destroy(value);
-        return 0;
-    }
-
-    return value;
-}
-
-QVariant IAPConfPrivate::valueToVariant(ConnSettingsValue *value)
-{
-    if (value == 0 || value->type == CONN_SETTINGS_VALUE_INVALID) {
-        return QVariant();
-    }
-
-    switch(value->type) {
-    
-    case CONN_SETTINGS_VALUE_BOOL:
-        return QVariant(value->value.bool_val ? true : false);
-    
-    case CONN_SETTINGS_VALUE_STRING:
-        return QVariant(QString(value->value.string_val));
-    
-    case CONN_SETTINGS_VALUE_DOUBLE:
-        return QVariant(value->value.double_val);
-    
-    case CONN_SETTINGS_VALUE_INT:
-        return QVariant(value->value.int_val);
-    
-    case CONN_SETTINGS_VALUE_LIST: {
-        // At least with GConf backend connsettings returns byte array as list
-        // of ints, first check for that case
-        if (value->value.list_val && value->value.list_val[0]) {
-            bool canBeConvertedToByteArray = true;
-            for (int idx = 0; value->value.list_val[idx]; idx++) {
-                ConnSettingsValue *val = value->value.list_val[idx];
-                if (val->type != CONN_SETTINGS_VALUE_INT
-                     || val->value.int_val > 255
-                     || val->value.int_val < 0) {
-                    canBeConvertedToByteArray = false;
-                    break;
-                }
-            }
-
-            if (canBeConvertedToByteArray) {
-                QByteArray array;
-                for (int idx = 0; value->value.list_val[idx]; idx++) {
-                    array.append(value->value.list_val[idx]->value.int_val);
-                }
-                return array;
-            }
-
-	    // Create normal list
-	    QVariantList list;
-	    for (int idx = 0; value->value.list_val[idx]; idx++) {
-	      list.append(valueToVariant(value->value.list_val[idx]));
-	    }
-	    return list;
-        }
-    }
-    
-    case CONN_SETTINGS_VALUE_BYTE_ARRAY:
-        return QByteArray::fromRawData((char *)value->value.byte_array.val, 
-                                       value->value.byte_array.len);
-    
-    default:
-        return QVariant();
-    }
-}
-
-// Public class implementation
-
-IAPConf::IAPConf(const QString &iap_id)
-    : d_ptr(new IAPConfPrivate)
-{
-    d_ptr->settings = conn_settings_open(CONN_SETTINGS_CONNECTION,
-                                         QSTRING_TO_CONST_CSTR(iap_id));
-    if (d_ptr->settings == 0) {
-        qWarning("IAPConf: Unable to open ConnSettings for %s", 
-                 QSTRING_TO_CONST_CSTR(iap_id));
-    }
-}
-
-IAPConf::~IAPConf()
-{
-    conn_settings_close(d_ptr->settings);
-    delete d_ptr;
-}
-
-void IAPConf::setValue(const QString& key, const QVariant& value)
-{
-    // Invalid value means unsetting the given key
-    if (!value.isValid()) {
-        int err = conn_settings_unset(d_ptr->settings, 
-                                      QSTRING_TO_CONST_CSTR(key));
-        if (err != CONN_SETTINGS_E_NO_ERROR) {
-            qWarning("IAPConf: unable to unset key %s: %s",
-                     QSTRING_TO_CONST_CSTR(key),
-                     conn_settings_error_text((ConnSettingsError)err));
-        }
-        return;
-    }
-
-    // Convert value to ConnSettingsValue
-    ConnSettingsValue *val = d_ptr->variantToValue(value);
-    if (val == 0) return;
-
-    // Set value and handle errors
-    int error = conn_settings_set(d_ptr->settings,
-                                  QSTRING_TO_CONST_CSTR(key),
-                                  val);
-    if (error != CONN_SETTINGS_E_NO_ERROR) {
-        qWarning("IAPConf: error in setting key %s: %s", 
-                 QSTRING_TO_CONST_CSTR(key), 
-                 conn_settings_error_text((ConnSettingsError)error));
-    }
-
-    // Destroy value
-    conn_settings_value_destroy(val);
-    return;
-}
-
-void IAPConf::set(const QString& key1, const QVariant& value1, 
-                  const QString& key2, const QVariant& value2, 
-                  const QString& key3, const QVariant& value3, 
-                  const QString& key4, const QVariant& value4, 
-                  const QString& key5, const QVariant& value5, 
-                  const QString& key6, const QVariant& value6, 
-                  const QString& key7, const QVariant& value7, 
-                  const QString& key8, const QVariant& value8, 
-                  const QString& key9, const QVariant& value9,
-                  const QString& key10, const QVariant& value10)
-{
-    if (!key1.isEmpty()) setValue(key1, value1);
-    if (!key2.isEmpty()) setValue(key2, value2);
-    if (!key3.isEmpty()) setValue(key3, value3);
-    if (!key4.isEmpty()) setValue(key4, value4);
-    if (!key5.isEmpty()) setValue(key5, value5);
-    if (!key6.isEmpty()) setValue(key6, value6);
-    if (!key7.isEmpty()) setValue(key7, value7);
-    if (!key8.isEmpty()) setValue(key8, value8);
-    if (!key9.isEmpty()) setValue(key9, value9);
-    if (!key10.isEmpty()) setValue(key10, value10);
-}
-
-QVariant IAPConf::value(const QString& key) const
-{
-    ConnSettingsValue *val = conn_settings_get(d_ptr->settings,
-                                               QSTRING_TO_CONST_CSTR(key));
-
-    QVariant variant = d_ptr->valueToVariant(val);
-    conn_settings_value_destroy(val);
-    return variant;
-}
-
-void IAPConf::clear(const char *default_path)
-{
-    Q_UNUSED(default_path); // default path is unused
-
-    int error = conn_settings_remove(d_ptr->settings);
-    if (error != CONN_SETTINGS_E_NO_ERROR) {
-        qWarning("IAPConf: Error when removing IAP: %s",
-                 conn_settings_error_text((ConnSettingsError)error));
-    }
-}
-
-void IAPConf::clearAll()
-{
-    ConnSettings *settings = conn_settings_open(CONN_SETTINGS_CONNECTION,
-                                                NULL);
-    conn_settings_remove(settings);
-    conn_settings_close(settings);
-}
-
-
-void IAPConf::getAll(QList<QString> &all_iaps, bool return_path)
-{
-    Q_UNUSED(return_path); // We don't use return path currently
-
-    // Go through all available connections and add them to the list
-    char **ids = conn_settings_list_ids(CONN_SETTINGS_CONNECTION);
-    if (ids == 0) {
-        // No ids found - nothing to do
-        return;
-    }
-
-    for (int idx = 0; ids[idx]; idx++) {
-        all_iaps.append(QString(ids[idx]));
-        free(ids[idx]);
-    }
-    free(ids);
-}
-
-
-} // namespace Maemo
diff --git a/src/3rdparty/libconninet/src/iapconf.h b/src/3rdparty/libconninet/src/iapconf.h
deleted file mode 100644
index 57c0856..0000000
--- a/src/3rdparty/libconninet/src/iapconf.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2009 Nokia Corporation. All rights reserved.
-
-  Contact: Aapo Makela <aapo.makela@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#ifndef IAPCONF_H
-#define IAPCONF_H
-
-#include <QString>
-#include <QVariant>
-
-namespace Maemo {
-
-class IAPConfPrivate;
-class IAPConf {
-public:
-    IAPConf(const QString &iap_id);
-    virtual ~IAPConf();
-
-    /**
-        Convenience method for setting multiple IAP values with one call.
-    */
-    void set(const QString& key1, const QVariant& value1, 
-             const QString& key2 = "", const QVariant& value2 = QVariant(), 
-             const QString& key3 = "", const QVariant& value3 = QVariant(), 
-             const QString& key4 = "", const QVariant& value4 = QVariant(), 
-             const QString& key5 = "", const QVariant& value5 = QVariant(), 
-             const QString& key6 = "", const QVariant& value6 = QVariant(), 
-             const QString& key7 = "", const QVariant& value7 = QVariant(), 
-             const QString& key8 = "", const QVariant& value8 = QVariant(), 
-             const QString& key9 = "", const QVariant& value9 = QVariant(),
-             const QString& key10 = "", const QVariant& value10 = QVariant());
-
-    /**
-        Set one IAP value.
-    */
-    void setValue(const QString& key, const QVariant& value);
-
-    /**
-        Get one IAP value.
-    */
-    QVariant value(const QString& key) const;
-
-    /**
-        Clear this IAP from GConf
-    */
-    void clear(const char *default_path=0);
-
-    /**
-        Clear all IAP specific information from GConf (including all IAPs).
-        DO NOT USE THIS FUNCTION IN ANYWHERE ELSE EXCEPT IN TEST CODE!
-    */
-    void clearAll();
-
-    /**
-        Return all the IAPs found in the system. If return_path is true,
-	then do not strip the IAP path away.
-    */
-    static void getAll(QList<QString> &all_iaps, bool return_path=false);
-
-private:
-    IAPConfPrivate *d_ptr;
-};
-
-} // namespace Maemo
-
-#endif
diff --git a/src/3rdparty/libconninet/src/iapmonitor.cpp b/src/3rdparty/libconninet/src/iapmonitor.cpp
deleted file mode 100644
index c44cbc8..0000000
--- a/src/3rdparty/libconninet/src/iapmonitor.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2009-2010 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#include <QStringList>
-
-#include <conn_settings.h>
-#include "iapmonitor.h"
-
-namespace Maemo {
-
-
-void conn_settings_notify_func (ConnSettingsType type,
-                                const char *id,
-                                const char *key,
-                                ConnSettingsValue *value,
-                                void *user_data);
-
-class IAPMonitorPrivate {
-private:
-    IAPMonitor *monitor;
-    ConnSettings *settings;
-
-public:
-
-    IAPMonitorPrivate(IAPMonitor *monitor)
-        : monitor(monitor)
-    {
-        settings = conn_settings_open(CONN_SETTINGS_CONNECTION, NULL);
-        conn_settings_add_notify(
-                        settings,
-                        (ConnSettingsNotifyFunc *)conn_settings_notify_func,
-                        this);
-    }
-
-    ~IAPMonitorPrivate()
-    {
-        conn_settings_del_notify(settings);
-        conn_settings_close(settings);
-    }
-
-    void iapAdded(const QString &iap)
-    {
-        monitor->iapAdded(iap);
-    }
-
-    void iapRemoved(const QString &iap)
-    {
-        monitor->iapRemoved(iap);
-    }
-};
-
-void conn_settings_notify_func (ConnSettingsType type,
-                                const char *id,
-                                const char *key,
-                                ConnSettingsValue *value,
-                                void *user_data)
-{    
-    if (type != CONN_SETTINGS_CONNECTION) return;
-    IAPMonitorPrivate *priv = (IAPMonitorPrivate *)user_data;
-
-    QString iapId(key);
-    iapId = iapId.split("/")[0];
-    if (value != 0) {
-        priv->iapAdded(iapId);
-    } else if (iapId == QString(key)) {
-        // IAP is removed only when the directory gets removed
-        priv->iapRemoved(iapId);
-    }
-}
-
-IAPMonitor::IAPMonitor()
-    : d_ptr(new IAPMonitorPrivate(this))
-{
-}
-
-IAPMonitor::~IAPMonitor()
-{
-    delete d_ptr;
-}
-
-void IAPMonitor::iapAdded(const QString &id)
-{
-    // By default do nothing
-}
-
-void IAPMonitor::iapRemoved(const QString &id)
-{
-    // By default do nothing
-}
-
-} // namespace Maemo
diff --git a/src/3rdparty/libconninet/src/iapmonitor.h b/src/3rdparty/libconninet/src/iapmonitor.h
deleted file mode 100644
index 558f23e..0000000
--- a/src/3rdparty/libconninet/src/iapmonitor.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2009-2010 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#ifndef IAPMONITOR_H
-#define IAPMONITOR_H
-
-#include <QString>
-
-namespace Maemo {
-
-class IAPMonitorPrivate;
-class IAPMonitor {
-public:
-    IAPMonitor();
-    ~IAPMonitor();
-
-protected:
-    virtual void iapAdded(const QString &id);
-    virtual void iapRemoved(const QString &id);
-
-private:
-    IAPMonitorPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(IAPMonitor);
-};
-
-} // namespace Maemo
-
-#endif // IAPMONITOR_H
-
diff --git a/src/3rdparty/libconninet/src/maemo_icd.cpp b/src/3rdparty/libconninet/src/maemo_icd.cpp
deleted file mode 100644
index 026241c..0000000
--- a/src/3rdparty/libconninet/src/maemo_icd.cpp
+++ /dev/null
@@ -1,1316 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-  
-  Copyright (C) 2009 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#include <stdio.h>
-#include "maemo_icd.h"
-#include <QObject>
-#include <QTimer>
-#include <QCoreApplication>
-#include <QEventLoop>
-#include <QDebug>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-namespace Maemo {
-
-#undef PRINT_DEBUGINFO
-#ifdef PRINT_DEBUGINFO
-  static FILE *fdebug = NULL;
-#define PDEBUG(fmt, args...)						\
-  do {									\
-    struct timeval tv;							\
-    gettimeofday(&tv, 0);						\
-    fprintf(fdebug, "DEBUG[%d]:%ld.%ld:%s:%s():%d: " fmt,		\
-	    getpid(),							\
-	    tv.tv_sec, tv.tv_usec,					\
-	    __FILE__, __FUNCTION__, __LINE__, args);			\
-    fflush(fdebug);							\
-  } while(0)
-#else
-#define PDEBUG(fmt...)
-#endif
-
-
-/* Reference counting singleton class that creates a single connection
- * to icd so that icd reference counting works as expected. This is
- * needed because DBusDispatcher uses private dbus connections
- * which come and go and icd cannot use that information to
- * determine whether application quit or not. So we create one
- * persistent connection that is only teared down when application
- * quits or calls disconnect()
- */
-class IcdRefCounting
-{
-public:
-    IcdRefCounting() : first_call(true) { }
-    void setup(enum icd_connection_flags flag);
-    void cleanup();
-
-private:
-    bool first_call;
-    struct DBusConnection *connection;
-};
-
-Q_GLOBAL_STATIC(IcdRefCounting, icdRefCounting);
-
-
-void IcdRefCounting::setup(enum icd_connection_flags flag)
-{
-    if (first_call) {
-	DBusMessage *msg = NULL;
-
-	connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL);
-	dbus_connection_set_exit_on_disconnect(connection, FALSE);
-	dbus_connection_setup_with_g_main(connection, NULL);
-
-	msg = dbus_message_new_method_call(ICD_DBUS_API_INTERFACE,
-					   ICD_DBUS_API_PATH,
-					   ICD_DBUS_API_INTERFACE,
-					   ICD_DBUS_API_CONNECT_REQ);
-	if (msg == NULL)
-	    goto out;
-
-	if (!dbus_message_append_args(msg,
-				      DBUS_TYPE_UINT32, &flag,
-				      DBUS_TYPE_INVALID))
-	    goto out;
-
-	if (!dbus_connection_send_with_reply(connection, msg,
-					     NULL, 60*1000))
-	    goto out;
-
-	first_call = false;
-	return;
-
-    out:
-	dbus_connection_close(connection);
-	dbus_connection_unref(connection);
-    }
-}
-
-void IcdRefCounting::cleanup()
-{
-    if (!first_call) {
-	dbus_connection_close(connection);
-	dbus_connection_unref(connection);
-	first_call = true;
-    }
-}
-
-
-class IcdPrivate
-{
-public:
-    IcdPrivate(Icd *myfriend)
-    {
-        init(10000, IcdNewDbusInterface, myfriend);
-    }
-
-    IcdPrivate(unsigned int timeout, Icd *myfriend)
-    {
-        init(timeout, IcdNewDbusInterface, myfriend);
-    }
-
-    IcdPrivate(unsigned int timeout, IcdDbusInterfaceVer ver, Icd *myfriend)
-    {
-        /* Note that the old Icd interface is currently disabled and
-	 * the new one is always used.
-	 */
-        init(timeout, IcdNewDbusInterface, myfriend);
-    }
-
-    ~IcdPrivate()
-    {
-      QObject::disconnect(mDBus, 
-			  SIGNAL(signalReceived(const QString&, 
-						const QString&,
-						const QList<QVariant>&)),
-			  icd,
-			  SLOT(icdSignalReceived(const QString&, 
-						 const QString&,
-						 const QList<QVariant>&)));
-
-      QObject::disconnect(mDBus,
-			  SIGNAL(callReply(const QString&,
-					   const QList<QVariant>&,
-					   const QString&)),
-			  icd,
-			  SLOT(icdCallReply(const QString&,
-					    const QList<QVariant>&,
-					    const QString&)));
-
-        delete mDBus;
-        mDBus = 0;
-    }
-
-    /* Icd2 dbus API functions */
-    QStringList scan(icd_scan_request_flags flags,
-		     QStringList &network_types,
-		     QList<IcdScanResult>& scan_results,
-		     QString& error);
-    void scanCancel();
-    bool connect(icd_connection_flags flags, IcdConnectResult& result);
-    bool connect(icd_connection_flags flags, QList<ConnectParams>& params,
-		 IcdConnectResult& result);
-    bool connect(icd_connection_flags flags, QString& iap, QString& result);
-    void select(uint flags);
-    void disconnect(uint connect_flags, QString& service_type,
-		    uint service_attrs, QString& service_id,
-		    QString& network_type, uint network_attrs,
-		    QByteArray& network_id);
-    void disconnect(uint connect_flags);
-
-    uint state(QString& service_type, uint service_attrs,
-	       QString& service_id, QString& network_type,
-	       uint network_attrs, QByteArray& network_id,
-	       IcdStateResult &state_result);
-    uint statistics(QString& service_type, uint service_attrs,
-		    QString& service_id, QString& network_type,
-		    uint network_attrs, QByteArray& network_id,
-		    IcdStatisticsResult& stats_result);
-    uint addrinfo(QString& service_type, uint service_attrs,
-		  QString& service_id, QString& network_type,
-		  uint network_attrs, QByteArray& network_id,
-		  IcdAddressInfoResult& addr_result);
-
-    uint state(QList<IcdStateResult>& state_results);
-    uint state_non_blocking(QList<IcdStateResult>& state_results);
-    uint statistics(QList<IcdStatisticsResult>& stats_results);
-    uint addrinfo(QList<IcdAddressInfoResult>& addr_results);
-    uint addrinfo_non_blocking(QList<IcdAddressInfoResult>& addr_results);
-
-    void signalReceived(const QString& interface, 
-                        const QString& signal,
-                        const QList<QVariant>& args);
-    void callReply(const QString& method, 
-                   const QList<QVariant>& args,
-                   const QString& error);
-
-    QString error() { return mError; }
-
-public:
-    DBusDispatcher *mDBus;
-    QString mMethod;
-    QString mInterface;
-    QString mSignal;
-    QString mError;
-    QList<QVariant> mArgs;
-    QList<QVariant> receivedSignals;
-    unsigned int timeout;
-    IcdDbusInterfaceVer icd_dbus_version;
-    Icd *icd;
-
-    void init(unsigned int dbus_timeout, IcdDbusInterfaceVer ver,
-	      Icd *myfriend)
-    {
-      if (ver == IcdNewDbusInterface) {
-	mDBus = new DBusDispatcher(ICD_DBUS_API_INTERFACE,
-				   ICD_DBUS_API_PATH,
-				   ICD_DBUS_API_INTERFACE);
-      } else {
-	mDBus = new DBusDispatcher(ICD_DBUS_SERVICE,
-				   ICD_DBUS_PATH,
-				   ICD_DBUS_INTERFACE);
-      }
-      icd_dbus_version = ver;
-
-      /* This connect has a side effect as it means that only one
-       * Icd object can exists in one time. This should be fixed!
-       */
-      QObject::connect(mDBus, 
-		       SIGNAL(signalReceived(const QString&, 
-					     const QString&,
-					     const QList<QVariant>&)),
-		       myfriend,
-		       SLOT(icdSignalReceived(const QString&, 
-					      const QString&,
-					      const QList<QVariant>&)));
-
-      QObject::connect(mDBus,
-		       SIGNAL(callReply(const QString&,
-					const QList<QVariant>&,
-					const QString&)),
-		       myfriend,
-		       SLOT(icdCallReply(const QString&,
-					 const QList<QVariant>&,
-					 const QString&)));
-
-      icd = myfriend;
-      timeout = dbus_timeout;
-
-#ifdef PRINT_DEBUGINFO
-      if (!fdebug) {
-	fdebug = fopen("/tmp/maemoicd.log", "a+");
-      }
-      PDEBUG("created %s\n", "IcdPrivate");
-#endif
-    }
-
-    void clearState()
-    {
-      mMethod.clear();
-      mInterface.clear();
-      mSignal.clear();
-      mError.clear();
-      mArgs.clear();
-      receivedSignals.clear();
-    }
-
-    bool doConnect(IcdConnectResult& result);
-    bool doConnect(QString& result);
-    bool doState();
-};
-
-
-void IcdPrivate::signalReceived(const QString& interface, 
-				const QString& signal,
-				const QList<QVariant>& args)
-{
-    // Signal handler, which simply records what has been signalled
-    mInterface = interface;
-    mSignal = signal;
-    mArgs = args;
-
-    //qDebug() << "signal" << signal << "received:" << args;
-    receivedSignals << QVariant(interface) << QVariant(signal) << QVariant(args);
-}
-
-
-void IcdPrivate::callReply(const QString& method, 
-			   const QList<QVariant>& /*args*/,
-			   const QString& error)
-{
-    mMethod = method;
-    mError = error;
-}
-
-
-static void get_scan_result(QList<QVariant>& args,
-			    IcdScanResult& ret)
-{
-    int i=0;
-
-    if (args.isEmpty())
-      return;
-
-    ret.status = args[i++].toUInt();
-    ret.timestamp = args[i++].toUInt();
-    ret.scan.service_type = args[i++].toString();
-    ret.service_name = args[i++].toString();
-    ret.scan.service_attrs = args[i++].toUInt();
-    ret.scan.service_id = args[i++].toString();
-    ret.service_priority = args[i++].toInt();
-    ret.scan.network_type = args[i++].toString();
-    ret.network_name = args[i++].toString();
-    ret.scan.network_attrs = args[i++].toUInt();
-    ret.scan.network_id = args[i++].toByteArray();
-    ret.network_priority = args[i++].toInt();
-    ret.signal_strength = args[i++].toInt();
-    ret.station_id = args[i++].toString();
-    ret.signal_dB = args[i++].toInt();
-}
-
-
-static void get_connect_result(QList<QVariant>& args,
-			       IcdConnectResult& ret)
-{
-    int i=0;
-
-    if (args.isEmpty())
-      return;
-
-    ret.connect.service_type = args[i++].toString();
-    ret.connect.service_attrs = args[i++].toInt();
-    ret.connect.service_id = args[i++].toString();
-    ret.connect.network_type = args[i++].toString();
-    ret.connect.network_attrs = args[i++].toInt();
-    ret.connect.network_id = args[i++].toByteArray();
-    ret.status = args[i++].toInt();
-}
-
-
-QStringList IcdPrivate::scan(icd_scan_request_flags flags,
-			     QStringList &network_types,
-			     QList<IcdScanResult>& scan_results,
-			     QString& error)
-{
-    QStringList scanned_types;
-    QTimer timer;
-    QVariant reply;
-    QVariantList vl;
-    bool last_result = false;
-    IcdScanResult result;
-    int all_waited;
-    
-    clearState();
-    reply = mDBus->call(ICD_DBUS_API_SCAN_REQ, (uint)flags);
-    if (reply.type() != QVariant::List)
-        return scanned_types;
-    vl = reply.toList();
-    if (vl.isEmpty()) {
-        error = "Scan did not return anything.";
-	return scanned_types;
-    }
-    reply = vl.first();
-    scanned_types = reply.toStringList();
-    //qDebug() << "Scanning:" << scanned_types;
-    all_waited = scanned_types.size();
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-
-    scan_results.clear();
-    while (!last_result) {
-	while (timer.isActive() && mInterface.isEmpty() && mError.isEmpty()) {
-	    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-	}
-
-	if (!timer.isActive()) {
-	    //qDebug() << "Timeout happened";
-	    break;
-	}
-
-	if (mSignal != ICD_DBUS_API_SCAN_SIG) {
-	    //qDebug() << "Received" << mSignal << "while waiting" << ICD_DBUS_API_SCAN_SIG << ", ignoring";
-	    mInterface.clear();
-	    continue;
-	}
-
-	if (mError.isEmpty()) {
-  	    QString msgInterface = receivedSignals.takeFirst().toString();
-	    QString msgSignal = receivedSignals.takeFirst().toString();
-	    QList<QVariant> msgArgs = receivedSignals.takeFirst().toList();
-	    //qDebug() << "Signal" << msgSignal << "received.";
-	    //qDebug() << "Params:" << msgArgs;
-
-	    while (!msgSignal.isEmpty()) {
-		get_scan_result(msgArgs, result);
-
-#if 0
-		qDebug() << "Received: " <<
-		    "status =" << result.status <<
-		    ", timestamp =" << result.timestamp <<
-		    ", service_type =" << result.scan.service_type <<
-		    ", service_name =" << result.service_name <<
-		    ", service_attrs =" << result.scan.service_attrs <<
-		    ", service_id =" << result.scan.service_id <<
-		    ", service_priority =" << result.service_priority <<
-		    ", network_type =" << result.scan.network_type <<
-		    ", network_name =" << result.network_name <<
-		    ", network_attrs =" << result.scan.network_attrs <<
-		    ", network_id =" << "-" <<
-		    ", network_priority =" << result.network_priority <<
-		    ", signal_strength =" << result.signal_strength <<
-		    ", station_id =" << result.station_id <<
-		    ", signal_dB =" << result.signal_dB;
-#endif
-
-		if (result.status == ICD_SCAN_COMPLETE) {
-		    //qDebug() << "waited =" << all_waited;
-		    if (--all_waited == 0) {
-		        last_result = true;
-			break;
-		    }
-		} else
-		    scan_results << result;
-
-		if (receivedSignals.isEmpty())
-		    break;
-
-		msgInterface = receivedSignals.takeFirst().toString();
-		msgSignal = receivedSignals.takeFirst().toString();
-		msgArgs = receivedSignals.takeFirst().toList();
-	    }
-	    mInterface.clear();
-
-	} else {
-	    qWarning() << "Error while scanning:" << mError;
-	    break;
-	}
-    }
-    timer.stop();
-
-    error = mError;
-    return scanned_types;
-}
-
-
-void IcdPrivate::scanCancel()
-{
-    mDBus->call(ICD_DBUS_API_SCAN_CANCEL);
-}
-
-
-bool IcdPrivate::doConnect(IcdConnectResult& result)
-{
-    QTimer timer;
-    bool status = false;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-
-    //qDebug() << "Waiting" << ICD_DBUS_API_CONNECT_SIG << "signal";
-
-    while (timer.isActive() && mInterface.isEmpty() &&
-	mSignal != ICD_DBUS_API_CONNECT_SIG &&
-	mError.isEmpty()) {
-	QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    }
-
-    timer.stop();
-
-    if (mError.isEmpty()) {
-        if (!mArgs.isEmpty()) {
-	    get_connect_result(mArgs, result);
-	    status = true;
-	} else
-	    status = false;
-    } else
-	status = false;
-
-    return status;
-}
-
-
-bool IcdPrivate::connect(icd_connection_flags flags, IcdConnectResult& result)
-{
-    clearState();
-    //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags);
-    mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags);
-    icdRefCounting()->setup(flags);
-    return doConnect(result);
-}
-
-
-bool IcdPrivate::connect(icd_connection_flags flags, QList<ConnectParams>& params,
-		IcdConnectResult& result)
-{
-    QVariantList varlist;
-    QVariantList varlist2;
-
-    foreach (ConnectParams param, params) {
-        QVariantList items;
-
-	items.append(QVariant(param.connect.service_type));
-	items.append(QVariant(param.connect.service_attrs));
-	items.append(QVariant(param.connect.service_id));
-	items.append(QVariant(param.connect.network_type));
-	items.append(QVariant(param.connect.network_attrs));
-	items.append(QVariant(param.connect.network_id));
-
-	varlist.append(items);
-    }
-
-    varlist2.append(QVariant(varlist));
-
-    clearState();
-    //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2);
-    mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2);
-    icdRefCounting()->setup(flags);
-    return doConnect(result);
-}
-
-
-bool IcdPrivate::doConnect(QString& ret)
-{
-    QTimer timer;
-    bool status = false;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-
-    while (timer.isActive() && mInterface.isEmpty() &&
-	mError.isEmpty()) {
-	QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    }
-
-    timer.stop();
-
-    if (mError.isEmpty()) {
-	if (!mArgs.isEmpty()) {
-	    status = true;
-	    //ret = mArgs[0];  // TODO correctly
-	} else
-	    status = false;
-    } else
-	status = false;
-
-    return status;
-}
-
-
-bool IcdPrivate::connect(icd_connection_flags flags, QString& iap, QString& result)
-{
-    clearState();
-    //mDBus->callAsynchronous(ICD_CONNECT_REQ, iap, (uint)flags);
-    mDBus->call(ICD_CONNECT_REQ, iap, (uint)flags);
-    icdRefCounting()->setup(flags);
-    return doConnect(result);
-}
-
-
-void IcdPrivate::select(uint flags)
-{
-    mDBus->call(ICD_DBUS_API_SELECT_REQ, flags);
-}
-
-
-void IcdPrivate::disconnect(uint flags, QString& service_type,
-		    uint service_attrs, QString& service_id,
-		    QString& network_type, uint network_attrs,
-		    QByteArray& network_id)
-{
-    clearState();
-    mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags,
-		service_type, service_attrs, service_id,
-		network_type, network_attrs, network_id);
-    icdRefCounting()->cleanup();
-}
-
-
-void IcdPrivate::disconnect(uint flags)
-{
-    clearState();
-    mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags);
-    icdRefCounting()->cleanup();
-}
-
-
-static void get_state_all_result(QList<QVariant>& args,
-				 IcdStateResult& ret)
-{
-    int i=0;
-
-    ret.params.service_type = args[i++].toString();
-    ret.params.service_attrs = args[i++].toUInt();
-    ret.params.service_id = args[i++].toString();
-    ret.params.network_type = args[i++].toString();
-    ret.params.network_attrs = args[i++].toUInt();
-    ret.params.network_id = args[i++].toByteArray();
-    ret.error = args[i++].toString();
-    ret.state = args[i++].toInt();
-}
-
-
-static void get_state_all_result2(QList<QVariant>& args,
-				 IcdStateResult& ret)
-{
-    int i=0;
-
-    ret.params.network_type = args[i++].toString();
-    ret.state = args[i++].toInt();
-
-    // Initialize the other values so that the caller can
-    // notice we only returned partial status
-    ret.params.service_type = QString();
-    ret.params.service_attrs = 0;
-    ret.params.service_id = QString();
-    ret.params.network_attrs = 0;
-    ret.params.network_id = QByteArray();
-    ret.error = QString();
-}
-
-
-uint IcdPrivate::state(QString& service_type, uint service_attrs,
-		       QString& service_id, QString& network_type,
-		       uint network_attrs, QByteArray& network_id,
-		       IcdStateResult& state_result)
-{
-    QTimer timer;
-    QVariant reply;
-    uint total_signals;
-    QVariantList vl;
-
-    clearState();
-
-    reply = mDBus->call(ICD_DBUS_API_STATE_REQ,
-			service_type, service_attrs, service_id,
-			network_type, network_attrs, network_id);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    total_signals = reply.toUInt();
-    if (!total_signals)
-        return 0;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-
-    mInterface.clear();
-    while (timer.isActive() && mInterface.isEmpty()) {
-        QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-
-	if (mSignal != ICD_DBUS_API_STATE_SIG) {
-            mInterface.clear();
-	    continue;
-	}
-    }
-
-    timer.stop();
-
-    if (mError.isEmpty()) {
-        if (!mArgs.isEmpty()) {
-	    if (mArgs.size()>2)
-	        get_state_all_result(mArgs, state_result);
-	    else {
-	        // We are not connected as we did not get the status we asked
-	        return 0;
-	    }
-	}
-    } else {
-        qWarning() << "Error:" << mError;
-    }
-
-    // The returned value should be one because we asked for one state
-    return total_signals;
-}
-
-
-uint IcdPrivate::state_non_blocking(QList<IcdStateResult>& state_results)
-{
-    QTimer timer;
-    QVariant reply;
-    QVariantList vl;
-    uint signals_left, total_signals;
-    IcdStateResult result;
-
-    PDEBUG("%s\n", "non blocking state");
-
-    clearState();
-    reply = mDBus->call(ICD_DBUS_API_STATE_REQ);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    signals_left = total_signals = reply.toUInt();
-    if (!signals_left)
-        return 0;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-    state_results.clear();
-    mError.clear();
-    while (signals_left) {
-        mInterface.clear();
-	while (timer.isActive() && mInterface.isEmpty()) {
-	    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-	}
-
-	if (!timer.isActive()) {
-	    total_signals = 0;
-	    break;
-	}
-
-	if (mSignal != ICD_DBUS_API_STATE_SIG) {
-	    continue;
-	}
-
-	if (mError.isEmpty()) {
-	    if (!mArgs.isEmpty()) {
-	        if (mArgs.size()==2)
-	            get_state_all_result2(mArgs, result);
-		else
-	            get_state_all_result(mArgs, result);
-		state_results << result;
-	    }
-	    signals_left--;
-	} else {
-	    qWarning() << "Error:" << mError;
-	    break;
-	}
-    }
-    timer.stop();
-
-    PDEBUG("total_signals=%d\n", total_signals);
-    return total_signals;
-}
-
-
-/* Special version of the state() call which does not call event loop.
- * Needed in order to fix NB#175098 where Qt4.7 webkit crashes because event
- * loop is run when webkit does not expect it. This function is called from
- * bearer management API syncStateWithInterface() in QNetworkSession
- * constructor.
- */
-uint IcdPrivate::state(QList<IcdStateResult>& state_results)
-{
-    QVariant reply;
-    QVariantList vl;
-    uint signals_left, total_signals;
-    IcdStateResult result;
-    time_t started;
-    int timeout_secs = timeout / 1000;
-
-    PDEBUG("%s\n", "state_results");
-
-    clearState();
-    reply = mDBus->call(ICD_DBUS_API_STATE_REQ);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    signals_left = total_signals = reply.toUInt();
-    if (!signals_left)
-        return 0;
-
-    started = time(0);
-    state_results.clear();
-    mError.clear();
-    while (signals_left) {
-        mInterface.clear();
-	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
-	    mDBus->synchronousDispatch(1000);
-	}
-
-        if (time(0)>(started+timeout_secs)) {
-	    total_signals = 0;
-	    break;
-	}
-
-	if (mSignal != ICD_DBUS_API_STATE_SIG) {
-	    continue;
-	}
-
-	if (mError.isEmpty()) {
-	    if (!mArgs.isEmpty()) {
-	        if (mArgs.size()==2)
-	            get_state_all_result2(mArgs, result);
-		else
-	            get_state_all_result(mArgs, result);
-		state_results << result;
-	    }
-	    signals_left--;
-	} else {
-	    qWarning() << "Error:" << mError;
-	    break;
-	}
-    }
-
-    PDEBUG("total_signals=%d\n", total_signals);
-    return total_signals;
-}
-
-
-static void get_statistics_all_result(QList<QVariant>& args,
-				      IcdStatisticsResult& ret)
-{
-    int i=0;
-
-    if (args.isEmpty())
-      return;
-
-    ret.params.service_type = args[i++].toString();
-    ret.params.service_attrs = args[i++].toUInt();
-    ret.params.service_id = args[i++].toString();
-    ret.params.network_type = args[i++].toString();
-    ret.params.network_attrs = args[i++].toUInt();
-    ret.params.network_id = args[i++].toByteArray();
-    ret.time_active = args[i++].toUInt();
-    ret.signal_strength = (enum icd_nw_levels)args[i++].toUInt();
-    ret.bytes_sent = args[i++].toUInt();
-    ret.bytes_received = args[i++].toUInt();
-}
-
-
-uint IcdPrivate::statistics(QList<IcdStatisticsResult>& stats_results)
-{
-    QTimer timer;
-    QVariant reply;
-    QVariantList vl;
-    uint signals_left, total_signals;
-    IcdStatisticsResult result;
-
-    clearState();
-    reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    if (reply.type() != QVariant::UInt)
-        return 0;
-    signals_left = total_signals = reply.toUInt();
-
-    if (!signals_left)
-        return 0;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-    stats_results.clear();
-    while (signals_left) {
-	mInterface.clear();
-	while (timer.isActive() && mInterface.isEmpty()) {
-	    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-	}
-
-	if (!timer.isActive()) {
-	    total_signals = 0;
-	    break;
-	}
-
-	if (mSignal != ICD_DBUS_API_STATISTICS_SIG) {
-	    continue;
-	}
-
-	if (mError.isEmpty()) {
-  	    get_statistics_all_result(mArgs, result);
-	    stats_results << result;
-	    signals_left--;
-	} else {
-	    qWarning() << "Error:" << mError;
-	    break;
-	}
-    }
-    timer.stop();
-
-    return total_signals;
-}
-
-
-uint IcdPrivate::statistics(QString& service_type, uint service_attrs,
-			    QString& service_id, QString& network_type,
-			    uint network_attrs, QByteArray& network_id,
-			    IcdStatisticsResult& stats_result)
-{
-    QTimer timer;
-    QVariant reply;
-    uint total_signals;
-    QVariantList vl;
-
-    clearState();
-
-    reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ,
-			service_type, service_attrs, service_id,
-			network_type, network_attrs, network_id);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    total_signals = reply.toUInt();
-    if (!total_signals)
-        return 0;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-
-    mInterface.clear();
-    while (timer.isActive() && mInterface.isEmpty()) {
-        QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-
-	if (mSignal != ICD_DBUS_API_STATISTICS_SIG) {
-            mInterface.clear();
-	    continue;
-	}
-    }
-
-    timer.stop();
-
-    if (mError.isEmpty()) {
-        get_statistics_all_result(mArgs, stats_result);
-    } else {
-        qWarning() << "Error:" << mError;
-    }
-
-    // The returned value should be one because we asked for one statistics
-    return total_signals;
-}
-
-
-static void get_addrinfo_all_result(QList<QVariant>& args,
-				    IcdAddressInfoResult& ret)
-{
-    int i=0;
-
-    if (args.isEmpty())
-      return;
-
-    ret.params.service_type = args[i++].toString();
-    ret.params.service_attrs = args[i++].toUInt();
-    ret.params.service_id = args[i++].toString();
-    ret.params.network_type = args[i++].toString();
-    ret.params.network_attrs = args[i++].toUInt();
-    ret.params.network_id = args[i++].toByteArray();
-
-    QVariantList vl = args[i].toList();
-    QVariant reply = vl.first();
-    QList<QVariant> lst = reply.toList();
-    for (int k=0; k<lst.size()/6; k=k+6) {
-        IcdIPInformation ip_info;
-	ip_info.address = lst[k].toString();
-	ip_info.netmask = lst[k++].toString();
-	ip_info.default_gateway = lst[k++].toString();
-	ip_info.dns1 = lst[k++].toString();
-	ip_info.dns2 = lst[k++].toString();
-	ip_info.dns3 = lst[k++].toString();
-
-	ret.ip_info << ip_info;
-    }
-}
-
-
-/* Special version of the addrinfo() call which does not call event loop.
- * Needed in order to fix NB#175098 where Qt4.7 webkit crashes because event
- * loop is run when webkit does not expect it. This function is called from
- * bearer management API syncStateWithInterface() in QNetworkSession
- * constructor.
- */
-uint IcdPrivate::addrinfo(QList<IcdAddressInfoResult>& addr_results)
-{
-    QVariant reply;
-    QVariantList vl;
-    uint signals_left, total_signals;
-    IcdAddressInfoResult result;
-    time_t started;
-    int timeout_secs = timeout / 1000;
-
-    PDEBUG("%s\n", "addr_results");
-
-    clearState();
-    reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    if (reply.type() != QVariant::UInt)
-        return 0;
-    signals_left = total_signals = reply.toUInt();
-    if (!signals_left)
-        return 0;
-
-    started = time(0);
-    addr_results.clear();
-    while (signals_left) {
-        mInterface.clear();
-	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
-	    mDBus->synchronousDispatch(1000);
-	}
-
-        if (time(0)>(started+timeout_secs)) {
-	    total_signals = 0;
-	    break;
-	}
-
-	if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) {
-	    continue;
-	}
-
-	if (mError.isEmpty()) {
-  	    get_addrinfo_all_result(mArgs, result);
-	    addr_results << result;
-	    signals_left--;
-	} else {
-	    qWarning() << "Error:" << mError;
-	    break;
-	}
-    }
-
-    PDEBUG("total_signals=%d\n", total_signals);
-    return total_signals;
-}
-
-uint IcdPrivate::addrinfo_non_blocking(QList<IcdAddressInfoResult>& addr_results)
-{
-    QTimer timer;
-    QVariant reply;
-    QVariantList vl;
-    uint signals_left, total_signals;
-    IcdAddressInfoResult result;
-
-    PDEBUG("%s\n", "non blocking addrinfo");
-
-    clearState();
-    reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    if (reply.type() != QVariant::UInt)
-        return 0;
-    signals_left = total_signals = reply.toUInt();
-    if (!signals_left)
-        return 0;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-    addr_results.clear();
-    while (signals_left) {
-        mInterface.clear();
-	while (timer.isActive() && mInterface.isEmpty()) {
-	    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-	}
-
-	if (!timer.isActive()) {
-	    total_signals = 0;
-	    break;
-	}
-
-	if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) {
-	    continue;
-	}
-
-	if (mError.isEmpty()) {
-  	    get_addrinfo_all_result(mArgs, result);
-	    addr_results << result;
-	    signals_left--;
-	} else {
-	    qWarning() << "Error:" << mError;
-	    break;
-	}
-    }
-    timer.stop();
-    PDEBUG("total_signals=%d\n", total_signals);
-    return total_signals;
-}
-
-
-uint IcdPrivate::addrinfo(QString& service_type, uint service_attrs,
-			  QString& service_id, QString& network_type,
-			  uint network_attrs, QByteArray& network_id,
-			  IcdAddressInfoResult& addr_result)
-{
-    QTimer timer;
-    QVariant reply;
-    uint total_signals;
-    QVariantList vl;
-
-    clearState();
-
-    reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ,
-			service_type, service_attrs, service_id,
-			network_type, network_attrs, network_id);
-    if (reply.type() != QVariant::List)
-        return 0;
-    vl = reply.toList();
-    if (vl.isEmpty())
-        return 0;
-    reply = vl.first();
-    total_signals = reply.toUInt();
-
-    if (!total_signals)
-        return 0;
-
-    timer.setSingleShot(true);
-    timer.start(timeout);
-
-    mInterface.clear();
-    while (timer.isActive() && mInterface.isEmpty()) {
-        QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-
-	if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) {
-            mInterface.clear();
-	    continue;
-	}
-    }
-
-    timer.stop();
-
-    if (mError.isEmpty()) {
-        get_addrinfo_all_result(mArgs, addr_result);
-    } else {
-        qWarning() << "Error:" << mError;
-    }
-
-    // The returned value should be one because we asked for one addrinfo
-    return total_signals;
-}
-
-
-Icd::Icd(QObject *parent)
-  : QObject(parent), d(new IcdPrivate(this))
-{
-}
-
-Icd::Icd(unsigned int timeout, QObject *parent)
-  : QObject(parent), d(new IcdPrivate(timeout, this))
-{
-}
-
-Icd::Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent)
-  : QObject(parent), d(new IcdPrivate(timeout, ver, this))
-{
-}
-
-Icd::~Icd()
-{
-    delete d;
-}
-
-
-QStringList Icd::scan(icd_scan_request_flags flags,
-		      QStringList &network_types,
-		      QList<IcdScanResult>& scan_results,
-		      QString& error)
-{
-    return d->scan(flags, network_types, scan_results, error);
-}
-
-
-void Icd::scanCancel()
-{
-    d->scanCancel();
-}
-
-
-bool Icd::connect(icd_connection_flags flags, IcdConnectResult& result)
-{
-    return d->connect(flags, result);
-}
-
-
-bool Icd::connect(icd_connection_flags flags, QList<ConnectParams>& params,
-		  IcdConnectResult& result)
-{
-    return d->connect(flags, params, result);
-}
-
-
-bool Icd::connect(icd_connection_flags flags, QString& iap, QString& result)
-{
-    return d->connect(flags, iap, result);
-}
-
-
-void Icd::select(uint flags)
-{
-    d->select(flags);
-}
-
-
-void Icd::disconnect(uint connect_flags, QString& service_type,
-		     uint service_attrs, QString& service_id,
-		     QString& network_type, uint network_attrs,
-		     QByteArray& network_id)
-{
-    d->disconnect(connect_flags, service_type,
-		  service_attrs, service_id,
-		  network_type, network_attrs,
-		  network_id);
-}
-
-
-void Icd::disconnect(uint connect_flags)
-{
-    d->disconnect(connect_flags);
-}
-
-
-uint Icd::state(QString& service_type, uint service_attrs,
-		QString& service_id, QString& network_type,
-		uint network_attrs, QByteArray& network_id,
-		IcdStateResult &state_result)
-{
-    return d->state(service_type, service_attrs, service_id,
-		    network_type, network_attrs, network_id,
-		    state_result);
-}
-
-
-uint Icd::statistics(QString& service_type, uint service_attrs,
-		     QString& service_id, QString& network_type,
-		     uint network_attrs, QByteArray& network_id,
-		     IcdStatisticsResult& stats_result)
-{
-    return d->statistics(service_type, service_attrs, service_id,
-			 network_type, network_attrs, network_id,
-			 stats_result);
-}
-
-
-uint Icd::addrinfo(QString& service_type, uint service_attrs,
-		   QString& service_id, QString& network_type,
-		   uint network_attrs, QByteArray& network_id,
-		   IcdAddressInfoResult& addr_result)
-{
-    return d->addrinfo(service_type, service_attrs, service_id,
-		       network_type, network_attrs, network_id,
-		       addr_result);
-}
-
-
-uint Icd::state(QList<IcdStateResult>& state_results)
-{
-    return d->state(state_results);
-}
-
-uint Icd::state_non_blocking(QList<IcdStateResult>& state_results)
-{
-    return d->state_non_blocking(state_results);
-}
-
-uint Icd::statistics(QList<IcdStatisticsResult>& stats_results)
-{
-    return d->statistics(stats_results);
-}
-
-
-uint Icd::addrinfo(QList<IcdAddressInfoResult>& addr_results)
-{
-    return d->addrinfo(addr_results);
-}
-
-uint Icd::addrinfo_non_blocking(QList<IcdAddressInfoResult>& addr_results)
-{
-    return d->addrinfo_non_blocking(addr_results);
-}
-
-void Icd::icdSignalReceived(const QString& interface, 
-			 const QString& signal,
-			 const QList<QVariant>& args)
-{
-    d->signalReceived(interface, signal, args);
-}
-
-
-void Icd::icdCallReply(const QString& method, 
-		    const QList<QVariant>& args,
-		    const QString& error)
-{
-    d->callReply(method, args, error);
-}
-
-
-QString Icd::error()
-{
-    return d->error();
-}
-
-}  // Maemo namespace
-
-
diff --git a/src/3rdparty/libconninet/src/maemo_icd.h b/src/3rdparty/libconninet/src/maemo_icd.h
deleted file mode 100644
index d7a8d5b..0000000
--- a/src/3rdparty/libconninet/src/maemo_icd.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-  
-  Copyright (C) 2009 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#ifndef MAEMO_ICD_H
-#define MAEMO_ICD_H
-
-#include <QObject>
-#include <QStringList>
-#include <QByteArray>
-#include <QMetaType>
-#include <QtDBus>
-#include <QDBusArgument>
-
-#include <glib.h>
-#include <icd/dbus_api.h>
-#include <icd/osso-ic.h>
-#include <icd/osso-ic-dbus.h>
-
-#include "dbusdispatcher.h"
-#include <icd/network_api_defines.h>
-
-#define ICD_LONG_SCAN_TIMEOUT (30*1000)  /* 30sec */
-#define ICD_SHORT_SCAN_TIMEOUT (10*1000)  /* 10sec */
-#define ICD_SHORT_CONNECT_TIMEOUT (10*1000) /* 10sec */
-#define ICD_LONG_CONNECT_TIMEOUT (150*1000) /* 2.5min */
-
-namespace Maemo {
-
-struct CommonParams {
-	QString service_type;
-	uint service_attrs;
-	QString service_id;
-	QString network_type;
-	uint network_attrs;
-	QByteArray network_id;
-};
-
-struct ConnectParams {
-	struct CommonParams connect;
-};
-
-struct IcdScanResult {
-	uint status; // see #icd_scan_status
-	uint timestamp; // when last seen
-	QString service_name;
-	uint service_priority; // within a service type
-	QString network_name;
-	uint network_priority;
-	struct CommonParams scan;
-	uint signal_strength; // quality, 0 (none) - 10 (good)
-	QString station_id; // e.g. MAC address or similar id
-	uint signal_dB; // use signal strength above unless you know what you are doing
-
-	IcdScanResult() {
-		status = timestamp = scan.service_attrs = service_priority =
-			scan.network_attrs = network_priority = signal_strength =
-			signal_dB = 0;
-	}
-};
-
-struct IcdConnectResult {
-	struct CommonParams connect;
-	uint status;
-};
-
-struct IcdStateResult {
-	struct CommonParams params;
-	QString error;
-	uint state;
-};
-
-struct IcdStatisticsResult {
-	struct CommonParams params;
-	uint time_active;  // in seconds
-	enum icd_nw_levels signal_strength; // see network_api_defines.h in icd2-dev package
-	uint bytes_sent;
-	uint bytes_received;
-};
-
-struct IcdIPInformation {
-	QString address;
-	QString netmask;
-	QString default_gateway;
-	QString dns1;
-	QString dns2;
-	QString dns3;
-};
-
-struct IcdAddressInfoResult {
-	struct CommonParams params;
-	QList<IcdIPInformation> ip_info;
-};
-
-enum IcdDbusInterfaceVer {
-	IcdOldDbusInterface = 0,  // use the old OSSO-IC interface
-	IcdNewDbusInterface       // use the new Icd2 interface (default)
-};
-
-
-class IcdPrivate;
-class Icd : public QObject
-{
-    Q_OBJECT
-
-public:
-    Icd(QObject *parent = 0);
-    Icd(unsigned int timeout, QObject *parent = 0);
-    Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent = 0);
-    ~Icd();
-    QString error();  // returns last error string
-
-    /* Icd2 dbus API functions */
-    QStringList scan(icd_scan_request_flags flags,
-		     QStringList &network_types,
-		     QList<IcdScanResult>& scan_results,
-		     QString& error);
-    void scanCancel();
-    bool connect(icd_connection_flags flags, IcdConnectResult& result);
-    bool connect(icd_connection_flags flags, QList<ConnectParams>& params,
-		 IcdConnectResult& result);
-    bool connect(icd_connection_flags flags, QString& iap, QString& result);
-    void select(uint flags);
-    void disconnect(uint connect_flags, QString& service_type,
-		    uint service_attrs, QString& service_id,
-		    QString& network_type, uint network_attrs,
-		    QByteArray& network_id);
-    void disconnect(uint connect_flags);
-
-    uint state(QString& service_type, uint service_attrs,
-	       QString& service_id, QString& network_type,
-	       uint network_attrs, QByteArray& network_id,
-	       IcdStateResult &state_result);
-    uint statistics(QString& service_type, uint service_attrs,
-		    QString& service_id, QString& network_type,
-		    uint network_attrs, QByteArray& network_id,
-		    IcdStatisticsResult& stats_result);
-    uint addrinfo(QString& service_type, uint service_attrs,
-		  QString& service_id, QString& network_type,
-		  uint network_attrs, QByteArray& network_id,
-		  IcdAddressInfoResult& addr_result);
-
-    uint state(QList<IcdStateResult>& state_results);
-    uint state_non_blocking(QList<IcdStateResult>& state_results);
-    uint statistics(QList<IcdStatisticsResult>& stats_results);
-    uint addrinfo(QList<IcdAddressInfoResult>& addr_results);
-    uint addrinfo_non_blocking(QList<IcdAddressInfoResult>& addr_results);
-
-private Q_SLOTS:
-    void icdSignalReceived(const QString& interface, 
-                        const QString& signal,
-                        const QList<QVariant>& args);
-    void icdCallReply(const QString& method, 
-                   const QList<QVariant>& args,
-                   const QString& error);
-
-private:
-    IcdPrivate *d;
-    friend class IcdPrivate;
-};
-
-}  // Maemo namespace
-
-#endif
diff --git a/src/3rdparty/libconninet/src/proxyconf.cpp b/src/3rdparty/libconninet/src/proxyconf.cpp
deleted file mode 100644
index d377a31..0000000
--- a/src/3rdparty/libconninet/src/proxyconf.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2010 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#include <QVariant>
-#include <QStringList>
-#include <QDebug>
-#include <QWriteLocker>
-#include <QNetworkProxyFactory>
-#include <QNetworkProxy>
-#include <gconf/gconf-value.h>
-#include <gconf/gconf-client.h>
-#include "proxyconf.h"
-
-#define CONF_PROXY "/system/proxy"
-#define HTTP_PROXY "/system/http_proxy"
-
-
-namespace Maemo {
-
-static QString convertKey(const char *key)
-{
-    return QString::fromUtf8(key);
-}
-
-static QVariant convertValue(GConfValue *src)
-{
-    if (!src) {
-        return QVariant();
-    } else {
-        switch (src->type) {
-        case GCONF_VALUE_INVALID:
-            return QVariant(QVariant::Invalid);
-        case GCONF_VALUE_BOOL:
-            return QVariant((bool)gconf_value_get_bool(src));
-        case GCONF_VALUE_INT:
-            return QVariant(gconf_value_get_int(src));
-        case GCONF_VALUE_FLOAT:
-            return QVariant(gconf_value_get_float(src));
-        case GCONF_VALUE_STRING:
-            return QVariant(QString::fromUtf8(gconf_value_get_string(src)));
-        case GCONF_VALUE_LIST:
-            switch (gconf_value_get_list_type(src)) {
-            case GCONF_VALUE_STRING:
-                {
-                    QStringList result;
-                    for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
-                        result.append(QString::fromUtf8(gconf_value_get_string((GConfValue *)elts->data)));
-                    return QVariant(result);
-                }
-            default:
-                {
-                    QList<QVariant> result;
-                    for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
-                        result.append(convertValue((GConfValue *)elts->data));
-                    return QVariant(result);
-                }
-            }
-        case GCONF_VALUE_SCHEMA:
-        default:
-            return QVariant();
-        }
-    }
-}
-
-
-/* Fast version of GConfItem, allows reading subtree at a time */
-class GConfItemFast {
-public:
-  GConfItemFast(const QString &k) : key(k) {}
-  QHash<QString,QVariant> getEntries() const;
-
-private:
-  QString key;
-};
-
-#define withClient(c) for (GConfClient *c = gconf_client_get_default(); c; c=0)
-
-
-QHash<QString,QVariant> GConfItemFast::getEntries() const
-{
-    QHash<QString,QVariant> children;
-
-    withClient(client) {
-        QByteArray k = key.toUtf8();
-        GSList *entries = gconf_client_all_entries(client, k.data(), NULL);
-        for (GSList *e = entries; e; e = e->next) {
-	    char *key_name = strrchr(((GConfEntry *)e->data)->key, '/');
-	    if (!key_name)
-	        key_name = ((GConfEntry *)e->data)->key;
-	    else
-	        key_name++;
-	    QString key(convertKey(key_name));
-	    QVariant value = convertValue(((GConfEntry *)e->data)->value);
-	    gconf_entry_unref((GConfEntry *)e->data);
-	    //qDebug()<<"key="<<key<<"value="<<value;
-	    children.insert(key, value);
-        }
-        g_slist_free (entries);
-    }
-
-    return children;
-}
-
-
-
-class NetworkProxyFactory : QNetworkProxyFactory {
-public:
-    NetworkProxyFactory() { }
-    QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery());
-};
-
-
-QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query)
-{
-    ProxyConf proxy_conf;
-
-    QList<QNetworkProxy> result = proxy_conf.flush(query);
-    if (result.isEmpty())
-        result << QNetworkProxy::NoProxy;
-
-    return result;
-}
-
-
-class ProxyConfPrivate {
-private:
-    // proxy values from gconf
-    QString mode;
-    bool use_http_host;
-    QString autoconfig_url;
-    QString http_proxy;
-    quint16 http_port;
-    QList<QVariant> ignore_hosts;
-    QString secure_host;
-    quint16 secure_port;
-    QString ftp_host;
-    quint16 ftp_port;
-    QString socks_host;
-    quint16 socks_port;
-    QString rtsp_host;
-    quint16 rtsp_port;
-
-    bool isHostExcluded(const QString &host);
-
-public:
-    QString prefix;
-    QString http_prefix;
-
-    void readProxyData();
-    QList<QNetworkProxy> flush(const QNetworkProxyQuery &query);
-};
-
-
-static QHash<QString,QVariant> getValues(const QString& prefix)
-{
-    GConfItemFast item(prefix);
-    return item.getEntries();
-}
-
-static QHash<QString,QVariant> getHttpValues(const QString& prefix)
-{
-    GConfItemFast item(prefix);
-    return item.getEntries();
-}
-
-#define GET(var, type)				\
-  do {						\
-    QVariant v = values.value(#var);		\
-    if (v.isValid())				\
-      var = v.to##type ();			\
-  } while(0)
-
-#define GET_HTTP(var, name, type)		\
-  do {						\
-    QVariant v = httpValues.value(#name);	\
-    if (v.isValid())				\
-      var = v.to##type ();			\
-  } while(0)
-
-
-void ProxyConfPrivate::readProxyData()
-{
-    QHash<QString,QVariant> values = getValues(prefix);
-    QHash<QString,QVariant> httpValues = getHttpValues(http_prefix);
-
-    //qDebug()<<"values="<<values;
-
-    /* Read the proxy settings from /system/proxy* */
-    GET_HTTP(http_proxy, host, String);
-    GET_HTTP(http_port, port, Int);
-    GET_HTTP(ignore_hosts, ignore_hosts, List);
-
-    GET(mode, String);
-    GET(autoconfig_url, String);
-    GET(secure_host, String);
-    GET(secure_port, Int);
-    GET(ftp_host, String);
-    GET(ftp_port, Int);
-    GET(socks_host, String);
-    GET(socks_port, Int);
-    GET(rtsp_host, String);
-    GET(rtsp_port, Int);
-
-    if (http_proxy.isEmpty())
-        use_http_host = false;
-    else
-        use_http_host = true;
-}
-
-
-bool ProxyConfPrivate::isHostExcluded(const QString &host)
-{
-    if (host.isEmpty())
-        return true;
-
-    if (ignore_hosts.isEmpty())
-        return false;
-
-    QHostAddress ipAddress;
-    bool isIpAddress = ipAddress.setAddress(host);
-
-    foreach (QVariant h, ignore_hosts) {
-        QString entry = h.toString();
-        if (isIpAddress && ipAddress.isInSubnet(QHostAddress::parseSubnet(entry))) {
-            return true;  // excluded
-        } else {
-            // do wildcard matching
-            QRegExp rx(entry, Qt::CaseInsensitive, QRegExp::Wildcard);
-            if (rx.exactMatch(host))
-                return true;
-        }
-    }
-
-    // host was not excluded
-    return false;
-}
-
-
-QList<QNetworkProxy> ProxyConfPrivate::flush(const QNetworkProxyQuery &query)
-{
-    QList<QNetworkProxy> result;
-
-#if 0
-    qDebug()<<"http_proxy" << http_proxy;
-    qDebug()<<"http_port" << http_port;
-    qDebug()<<"ignore_hosts" << ignore_hosts;
-    qDebug()<<"use_http_host" << use_http_host;
-    qDebug()<<"mode" << mode;
-    qDebug()<<"autoconfig_url" << autoconfig_url;
-    qDebug()<<"secure_host" << secure_host;
-    qDebug()<<"secure_port" << secure_port;
-    qDebug()<<"ftp_host" << ftp_host;
-    qDebug()<<"ftp_port" << ftp_port;
-    qDebug()<<"socks_host" << socks_host;
-    qDebug()<<"socks_port" << socks_port;
-    qDebug()<<"rtsp_host" << rtsp_host;
-    qDebug()<<"rtsp_port" << rtsp_port;
-#endif
-
-    if (isHostExcluded(query.peerHostName()))
-        return result;          // no proxy for this host
-
-    if (mode == "auto") {
-        // TODO: pac currently not supported, fix me
-        return result;
-    }
-
-    if (mode == "manual") {
-        bool isHttps = false;
-	QString protocol = query.protocolTag().toLower();
-
-	// try the protocol-specific proxy
-	QNetworkProxy protocolSpecificProxy;
-
-	if (protocol == QLatin1String("ftp")) {
-	    if (!ftp_host.isEmpty()) {
-	        protocolSpecificProxy.setType(QNetworkProxy::FtpCachingProxy);
-		protocolSpecificProxy.setHostName(ftp_host);
-		protocolSpecificProxy.setPort(ftp_port);
-	    }
-	} else if (protocol == QLatin1String("http")) {
-	    if (!http_proxy.isEmpty()) {
-	        protocolSpecificProxy.setType(QNetworkProxy::HttpProxy);
-		protocolSpecificProxy.setHostName(http_proxy);
-		protocolSpecificProxy.setPort(http_port);
-	    }
-	} else if (protocol == QLatin1String("https")) {
-	    isHttps = true;
-	    if (!secure_host.isEmpty()) {
-	        protocolSpecificProxy.setType(QNetworkProxy::HttpProxy);
-		protocolSpecificProxy.setHostName(secure_host);
-		protocolSpecificProxy.setPort(secure_port);
-	    }
-	}
-
-	if (protocolSpecificProxy.type() != QNetworkProxy::DefaultProxy)
-	    result << protocolSpecificProxy;
-
-
-        if (!socks_host.isEmpty()) {
-	    QNetworkProxy proxy;
-	    proxy.setType(QNetworkProxy::Socks5Proxy);
-	    proxy.setHostName(socks_host);
-	    proxy.setPort(socks_port);
-	    result << proxy;
-	}
-
-
-	// Add the HTTPS proxy if present (and if we haven't added yet)
-	if (!isHttps) {
-	    QNetworkProxy https;
-	    if (!secure_host.isEmpty()) {
-	        https.setType(QNetworkProxy::HttpProxy);
-		https.setHostName(secure_host);
-		https.setPort(secure_port);
-	    }
-
-	    if (https.type() != QNetworkProxy::DefaultProxy &&
-		https != protocolSpecificProxy)
-	        result << https;
-	}
-    }
-
-    return result;
-}
-
-
-ProxyConf::ProxyConf()
-    : d_ptr(new ProxyConfPrivate)
-{
-    g_type_init();
-    d_ptr->prefix = CONF_PROXY;
-    d_ptr->http_prefix = HTTP_PROXY;
-}
-
-ProxyConf::~ProxyConf()
-{
-    delete d_ptr;
-}
-
-
-QList<QNetworkProxy> ProxyConf::flush(const QNetworkProxyQuery &query)
-{
-    d_ptr->readProxyData();
-    return d_ptr->flush(query);
-}
-
-
-static int refcount = 0;
-static QReadWriteLock lock;
-
-void ProxyConf::update()
-{
-    QWriteLocker locker(&lock);
-    NetworkProxyFactory *factory = new NetworkProxyFactory();
-    QNetworkProxyFactory::setApplicationProxyFactory((QNetworkProxyFactory*)factory);
-    refcount++;
-}
-
-
-void ProxyConf::clear(void)
-{
-    QWriteLocker locker(&lock);
-    refcount--;
-    if (refcount == 0)
-        QNetworkProxyFactory::setApplicationProxyFactory(NULL);
-
-    if (refcount<0)
-        refcount = 0;
-}
-
-
-} // namespace Maemo
diff --git a/src/3rdparty/libconninet/src/proxyconf.h b/src/3rdparty/libconninet/src/proxyconf.h
deleted file mode 100644
index 7711c49..0000000
--- a/src/3rdparty/libconninet/src/proxyconf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2010 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-#ifndef PROXYCONF_H
-#define PROXYCONF_H
-
-#include <QString>
-#include <QNetworkProxy>
-
-namespace Maemo {
-
-class ProxyConfPrivate;
-class ProxyConf {
-private:
-    ProxyConfPrivate *d_ptr;
-
-public:
-    ProxyConf();
-    virtual ~ProxyConf();
-
-    QList<QNetworkProxy> flush(const QNetworkProxyQuery &query = QNetworkProxyQuery());  // read the proxies from db
-
-    /* Note that for each update() call there should be corresponding
-     * clear() call because the ProxyConf class implements a reference
-     * counting mechanism. The factory is removed only when there is
-     * no one using the factory any more.
-     */
-    static void update(void);          // this builds QNetworkProxy factory
-    static void clear(void);           // this removes QNetworkProxy factory
-};
-
-} // namespace Maemo
-
-#endif
diff --git a/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp b/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp
deleted file mode 100644
index 70deb3f..0000000
--- a/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/* * This file is part of conn-dui-settings-inet *
- *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: Aapo Makela <aapo.makela@nokia.com>
- *
- * This software, including documentation, is protected by copyright
- * controlled by Nokia Corporation. All rights are reserved. Copying,
- * including reproducing, storing, adapting or translating, any or all of
- * this material requires the prior written consent of Nokia Corporation.
- * This material also contains confidential information which may not be
- * disclosed to others without the prior written consent of Nokia.
- */
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QEventLoop>
-#include <QDebug>
-#include <icd/dbus_api.h>
-
-#include <dbusdispatcher.h>
-
-class Ut_DBusDispatcher : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void init();
-    void cleanup();
-    void initTestCase();
-    void cleanupTestCase();
-
-    void simpleSignalReceived(const QString& interface, 
-                              const QString& signal,
-                              const QList<QVariant>& args);
-    void simpleCallReply(const QString& method, 
-                         const QList<QVariant>& args,
-                         const QString& error);
-    void simpleCall();
-
-    void complexCallReply(const QString& method, 
-                          const QList<QVariant>& args,
-                          const QString& error);
-    void complexCall();
-
-private:
-    Maemo::DBusDispatcher *mSubject;
-    QProcess *icd_stub;
-
-    QString mMethod;
-    QString mInterface;
-    QString mSignal;
-    QList<QVariant> mArgs;
-};
-
-void Ut_DBusDispatcher::init()
-{
-    mSubject = new Maemo::DBusDispatcher("com.nokia.icd2", "/com/nokia/icd2",
-					 "com.nokia.icd2");
-
-    // Start icd2 stub
-    icd_stub = new QProcess(this);
-    icd_stub->start("/usr/bin/icd2_stub.py");
-    QTest::qWait(1000);
-}
-
-void Ut_DBusDispatcher::cleanup()
-{
-    // Terminate icd2 stub
-    icd_stub->terminate();
-    icd_stub->waitForFinished();
-
-    delete mSubject;
-    mSubject = 0;
-}
-
-void Ut_DBusDispatcher::initTestCase()
-{
-} 
-
-void Ut_DBusDispatcher::cleanupTestCase()
-{
-}
-
-void Ut_DBusDispatcher::simpleSignalReceived(const QString& interface, 
-                                             const QString& signal,
-                                             const QList<QVariant>& args)
-{
-    // Signal handler, which simply records what has been signalled
-    mInterface = interface;
-    mSignal = signal;
-    mArgs = args;
-}
-
-void Ut_DBusDispatcher::simpleCallReply(const QString& method, 
-                                        const QList<QVariant>& args,
-                                        const QString& error)
-{
-    mMethod = method;
-
-    // Check that method matches and at least WLAN_INFRA is returned
-    QVERIFY(error.isEmpty());
-    QVERIFY(args[0].toStringList().contains("WLAN_INFRA"));
-}
-
-void Ut_DBusDispatcher::simpleCall()
-{
-    uint flags = 0;
-    QList<QVariant> reply;
-    int idx = 0;
-    QTimer timer;
-
-    // Connect signals
-    connect(mSubject, SIGNAL(signalReceived(const QString&, 
-                                            const QString&,
-                                            const QList<QVariant>&)),
-            this, SLOT(simpleSignalReceived(const QString&, 
-                                      const QString&,
-                                      const QList<QVariant>&)));
-    connect(mSubject, SIGNAL(callReply(const QString&,
-                                       const QList<QVariant>&,
-                                       const QString&)),
-            this, SLOT(simpleCallReply(const QString&,
-                                 const QList<QVariant>&,
-                                 const QString&)));
-
-    // Request scan and verify the call starts succesfully
-    QVERIFY(mSubject->callAsynchronous("scan_req", flags));
-
-    // Wait 1st scan signal for 10 secs
-    timer.setSingleShot(true);
-    timer.start(10000);
-    while (timer.isActive() && mInterface.isEmpty()) {
-        QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-        idx++;
-    }
-    timer.stop();
-
-    // Sanity checks for the scan result
-    QVERIFY(mInterface == "com.nokia.icd2");    // interface is icd2
-    QVERIFY(mMethod == "scan_req");             // method is scan_req
-    QVERIFY(mSignal == "scan_result_sig");      // signal is scan result
-    QVERIFY(mArgs[0] == QVariant(0) ||
-	    mArgs[0] == QVariant(4));           // First argument is status
-                                                // (0 == NEW, 4 == COMPLETED)
-    //QVERIFY(mArgs.contains(QVariant("WLAN_INFRA"))); // WLAN scan result
-}
-
-void Ut_DBusDispatcher::complexCallReply(const QString& method, 
-                                         const QList<QVariant>& args,
-                                         const QString& error)
-{
-    mMethod = method;
-
-    // Check that method has not return arguments and error is not set
-    QVERIFY(error.isEmpty());
-    QVERIFY(args.isEmpty());
-}
-
-void Ut_DBusDispatcher::complexCall()
-{    
-    uint flags = ICD_CONNECTION_FLAG_UI_EVENT;
-    QList<QVariant> reply;
-    QVariantList networks;
-    QVariantList network1;
-
-    network1 << "" << (uint)0 << "" << "WLAN_INFRA" << (uint)0x05000011 << QByteArray("osso@46@net");
-    networks << QVariant(network1);
-
-    // Connect signal
-    connect(mSubject, SIGNAL(callReply(const QString&,
-                                       const QList<QVariant>&,
-                                       const QString&)),
-            this, SLOT(complexCallReply(const QString&,
-                                        const QList<QVariant>&,
-                                        const QString&)));
-
-    // Request connect and verify the call starts succesfully
-    QVERIFY(mSubject->callAsynchronous("connect_req", flags, networks));
-
-    QTest::qWait(1000);
-
-    // Sanity checks for the scan result
-    QVERIFY(mInterface == "com.nokia.icd2");    // interface is icd2
-    QVERIFY(mMethod == "connect_req");          // method connect_req
-}
-
-QTEST_MAIN(Ut_DBusDispatcher)
-
-#include "ut_dbusdispatcher.moc"
diff --git a/src/3rdparty/libconninet/tests/ut_iapconf.cpp b/src/3rdparty/libconninet/tests/ut_iapconf.cpp
deleted file mode 100644
index 6a91d61..0000000
--- a/src/3rdparty/libconninet/tests/ut_iapconf.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2009 Nokia Corporation. All rights reserved.
-
-  Contact: Aapo Makela <aapo.makela@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-
-#include <QtTest/QtTest>
-#include <QDebug>
-
-#include <iapconf.h>
-
-class Ut_IAPConf : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void init();
-    void cleanup();
-    void initTestCase();
-    void cleanupTestCase();
-
-    void setupIAP();
-    void setupIAPContainingDot();
-    void unsetIAPValueIsNotValid();
-    void verifyAllIAPs();
-    void allForEmptyConfReturnsEmptyList();
-    void settingInvalidValueUnsetsKey();
-
-private:
-    Maemo::IAPConf *mSubject;
-};
-
-void Ut_IAPConf::init()
-{
-    mSubject = new Maemo::IAPConf("test_iap");
-}
-
-void Ut_IAPConf::cleanup()
-{
-    // Clear made settings
-    mSubject->clear();
-
-    delete mSubject;
-    mSubject = 0;
-}
-
-void Ut_IAPConf::initTestCase()
-{
-} 
-
-void Ut_IAPConf::cleanupTestCase()
-{
-}
-
-void Ut_IAPConf::setupIAP()
-{
-    // Set bunch of values
-    mSubject->set("ipv4_type", "AUTO",
-                  "wlan_wepkey1", "connt",
-                  "wlan_wepdefkey", 1,
-                  "wlan_ssid", QByteArray("CONNTEST-1"));
-
-    // Set one value
-    mSubject->setValue("type", "WLAN_INFRA");
-
-    // Check all values that they were set correctly
-    QVERIFY(mSubject->value("ipv4_type").toString() == "AUTO");
-    QVERIFY(mSubject->value("wlan_wepkey1").toString() == "connt");
-    QVERIFY(mSubject->value("wlan_wepdefkey").toInt() == 1);
-    QVERIFY(mSubject->value("wlan_ssid").toByteArray() == QByteArray("CONNTEST-1"));
-    QVERIFY(mSubject->value("type").toString() == "WLAN_INFRA");
-}
-
-void Ut_IAPConf::setupIAPContainingDot()
-{
-    delete mSubject;
-    mSubject = new Maemo::IAPConf("test.iap");
-
-    // Set and check one value
-    mSubject->setValue("type", "DUMMY");
-    QVERIFY(mSubject->value("type").toString() == "DUMMY");
-}
-
-void Ut_IAPConf::unsetIAPValueIsNotValid()
-{
-    QVariant invalidValue = mSubject->value("this_value_does_not_exist");
-    QVERIFY(invalidValue.isValid() == false);
-}
-
-void Ut_IAPConf::verifyAllIAPs()
-{
-    int count = 0, extras = 0;
-    QRegExp regexp("iap[1-3]");
-    Maemo::IAPConf iap1("iap1");
-    Maemo::IAPConf iap2("iap2");
-    Maemo::IAPConf iap3("iap3");
-
-    iap1.clear();
-    iap2.clear();
-    iap3.clear();
-
-    iap1.setValue("name", "iap1");
-    iap2.setValue("name", "iap2");
-    iap3.setValue("name", "iap3");
-
-    count = extras = 0;
-    QList<QString> iaps;
-    Maemo::IAPConf::getAll(iaps, true);
-    foreach (QString iap_path, iaps) {
-        QString iap_id = iap_path.section('/', 5);  /* This is the IAP id */
-	if (!iap_id.contains(regexp)) {
-	    extras++;
-	    continue;
-	}
-	Maemo::IAPConf iap(iap_id);
-	QString name = iap.value("name").toString();
-	QVERIFY(name == iap_id);
-	count++;
-    }
-    QCOMPARE(count, iaps.size()-extras);
-
-    iap1.clear();
-    iap2.clear();
-    iap3.clear();
-
-    iap1.setValue("name", "iap1");
-    iap2.setValue("name", "iap2");
-    iap3.setValue("name", "iap3");
-
-    count = extras = 0;
-    Maemo::IAPConf::getAll(iaps);
-    foreach (QString iap_id, iaps) {
-        if (!iap_id.contains(regexp)) {
-	    extras++;
-	    continue;
-	}
-	Maemo::IAPConf iap(iap_id);
-	QString name = iap.value("name").toString();
-	QVERIFY(name == iap_id);
-	count++;
-    }
-    QCOMPARE(count, iaps.size()-extras);
-}
-
-void Ut_IAPConf::allForEmptyConfReturnsEmptyList()
-{
-    // Clear everything in configuration
-    mSubject->clearAll();
-
-    // Get all for a list and check that it is empty
-    QStringList iaps;
-    mSubject->getAll(iaps);
-    QVERIFY(iaps.isEmpty());
-}
-
-void Ut_IAPConf::settingInvalidValueUnsetsKey()
-{
-    // Setup some IAP
-    setupIAP();
-
-    // Set invalid value to unset "wlan_wepdefkey" key and verify that the
-    // value is unset
-    mSubject->setValue("wlan_wepdefkey", QVariant());
-    QVERIFY(!mSubject->value("wlan_wepdefkey").isValid());
-}
-
-QTEST_MAIN(Ut_IAPConf)
-
-#include "ut_iapconf.moc"
diff --git a/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp b/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp
deleted file mode 100644
index f14f623..0000000
--- a/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2009-2010 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-
-#include <QtTest/QtTest>
-#include <QDebug>
-
-#include <iapmonitor.h>
-#include <iapconf.h>
-
-static const char *iap_id = "test_monitor_1";
-
-class TestIAPMonitor : public Maemo::IAPMonitor
-{
-public:
-    QString addedIap;
-    QString removedIap;
-    
-protected:
-    virtual void iapAdded(const QString &id)
-    {
-        addedIap = id;
-    }
-
-    virtual void iapRemoved(const QString &id)
-    {
-        removedIap = id;
-    }
-};
-
-class Ut_IAPMonitor : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void init();
-    void cleanup();
-    void initTestCase();
-    void cleanupTestCase();
-
-    void check();
-
-private:
-    TestIAPMonitor *mon;
-    Maemo::IAPConf *iap;
-};
-
-void Ut_IAPMonitor::init()
-{
-    mon = new TestIAPMonitor;
-}
-
-void Ut_IAPMonitor::cleanup()
-{
-    delete mon;
-    mon = 0;
-}
-
-void Ut_IAPMonitor::initTestCase()
-{
-} 
-
-void Ut_IAPMonitor::cleanupTestCase()
-{
-}
-
-void Ut_IAPMonitor::check()
-{
-    QVERIFY(mon->addedIap.isEmpty());
-
-    iap = new Maemo::IAPConf(iap_id);
-    iap->set("ipv4_type", "AUTO",
-	    "wlan_wepkey1", "connt",
-	    "wlan_wepdefkey", 1,
-	    "wlan_ssid", QByteArray(iap_id));
-    
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QVERIFY(mon->addedIap == iap_id);
-    mon->addedIap.clear();
-
-    QVERIFY(mon->removedIap.isEmpty());
-
-    // Unset only one value and verify that IAP is not removed
-    iap->set("ipv4_type", QVariant());
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QVERIFY(mon->removedIap.isEmpty());
-
-    // Clear the whole IAP and check that it is removed
-    iap->clear();
-    delete iap;
-
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-
-    QVERIFY(mon->removedIap == iap_id);
-}
-
-QTEST_MAIN(Ut_IAPMonitor)
-
-#include "ut_iapmonitor.moc"
diff --git a/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp b/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp
deleted file mode 100644
index 494829d..0000000
--- a/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-// !!!!
-// !!!! NOTE: THESE TEST DO NOT REALLY WORK YET BECAUSE OF MISSING
-// !!!!       FUNCTIONALITY IN ICD2 STUB. YOU HAVE BEEN WARNED.
-// !!!!
-
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QEventLoop>
-#include <QDebug>
-#include <icd/dbus_api.h>
-
-#include "maemo_icd.h"
-
-class Ut_MaemoIcd : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void init();
-    void cleanup();
-    void initTestCase();
-    void cleanupTestCase();
-
-    void scan_req();
-    void scan_cancel_req();
-    void connect_req_default();
-    void state_req_all();
-    void state_req();
-    void statistics_req_all();
-    void statistics_req();
-    void addrinfo_req_all();
-    void addrinfo_req();
-
-private:
-    void disconnect_req_default(); // this is currently not run
-    void connect_req_specific();   // this is currently not run
-    QProcess *icd_stub;
-    bool connect_iap(Maemo::IcdConnectResult &connect_result,
-		     QString &result,
-		     QString &error,
-		     QString iap=QString());
-};
-
-
-QString create_error_str(Maemo::Icd &icd)
-{
-    return icd.error();
-}
-
-
-void Ut_MaemoIcd::init()
-{
-    icd_stub = new QProcess(this);
-    icd_stub->setStandardOutputFile("/tmp/ut_maemo_icd.log");
-    icd_stub->start("/usr/bin/icd2_stub.py");
-    QTest::qWait(1000);
-
-    // Set the statistics
-    QProcess dbus_send;
-    dbus_send.start("dbus-send --type=method_call --system "
-		    "--dest=com.nokia.icd2 /com/nokia/icd2 "
-		    "com.nokia.icd2.testing.set_statistics "
-		    "uint32:1024 uint32:256");
-    dbus_send.waitForFinished();
-
-}
-
-void Ut_MaemoIcd::cleanup()
-{
-    icd_stub->terminate();
-    icd_stub->waitForFinished();
-}
-
-void Ut_MaemoIcd::initTestCase()
-{
-} 
-
-void Ut_MaemoIcd::cleanupTestCase()
-{
-}
-
-void Ut_MaemoIcd::scan_req()
-{    
-    QList<Maemo::IcdScanResult> scanned;
-    QStringList scannedNetworkTypes;
-    QStringList networkTypesToScan;
-    QString error;
-    Maemo::Icd icd(ICD_SHORT_SCAN_TIMEOUT);
-
-    scannedNetworkTypes = icd.scan(ICD_SCAN_REQUEST_ACTIVE,
-				   networkTypesToScan,
-				   scanned,
-				   error);
-    QVERIFY(error.isEmpty());
-    QCOMPARE(scanned.size(), 3);
-    QVERIFY(scannedNetworkTypes[0] == "WLAN_INFRA");
-    QVERIFY(scannedNetworkTypes[1] == "DUN_GSM_PS");
-}
-
-void Ut_MaemoIcd::scan_cancel_req()
-{
-    Maemo::Icd icd;
-    icd.scanCancel();
-    // Not much to verify here
-}
-
-bool Ut_MaemoIcd::connect_iap(Maemo::IcdConnectResult &connect_result,
-			      QString &result,
-			      QString &error,
-			      QString iap)
-{
-    icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT;
-    bool st;
-    Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT);
-
-    if (iap.isEmpty()) {
-      qDebug() << "connecting to default IAP";
-      st = icd.connect(flags, connect_result);
-    } else {
-      qDebug() << "connecting to" << iap;
-      st = icd.connect(flags, iap, result);
-    }
-
-    error = create_error_str(icd);
-    return st;
-}
-
-void Ut_MaemoIcd::connect_req_default()
-{
-    Maemo::IcdConnectResult connect_result;
-    QString result, error;
-    bool st;
-    st = connect_iap(connect_result, result, error);
-    QVERIFY2(st, error.toAscii().data());
-    result = connect_result.connect.network_id.data();
-    qDebug() << result;
-}
-
-
-void Ut_MaemoIcd::disconnect_req_default()
-{
-    icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT;
-    bool st;
-    Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT);
-    icd.disconnect(flags);
-}
-
-
-void Ut_MaemoIcd::connect_req_specific()
-{
-    Maemo::IcdConnectResult connect_result;
-    QString result;
-    QString error;
-    bool st;
-    st = connect_iap(connect_result, result, error, "wpa2gx2.osso.net");
-    QVERIFY2(st, error.toAscii().data());
-    qDebug() << result;
-}
-
-
-void Ut_MaemoIcd::state_req_all()
-{
-    QList<Maemo::IcdStateResult> state_results;
-    Maemo::Icd icd;
-    int sig;
-    sig = icd.state(state_results);
-    QVERIFY2(sig==1, create_error_str(icd).toAscii().data());
-}
-
-
-void Ut_MaemoIcd::state_req()
-{
-    Maemo::IcdStateResult state_result;
-    Maemo::Icd icd;
-    int sig;
-    QString service_type, service_id;
-    QString network_type("WLAN_INFRA");
-    QByteArray network_id("wpa2gx2.osso.net");
-    sig = icd.state(service_type, 0, service_id,
-		    network_type, (uint)0x17a1, network_id,
-		    state_result);
-    QVERIFY2(sig==1, create_error_str(icd).toAscii().data());
-}
-
-
-void Ut_MaemoIcd::statistics_req_all()
-{
-    QList<Maemo::IcdStatisticsResult> stats_results;
-    Maemo::Icd icd;
-    int sig;
-    QString err;
-    sig = icd.statistics(stats_results);
-    err = create_error_str(icd);
-    if (!err.isEmpty())
-      QVERIFY2(sig==1, err.toAscii().data());
-    else
-      QCOMPARE(sig, 1);
-
-    for(int i=0; i<sig; i++) {
-        QVERIFY(stats_results[i].bytes_received == 1024);
-        QVERIFY(stats_results[i].bytes_sent == 256);
-    }
-}
-
-
-// Can be uncommented when needed function is enabled in Icd class
-void Ut_MaemoIcd::statistics_req()
-{
-    Maemo::IcdStatisticsResult stats_result;
-    Maemo::Icd icd;
-    int sig;
-    QString service_type, service_id;
-    QString network_type("WLAN_INFRA");
-    QByteArray network_id("wpa2gx2.osso.net");
-    sig = icd.statistics(service_type, 0, service_id,
-			 network_type, (uint)0x17a1, network_id,
-			 stats_result);
-    QVERIFY2(sig==1, create_error_str(icd).toAscii().data());
-    QVERIFY(stats_result.bytes_received == 1024);
-    QVERIFY(stats_result.bytes_sent == 256);
-}
-
-
-void Ut_MaemoIcd::addrinfo_req_all()
-{
-    QList<Maemo::IcdAddressInfoResult> addr_results;
-    Maemo::Icd icd;
-    int sig;
-    sig = icd.addrinfo(addr_results);
-    QVERIFY2(sig==1, create_error_str(icd).toAscii().data());
-}
-
-
-void Ut_MaemoIcd::addrinfo_req()
-{
-    Maemo::IcdAddressInfoResult addr_result;
-    Maemo::Icd icd;
-    int sig;
-    QString service_type, service_id;
-    QString network_type("WLAN_INFRA");
-    QByteArray network_id("wpa2gx2.osso.net");
-    sig = icd.addrinfo(service_type, 0, service_id,
-			 network_type, (uint)0x17a1, network_id,
-			 addr_result);
-    QVERIFY2(sig==1, create_error_str(icd).toAscii().data());
-}
-
-
-QTEST_MAIN(Ut_MaemoIcd)
-
-#include "ut_maemo_icd.moc"
diff --git a/src/3rdparty/libconninet/tests/ut_proxyconf.cpp b/src/3rdparty/libconninet/tests/ut_proxyconf.cpp
deleted file mode 100644
index 1f407f0..0000000
--- a/src/3rdparty/libconninet/tests/ut_proxyconf.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-  libconninet - Internet Connectivity support library
-
-  Copyright (C) 2010 Nokia Corporation. All rights reserved.
-
-  Contact: Jukka Rissanen <jukka.rissanen@nokia.com>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public License
-  version 2.1 as published by the Free Software Foundation.
-
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA
-*/
-
-
-#include <QtTest/QtTest>
-#include <QDebug>
-#include <QNetworkProxy>
-#include <conn_settings.h>
-
-#include "../src/proxyconf.h"
-
-class Ut_ProxyConf : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void init();
-    void cleanup();
-    void initTestCase();
-    void cleanupTestCase();
-
-    // tests without the factory
-    void proxy_ftp_no_factory_ok_auto();
-    void proxy_ftp_no_factory_ok_manual();
-    void proxy_http_no_factory_ok_manual();
-    void proxy_https_no_factory_ok_manual();
-    void proxy_socks_no_factory_ok_manual();
-    void proxy_default_no_factory_ok_manual();
-
-    // tests using the factory
-    void proxy_ftp_factory_ok_auto();
-    void proxy_ftp_factory_ok_manual();
-    void proxy_http_factory_ok_manual();
-    void proxy_https_factory_ok_manual();
-    void proxy_socks_factory_ok_manual();
-    void proxy_http_factory_ok_manual_clear();
-    void proxy_default_factory_ok_manual();
-    void proxy_http_factory_ok_manual_ignore_list();
-    void proxy_default_factory_ok_manual_system();
-
-private:
-    Maemo::ProxyConf *pc;
-};
-
-
-void put(QString var, QString type, QString value)
-{
-    QProcess gconf;
-    if (value.isEmpty())
-        gconf.start(QString("gconftool-2 -u /system/proxy/"+var));
-    else
-        gconf.start(QString("gconftool-2 -s /system/proxy/"+var+" -t "+type+" "+value));
-    gconf.waitForFinished();
-}
-
-void put_http(QString var, QString type, QString value)
-{
-    QProcess gconf;
-    if (value.isEmpty())
-        gconf.start(QString("gconftool-2 -u /system/http_proxy/"+var));
-    else
-        gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t "+type+" "+value));
-    gconf.waitForFinished();
-}
-
-void put_list(QString var, QString type, QList<QString> value)
-{
-    QProcess gconf;
-    QString values = "[";
-    foreach (QString str, value)
-        values = values + str + ",";
-    values.chop(1);
-    values = values + "]";
-
-    gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t list --list-type="+type+" "+values));
-    gconf.waitForFinished();
-}
-
-
-void Ut_ProxyConf::init()
-{
-    put_http("host", "string", "my.proxy.com");
-    put_http("port", "int", "8080");
-
-    QList<QString> list;
-    list.append("foo.bar.com");
-    list.append("192.168.19.69");
-    list.append("192.168.20.0/24");
-    list.append("bar.foo.com");
-    put_list("ignore_hosts", "string", list);
-    put_http("use_http_host", "boolean", "true");
-
-    put("mode", "string", "auto");
-    put("autoconfig_url", "string", "http://foo.bar.com/autoconf");
-    put("secure_host", "string", "secure_host.com");
-    put("secure_port", "int", "112");
-
-    put("ftp_host", "string", "ftp.nuukia.com");
-    put("ftp_port", "int", "2000");
-    put("socks_host", "string", "socks.host.com");
-    put("socks_port", "int", "10080");
-    put("rtsp_host", "string", "rtsp.voice.com");
-    put("rtsp_port", "int", "1554");
-
-    pc = new Maemo::ProxyConf();
-}
-
-void Ut_ProxyConf::cleanup()
-{
-    delete pc;
-    pc = 0;
-}
-
-void Ut_ProxyConf::initTestCase()
-{
-} 
-
-void Ut_ProxyConf::cleanupTestCase()
-{
-}
-
-
-void Ut_ProxyConf::proxy_ftp_no_factory_ok_auto()
-{
-    QList<QNetworkProxy> nplist;
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/"));
-
-    nplist = pc->flush(query);
-    QVERIFY(nplist.length()==0);
-}
-
-
-void Ut_ProxyConf::proxy_ftp_no_factory_ok_manual()
-{
-    QList<QNetworkProxy> nplist;
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/"));
-
-    put("mode", "string", "manual");
-
-    nplist = pc->flush(query);
-    foreach (QNetworkProxy proxy, nplist) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(nplist.length()==3);
-    QVERIFY(nplist.first().type() == QNetworkProxy::FtpCachingProxy);
-}
-
-
-void Ut_ProxyConf::proxy_http_no_factory_ok_manual()
-{
-    QList<QNetworkProxy> nplist;
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/"));
-
-    put("mode", "string", "manual");
-
-    nplist = pc->flush(query);
-    foreach (QNetworkProxy proxy, nplist) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(nplist.length()==3);
-    QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy);
-}
-
-
-void Ut_ProxyConf::proxy_https_no_factory_ok_manual()
-{
-    QList<QNetworkProxy> nplist;
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/"));
-
-    put("mode", "string", "manual");
-
-    nplist = pc->flush(query);
-    foreach (QNetworkProxy proxy, nplist) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(nplist.length()==2);
-    QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy);
-}
-
-
-void Ut_ProxyConf::proxy_socks_no_factory_ok_manual()
-{
-    QList<QNetworkProxy> nplist;
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/"));
-
-    put("mode", "string", "manual");
-    put_http("host", "string", "");
-
-    nplist = pc->flush(query);
-    foreach (QNetworkProxy proxy, nplist) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(nplist.length()==2);
-    QVERIFY(nplist.first().type() == QNetworkProxy::Socks5Proxy);
-}
-
-
-void Ut_ProxyConf::proxy_default_no_factory_ok_manual()
-{
-    QList<QNetworkProxy> nplist;
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/"));
-
-    put("mode", "string", "manual");
-    put("socks_host", "string", "");
-    put("secure_host", "string", "");
-
-    nplist = pc->flush(query);
-    foreach (QNetworkProxy proxy, nplist) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(nplist.length()==0);
-}
-
-
-void Ut_ProxyConf::proxy_ftp_factory_ok_auto()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/"));
-    Maemo::ProxyConf::update();
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-    QVERIFY(listOfProxies.length()==1);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-void Ut_ProxyConf::proxy_ftp_factory_ok_manual()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-
-    foreach (QNetworkProxy proxy, listOfProxies) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(listOfProxies.length()==3);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::FtpCachingProxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-void Ut_ProxyConf::proxy_http_factory_ok_manual()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-
-    foreach (QNetworkProxy proxy, listOfProxies) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(listOfProxies.length()==3);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-void Ut_ProxyConf::proxy_https_factory_ok_manual()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-
-    foreach (QNetworkProxy proxy, listOfProxies) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(listOfProxies.length()==2);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-void Ut_ProxyConf::proxy_socks_factory_ok_manual()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-    put_http("host", "string", "");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-
-    foreach (QNetworkProxy proxy, listOfProxies) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(listOfProxies.length()==2);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::Socks5Proxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-void Ut_ProxyConf::proxy_http_factory_ok_manual_clear()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-    put_http("host", "string", "192.168.1.1");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-
-    foreach (QNetworkProxy proxy, listOfProxies) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(listOfProxies.length()==3);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy);
-
-    Maemo::ProxyConf::clear();
-    listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-    QVERIFY(listOfProxies.length()==1);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy);
-}
-
-
-void Ut_ProxyConf::proxy_default_factory_ok_manual()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-    put("socks_host", "string", "");
-    put("secure_host", "string", "");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-
-    QVERIFY(listOfProxies.length()==1);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-void Ut_ProxyConf::proxy_http_factory_ok_manual_ignore_list()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://192.168.19.70/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-
-    foreach (QNetworkProxy proxy, listOfProxies) {
-      qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port();
-    }
-    QVERIFY(listOfProxies.length()==3);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy);
-
-    query = QNetworkProxyQuery(QUrl("http://192.168.20.10/"));
-    listOfProxies = QNetworkProxyFactory::proxyForQuery(query);
-    QVERIFY(listOfProxies.length()==1);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-void Ut_ProxyConf::proxy_default_factory_ok_manual_system()
-{
-    QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/"));
-    Maemo::ProxyConf::update();
-
-    put("mode", "string", "manual");
-
-    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::systemProxyForQuery(query);
-
-    QVERIFY(listOfProxies.length()==1);
-    QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy);
-    Maemo::ProxyConf::clear();
-}
-
-
-
-
-QTEST_MAIN(Ut_ProxyConf)
-
-#include "ut_proxyconf.moc"
diff --git a/src/plugins/bearer/icd/dbusdispatcher.cpp b/src/plugins/bearer/icd/dbusdispatcher.cpp
new file mode 100644
index 0000000..3d588dc
--- /dev/null
+++ b/src/plugins/bearer/icd/dbusdispatcher.cpp
@@ -0,0 +1,631 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QDebug>
+#include <QtCore>
+#include <poll.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <glib.h>
+#include "dbusdispatcher.h"
+
+namespace Maemo {
+
+/*!
+    \class DBusDispatcher
+
+    \brief DBusDispatcher is a class, which is able to send DBUS method call
+    messages and receive unicast signals from DBUS object.
+*/
+
+class DBusDispatcherPrivate
+{
+public:
+    DBusDispatcherPrivate(const QString& service,
+                          const QString& path,
+                          const QString& interface,
+                          const QString& signalPath)
+        : service(service), path(path), interface(interface),
+          signalPath(signalPath), connection(0)
+    {
+        memset(&signal_vtable, 0, sizeof(signal_vtable));
+    }
+
+    ~DBusDispatcherPrivate()
+    {
+        foreach(DBusPendingCall *call, pending_calls) {
+            dbus_pending_call_cancel(call);
+            dbus_pending_call_unref(call);
+        }
+    }
+
+    QString service;
+    QString path;
+    QString interface;
+    QString signalPath;
+    struct DBusConnection *connection;
+    QList<DBusPendingCall *> pending_calls;
+    struct DBusObjectPathVTable signal_vtable;
+};
+
+static bool constantVariantList(const QVariantList& variantList) {
+    // Special case, empty list == empty struct
+    if (variantList.isEmpty()) {
+        return false;
+    } else {        
+        QVariant::Type type = variantList[0].type();
+        // Iterate items in the list and check if they are same type
+        foreach(QVariant variant, variantList) {
+            if (variant.type() != type) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+static QString variantToSignature(const QVariant& argument,
+                                  bool constantList = true) {
+    switch (argument.type()) {
+        case QVariant::Bool:
+            return "b";
+        case QVariant::ByteArray:
+            return "ay";
+        case QVariant::Char:
+            return "y";
+        case QVariant::Int:
+            return "i";
+        case QVariant::UInt:
+            return "u";
+        case QVariant::StringList:
+            return "as";
+        case QVariant::String:
+            return "s";
+        case QVariant::LongLong:
+            return "x";
+        case QVariant::ULongLong:
+            return "t";
+        case QVariant::List:
+            {
+            QString signature;
+            QVariantList variantList = argument.toList();
+            if (!constantList) {
+                signature += DBUS_STRUCT_BEGIN_CHAR_AS_STRING;
+                foreach(QVariant listItem, variantList) {
+                    signature += variantToSignature(listItem);
+                }
+                signature += DBUS_STRUCT_END_CHAR_AS_STRING;
+            } else {
+                if (variantList.isEmpty())
+                    return "";
+                signature = "a" + variantToSignature(variantList[0]);
+            }
+
+            return signature;
+            }
+        default:
+            qDebug() << "Unsupported variant type: " << argument.type();
+            break;
+    }
+
+    return "";
+}
+
+static bool appendVariantToDBusMessage(const QVariant& argument,
+                                       DBusMessageIter *dbus_iter) {
+    int idx = 0;
+    DBusMessageIter array_iter;
+    QStringList str_list;
+    dbus_bool_t bool_data;
+    dbus_int32_t int32_data;
+    dbus_uint32_t uint32_data;
+    dbus_int64_t int64_data;
+    dbus_uint64_t uint64_data;
+    char *str_data;
+    char char_data;
+
+    switch (argument.type()) {
+
+        case QVariant::Bool:
+            bool_data = argument.toBool();
+            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BOOLEAN, 
+                                           &bool_data);
+            break;
+
+        case QVariant::ByteArray:
+            str_data = argument.toByteArray().data();
+            dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY,
+                                             DBUS_TYPE_BYTE_AS_STRING, &array_iter);
+            dbus_message_iter_append_fixed_array(&array_iter,
+                                                 DBUS_TYPE_BYTE,
+                                                 &str_data,
+                                                 argument.toByteArray().size());
+            dbus_message_iter_close_container(dbus_iter, &array_iter);
+            break;
+
+        case QVariant::Char:
+            char_data = argument.toChar().toAscii();
+            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BYTE, 
+                                           &char_data);
+            break;
+
+        case QVariant::Int:
+            int32_data = argument.toInt();
+            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT32, 
+                                           &int32_data);
+            break;
+
+        case QVariant::String:
+            str_data = argument.toString().toLatin1().data();
+            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_STRING,
+                                           &str_data);
+            break;
+
+        case QVariant::StringList:
+            str_list = argument.toStringList();
+            dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY,
+                                             "s", &array_iter);
+            for (idx = 0; idx < str_list.size(); idx++) {
+                str_data = str_list.at(idx).toLatin1().data();
+                dbus_message_iter_append_basic(&array_iter,
+                                               DBUS_TYPE_STRING,
+                                               &str_data);
+            }
+            dbus_message_iter_close_container(dbus_iter, &array_iter);
+            break;
+
+        case QVariant::UInt:
+            uint32_data = argument.toUInt();
+            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT32, 
+                                           &uint32_data);
+            break;
+
+        case QVariant::ULongLong:
+            uint64_data = argument.toULongLong();
+            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT64, 
+                                           &uint64_data);
+            break;
+
+        case QVariant::LongLong:
+            int64_data = argument.toLongLong();
+            dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT64, 
+                                           &int64_data);
+            break;
+
+        case QVariant::List:
+            {
+            QVariantList variantList = argument.toList();
+            bool constantList = constantVariantList(variantList);
+            DBusMessageIter array_iter;
+
+            // List is mapped either as an DBUS array (all items same type)
+            // DBUS struct (variable types) depending on constantList
+            if (constantList) {
+                // Resolve the signature for the first item
+                QString signature = "";
+                if (!variantList.isEmpty()) {
+                    signature = variantToSignature(
+                                variantList[0],
+                                constantVariantList(variantList[0].toList()));
+                }
+
+                // Mapped as DBUS array
+                dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY,
+                                                 signature.toAscii(),
+                                                 &array_iter);
+
+                foreach(QVariant listItem, variantList) {
+                    appendVariantToDBusMessage(listItem, &array_iter);
+                }
+
+                dbus_message_iter_close_container(dbus_iter, &array_iter);
+            } else {
+                // Mapped as DBUS struct
+                dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_STRUCT,
+                                                 NULL,
+                                                 &array_iter);
+
+                foreach(QVariant listItem, variantList) {
+                    appendVariantToDBusMessage(listItem, &array_iter);
+                }
+
+                dbus_message_iter_close_container(dbus_iter, &array_iter);
+            }
+
+            break;
+            }
+        default:
+            qDebug() << "Unsupported variant type: " << argument.type();
+            break;
+    }
+
+    return true;
+}
+
+static QVariant getVariantFromDBusMessage(DBusMessageIter *iter) {
+    dbus_bool_t bool_data;
+    dbus_int32_t int32_data;
+    dbus_uint32_t uint32_data;
+    dbus_int64_t int64_data;
+    dbus_uint64_t uint64_data;
+    char *str_data;
+    char char_data;
+    int argtype = dbus_message_iter_get_arg_type(iter);
+
+    switch (argtype) {
+
+        case DBUS_TYPE_BOOLEAN:
+        {
+            dbus_message_iter_get_basic(iter, &bool_data);
+            QVariant variant((bool)bool_data);
+            return variant;
+        }
+
+        case DBUS_TYPE_ARRAY:
+        {
+            // Handle all arrays here
+            int elem_type = dbus_message_iter_get_element_type(iter);
+            DBusMessageIter array_iter;
+
+            dbus_message_iter_recurse(iter, &array_iter);
+
+            if (elem_type == DBUS_TYPE_BYTE) {
+                QByteArray byte_array;
+                do {
+                    dbus_message_iter_get_basic(&array_iter, &char_data);
+                    byte_array.append(char_data);
+                } while (dbus_message_iter_next(&array_iter));
+                QVariant variant(byte_array);
+                return variant;
+            } else if (elem_type == DBUS_TYPE_STRING) {
+                QStringList str_list;
+                do {
+                    dbus_message_iter_get_basic(&array_iter, &str_data);
+                    str_list.append(str_data);
+                } while (dbus_message_iter_next(&array_iter));
+                QVariant variant(str_list);
+                return variant;
+            } else {
+                QVariantList variantList;
+                do {
+                    variantList << getVariantFromDBusMessage(&array_iter);
+                } while (dbus_message_iter_next(&array_iter));
+                QVariant variant(variantList);
+                return variant;
+            }
+            break;
+        }
+
+        case DBUS_TYPE_BYTE:
+        {
+            dbus_message_iter_get_basic(iter, &char_data);
+            QChar ch(char_data);
+            QVariant variant(ch);
+            return variant;
+        }
+
+        case DBUS_TYPE_INT32:
+        {
+            dbus_message_iter_get_basic(iter, &int32_data);
+            QVariant variant((int)int32_data);
+            return variant;
+        }
+
+        case DBUS_TYPE_UINT32:
+        {
+            dbus_message_iter_get_basic(iter, &uint32_data);
+            QVariant variant((uint)uint32_data);
+            return variant;
+        }
+
+        case DBUS_TYPE_STRING:
+        {
+            dbus_message_iter_get_basic(iter, &str_data);
+            QString str(str_data);
+            QVariant variant(str);
+            return variant;
+        }
+
+        case DBUS_TYPE_INT64:
+        {
+            dbus_message_iter_get_basic(iter, &int64_data);
+            QVariant variant((qlonglong)int64_data);
+            return variant;
+        }
+
+        case DBUS_TYPE_UINT64:
+        {
+            dbus_message_iter_get_basic(iter, &uint64_data);
+            QVariant variant((qulonglong)uint64_data);
+            return variant;
+        }
+
+        case DBUS_TYPE_STRUCT:
+        {
+            // Handle all structs here
+            DBusMessageIter struct_iter;
+            dbus_message_iter_recurse(iter, &struct_iter);
+
+	    QVariantList variantList;
+	    do {
+	      variantList << getVariantFromDBusMessage(&struct_iter);
+	    } while (dbus_message_iter_next(&struct_iter));
+	    QVariant variant(variantList);
+	    return variant;
+        }
+
+        default:
+            qDebug() << "Unsupported DBUS type: " << argtype;
+    }
+
+    return QVariant();
+}
+
+static DBusHandlerResult signalHandler (DBusConnection *connection,
+                                        DBusMessage *message,
+                                        void *object_ref) {
+    (void)connection;
+    QString interface;
+    QString signal;
+    DBusDispatcher *dispatcher = (DBusDispatcher *)object_ref;
+
+    if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL) {
+        interface = dbus_message_get_interface(message);
+        signal = dbus_message_get_member(message);
+        
+        QList<QVariant> arglist;
+        DBusMessageIter dbus_iter;
+
+        if (dbus_message_iter_init(message, &dbus_iter)) {
+            // Read return arguments
+            while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) {
+                arglist << getVariantFromDBusMessage(&dbus_iter);
+                dbus_message_iter_next(&dbus_iter);
+            }
+        }
+
+        dispatcher->emitSignalReceived(interface, signal, arglist);
+        return DBUS_HANDLER_RESULT_HANDLED;
+    }
+    (void)message;
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+DBusDispatcher::DBusDispatcher(const QString& service,
+                               const QString& path,
+                               const QString& interface,
+                               QObject *parent)
+ : QObject(parent),
+   d_ptr(new DBusDispatcherPrivate(service, path, interface, path)) {
+    setupDBus();
+}
+
+DBusDispatcher::DBusDispatcher(const QString& service,
+                               const QString& path,
+                               const QString& interface,
+                               const QString& signalPath,
+                               QObject *parent)
+ : QObject(parent),
+   d_ptr(new DBusDispatcherPrivate(service, path, interface, signalPath)) {
+    setupDBus();
+}
+
+DBusDispatcher::~DBusDispatcher()
+{
+    if (d_ptr->connection) {
+        dbus_connection_close(d_ptr->connection);
+        dbus_connection_unref(d_ptr->connection);
+    }
+    delete d_ptr;
+}
+
+void DBusDispatcher::setupDBus()
+{
+    d_ptr->connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL);
+
+    if (d_ptr->connection == NULL)
+        qDebug() << "Unable to get DBUS connection!";
+    else {
+        d_ptr->signal_vtable.message_function = signalHandler;
+
+	dbus_connection_set_exit_on_disconnect(d_ptr->connection, FALSE);
+        dbus_connection_setup_with_g_main(d_ptr->connection, NULL);
+        dbus_connection_register_object_path(d_ptr->connection, 
+                                             d_ptr->signalPath.toLatin1(),
+                                             &d_ptr->signal_vtable,
+                                             this);
+    }
+}
+
+static DBusMessage *prepareDBusCall(const QString& service,
+                                    const QString& path,
+                                    const QString& interface,
+                                    const QString& method, 
+                                    const QVariant& arg1 = QVariant(),
+                                    const QVariant& arg2 = QVariant(),
+                                    const QVariant& arg3 = QVariant(),
+                                    const QVariant& arg4 = QVariant(),
+                                    const QVariant& arg5 = QVariant(),
+                                    const QVariant& arg6 = QVariant(),
+                                    const QVariant& arg7 = QVariant(),
+                                    const QVariant& arg8 = QVariant()) 
+{
+    DBusMessage *message = dbus_message_new_method_call(service.toLatin1(),
+                                                        path.toLatin1(),
+                                                        interface.toLatin1(),
+                                                        method.toLatin1());
+    DBusMessageIter dbus_iter;
+
+    // Append variants to DBUS message
+    QList<QVariant> arglist;
+    if (arg1.isValid()) arglist << arg1;
+    if (arg2.isValid()) arglist << arg2;
+    if (arg3.isValid()) arglist << arg3;
+    if (arg4.isValid()) arglist << arg4;
+    if (arg5.isValid()) arglist << arg5;
+    if (arg6.isValid()) arglist << arg6;
+    if (arg7.isValid()) arglist << arg7;
+    if (arg8.isValid()) arglist << arg8;
+
+    dbus_message_iter_init_append (message, &dbus_iter);
+    
+    while (!arglist.isEmpty()) {
+        QVariant argument = arglist.takeFirst();
+        appendVariantToDBusMessage(argument, &dbus_iter);
+    }
+
+    return message;
+}
+
+QList<QVariant> DBusDispatcher::call(const QString& method, 
+                                     const QVariant& arg1,
+                                     const QVariant& arg2,
+                                     const QVariant& arg3,
+                                     const QVariant& arg4,
+                                     const QVariant& arg5,
+                                     const QVariant& arg6,
+                                     const QVariant& arg7,
+                                     const QVariant& arg8) {
+    DBusMessageIter dbus_iter;
+    DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path,
+                                           d_ptr->interface, method,
+                                           arg1, arg2, arg3, arg4, arg5,
+                                           arg6, arg7, arg8);
+    DBusMessage *reply = dbus_connection_send_with_reply_and_block(
+                                                    d_ptr->connection,
+                                                    message, -1, NULL);
+    dbus_message_unref(message);
+
+    QList<QVariant> replylist;
+    if (reply != NULL &&  dbus_message_iter_init(reply, &dbus_iter)) {
+        // Read return arguments
+        while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) {
+            replylist << getVariantFromDBusMessage(&dbus_iter);
+            dbus_message_iter_next(&dbus_iter);
+        }
+    }
+    if (reply != NULL) dbus_message_unref(reply);
+    return replylist;
+}
+
+class PendingCallInfo {
+public:
+    QString method;
+    DBusDispatcher *dispatcher;
+    DBusDispatcherPrivate *priv;
+};
+
+static void freePendingCallInfo(void *memory) {
+    PendingCallInfo *info = (PendingCallInfo *)memory;
+    delete info;
+}
+
+static void pendingCallFunction (DBusPendingCall *pending,
+                                 void *memory) {
+    PendingCallInfo *info = (PendingCallInfo *)memory;
+    QString errorStr;
+    QList<QVariant> replyList;
+    DBusMessage *reply = dbus_pending_call_steal_reply (pending);
+
+    Q_ASSERT(reply != NULL);
+
+    if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
+        errorStr = dbus_message_get_error_name (reply);
+    } else {
+        DBusMessageIter dbus_iter;
+        dbus_message_iter_init(reply, &dbus_iter);
+        // Read return arguments
+        while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) {
+            replyList << getVariantFromDBusMessage(&dbus_iter);
+            dbus_message_iter_next(&dbus_iter);
+        }
+    }
+
+    info->priv->pending_calls.removeOne(pending);
+    info->dispatcher->emitCallReply(info->method, replyList, errorStr);
+    dbus_message_unref(reply);
+    dbus_pending_call_unref(pending);
+}
+
+bool DBusDispatcher::callAsynchronous(const QString& method, 
+                                      const QVariant& arg1,
+                                      const QVariant& arg2,
+                                      const QVariant& arg3,
+                                      const QVariant& arg4,
+                                      const QVariant& arg5,
+                                      const QVariant& arg6,
+                                      const QVariant& arg7,
+                                      const QVariant& arg8) {
+    DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path,
+                                           d_ptr->interface, method,
+                                           arg1, arg2, arg3, arg4, arg5,
+                                           arg6, arg7, arg8);
+    DBusPendingCall *call = NULL;
+    dbus_bool_t ret = dbus_connection_send_with_reply(d_ptr->connection,
+                                                      message, &call, -1);
+    PendingCallInfo *info = new PendingCallInfo;
+    info->method = method;
+    info->dispatcher = this;
+    info->priv = d_ptr;
+
+    dbus_pending_call_set_notify(call, pendingCallFunction, info, freePendingCallInfo);
+    d_ptr->pending_calls.append(call);
+    return (bool)ret;
+}
+
+void DBusDispatcher::emitSignalReceived(const QString& interface, 
+                                        const QString& signal,
+                                        const QList<QVariant>& args) {
+    emit signalReceived(interface, signal, args); }
+
+void DBusDispatcher::emitCallReply(const QString& method,
+                                   const QList<QVariant>& args,
+                                   const QString& error) {
+    emit callReply(method, args, error); }
+
+void DBusDispatcher::synchronousDispatch(int timeout_ms)
+{
+    dbus_connection_read_write_dispatch(d_ptr->connection, timeout_ms);
+}
+
+} // Maemo namespace
+
diff --git a/src/plugins/bearer/icd/dbusdispatcher.h b/src/plugins/bearer/icd/dbusdispatcher.h
new file mode 100644
index 0000000..6f2f347
--- /dev/null
+++ b/src/plugins/bearer/icd/dbusdispatcher.h
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef DBUSDISPATCHER_H
+#define DBUSDISPATCHER_H
+
+#include <QObject>
+#include <QVariant>
+
+namespace Maemo {
+
+class DBusDispatcherPrivate;
+class DBusDispatcher : public QObject
+{
+    Q_OBJECT
+
+public:
+    DBusDispatcher(const QString& service,
+                   const QString& path,
+                   const QString& interface,
+                   QObject *parent = 0);
+    DBusDispatcher(const QString& service,
+                   const QString& path,
+                   const QString& interface,
+                   const QString& signalPath,
+                   QObject *parent = 0);
+    ~DBusDispatcher();
+
+    QList<QVariant> call(const QString& method, 
+                         const QVariant& arg1 = QVariant(),
+                         const QVariant& arg2 = QVariant(),
+                         const QVariant& arg3 = QVariant(),
+                         const QVariant& arg4 = QVariant(),
+                         const QVariant& arg5 = QVariant(),
+                         const QVariant& arg6 = QVariant(),
+                         const QVariant& arg7 = QVariant(),
+                         const QVariant& arg8 = QVariant());
+    bool callAsynchronous(const QString& method, 
+                          const QVariant& arg1 = QVariant(),
+                          const QVariant& arg2 = QVariant(),
+                          const QVariant& arg3 = QVariant(),
+                          const QVariant& arg4 = QVariant(),
+                          const QVariant& arg5 = QVariant(),
+                          const QVariant& arg6 = QVariant(),
+                          const QVariant& arg7 = QVariant(),
+                          const QVariant& arg8 = QVariant());
+    void emitSignalReceived(const QString& interface, 
+                            const QString& signal,
+                            const QList<QVariant>& args);
+    void emitCallReply(const QString& method,
+                       const QList<QVariant>& args,
+                       const QString& error = "");
+    void synchronousDispatch(int timeout_ms);
+
+Q_SIGNALS:
+    void signalReceived(const QString& interface, 
+                        const QString& signal,
+                        const QList<QVariant>& args);
+    void callReply(const QString& method,
+                   const QList<QVariant>& args,
+                   const QString& error);
+
+protected:
+    void setupDBus();
+
+private:
+    DBusDispatcherPrivate *d_ptr;
+};
+
+}  // Maemo namespace
+
+#endif
diff --git a/src/plugins/bearer/icd/iapconf.cpp b/src/plugins/bearer/icd/iapconf.cpp
new file mode 100644
index 0000000..ddd9fc2
--- /dev/null
+++ b/src/plugins/bearer/icd/iapconf.cpp
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <conn_settings.h>
+
+#include "iapconf.h"
+
+#define QSTRING_TO_CONST_CSTR(str) \
+    str.toUtf8().constData()
+
+namespace Maemo {
+
+class IAPConfPrivate {
+public:
+    ConnSettings *settings;
+
+    ConnSettingsValue *variantToValue(const QVariant &variant);
+    QVariant valueToVariant(ConnSettingsValue *value);
+};
+
+ConnSettingsValue *IAPConfPrivate::variantToValue(const QVariant &variant)
+{
+    // Convert variant to ConnSettingsValue
+    ConnSettingsValue *value = conn_settings_value_new();
+    if (value == 0) {
+        qWarning("IAPConf: Unable to create new ConnSettingsValue");
+        return 0;
+    }
+
+    switch(variant.type()) {
+        
+    case QVariant::Invalid:
+        value->type = CONN_SETTINGS_VALUE_INVALID;
+        break;
+    
+    case QVariant::String: {
+        char *valueStr = strdup(QSTRING_TO_CONST_CSTR(variant.toString()));
+        value->type = CONN_SETTINGS_VALUE_STRING;
+        value->value.string_val = valueStr;
+        break;
+    }
+    
+    case QVariant::Int:
+        value->type = CONN_SETTINGS_VALUE_INT;
+        value->value.int_val = variant.toInt();
+        break;
+    
+    case QMetaType::Float:
+    case QVariant::Double:
+        value->type = CONN_SETTINGS_VALUE_DOUBLE;
+        value->value.double_val = variant.toDouble();
+        break;
+    
+    case QVariant::Bool:
+        value->type = CONN_SETTINGS_VALUE_BOOL;
+        value->value.bool_val = variant.toBool() ? 1 : 0;
+        break;
+    
+    case QVariant::ByteArray: {
+        QByteArray array = variant.toByteArray();
+        value->type = CONN_SETTINGS_VALUE_BYTE_ARRAY;
+        value->value.byte_array.len = array.size();
+        value->value.byte_array.val = (unsigned char *)malloc(array.size());
+        memcpy(value->value.byte_array.val, array.constData(), array.size());
+        break;
+    }
+    
+    case QVariant::List: {
+        QVariantList list = variant.toList();
+        ConnSettingsValue **list_val = (ConnSettingsValue **)malloc(
+            (list.size() + 1) * sizeof(ConnSettingsValue *));
+
+        for (int idx = 0; idx < list.size(); idx++) {
+            list_val[idx] = variantToValue(list.at(idx));
+        }
+        list_val[list.size()] = 0;
+
+        value->type = CONN_SETTINGS_VALUE_LIST;
+        value->value.list_val = list_val;
+        break;
+    }
+    
+    default:
+        qWarning("IAPConf: Can not handle QVariant of type %d",
+                 variant.type());
+        conn_settings_value_destroy(value);
+        return 0;
+    }
+
+    return value;
+}
+
+QVariant IAPConfPrivate::valueToVariant(ConnSettingsValue *value)
+{
+    if (value == 0 || value->type == CONN_SETTINGS_VALUE_INVALID) {
+        return QVariant();
+    }
+
+    switch(value->type) {
+    
+    case CONN_SETTINGS_VALUE_BOOL:
+        return QVariant(value->value.bool_val ? true : false);
+    
+    case CONN_SETTINGS_VALUE_STRING:
+        return QVariant(QString(value->value.string_val));
+    
+    case CONN_SETTINGS_VALUE_DOUBLE:
+        return QVariant(value->value.double_val);
+    
+    case CONN_SETTINGS_VALUE_INT:
+        return QVariant(value->value.int_val);
+    
+    case CONN_SETTINGS_VALUE_LIST: {
+        // At least with GConf backend connsettings returns byte array as list
+        // of ints, first check for that case
+        if (value->value.list_val && value->value.list_val[0]) {
+            bool canBeConvertedToByteArray = true;
+            for (int idx = 0; value->value.list_val[idx]; idx++) {
+                ConnSettingsValue *val = value->value.list_val[idx];
+                if (val->type != CONN_SETTINGS_VALUE_INT
+                     || val->value.int_val > 255
+                     || val->value.int_val < 0) {
+                    canBeConvertedToByteArray = false;
+                    break;
+                }
+            }
+
+            if (canBeConvertedToByteArray) {
+                QByteArray array;
+                for (int idx = 0; value->value.list_val[idx]; idx++) {
+                    array.append(value->value.list_val[idx]->value.int_val);
+                }
+                return array;
+            }
+
+	    // Create normal list
+	    QVariantList list;
+	    for (int idx = 0; value->value.list_val[idx]; idx++) {
+	      list.append(valueToVariant(value->value.list_val[idx]));
+	    }
+	    return list;
+        }
+    }
+    
+    case CONN_SETTINGS_VALUE_BYTE_ARRAY:
+        return QByteArray::fromRawData((char *)value->value.byte_array.val, 
+                                       value->value.byte_array.len);
+    
+    default:
+        return QVariant();
+    }
+}
+
+// Public class implementation
+
+IAPConf::IAPConf(const QString &iap_id)
+    : d_ptr(new IAPConfPrivate)
+{
+    d_ptr->settings = conn_settings_open(CONN_SETTINGS_CONNECTION,
+                                         QSTRING_TO_CONST_CSTR(iap_id));
+    if (d_ptr->settings == 0) {
+        qWarning("IAPConf: Unable to open ConnSettings for %s", 
+                 QSTRING_TO_CONST_CSTR(iap_id));
+    }
+}
+
+IAPConf::~IAPConf()
+{
+    conn_settings_close(d_ptr->settings);
+    delete d_ptr;
+}
+
+
+QVariant IAPConf::value(const QString& key) const
+{
+    ConnSettingsValue *val = conn_settings_get(d_ptr->settings,
+                                               QSTRING_TO_CONST_CSTR(key));
+
+    QVariant variant = d_ptr->valueToVariant(val);
+    conn_settings_value_destroy(val);
+    return variant;
+}
+
+
+void IAPConf::getAll(QList<QString> &all_iaps, bool return_path)
+{
+    Q_UNUSED(return_path); // We don't use return path currently
+
+    // Go through all available connections and add them to the list
+    char **ids = conn_settings_list_ids(CONN_SETTINGS_CONNECTION);
+    if (ids == 0) {
+        // No ids found - nothing to do
+        return;
+    }
+
+    for (int idx = 0; ids[idx]; idx++) {
+        all_iaps.append(QString(ids[idx]));
+        free(ids[idx]);
+    }
+    free(ids);
+}
+
+
+} // namespace Maemo
diff --git a/src/plugins/bearer/icd/iapconf.h b/src/plugins/bearer/icd/iapconf.h
new file mode 100644
index 0000000..9c4ddcb
--- /dev/null
+++ b/src/plugins/bearer/icd/iapconf.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef IAPCONF_H
+#define IAPCONF_H
+
+#include <QString>
+#include <QVariant>
+
+namespace Maemo {
+
+class IAPConfPrivate;
+class IAPConf {
+public:
+    IAPConf(const QString &iap_id);
+    virtual ~IAPConf();
+
+    /**
+        Get one IAP value.
+    */
+    QVariant value(const QString& key) const;
+
+    /**
+        Return all the IAPs found in the system. If return_path is true,
+	then do not strip the IAP path away.
+    */
+    static void getAll(QList<QString> &all_iaps, bool return_path=false);
+
+private:
+    IAPConfPrivate *d_ptr;
+};
+
+} // namespace Maemo
+
+#endif
diff --git a/src/plugins/bearer/icd/iapmonitor.cpp b/src/plugins/bearer/icd/iapmonitor.cpp
new file mode 100644
index 0000000..6138e7b
--- /dev/null
+++ b/src/plugins/bearer/icd/iapmonitor.cpp
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QStringList>
+
+#include <conn_settings.h>
+#include "iapmonitor.h"
+
+namespace Maemo {
+
+
+void conn_settings_notify_func (ConnSettingsType type,
+                                const char *id,
+                                const char *key,
+                                ConnSettingsValue *value,
+                                void *user_data);
+
+class IAPMonitorPrivate {
+private:
+    IAPMonitor *monitor;
+    ConnSettings *settings;
+
+public:
+
+    IAPMonitorPrivate(IAPMonitor *monitor)
+        : monitor(monitor)
+    {
+        settings = conn_settings_open(CONN_SETTINGS_CONNECTION, NULL);
+        conn_settings_add_notify(
+                        settings,
+                        (ConnSettingsNotifyFunc *)conn_settings_notify_func,
+                        this);
+    }
+
+    ~IAPMonitorPrivate()
+    {
+        conn_settings_del_notify(settings);
+        conn_settings_close(settings);
+    }
+
+    void iapAdded(const QString &iap)
+    {
+        monitor->iapAdded(iap);
+    }
+
+    void iapRemoved(const QString &iap)
+    {
+        monitor->iapRemoved(iap);
+    }
+};
+
+void conn_settings_notify_func (ConnSettingsType type,
+                                const char *id,
+                                const char *key,
+                                ConnSettingsValue *value,
+                                void *user_data)
+{    
+    if (type != CONN_SETTINGS_CONNECTION) return;
+    IAPMonitorPrivate *priv = (IAPMonitorPrivate *)user_data;
+
+    QString iapId(key);
+    iapId = iapId.split("/")[0];
+    if (value != 0) {
+        priv->iapAdded(iapId);
+    } else if (iapId == QString(key)) {
+        // IAP is removed only when the directory gets removed
+        priv->iapRemoved(iapId);
+    }
+}
+
+IAPMonitor::IAPMonitor()
+    : d_ptr(new IAPMonitorPrivate(this))
+{
+}
+
+IAPMonitor::~IAPMonitor()
+{
+    delete d_ptr;
+}
+
+void IAPMonitor::iapAdded(const QString &id)
+{
+    // By default do nothing
+}
+
+void IAPMonitor::iapRemoved(const QString &id)
+{
+    // By default do nothing
+}
+
+} // namespace Maemo
diff --git a/src/plugins/bearer/icd/iapmonitor.h b/src/plugins/bearer/icd/iapmonitor.h
new file mode 100644
index 0000000..21ad3bc
--- /dev/null
+++ b/src/plugins/bearer/icd/iapmonitor.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef IAPMONITOR_H
+#define IAPMONITOR_H
+
+#include <QString>
+
+namespace Maemo {
+
+class IAPMonitorPrivate;
+class IAPMonitor {
+public:
+    IAPMonitor();
+    ~IAPMonitor();
+
+protected:
+    virtual void iapAdded(const QString &id);
+    virtual void iapRemoved(const QString &id);
+
+private:
+    IAPMonitorPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(IAPMonitor);
+};
+
+} // namespace Maemo
+
+#endif // IAPMONITOR_H
+
diff --git a/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro
index b2c58e9..464cc1c 100644
--- a/src/plugins/bearer/icd/icd.pro
+++ b/src/plugins/bearer/icd/icd.pro
@@ -7,15 +7,25 @@ QMAKE_CXXFLAGS *= $$QT_CFLAGS_DBUS $$QT_CFLAGS_CONNSETTINGS
 LIBS += $$QT_LIBS_CONNSETTINGS
 
 HEADERS += qicdengine.h \
-           qnetworksession_impl.h
+           qnetworksession_impl.h \
+           dbusdispatcher.h \
+           iapconf.h \
+           iapmonitor.h \
+           maemo_icd.h \
+           proxyconf.h \
+           wlan-utils.h
 
 SOURCES += main.cpp \
            qicdengine.cpp \
-           qnetworksession_impl.cpp
+           qnetworksession_impl.cpp \
+           dbusdispatcher.cpp \
+           iapmonitor.cpp \
+           iapconf.cpp \
+           maemo_icd.cpp \
+           proxyconf.cpp
 
 #DEFINES += BEARER_MANAGEMENT_DEBUG
 
-include(../../../3rdparty/libconninet.pri)
 include(../../../3rdparty/libgq.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
diff --git a/src/plugins/bearer/icd/maemo_icd.cpp b/src/plugins/bearer/icd/maemo_icd.cpp
new file mode 100644
index 0000000..eb093fe
--- /dev/null
+++ b/src/plugins/bearer/icd/maemo_icd.cpp
@@ -0,0 +1,849 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include "maemo_icd.h"
+#include "dbusdispatcher.h"
+
+#include <QObject>
+#include <QTimer>
+#include <QCoreApplication>
+#include <QEventLoop>
+#include <QDebug>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+namespace Maemo {
+
+#undef PRINT_DEBUGINFO
+#ifdef PRINT_DEBUGINFO
+  static FILE *fdebug = NULL;
+#define PDEBUG(fmt, args...)						\
+  do {									\
+    struct timeval tv;							\
+    gettimeofday(&tv, 0);						\
+    fprintf(fdebug, "DEBUG[%d]:%ld.%ld:%s:%s():%d: " fmt,		\
+	    getpid(),							\
+	    tv.tv_sec, tv.tv_usec,					\
+	    __FILE__, __FUNCTION__, __LINE__, args);			\
+    fflush(fdebug);							\
+  } while(0)
+#else
+#define PDEBUG(fmt...)
+#endif
+
+
+class IcdPrivate
+{
+public:
+    IcdPrivate(Icd *myfriend)
+    {
+        init(10000, IcdNewDbusInterface, myfriend);
+    }
+
+    IcdPrivate(unsigned int timeout, Icd *myfriend)
+    {
+        init(timeout, IcdNewDbusInterface, myfriend);
+    }
+
+    IcdPrivate(unsigned int timeout, IcdDbusInterfaceVer ver, Icd *myfriend)
+    {
+        /* Note that the old Icd interface is currently disabled and
+	 * the new one is always used.
+	 */
+        init(timeout, IcdNewDbusInterface, myfriend);
+    }
+
+    ~IcdPrivate()
+    {
+      QObject::disconnect(mDBus, 
+			  SIGNAL(signalReceived(const QString&, 
+						const QString&,
+						const QList<QVariant>&)),
+			  icd,
+			  SLOT(icdSignalReceived(const QString&, 
+						 const QString&,
+						 const QList<QVariant>&)));
+
+      QObject::disconnect(mDBus,
+			  SIGNAL(callReply(const QString&,
+					   const QList<QVariant>&,
+					   const QString&)),
+			  icd,
+			  SLOT(icdCallReply(const QString&,
+					    const QList<QVariant>&,
+					    const QString&)));
+
+        delete mDBus;
+        mDBus = 0;
+    }
+
+    /* Icd2 dbus API functions */
+    QStringList scan(icd_scan_request_flags flags,
+		     QStringList &network_types,
+		     QList<IcdScanResult>& scan_results,
+		     QString& error);
+
+    uint state(QString& service_type, uint service_attrs,
+	       QString& service_id, QString& network_type,
+	       uint network_attrs, QByteArray& network_id,
+	       IcdStateResult &state_result);
+
+    uint addrinfo(QString& service_type, uint service_attrs,
+		  QString& service_id, QString& network_type,
+		  uint network_attrs, QByteArray& network_id,
+		  IcdAddressInfoResult& addr_result);
+
+    uint state(QList<IcdStateResult>& state_results);
+    uint statistics(QList<IcdStatisticsResult>& stats_results);
+    uint addrinfo(QList<IcdAddressInfoResult>& addr_results);
+
+    void signalReceived(const QString& interface, 
+                        const QString& signal,
+                        const QList<QVariant>& args);
+    void callReply(const QString& method, 
+                   const QList<QVariant>& args,
+                   const QString& error);
+
+public:
+    DBusDispatcher *mDBus;
+    QString mMethod;
+    QString mInterface;
+    QString mSignal;
+    QString mError;
+    QList<QVariant> mArgs;
+    QList<QVariant> receivedSignals;
+    unsigned int timeout;
+    IcdDbusInterfaceVer icd_dbus_version;
+    Icd *icd;
+
+    void init(unsigned int dbus_timeout, IcdDbusInterfaceVer ver,
+	      Icd *myfriend)
+    {
+      if (ver == IcdNewDbusInterface) {
+	mDBus = new DBusDispatcher(ICD_DBUS_API_INTERFACE,
+				   ICD_DBUS_API_PATH,
+				   ICD_DBUS_API_INTERFACE);
+      } else {
+	mDBus = new DBusDispatcher(ICD_DBUS_SERVICE,
+				   ICD_DBUS_PATH,
+				   ICD_DBUS_INTERFACE);
+      }
+      icd_dbus_version = ver;
+
+      /* This connect has a side effect as it means that only one
+       * Icd object can exists in one time. This should be fixed!
+       */
+      QObject::connect(mDBus, 
+		       SIGNAL(signalReceived(const QString&, 
+					     const QString&,
+					     const QList<QVariant>&)),
+		       myfriend,
+		       SLOT(icdSignalReceived(const QString&, 
+					      const QString&,
+					      const QList<QVariant>&)));
+
+      QObject::connect(mDBus,
+		       SIGNAL(callReply(const QString&,
+					const QList<QVariant>&,
+					const QString&)),
+		       myfriend,
+		       SLOT(icdCallReply(const QString&,
+					 const QList<QVariant>&,
+					 const QString&)));
+
+      icd = myfriend;
+      timeout = dbus_timeout;
+
+#ifdef PRINT_DEBUGINFO
+      if (!fdebug) {
+	fdebug = fopen("/tmp/maemoicd.log", "a+");
+      }
+      PDEBUG("created %s\n", "IcdPrivate");
+#endif
+    }
+
+    void clearState()
+    {
+      mMethod.clear();
+      mInterface.clear();
+      mSignal.clear();
+      mError.clear();
+      mArgs.clear();
+      receivedSignals.clear();
+    }
+
+    bool doState();
+};
+
+
+void IcdPrivate::signalReceived(const QString& interface, 
+				const QString& signal,
+				const QList<QVariant>& args)
+{
+    // Signal handler, which simply records what has been signalled
+    mInterface = interface;
+    mSignal = signal;
+    mArgs = args;
+
+    //qDebug() << "signal" << signal << "received:" << args;
+    receivedSignals << QVariant(interface) << QVariant(signal) << QVariant(args);
+}
+
+
+void IcdPrivate::callReply(const QString& method, 
+			   const QList<QVariant>& /*args*/,
+			   const QString& error)
+{
+    mMethod = method;
+    mError = error;
+}
+
+
+static void get_scan_result(QList<QVariant>& args,
+			    IcdScanResult& ret)
+{
+    int i=0;
+
+    if (args.isEmpty())
+      return;
+
+    ret.status = args[i++].toUInt();
+    ret.timestamp = args[i++].toUInt();
+    ret.scan.service_type = args[i++].toString();
+    ret.service_name = args[i++].toString();
+    ret.scan.service_attrs = args[i++].toUInt();
+    ret.scan.service_id = args[i++].toString();
+    ret.service_priority = args[i++].toInt();
+    ret.scan.network_type = args[i++].toString();
+    ret.network_name = args[i++].toString();
+    ret.scan.network_attrs = args[i++].toUInt();
+    ret.scan.network_id = args[i++].toByteArray();
+    ret.network_priority = args[i++].toInt();
+    ret.signal_strength = args[i++].toInt();
+    ret.station_id = args[i++].toString();
+    ret.signal_dB = args[i++].toInt();
+}
+
+
+QStringList IcdPrivate::scan(icd_scan_request_flags flags,
+			     QStringList &network_types,
+			     QList<IcdScanResult>& scan_results,
+			     QString& error)
+{
+    QStringList scanned_types;
+    QTimer timer;
+    QVariant reply;
+    QVariantList vl;
+    bool last_result = false;
+    IcdScanResult result;
+    int all_waited;
+    
+    clearState();
+    reply = mDBus->call(ICD_DBUS_API_SCAN_REQ, (uint)flags);
+    if (reply.type() != QVariant::List)
+        return scanned_types;
+    vl = reply.toList();
+    if (vl.isEmpty()) {
+        error = "Scan did not return anything.";
+	return scanned_types;
+    }
+    reply = vl.first();
+    scanned_types = reply.toStringList();
+    //qDebug() << "Scanning:" << scanned_types;
+    all_waited = scanned_types.size();
+
+    timer.setSingleShot(true);
+    timer.start(timeout);
+
+    scan_results.clear();
+    while (!last_result) {
+	while (timer.isActive() && mInterface.isEmpty() && mError.isEmpty()) {
+	    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
+	}
+
+	if (!timer.isActive()) {
+	    //qDebug() << "Timeout happened";
+	    break;
+	}
+
+	if (mSignal != ICD_DBUS_API_SCAN_SIG) {
+	    //qDebug() << "Received" << mSignal << "while waiting" << ICD_DBUS_API_SCAN_SIG << ", ignoring";
+	    mInterface.clear();
+	    continue;
+	}
+
+	if (mError.isEmpty()) {
+  	    QString msgInterface = receivedSignals.takeFirst().toString();
+	    QString msgSignal = receivedSignals.takeFirst().toString();
+	    QList<QVariant> msgArgs = receivedSignals.takeFirst().toList();
+	    //qDebug() << "Signal" << msgSignal << "received.";
+	    //qDebug() << "Params:" << msgArgs;
+
+	    while (!msgSignal.isEmpty()) {
+		get_scan_result(msgArgs, result);
+
+#if 0
+		qDebug() << "Received: " <<
+		    "status =" << result.status <<
+		    ", timestamp =" << result.timestamp <<
+		    ", service_type =" << result.scan.service_type <<
+		    ", service_name =" << result.service_name <<
+		    ", service_attrs =" << result.scan.service_attrs <<
+		    ", service_id =" << result.scan.service_id <<
+		    ", service_priority =" << result.service_priority <<
+		    ", network_type =" << result.scan.network_type <<
+		    ", network_name =" << result.network_name <<
+		    ", network_attrs =" << result.scan.network_attrs <<
+		    ", network_id =" << "-" <<
+		    ", network_priority =" << result.network_priority <<
+		    ", signal_strength =" << result.signal_strength <<
+		    ", station_id =" << result.station_id <<
+		    ", signal_dB =" << result.signal_dB;
+#endif
+
+		if (result.status == ICD_SCAN_COMPLETE) {
+		    //qDebug() << "waited =" << all_waited;
+		    if (--all_waited == 0) {
+		        last_result = true;
+			break;
+		    }
+		} else
+		    scan_results << result;
+
+		if (receivedSignals.isEmpty())
+		    break;
+
+		msgInterface = receivedSignals.takeFirst().toString();
+		msgSignal = receivedSignals.takeFirst().toString();
+		msgArgs = receivedSignals.takeFirst().toList();
+	    }
+	    mInterface.clear();
+
+	} else {
+	    qWarning() << "Error while scanning:" << mError;
+	    break;
+	}
+    }
+    timer.stop();
+
+    error = mError;
+    return scanned_types;
+}
+
+
+static void get_state_all_result(QList<QVariant>& args,
+				 IcdStateResult& ret)
+{
+    int i=0;
+
+    ret.params.service_type = args[i++].toString();
+    ret.params.service_attrs = args[i++].toUInt();
+    ret.params.service_id = args[i++].toString();
+    ret.params.network_type = args[i++].toString();
+    ret.params.network_attrs = args[i++].toUInt();
+    ret.params.network_id = args[i++].toByteArray();
+    ret.error = args[i++].toString();
+    ret.state = args[i++].toInt();
+}
+
+
+static void get_state_all_result2(QList<QVariant>& args,
+				 IcdStateResult& ret)
+{
+    int i=0;
+
+    ret.params.network_type = args[i++].toString();
+    ret.state = args[i++].toInt();
+
+    // Initialize the other values so that the caller can
+    // notice we only returned partial status
+    ret.params.service_type = QString();
+    ret.params.service_attrs = 0;
+    ret.params.service_id = QString();
+    ret.params.network_attrs = 0;
+    ret.params.network_id = QByteArray();
+    ret.error = QString();
+}
+
+
+uint IcdPrivate::state(QString& service_type, uint service_attrs,
+		       QString& service_id, QString& network_type,
+		       uint network_attrs, QByteArray& network_id,
+		       IcdStateResult& state_result)
+{
+    QTimer timer;
+    QVariant reply;
+    uint total_signals;
+    QVariantList vl;
+
+    clearState();
+
+    reply = mDBus->call(ICD_DBUS_API_STATE_REQ,
+			service_type, service_attrs, service_id,
+			network_type, network_attrs, network_id);
+    if (reply.type() != QVariant::List)
+        return 0;
+    vl = reply.toList();
+    if (vl.isEmpty())
+        return 0;
+    reply = vl.first();
+    total_signals = reply.toUInt();
+    if (!total_signals)
+        return 0;
+
+    timer.setSingleShot(true);
+    timer.start(timeout);
+
+    mInterface.clear();
+    while (timer.isActive() && mInterface.isEmpty()) {
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
+
+	if (mSignal != ICD_DBUS_API_STATE_SIG) {
+            mInterface.clear();
+	    continue;
+	}
+    }
+
+    timer.stop();
+
+    if (mError.isEmpty()) {
+        if (!mArgs.isEmpty()) {
+	    if (mArgs.size()>2)
+	        get_state_all_result(mArgs, state_result);
+	    else {
+	        // We are not connected as we did not get the status we asked
+	        return 0;
+	    }
+	}
+    } else {
+        qWarning() << "Error:" << mError;
+    }
+
+    // The returned value should be one because we asked for one state
+    return total_signals;
+}
+
+
+/* Special version of the state() call which does not call event loop.
+ * Needed in order to fix NB#175098 where Qt4.7 webkit crashes because event
+ * loop is run when webkit does not expect it. This function is called from
+ * bearer management API syncStateWithInterface() in QNetworkSession
+ * constructor.
+ */
+uint IcdPrivate::state(QList<IcdStateResult>& state_results)
+{
+    QVariant reply;
+    QVariantList vl;
+    uint signals_left, total_signals;
+    IcdStateResult result;
+    time_t started;
+    int timeout_secs = timeout / 1000;
+
+    PDEBUG("%s\n", "state_results");
+
+    clearState();
+    reply = mDBus->call(ICD_DBUS_API_STATE_REQ);
+    if (reply.type() != QVariant::List)
+        return 0;
+    vl = reply.toList();
+    if (vl.isEmpty())
+        return 0;
+    reply = vl.first();
+    signals_left = total_signals = reply.toUInt();
+    if (!signals_left)
+        return 0;
+
+    started = time(0);
+    state_results.clear();
+    mError.clear();
+    while (signals_left) {
+        mInterface.clear();
+	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
+	    mDBus->synchronousDispatch(1000);
+	}
+
+        if (time(0)>(started+timeout_secs)) {
+	    total_signals = 0;
+	    break;
+	}
+
+	if (mSignal != ICD_DBUS_API_STATE_SIG) {
+	    continue;
+	}
+
+	if (mError.isEmpty()) {
+	    if (!mArgs.isEmpty()) {
+	        if (mArgs.size()==2)
+	            get_state_all_result2(mArgs, result);
+		else
+	            get_state_all_result(mArgs, result);
+		state_results << result;
+	    }
+	    signals_left--;
+	} else {
+	    qWarning() << "Error:" << mError;
+	    break;
+	}
+    }
+
+    PDEBUG("total_signals=%d\n", total_signals);
+    return total_signals;
+}
+
+
+static void get_statistics_all_result(QList<QVariant>& args,
+				      IcdStatisticsResult& ret)
+{
+    int i=0;
+
+    if (args.isEmpty())
+      return;
+
+    ret.params.service_type = args[i++].toString();
+    ret.params.service_attrs = args[i++].toUInt();
+    ret.params.service_id = args[i++].toString();
+    ret.params.network_type = args[i++].toString();
+    ret.params.network_attrs = args[i++].toUInt();
+    ret.params.network_id = args[i++].toByteArray();
+    ret.time_active = args[i++].toUInt();
+    ret.signal_strength = (enum icd_nw_levels)args[i++].toUInt();
+    ret.bytes_sent = args[i++].toUInt();
+    ret.bytes_received = args[i++].toUInt();
+}
+
+
+uint IcdPrivate::statistics(QList<IcdStatisticsResult>& stats_results)
+{
+    QTimer timer;
+    QVariant reply;
+    QVariantList vl;
+    uint signals_left, total_signals;
+    IcdStatisticsResult result;
+
+    clearState();
+    reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ);
+    if (reply.type() != QVariant::List)
+        return 0;
+    vl = reply.toList();
+    if (vl.isEmpty())
+        return 0;
+    reply = vl.first();
+    if (reply.type() != QVariant::UInt)
+        return 0;
+    signals_left = total_signals = reply.toUInt();
+
+    if (!signals_left)
+        return 0;
+
+    timer.setSingleShot(true);
+    timer.start(timeout);
+    stats_results.clear();
+    while (signals_left) {
+	mInterface.clear();
+	while (timer.isActive() && mInterface.isEmpty()) {
+	    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
+	}
+
+	if (!timer.isActive()) {
+	    total_signals = 0;
+	    break;
+	}
+
+	if (mSignal != ICD_DBUS_API_STATISTICS_SIG) {
+	    continue;
+	}
+
+	if (mError.isEmpty()) {
+  	    get_statistics_all_result(mArgs, result);
+	    stats_results << result;
+	    signals_left--;
+	} else {
+	    qWarning() << "Error:" << mError;
+	    break;
+	}
+    }
+    timer.stop();
+
+    return total_signals;
+}
+
+
+static void get_addrinfo_all_result(QList<QVariant>& args,
+				    IcdAddressInfoResult& ret)
+{
+    int i=0;
+
+    if (args.isEmpty())
+      return;
+
+    ret.params.service_type = args[i++].toString();
+    ret.params.service_attrs = args[i++].toUInt();
+    ret.params.service_id = args[i++].toString();
+    ret.params.network_type = args[i++].toString();
+    ret.params.network_attrs = args[i++].toUInt();
+    ret.params.network_id = args[i++].toByteArray();
+
+    QVariantList vl = args[i].toList();
+    QVariant reply = vl.first();
+    QList<QVariant> lst = reply.toList();
+    for (int k=0; k<lst.size()/6; k=k+6) {
+        IcdIPInformation ip_info;
+	ip_info.address = lst[k].toString();
+	ip_info.netmask = lst[k++].toString();
+	ip_info.default_gateway = lst[k++].toString();
+	ip_info.dns1 = lst[k++].toString();
+	ip_info.dns2 = lst[k++].toString();
+	ip_info.dns3 = lst[k++].toString();
+
+	ret.ip_info << ip_info;
+    }
+}
+
+
+/* Special version of the addrinfo() call which does not call event loop.
+ * Needed in order to fix NB#175098 where Qt4.7 webkit crashes because event
+ * loop is run when webkit does not expect it. This function is called from
+ * bearer management API syncStateWithInterface() in QNetworkSession
+ * constructor.
+ */
+uint IcdPrivate::addrinfo(QList<IcdAddressInfoResult>& addr_results)
+{
+    QVariant reply;
+    QVariantList vl;
+    uint signals_left, total_signals;
+    IcdAddressInfoResult result;
+    time_t started;
+    int timeout_secs = timeout / 1000;
+
+    PDEBUG("%s\n", "addr_results");
+
+    clearState();
+    reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ);
+    if (reply.type() != QVariant::List)
+        return 0;
+    vl = reply.toList();
+    if (vl.isEmpty())
+        return 0;
+    reply = vl.first();
+    if (reply.type() != QVariant::UInt)
+        return 0;
+    signals_left = total_signals = reply.toUInt();
+    if (!signals_left)
+        return 0;
+
+    started = time(0);
+    addr_results.clear();
+    while (signals_left) {
+        mInterface.clear();
+	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
+	    mDBus->synchronousDispatch(1000);
+	}
+
+        if (time(0)>(started+timeout_secs)) {
+	    total_signals = 0;
+	    break;
+	}
+
+	if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) {
+	    continue;
+	}
+
+	if (mError.isEmpty()) {
+  	    get_addrinfo_all_result(mArgs, result);
+	    addr_results << result;
+	    signals_left--;
+	} else {
+	    qWarning() << "Error:" << mError;
+	    break;
+	}
+    }
+
+    PDEBUG("total_signals=%d\n", total_signals);
+    return total_signals;
+}
+
+
+uint IcdPrivate::addrinfo(QString& service_type, uint service_attrs,
+			  QString& service_id, QString& network_type,
+			  uint network_attrs, QByteArray& network_id,
+			  IcdAddressInfoResult& addr_result)
+{
+    QTimer timer;
+    QVariant reply;
+    uint total_signals;
+    QVariantList vl;
+
+    clearState();
+
+    reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ,
+			service_type, service_attrs, service_id,
+			network_type, network_attrs, network_id);
+    if (reply.type() != QVariant::List)
+        return 0;
+    vl = reply.toList();
+    if (vl.isEmpty())
+        return 0;
+    reply = vl.first();
+    total_signals = reply.toUInt();
+
+    if (!total_signals)
+        return 0;
+
+    timer.setSingleShot(true);
+    timer.start(timeout);
+
+    mInterface.clear();
+    while (timer.isActive() && mInterface.isEmpty()) {
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
+
+	if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) {
+            mInterface.clear();
+	    continue;
+	}
+    }
+
+    timer.stop();
+
+    if (mError.isEmpty()) {
+        get_addrinfo_all_result(mArgs, addr_result);
+    } else {
+        qWarning() << "Error:" << mError;
+    }
+
+    // The returned value should be one because we asked for one addrinfo
+    return total_signals;
+}
+
+
+Icd::Icd(QObject *parent)
+  : QObject(parent), d(new IcdPrivate(this))
+{
+}
+
+Icd::Icd(unsigned int timeout, QObject *parent)
+  : QObject(parent), d(new IcdPrivate(timeout, this))
+{
+}
+
+Icd::Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent)
+  : QObject(parent), d(new IcdPrivate(timeout, ver, this))
+{
+}
+
+Icd::~Icd()
+{
+    delete d;
+}
+
+
+QStringList Icd::scan(icd_scan_request_flags flags,
+		      QStringList &network_types,
+		      QList<IcdScanResult>& scan_results,
+		      QString& error)
+{
+    return d->scan(flags, network_types, scan_results, error);
+}
+
+
+uint Icd::state(QString& service_type, uint service_attrs,
+		QString& service_id, QString& network_type,
+		uint network_attrs, QByteArray& network_id,
+		IcdStateResult &state_result)
+{
+    return d->state(service_type, service_attrs, service_id,
+		    network_type, network_attrs, network_id,
+		    state_result);
+}
+
+
+uint Icd::addrinfo(QString& service_type, uint service_attrs,
+		   QString& service_id, QString& network_type,
+		   uint network_attrs, QByteArray& network_id,
+		   IcdAddressInfoResult& addr_result)
+{
+    return d->addrinfo(service_type, service_attrs, service_id,
+		       network_type, network_attrs, network_id,
+		       addr_result);
+}
+
+
+uint Icd::state(QList<IcdStateResult>& state_results)
+{
+    return d->state(state_results);
+}
+
+
+uint Icd::statistics(QList<IcdStatisticsResult>& stats_results)
+{
+    return d->statistics(stats_results);
+}
+
+
+uint Icd::addrinfo(QList<IcdAddressInfoResult>& addr_results)
+{
+    return d->addrinfo(addr_results);
+}
+
+
+void Icd::icdSignalReceived(const QString& interface, 
+			 const QString& signal,
+			 const QList<QVariant>& args)
+{
+    d->signalReceived(interface, signal, args);
+}
+
+
+void Icd::icdCallReply(const QString& method, 
+		    const QList<QVariant>& args,
+		    const QString& error)
+{
+    d->callReply(method, args, error);
+}
+
+}  // Maemo namespace
+
+
diff --git a/src/plugins/bearer/icd/maemo_icd.h b/src/plugins/bearer/icd/maemo_icd.h
new file mode 100644
index 0000000..156316a
--- /dev/null
+++ b/src/plugins/bearer/icd/maemo_icd.h
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef MAEMO_ICD_H
+#define MAEMO_ICD_H
+
+#include <QObject>
+#include <QStringList>
+#include <QByteArray>
+#include <QMetaType>
+#include <QtDBus>
+#include <QDBusArgument>
+
+#include <glib.h>
+#include <icd/dbus_api.h>
+#include <icd/osso-ic.h>
+#include <icd/osso-ic-dbus.h>
+#include <icd/network_api_defines.h>
+
+#define ICD_LONG_SCAN_TIMEOUT (30*1000)  /* 30sec */
+#define ICD_SHORT_SCAN_TIMEOUT (10*1000)  /* 10sec */
+#define ICD_SHORT_CONNECT_TIMEOUT (10*1000) /* 10sec */
+#define ICD_LONG_CONNECT_TIMEOUT (150*1000) /* 2.5min */
+
+namespace Maemo {
+
+struct CommonParams {
+	QString service_type;
+	uint service_attrs;
+	QString service_id;
+	QString network_type;
+	uint network_attrs;
+	QByteArray network_id;
+};
+
+struct IcdScanResult {
+	uint status; // see #icd_scan_status
+	uint timestamp; // when last seen
+	QString service_name;
+	uint service_priority; // within a service type
+	QString network_name;
+	uint network_priority;
+	struct CommonParams scan;
+	uint signal_strength; // quality, 0 (none) - 10 (good)
+	QString station_id; // e.g. MAC address or similar id
+	uint signal_dB; // use signal strength above unless you know what you are doing
+
+	IcdScanResult() {
+		status = timestamp = scan.service_attrs = service_priority =
+			scan.network_attrs = network_priority = signal_strength =
+			signal_dB = 0;
+	}
+};
+
+struct IcdStateResult {
+	struct CommonParams params;
+	QString error;
+	uint state;
+};
+
+struct IcdStatisticsResult {
+	struct CommonParams params;
+	uint time_active;  // in seconds
+	enum icd_nw_levels signal_strength; // see network_api_defines.h in icd2-dev package
+	uint bytes_sent;
+	uint bytes_received;
+};
+
+struct IcdIPInformation {
+	QString address;
+	QString netmask;
+	QString default_gateway;
+	QString dns1;
+	QString dns2;
+	QString dns3;
+};
+
+struct IcdAddressInfoResult {
+	struct CommonParams params;
+	QList<IcdIPInformation> ip_info;
+};
+
+enum IcdDbusInterfaceVer {
+	IcdOldDbusInterface = 0,  // use the old OSSO-IC interface
+	IcdNewDbusInterface       // use the new Icd2 interface (default)
+};
+
+
+class IcdPrivate;
+class Icd : public QObject
+{
+    Q_OBJECT
+
+public:
+    Icd(QObject *parent = 0);
+    Icd(unsigned int timeout, QObject *parent = 0);
+    Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent = 0);
+    ~Icd();
+
+    /* Icd2 dbus API functions */
+    QStringList scan(icd_scan_request_flags flags,
+		     QStringList &network_types,
+		     QList<IcdScanResult>& scan_results,
+		     QString& error);
+
+    uint state(QString& service_type, uint service_attrs,
+	       QString& service_id, QString& network_type,
+	       uint network_attrs, QByteArray& network_id,
+	       IcdStateResult &state_result);
+
+    uint addrinfo(QString& service_type, uint service_attrs,
+		  QString& service_id, QString& network_type,
+		  uint network_attrs, QByteArray& network_id,
+		  IcdAddressInfoResult& addr_result);
+
+    uint state(QList<IcdStateResult>& state_results);
+    uint statistics(QList<IcdStatisticsResult>& stats_results);
+    uint addrinfo(QList<IcdAddressInfoResult>& addr_results);
+
+private Q_SLOTS:
+    void icdSignalReceived(const QString& interface, 
+                        const QString& signal,
+                        const QList<QVariant>& args);
+    void icdCallReply(const QString& method, 
+                   const QList<QVariant>& args,
+                   const QString& error);
+
+private:
+    IcdPrivate *d;
+    friend class IcdPrivate;
+};
+
+}  // Maemo namespace
+
+#endif
diff --git a/src/plugins/bearer/icd/proxyconf.cpp b/src/plugins/bearer/icd/proxyconf.cpp
new file mode 100644
index 0000000..e5c8f4e
--- /dev/null
+++ b/src/plugins/bearer/icd/proxyconf.cpp
@@ -0,0 +1,412 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QVariant>
+#include <QStringList>
+#include <QDebug>
+#include <QWriteLocker>
+#include <QNetworkProxyFactory>
+#include <QNetworkProxy>
+#include <gconf/gconf-value.h>
+#include <gconf/gconf-client.h>
+#include "proxyconf.h"
+
+#define CONF_PROXY "/system/proxy"
+#define HTTP_PROXY "/system/http_proxy"
+
+
+namespace Maemo {
+
+static QString convertKey(const char *key)
+{
+    return QString::fromUtf8(key);
+}
+
+static QVariant convertValue(GConfValue *src)
+{
+    if (!src) {
+        return QVariant();
+    } else {
+        switch (src->type) {
+        case GCONF_VALUE_INVALID:
+            return QVariant(QVariant::Invalid);
+        case GCONF_VALUE_BOOL:
+            return QVariant((bool)gconf_value_get_bool(src));
+        case GCONF_VALUE_INT:
+            return QVariant(gconf_value_get_int(src));
+        case GCONF_VALUE_FLOAT:
+            return QVariant(gconf_value_get_float(src));
+        case GCONF_VALUE_STRING:
+            return QVariant(QString::fromUtf8(gconf_value_get_string(src)));
+        case GCONF_VALUE_LIST:
+            switch (gconf_value_get_list_type(src)) {
+            case GCONF_VALUE_STRING:
+                {
+                    QStringList result;
+                    for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
+                        result.append(QString::fromUtf8(gconf_value_get_string((GConfValue *)elts->data)));
+                    return QVariant(result);
+                }
+            default:
+                {
+                    QList<QVariant> result;
+                    for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
+                        result.append(convertValue((GConfValue *)elts->data));
+                    return QVariant(result);
+                }
+            }
+        case GCONF_VALUE_SCHEMA:
+        default:
+            return QVariant();
+        }
+    }
+}
+
+
+/* Fast version of GConfItem, allows reading subtree at a time */
+class GConfItemFast {
+public:
+  GConfItemFast(const QString &k) : key(k) {}
+  QHash<QString,QVariant> getEntries() const;
+
+private:
+  QString key;
+};
+
+#define withClient(c) for (GConfClient *c = gconf_client_get_default(); c; c=0)
+
+
+QHash<QString,QVariant> GConfItemFast::getEntries() const
+{
+    QHash<QString,QVariant> children;
+
+    withClient(client) {
+        QByteArray k = key.toUtf8();
+        GSList *entries = gconf_client_all_entries(client, k.data(), NULL);
+        for (GSList *e = entries; e; e = e->next) {
+	    char *key_name = strrchr(((GConfEntry *)e->data)->key, '/');
+	    if (!key_name)
+	        key_name = ((GConfEntry *)e->data)->key;
+	    else
+	        key_name++;
+	    QString key(convertKey(key_name));
+	    QVariant value = convertValue(((GConfEntry *)e->data)->value);
+	    gconf_entry_unref((GConfEntry *)e->data);
+	    //qDebug()<<"key="<<key<<"value="<<value;
+	    children.insert(key, value);
+        }
+        g_slist_free (entries);
+    }
+
+    return children;
+}
+
+
+
+class NetworkProxyFactory : QNetworkProxyFactory {
+public:
+    NetworkProxyFactory() { }
+    QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery());
+};
+
+
+QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query)
+{
+    ProxyConf proxy_conf;
+
+    QList<QNetworkProxy> result = proxy_conf.flush(query);
+    if (result.isEmpty())
+        result << QNetworkProxy::NoProxy;
+
+    return result;
+}
+
+
+class ProxyConfPrivate {
+private:
+    // proxy values from gconf
+    QString mode;
+    bool use_http_host;
+    QString autoconfig_url;
+    QString http_proxy;
+    quint16 http_port;
+    QList<QVariant> ignore_hosts;
+    QString secure_host;
+    quint16 secure_port;
+    QString ftp_host;
+    quint16 ftp_port;
+    QString socks_host;
+    quint16 socks_port;
+    QString rtsp_host;
+    quint16 rtsp_port;
+
+    bool isHostExcluded(const QString &host);
+
+public:
+    QString prefix;
+    QString http_prefix;
+
+    void readProxyData();
+    QList<QNetworkProxy> flush(const QNetworkProxyQuery &query);
+};
+
+
+static QHash<QString,QVariant> getValues(const QString& prefix)
+{
+    GConfItemFast item(prefix);
+    return item.getEntries();
+}
+
+static QHash<QString,QVariant> getHttpValues(const QString& prefix)
+{
+    GConfItemFast item(prefix);
+    return item.getEntries();
+}
+
+#define GET(var, type)				\
+  do {						\
+    QVariant v = values.value(#var);		\
+    if (v.isValid())				\
+      var = v.to##type ();			\
+  } while(0)
+
+#define GET_HTTP(var, name, type)		\
+  do {						\
+    QVariant v = httpValues.value(#name);	\
+    if (v.isValid())				\
+      var = v.to##type ();			\
+  } while(0)
+
+
+void ProxyConfPrivate::readProxyData()
+{
+    QHash<QString,QVariant> values = getValues(prefix);
+    QHash<QString,QVariant> httpValues = getHttpValues(http_prefix);
+
+    //qDebug()<<"values="<<values;
+
+    /* Read the proxy settings from /system/proxy* */
+    GET_HTTP(http_proxy, host, String);
+    GET_HTTP(http_port, port, Int);
+    GET_HTTP(ignore_hosts, ignore_hosts, List);
+
+    GET(mode, String);
+    GET(autoconfig_url, String);
+    GET(secure_host, String);
+    GET(secure_port, Int);
+    GET(ftp_host, String);
+    GET(ftp_port, Int);
+    GET(socks_host, String);
+    GET(socks_port, Int);
+    GET(rtsp_host, String);
+    GET(rtsp_port, Int);
+
+    if (http_proxy.isEmpty())
+        use_http_host = false;
+    else
+        use_http_host = true;
+}
+
+
+bool ProxyConfPrivate::isHostExcluded(const QString &host)
+{
+    if (host.isEmpty())
+        return true;
+
+    if (ignore_hosts.isEmpty())
+        return false;
+
+    QHostAddress ipAddress;
+    bool isIpAddress = ipAddress.setAddress(host);
+
+    foreach (QVariant h, ignore_hosts) {
+        QString entry = h.toString();
+        if (isIpAddress && ipAddress.isInSubnet(QHostAddress::parseSubnet(entry))) {
+            return true;  // excluded
+        } else {
+            // do wildcard matching
+            QRegExp rx(entry, Qt::CaseInsensitive, QRegExp::Wildcard);
+            if (rx.exactMatch(host))
+                return true;
+        }
+    }
+
+    // host was not excluded
+    return false;
+}
+
+
+QList<QNetworkProxy> ProxyConfPrivate::flush(const QNetworkProxyQuery &query)
+{
+    QList<QNetworkProxy> result;
+
+#if 0
+    qDebug()<<"http_proxy" << http_proxy;
+    qDebug()<<"http_port" << http_port;
+    qDebug()<<"ignore_hosts" << ignore_hosts;
+    qDebug()<<"use_http_host" << use_http_host;
+    qDebug()<<"mode" << mode;
+    qDebug()<<"autoconfig_url" << autoconfig_url;
+    qDebug()<<"secure_host" << secure_host;
+    qDebug()<<"secure_port" << secure_port;
+    qDebug()<<"ftp_host" << ftp_host;
+    qDebug()<<"ftp_port" << ftp_port;
+    qDebug()<<"socks_host" << socks_host;
+    qDebug()<<"socks_port" << socks_port;
+    qDebug()<<"rtsp_host" << rtsp_host;
+    qDebug()<<"rtsp_port" << rtsp_port;
+#endif
+
+    if (isHostExcluded(query.peerHostName()))
+        return result;          // no proxy for this host
+
+    if (mode == "auto") {
+        // TODO: pac currently not supported, fix me
+        return result;
+    }
+
+    if (mode == "manual") {
+        bool isHttps = false;
+	QString protocol = query.protocolTag().toLower();
+
+	// try the protocol-specific proxy
+	QNetworkProxy protocolSpecificProxy;
+
+	if (protocol == QLatin1String("ftp")) {
+	    if (!ftp_host.isEmpty()) {
+	        protocolSpecificProxy.setType(QNetworkProxy::FtpCachingProxy);
+		protocolSpecificProxy.setHostName(ftp_host);
+		protocolSpecificProxy.setPort(ftp_port);
+	    }
+	} else if (protocol == QLatin1String("http")) {
+	    if (!http_proxy.isEmpty()) {
+	        protocolSpecificProxy.setType(QNetworkProxy::HttpProxy);
+		protocolSpecificProxy.setHostName(http_proxy);
+		protocolSpecificProxy.setPort(http_port);
+	    }
+	} else if (protocol == QLatin1String("https")) {
+	    isHttps = true;
+	    if (!secure_host.isEmpty()) {
+	        protocolSpecificProxy.setType(QNetworkProxy::HttpProxy);
+		protocolSpecificProxy.setHostName(secure_host);
+		protocolSpecificProxy.setPort(secure_port);
+	    }
+	}
+
+	if (protocolSpecificProxy.type() != QNetworkProxy::DefaultProxy)
+	    result << protocolSpecificProxy;
+
+
+        if (!socks_host.isEmpty()) {
+	    QNetworkProxy proxy;
+	    proxy.setType(QNetworkProxy::Socks5Proxy);
+	    proxy.setHostName(socks_host);
+	    proxy.setPort(socks_port);
+	    result << proxy;
+	}
+
+
+	// Add the HTTPS proxy if present (and if we haven't added yet)
+	if (!isHttps) {
+	    QNetworkProxy https;
+	    if (!secure_host.isEmpty()) {
+	        https.setType(QNetworkProxy::HttpProxy);
+		https.setHostName(secure_host);
+		https.setPort(secure_port);
+	    }
+
+	    if (https.type() != QNetworkProxy::DefaultProxy &&
+		https != protocolSpecificProxy)
+	        result << https;
+	}
+    }
+
+    return result;
+}
+
+
+ProxyConf::ProxyConf()
+    : d_ptr(new ProxyConfPrivate)
+{
+    g_type_init();
+    d_ptr->prefix = CONF_PROXY;
+    d_ptr->http_prefix = HTTP_PROXY;
+}
+
+ProxyConf::~ProxyConf()
+{
+    delete d_ptr;
+}
+
+
+QList<QNetworkProxy> ProxyConf::flush(const QNetworkProxyQuery &query)
+{
+    d_ptr->readProxyData();
+    return d_ptr->flush(query);
+}
+
+
+static int refcount = 0;
+static QReadWriteLock lock;
+
+void ProxyConf::update()
+{
+    QWriteLocker locker(&lock);
+    NetworkProxyFactory *factory = new NetworkProxyFactory();
+    QNetworkProxyFactory::setApplicationProxyFactory((QNetworkProxyFactory*)factory);
+    refcount++;
+}
+
+
+void ProxyConf::clear(void)
+{
+    QWriteLocker locker(&lock);
+    refcount--;
+    if (refcount == 0)
+        QNetworkProxyFactory::setApplicationProxyFactory(NULL);
+
+    if (refcount<0)
+        refcount = 0;
+}
+
+
+} // namespace Maemo
diff --git a/src/plugins/bearer/icd/proxyconf.h b/src/plugins/bearer/icd/proxyconf.h
new file mode 100644
index 0000000..884cc5c
--- /dev/null
+++ b/src/plugins/bearer/icd/proxyconf.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef PROXYCONF_H
+#define PROXYCONF_H
+
+#include <QString>
+#include <QNetworkProxy>
+
+namespace Maemo {
+
+class ProxyConfPrivate;
+class ProxyConf {
+private:
+    ProxyConfPrivate *d_ptr;
+
+public:
+    ProxyConf();
+    virtual ~ProxyConf();
+
+    QList<QNetworkProxy> flush(const QNetworkProxyQuery &query = QNetworkProxyQuery());  // read the proxies from db
+
+    /* Note that for each update() call there should be corresponding
+     * clear() call because the ProxyConf class implements a reference
+     * counting mechanism. The factory is removed only when there is
+     * no one using the factory any more.
+     */
+    static void update(void);          // this builds QNetworkProxy factory
+    static void clear(void);           // this removes QNetworkProxy factory
+};
+
+} // namespace Maemo
+
+#endif
diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp
index 3264f15..bdf4e2e 100644
--- a/src/plugins/bearer/icd/qicdengine.cpp
+++ b/src/plugins/bearer/icd/qicdengine.cpp
@@ -43,7 +43,7 @@
 #include "qnetworksession_impl.h"
 
 #include <wlancond.h>
-#include <libicd-network-wlan-dev.h>
+#include <wlan-utils.h>
 #include <iapconf.h>
 #include <iapmonitor.h>
 
@@ -67,6 +67,10 @@ QString IcdNetworkConfigurationPrivate::bearerTypeName() const
     return iap_type;
 }
 
+/******************************************************************************/
+/** IapAddTimer specific                                                      */
+/******************************************************************************/
+
 /* The IapAddTimer is a helper class that makes sure we update
  * the configuration only after all db additions to certain
  * iap are finished (after a certain timeout)
@@ -162,6 +166,9 @@ void IapAddTimer::del(QString& iap_id)
     }
 }
 
+/******************************************************************************/
+/** IAPMonitor specific                                                       */
+/******************************************************************************/
 
 class IapMonitor : public Maemo::IAPMonitor
 {
@@ -216,6 +223,11 @@ void IapMonitor::iapRemoved(const QString &iap_id)
     d->deleteConfiguration(id);
 }
 
+
+/******************************************************************************/
+/** QIcdEngine implementation                                                 */
+/******************************************************************************/
+
 QIcdEngine::QIcdEngine(QObject *parent)
 :   QBearerEngine(parent), iapMonitor(0), m_dbusInterface(0),
     firstUpdate(true), m_scanGoingOn(false)
diff --git a/src/plugins/bearer/icd/qicdengine.h b/src/plugins/bearer/icd/qicdengine.h
index 0d5ba27..d528f15 100644
--- a/src/plugins/bearer/icd/qicdengine.h
+++ b/src/plugins/bearer/icd/qicdengine.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/qtimer.h>
 
-#include <maemo_icd.h>
+#include "maemo_icd.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index 787cc55..2ed0b88 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -60,13 +60,16 @@ QDBusArgument &operator<<(QDBusArgument &argument,
                           const ICd2DetailsDBusStruct &icd2)
 {
     argument.beginStructure();
+
     argument << icd2.serviceType;
     argument << icd2.serviceAttributes;
     argument << icd2.setviceId;
     argument << icd2.networkType;
     argument << icd2.networkAttributes;
     argument << icd2.networkId;
+
     argument.endStructure();
+
     return argument;
 }
 
@@ -74,13 +77,16 @@ const QDBusArgument &operator>>(const QDBusArgument &argument,
                                 ICd2DetailsDBusStruct &icd2)
 {
     argument.beginStructure();
+
     argument >> icd2.serviceType;
     argument >> icd2.serviceAttributes;
     argument >> icd2.setviceId;
     argument >> icd2.networkType;
     argument >> icd2.networkAttributes;
     argument >> icd2.networkId;
+
     argument.endStructure();
+
     return argument;
 }
 
@@ -104,9 +110,12 @@ QDBusArgument &operator<<(QDBusArgument &argument,
                           const ICd2DetailsList &detailsList)
 {
      argument.beginArray(qMetaTypeId<ICd2DetailsDBusStruct>());
+
      for (int i = 0; i < detailsList.count(); ++i)
          argument << detailsList[i];
+
      argument.endArray();
+
      return argument;
 }
 
@@ -144,7 +153,8 @@ void QNetworkSessionPrivateImpl::iapStateChanged(const QString& iapid, uint icd_
 
 void QNetworkSessionPrivateImpl::cleanupSession(void)
 {
-    QObject::disconnect(q, SIGNAL(stateChanged(QNetworkSession::State)), this, SLOT(updateProxies(QNetworkSession::State)));
+    QObject::disconnect(q, SIGNAL(stateChanged(QNetworkSession::State)),
+                        this, SLOT(updateProxies(QNetworkSession::State)));
 }
 
 
diff --git a/src/plugins/bearer/icd/wlan-utils.h b/src/plugins/bearer/icd/wlan-utils.h
new file mode 100644
index 0000000..1d9e89d
--- /dev/null
+++ b/src/plugins/bearer/icd/wlan-utils.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef WLAN_UTILS_H
+#define WLAN_UTILS_H
+
+/** Originally taken from: libicd-network-wlan-dev.h*/
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <wlancond.h>
+#include <icd/network_api_defines.h>
+
+/* capability bits inside network attributes var */
+#define NWATTR_WPS_MASK       0x0000F000
+#define NWATTR_ALGORITHM_MASK 0x00000F00
+#define NWATTR_WPA2_MASK      0x00000080
+#define NWATTR_METHOD_MASK    0x00000078
+#define NWATTR_MODE_MASK      0x00000007
+
+#define CAP_LOCALMASK         0x0FFFE008
+
+/* how much to shift between capability and network attributes var */
+#define CAP_SHIFT_WPS        3
+#define CAP_SHIFT_ALGORITHM 20
+#define CAP_SHIFT_WPA2       1
+#define CAP_SHIFT_METHOD     1
+#define CAP_SHIFT_MODE       0
+#define CAP_SHIFT_ALWAYS_ONLINE 26
+
+/* ------------------------------------------------------------------------- */
+/* From combined to capability */
+static inline dbus_uint32_t nwattr2cap(guint nwattrs, dbus_uint32_t *cap)
+{
+	guint oldval = *cap;
+
+	*cap &= CAP_LOCALMASK; /* clear old capabilities */
+	*cap |=
+		((nwattrs & ICD_NW_ATTR_ALWAYS_ONLINE) >> CAP_SHIFT_ALWAYS_ONLINE) |
+		((nwattrs & NWATTR_WPS_MASK) >> CAP_SHIFT_WPS) |
+		((nwattrs & NWATTR_ALGORITHM_MASK) << CAP_SHIFT_ALGORITHM) |
+		((nwattrs & NWATTR_WPA2_MASK) << CAP_SHIFT_WPA2) |
+		((nwattrs & NWATTR_METHOD_MASK) << CAP_SHIFT_METHOD) |
+		(nwattrs & NWATTR_MODE_MASK);
+
+	return oldval;
+}
+
+
+/* ------------------------------------------------------------------------- */
+/* From capability to combined */
+static inline guint cap2nwattr(dbus_uint32_t cap, guint *nwattrs)
+{
+	guint oldval = *nwattrs;
+
+	*nwattrs &= ~ICD_NW_ATTR_LOCALMASK; /* clear old capabilities */
+        *nwattrs |=
+#ifdef WLANCOND_WPS_MASK
+		((cap & WLANCOND_WPS_MASK) << CAP_SHIFT_WPS) |
+#endif
+		((cap & (WLANCOND_ENCRYPT_ALG_MASK |
+			 WLANCOND_ENCRYPT_GROUP_ALG_MASK)) >> CAP_SHIFT_ALGORITHM)|
+		((cap & WLANCOND_ENCRYPT_WPA2_MASK) >> CAP_SHIFT_WPA2) |
+		((cap & WLANCOND_ENCRYPT_METHOD_MASK) >> CAP_SHIFT_METHOD) |
+		(cap & WLANCOND_MODE_MASK);
+
+	return oldval;
+}
+
+
+#endif
-- 
cgit v0.12


From 83e6bc232e687bab93c9eddaf0b4479462c8414c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 20 Sep 2010 14:54:30 +0200
Subject: Fixed scaled point drawing with square cap in raster paint engine.

With a large pen width and a small scale, due to the hacky way we draw
points (stroking a line from (x, y) to (x + tiny_amount, y)), we some
times end up snapping these two points to the same in rasterizeLine().
If we instead apply the SquareCap before we do clipping / snapping we
don't get this problem.

Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 7c673a4cf64ba043bb27f90287517bdcdd7a21db)
---
 src/gui/painting/qrasterizer.cpp     | 41 +++++++++++++++---------------------
 tests/auto/qpainter/tst_qpainter.cpp | 22 +++++++++++++++++++
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp
index f8f8afb..61ed12e 100644
--- a/src/gui/painting/qrasterizer.cpp
+++ b/src/gui/painting/qrasterizer.cpp
@@ -718,17 +718,21 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
     QPointF pa = a;
     QPointF pb = b;
 
-    QPointF offs = QPointF(qAbs(b.y() - a.y()), qAbs(b.x() - a.x())) * width * 0.5;    
-    if (squareCap)
-        offs += QPointF(offs.y(), offs.x());
+    if (squareCap) {
+        QPointF delta = pb - pa;
+        pa -= (0.5f * width) * delta;
+        pb += (0.5f * width) * delta;
+    }
+
+    QPointF offs = QPointF(qAbs(b.y() - a.y()), qAbs(b.x() - a.x())) * width * 0.5;
     const QRectF clip(d->clipRect.topLeft() - offs, d->clipRect.bottomRight() + QPoint(1, 1) + offs);
 
-    if (!clip.contains(a) || !clip.contains(b)) {
+    if (!clip.contains(pa) || !clip.contains(pb)) {
         qreal t1 = 0;
         qreal t2 = 1;
 
-        const qreal o[2] = { a.x(), a.y() };
-        const qreal d[2] = { b.x() - a.x(), b.y() - a.y() };
+        const qreal o[2] = { pa.x(), pa.y() };
+        const qreal d[2] = { pb.x() - pa.x(), pb.y() - pa.y() };
 
         const qreal low[2] = { clip.left(), clip.top() };
         const qreal high[2] = { clip.right(), clip.bottom() };
@@ -751,8 +755,12 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
             if (t1 >= t2)
                 return;
         }
-        pa = a + (b - a) * t1;
-        pb = a + (b - a) * t2;
+
+        QPointF npa = pa + (pb - pa) * t1;
+        QPointF npb = pa + (pb - pa) * t2;
+
+        pa = npa;
+        pb = npb;
     }
 
     if (!d->antialiased) {
@@ -799,12 +807,7 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
         pa = QPointF(x, y - dy);
         pb = QPointF(x, y + dy);
 
-        if (squareCap)
-            width = 1 / width + 1.0f;
-        else
-            width = 1 / width;
-
-        squareCap = false;
+        width = 1 / width;
     }
 
     if (q16Dot16Compare(pa.x(), pb.x())) {
@@ -814,11 +817,6 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
         const qreal dy = pb.y() - pa.y();
         const qreal halfWidth = 0.5f * width * dy;
 
-        if (squareCap) {
-            pa.ry() -= halfWidth;
-            pb.ry() += halfWidth;
-        }
-
         qreal left = pa.x() - halfWidth;
         qreal right = pa.x() + halfWidth;
 
@@ -899,11 +897,6 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
         delta *= 0.5f * width;
         const QPointF perp(delta.y(), -delta.x());
 
-        if (squareCap) {
-            pa -= delta;
-            pb += delta;
-        }
-
         QPointF top;
         QPointF left;
         QPointF right;
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index f358681..a94c300 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -252,6 +252,8 @@ private slots:
 
     void QTBUG5939_attachPainterPrivate();
 
+    void drawPointScaled();
+
 private:
     void fillData();
     void setPenColor(QPainter& p);
@@ -4522,6 +4524,26 @@ void tst_QPainter::QTBUG5939_attachPainterPrivate()
     QCOMPARE(widget->deviceTransform, proxy->deviceTransform);
 }
 
+void tst_QPainter::drawPointScaled()
+{
+    QImage image(32, 32, QImage::Format_RGB32);
+    image.fill(0xffffffff);
+
+    QPainter p(&image);
+
+    p.scale(0.1, 0.1);
+
+    QPen pen;
+    pen.setWidth(1000);
+    pen.setColor(Qt::red);
+
+    p.setPen(pen);
+    p.drawPoint(0, 0);
+    p.end();
+
+    QCOMPARE(image.pixel(16, 16), 0xffff0000);
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"
-- 
cgit v0.12


From e8d9e657509be4d8fea62a73c8dd51305951f1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Thu, 23 Sep 2010 10:04:39 +0200
Subject: Fixed floating point overflow issues in QRasterizer::rasterizeLine

Change 7c673a4cf64ba04 introduced some autotest failures in the
fpe_steepSlopes test in QPainter.

Since the other rasterizers all deal in a 26.6 fixed point coordinate
space we should snap the line vertices to this to prevent floating point
overflows due to very steep slopes.

This also necessitates keeping track of four different slope / inverse
slope increments for each of the four edges.

This also fixes a previously QEXPECT_FAIL'ed test case.

Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 93199a5b7082fd484b7f21ad4825d71693ecead2)
---
 src/gui/painting/qrasterizer.cpp     | 139 ++++++++++++++++++++---------------
 tests/auto/qpainter/tst_qpainter.cpp |   1 -
 2 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp
index 61ed12e..4fded1f 100644
--- a/src/gui/painting/qrasterizer.cpp
+++ b/src/gui/painting/qrasterizer.cpp
@@ -65,6 +65,12 @@ typedef int Q16Dot16;
 #define COORD_ROUNDING 1 // 0: round up, 1: round down
 #define COORD_OFFSET 32 // 26.6, 32 is half a pixel
 
+static inline QT_FT_Vector PointToVector(const QPointF &p)
+{
+    QT_FT_Vector result = { QT_FT_Pos(p.x() * 64), QT_FT_Pos(p.y() * 64) };
+    return result;
+}
+
 class QSpanBuffer {
 public:
     QSpanBuffer(ProcessSpans blend, void *data, const QRect &clipRect)
@@ -693,9 +699,9 @@ static Q16Dot16 intersectPixelFP(int x, Q16Dot16 top, Q16Dot16 bottom, Q16Dot16
     }
 }
 
-static inline bool q16Dot16Compare(qreal p1, qreal p2)
+static inline bool q26Dot6Compare(qreal p1, qreal p2)
 {
-    return FloatToQ16Dot16(p2 - p1) == 0;
+    return int((p2  - p1) * 64.) == 0;
 }
 
 static inline qreal qFloorF(qreal v)
@@ -708,6 +714,12 @@ static inline qreal qFloorF(qreal v)
         return floor(v);
 }
 
+static inline QPointF snapTo26Dot6Grid(const QPointF &p)
+{
+    return QPointF(qFloorF(p.x() * 64) * (1 / qreal(64)),
+                   qFloorF(p.y() * 64) * (1 / qreal(64)));
+}
+
 void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width, bool squareCap)
 {
     if (a == b || width == 0 || d->clipRect.isEmpty())
@@ -771,15 +783,6 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
     }
 
     {
-        const qreal gridResolution = 64;
-        const qreal reciprocal = 1 / gridResolution;
-
-        // snap to grid to prevent large slopes
-        pa.rx() = qFloorF(pa.rx() * gridResolution) * reciprocal;
-        pa.ry() = qFloorF(pa.ry() * gridResolution) * reciprocal;
-        pb.rx() = qFloorF(pb.rx() * gridResolution) * reciprocal;
-        pb.ry() = qFloorF(pb.ry() * gridResolution) * reciprocal;
-
         // old delta
         const QPointF d0 = a - b;
         const qreal w0 = d0.x() * d0.x() + d0.y() * d0.y();
@@ -797,7 +800,7 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
 
     QSpanBuffer buffer(d->blend, d->data, d->clipRect);
 
-    if (q16Dot16Compare(pa.y(), pb.y())) {
+    if (q26Dot6Compare(pa.y(), pb.y())) {
         const qreal x = (pa.x() + pb.x()) * 0.5f;
         const qreal dx = qAbs(pb.x() - pa.x()) * 0.5f;
 
@@ -810,7 +813,7 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
         width = 1 / width;
     }
 
-    if (q16Dot16Compare(pa.x(), pb.x())) {
+    if (q26Dot6Compare(pa.x(), pb.x())) {
         if (pa.y() > pb.y())
             qSwap(pa, pb);
 
@@ -826,7 +829,7 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
         pa.ry() = qBound(qreal(d->clipRect.top()), pa.y(), qreal(d->clipRect.bottom() + 1));
         pb.ry() = qBound(qreal(d->clipRect.top()), pb.y(), qreal(d->clipRect.bottom() + 1));
 
-        if (q16Dot16Compare(left, right) || q16Dot16Compare(pa.y(), pb.y()))
+        if (q26Dot6Compare(left, right) || q26Dot6Compare(pa.y(), pb.y()))
             return;
 
         if (d->antialiased) {
@@ -914,14 +917,36 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
             bottom = pb + perp;
         }
 
+        top = snapTo26Dot6Grid(top);
+        bottom = snapTo26Dot6Grid(bottom);
+        left = snapTo26Dot6Grid(left);
+        right = snapTo26Dot6Grid(right);
+
         const qreal topBound = qBound(qreal(d->clipRect.top()), top.y(), qreal(d->clipRect.bottom()));
         const qreal bottomBound = qBound(qreal(d->clipRect.top()), bottom.y(), qreal(d->clipRect.bottom()));
 
-        const qreal leftSlope = (left.x() - top.x()) / (left.y() - top.y());
-        const qreal rightSlope = -1.0f / leftSlope;
+        const QPointF topLeftEdge = left - top;
+        const QPointF topRightEdge = right - top;
+        const QPointF bottomLeftEdge = bottom - left;
+        const QPointF bottomRightEdge = bottom - right;
 
-        const Q16Dot16 leftSlopeFP = FloatToQ16Dot16(leftSlope);
-        const Q16Dot16 rightSlopeFP = FloatToQ16Dot16(rightSlope);
+        const qreal topLeftSlope = topLeftEdge.x() / topLeftEdge.y();
+        const qreal bottomLeftSlope = bottomLeftEdge.x() / bottomLeftEdge.y();
+
+        const qreal topRightSlope = topRightEdge.x() / topRightEdge.y();
+        const qreal bottomRightSlope = bottomRightEdge.x() / bottomRightEdge.y();
+
+        const Q16Dot16 topLeftSlopeFP = FloatToQ16Dot16(topLeftSlope);
+        const Q16Dot16 topRightSlopeFP = FloatToQ16Dot16(topRightSlope);
+
+        const Q16Dot16 bottomLeftSlopeFP = FloatToQ16Dot16(bottomLeftSlope);
+        const Q16Dot16 bottomRightSlopeFP = FloatToQ16Dot16(bottomRightSlope);
+
+        const Q16Dot16 invTopLeftSlopeFP = FloatToQ16Dot16(1 / topLeftSlope);
+        const Q16Dot16 invTopRightSlopeFP = FloatToQ16Dot16(1 / topRightSlope);
+
+        const Q16Dot16 invBottomLeftSlopeFP = FloatToQ16Dot16(1 / bottomLeftSlope);
+        const Q16Dot16 invBottomRightSlopeFP = FloatToQ16Dot16(1 / bottomRightSlope);
 
         if (d->antialiased) {
             const Q16Dot16 iTopFP = IntToQ16Dot16(int(topBound));
@@ -929,16 +954,16 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
             const Q16Dot16 iRightFP = IntToQ16Dot16(int(right.y()));
             const Q16Dot16 iBottomFP = IntToQ16Dot16(int(bottomBound));
 
-            Q16Dot16 leftIntersectAf = FloatToQ16Dot16(top.x() + (int(topBound) - top.y()) * leftSlope);
-            Q16Dot16 rightIntersectAf = FloatToQ16Dot16(top.x() + (int(topBound) - top.y()) * rightSlope);
+            Q16Dot16 leftIntersectAf = FloatToQ16Dot16(top.x() + (int(topBound) - top.y()) * topLeftSlope);
+            Q16Dot16 rightIntersectAf = FloatToQ16Dot16(top.x() + (int(topBound) - top.y()) * topRightSlope);
             Q16Dot16 leftIntersectBf = 0;
             Q16Dot16 rightIntersectBf = 0;
 
             if (iLeftFP < iTopFP)
-                leftIntersectBf = FloatToQ16Dot16(left.x() + (int(topBound) - left.y()) * rightSlope);
+                leftIntersectBf = FloatToQ16Dot16(left.x() + (int(topBound) - left.y()) * bottomLeftSlope);
 
             if (iRightFP < iTopFP)
-                rightIntersectBf = FloatToQ16Dot16(right.x() + (int(topBound) - right.y()) * leftSlope);
+                rightIntersectBf = FloatToQ16Dot16(right.x() + (int(topBound) - right.y()) * bottomRightSlope);
 
             Q16Dot16 rowTop, rowBottomLeft, rowBottomRight, rowTopLeft, rowTopRight, rowBottom;
             Q16Dot16 topLeftIntersectAf, topLeftIntersectBf, topRightIntersectAf, topRightIntersectBf;
@@ -953,9 +978,9 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
 
             rowTop = qMax(iTopFP, yTopFP);
             topLeftIntersectAf = leftIntersectAf +
-                                 Q16Dot16Multiply(leftSlopeFP, rowTop - iTopFP);
+                                 Q16Dot16Multiply(topLeftSlopeFP, rowTop - iTopFP);
             topRightIntersectAf = rightIntersectAf +
-                                  Q16Dot16Multiply(rightSlopeFP, rowTop - iTopFP);
+                                  Q16Dot16Multiply(topRightSlopeFP, rowTop - iTopFP);
 
             Q16Dot16 yFP = iTopFP;
             while (yFP <= iBottomFP) {
@@ -967,30 +992,30 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
 
                 if (yFP == iLeftFP) {
                     const int y = Q16Dot16ToInt(yFP);
-                    leftIntersectBf = FloatToQ16Dot16(left.x() + (y - left.y()) * rightSlope);
-                    topLeftIntersectBf = leftIntersectBf + Q16Dot16Multiply(rightSlopeFP, rowTopLeft - yFP);
-                    bottomLeftIntersectAf = leftIntersectAf + Q16Dot16Multiply(leftSlopeFP, rowBottomLeft - yFP);
+                    leftIntersectBf = FloatToQ16Dot16(left.x() + (y - left.y()) * bottomLeftSlope);
+                    topLeftIntersectBf = leftIntersectBf + Q16Dot16Multiply(bottomLeftSlopeFP, rowTopLeft - yFP);
+                    bottomLeftIntersectAf = leftIntersectAf + Q16Dot16Multiply(topLeftSlopeFP, rowBottomLeft - yFP);
                 } else {
                     topLeftIntersectBf = leftIntersectBf;
-                    bottomLeftIntersectAf = leftIntersectAf + leftSlopeFP;
+                    bottomLeftIntersectAf = leftIntersectAf + topLeftSlopeFP;
                 }
 
                 if (yFP == iRightFP) {
                     const int y = Q16Dot16ToInt(yFP);
-                    rightIntersectBf = FloatToQ16Dot16(right.x() + (y - right.y()) * leftSlope);
-                    topRightIntersectBf = rightIntersectBf + Q16Dot16Multiply(leftSlopeFP, rowTopRight - yFP);
-                    bottomRightIntersectAf = rightIntersectAf + Q16Dot16Multiply(rightSlopeFP, rowBottomRight - yFP);
+                    rightIntersectBf = FloatToQ16Dot16(right.x() + (y - right.y()) * bottomRightSlope);
+                    topRightIntersectBf = rightIntersectBf + Q16Dot16Multiply(bottomRightSlopeFP, rowTopRight - yFP);
+                    bottomRightIntersectAf = rightIntersectAf + Q16Dot16Multiply(topRightSlopeFP, rowBottomRight - yFP);
                 } else {
                     topRightIntersectBf = rightIntersectBf;
-                    bottomRightIntersectAf = rightIntersectAf + rightSlopeFP;
+                    bottomRightIntersectAf = rightIntersectAf + topRightSlopeFP;
                 }
 
                 if (yFP == iBottomFP) {
-                    bottomLeftIntersectBf = leftIntersectBf + Q16Dot16Multiply(rightSlopeFP, rowBottom - yFP);
-                    bottomRightIntersectBf = rightIntersectBf + Q16Dot16Multiply(leftSlopeFP, rowBottom - yFP);
+                    bottomLeftIntersectBf = leftIntersectBf + Q16Dot16Multiply(bottomLeftSlopeFP, rowBottom - yFP);
+                    bottomRightIntersectBf = rightIntersectBf + Q16Dot16Multiply(bottomRightSlopeFP, rowBottom - yFP);
                 } else {
-                    bottomLeftIntersectBf = leftIntersectBf + rightSlopeFP;
-                    bottomRightIntersectBf = rightIntersectBf + leftSlopeFP;
+                    bottomLeftIntersectBf = leftIntersectBf + bottomLeftSlopeFP;
+                    bottomRightIntersectBf = rightIntersectBf + bottomRightSlopeFP;
                 }
 
                 if (yFP < iLeftFP) {
@@ -1035,21 +1060,21 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
                     if (yFP <= iLeftFP)
                         excluded += intersectPixelFP(x, rowTop, rowBottomLeft,
                                                      bottomLeftIntersectAf, topLeftIntersectAf,
-                                                     leftSlopeFP, -rightSlopeFP);
+                                                     topLeftSlopeFP, invTopLeftSlopeFP);
                     if (yFP >= iLeftFP)
                         excluded += intersectPixelFP(x, rowTopLeft, rowBottom,
                                                      topLeftIntersectBf, bottomLeftIntersectBf,
-                                                     rightSlopeFP, -leftSlopeFP);
+                                                     bottomLeftSlopeFP, invBottomLeftSlopeFP);
 
                     if (x >= rightMin) {
                         if (yFP <= iRightFP)
                             excluded += (rowBottomRight - rowTop) - intersectPixelFP(x, rowTop, rowBottomRight,
                                                                                      topRightIntersectAf, bottomRightIntersectAf,
-                                                                                     rightSlopeFP, -leftSlopeFP);
+                                                                                     topRightSlopeFP, invTopRightSlopeFP);
                         if (yFP >= iRightFP)
                             excluded += (rowBottom - rowTopRight) - intersectPixelFP(x, rowTopRight, rowBottom,
                                                                                      bottomRightIntersectBf, topRightIntersectBf,
-                                                                                     leftSlopeFP, -rightSlopeFP);
+                                                                                     bottomRightSlopeFP, invBottomRightSlopeFP);
                     }
 
                     Q16Dot16 coverage = rowHeight - excluded;
@@ -1067,11 +1092,11 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
                     if (yFP <= iRightFP)
                         excluded += (rowBottomRight - rowTop) - intersectPixelFP(x, rowTop, rowBottomRight,
                                                                                  topRightIntersectAf, bottomRightIntersectAf,
-                                                                                 rightSlopeFP, -leftSlopeFP);
+                                                                                 topRightSlopeFP, invTopRightSlopeFP);
                     if (yFP >= iRightFP)
                         excluded += (rowBottom - rowTopRight) - intersectPixelFP(x, rowTopRight, rowBottom,
                                                                                  bottomRightIntersectBf, topRightIntersectBf,
-                                                                                 leftSlopeFP, -rightSlopeFP);
+                                                                                 bottomRightSlopeFP, invBottomRightSlopeFP);
 
                     Q16Dot16 coverage = rowHeight - excluded;
                     buffer.addSpan(x, 1, Q16Dot16ToInt(yFP),
@@ -1079,10 +1104,10 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
                     ++x;
                 }
 
-                leftIntersectAf += leftSlopeFP;
-                leftIntersectBf += rightSlopeFP;
-                rightIntersectAf += rightSlopeFP;
-                rightIntersectBf += leftSlopeFP;
+                leftIntersectAf += topLeftSlopeFP;
+                leftIntersectBf += bottomLeftSlopeFP;
+                rightIntersectAf += topRightSlopeFP;
+                rightIntersectBf += bottomRightSlopeFP;
                 topLeftIntersectAf = leftIntersectAf;
                 topRightIntersectAf = rightIntersectAf;
 
@@ -1096,10 +1121,10 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
             int iBottom = bottom.y() < 0.5f? -1 : int(bottom.y() - 0.5f);
             int iMiddle = qMin(iLeft, iRight);
 
-            Q16Dot16 leftIntersectAf = FloatToQ16Dot16(top.x() + 0.5f + (iTop + 0.5f - top.y()) * leftSlope);
-            Q16Dot16 leftIntersectBf = FloatToQ16Dot16(left.x() + 0.5f + (iLeft + 1.5f - left.y()) * rightSlope);
-            Q16Dot16 rightIntersectAf = FloatToQ16Dot16(top.x() - 0.5f + (iTop + 0.5f - top.y()) * rightSlope);
-            Q16Dot16 rightIntersectBf = FloatToQ16Dot16(right.x() - 0.5f + (iRight + 1.5f - right.y()) * leftSlope);
+            Q16Dot16 leftIntersectAf = FloatToQ16Dot16(top.x() + 0.5f + (iTop + 0.5f - top.y()) * topLeftSlope);
+            Q16Dot16 leftIntersectBf = FloatToQ16Dot16(left.x() + 0.5f + (iLeft + 1.5f - left.y()) * bottomLeftSlope);
+            Q16Dot16 rightIntersectAf = FloatToQ16Dot16(top.x() - 0.5f + (iTop + 0.5f - top.y()) * topRightSlope);
+            Q16Dot16 rightIntersectBf = FloatToQ16Dot16(right.x() - 0.5f + (iRight + 1.5f - right.y()) * bottomRightSlope);
 
             int ny;
             int y = iTop;
@@ -1121,10 +1146,10 @@ void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width,
                 ri += rs; \
              }
 
-            DO_SEGMENT(iMiddle, leftIntersectAf, rightIntersectAf, leftSlopeFP, rightSlopeFP)
-            DO_SEGMENT(iRight, leftIntersectBf, rightIntersectAf, rightSlopeFP, rightSlopeFP)
-            DO_SEGMENT(iLeft, leftIntersectAf, rightIntersectBf, leftSlopeFP, leftSlopeFP)
-            DO_SEGMENT(iBottom, leftIntersectBf, rightIntersectBf, rightSlopeFP, leftSlopeFP)
+            DO_SEGMENT(iMiddle, leftIntersectAf, rightIntersectAf, topLeftSlopeFP, topRightSlopeFP)
+            DO_SEGMENT(iRight, leftIntersectBf, rightIntersectAf, bottomLeftSlopeFP, topRightSlopeFP)
+            DO_SEGMENT(iLeft, leftIntersectAf, rightIntersectBf, topLeftSlopeFP, bottomRightSlopeFP);
+            DO_SEGMENT(iBottom, leftIntersectBf, rightIntersectBf, bottomLeftSlopeFP, bottomRightSlopeFP);
 #undef DO_SEGMENT
         }
     }
@@ -1176,12 +1201,6 @@ void QRasterizer::rasterize(const QT_FT_Outline *outline, Qt::FillRule fillRule)
     d->scanConverter.end();
 }
 
-static inline QT_FT_Vector PointToVector(const QPointF &p)
-{
-    QT_FT_Vector result = { QT_FT_Pos(p.x() * 64), QT_FT_Pos(p.y() * 64) };
-    return result;
-}
-
 void QRasterizer::rasterize(const QPainterPath &path, Qt::FillRule fillRule)
 {
     if (path.isEmpty())
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index a94c300..45f5c3e 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -3172,7 +3172,6 @@ void fpe_steepSlopes()
     p.setRenderHint(QPainter::Antialiasing, antialiased);
     p.setTransform(transform);
 
-    QEXPECT_FAIL("steep line 3 aa", "needs to be fixed", Continue);
     p.drawLine(line);
 }
 
-- 
cgit v0.12


From ee550b73ca47eeee2b2d745eaa28c8d0069190e5 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 27 Sep 2010 14:47:21 +0200
Subject: Fix assert when placing a .qml file inside $QTDIR/imports

The assert "Internal error: Plugin imported previously with different uri"
happens on Windows. $QTDIR\imports, which is prefixed to the
search path, is still written with backslashes. Unify this to forward
slashes for all paths.

Task-number:QTBUG-13994
Reviewed-by: mae
(cherry picked from commit 0aa6360b7648ddeb8a905960265eb46d8c12448f)
---
 src/declarative/qml/qdeclarativeimport.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 8f95e26..fe4ed48 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -876,6 +876,7 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path)
         cPath = dir.canonicalPath();
     } else {
         cPath = path;
+        cPath.replace(QLatin1Char('\\'), QLatin1Char('/'));
     }
 
     if (!cPath.isEmpty()
-- 
cgit v0.12


From d7e92cd6d44b6d0bc5157ba0dfd98e6627d45ed6 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 27 Sep 2010 16:15:40 +0300
Subject: Fixed incorrect snippet in BLD_INF_RULES documentation

Task-number: QTBUG-13988
Reviewed-by: TrustMe
(cherry picked from commit 1e4f736c2825c8c36ec74719efbc723f6374d072)
---
 doc/src/development/qmake-manual.qdoc           | 2 +-
 doc/src/snippets/code/doc_src_qmake-manual.qdoc | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index f4becf8..9f569e9 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1088,7 +1088,7 @@
 
     For example:
 
-    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 146
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 152
 
     This will add the specified statements to the \c prj_exports section of the 
     generated \c bld.inf file.
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 4ac7d5e..8c35c3f 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1002,3 +1002,10 @@ symbian {
 RSS_RULES.service_list += "uid = 0x12345678; datatype_list = \{\}; opaque_data = r_my_icon;"
 RSS_RULES.footer +="RESOURCE CAPTION_AND_ICON_INFO r_my_icon \{ icon_file =\"$$PWD/my_icon.svg\"; \}"
 //! [151]
+
+//! [152]
+my_exports = \
+    "foo.h /epoc32/include/mylib/foo.h" \
+    "bar.h /epoc32/include/mylib/bar.h"
+BLD_INF_RULES.prj_exports += my_exports
+//! [152]
-- 
cgit v0.12


From 5197ca2a89ce942a8991ceec50f7be89ff72455f Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 27 Sep 2010 15:39:18 +0300
Subject: Streamlined smart installer package creation

Previously manual editing of the pkg file was required to publish
application using smart installer. Now a proper app_installer.pkg
will  be created as long as application has protected range UID.
Also changed "make installer_sis" to always generate the application
sis as publishing process supports signing both application and its
smart installer wrapper packages in single step.

Task-number: QTBUG-13991
Reviewed-by: axis
(cherry picked from commit bc8409b9d04be54d98ca97d96c32473039f58a80)
---
 mkspecs/features/symbian/sis_targets.prf   |  4 ++--
 qmake/generators/symbian/symbiancommon.cpp | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf
index 800a04c..673127e 100644
--- a/mkspecs/features/symbian/sis_targets.prf
+++ b/mkspecs/features/symbian/sis_targets.prf
@@ -67,7 +67,7 @@ equals(GENERATE_SIS_TARGETS, true) {
                                         , \
                                             $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
                                         )
-        installer_sis_target.depends = $${baseTarget}.sis
+        installer_sis_target.depends = sis
 
         ok_installer_sis_target.target = ok_installer_sis
         ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
@@ -154,7 +154,7 @@ equals(GENERATE_SIS_TARGETS, true) {
         installer_sis_target.target = installer_sis
         installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
                                             $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
-        installer_sis_target.depends = $${sis_destdir}/$${baseTarget}.sis
+        installer_sis_target.depends = sis
 
         !isEmpty(sis_destdir):!equals(sis_destdir, "."):!equals(sis_destdir, "./") {
             sis_target.commands += && $$QMAKE_MOVE $${baseTarget}.sis $$sis_destdir
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index a60ae07..9af3fe4 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -178,8 +178,15 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
     QTextStream ts(&stubPkgFile);
 
     QString installerSisHeader = project->values("DEPLOYMENT.installer_header").join("\n");
-    if (installerSisHeader.isEmpty())
-        installerSisHeader = "0xA000D7CE"; // Use default self-signable UID if not defined
+    if (installerSisHeader.isEmpty()) {
+        // Use correct protected UID for publishing if application UID is in protected range,
+        // otherwise use self-signable test UID.
+        QRegExp protUidMatcher("0[xX][0-7].*");
+        if (protUidMatcher.exactMatch(uid3))
+            installerSisHeader = QLatin1String("0x2002CCCF");
+        else
+            installerSisHeader = QLatin1String("0xA000D7CE"); // Use default self-signable UID
+    }
 
     QString wrapperStreamBuffer;
     QTextStream tw(&wrapperStreamBuffer);
@@ -531,7 +538,7 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
         // Wrapped files deployment
         QString currentPath = qmake_getpwd();
         QString sisName = QString("%1.sis").arg(fixedTarget);
-        twf << "\"" << currentPath << "/" << sisName << "\" - \"c:\\private\\2002CCCE\\import\\" << sisName << "\"" << endl;
+        twf << "\"" << currentPath << "/" << sisName << "\" - \"!:\\private\\2002CCCE\\import\\" << sisName << "\"" << endl;
 
         QString bootStrapPath = QLibraryInfo::location(QLibraryInfo::PrefixPath);
         bootStrapPath.append("/smartinstaller.sis");
-- 
cgit v0.12


From f9312fec1c44097a2093b3075aa68901327eb9c5 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Wed, 29 Sep 2010 14:02:10 +0200
Subject: Fixes cursor shape when widget becomes native on X11.

When a native window handle is created for a widget that has override
cursor set, we should reset the cursor on the parent and set the cursor
on the new window handle.

Task-number: QTBUG-6185
Reviewed-by: Olivier Goffart
(cherry picked from commit 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba)
---
 src/gui/kernel/qwidget_x11.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index e01489f..8d80e10 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -889,8 +889,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
                 q->setWindowOpacity(maybeTopData()->opacity/255.);
 
         }
-    } else if (q->testAttribute(Qt::WA_SetCursor) && q->internalWinId()) {
+    } else if (q->internalWinId()) {
         qt_x11_enforce_cursor(q);
+        if (QWidget *p = q->parentWidget()) // reset the cursor on the native parent
+            qt_x11_enforce_cursor(p);
     }
 
     if (extra && !extra->mask.isEmpty() && q->internalWinId())
-- 
cgit v0.12


From 5efa6ff7ca33d2dca14418ac8ffb49b69e2e2452 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Thu, 30 Sep 2010 13:45:00 +0200
Subject: QAxBase::dynamicCall() returns invalid QVariant

Starting from 4.7.0, QVariant is recognized as a standard type by the
meta type system. ActiveQt needs to consider this while converting
COM VARIANT types to a QVariant.

Task-number: QTBUG-13845
Reviewed-by: Volker Hilsheimer
Reviewed-by: Olivier Goffart
(cherry picked from commit fc50d7ecaacfbfef1dbefd6ffdc083cb66c5633c)
---
 src/activeqt/shared/qaxtypes.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index 957733e..ff21a9f 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -1376,8 +1376,10 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
     }
     
     QVariant::Type proptype = (QVariant::Type)type;
-    if (proptype == QVariant::Invalid && !typeName.isEmpty())
-        proptype = QVariant::nameToType(typeName);
+    if (proptype == QVariant::Invalid && !typeName.isEmpty()) {
+        if (typeName != "QVariant")
+            proptype = QVariant::nameToType(typeName);
+    }
     if (proptype != QVariant::LastType && proptype != QVariant::Invalid && var.type() != proptype) {
         if (var.canConvert(proptype)) {
             QVariant oldvar = var;
-- 
cgit v0.12


From bb0d20406d5d1b473b9f8d9c1284d310405fcd47 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Tue, 28 Sep 2010 13:55:04 +1000
Subject: Fix crash when trying to append a null transform to QDeclarativeItem.

Task-number: QTBUG-13893
(cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
---
 src/declarative/graphicsitems/qdeclarativeitem.cpp          |  2 +-
 .../declarative/qdeclarativeitem/data/transformCrash.qml    | 13 +++++++++++++
 .../declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp   | 12 ++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index e9da4f7..230169d 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1705,7 +1705,7 @@ int QDeclarativeItemPrivate::transform_count(QDeclarativeListProperty<QGraphicsT
 void QDeclarativeItemPrivate::transform_append(QDeclarativeListProperty<QGraphicsTransform> *list, QGraphicsTransform *item)
 {
     QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
-    if (object) // QGraphicsItem applies the list in the wrong order, so we prepend.
+    if (object && item) // QGraphicsItem applies the list in the wrong order, so we prepend.
         QGraphicsItemPrivate::get(object)->prependGraphicsTransform(item);
 }
 
diff --git a/tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml b/tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml
new file mode 100644
index 0000000..ab7fa84
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml
@@ -0,0 +1,13 @@
+import Qt 4.7
+
+Item {
+    id: wrapper
+    width: 200
+    height: 200
+
+    QtObject {
+        id: object
+    }
+
+    Component.onCompleted: wrapper.transform = object
+}
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index 25ca157..6b28c53 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -81,6 +81,8 @@ private slots:
     void resourcesProperty();
     void mouseFocus();
 
+    void transformCrash();
+
 private:
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &objectName);
@@ -792,6 +794,16 @@ void tst_QDeclarativeItem::childrenRectBug3()
     delete canvas;
 }
 
+// QTBUG-13893
+void tst_QDeclarativeItem::transformCrash()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/transformCrash.qml"));
+    canvas->show();
+
+    delete canvas;
+}
+
 template<typename T>
 T *tst_QDeclarativeItem::findItem(QGraphicsObject *parent, const QString &objectName)
 {
-- 
cgit v0.12


From 916cc3ac7dde877ae8dd605f217699ecf9da06c6 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 30 Sep 2010 16:11:43 +0300
Subject: Added support for unsigned smart installer package creation in
 Symbian

Make target "unsigned_installer_sis" can now be used to create
unsigned smart installer sis. The contained application sis
will also be unsigned.

Task-number: QTBUG-13902
Reviewed-by: axis
(cherry picked from commit 6d5309c2fbdbf15948b430de103f393c5af5b7cd)
---
 bin/createpackage.pl                        | 27 +++++++++++++++++++++++++--
 doc/src/platforms/symbian-introduction.qdoc |  2 ++
 mkspecs/features/symbian/sis_targets.prf    | 24 ++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index cce0b54..72c61f6 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -148,6 +148,10 @@ my $certfilepath = abs_path(dirname($certfile));
 my $templatepkg = $ARGV[0];
 my $targetplatform = lc $ARGV[1];
 
+if ($targetplatform eq "") {
+    $targetplatform = "-";
+}
+
 my @tmpvalues = split('-', $targetplatform);
 my $target;
 $target = $tmpvalues[0] or $target = "";
@@ -179,11 +183,11 @@ $passphrase = $ARGV[4] or $passphrase = "";
 my $pkgoutputbasename = $templatepkg;
 my $preservePkgOutput = "";
 $pkgoutputbasename =~ s/_template/_$targetplatform/g;
+$pkgoutputbasename =~ s/_installer\.pkg/_installer___temp\.pkg/g;
 if ($pkgoutputbasename eq $templatepkg) {
     $preservePkgOutput = "1";
 }
 $pkgoutputbasename =~ s/\.pkg//g;
-$pkgoutputbasename = $pkgoutputbasename;
 
 # Store output file names to variables
 my $pkgoutput = $pkgoutputbasename.".pkg";
@@ -191,6 +195,7 @@ my $sisoutputbasename;
 if ($signed_sis_name eq "") {
     $sisoutputbasename = $pkgoutputbasename;
     $sisoutputbasename =~ s/_$targetplatform//g;
+    $sisoutputbasename =~ s/_installer___temp/_installer/g;
     $signed_sis_name = $sisoutputbasename.".sis";
 } else {
     $sisoutputbasename = $signed_sis_name;
@@ -201,6 +206,16 @@ if ($signed_sis_name eq "") {
     }
 }
 
+my $installer_unsigned_app_sis_name = "";
+my $installer_app_sis_name = "";
+
+if ($templatepkg =~ m/_installer\.pkg$/i && $onlyUnsigned) {
+    $installer_unsigned_app_sis_name = $templatepkg;
+    $installer_unsigned_app_sis_name =~ s/_installer.pkg$/_unsigned.sis/i;
+    $installer_app_sis_name = $installer_unsigned_app_sis_name;
+    $installer_app_sis_name =~ s/_unsigned.sis$/.sis/;
+}
+
 my $unsigned_sis_name = $sisoutputbasename."_unsigned.sis";
 my $stub_sis_name = $sisoutputbasename.".sis";
 
@@ -271,7 +286,9 @@ if (length($certfile)) {
 
 # Remove any existing .sis packages
 unlink $unsigned_sis_name;
-unlink $signed_sis_name;
+if (!$onlyUnsigned) {
+    unlink $signed_sis_name;
+}
 if (!$preservePkgOutput) {
     unlink $pkgoutput;
 }
@@ -296,6 +313,10 @@ if (m/\$\(PLATFORM\)/) {
 s/\$\(PLATFORM\)/$platform/gm;
 s/\$\(TARGET\)/$target/gm;
 
+if ($installer_unsigned_app_sis_name ne "") {
+    s/$installer_app_sis_name\"/$installer_unsigned_app_sis_name\"/;
+}
+
 #write the output
 open( OUTPUT, ">$pkgoutput" ) or die "Error '$pkgoutput' $!\n";
 print OUTPUT $_;
@@ -347,6 +368,7 @@ if($stub) {
         if (!$preservePkgOutput) {
             unlink $pkgoutput;
         }
+        print ("\n");
         exit;
     }
 
@@ -388,6 +410,7 @@ if($stub) {
         # Lets leave the generated PKG for problem solving purposes
         print ("\nSIS creation failed!\n");
     }
+    print ("\n");
 }
 
 #end of file
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index fafe007..9bf5c72 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -144,6 +144,8 @@
                                 Smart installer will attempt to download
                                 missing dependencies in addition to
                                 just installing the application.
+    \row \o \c unsigned_installer_sis \o Create unsigned \l{Smart Installer}{smart installer}
+                                         \c .sis file for project.
     \row \o \c stub_sis      \o Create a stub sis to allow upgradability of projects
                                 that are deployed in ROM
     \endtable
diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf
index 673127e..b145263 100644
--- a/mkspecs/features/symbian/sis_targets.prf
+++ b/mkspecs/features/symbian/sis_targets.prf
@@ -73,6 +73,17 @@ equals(GENERATE_SIS_TARGETS, true) {
         ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
                                                $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
+        unsigned_installer_sis_target.target = unsigned_installer_sis
+        unsigned_installer_sis_target.commands = $(if $(wildcard $${baseTarget}_installer.pkg), \
+                                            $(MAKE) -f $(MAKEFILE) ok_unsigned_installer_sis \
+                                        , \
+                                            $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
+                                        )
+        unsigned_installer_sis_target.depends = unsigned_sis
+
+        ok_unsigned_installer_sis_target.target = ok_unsigned_installer_sis
+        ok_unsigned_installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg
+
         fail_sis_nopkg_target.target = fail_sis_nopkg
         fail_sis_nopkg_target.commands = "$(error PKG file does not exist, 'sis' and 'installer_sis' target are only supported for executables or projects with DEPLOYMENT statement)"
 
@@ -105,6 +116,8 @@ equals(GENERATE_SIS_TARGETS, true) {
                                target_sis_target \
                                installer_sis_target \
                                ok_installer_sis_target \
+                               unsigned_installer_sis_target \
+                               ok_unsigned_installer_sis_target \
                                fail_sis_nopkg_target \
                                fail_sis_nocache_target \
                                stub_sis_target \
@@ -156,15 +169,22 @@ equals(GENERATE_SIS_TARGETS, true) {
                                             $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
         installer_sis_target.depends = sis
 
+        unsigned_installer_sis_target.target = unsigned_installer_sis
+        unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg
+        unsigned_installer_sis_target.depends = unsigned_sis
+
         !isEmpty(sis_destdir):!equals(sis_destdir, "."):!equals(sis_destdir, "./") {
             sis_target.commands += && $$QMAKE_MOVE $${baseTarget}.sis $$sis_destdir
-            installer_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}.sis $$sis_destdir
+            unsigned_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}_unsigned.sis $$sis_destdir
+            installer_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}_installer.sis $$sis_destdir
+            unsigned_installer_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}_unsigned_installer.sis $$sis_destdir
         }
 
         QMAKE_EXTRA_TARGETS += sis_target \
                                unsigned_sis_target \
                                target_sis_target \
-                               installer_sis_target
+                               installer_sis_target \
+                               unsigned_installer_sis_target
 
         QMAKE_DISTCLEAN += $${sis_destdir}/$${baseTarget}.sis
     }
-- 
cgit v0.12


From 664fc515072b58765bb35da0920ab4858cf478aa Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 27 Sep 2010 10:56:00 +0200
Subject: QDeclarativeDebugService: Add bc autotest

Although it's a private header we use qdeclarativedebugservice_p.h in
creator / qmljsdebugger library. Working with a copy of the header in
the autotest hopefully catches some bc breakages.
(cherry picked from commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135)
---
 .../private_headers/qdeclarativedebugservice_p.h   | 92 ++++++++++++++++++++++
 .../qdeclarativedebugservice.pro                   |  3 +-
 .../tst_qdeclarativedebugservice.cpp               |  2 +-
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h

diff --git a/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h b/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h
new file mode 100644
index 0000000..0cadbe5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDEBUGSERVICE_H
+#define QDECLARATIVEDEBUGSERVICE_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeDebugServicePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeDebugService)
+    Q_DISABLE_COPY(QDeclarativeDebugService)
+
+public:
+    explicit QDeclarativeDebugService(const QString &, QObject *parent = 0);
+    ~QDeclarativeDebugService();
+
+    QString name() const;
+
+    enum Status { NotConnected, Unavailable, Enabled };
+    Status status() const;
+
+    void sendMessage(const QByteArray &);
+
+    static int idForObject(QObject *);
+    static QObject *objectForId(int);
+
+    static QString objectToString(QObject *obj);
+
+    static bool isDebuggingEnabled();
+    static bool hasDebuggingClient();
+
+protected:
+    virtual void statusChanged(Status);
+    virtual void messageReceived(const QByteArray &);
+
+private:
+    friend class QDeclarativeDebugServer;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGSERVICE_H
+
diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
index a62e148..83bcadb 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
+++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
@@ -2,7 +2,8 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
-HEADERS += ../shared/debugutil_p.h
+HEADERS += ../shared/debugutil_p.h \
+	   private_headers/qdeclarativedebugservice_p.h
 SOURCES += tst_qdeclarativedebugservice.cpp \
            ../shared/debugutil.cpp
 
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 4683199..70679b9 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -50,8 +50,8 @@
 #include <private/qdeclarativedebug_p.h>
 #include <private/qdeclarativeenginedebug_p.h>
 #include <private/qdeclarativedebugclient_p.h>
-#include <private/qdeclarativedebugservice_p.h>
 
+#include "private_headers/qdeclarativedebugservice_p.h"
 #include "../../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
-- 
cgit v0.12


From bc93f0cb3af281957101b1427635044ac94dac5d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 28 Sep 2010 14:53:44 +0200
Subject: fix moc argument quoting on mingw

for some bizarre reason, mingw doesn't like double quotes.
so instead of building some more elaborate custom quoting, just let
qmake do it for us.

Reviewed-by: mariusSO
(cherry picked from commit fa5c83003db5dea46fc045b2fd90e6308a0d8911)
---
 mkspecs/features/moc.prf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 15e7fd9..89e9b40 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -39,22 +39,22 @@ win32:count($$list($$INCLUDEPATH), 40, >) {
     }
 }
 
-defineReplace(mocCmd) {
+defineReplace(mocCmdBase) {
     !isEmpty(WIN_INCLUDETEMP) {
         RET =
         if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
             RET += $$mocinclude.commands
         }
-        RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2
+        RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D)
         return($$RET)
     }
-    return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2)
+    return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D))
 }
 
 #moc headers
 moc_header.CONFIG = moc_verify
 moc_header.dependency_type = TYPE_C
-moc_header.commands = ${QMAKE_FUNC_mocCmd}
+moc_header.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
 moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)}
 moc_header.input = HEADERS
 moc_header.variable_out = SOURCES
@@ -69,7 +69,7 @@ INCREDIBUILD_XGE += moc_header
 #moc sources
 moc_source.CONFIG = no_link moc_verify
 moc_source.dependency_type = TYPE_C
-moc_source.commands = ${QMAKE_FUNC_mocCmd}
+moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
 moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC}
 moc_source.input = SOURCES OBJECTIVE_SOURCES
 moc_source.name = MOC ${QMAKE_FILE_IN}
-- 
cgit v0.12


From 89f383cdd9aa9d928341b15f99ecd9396b2f43cb Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 30 Sep 2010 10:42:21 +0300
Subject: Fix QApplication::desktop()->availableGeometry() for Symbian

Since screen geometry changes before client area geometry is
changed in Eikon, we need to send two resize events, one for screen
area change and one for client area change.

Note that the correct way to detect client area change in applications
is to connect to QApplication::desktop() signal workAreaResized(int)
instead of filtering for resize events meant for QDesktopWidget.

Task-number: QTBUG-14058
Reviewed-by: Jason Barron
(cherry picked from commit 0725abc4607755833a1eb7cb9e083add48d03a88)
---
 src/gui/kernel/qapplication_s60.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index e937918..988823b 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -673,6 +673,9 @@ void QSymbianControl::HandleStatusPaneSizeChange()
 {
     QS60MainAppUi *s60AppUi = static_cast<QS60MainAppUi *>(S60->appUi());
     s60AppUi->HandleStatusPaneSizeChange();
+    // Send resize event to trigger desktopwidget workAreaResized signal
+    QResizeEvent e(qt_desktopWidget->size(), qt_desktopWidget->size());
+    QApplication::sendEvent(qt_desktopWidget, &e);
 }
 #endif
 
-- 
cgit v0.12


From 4175e45658abd6913b5152a7637f8a23477b7c2d Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 27 Sep 2010 13:37:14 +0200
Subject: Fixed regression when typing in QTextControl based widgets on Symbian

The bug was that when querying for the maximum text length, the case
where an invalid QVariant was returned (which is allowed) was not
handled properly. This would lead to input being blocked by the input
context when it shouldn't.

RevBy:    Sami Merila
(cherry picked from commit 3bb3af84bef3c0472ca8ed0d5c6bb3c82320956d)
---
 src/gui/inputmethod/qcoefepinputcontext_s60.cpp |   6 +-
 tests/auto/qinputcontext/tst_qinputcontext.cpp  | 257 +++++++++++++++++++-----
 2 files changed, 208 insertions(+), 55 deletions(-)

diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index af86d77..4a1b9b9 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -238,8 +238,10 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event)
         }
 
         QString widgetText = focusWidget()->inputMethodQuery(Qt::ImSurroundingText).toString();
-        int maxLength = focusWidget()->inputMethodQuery(Qt::ImMaximumTextLength).toInt();
-        if (!keyEvent->text().isEmpty() && widgetText.size() + m_preeditString.size() >= maxLength) {
+        bool validLength;
+        int maxLength = focusWidget()->inputMethodQuery(Qt::ImMaximumTextLength).toInt(&validLength);
+        if (!keyEvent->text().isEmpty() && validLength
+                && widgetText.size() + m_preeditString.size() >= maxLength) {
             // Don't send key events with string content if the widget is "full".
             return true;
         }
diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp
index d077bc1..700a49b 100644
--- a/tests/auto/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp
@@ -67,6 +67,8 @@ public:
     tst_QInputContext() : m_phoneIsQwerty(false) {}
     virtual ~tst_QInputContext() {}
 
+    template <class WidgetType> void symbianTestCoeFepInputContext_addData();
+
 public slots:
     void initTestCase();
     void cleanupTestCase() {}
@@ -467,6 +469,7 @@ void tst_QInputContext::focusProxy()
 void tst_QInputContext::symbianTestCoeFepInputContext_data()
 {
 #ifdef Q_OS_SYMBIAN
+    QTest::addColumn<QWidget *>              ("editwidget");
     QTest::addColumn<bool>                   ("inputMethodEnabled");
     QTest::addColumn<Qt::InputMethodHints>   ("inputMethodHints");
     QTest::addColumn<int>                    ("maxLength"); // Zero for no limit
@@ -474,7 +477,23 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     QTest::addColumn<QList<FepReplayEvent> > ("keyEvents");
     QTest::addColumn<QString>                ("finalString");
     QTest::addColumn<QString>                ("preeditString");
+
+    symbianTestCoeFepInputContext_addData<QLineEdit>();
+    symbianTestCoeFepInputContext_addData<QPlainTextEdit>();
+    symbianTestCoeFepInputContext_addData<QTextEdit>();
+#endif
+}
+
+Q_DECLARE_METATYPE(QWidget *)
+Q_DECLARE_METATYPE(QLineEdit *)
+Q_DECLARE_METATYPE(QPlainTextEdit *)
+Q_DECLARE_METATYPE(QTextEdit *)
+
+template <class WidgetType>
+void tst_QInputContext::symbianTestCoeFepInputContext_addData()
+{
     QList<FepReplayEvent> events;
+    QWidget *editwidget;
 
     events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0);
     events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0);
@@ -487,7 +506,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0);
     events << FepReplayEvent('2', '2', 0, 0);
     events << FepReplayEvent('1', '1', 0, 0);
-    QTest::newRow("Numbers (no FEP)")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers (no FEP)").toLocal8Bit())
+            << editwidget
             << false
             << Qt::InputMethodHints(Qt::ImhNone)
             << 0
@@ -495,7 +517,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("521")
             << QString("");
-    QTest::newRow("Numbers and password mode (no FEP)")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers and password mode (no FEP)").toLocal8Bit())
+            << editwidget
             << false
             << Qt::InputMethodHints(Qt::ImhNone)
             << 0
@@ -503,7 +528,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("521")
             << QString("");
-    QTest::newRow("Numbers")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 0
@@ -511,7 +539,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("521")
             << QString("");
-    QTest::newRow("Numbers max length (no FEP)")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers max length (no FEP)").toLocal8Bit())
+            << editwidget
             << false
             << Qt::InputMethodHints(Qt::ImhNone)
             << 2
@@ -519,7 +550,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("21")
             << QString("");
-    QTest::newRow("Numbers max length")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers max length").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 2
@@ -534,7 +568,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent(EEventKey, '5', '5', 0, 1);
     events << FepReplayEvent(EEventKey, '5', '5', 0, 1);
     events << FepReplayEvent(EEventKeyUp, '5', 0, 0, 0);
-    QTest::newRow("Numbers and autorepeat (no FEP)")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers and autorepeat (no FEP)").toLocal8Bit())
+            << editwidget
             << false
             << Qt::InputMethodHints(Qt::ImhNone)
             << 0
@@ -552,7 +589,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent('5', '5', 0, 0);
     events << FepReplayEvent('5', '5', 0, 0);
     events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0);
-    QTest::newRow("Multitap")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText)
             << 0
@@ -560,7 +600,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("Adh")
             << QString("");
-    QTest::newRow("Multitap with no auto uppercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with no auto uppercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase)
             << 0
@@ -568,7 +611,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("adh")
             << QString("");
-    QTest::newRow("Multitap with uppercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with uppercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferUppercase)
             << 0
@@ -576,7 +622,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("ADH")
             << QString("");
-    QTest::newRow("Multitap with lowercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with lowercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase)
             << 0
@@ -584,7 +633,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("adh")
             << QString("");
-    QTest::newRow("Multitap with forced uppercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with forced uppercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhUppercaseOnly)
             << 0
@@ -592,7 +644,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("ADH")
             << QString("");
-    QTest::newRow("Multitap with forced lowercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with forced lowercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhLowercaseOnly)
             << 0
@@ -611,7 +666,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent('5', '5', 0, 0);
     events << FepReplayEvent('5', '5', 0, 0);
     events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0);
-    QTest::newRow("Multitap with mode switch")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with mode switch").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText)
             << 0
@@ -626,7 +684,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent('8', '8', 0, 0);
     events << FepReplayEvent('9', '9', 0, 0);
     events << FepReplayEvent('9', '9', 0, 0);
-    QTest::newRow("Multitap with unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText)
             << 0
@@ -635,7 +696,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << QString("Qt")
             << QString("x");
     events << FepReplayEvent(2000);
-    QTest::newRow("Multitap with committed text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with committed text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText)
             << 0
@@ -671,7 +735,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent('8', '8', 0, 0);
     events << FepReplayEvent(2000);
     events << FepReplayEvent(EStdKeyDevice3, EKeyDevice3, 0, 0); // Select key
-    QTest::newRow("Multitap and numbers")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap and numbers").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText)
             << 0
@@ -679,7 +746,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("H778wmt")
             << QString("");
-    QTest::newRow("T9 and numbers")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 and numbers").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 0
@@ -692,7 +762,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent('4', '4', 0, 0);
     events << FepReplayEvent('4', '4', 0, 0);
     events << FepReplayEvent(EStdKeyDevice3, EKeyDevice3, 0, 0); // Select key
-    QTest::newRow("T9")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 0
@@ -700,7 +773,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("hi")
             << QString("");
-    QTest::newRow("T9 with uppercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with uppercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferUppercase)
             << 0
@@ -708,7 +784,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("HI")
             << QString("");
-    QTest::newRow("T9 with forced lowercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with forced lowercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhLowercaseOnly)
             << 0
@@ -716,7 +795,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("hi")
             << QString("");
-    QTest::newRow("T9 with forced uppercase")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with forced uppercase").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhUppercaseOnly)
             << 0
@@ -724,7 +806,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("HI")
             << QString("");
-    QTest::newRow("T9 with maxlength")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with maxlength").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhLowercaseOnly)
             << 1
@@ -746,7 +831,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     events << FepReplayEvent(EStdKeyRightArrow, EKeyRightArrow, 0, 0);
     events << FepReplayEvent('8', '8', 0, 0);
     events << FepReplayEvent('8', '8', 0, 0);
-    QTest::newRow("T9 with movement and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with movement and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 0
@@ -754,7 +842,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("you hi")
             << QString("tv");
-    QTest::newRow("T9 with movement, password and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with movement, password and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 0
@@ -762,7 +853,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wmt h")
             << QString("u");
-    QTest::newRow("T9 with movement, maxlength, password and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with movement, maxlength, password and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 2
@@ -770,7 +864,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wh")
             << QString("");
-    QTest::newRow("T9 with movement, maxlength and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with movement, maxlength and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 2
@@ -778,7 +875,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("hi")
             << QString("");
-    QTest::newRow("Multitap with movement and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with movement and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase)
             << 0
@@ -786,7 +886,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wmt h")
             << QString("u");
-    QTest::newRow("Multitap with movement, maxlength and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with movement, maxlength and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase)
             << 2
@@ -794,7 +897,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wh")
             << QString("");
-    QTest::newRow("Numbers with movement")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers with movement").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 0
@@ -802,7 +908,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("96804488")
             << QString("");
-    QTest::newRow("Numbers with movement and maxlength")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers with movement and maxlength").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 2
@@ -810,7 +919,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("44")
             << QString("");
-    QTest::newRow("Numbers with movement, password and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers with movement, password and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 0
@@ -818,7 +930,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("9680448")
             << QString("8");
-    QTest::newRow("Numbers with movement, maxlength, password and unfinished text")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers with movement, maxlength, password and unfinished text").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 2
@@ -827,7 +942,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << QString("44")
             << QString("");
     events << FepReplayEvent(EStdKeyRightArrow, EKeyRightArrow, 0, 0);
-    QTest::newRow("T9 with movement")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with movement").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 0
@@ -835,7 +953,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("you htvi")
             << QString("");
-    QTest::newRow("T9 with movement and password")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with movement and password").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 0
@@ -843,7 +964,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wmt hu")
             << QString("");
-    QTest::newRow("T9 with movement, maxlength and password")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": T9 with movement, maxlength and password").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhPreferLowercase)
             << 2
@@ -851,7 +975,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wh")
             << QString("");
-    QTest::newRow("Multitap with movement")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with movement").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase)
             << 0
@@ -859,7 +986,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wmt hu")
             << QString("");
-    QTest::newRow("Multitap with movement and maxlength")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Multitap with movement and maxlength").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase)
             << 2
@@ -867,7 +997,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("wh")
             << QString("");
-    QTest::newRow("Numbers with movement and password")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers with movement and password").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 0
@@ -875,7 +1008,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("96804488")
             << QString("");
-    QTest::newRow("Numbers with movement, maxlength and password")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Numbers with movement, maxlength and password").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 2
@@ -888,7 +1024,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     // Test that the symbol key successfully does nothing when in number-only mode.
     events << FepReplayEvent(EEventKeyDown, EStdKeyLeftFunc, 0, 0, 0);
     events << FepReplayEvent(EEventKeyUp, EStdKeyLeftFunc, 0, 0, 0);
-    QTest::newRow("Dead symbols key")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Dead symbols key").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 0
@@ -896,7 +1035,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << events
             << QString("")
             << QString("");
-    QTest::newRow("Dead symbols key and password")
+    editwidget = new WidgetType;
+    QTest::newRow(QString(QString::fromLatin1(editwidget->metaObject()->className())
+            + ": Dead symbols key and password").toLocal8Bit())
+            << editwidget
             << true
             << Qt::InputMethodHints(Qt::ImhDigitsOnly)
             << 0
@@ -905,7 +1047,6 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
             << QString("")
             << QString("");
     events.clear();
-#endif
 }
 
 void tst_QInputContext::symbianTestCoeFepInputContext()
@@ -918,6 +1059,7 @@ void tst_QInputContext::symbianTestCoeFepInputContext()
         QSKIP("coefep is not the active input context; skipping test", SkipAll);
     }
 
+    QFETCH(QWidget *,             editwidget);
     QFETCH(bool,                  inputMethodEnabled);
     QFETCH(Qt::InputMethodHints,  inputMethodHints);
     QFETCH(int,                   maxLength);
@@ -933,30 +1075,39 @@ void tst_QInputContext::symbianTestCoeFepInputContext()
     QWidget w;
     QLayout *layout = new QVBoxLayout;
     w.setLayout(layout);
-    QLineEdit *lineedit = new QLineEdit;
-    layout->addWidget(lineedit);
-    lineedit->setFocus();
+
+    layout->addWidget(editwidget);
+    editwidget->setFocus();
 #ifdef QT_KEYPAD_NAVIGATION
-    lineedit->setEditFocus(true);
+    editwidget->setEditFocus(true);
 #endif
     w.show();
 
-    lineedit->setAttribute(Qt::WA_InputMethodEnabled, inputMethodEnabled);
-    lineedit->setInputMethodHints(inputMethodHints);
-    if (maxLength > 0)
-        lineedit->setMaxLength(maxLength);
-    lineedit->setEchoMode(echoMode);
+    editwidget->setAttribute(Qt::WA_InputMethodEnabled, inputMethodEnabled);
+    editwidget->setInputMethodHints(inputMethodHints);
+    QLineEdit *lineedit = qobject_cast<QLineEdit *>(editwidget);
+    if (lineedit) {
+        if (maxLength > 0)
+            lineedit->setMaxLength(maxLength);
+        lineedit->setEchoMode(echoMode);
+    } else if (maxLength > 0 || echoMode != QLineEdit::Normal) {
+        // Only QLineEdits support these features so don't attempt any tests using those
+        // on other widgets.
+        return;
+    }
 
     QTest::qWait(200);
 
     foreach(FepReplayEvent event, keyEvents) {
-        event.replay(lineedit);
+        event.replay(editwidget);
     }
 
     QApplication::processEvents();
 
-    QCOMPARE(lineedit->text(), finalString);
+    QCOMPARE(editwidget->inputMethodQuery(Qt::ImSurroundingText).toString(), finalString);
     QCOMPARE(ic->m_preeditString, preeditString);
+
+    delete editwidget;
 #endif
 }
 
-- 
cgit v0.12


From 2548104448577f7e87d10c827ef464a62e6d8fc6 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Tue, 28 Sep 2010 08:21:13 +0200
Subject: Fixed compile error on non-Symbian platforms. (cherry picked from
 commit 3e3ce984b54a0b199bf5d4f5e3dcb0a9d5b5bd79)

---
 tests/auto/qinputcontext/tst_qinputcontext.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp
index 700a49b..7811a53 100644
--- a/tests/auto/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp
@@ -492,6 +492,7 @@ Q_DECLARE_METATYPE(QTextEdit *)
 template <class WidgetType>
 void tst_QInputContext::symbianTestCoeFepInputContext_addData()
 {
+#ifdef Q_OS_SYMBIAN
     QList<FepReplayEvent> events;
     QWidget *editwidget;
 
@@ -1047,6 +1048,7 @@ void tst_QInputContext::symbianTestCoeFepInputContext_addData()
             << QString("")
             << QString("");
     events.clear();
+#endif
 }
 
 void tst_QInputContext::symbianTestCoeFepInputContext()
-- 
cgit v0.12


From 837e4024556c74a031acad87e9dd5972d5ef81ef Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 28 Sep 2010 18:50:18 +1000
Subject: If a type is registered under several names, share the attached
 property object

Task-number: QTBUG-13799
(cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)
---
 .../qml/qdeclarativecompiledbindings.cpp           | 10 ++++-----
 src/declarative/qml/qdeclarativecompiler.cpp       |  2 +-
 src/declarative/qml/qdeclarativemetatype.cpp       | 25 +++++++++++++++++++++-
 src/declarative/qml/qdeclarativemetatype_p.h       |  1 +
 src/declarative/qml/qdeclarativeproperty.cpp       |  4 ++--
 .../qml/qdeclarativetypenamescriptclass.cpp        |  2 +-
 .../data/sharedAttachedObject.qml                  | 16 ++++++++++++++
 .../qdeclarativeecmascript/testtypes.cpp           |  1 +
 .../tst_qdeclarativeecmascript.cpp                 | 11 ++++++++++
 9 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml

diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 9402596..5f0fd56 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -438,7 +438,7 @@ struct Instr {
             qint8 output;
             qint8 reg;
             quint8 exceptionId;
-            quint32 index;
+            quint32 id;
         } attached;
         struct {
             QML_INSTR_HEADER
@@ -988,7 +988,7 @@ static void dumpInstruction(const Instr *instr)
         qWarning().nospace() << "\t" << "LoadRoot" << "\t\t" << instr->load.index << "\t" << instr->load.reg;
         break;
     case Instr::LoadAttached:
-        qWarning().nospace() << "\t" << "LoadAttached" << "\t\t" << instr->attached.output << "\t" << instr->attached.reg << "\t" << instr->attached.index;
+        qWarning().nospace() << "\t" << "LoadAttached" << "\t\t" << instr->attached.output << "\t" << instr->attached.reg << "\t" << instr->attached.id;
         break;
     case Instr::ConvertIntToReal:
         qWarning().nospace() << "\t" << "ConvertIntToReal" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
@@ -1225,7 +1225,7 @@ void QDeclarativeCompiledBindingsPrivate::run(int instrIndex,
             output.setUndefined();
         } else {
             QObject *attached = 
-                qmlAttachedPropertiesObjectById(instr->attached.index, 
+                qmlAttachedPropertiesObjectById(instr->attached.id, 
                                                 registers[instr->attached.reg].getQObject(), 
                                                 true);
             Q_ASSERT(attached);
@@ -1895,7 +1895,7 @@ bool QDeclarativeBindingCompilerPrivate::parseName(AST::Node *node, Result &type
                 attach.common.type = Instr::LoadAttached;
                 attach.attached.output = reg;
                 attach.attached.reg = reg;
-                attach.attached.index = attachType->index();
+                attach.attached.id = attachType->attachedPropertiesId();
                 attach.attached.exceptionId = exceptionId(nameNodes.at(ii));
                 bytecode << attach;
 
@@ -2011,7 +2011,7 @@ bool QDeclarativeBindingCompilerPrivate::parseName(AST::Node *node, Result &type
                 attach.common.type = Instr::LoadAttached;
                 attach.attached.output = reg;
                 attach.attached.reg = reg;
-                attach.attached.index = attachType->index();
+                attach.attached.id = attachType->attachedPropertiesId();
                 bytecode << attach;
 
                 absType = 0;
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index e55dc92..8c5fd3a 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1407,7 +1407,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeParser::Property *prop,
             COMPILE_EXCEPTION(prop, tr("Invalid attached object assignment"));
 
         Q_ASSERT(type->attachedPropertiesFunction());
-        prop->index = type->index();
+        prop->index = type->attachedPropertiesId();
         prop->value->metatype = type->attachedPropertiesType();
     } else {
         // Setup regular property data
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index a5c878f..7a78a1f 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -146,6 +146,7 @@ public:
     const QMetaObject *m_baseMetaObject;
     QDeclarativeAttachedPropertiesFunc m_attachedPropertiesFunc;
     const QMetaObject *m_attachedPropertiesType;
+    int m_attachedPropertiesId;
     int m_parserStatusCast;
     int m_propertyValueSourceCast;
     int m_propertyValueInterceptorCast;
@@ -155,8 +156,12 @@ public:
     QDeclarativeCustomParser *m_customParser;
     mutable volatile bool m_isSetup:1;
     mutable QList<QDeclarativeProxyMetaObject::ProxyData> m_metaObjects;
+
+    static QHash<const QMetaObject *, int> m_attachedPropertyIds;
 };
 
+QHash<const QMetaObject *, int> QDeclarativeTypePrivate::m_attachedPropertyIds;
+
 QDeclarativeTypePrivate::QDeclarativeTypePrivate()
 : m_isInterface(false), m_iid(0), m_typeId(0), m_listId(0), 
   m_allocationSize(0), m_newFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), m_attachedPropertiesType(0),
@@ -198,6 +203,14 @@ QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::Registe
     d->m_baseMetaObject = type.metaObject;
     d->m_attachedPropertiesFunc = type.attachedPropertiesFunction;
     d->m_attachedPropertiesType = type.attachedPropertiesMetaObject;
+    if (d->m_attachedPropertiesType) {
+        QHash<const QMetaObject *, int>::Iterator iter = d->m_attachedPropertyIds.find(d->m_baseMetaObject);
+        if (iter == d->m_attachedPropertyIds.end())
+            iter = d->m_attachedPropertyIds.insert(d->m_baseMetaObject, index);
+        d->m_attachedPropertiesId = *iter;
+    } else {
+        d->m_attachedPropertiesId = -1;
+    }
     d->m_parserStatusCast = type.parserStatusCast;
     d->m_propertyValueSourceCast = type.valueSourceCast;
     d->m_propertyValueInterceptorCast = type.valueInterceptorCast;
@@ -461,6 +474,16 @@ const QMetaObject *QDeclarativeType::attachedPropertiesType() const
     return d->m_attachedPropertiesType;
 }
 
+/*
+This is the id passed to qmlAttachedPropertiesById().  This is different from the index
+for the case that a single class is registered under two or more names (eg. Item in 
+Qt 4.7 and QtQuick 1.0).
+*/
+int QDeclarativeType::attachedPropertiesId() const
+{
+    return d->m_attachedPropertiesId;
+}
+
 int QDeclarativeType::parserStatusCast() const
 {
     return d->m_parserStatusCast;
@@ -662,7 +685,7 @@ int QDeclarativeMetaType::attachedPropertiesFuncId(const QMetaObject *mo)
 
     QDeclarativeType *type = data->metaObjectToType.value(mo);
     if (type && type->attachedPropertiesFunction())
-        return type->index();
+        return type->attachedPropertiesId();
     else
         return -1;
 }
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index f410547..382abd2 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -137,6 +137,7 @@ public:
 
     QDeclarativeAttachedPropertiesFunc attachedPropertiesFunction() const;
     const QMetaObject *attachedPropertiesType() const;
+    int attachedPropertiesId() const;
 
     int parserStatusCast() const;
     QVariant fromObject(QObject *) const;
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index d0dd2e8..bc20bff 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -220,7 +220,7 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
                 QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
                 if (!func) return; // Not an attachable type
 
-                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                currentObject = qmlAttachedPropertiesObjectById(data->type->attachedPropertiesId(), currentObject);
                 if (!currentObject) return; // Something is broken with the attachable type
             } else {
                 Q_ASSERT(data->typeNamespace);
@@ -232,7 +232,7 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
                 QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
                 if (!func) return; // Not an attachable type
 
-                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                currentObject = qmlAttachedPropertiesObjectById(data->type->attachedPropertiesId(), currentObject);
                 if (!currentObject) return; // Something is broken with the attachable type
             }
         } else {
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
index 764a8db..cba7b4a 100644
--- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
@@ -129,7 +129,7 @@ QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &na
             return 0;
         } else if (data->object) {
             // Must be an attached property
-            object = qmlAttachedPropertiesObjectById(data->type->index(), data->object);
+            object = qmlAttachedPropertiesObjectById(data->type->attachedPropertiesId(), data->object);
             if (!object) return 0;
             return ep->objectClass->queryProperty(object, name, flags, 0);
         }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml
new file mode 100644
index 0000000..817391d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml
@@ -0,0 +1,16 @@
+import Qt.test 1.0
+import Qt 4.7
+
+MyQmlObject {
+    id: root
+    property bool test1: false
+    property bool test2: false
+
+    MyQmlObject.value2: 7
+
+    Component.onCompleted: {
+        test1 = root.MyQmlObject.value2 == 7;
+        test2 = root.MyQmlObjectAlias.value2 == 7;
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
index 8a4605a..810a0f7 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
@@ -102,6 +102,7 @@ public:
 
 void registerTypes()
 {
+    qmlRegisterType<MyQmlObject>("Qt.test", 1,0, "MyQmlObjectAlias");
     qmlRegisterType<MyQmlObject>("Qt.test", 1,0, "MyQmlObject");
     qmlRegisterType<MyDeferredObject>("Qt.test", 1,0, "MyDeferredObject");
     qmlRegisterType<MyQmlContainer>("Qt.test", 1,0, "MyQmlContainer");
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index c10a110..4feb630 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -161,6 +161,7 @@ private slots:
     void nonscriptable();
     void deleteLater();
     void in();
+    void sharedAttachedObject();
 
     void include();
 
@@ -2583,6 +2584,16 @@ void tst_qdeclarativeecmascript::in()
     delete o;
 }
 
+void tst_qdeclarativeecmascript::sharedAttachedObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("sharedAttachedObject.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    QCOMPARE(o->property("test1").toBool(), true);
+    QCOMPARE(o->property("test2").toBool(), true);
+    delete o;
+}
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
-- 
cgit v0.12


From 94aa8a639de93861cfafef2e195616cb8ee52093 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 29 Sep 2010 11:13:18 +1000
Subject: Register QtQuick 1.0 module.

Qt 4.7 is still supported, but deprecated.

Reviewed-by: Martin Jones
Task-number: QTBUG-13799
(cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
---
 .../graphicsitems/qdeclarativeitemsmodule.cpp      | 98 +++++++++++++++++-----
 src/declarative/qml/qdeclarativeengine.cpp         | 12 ++-
 src/declarative/qml/qdeclarativevaluetype.cpp      | 12 ++-
 src/declarative/util/qdeclarativeutilmodule.cpp    | 54 +++++++++++-
 tools/qml/qmlruntime.cpp                           |  1 +
 5 files changed, 146 insertions(+), 31 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 783eff1..52703c2 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -97,7 +97,84 @@ void QDeclarativeItemModule::defineModule()
 {
     QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qgraphicsobject_autoParent };
     QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent);
+#ifdef QT_NO_MOVIE
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"AnimatedImage",
+        qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
+#else
+    qmlRegisterType<QDeclarativeAnimatedImage>("QtQuick",1,0,"AnimatedImage");
+#endif
+    qmlRegisterType<QDeclarativeBorderImage>("QtQuick",1,0,"BorderImage");
+    qmlRegisterType<QDeclarativeColumn>("QtQuick",1,0,"Column");
+    qmlRegisterType<QDeclarativeDrag>("QtQuick",1,0,"Drag");
+    qmlRegisterType<QDeclarativeFlickable>("QtQuick",1,0,"Flickable");
+    qmlRegisterType<QDeclarativeFlipable>("QtQuick",1,0,"Flipable");
+    qmlRegisterType<QDeclarativeFlow>("QtQuick",1,0,"Flow");
+    qmlRegisterType<QDeclarativeFocusPanel>("QtQuick",1,0,"FocusPanel");
+    qmlRegisterType<QDeclarativeFocusScope>("QtQuick",1,0,"FocusScope");
+    qmlRegisterType<QDeclarativeGradient>("QtQuick",1,0,"Gradient");
+    qmlRegisterType<QDeclarativeGradientStop>("QtQuick",1,0,"GradientStop");
+    qmlRegisterType<QDeclarativeGrid>("QtQuick",1,0,"Grid");
+    qmlRegisterType<QDeclarativeGridView>("QtQuick",1,0,"GridView");
+    qmlRegisterType<QDeclarativeImage>("QtQuick",1,0,"Image");
+    qmlRegisterType<QDeclarativeItem>("QtQuick",1,0,"Item");
+    qmlRegisterType<QDeclarativeLayoutItem>("QtQuick",1,0,"LayoutItem");
+    qmlRegisterType<QDeclarativeListView>("QtQuick",1,0,"ListView");
+    qmlRegisterType<QDeclarativeLoader>("QtQuick",1,0,"Loader");
+    qmlRegisterType<QDeclarativeMouseArea>("QtQuick",1,0,"MouseArea");
+    qmlRegisterType<QDeclarativePath>("QtQuick",1,0,"Path");
+    qmlRegisterType<QDeclarativePathAttribute>("QtQuick",1,0,"PathAttribute");
+    qmlRegisterType<QDeclarativePathCubic>("QtQuick",1,0,"PathCubic");
+    qmlRegisterType<QDeclarativePathLine>("QtQuick",1,0,"PathLine");
+    qmlRegisterType<QDeclarativePathPercent>("QtQuick",1,0,"PathPercent");
+    qmlRegisterType<QDeclarativePathQuad>("QtQuick",1,0,"PathQuad");
+    qmlRegisterType<QDeclarativePathView>("QtQuick",1,0,"PathView");
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QIntValidator>("QtQuick",1,0,"IntValidator");
+    qmlRegisterType<QDoubleValidator>("QtQuick",1,0,"DoubleValidator");
+    qmlRegisterType<QRegExpValidator>("QtQuick",1,0,"RegExpValidator");
+#endif
+    qmlRegisterType<QDeclarativeRectangle>("QtQuick",1,0,"Rectangle");
+    qmlRegisterType<QDeclarativeRepeater>("QtQuick",1,0,"Repeater");
+    qmlRegisterType<QGraphicsRotation>("QtQuick",1,0,"Rotation");
+    qmlRegisterType<QDeclarativeRow>("QtQuick",1,0,"Row");
+    qmlRegisterType<QDeclarativeTranslate>("QtQuick",1,0,"Translate");
+    qmlRegisterType<QGraphicsScale>("QtQuick",1,0,"Scale");
+    qmlRegisterType<QDeclarativeText>("QtQuick",1,0,"Text");
+    qmlRegisterType<QDeclarativeTextEdit>("QtQuick",1,0,"TextEdit");
+#ifndef QT_NO_LINEEDIT
+    qmlRegisterType<QDeclarativeTextInput>("QtQuick",1,0,"TextInput");
+#endif
+    qmlRegisterType<QDeclarativeViewSection>("QtQuick",1,0,"ViewSection");
+    qmlRegisterType<QDeclarativeVisualDataModel>("QtQuick",1,0,"VisualDataModel");
+    qmlRegisterType<QDeclarativeVisualItemModel>("QtQuick",1,0,"VisualItemModel");
 
+    qmlRegisterType<QDeclarativeAnchors>();
+    qmlRegisterType<QDeclarativeKeyEvent>();
+    qmlRegisterType<QDeclarativeMouseEvent>();
+    qmlRegisterType<QGraphicsObject>();
+    qmlRegisterType<QGraphicsWidget>("QtQuick",1,0,"QGraphicsWidget");
+    qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("QtQuick",1,0,"QGraphicsWidget");
+    qmlRegisterType<QGraphicsTransform>();
+    qmlRegisterType<QDeclarativePathElement>();
+    qmlRegisterType<QDeclarativeCurve>();
+    qmlRegisterType<QDeclarativeScaleGrid>();
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QValidator>();
+#endif
+    qmlRegisterType<QDeclarativeVisualModel>();
+#ifndef QT_NO_ACTION
+    qmlRegisterType<QAction>();
+#endif
+    qmlRegisterType<QDeclarativePen>();
+    qmlRegisterType<QDeclarativeFlickableVisibleArea>();
+#ifndef QT_NO_GRAPHICSEFFECT
+    qmlRegisterType<QGraphicsEffect>();
+#endif
+
+    qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("QtQuick",1,0,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
+    qmlRegisterUncreatableType<QDeclarativeKeysAttached>("QtQuick",1,0,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
+
+#ifndef QT_NO_IMPORT_QT47_QML
 #ifdef QT_NO_MOVIE
     qmlRegisterTypeNotAvailable("Qt",4,7,"AnimatedImage",
         qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
@@ -149,29 +226,10 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativeVisualDataModel>("Qt",4,7,"VisualDataModel");
     qmlRegisterType<QDeclarativeVisualItemModel>("Qt",4,7,"VisualItemModel");
 
-    qmlRegisterType<QDeclarativeAnchors>();
-    qmlRegisterType<QDeclarativeKeyEvent>();
-    qmlRegisterType<QDeclarativeMouseEvent>();
-    qmlRegisterType<QGraphicsObject>();
     qmlRegisterType<QGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
     qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
-    qmlRegisterType<QGraphicsTransform>();
-    qmlRegisterType<QDeclarativePathElement>();
-    qmlRegisterType<QDeclarativeCurve>();
-    qmlRegisterType<QDeclarativeScaleGrid>();
-#ifndef QT_NO_VALIDATOR
-    qmlRegisterType<QValidator>();
-#endif
-    qmlRegisterType<QDeclarativeVisualModel>();
-#ifndef QT_NO_ACTION
-    qmlRegisterType<QAction>();
-#endif
-    qmlRegisterType<QDeclarativePen>();
-    qmlRegisterType<QDeclarativeFlickableVisibleArea>();
-#ifndef QT_NO_GRAPHICSEFFECT
-    qmlRegisterType<QGraphicsEffect>();
-#endif
 
     qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,7,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
     qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,7,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
+#endif
 }
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 80db230..bfed22c 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -141,7 +141,7 @@ QT_BEGIN_NAMESPACE
     \qml
     // MyRect.qml
 
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         width: 200; height: 200
@@ -177,9 +177,15 @@ static bool qt_QmlQtModule_registered = false;
 
 void QDeclarativeEnginePrivate::defineModule()
 {
+    qmlRegisterType<QDeclarativeComponent>("QtQuick",1,0,"Component");
+    qmlRegisterType<QObject>("QtQuick",1,0,"QtObject");
+    qmlRegisterType<QDeclarativeWorkerScript>("QtQuick",1,0,"WorkerScript");
+
+#ifndef QT_NO_IMPORT_QT47_QML
     qmlRegisterType<QDeclarativeComponent>("Qt",4,7,"Component");
     qmlRegisterType<QObject>("Qt",4,7,"QtObject");
     qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,7,"WorkerScript");
+#endif
 
     qmlRegisterType<QDeclarativeBinding>();
 }
@@ -198,7 +204,7 @@ with enums and functions.  To use it, call the members of the global \c Qt objec
 For example:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Text {
     color: Qt.rgba(255, 0, 0, 1)
@@ -510,7 +516,7 @@ QDeclarativeWorkerScriptEngine *QDeclarativeEnginePrivate::getWorkerScriptEngine
   \code
   QDeclarativeEngine engine;
   QDeclarativeComponent component(&engine);
-  component.setData("import Qt 4.7\nText { text: \"Hello world!\" }", QUrl());
+  component.setData("import QtQuick 1.0\nText { text: \"Hello world!\" }", QUrl());
   QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
 
   //add item to view, etc
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index fda62ee..b9e9cec 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT int qt_defaultDpi();
 
 template<typename T>
-int qmlRegisterValueTypeEnums(const char *qmlName)
+int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
 {
     QByteArray name(T::staticMetaObject.className());
 
@@ -63,7 +63,7 @@ int qmlRegisterValueTypeEnums(const char *qmlName)
 
         QString(),
 
-        "Qt", 4, 7, qmlName, &T::staticMetaObject,
+        uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
         0, 0,
 
@@ -99,8 +99,12 @@ bool QDeclarativeValueTypeFactory::isValueType(int idx)
 
 void QDeclarativeValueTypeFactory::registerValueTypes()
 {
-    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Easing");
-    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Font");
+    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("QtQuick",1,0,"Easing");
+    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("QtQuick",1,0,"Font");
+#ifndef QT_NO_IMPORT_QT47_QML
+    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Qt",4,7,"Easing");
+    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Qt",4,7,"Font");
+#endif
 }
 
 QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t)
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index c5bfebd..0544f22 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -75,6 +75,55 @@
 
 void QDeclarativeUtilModule::defineModule()
 {
+    qmlRegisterType<QDeclarativeAnchorAnimation>("QtQuick",1,0,"AnchorAnimation");
+    qmlRegisterType<QDeclarativeAnchorChanges>("QtQuick",1,0,"AnchorChanges");
+    qmlRegisterType<QDeclarativeBehavior>("QtQuick",1,0,"Behavior");
+    qmlRegisterType<QDeclarativeBind>("QtQuick",1,0,"Binding");
+    qmlRegisterType<QDeclarativeColorAnimation>("QtQuick",1,0,"ColorAnimation");
+    qmlRegisterType<QDeclarativeConnections>("QtQuick",1,0,"Connections");
+    qmlRegisterType<QDeclarativeSmoothedAnimation>("QtQuick",1,0,"SmoothedAnimation");
+    qmlRegisterType<QDeclarativeFontLoader>("QtQuick",1,0,"FontLoader");
+    qmlRegisterType<QDeclarativeListElement>("QtQuick",1,0,"ListElement");
+    qmlRegisterType<QDeclarativeNumberAnimation>("QtQuick",1,0,"NumberAnimation");
+    qmlRegisterType<QDeclarativePackage>("QtQuick",1,0,"Package");
+    qmlRegisterType<QDeclarativeParallelAnimation>("QtQuick",1,0,"ParallelAnimation");
+    qmlRegisterType<QDeclarativeParentAnimation>("QtQuick",1,0,"ParentAnimation");
+    qmlRegisterType<QDeclarativeParentChange>("QtQuick",1,0,"ParentChange");
+    qmlRegisterType<QDeclarativePauseAnimation>("QtQuick",1,0,"PauseAnimation");
+    qmlRegisterType<QDeclarativePropertyAction>("QtQuick",1,0,"PropertyAction");
+    qmlRegisterType<QDeclarativePropertyAnimation>("QtQuick",1,0,"PropertyAnimation");
+    qmlRegisterType<QDeclarativeRotationAnimation>("QtQuick",1,0,"RotationAnimation");
+    qmlRegisterType<QDeclarativeScriptAction>("QtQuick",1,0,"ScriptAction");
+    qmlRegisterType<QDeclarativeSequentialAnimation>("QtQuick",1,0,"SequentialAnimation");
+    qmlRegisterType<QDeclarativeSpringAnimation>("QtQuick",1,0,"SpringAnimation");
+    qmlRegisterType<QDeclarativeStateChangeScript>("QtQuick",1,0,"StateChangeScript");
+    qmlRegisterType<QDeclarativeStateGroup>("QtQuick",1,0,"StateGroup");
+    qmlRegisterType<QDeclarativeState>("QtQuick",1,0,"State");
+    qmlRegisterType<QDeclarativeSystemPalette>("QtQuick",1,0,"SystemPalette");
+    qmlRegisterType<QDeclarativeTimer>("QtQuick",1,0,"Timer");
+    qmlRegisterType<QDeclarativeTransition>("QtQuick",1,0,"Transition");
+    qmlRegisterType<QDeclarativeVector3dAnimation>("QtQuick",1,0,"Vector3dAnimation");
+#ifdef QT_NO_XMLPATTERNS
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlListModel",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlRole",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+#else
+    qmlRegisterType<QDeclarativeXmlListModel>("QtQuick",1,0,"XmlListModel");
+    qmlRegisterType<QDeclarativeXmlListModelRole>("QtQuick",1,0,"XmlRole");
+#endif
+
+    qmlRegisterType<QDeclarativeAnchors>();
+    qmlRegisterType<QDeclarativeStateOperation>();
+    qmlRegisterType<QDeclarativeAnchorSet>();
+
+    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("QtQuick",1,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
+
+    qmlRegisterCustomType<QDeclarativeListModel>("QtQuick",1,0,"ListModel", new QDeclarativeListModelParser);
+    qmlRegisterCustomType<QDeclarativePropertyChanges>("QtQuick",1,0,"PropertyChanges", new QDeclarativePropertyChangesParser);
+    qmlRegisterCustomType<QDeclarativeConnections>("QtQuick",1,0,"Connections", new QDeclarativeConnectionsParser);
+
+#ifndef QT_NO_IMPORT_QT47_QML
     qmlRegisterType<QDeclarativeAnchorAnimation>("Qt",4,7,"AnchorAnimation");
     qmlRegisterType<QDeclarativeAnchorChanges>("Qt",4,7,"AnchorChanges");
     qmlRegisterType<QDeclarativeBehavior>("Qt",4,7,"Behavior");
@@ -113,13 +162,10 @@ void QDeclarativeUtilModule::defineModule()
     qmlRegisterType<QDeclarativeXmlListModelRole>("Qt",4,7,"XmlRole");
 #endif
 
-    qmlRegisterType<QDeclarativeAnchors>();
-    qmlRegisterType<QDeclarativeStateOperation>();
-    qmlRegisterType<QDeclarativeAnchorSet>();
-
     qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
 
     qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,7, "ListModel", new QDeclarativeListModelParser);
     qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
     qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 7, "Connections", new QDeclarativeConnectionsParser);
+#endif
 }
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index c59621a..5e169d8 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -1532,6 +1532,7 @@ void QDeclarativeViewer::registerTypes()
     if (!registered) {
         // registering only for exposing the DeviceOrientation::Orientation enum
         qmlRegisterUncreatableType<DeviceOrientation>("Qt",4,7,"Orientation","");
+        qmlRegisterUncreatableType<DeviceOrientation>("QtQuick",1,0,"Orientation","");
         registered = true;
     }
 }
-- 
cgit v0.12


From dcc5c7ea047513ceb6fc75aac526b17ad6629d4c Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 1 Oct 2010 15:28:48 +1000
Subject: Replace all occurances of "Qt 4.7" with "QtQuick 1.0"

Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)

Conflicts:

	tests/auto/declarative/qdeclarativeconnection/data/error-object.qml
	tests/auto/declarative/qdeclarativeconnection/data/error-property.qml
	tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml
	tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml
	tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
	tests/auto/declarative/qdeclarativeqt/data/quit.qml
	tests/auto/declarative/qdeclarativeview/data/error1.qml
---
 demos/declarative/calculator/Core/Button.qml       |   2 +-
 demos/declarative/calculator/Core/Display.qml      |   2 +-
 demos/declarative/calculator/calculator.qml        |   2 +-
 demos/declarative/flickr/common/Progress.qml       |   2 +-
 demos/declarative/flickr/common/RssModel.qml       |   2 +-
 demos/declarative/flickr/common/ScrollBar.qml      |   2 +-
 demos/declarative/flickr/common/Slider.qml         |   2 +-
 demos/declarative/flickr/flickr-90.qml             |   2 +-
 demos/declarative/flickr/flickr.qml                |   2 +-
 demos/declarative/flickr/mobile/Button.qml         |   2 +-
 demos/declarative/flickr/mobile/GridDelegate.qml   |   2 +-
 demos/declarative/flickr/mobile/ImageDetails.qml   |   2 +-
 demos/declarative/flickr/mobile/ListDelegate.qml   |   2 +-
 demos/declarative/flickr/mobile/TitleBar.qml       |   2 +-
 demos/declarative/flickr/mobile/ToolBar.qml        |   2 +-
 .../minehunt/MinehuntCore/Explosion.qml            |   2 +-
 demos/declarative/minehunt/MinehuntCore/Tile.qml   |   2 +-
 demos/declarative/minehunt/minehunt.qml            |   2 +-
 .../photoviewer/PhotoViewerCore/AlbumDelegate.qml  |   2 +-
 .../photoviewer/PhotoViewerCore/BusyIndicator.qml  |   2 +-
 .../photoviewer/PhotoViewerCore/Button.qml         |   2 +-
 .../photoviewer/PhotoViewerCore/EditableButton.qml |   2 +-
 .../photoviewer/PhotoViewerCore/PhotoDelegate.qml  |   2 +-
 .../photoviewer/PhotoViewerCore/ProgressBar.qml    |   2 +-
 .../photoviewer/PhotoViewerCore/RssModel.qml       |   2 +-
 .../photoviewer/PhotoViewerCore/Tag.qml            |   2 +-
 demos/declarative/photoviewer/photoviewer.qml      |   2 +-
 .../declarative/rssnews/content/BusyIndicator.qml  |   2 +-
 .../rssnews/content/CategoryDelegate.qml           |   2 +-
 demos/declarative/rssnews/content/NewsDelegate.qml |   2 +-
 demos/declarative/rssnews/content/RssFeeds.qml     |   2 +-
 demos/declarative/rssnews/content/ScrollBar.qml    |   2 +-
 demos/declarative/rssnews/rssnews.qml              |   2 +-
 .../samegame/SamegameCore/BoomBlock.qml            |   2 +-
 demos/declarative/samegame/SamegameCore/Button.qml |   2 +-
 demos/declarative/samegame/SamegameCore/Dialog.qml |   2 +-
 demos/declarative/samegame/samegame.qml            |   2 +-
 demos/declarative/snake/content/Button.qml         |   2 +-
 demos/declarative/snake/content/Cookie.qml         |   2 +-
 demos/declarative/snake/content/HighScoreModel.qml |   2 +-
 demos/declarative/snake/content/Link.qml           |   2 +-
 demos/declarative/snake/content/Skull.qml          |   2 +-
 demos/declarative/snake/snake.qml                  |   2 +-
 demos/declarative/twitter/TwitterCore/Button.qml   |   2 +-
 .../twitter/TwitterCore/FatDelegate.qml            |   2 +-
 demos/declarative/twitter/TwitterCore/Input.qml    |   2 +-
 demos/declarative/twitter/TwitterCore/Loading.qml  |   2 +-
 .../twitter/TwitterCore/MultiTitleBar.qml          |   2 +-
 demos/declarative/twitter/TwitterCore/RssModel.qml |   2 +-
 .../declarative/twitter/TwitterCore/SearchView.qml |   2 +-
 demos/declarative/twitter/TwitterCore/TitleBar.qml |   2 +-
 demos/declarative/twitter/TwitterCore/ToolBar.qml  |   2 +-
 .../declarative/twitter/TwitterCore/UserModel.qml  |   2 +-
 demos/declarative/twitter/twitter.qml              |   2 +-
 demos/declarative/webbrowser/content/Button.qml    |   2 +-
 .../webbrowser/content/FlickableWebView.qml        |   2 +-
 demos/declarative/webbrowser/content/Header.qml    |   2 +-
 demos/declarative/webbrowser/content/ScrollBar.qml |   2 +-
 demos/declarative/webbrowser/content/UrlInput.qml  |   2 +-
 demos/declarative/webbrowser/webbrowser.qml        |   2 +-
 demos/qtdemo/qmlShell.qml                          |   2 +-
 doc/src/declarative/modules.qdoc                   |   8 +-
 doc/src/declarative/qdeclarativedebugging.qdoc     |   2 +-
 doc/src/declarative/qdeclarativedocument.qdoc      |   2 +-
 doc/src/declarative/qdeclarativei18n.qdoc          |   2 +-
 doc/src/declarative/qdeclarativeintro.qdoc         |   2 +-
 doc/src/declarative/qmlruntime.qdoc                |   2 +-
 doc/src/declarative/qmlviewer.qdoc                 |   8 +-
 doc/src/declarative/qtbinding.qdoc                 |   2 +-
 doc/src/declarative/scope.qdoc                     |  10 +-
 doc/src/getting-started/gettingstartedqml.qdoc     |   4 +-
 .../snippets/declarative/SelfDestroyingRect.qml    |   2 +-
 doc/src/snippets/declarative/Sprite.qml            |   2 +-
 doc/src/snippets/declarative/anchoranimation.qml   |   2 +-
 doc/src/snippets/declarative/anchorchanges.qml     |   2 +-
 doc/src/snippets/declarative/animatedimage.qml     |   2 +-
 .../snippets/declarative/animation-behavioral.qml  |   2 +-
 doc/src/snippets/declarative/animation-easing.qml  |   2 +-
 .../snippets/declarative/animation-elements.qml    |   2 +-
 doc/src/snippets/declarative/animation-groups.qml  |   2 +-
 .../declarative/animation-propertyvaluesource.qml  |   2 +-
 .../declarative/animation-signalhandler.qml        |   2 +-
 .../snippets/declarative/animation-standalone.qml  |   2 +-
 .../snippets/declarative/animation-transitions.qml |   2 +-
 doc/src/snippets/declarative/behavior.qml          |   2 +-
 .../declarative/borderimage/borderimage-scaled.qml |   2 +-
 .../declarative/borderimage/borderimage-tiled.qml  |   2 +-
 .../declarative/borderimage/normal-image.qml       |   2 +-
 .../codingconventions/dotproperties.qml            |   2 +-
 .../codingconventions/javascript-imports.qml       |   2 +-
 .../declarative/codingconventions/javascript.qml   |   2 +-
 .../declarative/codingconventions/lists.qml        |   2 +-
 .../declarative/codingconventions/photo.qml        |   2 +-
 doc/src/snippets/declarative/coloranimation.qml    |   2 +-
 doc/src/snippets/declarative/column/column.qml     |   2 +-
 .../column/vertical-positioner-transition.qml      |   2 +-
 .../declarative/column/vertical-positioner.qml     |   2 +-
 doc/src/snippets/declarative/comments.qml          |   2 +-
 doc/src/snippets/declarative/component.qml         |   2 +-
 .../declarative/createComponent-simple.qml         |   2 +-
 doc/src/snippets/declarative/createComponent.qml   |   2 +-
 doc/src/snippets/declarative/createQmlObject.qml   |   4 +-
 .../declarative/dynamicObjects-destroy.qml         |   2 +-
 doc/src/snippets/declarative/flickable.qml         |   2 +-
 .../snippets/declarative/flickableScrollbar.qml    |   2 +-
 doc/src/snippets/declarative/flipable/flipable.qml |   2 +-
 doc/src/snippets/declarative/flow-diagram.qml      |   2 +-
 doc/src/snippets/declarative/flow.qml              |   2 +-
 doc/src/snippets/declarative/focusscopes.qml       |   2 +-
 doc/src/snippets/declarative/folderlistmodel.qml   |   2 +-
 doc/src/snippets/declarative/gradient.qml          |   2 +-
 doc/src/snippets/declarative/grid/grid-items.qml   |   2 +-
 .../snippets/declarative/grid/grid-no-spacing.qml  |   2 +-
 doc/src/snippets/declarative/grid/grid-spacing.qml |   2 +-
 doc/src/snippets/declarative/grid/grid.qml         |   2 +-
 .../snippets/declarative/gridview/ContactModel.qml |   2 +-
 doc/src/snippets/declarative/gridview/gridview.qml |   2 +-
 doc/src/snippets/declarative/image.qml             |   2 +-
 doc/src/snippets/declarative/listmodel-modify.qml  |   2 +-
 doc/src/snippets/declarative/listmodel-nested.qml  |   2 +-
 doc/src/snippets/declarative/listmodel-simple.qml  |   2 +-
 doc/src/snippets/declarative/listmodel.qml         |   2 +-
 .../snippets/declarative/listview/ContactModel.qml |   2 +-
 .../declarative/listview/listview-snippet.qml      |   2 +-
 doc/src/snippets/declarative/listview/listview.qml |   2 +-
 doc/src/snippets/declarative/loader/KeyReader.qml  |   2 +-
 doc/src/snippets/declarative/loader/MyItem.qml     |   2 +-
 .../snippets/declarative/loader/connections.qml    |   2 +-
 doc/src/snippets/declarative/loader/focus.qml      |   2 +-
 doc/src/snippets/declarative/loader/simple.qml     |   2 +-
 .../declarative/mousearea/mousearea-snippet.qml    |   2 +-
 .../snippets/declarative/mousearea/mousearea.qml   |   2 +-
 .../declarative/mousearea/mouseareadragfilter.qml  |   2 +-
 doc/src/snippets/declarative/numberanimation.qml   |   2 +-
 doc/src/snippets/declarative/parallelanimation.qml |   2 +-
 doc/src/snippets/declarative/parentanimation.qml   |   2 +-
 doc/src/snippets/declarative/parentchange.qml      |   2 +-
 .../snippets/declarative/pathview/ContactModel.qml |   2 +-
 .../declarative/pathview/pathattributes.qml        |   2 +-
 doc/src/snippets/declarative/pathview/pathview.qml |   2 +-
 doc/src/snippets/declarative/propertyaction.qml    |   2 +-
 doc/src/snippets/declarative/propertyanimation.qml |   2 +-
 doc/src/snippets/declarative/propertychanges.qml   |   2 +-
 .../qml-data-models/dynamic-listmodel.qml          |   2 +-
 .../declarative/qml-data-models/listelements.qml   |   2 +-
 .../qml-data-models/listmodel-listview.qml         |   2 +-
 .../declarative/qml-documents/inline-component.qml |   2 +-
 .../qml-documents/inline-text-component.qml        |   2 +-
 .../declarative/qml-documents/non-trivial.qml      |   2 +-
 .../declarative/qml-documents/qmldocuments.qml     |   2 +-
 .../snippets/declarative/qml-intro/anchors1.qml    |   2 +-
 .../snippets/declarative/qml-intro/anchors2.qml    |   2 +-
 .../snippets/declarative/qml-intro/anchors3.qml    |   2 +-
 .../declarative/qml-intro/hello-world1.qml         |   2 +-
 .../declarative/qml-intro/hello-world2.qml         |   2 +-
 .../declarative/qml-intro/hello-world3.qml         |   2 +-
 .../declarative/qml-intro/hello-world4.qml         |   2 +-
 .../declarative/qml-intro/hello-world5.qml         |   2 +-
 .../declarative/qml-intro/number-animation1.qml    |   2 +-
 .../declarative/qml-intro/number-animation2.qml    |   2 +-
 .../snippets/declarative/qml-intro/rectangle.qml   |   2 +-
 .../qml-intro/sequential-animation1.qml            |   2 +-
 .../qml-intro/sequential-animation2.qml            |   2 +-
 .../qml-intro/sequential-animation3.qml            |   4 +-
 doc/src/snippets/declarative/qml-intro/states1.qml |   2 +-
 .../declarative/qml-intro/transformations1.qml     |   2 +-
 .../qtbinding/contextproperties/main.qml           |   2 +-
 .../declarative/qtbinding/custompalette/main.qml   |   2 +-
 .../declarative/qtbinding/resources/main.qml       |   2 +-
 .../declarative/qtbinding/stopwatch/main.qml       |   2 +-
 doc/src/snippets/declarative/qtobject.qml          |   2 +-
 .../declarative/rectangle/rect-border-width.qml    |   2 +-
 .../declarative/rectangle/rectangle-colors.qml     |   2 +-
 .../declarative/rectangle/rectangle-gradient.qml   |   2 +-
 .../declarative/rectangle/rectangle-smooth.qml     |   2 +-
 .../snippets/declarative/rectangle/rectangle.qml   |   2 +-
 .../declarative/repeaters/repeater-grid-index.qml  |   2 +-
 .../snippets/declarative/repeaters/repeater.qml    |   2 +-
 doc/src/snippets/declarative/rotation.qml          |   2 +-
 doc/src/snippets/declarative/rotationanimation.qml |   2 +-
 doc/src/snippets/declarative/row.qml               |   2 +-
 doc/src/snippets/declarative/row/row.qml           |   2 +-
 .../snippets/declarative/sequentialanimation.qml   |   2 +-
 doc/src/snippets/declarative/smoothedanimation.qml |   2 +-
 doc/src/snippets/declarative/springanimation.qml   |   2 +-
 doc/src/snippets/declarative/state-when.qml        |   2 +-
 doc/src/snippets/declarative/state.qml             |   2 +-
 doc/src/snippets/declarative/states.qml            |   2 +-
 doc/src/snippets/declarative/systempalette.qml     |   2 +-
 .../snippets/declarative/text/onLinkActivated.qml  |   2 +-
 doc/src/snippets/declarative/texteditor.qml        |   2 +-
 .../snippets/declarative/transition-from-to.qml    |   2 +-
 .../snippets/declarative/transition-reversible.qml |   2 +-
 doc/src/snippets/declarative/transition.qml        |   2 +-
 doc/src/snippets/declarative/visualdatamodel.qml   |   2 +-
 .../declarative/visualdatamodel_rootindex/view.qml |   2 +-
 doc/src/snippets/declarative/workerscript.qml      |   2 +-
 doc/src/snippets/declarative/xmlrole.qml           |   2 +-
 .../animation/basics/color-animation.qml           |   2 +-
 .../animation/basics/property-animation.qml        |   2 +-
 .../declarative/animation/behaviors/SideRect.qml   |   2 +-
 .../animation/behaviors/behavior-example.qml       |   2 +-
 .../animation/easing/content/QuitButton.qml        |   4 +-
 examples/declarative/animation/easing/easing.qml   |   2 +-
 examples/declarative/animation/states/states.qml   |   2 +-
 .../declarative/animation/states/transitions.qml   |   2 +-
 .../imageprovider/imageprovider-example.qml        |   2 +-
 .../networkaccessmanagerfactory/view.qml           |   2 +-
 .../plugins/com/nokia/TimeExample/Clock.qml        |   2 +-
 .../qgraphicslayouts/layoutitem/layoutitem.qml     |   2 +-
 .../qgraphicsgridlayout/qgraphicsgridlayout.qml    |   2 +-
 .../qgraphicslinearlayout.qml                      |   2 +-
 .../cppextensions/qwidgets/qwidgets.qml            |   2 +-
 .../referenceexamples/methods/example.qml          |   2 +-
 examples/declarative/i18n/i18n.qml                 |   2 +-
 .../imageelements/borderimage/borderimage.qml      |   2 +-
 .../borderimage/content/MyBorderImage.qml          |   2 +-
 .../borderimage/content/ShadowRectangle.qml        |   2 +-
 .../imageelements/borderimage/shadows.qml          |   2 +-
 .../declarative/imageelements/image/ImageCell.qml  |   2 +-
 examples/declarative/imageelements/image/image.qml |   2 +-
 .../keyinteraction/focus/Core/ContextMenu.qml      |   2 +-
 .../keyinteraction/focus/Core/GridMenu.qml         |   2 +-
 .../keyinteraction/focus/Core/ListMenu.qml         |   2 +-
 .../keyinteraction/focus/Core/ListViewDelegate.qml |   2 +-
 .../declarative/keyinteraction/focus/focus.qml     |   2 +-
 .../modelviews/abstractitemmodel/view.qml          |   2 +-
 .../modelviews/gridview/gridview-example.qml       |   2 +-
 .../modelviews/listview/content/PetsModel.qml      |   2 +-
 .../listview/content/PressAndHoldButton.qml        |   2 +-
 .../modelviews/listview/content/RecipesModel.qml   |   2 +-
 .../modelviews/listview/content/TextButton.qml     |   2 +-
 .../modelviews/listview/dynamiclist.qml            |   2 +-
 .../modelviews/listview/expandingdelegates.qml     |   2 +-
 .../declarative/modelviews/listview/highlight.qml  |   2 +-
 .../modelviews/listview/highlightranges.qml        |   2 +-
 .../declarative/modelviews/listview/sections.qml   |   2 +-
 .../modelviews/objectlistmodel/view.qml            |   2 +-
 .../declarative/modelviews/package/Delegate.qml    |   2 +-
 examples/declarative/modelviews/package/view.qml   |   2 +-
 .../declarative/modelviews/parallax/parallax.qml   |   2 +-
 .../modelviews/parallax/qml/ParallaxView.qml       |   2 +-
 .../declarative/modelviews/parallax/qml/Smiley.qml |   2 +-
 .../modelviews/pathview/pathview-example.qml       |   2 +-
 .../modelviews/stringlistmodel/view.qml            |   2 +-
 .../modelviews/visualitemmodel/visualitemmodel.qml |   2 +-
 examples/declarative/modelviews/webview/alerts.qml |   2 +-
 .../declarative/modelviews/webview/autosize.qml    |   2 +-
 .../modelviews/webview/content/Mapping/Map.qml     |   2 +-
 .../declarative/modelviews/webview/googlemaps.qml  |   2 +-
 .../declarative/modelviews/webview/inlinehtml.qml  |   2 +-
 .../declarative/modelviews/webview/newwindows.qml  |   2 +-
 examples/declarative/positioners/Button.qml        |   2 +-
 examples/declarative/positioners/positioners.qml   |   2 +-
 .../declarative/screenorientation/Core/Bubble.qml  |   4 +-
 .../declarative/screenorientation/Core/Button.qml  |   2 +-
 .../screenorientation/screenorientation.qml        |   2 +-
 examples/declarative/sqllocalstorage/hello.qml     |   2 +-
 examples/declarative/text/fonts/availableFonts.qml |   2 +-
 examples/declarative/text/fonts/banner.qml         |   2 +-
 examples/declarative/text/fonts/fonts.qml          |   2 +-
 examples/declarative/text/fonts/hello.qml          |   2 +-
 .../text/textselection/textselection.qml           |   2 +-
 .../threading/threadedlistmodel/timedisplay.qml    |   2 +-
 .../threading/workerscript/workerscript.qml        |   2 +-
 .../gestures/experimental-gestures.qml             |   2 +-
 .../mousearea/mousearea-example.qml                |   2 +-
 examples/declarative/toys/clocks/clocks.qml        |   2 +-
 examples/declarative/toys/clocks/content/Clock.qml |   2 +-
 .../declarative/toys/clocks/content/QuitButton.qml |   4 +-
 examples/declarative/toys/corkboards/Day.qml       |   2 +-
 .../declarative/toys/corkboards/corkboards.qml     |   2 +-
 .../declarative/toys/dynamicscene/dynamicscene.qml |   4 +-
 .../declarative/toys/dynamicscene/qml/Button.qml   |   2 +-
 .../toys/dynamicscene/qml/GenericSceneItem.qml     |   2 +-
 .../toys/dynamicscene/qml/PaletteItem.qml          |   2 +-
 .../toys/dynamicscene/qml/PerspectiveItem.qml      |   2 +-
 examples/declarative/toys/dynamicscene/qml/Sun.qml |   2 +-
 .../toys/tic-tac-toe/content/Button.qml            |   2 +-
 .../toys/tic-tac-toe/content/TicTac.qml            |   2 +-
 .../declarative/toys/tic-tac-toe/tic-tac-toe.qml   |   2 +-
 examples/declarative/toys/tvtennis/tvtennis.qml    |   2 +-
 .../tutorials/extending/chapter1-basics/app.qml    |   2 +-
 .../tutorials/extending/chapter2-methods/app.qml   |   2 +-
 .../tutorials/extending/chapter3-bindings/app.qml  |   2 +-
 .../extending/chapter4-customPropertyTypes/app.qml |   2 +-
 .../extending/chapter5-listproperties/app.qml      |   2 +-
 .../tutorials/extending/chapter6-plugins/app.qml   |   2 +-
 examples/declarative/tutorials/helloworld/Cell.qml |   2 +-
 .../declarative/tutorials/helloworld/tutorial1.qml |   2 +-
 .../declarative/tutorials/helloworld/tutorial2.qml |   2 +-
 .../declarative/tutorials/helloworld/tutorial3.qml |   2 +-
 .../tutorials/samegame/samegame1/Block.qml         |   2 +-
 .../tutorials/samegame/samegame1/Button.qml        |   2 +-
 .../tutorials/samegame/samegame1/samegame.qml      |   2 +-
 .../tutorials/samegame/samegame2/Block.qml         |   2 +-
 .../tutorials/samegame/samegame2/Button.qml        |   2 +-
 .../tutorials/samegame/samegame2/samegame.qml      |   2 +-
 .../tutorials/samegame/samegame3/Block.qml         |   2 +-
 .../tutorials/samegame/samegame3/Button.qml        |   2 +-
 .../tutorials/samegame/samegame3/Dialog.qml        |   2 +-
 .../tutorials/samegame/samegame3/samegame.qml      |   2 +-
 .../samegame/samegame4/content/BoomBlock.qml       |   2 +-
 .../samegame/samegame4/content/Button.qml          |   2 +-
 .../samegame/samegame4/content/Dialog.qml          |   2 +-
 .../tutorials/samegame/samegame4/samegame.qml      |   2 +-
 .../ui-components/dialcontrol/content/Dial.qml     |   2 +-
 .../dialcontrol/content/QuitButton.qml             |   4 +-
 .../ui-components/dialcontrol/dialcontrol.qml      |   2 +-
 .../ui-components/flipable/content/Card.qml        |   2 +-
 .../ui-components/flipable/flipable.qml            |   2 +-
 .../progressbar/content/ProgressBar.qml            |   2 +-
 .../declarative/ui-components/progressbar/main.qml |   2 +-
 .../ui-components/scrollbar/ScrollBar.qml          |   2 +-
 .../declarative/ui-components/scrollbar/main.qml   |   2 +-
 .../ui-components/searchbox/SearchBox.qml          |   2 +-
 .../declarative/ui-components/searchbox/main.qml   |   2 +-
 .../ui-components/slideswitch/content/Switch.qml   |   2 +-
 .../ui-components/slideswitch/slideswitch.qml      |   2 +-
 .../ui-components/spinner/content/Spinner.qml      |   2 +-
 .../declarative/ui-components/spinner/main.qml     |   2 +-
 .../ui-components/tabwidget/TabWidget.qml          |   2 +-
 .../declarative/ui-components/tabwidget/main.qml   |   2 +-
 .../xml/xmlhttprequest/xmlhttprequest-example.qml  |   2 +-
 .../tutorials/gettingStarted/gsQml/core/button.qml |   4 +-
 .../gettingStarted/gsQml/core/editMenu.qml         |   4 +-
 .../gettingStarted/gsQml/core/fileDialog.qml       |   4 +-
 .../gettingStarted/gsQml/core/fileMenu.qml         |   2 +-
 .../gettingStarted/gsQml/core/menuBar.qml          |   2 +-
 .../gettingStarted/gsQml/core/textArea.qml         |   4 +-
 .../tutorials/gettingStarted/gsQml/texteditor.qml  |   2 +-
 src/declarative/graphicsitems/qdeclarativeitem.cpp |   2 +-
 .../graphicsitems/qdeclarativetextedit.cpp         |   4 +-
 .../graphicsitems/qdeclarativetextinput.cpp        |   6 +-
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  |   2 +-
 src/declarative/qml/qdeclarativecompiler.cpp       |   2 +-
 src/declarative/qml/qdeclarativecomponent.cpp      |   2 +-
 src/declarative/qml/qdeclarativecontext.cpp        |   4 +-
 src/declarative/qml/qdeclarativedom.cpp            |   2 +-
 src/declarative/qml/qdeclarativeexpression.cpp     |   2 +-
 src/declarative/util/qdeclarativefontloader.cpp    |   2 +-
 src/declarative/util/qdeclarativetimer.cpp         |   2 +-
 src/declarative/util/qdeclarativexmllistmodel.cpp  |   2 +-
 src/imports/particles/qdeclarativeparticles.cpp    |   2 +-
 .../declarative/parserstress/tst_parserstress.cpp  |   2 +-
 .../qdeclarativeanchors/data/anchors.qml           |   2 +-
 .../data/anchorsqgraphicswidget.qml                |   2 +-
 .../qdeclarativeanchors/data/centerin.qml          |   2 +-
 .../qdeclarativeanchors/data/crash1.qml            |   2 +-
 .../declarative/qdeclarativeanchors/data/fill.qml  |   2 +-
 .../qdeclarativeanchors/data/hvCenter.qml          |   2 +-
 .../declarative/qdeclarativeanchors/data/loop1.qml |   2 +-
 .../declarative/qdeclarativeanchors/data/loop2.qml |   2 +-
 .../qdeclarativeanchors/data/margins.qml           |   2 +-
 .../tst_qdeclarativeanchors.cpp                    |   2 +-
 .../qdeclarativeanimatedimage/data/colors.qml      |   2 +-
 .../qdeclarativeanimatedimage/data/stickman.qml    |   2 +-
 .../data/stickmanerror1.qml                        |   2 +-
 .../data/stickmanpause.qml                         |   2 +-
 .../data/stickmanscaled.qml                        |   2 +-
 .../data/stickmanstopped.qml                       |   2 +-
 .../tst_qdeclarativeanimatedimage.cpp              |   2 +-
 .../qdeclarativeanimations/data/attached.qml       |   2 +-
 .../qdeclarativeanimations/data/badproperty1.qml   |   2 +-
 .../qdeclarativeanimations/data/badproperty2.qml   |   2 +-
 .../qdeclarativeanimations/data/badtype1.qml       |   2 +-
 .../qdeclarativeanimations/data/badtype2.qml       |   2 +-
 .../qdeclarativeanimations/data/badtype3.qml       |   2 +-
 .../qdeclarativeanimations/data/badtype4.qml       |   2 +-
 .../qdeclarativeanimations/data/dontAutoStart.qml  |   2 +-
 .../qdeclarativeanimations/data/dontStart.qml      |   2 +-
 .../qdeclarativeanimations/data/dontStart2.qml     |   2 +-
 .../qdeclarativeanimations/data/dotproperty.qml    |   2 +-
 .../qdeclarativeanimations/data/mixedtype1.qml     |   2 +-
 .../qdeclarativeanimations/data/mixedtype2.qml     |   2 +-
 .../data/nonTransitionBug.qml                      |   2 +-
 .../qdeclarativeanimations/data/properties.qml     |   2 +-
 .../qdeclarativeanimations/data/properties2.qml    |   2 +-
 .../qdeclarativeanimations/data/properties3.qml    |   2 +-
 .../qdeclarativeanimations/data/properties4.qml    |   2 +-
 .../qdeclarativeanimations/data/properties5.qml    |   2 +-
 .../data/propertiesTransition.qml                  |   2 +-
 .../data/propertiesTransition2.qml                 |   2 +-
 .../data/propertiesTransition3.qml                 |   2 +-
 .../data/propertiesTransition4.qml                 |   2 +-
 .../data/propertiesTransition5.qml                 |   2 +-
 .../data/propertiesTransition6.qml                 |   2 +-
 .../data/propertiesTransition7.qml                 |   2 +-
 .../qdeclarativeanimations/data/rotation.qml       |   2 +-
 .../qdeclarativeanimations/data/runningTrueBug.qml |   2 +-
 .../qdeclarativeanimations/data/valuesource.qml    |   2 +-
 .../qdeclarativeanimations/data/valuesource2.qml   |   2 +-
 .../tst_qdeclarativeanimations.cpp                 |   8 +-
 .../qdeclarativebehaviors/data/binding.qml         |   2 +-
 .../qdeclarativebehaviors/data/color.qml           |   2 +-
 .../qdeclarativebehaviors/data/cpptrigger.qml      |   2 +-
 .../qdeclarativebehaviors/data/disabled.qml        |   2 +-
 .../qdeclarativebehaviors/data/dontStart.qml       |   2 +-
 .../qdeclarativebehaviors/data/empty.qml           |   2 +-
 .../qdeclarativebehaviors/data/explicit.qml        |   2 +-
 .../qdeclarativebehaviors/data/groupProperty.qml   |   2 +-
 .../qdeclarativebehaviors/data/groupProperty2.qml  |   2 +-
 .../data/groupedPropertyCrash.qml                  |   2 +-
 .../qdeclarativebehaviors/data/loop.qml            |   2 +-
 .../qdeclarativebehaviors/data/nonSelecting2.qml   |   2 +-
 .../qdeclarativebehaviors/data/parent.qml          |   2 +-
 .../qdeclarativebehaviors/data/qtbug12295.qml      |   2 +-
 .../data/reassignedAnimation.qml                   |   2 +-
 .../qdeclarativebehaviors/data/runningTrue.qml     |   2 +-
 .../qdeclarativebehaviors/data/scripttrigger.qml   |   2 +-
 .../qdeclarativebehaviors/data/simple.qml          |   2 +-
 .../qdeclarativebehaviors/data/startup.qml         |   2 +-
 .../qdeclarativebehaviors/data/startup2.qml        |   2 +-
 .../qdeclarativebinding/data/test-binding.qml      |   2 +-
 .../qdeclarativebinding/data/test-binding2.qml     |   2 +-
 .../tst_qdeclarativeborderimage.cpp                |  20 +--
 .../qdeclarativecomponent/data/createObject.qml    |   2 +-
 .../data/connection-targetchange.qml               |   2 +-
 .../data/connection-unknownsignals-ignored.qml     |   2 +-
 .../data/connection-unknownsignals-notarget.qml    |   2 +-
 .../data/connection-unknownsignals-parent.qml      |   2 +-
 .../data/connection-unknownsignals.qml             |   2 +-
 .../data/test-connection.qml                       |   2 +-
 .../data/test-connection2.qml                      |   2 +-
 .../data/test-connection3.qml                      |   2 +-
 .../qdeclarativeconnection/data/trimming.qml       |   2 +-
 .../tst_qdeclarativecontext.cpp                    |  18 +--
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |   6 +-
 .../qdeclarativedom/data/MyComponent.qml           |   2 +-
 .../declarative/qdeclarativedom/data/MyItem.qml    |   2 +-
 .../qdeclarativedom/data/import/Bar.qml            |   2 +-
 .../qdeclarativedom/data/importlib/sublib/Foo.qml  |   2 +-
 .../auto/declarative/qdeclarativedom/data/top.qml  |   2 +-
 .../qdeclarativedom/tst_qdeclarativedom.cpp        | 162 ++++++++++-----------
 .../qdeclarativeecmascript/data/CustomObject.qml   |   2 +-
 .../qdeclarativeecmascript/data/MethodsObject.qml  |   2 +-
 .../data/NestedTypeTransientErrors.qml             |   2 +-
 .../qdeclarativeecmascript/data/ScopeObject.qml    |   2 +-
 .../data/SpuriousWarning.qml                       |   2 +-
 .../data/aliasPropertyAndBinding.qml               |   2 +-
 .../data/assignBasicTypes.qml                      |   2 +-
 .../data/attachedPropertyScope.qml                 |   2 +-
 .../qdeclarativeecmascript/data/bug.1.qml          |   2 +-
 .../data/canAssignNullToQObject.2.qml              |   2 +-
 .../qdeclarativeecmascript/data/compiled.qml       |   2 +-
 .../data/compositePropertyType.qml                 |   2 +-
 .../data/deferredPropertiesErrors.qml              |   2 +-
 .../qdeclarativeecmascript/data/deleteLater.qml    |   2 +-
 .../qdeclarativeecmascript/data/deletedEngine.qml  |   2 +-
 .../qdeclarativeecmascript/data/deletedObject.qml  |   2 +-
 .../qdeclarativeecmascript/data/eval.qml           |   2 +-
 .../data/exceptionProducesWarning.qml              |   2 +-
 .../data/exceptionProducesWarning2.qml             |   2 +-
 .../data/extendedObjectPropertyLookup.qml          |   2 +-
 .../data/extensionObjects.qml                      |   2 +-
 .../qdeclarativeecmascript/data/function.qml       |   2 +-
 .../qdeclarativeecmascript/data/functionErrors.qml |   2 +-
 .../data/idShortcutInvalidates.1.qml               |   2 +-
 .../data/idShortcutInvalidates.qml                 |   2 +-
 .../declarative/qdeclarativeecmascript/data/in.qml |   2 +-
 .../qdeclarativeecmascript/data/include.qml        |   2 +-
 .../data/include_callback.qml                      |   2 +-
 .../qdeclarativeecmascript/data/include_pragma.qml |   2 +-
 .../qdeclarativeecmascript/data/include_remote.qml |   2 +-
 .../data/include_remote_missing.qml                |   2 +-
 .../qdeclarativeecmascript/data/include_shared.qml |   2 +-
 .../data/invokableObjectArg.qml                    |   2 +-
 .../data/invokableObjectRet.qml                    |   2 +-
 .../qdeclarativeecmascript/data/jsObject.qml       |   2 +-
 .../data/libraryScriptAssert.qml                   |   2 +-
 .../qdeclarativeecmascript/data/listProperties.qml |   2 +-
 .../qdeclarativeecmascript/data/listToVariant.qml  |   2 +-
 .../qdeclarativeecmascript/data/methods.3.qml      |   2 +-
 .../qdeclarativeecmascript/data/methods.4.qml      |   2 +-
 .../qdeclarativeecmascript/data/methods.5.qml      |   2 +-
 .../data/multiEngineObject.qml                     |   2 +-
 .../data/noSpuriousWarningsAtShutdown.2.qml        |   2 +-
 .../data/noSpuriousWarningsAtShutdown.qml          |   2 +-
 .../qdeclarativeecmascript/data/nonscriptable.qml  |   2 +-
 .../data/nullObjectBinding.qml                     |   2 +-
 .../data/objectsCompareAsEqual.qml                 |   2 +-
 .../qdeclarativeecmascript/data/ownership.qml      |   2 +-
 .../data/propertyAssignmentErrors.qml              |   2 +-
 .../data/qlistqobjectMethods.qml                   |   2 +-
 .../qdeclarativeecmascript/data/qtbug_10696.qml    |   2 +-
 .../qdeclarativeecmascript/data/qtbug_11600.qml    |   2 +-
 .../qdeclarativeecmascript/data/qtbug_11606.qml    |   2 +-
 .../data/qtcreatorbug_1289.qml                     |   2 +-
 .../qdeclarativeecmascript/data/scope.2.qml        |   2 +-
 .../qdeclarativeecmascript/data/scope.3.qml        |   2 +-
 .../qdeclarativeecmascript/data/scope.qml          |   2 +-
 .../data/scriptConnect.1.qml                       |   2 +-
 .../data/scriptConnect.2.qml                       |   2 +-
 .../data/scriptConnect.3.qml                       |   2 +-
 .../data/scriptConnect.4.qml                       |   2 +-
 .../data/scriptConnect.5.qml                       |   2 +-
 .../data/scriptConnect.6.qml                       |   2 +-
 .../data/scriptDisconnect.1.qml                    |   2 +-
 .../data/scriptDisconnect.2.qml                    |   2 +-
 .../data/scriptDisconnect.3.qml                    |   2 +-
 .../data/scriptDisconnect.4.qml                    |   2 +-
 .../data/sharedAttachedObject.qml                  |   2 +-
 .../qdeclarativeecmascript/data/shutdownErrors.qml |   2 +-
 .../data/signalTriggeredBindings.qml               |   2 +-
 .../qdeclarativeecmascript/data/strictlyEquals.qml |   2 +-
 .../data/transientErrors.2.qml                     |   2 +-
 .../data/transientErrors.qml                       |   2 +-
 .../data/variantsAssignedUndefined.qml             |   2 +-
 .../qdeclarativeengine/tst_qdeclarativeengine.cpp  |   8 +-
 .../qdeclarativeflickable/data/flickable01.qml     |   2 +-
 .../qdeclarativeflickable/data/flickable02.qml     |   2 +-
 .../qdeclarativeflickable/data/flickable03.qml     |   2 +-
 .../qdeclarativeflickable/data/flickable04.qml     |   2 +-
 .../data/flickableqgraphicswidget.qml              |   2 +-
 .../tst_qdeclarativeflickable.cpp                  |  10 +-
 .../qdeclarativeflipable/data/crash.qml            |   2 +-
 .../qdeclarativeflipable/data/flipable-abort.qml   |   2 +-
 .../qdeclarativeflipable/data/test-flipable.qml    |   2 +-
 .../qdeclarativefocusscope/data/chain.qml          |   2 +-
 .../qdeclarativefocusscope/data/forcefocus.qml     |   2 +-
 .../qdeclarativefocusscope/data/signalEmission.qml |   2 +-
 .../qdeclarativefocusscope/data/test.qml           |   2 +-
 .../qdeclarativefocusscope/data/test2.qml          |   2 +-
 .../qdeclarativefocusscope/data/test3.qml          |   2 +-
 .../qdeclarativefocusscope/data/test4.qml          |   2 +-
 .../qdeclarativefocusscope/data/test5.qml          |   2 +-
 .../tst_qdeclarativefontloader.cpp                 |  16 +-
 .../qdeclarativegridview/data/displaygrid.qml      |   2 +-
 .../qdeclarativegridview/data/footer.qml           |   2 +-
 .../data/gridview-enforcerange.qml                 |   2 +-
 .../data/gridview-initCurrent.qml                  |   2 +-
 .../qdeclarativegridview/data/gridview1.qml        |   2 +-
 .../qdeclarativegridview/data/gridview2.qml        |   2 +-
 .../qdeclarativegridview/data/gridview3.qml        |   2 +-
 .../qdeclarativegridview/data/manual-highlight.qml |   2 +-
 .../data/propertychangestest.qml                   |   2 +-
 .../qdeclarativegridview/data/setindex.qml         |   2 +-
 .../tst_qdeclarativegridview.cpp                   |   4 +-
 .../qdeclarativeimage/data/aspectratio.qml         |   2 +-
 .../declarative/qdeclarativeimage/data/tiling.qml  |   2 +-
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    |  16 +-
 .../tst_qdeclarativeimageprovider.cpp              |   8 +-
 .../qdeclarativeinfo/data/NestedObject.qml         |   2 +-
 .../qdeclarativeinfo/data/nestedQmlObject.qml      |   2 +-
 .../qdeclarativeinfo/data/qmlObject.qml            |   2 +-
 .../qdeclarativeitem/data/childrenProperty.qml     |   2 +-
 .../qdeclarativeitem/data/childrenRect.qml         |   2 +-
 .../qdeclarativeitem/data/childrenRectBug.qml      |   2 +-
 .../qdeclarativeitem/data/childrenRectBug2.qml     |   2 +-
 .../qdeclarativeitem/data/childrenRectBug3.qml     |   2 +-
 .../qdeclarativeitem/data/keynavigationtest.qml    |   2 +-
 .../qdeclarativeitem/data/keyspriority.qml         |   2 +-
 .../declarative/qdeclarativeitem/data/keystest.qml |   2 +-
 .../qdeclarativeitem/data/mapCoordinates.qml       |   2 +-
 .../qdeclarativeitem/data/mouseFocus.qml           |   2 +-
 .../qdeclarativeitem/data/propertychanges.qml      |   2 +-
 .../qdeclarativeitem/data/resourcesProperty.qml    |   2 +-
 .../qdeclarativeitem/tst_qdeclarativeitem.cpp      |   6 +-
 .../qdeclarativelanguage/data/Alias.qml            |   2 +-
 .../qdeclarativelanguage/data/Alias2.qml           |   2 +-
 .../qdeclarativelanguage/data/Alias3.qml           |   2 +-
 .../qdeclarativelanguage/data/Alias4.qml           |   2 +-
 .../data/ComponentComposite.qml                    |   2 +-
 .../qdeclarativelanguage/data/CompositeType.qml    |   2 +-
 .../qdeclarativelanguage/data/CompositeType3.qml   |   2 +-
 .../data/DynamicPropertiesNestedType.qml           |   2 +-
 .../qdeclarativelanguage/data/HelperAlias.qml      |   2 +-
 .../qdeclarativelanguage/data/LocalLast.qml        |   2 +-
 .../qdeclarativelanguage/data/NestedAlias.qml      |   2 +-
 .../qdeclarativelanguage/data/NestedErrorsType.qml |   2 +-
 .../qdeclarativelanguage/data/OnCompletedType.qml  |   2 +-
 .../data/OnDestructionType.qml                     |   2 +-
 .../qdeclarativelanguage/data/alias.1.qml          |   2 +-
 .../qdeclarativelanguage/data/alias.3.qml          |   2 +-
 .../qdeclarativelanguage/data/alias.5.qml          |   2 +-
 .../qdeclarativelanguage/data/alias.6.qml          |   2 +-
 .../qdeclarativelanguage/data/alias.7.qml          |   2 +-
 .../qdeclarativelanguage/data/alias.8.qml          |   2 +-
 .../qdeclarativelanguage/data/alias.9.qml          |   2 +-
 .../data/aliasPropertiesAndSignals.qml             |   2 +-
 .../data/assignCompositeToType.qml                 |   2 +-
 .../data/assignLiteralToVariant.qml                |   2 +-
 .../data/assignObjectToVariant.qml                 |   2 +-
 .../data/assignToNamespace.qml                     |   2 +-
 .../data/attachedProperties.qml                    |   2 +-
 .../qdeclarativelanguage/data/component.1.qml      |   2 +-
 .../qdeclarativelanguage/data/component.2.qml      |   2 +-
 .../qdeclarativelanguage/data/component.3.qml      |   2 +-
 .../qdeclarativelanguage/data/component.4.qml      |   2 +-
 .../qdeclarativelanguage/data/component.5.qml      |   2 +-
 .../qdeclarativelanguage/data/component.6.qml      |   2 +-
 .../qdeclarativelanguage/data/component.7.qml      |   2 +-
 .../qdeclarativelanguage/data/component.8.qml      |   2 +-
 .../qdeclarativelanguage/data/component.9.qml      |   2 +-
 .../data/componentCompositeType.qml                |   2 +-
 .../qdeclarativelanguage/data/crash2.qml           |   2 +-
 .../qdeclarativelanguage/data/customOnProperty.qml |   2 +-
 .../data/customParserIdNotAllowed.qml              |   2 +-
 .../data/customParserTypes.qml                     |   2 +-
 .../data/declaredPropertyValues.qml                |   2 +-
 .../qdeclarativelanguage/data/defaultGrouped.qml   |   2 +-
 .../data/defaultPropertyListOrder.qml              |   2 +-
 .../qdeclarativelanguage/data/destroyedSignal.qml  |   2 +-
 .../data/dontDoubleCallClassBegin.qml              |   2 +-
 .../qdeclarativelanguage/data/dynamicMeta.1.qml    |   2 +-
 .../qdeclarativelanguage/data/dynamicMeta.2.qml    |   2 +-
 .../qdeclarativelanguage/data/dynamicMeta.3.qml    |   2 +-
 .../qdeclarativelanguage/data/dynamicMeta.4.qml    |   2 +-
 .../qdeclarativelanguage/data/dynamicMeta.5.qml    |   2 +-
 .../qdeclarativelanguage/data/dynamicObject.1.qml  |   2 +-
 .../data/dynamicObjectProperties.2.qml             |   4 +-
 .../data/dynamicObjectProperties.qml               |   4 +-
 .../data/dynamicProperties.qml                     |   2 +-
 .../data/dynamicPropertiesNested.qml               |   2 +-
 .../data/dynamicSignalsAndSlots.qml                |   2 +-
 .../qdeclarativelanguage/data/enumTypes.qml        |   2 +-
 .../data/importNamespaceConflict.qml               |   2 +-
 .../qdeclarativelanguage/data/importNonExist.qml   |   2 +-
 .../data/inlineQmlComponents.qml                   |   2 +-
 .../data/interfaceProperty.qml                     |   2 +-
 .../qdeclarativelanguage/data/invalidAlias.1.qml   |   2 +-
 .../qdeclarativelanguage/data/invalidAlias.2.qml   |   2 +-
 .../data/invalidAttachedProperty.1.qml             |   2 +-
 .../data/invalidAttachedProperty.10.qml            |   2 +-
 .../data/invalidAttachedProperty.11.qml            |   2 +-
 .../data/invalidAttachedProperty.2.qml             |   2 +-
 .../data/invalidAttachedProperty.3.qml             |   2 +-
 .../data/invalidAttachedProperty.4.qml             |   2 +-
 .../data/invalidAttachedProperty.5.qml             |   2 +-
 .../data/invalidAttachedProperty.6.qml             |   2 +-
 .../data/invalidAttachedProperty.7.qml             |   2 +-
 .../data/invalidAttachedProperty.8.qml             |   2 +-
 .../data/invalidAttachedProperty.9.qml             |   2 +-
 .../data/invalidGroupedProperty.1.qml              |   2 +-
 .../data/invalidGroupedProperty.2.qml              |   2 +-
 .../data/invalidImportID.errors.txt                |   2 +-
 .../qdeclarativelanguage/data/invalidImportID.qml  |   4 +-
 .../qdeclarativelanguage/data/invalidProperty.qml  |   2 +-
 .../lib/com/nokia/installedtest/InstalledTest.qml  |   2 +-
 .../lib/com/nokia/installedtest/InstalledTest2.qml |   2 +-
 .../data/lib/com/nokia/installedtest/LocalLast.qml |   2 +-
 .../lib/com/nokia/installedtest/PrivateType.qml    |   2 +-
 .../lib/com/nokia/installedtest0/InstalledTest.qml |   2 +-
 .../com/nokia/installedtest0/InstalledTest2.qml    |   2 +-
 .../qdeclarativelanguage/data/listAssignment.1.qml |   2 +-
 .../data/listItemDeleteSelf.qml                    |   2 +-
 .../qdeclarativelanguage/data/listProperties.qml   |   2 +-
 .../qdeclarativelanguage/data/method.1.qml         |   2 +-
 .../qdeclarativelanguage/data/missingSignal.qml    |   2 +-
 .../qdeclarativelanguage/data/nestedErrors.qml     |   2 +-
 .../qdeclarativelanguage/data/noCreation.qml       |   2 +-
 .../qdeclarativelanguage/data/onCompleted.qml      |   2 +-
 .../qdeclarativelanguage/data/onDestruction.qml    |   2 +-
 .../qdeclarativelanguage/data/property.1.qml       |   2 +-
 .../qdeclarativelanguage/data/property.2.qml       |   2 +-
 .../qdeclarativelanguage/data/property.3.qml       |   2 +-
 .../qdeclarativelanguage/data/property.4.qml       |   2 +-
 .../qdeclarativelanguage/data/property.5.qml       |   2 +-
 .../qdeclarativelanguage/data/property.6.qml       |   2 +-
 .../qdeclarativelanguage/data/property.7.qml       |   2 +-
 .../data/qmlAttachedPropertiesObjectMethod.1.qml   |   2 +-
 .../data/qmlAttachedPropertiesObjectMethod.2.qml   |   2 +-
 .../qdeclarativelanguage/data/readOnly.3.qml       |   2 +-
 .../qdeclarativelanguage/data/signal.1.qml         |   2 +-
 .../qdeclarativelanguage/data/signal.2.qml         |   2 +-
 .../qdeclarativelanguage/data/signal.3.qml         |   2 +-
 .../qdeclarativelanguage/data/signal.4.qml         |   2 +-
 .../qdeclarativelanguage/data/subdir/Test.qml      |   2 +-
 .../data/subdir/subsubdir/SubTest.qml              |   2 +-
 .../qdeclarativelanguage/data/variantNotify.qml    |   2 +-
 .../qdeclarativelanguage/data/wrongType.16.qml     |   2 +-
 .../declarative/qmllanguage/LocalInternal.qml      |   2 +-
 .../qtest/declarative/qmllanguage/Test.qml         |   2 +-
 .../declarative/qmllanguage/UndeclaredLocal.qml    |   2 +-
 .../declarative/qmllanguage/subdir/SubTest.qml     |   2 +-
 .../tst_qdeclarativelanguage.cpp                   |  14 +-
 .../qdeclarativelayoutitem/data/layoutItem.qml     |   2 +-
 .../qdeclarativelistmodel/data/enumerate.qml       |   2 +-
 .../qdeclarativelistmodel/data/model.qml           |   2 +-
 .../qdeclarativelistmodel/data/multipleroles.qml   |   4 +-
 .../tst_qdeclarativelistmodel.cpp                  |  32 ++--
 .../qdeclarativelistreference/data/MyType.qml      |   2 +-
 .../qdeclarativelistreference/data/engineTypes.qml |   2 +-
 .../data/variantToList.qml                         |   2 +-
 .../qdeclarativelistview/data/displaylist.qml      |   2 +-
 .../qdeclarativelistview/data/footer.qml           |   2 +-
 .../qdeclarativelistview/data/itemlist.qml         |   2 +-
 .../data/listview-enforcerange.qml                 |   2 +-
 .../data/listview-initCurrent.qml                  |   2 +-
 .../data/listview-sections.qml                     |   2 +-
 .../qdeclarativelistview/data/listviewtest.qml     |   2 +-
 .../qdeclarativelistview/data/manual-highlight.qml |   2 +-
 .../data/propertychangestest.qml                   |   2 +-
 .../data/strictlyenforcerange.qml                  |   2 +-
 .../tst_qdeclarativelistview.cpp                   |   4 +-
 .../qdeclarativeloader/data/AnchoredLoader.qml     |   2 +-
 .../qdeclarativeloader/data/BlueRect.qml           |   2 +-
 .../data/GraphicsWidget250x250.qml                 |   2 +-
 .../qdeclarativeloader/data/GreenRect.qml          |   2 +-
 .../qdeclarativeloader/data/NoResize.qml           |   2 +-
 .../data/NoResizeGraphicsWidget.qml                |   2 +-
 .../qdeclarativeloader/data/Rect120x60.qml         |   2 +-
 .../qdeclarativeloader/data/SetSourceComponent.qml |   2 +-
 .../data/SizeGraphicsWidgetToLoader.qml            |   2 +-
 .../data/SizeLoaderToGraphicsWidget.qml            |   2 +-
 .../qdeclarativeloader/data/SizeToItem.qml         |   2 +-
 .../qdeclarativeloader/data/SizeToLoader.qml       |   2 +-
 .../qdeclarativeloader/data/VmeError.qml           |   2 +-
 .../declarative/qdeclarativeloader/data/crash.qml  |   2 +-
 .../qdeclarativeloader/data/differentorigin.qml    |   2 +-
 .../qdeclarativeloader/data/nonItem.qml            |   2 +-
 .../qdeclarativeloader/data/sameorigin-load.qml    |   2 +-
 .../qdeclarativeloader/data/sameorigin.qml         |   2 +-
 .../qdeclarativeloader/data/vmeErrors.qml          |   2 +-
 .../qdeclarativeloader/tst_qdeclarativeloader.cpp  |  14 +-
 .../qdeclarativemousearea/data/clickandhold.qml    |   2 +-
 .../qdeclarativemousearea/data/doubleclick.qml     |   2 +-
 .../qdeclarativemousearea/data/dragging.qml        |   2 +-
 .../qdeclarativemousearea/data/dragproperties.qml  |   2 +-
 .../qdeclarativemousearea/data/dragreset.qml       |   2 +-
 .../qdeclarativemousearea/data/rejectEvent.qml     |   2 +-
 .../data/updateMousePosOnClick.qml                 |   2 +-
 .../data/updateMousePosOnResize.qml                |   2 +-
 .../data/particlemotiontest.qml                    |   2 +-
 .../qdeclarativeparticles/data/particlestest.qml   |   2 +-
 .../qdeclarativepathview/data/datamodel.qml        |   2 +-
 .../qdeclarativepathview/data/displaypath.qml      |   2 +-
 .../qdeclarativepathview/data/emptymodel.qml       |   2 +-
 .../data/pathUpdateOnStartChanged.qml              |   2 +-
 .../qdeclarativepathview/data/pathtest.qml         |   2 +-
 .../qdeclarativepathview/data/pathview0.qml        |   2 +-
 .../qdeclarativepathview/data/pathview1.qml        |   2 +-
 .../qdeclarativepathview/data/pathview2.qml        |   2 +-
 .../qdeclarativepathview/data/pathview3.qml        |   2 +-
 .../qdeclarativepathview/data/pathview_package.qml |   2 +-
 .../qdeclarativepathview/data/propertychanges.qml  |   2 +-
 .../tst_qdeclarativepathview.cpp                   |   2 +-
 .../data/flow-testimplicitsize.qml                 |   4 +-
 .../qdeclarativepositioners/data/flowtest.qml      |   2 +-
 .../qdeclarativepositioners/data/grid-animated.qml |   2 +-
 .../qdeclarativepositioners/data/grid-spacing.qml  |   2 +-
 .../data/grid-toptobottom.qml                      |   2 +-
 .../qdeclarativepositioners/data/gridtest.qml      |   2 +-
 .../data/gridzerocolumns.qml                       |   2 +-
 .../data/horizontal-animated.qml                   |   2 +-
 .../data/horizontal-spacing.qml                    |   2 +-
 .../qdeclarativepositioners/data/horizontal.qml    |   2 +-
 .../data/propertychangestest.qml                   |   2 +-
 .../qdeclarativepositioners/data/repeatertest.qml  |   2 +-
 .../data/vertical-animated.qml                     |   2 +-
 .../data/vertical-spacing.qml                      |   2 +-
 .../qdeclarativepositioners/data/vertical.qml      |   2 +-
 .../data/verticalqgraphicswidget.qml               |   2 +-
 .../tst_qdeclarativepositioners.cpp                |  28 ++--
 .../qdeclarativeproperty/data/TestType.qml         |   2 +-
 .../data/readSynthesizedObject.qml                 |   2 +-
 .../tst_qdeclarativepropertymap.cpp                |   4 +-
 .../auto/declarative/qdeclarativeqt/data/atob.qml  |   2 +-
 .../auto/declarative/qdeclarativeqt/data/btoa.qml  |   2 +-
 .../declarative/qdeclarativeqt/data/consoleLog.qml |   2 +-
 .../qdeclarativeqt/data/createComponent.qml        |   2 +-
 .../qdeclarativeqt/data/createComponentData.qml    |   2 +-
 .../qdeclarativeqt/data/createComponent_lib.qml    |   2 +-
 .../qdeclarativeqt/data/createQmlObject.qml        |  16 +-
 .../declarative/qdeclarativeqt/data/darker.qml     |   2 +-
 .../auto/declarative/qdeclarativeqt/data/enums.qml |   2 +-
 .../qdeclarativeqt/data/fontFamilies.qml           |   2 +-
 .../declarative/qdeclarativeqt/data/formatting.qml |   2 +-
 .../auto/declarative/qdeclarativeqt/data/hsla.qml  |   2 +-
 .../declarative/qdeclarativeqt/data/isQtObject.qml |   2 +-
 .../declarative/qdeclarativeqt/data/lighter.qml    |   2 +-
 tests/auto/declarative/qdeclarativeqt/data/md5.qml |   2 +-
 .../qdeclarativeqt/data/openUrlExternally.qml      |   2 +-
 .../auto/declarative/qdeclarativeqt/data/point.qml |   2 +-
 .../auto/declarative/qdeclarativeqt/data/rect.qml  |   2 +-
 .../auto/declarative/qdeclarativeqt/data/rgba.qml  |   2 +-
 .../auto/declarative/qdeclarativeqt/data/size.qml  |   2 +-
 .../auto/declarative/qdeclarativeqt/data/tint.qml  |   2 +-
 .../declarative/qdeclarativeqt/data/vector.qml     |   2 +-
 .../qdeclarativerepeater/data/intmodel.qml         |   2 +-
 .../qdeclarativerepeater/data/itemlist.qml         |   2 +-
 .../qdeclarativerepeater/data/objlist.qml          |   2 +-
 .../qdeclarativerepeater/data/properties.qml       |   2 +-
 .../qdeclarativerepeater/data/repeater1.qml        |   2 +-
 .../qdeclarativerepeater/data/repeater2.qml        |   2 +-
 .../tst_qdeclarativerepeater.cpp                   |   2 +-
 .../data/backtrace1.qml                            |   2 +-
 .../data/smoothedanimation1.qml                    |   2 +-
 .../data/smoothedanimation2.qml                    |   2 +-
 .../data/smoothedanimation3.qml                    |   2 +-
 .../data/smoothedanimationBehavior.qml             |   2 +-
 .../data/smoothedanimationValueSource.qml          |   2 +-
 .../data/springanimation1.qml                      |   2 +-
 .../data/springanimation2.qml                      |   2 +-
 .../data/springanimation3.qml                      |   2 +-
 .../tst_qdeclarativesqldatabase.cpp                |   2 +-
 .../qdeclarativestates/data/ExtendedRectangle.qml  |   2 +-
 .../data/Implementation/MyType.qml                 |   2 +-
 .../qdeclarativestates/data/anchorChanges1.qml     |   2 +-
 .../qdeclarativestates/data/anchorChanges2.qml     |   2 +-
 .../qdeclarativestates/data/anchorChanges3.qml     |   2 +-
 .../qdeclarativestates/data/anchorChanges4.qml     |   2 +-
 .../qdeclarativestates/data/anchorChanges5.qml     |   2 +-
 .../qdeclarativestates/data/anchorChangesCrash.qml |   2 +-
 .../qdeclarativestates/data/anchorRewindBug.qml    |   4 +-
 .../qdeclarativestates/data/anchorRewindBug2.qml   |   2 +-
 .../data/attachedPropertyChanges.qml               |   2 +-
 .../data/autoStateAtStartupRestoreBug.qml          |   2 +-
 .../qdeclarativestates/data/basicBinding.qml       |   2 +-
 .../qdeclarativestates/data/basicBinding2.qml      |   2 +-
 .../qdeclarativestates/data/basicBinding3.qml      |   2 +-
 .../qdeclarativestates/data/basicBinding4.qml      |   2 +-
 .../qdeclarativestates/data/basicChanges.qml       |   2 +-
 .../qdeclarativestates/data/basicChanges2.qml      |   2 +-
 .../qdeclarativestates/data/basicChanges3.qml      |   2 +-
 .../qdeclarativestates/data/basicChanges4.qml      |   2 +-
 .../qdeclarativestates/data/basicExtension.qml     |   2 +-
 .../qdeclarativestates/data/deleting.qml           |   2 +-
 .../qdeclarativestates/data/deletingState.qml      |   2 +-
 .../qdeclarativestates/data/editProperties.qml     |   2 +-
 .../qdeclarativestates/data/explicit.qml           |   2 +-
 .../qdeclarativestates/data/extendsBug.qml         |   2 +-
 .../qdeclarativestates/data/fakeExtension.qml      |   2 +-
 .../qdeclarativestates/data/illegalObj.qml         |   2 +-
 .../qdeclarativestates/data/illegalTempState.qml   |   2 +-
 .../qdeclarativestates/data/legalTempState.qml     |   2 +-
 .../qdeclarativestates/data/nonExistantProp.qml    |   2 +-
 .../qdeclarativestates/data/parentChange1.qml      |   2 +-
 .../qdeclarativestates/data/parentChange2.qml      |   2 +-
 .../qdeclarativestates/data/parentChange3.qml      |   2 +-
 .../qdeclarativestates/data/parentChange4.qml      |   2 +-
 .../qdeclarativestates/data/parentChange5.qml      |   2 +-
 .../qdeclarativestates/data/parentChange6.qml      |   2 +-
 .../qdeclarativestates/data/propertyErrors.qml     |   2 +-
 .../declarative/qdeclarativestates/data/reset.qml  |   2 +-
 .../qdeclarativestates/data/restoreEntryValues.qml |   2 +-
 .../qdeclarativestates/data/returnToBase.qml       |   2 +-
 .../declarative/qdeclarativestates/data/script.qml |   2 +-
 .../qdeclarativestates/data/signalOverride.qml     |   2 +-
 .../qdeclarativestates/data/signalOverride2.qml    |   2 +-
 .../data/signalOverrideCrash.qml                   |   2 +-
 .../data/signalOverrideCrash2.qml                  |   2 +-
 .../qdeclarativestates/data/unnamedWhen.qml        |   2 +-
 .../qdeclarativestates/data/urlResolution.qml      |   2 +-
 .../qdeclarativestates/data/whenOrdering.qml       |   2 +-
 .../tst_qdeclarativesystempalette.cpp              |   8 +-
 .../qdeclarativetext/data/alignments.qml           |   2 +-
 .../qdeclarativetext/data/embeddedImagesLocal.qml  |   2 +-
 .../data/embeddedImagesLocalError.qml              |   2 +-
 .../qdeclarativetext/data/embeddedImagesRemote.qml |   2 +-
 .../data/embeddedImagesRemoteError.qml             |   2 +-
 .../declarative/qdeclarativetext/data/rotated.qml  |   2 +-
 .../qdeclarativetext/tst_qdeclarativetext.cpp      | 110 +++++++-------
 .../qdeclarativetextedit/data/alignments.qml       |   2 +-
 .../qdeclarativetextedit/data/cursorTest.qml       |   2 +-
 .../qdeclarativetextedit/data/geometrySignals.qml  |   2 +-
 .../qdeclarativetextedit/data/http/ErrItem.qml     |   2 +-
 .../qdeclarativetextedit/data/http/NormItem.qml    |   2 +-
 .../data/http/cursorHttpTest.qml                   |   2 +-
 .../data/http/cursorHttpTestFail1.qml              |   2 +-
 .../data/http/cursorHttpTestFail2.qml              |   2 +-
 .../data/http/cursorHttpTestPass.qml               |   2 +-
 .../data/httpfail/FailItem.qml                     |   2 +-
 .../data/httpslow/WaitItem.qml                     |   2 +-
 .../qdeclarativetextedit/data/inputmethodhints.qml |   2 +-
 .../data/mouseselection_default.qml                |   2 +-
 .../data/mouseselection_false.qml                  |   2 +-
 .../data/mouseselection_true.qml                   |   2 +-
 .../qdeclarativetextedit/data/navigation.qml       |   2 +-
 .../qdeclarativetextedit/data/readOnly.qml         |   2 +-
 .../tst_qdeclarativetextedit.cpp                   |  64 ++++----
 .../qdeclarativetextinput/data/cursorTest.qml      |   2 +-
 .../qdeclarativetextinput/data/echoMode.qml        |   2 +-
 .../qdeclarativetextinput/data/geometrySignals.qml |   2 +-
 .../data/horizontalAlignment.qml                   |   2 +-
 .../qdeclarativetextinput/data/inputmethods.qml    |   2 +-
 .../qdeclarativetextinput/data/masks.qml           |   2 +-
 .../qdeclarativetextinput/data/maxLength.qml       |   2 +-
 .../qdeclarativetextinput/data/navigation.qml      |   2 +-
 .../qdeclarativetextinput/data/positionAt.qml      |   2 +-
 .../qdeclarativetextinput/data/readOnly.qml        |   2 +-
 .../qdeclarativetextinput/data/validators.qml      |   2 +-
 .../tst_qdeclarativetextinput.cpp                  |  34 ++---
 .../qdeclarativetimer/tst_qdeclarativetimer.cpp    |  18 +--
 .../qdeclarativevaluetypes/data/conflicting.1.qml  |   2 +-
 .../qdeclarativevaluetypes/data/conflicting.2.qml  |   2 +-
 .../qdeclarativevaluetypes/data/conflicting.3.qml  |   2 +-
 .../qdeclarativevaluetypes/data/deletedObject.qml  |   2 +-
 .../qdeclarativevaluetypes/data/enums.3.qml        |   2 +-
 .../qdeclarativevaluetypes/data/enums.4.qml        |   2 +-
 .../qdeclarativevaluetypes/data/enums.5.qml        |   2 +-
 .../qdeclarativevaluetypes/data/font_write.5.qml   |   2 +-
 .../qdeclarativevaluetypes/data/returnValues.qml   |   2 +-
 .../qdeclarativevaluetypes/data/scriptAccess.qml   |   2 +-
 .../data/sizereadonly_writeerror4.qml              |   2 +-
 .../qdeclarativevaluetypes/data/varAssignment.qml  |   2 +-
 .../data/resizemodedeclarativeitem.qml             |   2 +-
 .../data/resizemodegraphicswidget.qml              |   2 +-
 .../qdeclarativeviewer/data/orientation.qml        |   2 +-
 .../qdeclarativevisualdatamodel/data/datalist.qml  |   2 +-
 .../data/objectlist.qml                            |   2 +-
 .../data/singlerole1.qml                           |   2 +-
 .../data/singlerole2.qml                           |   2 +-
 .../data/visualdatamodel.qml                       |   2 +-
 .../declarative/qdeclarativewebview/data/basic.qml |   2 +-
 .../qdeclarativewebview/data/elements.qml          |   2 +-
 .../qdeclarativewebview/data/javaScript.qml        |   2 +-
 .../qdeclarativewebview/data/loadError.qml         |   2 +-
 .../qdeclarativewebview/data/newwindows.qml        |   2 +-
 .../qdeclarativewebview/data/propertychanges.qml   |   2 +-
 .../qdeclarativewebview/data/sethtml.qml           |   2 +-
 .../tst_qdeclarativewebview.cpp                    |   2 +-
 .../qdeclarativeworkerscript/data/BaseWorker.qml   |   2 +-
 .../qdeclarativeworkerscript/data/worker.qml       |   2 +-
 .../data/worker_pragma.qml                         |   2 +-
 .../qdeclarativexmlhttprequest/data/abort.qml      |   2 +-
 .../data/abort_opened.qml                          |   2 +-
 .../data/abort_unsent.qml                          |   2 +-
 .../qdeclarativexmlhttprequest/data/attr.qml       |   2 +-
 .../data/callbackException.qml                     |   2 +-
 .../qdeclarativexmlhttprequest/data/cdata.qml      |   2 +-
 .../data/constructor.qml                           |   2 +-
 .../data/defaultState.qml                          |   2 +-
 .../qdeclarativexmlhttprequest/data/document.qml   |   2 +-
 .../data/domExceptionCodes.qml                     |   2 +-
 .../qdeclarativexmlhttprequest/data/element.qml    |   2 +-
 .../data/getAllResponseHeaders.qml                 |   2 +-
 .../data/getAllResponseHeaders_args.qml            |   2 +-
 .../data/getAllResponseHeaders_sent.qml            |   2 +-
 .../data/getAllResponseHeaders_unsent.qml          |   2 +-
 .../data/getResponseHeader.qml                     |   2 +-
 .../data/getResponseHeader_args.qml                |   2 +-
 .../data/getResponseHeader_sent.qml                |   2 +-
 .../data/getResponseHeader_unsent.qml              |   2 +-
 .../data/instanceStateValues.qml                   |   2 +-
 .../data/invalidMethodUsage.qml                    |   2 +-
 .../qdeclarativexmlhttprequest/data/open.qml       |   2 +-
 .../data/open_arg_count.1.qml                      |   2 +-
 .../data/open_arg_count.2.qml                      |   2 +-
 .../data/open_invalid_method.qml                   |   2 +-
 .../qdeclarativexmlhttprequest/data/open_sync.qml  |   2 +-
 .../qdeclarativexmlhttprequest/data/open_user.qml  |   2 +-
 .../data/open_username.qml                         |   2 +-
 .../data/redirectError.qml                         |   2 +-
 .../data/redirectRecur.qml                         |   2 +-
 .../qdeclarativexmlhttprequest/data/redirects.qml  |   2 +-
 .../data/responseText.qml                          |   2 +-
 .../data/responseXML_invalid.qml                   |   2 +-
 .../data/send_alreadySent.qml                      |   2 +-
 .../data/send_data.1.qml                           |   2 +-
 .../data/send_data.2.qml                           |   2 +-
 .../data/send_data.3.qml                           |   2 +-
 .../data/send_data.4.qml                           |   2 +-
 .../data/send_data.5.qml                           |   2 +-
 .../data/send_data.6.qml                           |   2 +-
 .../data/send_data.7.qml                           |   2 +-
 .../data/send_ignoreData.qml                       |   2 +-
 .../data/send_unsent.qml                           |   2 +-
 .../data/setRequestHeader.qml                      |   2 +-
 .../data/setRequestHeader_args.qml                 |   2 +-
 .../data/setRequestHeader_illegalName.qml          |   2 +-
 .../data/setRequestHeader_sent.qml                 |   2 +-
 .../data/setRequestHeader_unsent.qml               |   2 +-
 .../data/staticStateValues.qml                     |   2 +-
 .../qdeclarativexmlhttprequest/data/status.qml     |   2 +-
 .../qdeclarativexmlhttprequest/data/statusText.qml |   2 +-
 .../qdeclarativexmlhttprequest/data/text.qml       |   2 +-
 .../qdeclarativexmlhttprequest/data/utf16.qml      |   2 +-
 .../qdeclarativexmllistmodel/data/model.qml        |   2 +-
 .../qdeclarativexmllistmodel/data/model2.qml       |   2 +-
 .../data/propertychanges.qml                       |   2 +-
 .../qdeclarativexmllistmodel/data/recipes.qml      |   2 +-
 .../qdeclarativexmllistmodel/data/roleErrors.qml   |   2 +-
 .../qdeclarativexmllistmodel/data/roleKeys.qml     |   2 +-
 .../qdeclarativexmllistmodel/data/unique.qml       |   2 +-
 .../auto/declarative/qmlvisual/ListView/basic1.qml |   2 +-
 .../auto/declarative/qmlvisual/ListView/basic2.qml |   2 +-
 .../auto/declarative/qmlvisual/ListView/basic3.qml |   2 +-
 .../auto/declarative/qmlvisual/ListView/basic4.qml |   2 +-
 .../declarative/qmlvisual/ListView/itemlist.qml    |   2 +-
 .../declarative/qmlvisual/ListView/listview.qml    |   2 +-
 .../qmlvisual/Package_Views/packageviews.qml       |   2 +-
 .../bindinganimation/bindinganimation.qml          |   2 +-
 .../colorAnimation/colorAnimation-visual.qml       |   2 +-
 .../qmlvisual/animation/easing/easing.qml          |   2 +-
 .../declarative/qmlvisual/animation/loop/loop.qml  |   2 +-
 .../parallelAnimation/parallelAnimation-visual.qml |   2 +-
 .../parentAnimation/parentAnimation-visual.qml     |   2 +-
 .../parentAnimation2/parentAnimation2.qml          |   2 +-
 .../pauseAnimation/pauseAnimation-visual.qml       |   2 +-
 .../propertyAction/propertyAction-visual.qml       |   2 +-
 .../qmlvisual/animation/qtbug10586/qtbug10586.qml  |   2 +-
 .../qmlvisual/animation/qtbug13398/qtbug13398.qml  |   2 +-
 .../qmlvisual/animation/reanchor/reanchor.qml      |   2 +-
 .../animation/scriptAction/scriptAction-visual.qml |   2 +-
 .../declarative/qmlvisual/fillmode/fillmode.qml    |   2 +-
 .../auto/declarative/qmlvisual/focusscope/test.qml |   2 +-
 .../declarative/qmlvisual/focusscope/test2.qml     |   2 +-
 .../declarative/qmlvisual/focusscope/test3.qml     |   2 +-
 .../qdeclarativeborderimage/animated-smooth.qml    |   2 +-
 .../qmlvisual/qdeclarativeborderimage/animated.qml |   2 +-
 .../qmlvisual/qdeclarativeborderimage/borders.qml  |   2 +-
 .../content/MyBorderImage.qml                      |   2 +-
 .../qdeclarativeflickable/flickable-horizontal.qml |   2 +-
 .../qdeclarativeflickable/flickable-vertical.qml   |   2 +-
 .../qdeclarativeflipable/test-flipable.qml         |   2 +-
 .../qdeclarativeflipable/test_flipable_resize.qml  |   2 +-
 .../qmlvisual/qdeclarativegridview/gridview.qml    |   2 +-
 .../qmlvisual/qdeclarativegridview/gridview2.qml   |   2 +-
 .../qmlvisual/qdeclarativemousearea/drag.qml       |   2 +-
 .../qdeclarativemousearea/mousearea-flickable.qml  |   2 +-
 .../qdeclarativemousearea/mousearea-visual.qml     |   2 +-
 .../qmlvisual/qdeclarativeparticles/particles.qml  |   2 +-
 .../qdeclarativepathview/test-pathview-2.qml       |   2 +-
 .../qdeclarativepathview/test-pathview.qml         |   2 +-
 .../qmlvisual/qdeclarativepositioners/dynamic.qml  |   2 +-
 .../qdeclarativepositioners/usingRepeater.qml      |   2 +-
 .../smoothedanimation.qml                          |   2 +-
 .../smoothedfollow.qml                             |   2 +-
 .../qmlvisual/qdeclarativespringfollow/clock.qml   |   2 +-
 .../qmlvisual/qdeclarativespringfollow/follow.qml  |   2 +-
 .../qdeclarativetext/baseline/parentanchor.qml     |   2 +-
 .../qmlvisual/qdeclarativetext/elide/elide.qml     |   2 +-
 .../qmlvisual/qdeclarativetext/elide/elide2.qml    |   2 +-
 .../qdeclarativetext/elide/multilength.qml         |   2 +-
 .../qmlvisual/qdeclarativetext/font/plaintext.qml  |   2 +-
 .../qmlvisual/qdeclarativetext/font/richtext.qml   |   2 +-
 .../qdeclarativetextedit/MultilineEdit.qml         |   2 +-
 .../qdeclarativetextedit/cursorDelegate.qml        |   2 +-
 .../qmlvisual/qdeclarativetextedit/qt-669.qml      |   2 +-
 .../qdeclarativetextedit/usingMultilineEdit.qml    |   2 +-
 .../qmlvisual/qdeclarativetextedit/wrap.qml        |   2 +-
 .../qmlvisual/qdeclarativetextinput/LineEdit.qml   |   2 +-
 .../qdeclarativetextinput/cursorDelegate.qml       |   2 +-
 .../qmlvisual/qdeclarativetextinput/echoMode.qml   |   2 +-
 .../qmlvisual/qdeclarativetextinput/hAlign.qml     |   2 +-
 .../qdeclarativetextinput/usingLineEdit.qml        |   2 +-
 .../declarative/qmlvisual/rect/GradientRect.qml    |   2 +-
 tests/auto/declarative/qmlvisual/rect/MyRect.qml   |   2 +-
 .../declarative/qmlvisual/rect/rect-painting.qml   |   2 +-
 .../auto/declarative/qmlvisual/repeater/basic1.qml |   2 +-
 .../auto/declarative/qmlvisual/repeater/basic2.qml |   2 +-
 .../auto/declarative/qmlvisual/repeater/basic3.qml |   2 +-
 .../auto/declarative/qmlvisual/repeater/basic4.qml |   2 +-
 .../selftest_noimages/selftest_noimages.qml        |   2 +-
 .../qmlvisual/webview/autosize/autosize.qml        |   2 +-
 .../webview/javascript/evaluateJavaScript.qml      |   2 +-
 .../qmlvisual/webview/javascript/windowObjects.qml |   2 +-
 .../qmlvisual/webview/settings/fontFamily.qml      |   2 +-
 .../qmlvisual/webview/settings/fontSize.qml        |   2 +-
 .../webview/settings/noAutoLoadImages.qml          |   2 +-
 .../qmlvisual/webview/settings/setFontFamily.qml   |   2 +-
 .../qmlvisual/webview/zooming/pageWidth.qml        |   2 +-
 .../qmlvisual/webview/zooming/renderControl.qml    |   2 +-
 .../qmlvisual/webview/zooming/resolution.qml       |   2 +-
 .../qmlvisual/webview/zooming/zoomTextOnly.qml     |   2 +-
 .../qmlvisual/webview/zooming/zooming.qml          |   2 +-
 .../lupdate/testdata/good/parseqml/main.qml        |   2 +-
 .../declarative/compilation/data/BoomBlock.qml     |   2 +-
 .../benchmarks/declarative/creation/data/item.qml  |   2 +-
 .../declarative/creation/data/qobject.qml          |   2 +-
 .../declarative/creation/tst_creation.cpp          |   2 +-
 .../qdeclarativecomponent/data/object.qml          |   2 +-
 .../qdeclarativecomponent/data/object_id.qml       |   2 +-
 .../data/samegame/BoomBlock.qml                    |   2 +-
 .../data/synthesized_properties.2.qml              |   2 +-
 .../data/synthesized_properties.qml                |   2 +-
 .../qdeclarativemetaproperty/data/object.qml       |   2 +-
 .../data/synthesized_object.qml                    |   2 +-
 tests/benchmarks/declarative/qmltime/example.qml   |   2 +-
 .../declarative/qmltime/tests/anchors/empty.qml    |   2 +-
 .../declarative/qmltime/tests/anchors/fill.qml     |   2 +-
 .../declarative/qmltime/tests/anchors/null.qml     |   2 +-
 .../declarative/qmltime/tests/animation/large.qml  |   2 +-
 .../qmltime/tests/animation/largeNoProps.qml       |   2 +-
 .../qmltime/tests/item_creation/children.qml       |   2 +-
 .../qmltime/tests/item_creation/data.qml           |   2 +-
 .../qmltime/tests/item_creation/no_creation.qml    |   2 +-
 .../qmltime/tests/item_creation/resources.qml      |   2 +-
 .../declarative/qmltime/tests/loader/Loaded.qml    |   2 +-
 .../qmltime/tests/loader/component_loader.qml      |   2 +-
 .../qmltime/tests/loader/empty_loader.qml          |   2 +-
 .../declarative/qmltime/tests/loader/no_loader.qml |   2 +-
 .../qmltime/tests/loader/source_loader.qml         |   2 +-
 .../tests/positioner_creation/no_positioner.qml    |   2 +-
 .../tests/positioner_creation/null_positioner.qml  |   2 +-
 .../tests/positioner_creation/positioner.qml       |   2 +-
 .../qmltime/tests/vmemetaobject/null.qml           |   2 +-
 .../qmltime/tests/vmemetaobject/property.qml       |   2 +-
 .../declarative/script/data/CustomObject.qml       |   2 +-
 tests/benchmarks/declarative/script/data/block.qml |   2 +-
 .../declarative/script/data/global_prop.qml        |   2 +-
 tools/qml/browser/Browser.qml                      |   2 +-
 tools/qml/startup/Logo.qml                         |   2 +-
 tools/qml/startup/startup.qml                      |   2 +-
 1095 files changed, 1417 insertions(+), 1417 deletions(-)

diff --git a/demos/declarative/calculator/Core/Button.qml b/demos/declarative/calculator/Core/Button.qml
index 7b19feb..f37de48 100644
--- a/demos/declarative/calculator/Core/Button.qml
+++ b/demos/declarative/calculator/Core/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 BorderImage {
     id: button
diff --git a/demos/declarative/calculator/Core/Display.qml b/demos/declarative/calculator/Core/Display.qml
index 53f74c9..f928d3a 100644
--- a/demos/declarative/calculator/Core/Display.qml
+++ b/demos/declarative/calculator/Core/Display.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 BorderImage {
     id: image
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 68c922b..3e1c650 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "Core"
 import "Core/calculator.js" as CalcEngine
 
diff --git a/demos/declarative/flickr/common/Progress.qml b/demos/declarative/flickr/common/Progress.qml
index 23bffb9..b928554 100644
--- a/demos/declarative/flickr/common/Progress.qml
+++ b/demos/declarative/flickr/common/Progress.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property variant progress: 0
diff --git a/demos/declarative/flickr/common/RssModel.qml b/demos/declarative/flickr/common/RssModel.qml
index b4ea3ce..0c1c834 100644
--- a/demos/declarative/flickr/common/RssModel.qml
+++ b/demos/declarative/flickr/common/RssModel.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     property string tags : ""
diff --git a/demos/declarative/flickr/common/ScrollBar.qml b/demos/declarative/flickr/common/ScrollBar.qml
index 1574915..dfe3cbf 100644
--- a/demos/declarative/flickr/common/ScrollBar.qml
+++ b/demos/declarative/flickr/common/ScrollBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/flickr/common/Slider.qml b/demos/declarative/flickr/common/Slider.qml
index faa2e5f..edccc7d 100644
--- a/demos/declarative/flickr/common/Slider.qml
+++ b/demos/declarative/flickr/common/Slider.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: slider; width: 400; height: 16
diff --git a/demos/declarative/flickr/flickr-90.qml b/demos/declarative/flickr/flickr-90.qml
index 3db44de..31b1d91 100644
--- a/demos/declarative/flickr/flickr-90.qml
+++ b/demos/declarative/flickr/flickr-90.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 480; height: 320
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 152f9f9..1533c04 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "common" as Common
 import "mobile" as Mobile
 
diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index 6228606..74a7dbb 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index c368e95..8f01292 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: wrapper; width: GridView.view.cellWidth; height: GridView.view.cellHeight
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 6408fc6..5dd3b4e 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "../common" as Common
 
 Flipable {
diff --git a/demos/declarative/flickr/mobile/ListDelegate.qml b/demos/declarative/flickr/mobile/ListDelegate.qml
index 9ec02e1..0773547 100644
--- a/demos/declarative/flickr/mobile/ListDelegate.qml
+++ b/demos/declarative/flickr/mobile/ListDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     Item {
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index 60ca4dc..f283307 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: titleBar
diff --git a/demos/declarative/flickr/mobile/ToolBar.qml b/demos/declarative/flickr/mobile/ToolBar.qml
index b9cb915..55f19d2 100644
--- a/demos/declarative/flickr/mobile/ToolBar.qml
+++ b/demos/declarative/flickr/mobile/ToolBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: toolbar
diff --git a/demos/declarative/minehunt/MinehuntCore/Explosion.qml b/demos/declarative/minehunt/MinehuntCore/Explosion.qml
index b2644ff..f04d033 100644
--- a/demos/declarative/minehunt/MinehuntCore/Explosion.qml
+++ b/demos/declarative/minehunt/MinehuntCore/Explosion.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/demos/declarative/minehunt/MinehuntCore/Tile.qml b/demos/declarative/minehunt/MinehuntCore/Tile.qml
index 64dd63c..1853ed9 100644
--- a/demos/declarative/minehunt/MinehuntCore/Tile.qml
+++ b/demos/declarative/minehunt/MinehuntCore/Tile.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
     id: flipable
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 4accb52..eb67b06 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "MinehuntCore" 1.0
 
 Item {
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 0df8155..9001033 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     id: albumDelegate
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
index e55bf17..7b28930 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: container
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml b/demos/declarative/photoviewer/PhotoViewerCore/Button.qml
index 47b90c8..29f2bb7 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml b/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
index decc0fe..06f8062 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index dadb409..5948b5d 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "script/script.js" as Script
 
 Package {
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml b/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
index 779d342..a0756ae 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
index 29bad52..15bb67f 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     property string tags : ""
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml b/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
index 5e93046..9358975 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
     id: flipable
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
index 3072ea2..0f59c64 100644
--- a/demos/declarative/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "PhotoViewerCore"
 
 Rectangle {
diff --git a/demos/declarative/rssnews/content/BusyIndicator.qml b/demos/declarative/rssnews/content/BusyIndicator.qml
index 13f54f2..e305cbe 100644
--- a/demos/declarative/rssnews/content/BusyIndicator.qml
+++ b/demos/declarative/rssnews/content/BusyIndicator.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: container
diff --git a/demos/declarative/rssnews/content/CategoryDelegate.qml b/demos/declarative/rssnews/content/CategoryDelegate.qml
index edfb4bb..c4fa8cc 100644
--- a/demos/declarative/rssnews/content/CategoryDelegate.qml
+++ b/demos/declarative/rssnews/content/CategoryDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: delegate
diff --git a/demos/declarative/rssnews/content/NewsDelegate.qml b/demos/declarative/rssnews/content/NewsDelegate.qml
index cfe9b00..cf88f4e 100644
--- a/demos/declarative/rssnews/content/NewsDelegate.qml
+++ b/demos/declarative/rssnews/content/NewsDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: delegate
diff --git a/demos/declarative/rssnews/content/RssFeeds.qml b/demos/declarative/rssnews/content/RssFeeds.qml
index 62e7f14..37c4b69 100644
--- a/demos/declarative/rssnews/content/RssFeeds.qml
+++ b/demos/declarative/rssnews/content/RssFeeds.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     id: rssFeeds
diff --git a/demos/declarative/rssnews/content/ScrollBar.qml b/demos/declarative/rssnews/content/ScrollBar.qml
index e0214d2..f20f0aa 100644
--- a/demos/declarative/rssnews/content/ScrollBar.qml
+++ b/demos/declarative/rssnews/content/ScrollBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/rssnews/rssnews.qml b/demos/declarative/rssnews/rssnews.qml
index fb5b5a3..f6fe188 100644
--- a/demos/declarative/rssnews/rssnews.qml
+++ b/demos/declarative/rssnews/rssnews.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
index 43050af..afda29c 100644
--- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml
+++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml
index d5979b2..7fb7b65 100644
--- a/demos/declarative/samegame/SamegameCore/Button.qml
+++ b/demos/declarative/samegame/SamegameCore/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/SamegameCore/Dialog.qml
index 7e64bd6..e1f3900 100644
--- a/demos/declarative/samegame/SamegameCore/Dialog.qml
+++ b/demos/declarative/samegame/SamegameCore/Dialog.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index 3e9c505..f66c40e 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "SamegameCore"
 import "SamegameCore/samegame.js" as Logic
 
diff --git a/demos/declarative/snake/content/Button.qml b/demos/declarative/snake/content/Button.qml
index 5d9eebe..cf4519d 100644
--- a/demos/declarative/snake/content/Button.qml
+++ b/demos/declarative/snake/content/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/demos/declarative/snake/content/Cookie.qml b/demos/declarative/snake/content/Cookie.qml
index eb57fd2..b4af9fe 100644
--- a/demos/declarative/snake/content/Cookie.qml
+++ b/demos/declarative/snake/content/Cookie.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item  {
diff --git a/demos/declarative/snake/content/HighScoreModel.qml b/demos/declarative/snake/content/HighScoreModel.qml
index 42482f8..e3a4704 100644
--- a/demos/declarative/snake/content/HighScoreModel.qml
+++ b/demos/declarative/snake/content/HighScoreModel.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 // Models a high score table.
 //
diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml
index 942008d..16b6e1e 100644
--- a/demos/declarative/snake/content/Link.qml
+++ b/demos/declarative/snake/content/Link.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item { id:link
diff --git a/demos/declarative/snake/content/Skull.qml b/demos/declarative/snake/content/Skull.qml
index 0cc6186..1a3ff7e 100644
--- a/demos/declarative/snake/content/Skull.qml
+++ b/demos/declarative/snake/content/Skull.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     property bool spawned: false
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 4d989df..5b69217 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content" as Content
 import "content/snake.js" as Logic
 
diff --git a/demos/declarative/twitter/TwitterCore/Button.qml b/demos/declarative/twitter/TwitterCore/Button.qml
index 437b013..a1fc2a2 100644
--- a/demos/declarative/twitter/TwitterCore/Button.qml
+++ b/demos/declarative/twitter/TwitterCore/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/twitter/TwitterCore/FatDelegate.qml b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
index 27dd300..896abbe 100644
--- a/demos/declarative/twitter/TwitterCore/FatDelegate.qml
+++ b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     id: listDelegate
diff --git a/demos/declarative/twitter/TwitterCore/Input.qml b/demos/declarative/twitter/TwitterCore/Input.qml
index a33a995..b15f0d5 100644
--- a/demos/declarative/twitter/TwitterCore/Input.qml
+++ b/demos/declarative/twitter/TwitterCore/Input.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     id:container
diff --git a/demos/declarative/twitter/TwitterCore/Loading.qml b/demos/declarative/twitter/TwitterCore/Loading.qml
index b979291..afeafa0 100644
--- a/demos/declarative/twitter/TwitterCore/Loading.qml
+++ b/demos/declarative/twitter/TwitterCore/Loading.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: loading; source: "images/loading.png"
diff --git a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
index 29b7713..bc8e0de 100644
--- a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     TitleBar { id: titleBar; width: parent.width; height: 60;
diff --git a/demos/declarative/twitter/TwitterCore/RssModel.qml b/demos/declarative/twitter/TwitterCore/RssModel.qml
index d03cdb3..276df62 100644
--- a/demos/declarative/twitter/TwitterCore/RssModel.qml
+++ b/demos/declarative/twitter/TwitterCore/RssModel.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item { id: wrapper
     property variant model: xmlModel
diff --git a/demos/declarative/twitter/TwitterCore/SearchView.qml b/demos/declarative/twitter/TwitterCore/SearchView.qml
index 22df374..effab30 100644
--- a/demos/declarative/twitter/TwitterCore/SearchView.qml
+++ b/demos/declarative/twitter/TwitterCore/SearchView.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     id: wrapper
diff --git a/demos/declarative/twitter/TwitterCore/TitleBar.qml b/demos/declarative/twitter/TwitterCore/TitleBar.qml
index 70de81d..19da491 100644
--- a/demos/declarative/twitter/TwitterCore/TitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/TitleBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: titleBar
diff --git a/demos/declarative/twitter/TwitterCore/ToolBar.qml b/demos/declarative/twitter/TwitterCore/ToolBar.qml
index e18f5c6..4ef92ff 100644
--- a/demos/declarative/twitter/TwitterCore/ToolBar.qml
+++ b/demos/declarative/twitter/TwitterCore/ToolBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: toolbar
diff --git a/demos/declarative/twitter/TwitterCore/UserModel.qml b/demos/declarative/twitter/TwitterCore/UserModel.qml
index d8ca804..013b827 100644
--- a/demos/declarative/twitter/TwitterCore/UserModel.qml
+++ b/demos/declarative/twitter/TwitterCore/UserModel.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //This "model" gets the user information about the searched user. Mainly for the icon.
 
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index 6d224a2..4495523 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "TwitterCore" 1.0 as Twitter
 
 Item {
diff --git a/demos/declarative/webbrowser/content/Button.qml b/demos/declarative/webbrowser/content/Button.qml
index 2a2e7ef..2da1c11 100644
--- a/demos/declarative/webbrowser/content/Button.qml
+++ b/demos/declarative/webbrowser/content/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property alias image: icon.source
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index fb479d2..6f4e09c 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 Flickable {
diff --git a/demos/declarative/webbrowser/content/Header.qml b/demos/declarative/webbrowser/content/Header.qml
index d3ccae3..88e3000 100644
--- a/demos/declarative/webbrowser/content/Header.qml
+++ b/demos/declarative/webbrowser/content/Header.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: header
diff --git a/demos/declarative/webbrowser/content/ScrollBar.qml b/demos/declarative/webbrowser/content/ScrollBar.qml
index d3f272c..19309fa 100644
--- a/demos/declarative/webbrowser/content/ScrollBar.qml
+++ b/demos/declarative/webbrowser/content/ScrollBar.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/webbrowser/content/UrlInput.qml b/demos/declarative/webbrowser/content/UrlInput.qml
index 4f49821..0468b64 100644
--- a/demos/declarative/webbrowser/content/UrlInput.qml
+++ b/demos/declarative/webbrowser/content/UrlInput.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 3bff0fe..a21fa0b 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 import "content"
diff --git a/demos/qtdemo/qmlShell.qml b/demos/qtdemo/qmlShell.qml
index 24c12ae..2764865 100644
--- a/demos/qtdemo/qmlShell.qml
+++ b/demos/qtdemo/qmlShell.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: main
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 467b7d0..044c1e7 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -52,7 +52,7 @@ An \c import statement includes the module name, and possibly a version number.
 This can be seen in the snippet commonly found at the top of QML files:
 
 \qml
-    import Qt 4.7
+    import QtQuick 1.0
 \endqml
     
 This imports version 4.7 of the "Qt" module into the global namespace. (The QML 
@@ -126,7 +126,7 @@ application code. When importing an installed module, an un-quoted URI is
 used, with a mandatory version number:
 
 \code
-    import Qt 4.7
+    import QtQuick 1.0
     import com.nokia.qml.mymodule 1.0
 \endcode
 
@@ -181,7 +181,7 @@ By default, when a module is imported, its contents are imported into the global
 To import a module into a specific namespace, use the \e as keyword:
 
 \qml
-    import Qt 4.7 as QtLibrary
+    import QtQuick 1.0 as QtLibrary
     import "../MyComponents" as MyComponents
     import com.nokia.qml.mymodule 1.0 as MyModule
 \endqml
@@ -199,7 +199,7 @@ Types from these modules can then only be used when qualified by the namespace:
 Multiple modules can be imported into the same namespace in the same way that multiple modules can be imported into the global namespace:
 
 \qml
-    import Qt 4.7 as Nokia
+    import QtQuick 1.0 as Nokia
     import Ovi 1.0 as Nokia
 \endqml
 
diff --git a/doc/src/declarative/qdeclarativedebugging.qdoc b/doc/src/declarative/qdeclarativedebugging.qdoc
index 64c312c..26d3b38 100644
--- a/doc/src/declarative/qdeclarativedebugging.qdoc
+++ b/doc/src/declarative/qdeclarativedebugging.qdoc
@@ -59,7 +59,7 @@ from QML's import loading mechanisms.
 For example, for a simple QML file like this:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 100; height: 100 }
 \endqml
diff --git a/doc/src/declarative/qdeclarativedocument.qdoc b/doc/src/declarative/qdeclarativedocument.qdoc
index 8ca6c11..b6af90b 100644
--- a/doc/src/declarative/qdeclarativedocument.qdoc
+++ b/doc/src/declarative/qdeclarativedocument.qdoc
@@ -82,7 +82,7 @@ Each instance is created with a different value for its \c text property:
 \o \snippet doc/src/snippets/declarative/qml-documents/qmldocuments.qml document
 \o 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Column {
     spacing: 10
diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/doc/src/declarative/qdeclarativei18n.qdoc
index 70a3587..620b902 100644
--- a/doc/src/declarative/qdeclarativei18n.qdoc
+++ b/doc/src/declarative/qdeclarativei18n.qdoc
@@ -58,7 +58,7 @@ that needs to be translated is enclosed in a call to \c qsTr().
 
 hello.qml:
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index fa42f59..9d89edf 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -46,7 +46,7 @@ technologies like HTML and CSS, but it's not required.
 QML looks like this:
 
 \code
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index 9a84237..51f9e4d 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -60,7 +60,7 @@ QDeclarativeView is a QWidget-based class that is able to load QML files.
 For example, if there is a QML file, \c application.qml, like this:
 
 \qml
-    import Qt 4.7
+    import QtQuick 1.0
     
     Rectangle { width: 100; height: 100; color: "red" }
 \endqml
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index 41c4c80..81ad218 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -118,7 +118,7 @@ For example, this QML document refers to a \c lottoNumbers property which does
 not actually exist within the document:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 200; height: 300
@@ -131,7 +131,7 @@ If within the document's directory, there is a "dummydata" directory which
 contains a \c lottoNumbers.qml file like this:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement { number: 23 }
@@ -146,7 +146,7 @@ Child properties are included when loaded from dummy data. The following documen
 refers to a \c clock.time property:
 
 \qml
-import Qt 4.7    
+import QtQuick 1.0    
 Text { text: clock.time }
 \endqml
     
@@ -154,7 +154,7 @@ The text value could be filled by a \c dummydata/clock.qml file with a \c time
 property in the root context:
 
 \qml
-import Qt 4.7    
+import QtQuick 1.0    
 QtObject { property int time: 54321 }
 \endqml
 
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 6eade18..35a05d2 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -188,7 +188,7 @@ is to have a "running" property in \c main.qml.  This leads to much nicer QML co
 \o
 \code
 // main.qml
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     MouseArea {
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index 363ba8d..5501242 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -112,7 +112,7 @@ following example shows a simple QML file that accesses some enumeration
 values and calls an imported JavaScript function.
 
 \code
-import Qt 4.7
+import QtQuick 1.0
 import "code.js" as Code
 
 ListView {
@@ -253,7 +253,7 @@ is used, the \c title property may resolve differently.
 
 \code
 // TitlePage.qml
-import Qt 4.7
+import QtQuick 1.0
 Item {
     property string title
     
@@ -269,7 +269,7 @@ Item {
 }
 
 // TitleText.qml
-import Qt 4.7
+import QtQuick 1.0
 Text {
     property int size
     text: "<b>" + title + "</b>"
@@ -285,7 +285,7 @@ to use property interfaces, like this:
 
 \code
 // TitlePage.qml
-import Qt 4.7
+import QtQuick 1.0
 Item {
     id: root
     property string title
@@ -304,7 +304,7 @@ Item {
 }
 
 // TitleText.qml
-import Qt 4.7
+import QtQuick 1.0
 Text {
     property string title
     property int size
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index a5e45d9..e2d6e72 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -73,7 +73,7 @@
 
     \snippet examples/tutorials/gettingStarted/gsQml/part0/Button.qml document
 
-    First, the \c { import Qt 4.7 } allows the qmlviewer tool to import the QML elements
+    First, the \c { import QtQuick 1.0 } allows the qmlviewer tool to import the QML elements
     we will later use. This line must exist for every QML file. Notice that the version
     of Qt modules is included in the import statement.
 
@@ -209,7 +209,7 @@
     \c FileMenu.qml.
 
     \code
-        import Qt 4.7                \\import the main Qt QML module
+        import QtQuick 1.0                \\import the main Qt QML module
         import "folderName"            \\import the contents of the folder    
         import "script.js" as Script        \\import a Javascript file and name it as Script
     \endcode
diff --git a/doc/src/snippets/declarative/SelfDestroyingRect.qml b/doc/src/snippets/declarative/SelfDestroyingRect.qml
index 413c04e..f89588b 100644
--- a/doc/src/snippets/declarative/SelfDestroyingRect.qml
+++ b/doc/src/snippets/declarative/SelfDestroyingRect.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/Sprite.qml b/doc/src/snippets/declarative/Sprite.qml
index 3928c4d..3bcd599 100644
--- a/doc/src/snippets/declarative/Sprite.qml
+++ b/doc/src/snippets/declarative/Sprite.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 80; height: 50; color: "red" }
 //![0]
diff --git a/doc/src/snippets/declarative/anchoranimation.qml b/doc/src/snippets/declarative/anchoranimation.qml
index f149326..d8235f6 100644
--- a/doc/src/snippets/declarative/anchoranimation.qml
+++ b/doc/src/snippets/declarative/anchoranimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/doc/src/snippets/declarative/anchorchanges.qml b/doc/src/snippets/declarative/anchorchanges.qml
index 19356d7..66c31c5 100644
--- a/doc/src/snippets/declarative/anchorchanges.qml
+++ b/doc/src/snippets/declarative/anchorchanges.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: window
diff --git a/doc/src/snippets/declarative/animatedimage.qml b/doc/src/snippets/declarative/animatedimage.qml
index 66abbae..a9b58c5 100644
--- a/doc/src/snippets/declarative/animatedimage.qml
+++ b/doc/src/snippets/declarative/animatedimage.qml
@@ -42,7 +42,7 @@
 // examples/declarative/imageelements/animatedimage
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: animation.width; height: animation.height + 8
diff --git a/doc/src/snippets/declarative/animation-behavioral.qml b/doc/src/snippets/declarative/animation-behavioral.qml
index a4fa648..0462e9a 100644
--- a/doc/src/snippets/declarative/animation-behavioral.qml
+++ b/doc/src/snippets/declarative/animation-behavioral.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/animation-easing.qml b/doc/src/snippets/declarative/animation-easing.qml
index 97f6e60..3438737 100644
--- a/doc/src/snippets/declarative/animation-easing.qml
+++ b/doc/src/snippets/declarative/animation-easing.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/animation-elements.qml b/doc/src/snippets/declarative/animation-elements.qml
index a65bd67..7843b75 100644
--- a/doc/src/snippets/declarative/animation-elements.qml
+++ b/doc/src/snippets/declarative/animation-elements.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/animation-groups.qml b/doc/src/snippets/declarative/animation-groups.qml
index ba546c9..57cc8c2 100644
--- a/doc/src/snippets/declarative/animation-groups.qml
+++ b/doc/src/snippets/declarative/animation-groups.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/animation-propertyvaluesource.qml b/doc/src/snippets/declarative/animation-propertyvaluesource.qml
index 366505c..ba56afd 100644
--- a/doc/src/snippets/declarative/animation-propertyvaluesource.qml
+++ b/doc/src/snippets/declarative/animation-propertyvaluesource.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/animation-signalhandler.qml b/doc/src/snippets/declarative/animation-signalhandler.qml
index 492c007..16f27c6 100644
--- a/doc/src/snippets/declarative/animation-signalhandler.qml
+++ b/doc/src/snippets/declarative/animation-signalhandler.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/animation-standalone.qml b/doc/src/snippets/declarative/animation-standalone.qml
index c847d02..1ff4073 100644
--- a/doc/src/snippets/declarative/animation-standalone.qml
+++ b/doc/src/snippets/declarative/animation-standalone.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/animation-transitions.qml b/doc/src/snippets/declarative/animation-transitions.qml
index 5b0bb84..025fc90 100644
--- a/doc/src/snippets/declarative/animation-transitions.qml
+++ b/doc/src/snippets/declarative/animation-transitions.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/behavior.qml b/doc/src/snippets/declarative/behavior.qml
index 7f66e5a..7e2d1e7 100644
--- a/doc/src/snippets/declarative/behavior.qml
+++ b/doc/src/snippets/declarative/behavior.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml b/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml
index 0ed9943..ba30491 100644
--- a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml
+++ b/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml b/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml
index 680709d..98a4175 100644
--- a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml
+++ b/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/doc/src/snippets/declarative/borderimage/normal-image.qml b/doc/src/snippets/declarative/borderimage/normal-image.qml
index 85a7f52..f8e3c60 100644
--- a/doc/src/snippets/declarative/borderimage/normal-image.qml
+++ b/doc/src/snippets/declarative/borderimage/normal-image.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/doc/src/snippets/declarative/codingconventions/dotproperties.qml b/doc/src/snippets/declarative/codingconventions/dotproperties.qml
index 8a173cd..98cb09c 100644
--- a/doc/src/snippets/declarative/codingconventions/dotproperties.qml
+++ b/doc/src/snippets/declarative/codingconventions/dotproperties.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
 
diff --git a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml b/doc/src/snippets/declarative/codingconventions/javascript-imports.qml
index 391bf27..931349f 100644
--- a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml
+++ b/doc/src/snippets/declarative/codingconventions/javascript-imports.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 import "myscript.js" as Script
diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/declarative/codingconventions/javascript.qml
index 90790b9..6c94626 100644
--- a/doc/src/snippets/declarative/codingconventions/javascript.qml
+++ b/doc/src/snippets/declarative/codingconventions/javascript.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
 
diff --git a/doc/src/snippets/declarative/codingconventions/lists.qml b/doc/src/snippets/declarative/codingconventions/lists.qml
index 8d2bdbc..a7f3c8f 100644
--- a/doc/src/snippets/declarative/codingconventions/lists.qml
+++ b/doc/src/snippets/declarative/codingconventions/lists.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Item {
diff --git a/doc/src/snippets/declarative/codingconventions/photo.qml b/doc/src/snippets/declarative/codingconventions/photo.qml
index 359a756..2eba035 100644
--- a/doc/src/snippets/declarative/codingconventions/photo.qml
+++ b/doc/src/snippets/declarative/codingconventions/photo.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/coloranimation.qml b/doc/src/snippets/declarative/coloranimation.qml
index d904721..452599e 100644
--- a/doc/src/snippets/declarative/coloranimation.qml
+++ b/doc/src/snippets/declarative/coloranimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/column/column.qml b/doc/src/snippets/declarative/column/column.qml
index 6d378bb..45c6822 100644
--- a/doc/src/snippets/declarative/column/column.qml
+++ b/doc/src/snippets/declarative/column/column.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 310; height: 170
diff --git a/doc/src/snippets/declarative/column/vertical-positioner-transition.qml b/doc/src/snippets/declarative/column/vertical-positioner-transition.qml
index 7785776..cd2fdcc 100644
--- a/doc/src/snippets/declarative/column/vertical-positioner-transition.qml
+++ b/doc/src/snippets/declarative/column/vertical-positioner-transition.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [document]
 Column {
diff --git a/doc/src/snippets/declarative/column/vertical-positioner.qml b/doc/src/snippets/declarative/column/vertical-positioner.qml
index 86ecc55..693734b 100644
--- a/doc/src/snippets/declarative/column/vertical-positioner.qml
+++ b/doc/src/snippets/declarative/column/vertical-positioner.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [document]
 Column {
diff --git a/doc/src/snippets/declarative/comments.qml b/doc/src/snippets/declarative/comments.qml
index aa034c6..a8e47ad 100644
--- a/doc/src/snippets/declarative/comments.qml
+++ b/doc/src/snippets/declarative/comments.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Text {
diff --git a/doc/src/snippets/declarative/component.qml b/doc/src/snippets/declarative/component.qml
index 84c063f..ed55803 100644
--- a/doc/src/snippets/declarative/component.qml
+++ b/doc/src/snippets/declarative/component.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/createComponent-simple.qml b/doc/src/snippets/declarative/createComponent-simple.qml
index f4c240d..f052529 100644
--- a/doc/src/snippets/declarative/createComponent-simple.qml
+++ b/doc/src/snippets/declarative/createComponent-simple.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/doc/src/snippets/declarative/createComponent.qml b/doc/src/snippets/declarative/createComponent.qml
index f1a7436..619c02d 100644
--- a/doc/src/snippets/declarative/createComponent.qml
+++ b/doc/src/snippets/declarative/createComponent.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 import "componentCreation.js" as MyScript
 
 Rectangle {
diff --git a/doc/src/snippets/declarative/createQmlObject.qml b/doc/src/snippets/declarative/createQmlObject.qml
index 6a4eae8..cfcffe1 100644
--- a/doc/src/snippets/declarative/createQmlObject.qml
+++ b/doc/src/snippets/declarative/createQmlObject.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: parentItem
@@ -48,7 +48,7 @@ Rectangle {
     
     function createIt() {
 //![0]
-var newObject = Qt.createQmlObject('import Qt 4.7; Rectangle {color: "red"; width: 20; height: 20}',
+var newObject = Qt.createQmlObject('import QtQuick 1.0; Rectangle {color: "red"; width: 20; height: 20}',
     parentItem, "dynamicSnippet1");
 //![0]
 
diff --git a/doc/src/snippets/declarative/dynamicObjects-destroy.qml b/doc/src/snippets/declarative/dynamicObjects-destroy.qml
index b4ae80c..665f631 100644
--- a/doc/src/snippets/declarative/dynamicObjects-destroy.qml
+++ b/doc/src/snippets/declarative/dynamicObjects-destroy.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/doc/src/snippets/declarative/flickable.qml b/doc/src/snippets/declarative/flickable.qml
index a283e9a..80e7301 100644
--- a/doc/src/snippets/declarative/flickable.qml
+++ b/doc/src/snippets/declarative/flickable.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Flickable {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/flickableScrollbar.qml b/doc/src/snippets/declarative/flickableScrollbar.qml
index fc06f63..18ea45a 100644
--- a/doc/src/snippets/declarative/flickableScrollbar.qml
+++ b/doc/src/snippets/declarative/flickableScrollbar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/flipable/flipable.qml b/doc/src/snippets/declarative/flipable/flipable.qml
index eaf367a..cd5da4b 100644
--- a/doc/src/snippets/declarative/flipable/flipable.qml
+++ b/doc/src/snippets/declarative/flipable/flipable.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
     id: flipable
diff --git a/doc/src/snippets/declarative/flow-diagram.qml b/doc/src/snippets/declarative/flow-diagram.qml
index f34e3fd..c970164 100644
--- a/doc/src/snippets/declarative/flow-diagram.qml
+++ b/doc/src/snippets/declarative/flow-diagram.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightblue"
diff --git a/doc/src/snippets/declarative/flow.qml b/doc/src/snippets/declarative/flow.qml
index 809627e..167cbdb 100644
--- a/doc/src/snippets/declarative/flow.qml
+++ b/doc/src/snippets/declarative/flow.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightblue"
diff --git a/doc/src/snippets/declarative/focusscopes.qml b/doc/src/snippets/declarative/focusscopes.qml
index da6a850..4713c0c 100644
--- a/doc/src/snippets/declarative/focusscopes.qml
+++ b/doc/src/snippets/declarative/focusscopes.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/folderlistmodel.qml b/doc/src/snippets/declarative/folderlistmodel.qml
index a5e0071..d1cd34b 100644
--- a/doc/src/snippets/declarative/folderlistmodel.qml
+++ b/doc/src/snippets/declarative/folderlistmodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.folderlistmodel 1.0
 
 ListView {
diff --git a/doc/src/snippets/declarative/gradient.qml b/doc/src/snippets/declarative/gradient.qml
index 4c8bd40..47165a4 100644
--- a/doc/src/snippets/declarative/gradient.qml
+++ b/doc/src/snippets/declarative/gradient.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![code]
 Rectangle {
diff --git a/doc/src/snippets/declarative/grid/grid-items.qml b/doc/src/snippets/declarative/grid/grid-items.qml
index 2382d38..62a444d 100644
--- a/doc/src/snippets/declarative/grid/grid-items.qml
+++ b/doc/src/snippets/declarative/grid/grid-items.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 112; height: 112
diff --git a/doc/src/snippets/declarative/grid/grid-no-spacing.qml b/doc/src/snippets/declarative/grid/grid-no-spacing.qml
index 6318165..a6ca305 100644
--- a/doc/src/snippets/declarative/grid/grid-no-spacing.qml
+++ b/doc/src/snippets/declarative/grid/grid-no-spacing.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 112; height: 112
diff --git a/doc/src/snippets/declarative/grid/grid-spacing.qml b/doc/src/snippets/declarative/grid/grid-spacing.qml
index fb3822c..c03cdad 100644
--- a/doc/src/snippets/declarative/grid/grid-spacing.qml
+++ b/doc/src/snippets/declarative/grid/grid-spacing.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 112; height: 112
diff --git a/doc/src/snippets/declarative/grid/grid.qml b/doc/src/snippets/declarative/grid/grid.qml
index 4599806..837ae60 100644
--- a/doc/src/snippets/declarative/grid/grid.qml
+++ b/doc/src/snippets/declarative/grid/grid.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Grid {
     columns: 3
diff --git a/doc/src/snippets/declarative/gridview/ContactModel.qml b/doc/src/snippets/declarative/gridview/ContactModel.qml
index 9fdeb4a..c3c3962 100644
--- a/doc/src/snippets/declarative/gridview/ContactModel.qml
+++ b/doc/src/snippets/declarative/gridview/ContactModel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
 
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index cbebb0a..73e58ec 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![import]
-import Qt 4.7
+import QtQuick 1.0
 //![import]
 
 Rectangle {
diff --git a/doc/src/snippets/declarative/image.qml b/doc/src/snippets/declarative/image.qml
index 228e83a..4c66ec1 100644
--- a/doc/src/snippets/declarative/image.qml
+++ b/doc/src/snippets/declarative/image.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     source: "pics/qtlogo.png"
diff --git a/doc/src/snippets/declarative/listmodel-modify.qml b/doc/src/snippets/declarative/listmodel-modify.qml
index f08137f..d85da6c 100644
--- a/doc/src/snippets/declarative/listmodel-modify.qml
+++ b/doc/src/snippets/declarative/listmodel-modify.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/listmodel-nested.qml b/doc/src/snippets/declarative/listmodel-nested.qml
index c38ee2d..36c5d66 100644
--- a/doc/src/snippets/declarative/listmodel-nested.qml
+++ b/doc/src/snippets/declarative/listmodel-nested.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/listmodel-simple.qml b/doc/src/snippets/declarative/listmodel-simple.qml
index e561284..c8e83eb 100644
--- a/doc/src/snippets/declarative/listmodel-simple.qml
+++ b/doc/src/snippets/declarative/listmodel-simple.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/listmodel.qml b/doc/src/snippets/declarative/listmodel.qml
index 20f2074..f5b6cd6 100644
--- a/doc/src/snippets/declarative/listmodel.qml
+++ b/doc/src/snippets/declarative/listmodel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     id: fruitModel
diff --git a/doc/src/snippets/declarative/listview/ContactModel.qml b/doc/src/snippets/declarative/listview/ContactModel.qml
index f48f84f..d421ffc 100644
--- a/doc/src/snippets/declarative/listview/ContactModel.qml
+++ b/doc/src/snippets/declarative/listview/ContactModel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/doc/src/snippets/declarative/listview/listview-snippet.qml b/doc/src/snippets/declarative/listview/listview-snippet.qml
index d81bcbb..f2a260d 100644
--- a/doc/src/snippets/declarative/listview/listview-snippet.qml
+++ b/doc/src/snippets/declarative/listview/listview-snippet.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 50; height: 200
diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
index 2945b2f..8ba47a8 100644
--- a/doc/src/snippets/declarative/listview/listview.qml
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![import]
-import Qt 4.7
+import QtQuick 1.0
 //![import]
 
 Item {
diff --git a/doc/src/snippets/declarative/loader/KeyReader.qml b/doc/src/snippets/declarative/loader/KeyReader.qml
index 66a74fa..e53700c 100644
--- a/doc/src/snippets/declarative/loader/KeyReader.qml
+++ b/doc/src/snippets/declarative/loader/KeyReader.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Item {
diff --git a/doc/src/snippets/declarative/loader/MyItem.qml b/doc/src/snippets/declarative/loader/MyItem.qml
index 22c3fd3..199c64a 100644
--- a/doc/src/snippets/declarative/loader/MyItem.qml
+++ b/doc/src/snippets/declarative/loader/MyItem.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
    id: myItem
diff --git a/doc/src/snippets/declarative/loader/connections.qml b/doc/src/snippets/declarative/loader/connections.qml
index a1cdce2..18f4259 100644
--- a/doc/src/snippets/declarative/loader/connections.qml
+++ b/doc/src/snippets/declarative/loader/connections.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/loader/focus.qml b/doc/src/snippets/declarative/loader/focus.qml
index 4b4c940..4b3042a 100644
--- a/doc/src/snippets/declarative/loader/focus.qml
+++ b/doc/src/snippets/declarative/loader/focus.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/loader/simple.qml b/doc/src/snippets/declarative/loader/simple.qml
index bb06ffc..556ce60 100644
--- a/doc/src/snippets/declarative/loader/simple.qml
+++ b/doc/src/snippets/declarative/loader/simple.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 200
diff --git a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
index 85071f1..e2a4ee9 100644
--- a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
+++ b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { 
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/mousearea/mousearea.qml b/doc/src/snippets/declarative/mousearea/mousearea.qml
index e7764f9..7cd0a77 100644
--- a/doc/src/snippets/declarative/mousearea/mousearea.qml
+++ b/doc/src/snippets/declarative/mousearea/mousearea.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [import]
-import Qt 4.7
+import QtQuick 1.0
 //! [import]
 
 Rectangle {
diff --git a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml b/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml
index fa0682e..8f9fd47 100644
--- a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml
+++ b/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [dragfilter]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 480
diff --git a/doc/src/snippets/declarative/numberanimation.qml b/doc/src/snippets/declarative/numberanimation.qml
index 19c0b0d..8f64493 100644
--- a/doc/src/snippets/declarative/numberanimation.qml
+++ b/doc/src/snippets/declarative/numberanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/doc/src/snippets/declarative/parallelanimation.qml b/doc/src/snippets/declarative/parallelanimation.qml
index caf4e01..0badc03 100644
--- a/doc/src/snippets/declarative/parallelanimation.qml
+++ b/doc/src/snippets/declarative/parallelanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/parentanimation.qml b/doc/src/snippets/declarative/parentanimation.qml
index b8a4c00..fa49d7a 100644
--- a/doc/src/snippets/declarative/parentanimation.qml
+++ b/doc/src/snippets/declarative/parentanimation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 100
diff --git a/doc/src/snippets/declarative/parentchange.qml b/doc/src/snippets/declarative/parentchange.qml
index 72932b2..e73bbb3 100644
--- a/doc/src/snippets/declarative/parentchange.qml
+++ b/doc/src/snippets/declarative/parentchange.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 100
diff --git a/doc/src/snippets/declarative/pathview/ContactModel.qml b/doc/src/snippets/declarative/pathview/ContactModel.qml
index 62daf3d..07db8dc 100644
--- a/doc/src/snippets/declarative/pathview/ContactModel.qml
+++ b/doc/src/snippets/declarative/pathview/ContactModel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml
index a45f15a..d6dacdb 100644
--- a/doc/src/snippets/declarative/pathview/pathattributes.qml
+++ b/doc/src/snippets/declarative/pathview/pathattributes.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 200
diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml
index e03c615..93298c4 100644
--- a/doc/src/snippets/declarative/pathview/pathview.qml
+++ b/doc/src/snippets/declarative/pathview/pathview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 200
diff --git a/doc/src/snippets/declarative/propertyaction.qml b/doc/src/snippets/declarative/propertyaction.qml
index 696c9ef..acb5c43 100644
--- a/doc/src/snippets/declarative/propertyaction.qml
+++ b/doc/src/snippets/declarative/propertyaction.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/propertyanimation.qml b/doc/src/snippets/declarative/propertyanimation.qml
index 24efd60..1f1cbaf 100644
--- a/doc/src/snippets/declarative/propertyanimation.qml
+++ b/doc/src/snippets/declarative/propertyanimation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
 
diff --git a/doc/src/snippets/declarative/propertychanges.qml b/doc/src/snippets/declarative/propertychanges.qml
index 06a3fae..00f6bfe 100644
--- a/doc/src/snippets/declarative/propertychanges.qml
+++ b/doc/src/snippets/declarative/propertychanges.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![import]
-import Qt 4.7
+import QtQuick 1.0
 //![import]
 
 Column {
diff --git a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml b/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml
index 48f2bdb..4aa318c 100644
--- a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml
+++ b/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 250
diff --git a/doc/src/snippets/declarative/qml-data-models/listelements.qml b/doc/src/snippets/declarative/qml-data-models/listelements.qml
index 2d12567..44fb056 100644
--- a/doc/src/snippets/declarative/qml-data-models/listelements.qml
+++ b/doc/src/snippets/declarative/qml-data-models/listelements.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 250
diff --git a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml b/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml
index 69533c9..53f844a 100644
--- a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml
+++ b/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 250
diff --git a/doc/src/snippets/declarative/qml-documents/inline-component.qml b/doc/src/snippets/declarative/qml-documents/inline-component.qml
index 45d7eb4..eef68a3 100644
--- a/doc/src/snippets/declarative/qml-documents/inline-component.qml
+++ b/doc/src/snippets/declarative/qml-documents/inline-component.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 320; 
diff --git a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml b/doc/src/snippets/declarative/qml-documents/inline-text-component.qml
index 1f3af33..593862d 100644
--- a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml
+++ b/doc/src/snippets/declarative/qml-documents/inline-text-component.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 320; 
diff --git a/doc/src/snippets/declarative/qml-documents/non-trivial.qml b/doc/src/snippets/declarative/qml-documents/non-trivial.qml
index e9cba98..ba567b5 100644
--- a/doc/src/snippets/declarative/qml-documents/non-trivial.qml
+++ b/doc/src/snippets/declarative/qml-documents/non-trivial.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240; height: 320; 
diff --git a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml b/doc/src/snippets/declarative/qml-documents/qmldocuments.qml
index a4b5589..20efc35 100644
--- a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml
+++ b/doc/src/snippets/declarative/qml-documents/qmldocuments.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property alias text: textItem.text
diff --git a/doc/src/snippets/declarative/qml-intro/anchors1.qml b/doc/src/snippets/declarative/qml-intro/anchors1.qml
index ba6f928..077eab2 100644
--- a/doc/src/snippets/declarative/qml-intro/anchors1.qml
+++ b/doc/src/snippets/declarative/qml-intro/anchors1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qml-intro/anchors2.qml b/doc/src/snippets/declarative/qml-intro/anchors2.qml
index ac60e1b..79f180d 100644
--- a/doc/src/snippets/declarative/qml-intro/anchors2.qml
+++ b/doc/src/snippets/declarative/qml-intro/anchors2.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qml-intro/anchors3.qml b/doc/src/snippets/declarative/qml-intro/anchors3.qml
index ab74670..db42e6b 100644
--- a/doc/src/snippets/declarative/qml-intro/anchors3.qml
+++ b/doc/src/snippets/declarative/qml-intro/anchors3.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world1.qml b/doc/src/snippets/declarative/qml-intro/hello-world1.qml
index 55b39c6..176f4f4 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world1.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world2.qml b/doc/src/snippets/declarative/qml-intro/hello-world2.qml
index c537528..98f04ec 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world2.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world2.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world3.qml b/doc/src/snippets/declarative/qml-intro/hello-world3.qml
index 794c406..abf684c 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world3.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world3.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world4.qml b/doc/src/snippets/declarative/qml-intro/hello-world4.qml
index 7ea4bed..de794ca 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world4.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world4.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world5.qml b/doc/src/snippets/declarative/qml-intro/hello-world5.qml
index 3345882..95ec6c8 100644
--- a/doc/src/snippets/declarative/qml-intro/hello-world5.qml
+++ b/doc/src/snippets/declarative/qml-intro/hello-world5.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/number-animation1.qml b/doc/src/snippets/declarative/qml-intro/number-animation1.qml
index 64ebe7a..aa5c109 100644
--- a/doc/src/snippets/declarative/qml-intro/number-animation1.qml
+++ b/doc/src/snippets/declarative/qml-intro/number-animation1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/number-animation2.qml b/doc/src/snippets/declarative/qml-intro/number-animation2.qml
index 7905002..9c6a4bc 100644
--- a/doc/src/snippets/declarative/qml-intro/number-animation2.qml
+++ b/doc/src/snippets/declarative/qml-intro/number-animation2.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/rectangle.qml b/doc/src/snippets/declarative/qml-intro/rectangle.qml
index 1ce0a04..ccfa514 100644
--- a/doc/src/snippets/declarative/qml-intro/rectangle.qml
+++ b/doc/src/snippets/declarative/qml-intro/rectangle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 // This is a comment. And below myRectangle is defined.
 Rectangle {
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
index a1a1af9..3ff1905 100644
--- a/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
index f83c224..47c8d6a 100644
--- a/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
index 32bf59c..530907a 100644
--- a/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRec
diff --git a/doc/src/snippets/declarative/qml-intro/states1.qml b/doc/src/snippets/declarative/qml-intro/states1.qml
index 6e7bab1..e63551a 100644
--- a/doc/src/snippets/declarative/qml-intro/states1.qml
+++ b/doc/src/snippets/declarative/qml-intro/states1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainRectangle
diff --git a/doc/src/snippets/declarative/qml-intro/transformations1.qml b/doc/src/snippets/declarative/qml-intro/transformations1.qml
index 7ca3aee..2fea733 100644
--- a/doc/src/snippets/declarative/qml-intro/transformations1.qml
+++ b/doc/src/snippets/declarative/qml-intro/transformations1.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myWin
diff --git a/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml b/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
index 341765a..425346d 100644
--- a/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300
diff --git a/doc/src/snippets/declarative/qtbinding/custompalette/main.qml b/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
index ea8464c..a20d9e0 100644
--- a/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/doc/src/snippets/declarative/qtbinding/resources/main.qml b/doc/src/snippets/declarative/qtbinding/resources/main.qml
index b12af9e..644d963 100644
--- a/doc/src/snippets/declarative/qtbinding/resources/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/resources/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     source: "images/background.png"
diff --git a/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml b/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
index 75c0831..f894f71 100644
--- a/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300
diff --git a/doc/src/snippets/declarative/qtobject.qml b/doc/src/snippets/declarative/qtobject.qml
index 581af16..e6e98c2 100644
--- a/doc/src/snippets/declarative/qtobject.qml
+++ b/doc/src/snippets/declarative/qtobject.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     QtObject { 
diff --git a/doc/src/snippets/declarative/rectangle/rect-border-width.qml b/doc/src/snippets/declarative/rectangle/rect-border-width.qml
index 3cf0831..3b2a4e5 100644
--- a/doc/src/snippets/declarative/rectangle/rect-border-width.qml
+++ b/doc/src/snippets/declarative/rectangle/rect-border-width.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml b/doc/src/snippets/declarative/rectangle/rectangle-colors.qml
index 8f306f6..df364bc 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle-colors.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 200
diff --git a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml b/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml
index aff5849..d727e84 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 100; height: 300
diff --git a/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml b/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml
index e1d6980..4cb1050 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 200
diff --git a/doc/src/snippets/declarative/rectangle/rectangle.qml b/doc/src/snippets/declarative/rectangle/rectangle.qml
index a464cb9..7bb7c58 100644
--- a/doc/src/snippets/declarative/rectangle/rectangle.qml
+++ b/doc/src/snippets/declarative/rectangle/rectangle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100
diff --git a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml b/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml
index dbf24ae..4835cfe 100644
--- a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml
+++ b/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 400; color: "black"
diff --git a/doc/src/snippets/declarative/repeaters/repeater.qml b/doc/src/snippets/declarative/repeaters/repeater.qml
index db606d0..f3a5505 100644
--- a/doc/src/snippets/declarative/repeaters/repeater.qml
+++ b/doc/src/snippets/declarative/repeaters/repeater.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [import]
-import Qt 4.7
+import QtQuick 1.0
 //! [import]
 
 Row {
diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml
index 4db8b4a..7366775 100644
--- a/doc/src/snippets/declarative/rotation.qml
+++ b/doc/src/snippets/declarative/rotation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //! [0]
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
     x: 10; y: 10
diff --git a/doc/src/snippets/declarative/rotationanimation.qml b/doc/src/snippets/declarative/rotationanimation.qml
index 2309d0a..c907287 100644
--- a/doc/src/snippets/declarative/rotationanimation.qml
+++ b/doc/src/snippets/declarative/rotationanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 300
diff --git a/doc/src/snippets/declarative/row.qml b/doc/src/snippets/declarative/row.qml
index efb6190..4e4bdd3 100644
--- a/doc/src/snippets/declarative/row.qml
+++ b/doc/src/snippets/declarative/row.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 320; height: 110
diff --git a/doc/src/snippets/declarative/row/row.qml b/doc/src/snippets/declarative/row/row.qml
index 8096c0f..b19bdc2 100644
--- a/doc/src/snippets/declarative/row/row.qml
+++ b/doc/src/snippets/declarative/row/row.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [document]
-import Qt 4.7
+import QtQuick 1.0
 
 Row {
     spacing: 2
diff --git a/doc/src/snippets/declarative/sequentialanimation.qml b/doc/src/snippets/declarative/sequentialanimation.qml
index 1a17ae9..c8788ac 100644
--- a/doc/src/snippets/declarative/sequentialanimation.qml
+++ b/doc/src/snippets/declarative/sequentialanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/smoothedanimation.qml b/doc/src/snippets/declarative/smoothedanimation.qml
index edc33db..06e1555 100644
--- a/doc/src/snippets/declarative/smoothedanimation.qml
+++ b/doc/src/snippets/declarative/smoothedanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 600
diff --git a/doc/src/snippets/declarative/springanimation.qml b/doc/src/snippets/declarative/springanimation.qml
index fe5aeb8..2051dbe 100644
--- a/doc/src/snippets/declarative/springanimation.qml
+++ b/doc/src/snippets/declarative/springanimation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 300
diff --git a/doc/src/snippets/declarative/state-when.qml b/doc/src/snippets/declarative/state-when.qml
index 6dbd099..583f3ba 100644
--- a/doc/src/snippets/declarative/state-when.qml
+++ b/doc/src/snippets/declarative/state-when.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 //![0]
 Rectangle {
     id: myRect
diff --git a/doc/src/snippets/declarative/state.qml b/doc/src/snippets/declarative/state.qml
index 8597314..07fd21b 100644
--- a/doc/src/snippets/declarative/state.qml
+++ b/doc/src/snippets/declarative/state.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRect
diff --git a/doc/src/snippets/declarative/states.qml b/doc/src/snippets/declarative/states.qml
index be483af..ee110aa 100644
--- a/doc/src/snippets/declarative/states.qml
+++ b/doc/src/snippets/declarative/states.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
  
 Rectangle {
     id: myRect
diff --git a/doc/src/snippets/declarative/systempalette.qml b/doc/src/snippets/declarative/systempalette.qml
index 5e540b9..53410a1 100644
--- a/doc/src/snippets/declarative/systempalette.qml
+++ b/doc/src/snippets/declarative/systempalette.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
diff --git a/doc/src/snippets/declarative/text/onLinkActivated.qml b/doc/src/snippets/declarative/text/onLinkActivated.qml
index 0fb236a..e9fd431 100644
--- a/doc/src/snippets/declarative/text/onLinkActivated.qml
+++ b/doc/src/snippets/declarative/text/onLinkActivated.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 700; height: 400
diff --git a/doc/src/snippets/declarative/texteditor.qml b/doc/src/snippets/declarative/texteditor.qml
index 55438f4..5596140 100644
--- a/doc/src/snippets/declarative/texteditor.qml
+++ b/doc/src/snippets/declarative/texteditor.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Flickable {
diff --git a/doc/src/snippets/declarative/transition-from-to.qml b/doc/src/snippets/declarative/transition-from-to.qml
index 73bf880..4fe39c5 100644
--- a/doc/src/snippets/declarative/transition-from-to.qml
+++ b/doc/src/snippets/declarative/transition-from-to.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/transition-reversible.qml b/doc/src/snippets/declarative/transition-reversible.qml
index b64cf37..e3fec2f 100644
--- a/doc/src/snippets/declarative/transition-reversible.qml
+++ b/doc/src/snippets/declarative/transition-reversible.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/doc/src/snippets/declarative/transition.qml b/doc/src/snippets/declarative/transition.qml
index 6a8a2f5..9154c3c 100644
--- a/doc/src/snippets/declarative/transition.qml
+++ b/doc/src/snippets/declarative/transition.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/doc/src/snippets/declarative/visualdatamodel.qml b/doc/src/snippets/declarative/visualdatamodel.qml
index 67f9b6b..e9ad800 100644
--- a/doc/src/snippets/declarative/visualdatamodel.qml
+++ b/doc/src/snippets/declarative/visualdatamodel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 100
diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
index 10bcfe8..bceaac8 100644
--- a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
+++ b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     id: view
diff --git a/doc/src/snippets/declarative/workerscript.qml b/doc/src/snippets/declarative/workerscript.qml
index 434a90e..95e787c 100644
--- a/doc/src/snippets/declarative/workerscript.qml
+++ b/doc/src/snippets/declarative/workerscript.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 300
diff --git a/doc/src/snippets/declarative/xmlrole.qml b/doc/src/snippets/declarative/xmlrole.qml
index 9c8af89..efa59eb 100644
--- a/doc/src/snippets/declarative/xmlrole.qml
+++ b/doc/src/snippets/declarative/xmlrole.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 200
diff --git a/examples/declarative/animation/basics/color-animation.qml b/examples/declarative/animation/basics/color-animation.qml
index 182bb54..809f391 100644
--- a/examples/declarative/animation/basics/color-animation.qml
+++ b/examples/declarative/animation/basics/color-animation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/examples/declarative/animation/basics/property-animation.qml b/examples/declarative/animation/basics/property-animation.qml
index 5149f5b..0a5b353 100644
--- a/examples/declarative/animation/basics/property-animation.qml
+++ b/examples/declarative/animation/basics/property-animation.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: window
diff --git a/examples/declarative/animation/behaviors/SideRect.qml b/examples/declarative/animation/behaviors/SideRect.qml
index eba0817..9517421 100644
--- a/examples/declarative/animation/behaviors/SideRect.qml
+++ b/examples/declarative/animation/behaviors/SideRect.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRect
diff --git a/examples/declarative/animation/behaviors/behavior-example.qml b/examples/declarative/animation/behaviors/behavior-example.qml
index 268d6e5..3e050ab 100644
--- a/examples/declarative/animation/behaviors/behavior-example.qml
+++ b/examples/declarative/animation/behaviors/behavior-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 600; height: 400
diff --git a/examples/declarative/animation/easing/content/QuitButton.qml b/examples/declarative/animation/easing/content/QuitButton.qml
index 9dfe9bd..cbbf916 100644
--- a/examples/declarative/animation/easing/content/QuitButton.qml
+++ b/examples/declarative/animation/easing/content/QuitButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Image {
     source: "quit.png"
     scale: quitMouse.pressed ? 0.8 : 1.0
@@ -49,4 +49,4 @@ Image {
         anchors.margins: -10
         onClicked: Qt.quit()
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml
index ffb129d..c748c23 100644
--- a/examples/declarative/animation/easing/easing.qml
+++ b/examples/declarative/animation/easing/easing.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/animation/states/states.qml b/examples/declarative/animation/states/states.qml
index 4f3e28c..a9046eb 100644
--- a/examples/declarative/animation/states/states.qml
+++ b/examples/declarative/animation/states/states.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/animation/states/transitions.qml b/examples/declarative/animation/states/transitions.qml
index 6efcdba..ea73b82 100644
--- a/examples/declarative/animation/states/transitions.qml
+++ b/examples/declarative/animation/states/transitions.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 /*
     This is exactly the same as states.qml, except that we have appended
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
index 58536bf..eda9a43 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import "ImageProviderCore" // import the plugin that registers the color image provider
 
 //![0]
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml b/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
index 439740a..07c2f5a 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     width: 100
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
index c7d2757..f416c8b 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: clock
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
index 571e427..5f442af 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 LayoutItem {    //Sized by the layout
     id: resizable
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
index fd3aa03..5a83937 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import GridLayouts 4.7
 
 Item {
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
index 24992d5..becbbfa 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import LinearLayouts 4.7
 
 Item {
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.qml b/examples/declarative/cppextensions/qwidgets/qwidgets.qml
index 16e9227..6ad937b 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.qml
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "QWidgets" 1.0
 
 Rectangle {
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/example.qml b/examples/declarative/cppextensions/referenceexamples/methods/example.qml
index ea3fa5f..f3616c7 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/methods/example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import People 1.0
 
 // ![0]
diff --git a/examples/declarative/i18n/i18n.qml b/examples/declarative/i18n/i18n.qml
index fcf24c2..8dac88d 100644
--- a/examples/declarative/i18n/i18n.qml
+++ b/examples/declarative/i18n/i18n.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //
 // The QML runtime automatically loads a translation from the i18n subdirectory of the root
diff --git a/examples/declarative/imageelements/borderimage/borderimage.qml b/examples/declarative/imageelements/borderimage/borderimage.qml
index bbe113c..53e35f9 100644
--- a/examples/declarative/imageelements/borderimage/borderimage.qml
+++ b/examples/declarative/imageelements/borderimage/borderimage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml b/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
index b8f8a70..96495cb 100644
--- a/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
+++ b/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml b/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
index 73eb040..839ecf1 100644
--- a/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
+++ b/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property alias color : rectangle.color
diff --git a/examples/declarative/imageelements/borderimage/shadows.qml b/examples/declarative/imageelements/borderimage/shadows.qml
index 4cb7c65..d547f63 100644
--- a/examples/declarative/imageelements/borderimage/shadows.qml
+++ b/examples/declarative/imageelements/borderimage/shadows.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/imageelements/image/ImageCell.qml b/examples/declarative/imageelements/image/ImageCell.qml
index f8973c8..e8a6c55 100644
--- a/examples/declarative/imageelements/image/ImageCell.qml
+++ b/examples/declarative/imageelements/image/ImageCell.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property alias mode: image.fillMode
diff --git a/examples/declarative/imageelements/image/image.qml b/examples/declarative/imageelements/image/image.qml
index 719d544..f00fc18 100644
--- a/examples/declarative/imageelements/image/image.qml
+++ b/examples/declarative/imageelements/image/image.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 490
diff --git a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
index be32386..79273ad 100644
--- a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     id: container
diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
index 8cdec3e..263adad 100644
--- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     property alias interactive: gridView.interactive
diff --git a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
index ca2e206..cefc9a3 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     clip: true
diff --git a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
index 95164f8..7b63cd8 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: container
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/declarative/keyinteraction/focus/focus.qml
index da2c30d..e2115d8 100644
--- a/examples/declarative/keyinteraction/focus/focus.qml
+++ b/examples/declarative/keyinteraction/focus/focus.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "Core"
 
 Rectangle {
diff --git a/examples/declarative/modelviews/abstractitemmodel/view.qml b/examples/declarative/modelviews/abstractitemmodel/view.qml
index 2fb4885..d1ab302 100644
--- a/examples/declarative/modelviews/abstractitemmodel/view.qml
+++ b/examples/declarative/modelviews/abstractitemmodel/view.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 ListView {
diff --git a/examples/declarative/modelviews/gridview/gridview-example.qml b/examples/declarative/modelviews/gridview/gridview-example.qml
index aea34ff..85fefda 100644
--- a/examples/declarative/modelviews/gridview/gridview-example.qml
+++ b/examples/declarative/modelviews/gridview/gridview-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 400
diff --git a/examples/declarative/modelviews/listview/content/PetsModel.qml b/examples/declarative/modelviews/listview/content/PetsModel.qml
index beeed1a..5220763 100644
--- a/examples/declarative/modelviews/listview/content/PetsModel.qml
+++ b/examples/declarative/modelviews/listview/content/PetsModel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml b/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
index ad6230e..d6808a4 100644
--- a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
+++ b/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: container
diff --git a/examples/declarative/modelviews/listview/content/RecipesModel.qml b/examples/declarative/modelviews/listview/content/RecipesModel.qml
index 812cf77..6056b90 100644
--- a/examples/declarative/modelviews/listview/content/RecipesModel.qml
+++ b/examples/declarative/modelviews/listview/content/RecipesModel.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 ListModel {
     ListElement {
diff --git a/examples/declarative/modelviews/listview/content/TextButton.qml b/examples/declarative/modelviews/listview/content/TextButton.qml
index 0270fdc..f26d775 100644
--- a/examples/declarative/modelviews/listview/content/TextButton.qml
+++ b/examples/declarative/modelviews/listview/content/TextButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/modelviews/listview/dynamiclist.qml b/examples/declarative/modelviews/listview/dynamiclist.qml
index 27ef6e0..f25f0fa 100644
--- a/examples/declarative/modelviews/listview/dynamiclist.qml
+++ b/examples/declarative/modelviews/listview/dynamiclist.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 // This example shows how items can be dynamically added to and removed from
diff --git a/examples/declarative/modelviews/listview/expandingdelegates.qml b/examples/declarative/modelviews/listview/expandingdelegates.qml
index 2dec769..bd3d3a9 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates.qml
+++ b/examples/declarative/modelviews/listview/expandingdelegates.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 // This example illustrates expanding a list item to show a more detailed view.
diff --git a/examples/declarative/modelviews/listview/highlight.qml b/examples/declarative/modelviews/listview/highlight.qml
index 5646e9f..249c73b 100644
--- a/examples/declarative/modelviews/listview/highlight.qml
+++ b/examples/declarative/modelviews/listview/highlight.qml
@@ -42,7 +42,7 @@
 // that uses a SpringAnimation to provide custom movement when the
 // highlight bar is moved between items.
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/modelviews/listview/highlightranges.qml b/examples/declarative/modelviews/listview/highlightranges.qml
index 711463a..2716ee5 100644
--- a/examples/declarative/modelviews/listview/highlightranges.qml
+++ b/examples/declarative/modelviews/listview/highlightranges.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/modelviews/listview/sections.qml b/examples/declarative/modelviews/listview/sections.qml
index a9ec538..3248899 100644
--- a/examples/declarative/modelviews/listview/sections.qml
+++ b/examples/declarative/modelviews/listview/sections.qml
@@ -41,7 +41,7 @@
 // This example shows how a ListView can be separated into sections using
 // the ListView.section attached property.
 
-import Qt 4.7
+import QtQuick 1.0
 
 //! [0]
 Rectangle {
diff --git a/examples/declarative/modelviews/objectlistmodel/view.qml b/examples/declarative/modelviews/objectlistmodel/view.qml
index 7e7c68a..fd9d149 100644
--- a/examples/declarative/modelviews/objectlistmodel/view.qml
+++ b/examples/declarative/modelviews/objectlistmodel/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 ListView {
diff --git a/examples/declarative/modelviews/package/Delegate.qml b/examples/declarative/modelviews/package/Delegate.qml
index a38727c..57048f4 100644
--- a/examples/declarative/modelviews/package/Delegate.qml
+++ b/examples/declarative/modelviews/package/Delegate.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Package {
diff --git a/examples/declarative/modelviews/package/view.qml b/examples/declarative/modelviews/package/view.qml
index 38cc047..cbe8f06 100644
--- a/examples/declarative/modelviews/package/view.qml
+++ b/examples/declarative/modelviews/package/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/examples/declarative/modelviews/parallax/parallax.qml b/examples/declarative/modelviews/parallax/parallax.qml
index 3d7d091..0d07522 100644
--- a/examples/declarative/modelviews/parallax/parallax.qml
+++ b/examples/declarative/modelviews/parallax/parallax.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "../../toys/clocks/content"  // for loading the Clock element
 import "qml"
 
diff --git a/examples/declarative/modelviews/parallax/qml/ParallaxView.qml b/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
index 724d7e0..96e3db9 100644
--- a/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/examples/declarative/modelviews/parallax/qml/Smiley.qml b/examples/declarative/modelviews/parallax/qml/Smiley.qml
index 959c85c..cac0a17 100644
--- a/examples/declarative/modelviews/parallax/qml/Smiley.qml
+++ b/examples/declarative/modelviews/parallax/qml/Smiley.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 // This is taken from the declarative animation/basics/property-animation.qml
 // example
diff --git a/examples/declarative/modelviews/pathview/pathview-example.qml b/examples/declarative/modelviews/pathview/pathview-example.qml
index 8777291..baf7575 100644
--- a/examples/declarative/modelviews/pathview/pathview-example.qml
+++ b/examples/declarative/modelviews/pathview/pathview-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 240
diff --git a/examples/declarative/modelviews/stringlistmodel/view.qml b/examples/declarative/modelviews/stringlistmodel/view.qml
index 1751a7a..0a90ee6 100644
--- a/examples/declarative/modelviews/stringlistmodel/view.qml
+++ b/examples/declarative/modelviews/stringlistmodel/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 //![0]
 
 ListView {
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
index 344ce62..15f2f11 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
@@ -41,7 +41,7 @@
 // This example demonstrates placing items in a view using
 // a VisualItemModel
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightgray"
diff --git a/examples/declarative/modelviews/webview/alerts.qml b/examples/declarative/modelviews/webview/alerts.qml
index 68f7a5c..4aa4a3b 100644
--- a/examples/declarative/modelviews/webview/alerts.qml
+++ b/examples/declarative/modelviews/webview/alerts.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 WebView {
diff --git a/examples/declarative/modelviews/webview/autosize.qml b/examples/declarative/modelviews/webview/autosize.qml
index 91550c1..7e10403 100644
--- a/examples/declarative/modelviews/webview/autosize.qml
+++ b/examples/declarative/modelviews/webview/autosize.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 // The WebView size is determined by the width, height,
diff --git a/examples/declarative/modelviews/webview/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
index ab549b5..9a86579 100644
--- a/examples/declarative/modelviews/webview/content/Mapping/Map.qml
+++ b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 Item {
diff --git a/examples/declarative/modelviews/webview/googlemaps.qml b/examples/declarative/modelviews/webview/googlemaps.qml
index bc9a0e3..aed0ddd 100644
--- a/examples/declarative/modelviews/webview/googlemaps.qml
+++ b/examples/declarative/modelviews/webview/googlemaps.qml
@@ -45,7 +45,7 @@
 // API, but users from QML don't need to understand the implementation in
 // order to create a Map.
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 import "content/Mapping"
 
diff --git a/examples/declarative/modelviews/webview/inlinehtml.qml b/examples/declarative/modelviews/webview/inlinehtml.qml
index afc8418..afc1fa9 100644
--- a/examples/declarative/modelviews/webview/inlinehtml.qml
+++ b/examples/declarative/modelviews/webview/inlinehtml.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 // Inline HTML with loose formatting can be
diff --git a/examples/declarative/modelviews/webview/newwindows.qml b/examples/declarative/modelviews/webview/newwindows.qml
index 5762321..52f7a0b 100644
--- a/examples/declarative/modelviews/webview/newwindows.qml
+++ b/examples/declarative/modelviews/webview/newwindows.qml
@@ -43,7 +43,7 @@
 // Note that to open windows from JavaScript, you will need to
 // allow it on WebView with settings.javascriptCanOpenWindows: true
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 Grid {
diff --git a/examples/declarative/positioners/Button.qml b/examples/declarative/positioners/Button.qml
index 4709aa6..32e5993 100644
--- a/examples/declarative/positioners/Button.qml
+++ b/examples/declarative/positioners/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/positioners/positioners.qml b/examples/declarative/positioners/positioners.qml
index 26b9ccd..6ae265e 100644
--- a/examples/declarative/positioners/positioners.qml
+++ b/examples/declarative/positioners/positioners.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/screenorientation/Core/Bubble.qml b/examples/declarative/screenorientation/Core/Bubble.qml
index 58bd13c..dea1e19 100644
--- a/examples/declarative/screenorientation/Core/Bubble.qml
+++ b/examples/declarative/screenorientation/Core/Bubble.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property bool rising: false
@@ -88,4 +88,4 @@ Rectangle {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/screenorientation/Core/Button.qml b/examples/declarative/screenorientation/Core/Button.qml
index 11117c9..bc73118 100644
--- a/examples/declarative/screenorientation/Core/Button.qml
+++ b/examples/declarative/screenorientation/Core/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Item {
     id: button
     signal clicked
diff --git a/examples/declarative/screenorientation/screenorientation.qml b/examples/declarative/screenorientation/screenorientation.qml
index 4387266..6c3f929 100644
--- a/examples/declarative/screenorientation/screenorientation.qml
+++ b/examples/declarative/screenorientation/screenorientation.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "Core"
 import "Core/screenorientation.js" as ScreenOrientation
 
diff --git a/examples/declarative/sqllocalstorage/hello.qml b/examples/declarative/sqllocalstorage/hello.qml
index cbfc14a..5f9b9e0 100644
--- a/examples/declarative/sqllocalstorage/hello.qml
+++ b/examples/declarative/sqllocalstorage/hello.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/examples/declarative/text/fonts/availableFonts.qml b/examples/declarative/text/fonts/availableFonts.qml
index 312bc38..4966a41 100644
--- a/examples/declarative/text/fonts/availableFonts.qml
+++ b/examples/declarative/text/fonts/availableFonts.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 480; height: 640; color: "steelblue"
diff --git a/examples/declarative/text/fonts/banner.qml b/examples/declarative/text/fonts/banner.qml
index 41bc997..d722468 100644
--- a/examples/declarative/text/fonts/banner.qml
+++ b/examples/declarative/text/fonts/banner.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/examples/declarative/text/fonts/fonts.qml b/examples/declarative/text/fonts/fonts.qml
index 743ee79..ae48f24 100644
--- a/examples/declarative/text/fonts/fonts.qml
+++ b/examples/declarative/text/fonts/fonts.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property string myText: "The quick brown fox jumps over the lazy dog."
diff --git a/examples/declarative/text/fonts/hello.qml b/examples/declarative/text/fonts/hello.qml
index 60bd919..3aaf0fe 100644
--- a/examples/declarative/text/fonts/hello.qml
+++ b/examples/declarative/text/fonts/hello.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/examples/declarative/text/textselection/textselection.qml b/examples/declarative/text/textselection/textselection.qml
index aa958e6..f343be5 100644
--- a/examples/declarative/text/textselection/textselection.qml
+++ b/examples/declarative/text/textselection/textselection.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: editor
diff --git a/examples/declarative/threading/threadedlistmodel/timedisplay.qml b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
index b1cce05..01411f4 100644
--- a/examples/declarative/threading/threadedlistmodel/timedisplay.qml
+++ b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 // ![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/examples/declarative/threading/workerscript/workerscript.qml b/examples/declarative/threading/workerscript/workerscript.qml
index e224bf1..2b03233 100644
--- a/examples/declarative/threading/workerscript/workerscript.qml
+++ b/examples/declarative/threading/workerscript/workerscript.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 480; height: 320
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures.qml b/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
index 500a909..6a4cb3d 100644
--- a/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
+++ b/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.gestures 1.0
 
 // Only works on platforms with Touch support.
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml b/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
index 492ffc6..8dacc05 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
+++ b/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: box
diff --git a/examples/declarative/toys/clocks/clocks.qml b/examples/declarative/toys/clocks/clocks.qml
index 9002fac..3354f11 100644
--- a/examples/declarative/toys/clocks/clocks.qml
+++ b/examples/declarative/toys/clocks/clocks.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/toys/clocks/content/Clock.qml b/examples/declarative/toys/clocks/content/Clock.qml
index 9c732f9..09e8393 100644
--- a/examples/declarative/toys/clocks/content/Clock.qml
+++ b/examples/declarative/toys/clocks/content/Clock.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: clock
diff --git a/examples/declarative/toys/clocks/content/QuitButton.qml b/examples/declarative/toys/clocks/content/QuitButton.qml
index 9dfe9bd..cbbf916 100644
--- a/examples/declarative/toys/clocks/content/QuitButton.qml
+++ b/examples/declarative/toys/clocks/content/QuitButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Image {
     source: "quit.png"
     scale: quitMouse.pressed ? 0.8 : 1.0
@@ -49,4 +49,4 @@ Image {
         anchors.margins: -10
         onClicked: Qt.quit()
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/toys/corkboards/Day.qml b/examples/declarative/toys/corkboards/Day.qml
index f406f7b..78591bb 100644
--- a/examples/declarative/toys/corkboards/Day.qml
+++ b/examples/declarative/toys/corkboards/Day.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     Item {
diff --git a/examples/declarative/toys/corkboards/corkboards.qml b/examples/declarative/toys/corkboards/corkboards.qml
index 9b764c9..14bc5f0 100644
--- a/examples/declarative/toys/corkboards/corkboards.qml
+++ b/examples/declarative/toys/corkboards/corkboards.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 480
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/dynamicscene.qml
index ad18698..5f14e1d 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.qml
+++ b/examples/declarative/toys/dynamicscene/dynamicscene.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 import "qml"
 
@@ -188,7 +188,7 @@ Item {
                     font.pixelSize: 14
                     wrapMode: TextEdit.WordWrap
 
-                    text: "import Qt 4.7\nImage {\n    id: smile\n    x: 360 * Math.random()\n    y: 180 * Math.random() \n    source: 'images/face-smile.png'\n    NumberAnimation on opacity { \n        to: 0; duration: 1500\n    }\n    Component.onCompleted: smile.destroy(1500);\n}"
+                    text: "import QtQuick 1.0\nImage {\n    id: smile\n    x: 360 * Math.random()\n    y: 180 * Math.random() \n    source: 'images/face-smile.png'\n    NumberAnimation on opacity { \n        to: 0; duration: 1500\n    }\n    Component.onCompleted: smile.destroy(1500);\n}"
                 }
             }
 
diff --git a/examples/declarative/toys/dynamicscene/qml/Button.qml b/examples/declarative/toys/dynamicscene/qml/Button.qml
index 7bb0ddf..8da799e 100644
--- a/examples/declarative/toys/dynamicscene/qml/Button.qml
+++ b/examples/declarative/toys/dynamicscene/qml/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml b/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml
index fa976c1..7391412 100644
--- a/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml
+++ b/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     property bool created: false
diff --git a/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml b/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml
index 1c31f71..cf5395f 100644
--- a/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml
+++ b/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "itemCreation.js" as Code
 
 Image {
diff --git a/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml b/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml
index 9b6f243..6536df3 100644
--- a/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml
+++ b/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: rootItem
diff --git a/examples/declarative/toys/dynamicscene/qml/Sun.qml b/examples/declarative/toys/dynamicscene/qml/Sun.qml
index eb24285..5b28b39 100644
--- a/examples/declarative/toys/dynamicscene/qml/Sun.qml
+++ b/examples/declarative/toys/dynamicscene/qml/Sun.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     id: sun
diff --git a/examples/declarative/toys/tic-tac-toe/content/Button.qml b/examples/declarative/toys/tic-tac-toe/content/Button.qml
index 2d30a03..403d587 100644
--- a/examples/declarative/toys/tic-tac-toe/content/Button.qml
+++ b/examples/declarative/toys/tic-tac-toe/content/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
index 0ca5350..7e50736 100644
--- a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
+++ b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     signal clicked
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
index 12b0fda..4c1ad51 100644
--- a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
+++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 import "content/tic-tac-toe.js" as Logic
 
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qml b/examples/declarative/toys/tvtennis/tvtennis.qml
index 53c95c0..805666d 100644
--- a/examples/declarative/toys/tvtennis/tvtennis.qml
+++ b/examples/declarative/toys/tvtennis/tvtennis.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/app.qml b/examples/declarative/tutorials/extending/chapter1-basics/app.qml
index 826bea9..85bd779 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/app.qml
+++ b/examples/declarative/tutorials/extending/chapter1-basics/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/app.qml b/examples/declarative/tutorials/extending/chapter2-methods/app.qml
index 50051b6..185b830 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/app.qml
+++ b/examples/declarative/tutorials/extending/chapter2-methods/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml b/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
index e183b27..a4822d3 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
index 6e5d3b4..80af476 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml b/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
index 483332c..58b099f 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 //![0]
 import Charts 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml b/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
index 097da7e..639da94 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
+++ b/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300; height: 200
diff --git a/examples/declarative/tutorials/helloworld/Cell.qml b/examples/declarative/tutorials/helloworld/Cell.qml
index e64aa7e..76055ab 100644
--- a/examples/declarative/tutorials/helloworld/Cell.qml
+++ b/examples/declarative/tutorials/helloworld/Cell.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 //![1]
 Item {
diff --git a/examples/declarative/tutorials/helloworld/tutorial1.qml b/examples/declarative/tutorials/helloworld/tutorial1.qml
index e6c4122..83b57b8 100644
--- a/examples/declarative/tutorials/helloworld/tutorial1.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial1.qml
@@ -40,7 +40,7 @@
 
 //![0]
 //![3]
-import Qt 4.7
+import QtQuick 1.0
 //![3]
 
 //![1]
diff --git a/examples/declarative/tutorials/helloworld/tutorial2.qml b/examples/declarative/tutorials/helloworld/tutorial2.qml
index 1ffde57..1bfab92 100644
--- a/examples/declarative/tutorials/helloworld/tutorial2.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial2.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index af2d5d2..cc06865 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/tutorials/samegame/samegame1/Block.qml b/examples/declarative/tutorials/samegame/samegame1/Block.qml
index db1245d..b4c4399 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Block.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: block
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/declarative/tutorials/samegame/samegame1/Button.qml
index 72b18bc..a3df028 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Button.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index 01396fa..5cc13fd 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/examples/declarative/tutorials/samegame/samegame2/Block.qml b/examples/declarative/tutorials/samegame/samegame2/Block.qml
index c271cf7..804c30f 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Block.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: block
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/declarative/tutorials/samegame/samegame2/Button.qml
index 3bd3099..cbf1b54 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
index ae1916e..11f6229 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 //![2]
 import "samegame.js" as SameGame
 //![2]
diff --git a/examples/declarative/tutorials/samegame/samegame3/Block.qml b/examples/declarative/tutorials/samegame/samegame3/Block.qml
index 673007e..784a6f4 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Block.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: block
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/declarative/tutorials/samegame/samegame3/Button.qml
index 3bd3099..cbf1b54 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
index ed17e5f..8554d86 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
index 2c49adc..972b778 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 import "samegame.js" as SameGame
 
 Rectangle {
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
index 8e3ca96..326b1b8 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
index 3bd3099..cbf1b54 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
index 5c81929..c390202 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 //![0]
 Rectangle {
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
index 4fec71b..e830635 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 import "content/samegame.js" as SameGame
 
diff --git a/examples/declarative/ui-components/dialcontrol/content/Dial.qml b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
index ed1b04d..2f1d27a 100644
--- a/examples/declarative/ui-components/dialcontrol/content/Dial.qml
+++ b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml b/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
index 9dfe9bd..cbbf916 100644
--- a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
+++ b/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 Image {
     source: "quit.png"
     scale: quitMouse.pressed ? 0.8 : 1.0
@@ -49,4 +49,4 @@ Image {
         anchors.margins: -10
         onClicked: Qt.quit()
     }
-}
\ No newline at end of file
+}
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
index ed8c7d6..c66dcdd 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [imports]
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 //! [imports]
 
diff --git a/examples/declarative/ui-components/flipable/content/Card.qml b/examples/declarative/ui-components/flipable/content/Card.qml
index d22fa7d..32c4ed1 100644
--- a/examples/declarative/ui-components/flipable/content/Card.qml
+++ b/examples/declarative/ui-components/flipable/content/Card.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
     id: container
diff --git a/examples/declarative/ui-components/flipable/flipable.qml b/examples/declarative/ui-components/flipable/flipable.qml
index 0f775e5..51867f9 100644
--- a/examples/declarative/ui-components/flipable/flipable.qml
+++ b/examples/declarative/ui-components/flipable/flipable.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml b/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
index f830f95..e92342a 100644
--- a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
+++ b/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: progressbar
diff --git a/examples/declarative/ui-components/progressbar/main.qml b/examples/declarative/ui-components/progressbar/main.qml
index c92e586..a805a7e 100644
--- a/examples/declarative/ui-components/progressbar/main.qml
+++ b/examples/declarative/ui-components/progressbar/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/scrollbar/ScrollBar.qml b/examples/declarative/ui-components/scrollbar/ScrollBar.qml
index ee8e9fa..faa501a 100644
--- a/examples/declarative/ui-components/scrollbar/ScrollBar.qml
+++ b/examples/declarative/ui-components/scrollbar/ScrollBar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: scrollBar
diff --git a/examples/declarative/ui-components/scrollbar/main.qml b/examples/declarative/ui-components/scrollbar/main.qml
index 930c3b8..b5c1a8f 100644
--- a/examples/declarative/ui-components/scrollbar/main.qml
+++ b/examples/declarative/ui-components/scrollbar/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 640
diff --git a/examples/declarative/ui-components/searchbox/SearchBox.qml b/examples/declarative/ui-components/searchbox/SearchBox.qml
index 60fa799..685552a 100644
--- a/examples/declarative/ui-components/searchbox/SearchBox.qml
+++ b/examples/declarative/ui-components/searchbox/SearchBox.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 FocusScope {
     id: focusScope
diff --git a/examples/declarative/ui-components/searchbox/main.qml b/examples/declarative/ui-components/searchbox/main.qml
index 513c298..09b1829 100644
--- a/examples/declarative/ui-components/searchbox/main.qml
+++ b/examples/declarative/ui-components/searchbox/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/examples/declarative/ui-components/slideswitch/content/Switch.qml b/examples/declarative/ui-components/slideswitch/content/Switch.qml
index 9632fd6..06d7a2b 100644
--- a/examples/declarative/ui-components/slideswitch/content/Switch.qml
+++ b/examples/declarative/ui-components/slideswitch/content/Switch.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //![0]
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: toggleswitch
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.qml b/examples/declarative/ui-components/slideswitch/slideswitch.qml
index a0a0eb2..0472f9f 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.qml
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/spinner/content/Spinner.qml b/examples/declarative/ui-components/spinner/content/Spinner.qml
index 910efb9..853c787 100644
--- a/examples/declarative/ui-components/spinner/content/Spinner.qml
+++ b/examples/declarative/ui-components/spinner/content/Spinner.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Image {
     property alias model: view.model
diff --git a/examples/declarative/ui-components/spinner/main.qml b/examples/declarative/ui-components/spinner/main.qml
index a196e72..416950f 100644
--- a/examples/declarative/ui-components/spinner/main.qml
+++ b/examples/declarative/ui-components/spinner/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/ui-components/tabwidget/TabWidget.qml b/examples/declarative/ui-components/tabwidget/TabWidget.qml
index 30eba68..f066fd2 100644
--- a/examples/declarative/ui-components/tabwidget/TabWidget.qml
+++ b/examples/declarative/ui-components/tabwidget/TabWidget.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: tabWidget
diff --git a/examples/declarative/ui-components/tabwidget/main.qml b/examples/declarative/ui-components/tabwidget/main.qml
index b9ca2a1..842ef1a 100644
--- a/examples/declarative/ui-components/tabwidget/main.qml
+++ b/examples/declarative/ui-components/tabwidget/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 TabWidget {
     id: tabs
diff --git a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml b/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
index f77e1de..78f93b5 100644
--- a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
+++ b/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 350; height: 400
diff --git a/examples/tutorials/gettingStarted/gsQml/core/button.qml b/examples/tutorials/gettingStarted/gsQml/core/button.qml
index dd5dcad..0b42bd1 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/button.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/button.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     //identifier of the item
@@ -105,4 +105,4 @@ Rectangle {
     //Animate the scale property change
     Behavior on scale { NumberAnimation{ duration: 55 } }
 
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml
index 7f47d9f..5cf8472 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: editMenu
@@ -102,4 +102,4 @@ Rectangle {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml
index 425f717..7004b63 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id:dialog
@@ -160,4 +160,4 @@ Rectangle {
             GradientStop { position: 1.0; color: "#03333333" }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml
index afe48c7..517c1811 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: fileMenu
diff --git a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml
index 0695772..bcab2fb 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: menuBar
diff --git a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml
index 6d3d214..2b327fc 100644
--- a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml
+++ b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id:textArea
@@ -84,4 +84,4 @@ Rectangle {
             selectByMouse: true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
index 5a75e0b..b50dc25 100644
--- a/examples/tutorials/gettingStarted/gsQml/texteditor.qml
+++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "core"
 
 Rectangle {
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 230169d..3c2f0a8 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -101,7 +101,7 @@ QT_BEGIN_NAMESPACE
     The following example moves the Y axis of the \l Rectangle elements while still allowing the \l Row element
     to lay the items out as if they had not been transformed:
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Row {
         Rectangle {
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 3ac095c..6f5608a 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -1422,7 +1422,7 @@ void QDeclarativeTextEditPrivate::updateDefaultTextOption()
     Only relevant on platforms, which provide virtual keyboards.
 
     \code
-        import Qt 4.7
+        import QtQuick 1.0
         TextEdit {
             id: textEdit
             text: "Hello world!"
@@ -1473,7 +1473,7 @@ void QDeclarativeTextEdit::openSoftwareInputPanel()
     Only relevant on platforms, which provide virtual keyboards.
 
     \code
-        import Qt 4.7
+        import QtQuick 1.0
         TextEdit {
             id: textEdit
             text: "Hello world!"
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 5604b82..4817999 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -651,7 +651,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
     input of integers between 11 and 31 into the text input:
 
     \code
-    import Qt 4.7
+    import QtQuick 1.0
     TextInput{
         validator: IntValidator{bottom: 11; top: 31;}
         focus: true
@@ -1334,7 +1334,7 @@ void QDeclarativeTextInput::moveCursorSelection(int position)
     Only relevant on platforms, which provide virtual keyboards.
 
     \qml
-        import Qt 4.7
+        import QtQuick 1.0
         TextInput {
             id: textInput
             text: "Hello world!"
@@ -1385,7 +1385,7 @@ void QDeclarativeTextInput::openSoftwareInputPanel()
     Only relevant on platforms, which provide virtual keyboards.
 
     \qml
-        import Qt 4.7
+        import QtQuick 1.0
         TextInput {
             id: textInput
             text: "Hello world!"
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 01cd652..bbd6e11 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -142,7 +142,7 @@ public:
 
     The example below places three colored rectangles in a ListView.
     \code
-    import Qt 4.7
+    import QtQuick 1.0
 
     Rectangle {
         VisualItemModel {
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 8c5fd3a..90d38b3 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1286,7 +1286,7 @@ bool QDeclarativeCompiler::buildSubObject(Object *obj, const BindingContext &ctx
 
 int QDeclarativeCompiler::componentTypeRef()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,7);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("QtQuick/Component",1,0);
     for (int ii = output->types.count() - 1; ii >= 0; --ii) {
         if (output->types.at(ii).type == t)
             return ii;
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 7f58166..b532b0c 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -78,7 +78,7 @@ class QByteArray;
     For example, if there is a \c main.qml file like this:
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         width: 200
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index de45a95..59d5cfa 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -85,7 +85,7 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     context->setContextProperty("myModel", &modelData);
 
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nListView { model: myModel }", QUrl());
+    component.setData("import QtQuick 1.0\nListView { model: myModel }", QUrl());
     component.create(context);
     \endcode
 
@@ -112,7 +112,7 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     context->setContextObject(&myDataSet);
 
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nListView { model: myModel }", QUrl());
+    component.setData("import QtQuick 1.0\nListView { model: myModel }", QUrl());
     component.create(context);
     \endcode
 
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp
index 1a9b501..fa79425 100644
--- a/src/declarative/qml/qdeclarativedom.cpp
+++ b/src/declarative/qml/qdeclarativedom.cpp
@@ -896,7 +896,7 @@ QByteArray QDeclarativeDomObject::customTypeData() const
 */
 bool QDeclarativeDomObject::isComponent() const
 {
-    return (d->object && d->object->typeName == "Qt/Component");
+    return (d->object && (d->object->typeName == "Qt/Component" || d->object->typeName == "QtQuick/Component"));
 }
 
 /*!
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 6fc4df0..77a1ba4 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -202,7 +202,7 @@ QScriptValue QDeclarativeExpressionPrivate::evalInObjectScope(QDeclarativeContex
     For example, given a file \c main.qml like this:
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         width: 200; height: 200
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 6879494..3e4a81a 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -157,7 +157,7 @@ QHash<QUrl, QDeclarativeFontObject*> QDeclarativeFontLoaderPrivate::fonts;
 
     For example:
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Column { 
         FontLoader { id: fixedFont; name: "Courier" }
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index 56320e6..c240f22 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -82,7 +82,7 @@ public:
     object to access the current time.
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         Timer {
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index f0ed80b..24edc89 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -531,7 +531,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
     A XmlListModel could create a model from this data, like this:
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     XmlListModel {
         id: xmlModel
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index edb69bc..3bd4b43 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -637,7 +637,7 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
     snow, the lower one has particles expelled up like a fountain.
 
     \qml
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Rectangle {
diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp
index 522a63a..8e8eedc 100644
--- a/tests/auto/declarative/parserstress/tst_parserstress.cpp
+++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp
@@ -121,7 +121,7 @@ void tst_parserstress::ecmascript()
 
     QString dataStr = QString::fromUtf8(data);
 
-    QString qml = "import Qt 4.7\n";
+    QString qml = "import QtQuick 1.0\n";
             qml+= "\n";
             qml+= "QtObject {\n";
             qml+= "    property int test\n";
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml b/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
index 227a055..9b7c805 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml b/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml
index d430c2c..82d0315 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml b/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
index e248cc3..d3bc8cb 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml b/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
index 01b469b..de66067 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Column {
     Text {
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/fill.qml b/tests/auto/declarative/qdeclarativeanchors/data/fill.qml
index c594365..50fbbe0 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/fill.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/fill.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/hvCenter.qml b/tests/auto/declarative/qdeclarativeanchors/data/hvCenter.qml
index 7cd4f26..11b31ff 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/hvCenter.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/hvCenter.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 77; height: 95
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml b/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
index bd7f3de..def48fa 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml b/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
index e2dfde2..21571e2 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
   id: container;
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/margins.qml b/tests/auto/declarative/qdeclarativeanchors/data/margins.qml
index 58bc8a8..dace9c0 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/margins.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/margins.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
index 97b77d0..15e107c 100644
--- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
+++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
@@ -304,7 +304,7 @@ void tst_qdeclarativeanchors::illegalSets()
 
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\n" + qml.toUtf8()), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\n" + qml.toUtf8()), QUrl::fromLocalFile(""));
     if (!component.isReady())
         qWarning() << "Test errors:" << component.errors();
     QVERIFY(component.isReady());
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
index 62e5b14..51deb56 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 AnimatedImage {
     source: "colors.gif"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
index 3400789..d44937f 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 AnimatedImage {
     source: "stickman.gif"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml
index 566f9ea..f08f74d 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 AnimatedImage {
     sourceSize: "240x180"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
index 92c57b6..1d7e259 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 AnimatedImage {
     source: "stickman.gif"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml
index b8a254f..8b24d73 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 AnimatedImage {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
index 2b6074c..c5b1413 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 AnimatedImage {
     source: "stickman.gif"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
index da15a85..8cbe813 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
@@ -192,7 +192,7 @@ void tst_qdeclarativeanimatedimage::invalidSource()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\n AnimatedImage { source: \"no-such-file.gif\" }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\n AnimatedImage { source: \"no-such-file.gif\" }", QUrl::fromLocalFile(""));
     QVERIFY(component.isReady());
 
     QTest::ignoreMessage(QtWarningMsg, "file::2:2: QML AnimatedImage: Error Reading Animated Image File file:no-such-file.gif");
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/attached.qml b/tests/auto/declarative/qdeclarativeanimations/data/attached.qml
index 78949f9..5da4a69 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/attached.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/attached.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 180; height: 200;
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml b/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
index 5bb20f6..3e7ebe7 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml b/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
index 8dc422c..40235ee 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
index 89cc424..0a8a7ea 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
index f14eaee..118bbbc 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
index dd0368c..2599e70 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
index 8d3d05e..5dafb0e 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
index 09987de..e2ce07f 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
index aab9d11..6b80317 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
index 034531c..2563c01 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml b/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
index 0e77c48..aff69e5 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
index def350e..a97b3fd 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
index a95bf2a..9a77467 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml
index e9dc36e..04741ff 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties.qml
index 9e4a74e..e6af9ac 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/properties.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
index 5de813e..60ec456 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
index cf1bc3f..e86eca1 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
index ce9f632..04d41c6 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
index a7f5116..e139f8c 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
index d8ef5d6..8e2b41d 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
index b3b827d..6b84685 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
index e6f773c..c9d8e95 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
index 0ae717a..61e8a96 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
index 44cedf0..b023943 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
index 277cc1b..7c88a7f 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml
index b47b5f2..fbef95e 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/rotation.qml b/tests/auto/declarative/qdeclarativeanimations/data/rotation.qml
index 6e48585..ac158df 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/rotation.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/rotation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 600; height: 200
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml
index 2c5207e..7d33ed7 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     color: "skyblue"
     width: 500
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml b/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
index bb6b028..fa9cd40 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml b/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
index b844bd8..f6343a1 100644
--- a/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index e5943fb..2c9d982 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -674,7 +674,7 @@ void tst_qdeclarativeanimations::easingProperties()
 {
     {
         QDeclarativeEngine engine;
-        QString componentStr = "import Qt 4.7\nNumberAnimation { easing.type: \"InOutQuad\" }";
+        QString componentStr = "import QtQuick 1.0\nNumberAnimation { easing.type: \"InOutQuad\" }";
         QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
@@ -685,7 +685,7 @@ void tst_qdeclarativeanimations::easingProperties()
 
     {
         QDeclarativeEngine engine;
-        QString componentStr = "import Qt 4.7\nPropertyAnimation { easing.type: \"OutBounce\"; easing.amplitude: 5.0 }";
+        QString componentStr = "import QtQuick 1.0\nPropertyAnimation { easing.type: \"OutBounce\"; easing.amplitude: 5.0 }";
         QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
@@ -697,7 +697,7 @@ void tst_qdeclarativeanimations::easingProperties()
 
     {
         QDeclarativeEngine engine;
-        QString componentStr = "import Qt 4.7\nPropertyAnimation { easing.type: \"OutElastic\"; easing.amplitude: 5.0; easing.period: 3.0}";
+        QString componentStr = "import QtQuick 1.0\nPropertyAnimation { easing.type: \"OutElastic\"; easing.amplitude: 5.0; easing.period: 3.0}";
         QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
@@ -710,7 +710,7 @@ void tst_qdeclarativeanimations::easingProperties()
 
     {
         QDeclarativeEngine engine;
-        QString componentStr = "import Qt 4.7\nPropertyAnimation { easing.type: \"InOutBack\"; easing.overshoot: 2 }";
+        QString componentStr = "import QtQuick 1.0\nPropertyAnimation { easing.type: \"InOutBack\"; easing.overshoot: 2 }";
         QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
index 62e6be5..a452447 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/color.qml b/tests/auto/declarative/qdeclarativebehaviors/data/color.qml
index e075bd0..c4b783a 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/color.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/color.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml b/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
index c766f42..88ddfaa 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml b/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
index e1f4699..f6cfa5e 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml b/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
index c0f4eac..e318dd2 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml b/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
index b58e332..6c78a84 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml b/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
index 0b5d00b..3baa1ac 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
index 6eb0729..ddb5bbd 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
index 42b80a5..c0b71cd 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml b/tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml
index c052366..8aa590b 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml b/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
index 9e328d6..76379c0 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml b/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
index 5857c4d..c5c78d1 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml b/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
index e3fd77d..d19da29 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml b/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml
index d41add3..03b5421 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml b/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
index 4528cce..9fca5c3 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml b/tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml
index d439875..25cdf10 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
index f2f6352..c05cdaa 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml b/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
index de27f69..6ba0118 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     width: 400
     height: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startup.qml b/tests/auto/declarative/qdeclarativebehaviors/data/startup.qml
index f3ff620..fca416c 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/startup.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/startup.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml b/tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml
index 1911cc4..eb62761 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800;
diff --git a/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
index 9c619e6..9449736 100644
--- a/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
+++ b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml b/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
index e0f1811..3e99e2b 100644
--- a/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
+++ b/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: screen
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index c77d395..2f00f60 100644
--- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -94,7 +94,7 @@ tst_qdeclarativeborderimage::tst_qdeclarativeborderimage()
 
 void tst_qdeclarativeborderimage::noSource()
 {
-    QString componentStr = "import Qt 4.7\nBorderImage { source: \"\" }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -138,7 +138,7 @@ void tst_qdeclarativeborderimage::imageSource()
     if (!error.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
 
-    QString componentStr = "import Qt 4.7\nBorderImage { source: \"" + source + "\" }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" + source + "\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -165,7 +165,7 @@ void tst_qdeclarativeborderimage::imageSource()
 
 void tst_qdeclarativeborderimage::clearSource()
 {
-    QString componentStr = "import Qt 4.7\nBorderImage { source: srcImage }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: srcImage }";
     QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
     QDeclarativeComponent component(&engine);
@@ -185,7 +185,7 @@ void tst_qdeclarativeborderimage::clearSource()
 
 void tst_qdeclarativeborderimage::resized()
 {
-    QString componentStr = "import Qt 4.7\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() + "\"; width: 300; height: 300 }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() + "\"; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -200,7 +200,7 @@ void tst_qdeclarativeborderimage::resized()
 
 void tst_qdeclarativeborderimage::smooth()
 {
-    QString componentStr = "import Qt 4.7\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -217,7 +217,7 @@ void tst_qdeclarativeborderimage::smooth()
 void tst_qdeclarativeborderimage::tileModes()
 {
     {
-        QString componentStr = "import Qt 4.7\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }";
+        QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }";
         QDeclarativeComponent component(&engine);
         component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -230,7 +230,7 @@ void tst_qdeclarativeborderimage::tileModes()
         delete obj;
     }
     {
-        QString componentStr = "import Qt 4.7\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 150; horizontalTileMode: BorderImage.Round; verticalTileMode: BorderImage.Round }";
+        QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 150; horizontalTileMode: BorderImage.Round; verticalTileMode: BorderImage.Round }";
         QDeclarativeComponent component(&engine);
         component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -257,7 +257,7 @@ void tst_qdeclarativeborderimage::sciSource()
         server->serveDirectory(SRCDIR "/data");
     }
 
-    QString componentStr = "import Qt 4.7\nBorderImage { source: \"" + source + "\"; width: 300; height: 300 }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" + source + "\"; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -302,7 +302,7 @@ void tst_qdeclarativeborderimage::invalidSciFile()
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeGridScaledImage: Invalid tile rule specified. Using Stretch."); // for "Roun"
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeGridScaledImage: Invalid tile rule specified. Using Stretch."); // for "Repea"
 
-    QString componentStr = "import Qt 4.7\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/invalid.sci").toString() +"\"; width: 300; height: 300 }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/invalid.sci").toString() +"\"; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
@@ -320,7 +320,7 @@ void tst_qdeclarativeborderimage::pendingRemoteRequest()
 {
     QFETCH(QString, source);
 
-    QString componentStr = "import Qt 4.7\nBorderImage { source: \"" + source + "\" }";
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" + source + "\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
diff --git a/tests/auto/declarative/qdeclarativecomponent/data/createObject.qml b/tests/auto/declarative/qdeclarativecomponent/data/createObject.qml
index 4ee1e75..4a06791 100644
--- a/tests/auto/declarative/qdeclarativecomponent/data/createObject.qml
+++ b/tests/auto/declarative/qdeclarativecomponent/data/createObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item{
     id: root
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/connection-targetchange.qml b/tests/auto/declarative/qdeclarativeconnection/data/connection-targetchange.qml
index bb9a3bc..dd92cb9 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/connection-targetchange.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/connection-targetchange.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Component {
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml
index 764d5ab..459c346 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: screen
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml
index 09e7812..8eddf43 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: screen
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-parent.qml b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-parent.qml
index 478503d..953347a 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-parent.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-parent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: screen
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals.qml b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals.qml
index d4e8d7e..3702bdb 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: screen
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
index 954ca97..c599083 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: screen; width: 50
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
index 9e5a99c..f0dbaba 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Connections { id: connection; target: connection; onTargetChanged: 1 == 1 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
index 51efde6..94c9c7c 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Connections {}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
index 361474c..00507d9 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: screen; width: 50
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index 605cf8e..100224b 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -233,7 +233,7 @@ private:
 #define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
 { \
     QDeclarativeComponent component(&engine); \
-    component.setData("import Qt 4.7; QtObject { property variant test: " #name " }", QUrl()); \
+    component.setData("import QtQuick 1.0; QtObject { property variant test: " #name " }", QUrl()); \
 \
     QObject *obj = component.create(ctxt); \
 \
@@ -283,7 +283,7 @@ void tst_qdeclarativecontext::setContextProperty()
     // Changes in context properties
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.7; QtObject { property variant test: a }", QUrl());
+        component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -295,7 +295,7 @@ void tst_qdeclarativecontext::setContextProperty()
     }
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.7; QtObject { property variant test: b }", QUrl());
+        component.setData("import QtQuick 1.0; QtObject { property variant test: b }", QUrl());
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -309,7 +309,7 @@ void tst_qdeclarativecontext::setContextProperty()
     }
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.7; QtObject { property variant test: e.a }", QUrl());
+        component.setData("import QtQuick 1.0; QtObject { property variant test: e.a }", QUrl());
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -323,7 +323,7 @@ void tst_qdeclarativecontext::setContextProperty()
     // New context properties
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.7; QtObject { property variant test: a }", QUrl());
+        component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -337,7 +337,7 @@ void tst_qdeclarativecontext::setContextProperty()
     // Setting an object-variant context property
     {
         QDeclarativeComponent component(&engine);
-        component.setData("import Qt 4.7; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property variant obj: root; }", QUrl());
+        component.setData("import QtQuick 1.0; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property variant obj: root; }", QUrl());
 
         QDeclarativeContext ctxt(engine.rootContext());
         ctxt.setContextProperty("ctxtProp", QVariant());
@@ -385,7 +385,7 @@ void tst_qdeclarativecontext::setContextObject()
     // Changes in context properties
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.7; QtObject { property variant test: a }", QUrl());
+        component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
 
         QObject *obj = component.create(&ctxt); 
 
@@ -417,7 +417,7 @@ void tst_qdeclarativecontext::destruction()
 void tst_qdeclarativecontext::idAsContextProperty()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; QtObject { property variant a; a: QtObject { id: myObject } }", QUrl());
+    component.setData("import QtQuick 1.0; QtObject { property variant a; a: QtObject { id: myObject } }", QUrl());
 
     QObject *obj = component.create();
     QVERIFY(obj);
@@ -437,7 +437,7 @@ void tst_qdeclarativecontext::idAsContextProperty()
 void tst_qdeclarativecontext::readOnlyContexts()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; QtObject { id: me }", QUrl());
+    component.setData("import QtQuick 1.0; QtObject { id: me }", QUrl());
 
     QObject *obj = component.create();
     QVERIFY(obj);
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index adba190..4a5bdf2 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -283,7 +283,7 @@ void tst_QDeclarativeDebug::initTestCase()
     m_engine = new QDeclarativeEngine(this);
 
     QList<QByteArray> qml;
-    qml << "import Qt 4.7\n"
+    qml << "import QtQuick 1.0\n"
             "Item {"
                 "width: 10; height: 20; scale: blueRect.scale;"
                 "Rectangle { id: blueRect; width: 500; height: 600; color: \"blue\"; }"
@@ -294,11 +294,11 @@ void tst_QDeclarativeDebug::initTestCase()
             "}";
 
     // add second component to test multiple root contexts
-    qml << "import Qt 4.7\n"
+    qml << "import QtQuick 1.0\n"
             "Item {}";
 
     // and a third to test methods
-    qml << "import Qt 4.7\n"
+    qml << "import QtQuick 1.0\n"
             "Item {"
                 "function myMethodNoArgs() { return 3; }\n"
                 "function myMethod(a) { return a + 9; }\n"
diff --git a/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml b/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
index dd9e9ea..f6760b6 100644
--- a/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
 }
diff --git a/tests/auto/declarative/qdeclarativedom/data/MyItem.qml b/tests/auto/declarative/qdeclarativedom/data/MyItem.qml
index dd9e9ea..f6760b6 100644
--- a/tests/auto/declarative/qdeclarativedom/data/MyItem.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/MyItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
 }
diff --git a/tests/auto/declarative/qdeclarativedom/data/import/Bar.qml b/tests/auto/declarative/qdeclarativedom/data/import/Bar.qml
index d26b299..86a7176 100644
--- a/tests/auto/declarative/qdeclarativedom/data/import/Bar.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/import/Bar.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 
diff --git a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml
index d26b299..86a7176 100644
--- a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 
diff --git a/tests/auto/declarative/qdeclarativedom/data/top.qml b/tests/auto/declarative/qdeclarativedom/data/top.qml
index 6405cd2..56ea9df 100644
--- a/tests/auto/declarative/qdeclarativedom/data/top.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/top.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 MyComponent {
     width: 100
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index dca5205..c61be55 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -86,7 +86,7 @@ private:
 
 void tst_qdeclarativedom::loadSimple()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                       "Item {}";
 
     QDeclarativeDomDocument document;
@@ -97,15 +97,15 @@ void tst_qdeclarativedom::loadSimple()
     QVERIFY(rootObject.isValid());
     QVERIFY(!rootObject.isComponent());
     QVERIFY(!rootObject.isCustomType());
-    QVERIFY(rootObject.objectType() == "Qt/Item");
-    QVERIFY(rootObject.objectTypeMajorVersion() == 4);
-    QVERIFY(rootObject.objectTypeMinorVersion() == 7);
+    QVERIFY(rootObject.objectType() == "QtQuick/Item");
+    QVERIFY(rootObject.objectTypeMajorVersion() == 1);
+    QVERIFY(rootObject.objectTypeMinorVersion() == 0);
 }
 
 // Test regular properties
 void tst_qdeclarativedom::loadProperties()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "Item { id : item; x : 300; visible : true }";
 
     QDeclarativeDomDocument document;
@@ -120,7 +120,7 @@ void tst_qdeclarativedom::loadProperties()
     QVERIFY(xProperty.propertyName() == "x");
     QCOMPARE(xProperty.propertyNameParts().count(), 1);
     QVERIFY(xProperty.propertyNameParts().at(0) == "x");
-    QCOMPARE(xProperty.position(), 32);
+    QCOMPARE(xProperty.position(), 37);
     QCOMPARE(xProperty.length(), 1);
     QVERIFY(xProperty.value().isLiteral());
     QVERIFY(xProperty.value().toLiteral().literal() == "300");
@@ -129,7 +129,7 @@ void tst_qdeclarativedom::loadProperties()
     QVERIFY(visibleProperty.propertyName() == "visible");
     QCOMPARE(visibleProperty.propertyNameParts().count(), 1);
     QVERIFY(visibleProperty.propertyNameParts().at(0) == "visible");
-    QCOMPARE(visibleProperty.position(), 41);
+    QCOMPARE(visibleProperty.position(), 46);
     QCOMPARE(visibleProperty.length(), 7);
     QVERIFY(visibleProperty.value().isLiteral());
     QVERIFY(visibleProperty.value().toLiteral().literal() == "true");
@@ -139,7 +139,7 @@ void tst_qdeclarativedom::loadProperties()
 void tst_qdeclarativedom::loadGroupedProperties()
 {
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item { anchors.left: parent.left; anchors.right: parent.right }";
 
         QDeclarativeDomDocument document;
@@ -166,7 +166,7 @@ void tst_qdeclarativedom::loadGroupedProperties()
         QCOMPARE(leftProperty.propertyNameParts().count(), 2);
         QVERIFY(leftProperty.propertyNameParts().at(0) == "anchors");
         QVERIFY(leftProperty.propertyNameParts().at(1) == "left");
-        QCOMPARE(leftProperty.position(), 21);
+        QCOMPARE(leftProperty.position(), 26);
         QCOMPARE(leftProperty.length(), 12);
         QVERIFY(leftProperty.value().isBinding());
         QVERIFY(leftProperty.value().toBinding().binding() == "parent.left");
@@ -175,14 +175,14 @@ void tst_qdeclarativedom::loadGroupedProperties()
         QCOMPARE(rightProperty.propertyNameParts().count(), 2);
         QVERIFY(rightProperty.propertyNameParts().at(0) == "anchors");
         QVERIFY(rightProperty.propertyNameParts().at(1) == "right");
-        QCOMPARE(rightProperty.position(), 48);
+        QCOMPARE(rightProperty.position(), 53);
         QCOMPARE(rightProperty.length(), 13);
         QVERIFY(rightProperty.value().isBinding());
         QVERIFY(rightProperty.value().toBinding().binding() == "parent.right");
     }
 
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item { \n"
                          "    anchors {\n"
                          "        left: parent.left\n"
@@ -214,7 +214,7 @@ void tst_qdeclarativedom::loadGroupedProperties()
         QCOMPARE(leftProperty.propertyNameParts().count(), 2);
         QVERIFY(leftProperty.propertyNameParts().at(0) == "anchors");
         QVERIFY(leftProperty.propertyNameParts().at(1) == "left");
-        QCOMPARE(leftProperty.position(), 44);
+        QCOMPARE(leftProperty.position(), 49);
         QCOMPARE(leftProperty.length(), 4);
         QVERIFY(leftProperty.value().isBinding());
         QVERIFY(leftProperty.value().toBinding().binding() == "parent.left");
@@ -223,7 +223,7 @@ void tst_qdeclarativedom::loadGroupedProperties()
         QCOMPARE(rightProperty.propertyNameParts().count(), 2);
         QVERIFY(rightProperty.propertyNameParts().at(0) == "anchors");
         QVERIFY(rightProperty.propertyNameParts().at(1) == "right");
-        QCOMPARE(rightProperty.position(), 70);
+        QCOMPARE(rightProperty.position(), 75);
         QCOMPARE(rightProperty.length(), 5);
         QVERIFY(rightProperty.value().isBinding());
         QVERIFY(rightProperty.value().toBinding().binding() == "parent.right");
@@ -233,7 +233,7 @@ void tst_qdeclarativedom::loadGroupedProperties()
 
 void tst_qdeclarativedom::loadChildObject()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "Item { Item {} }";
 
     QDeclarativeDomDocument document;
@@ -252,7 +252,7 @@ void tst_qdeclarativedom::loadChildObject()
 
     QDeclarativeDomObject childItem = list.values().first().toObject();
     QVERIFY(childItem.isValid());
-    QVERIFY(childItem.objectType() == "Qt/Item");
+    QVERIFY(childItem.objectType() == "QtQuick/Item");
 }
 
 void tst_qdeclarativedom::loadComposite()
@@ -278,7 +278,7 @@ void tst_qdeclarativedom::loadComposite()
 
 void tst_qdeclarativedom::testValueSource()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "Rectangle { SpringAnimation on height { spring: 1.4; damping: .15; to: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
 
     QDeclarativeEngine freshEngine;
@@ -295,7 +295,7 @@ void tst_qdeclarativedom::testValueSource()
     QDeclarativeDomObject valueSourceObject = valueSource.object();
     QVERIFY(valueSourceObject.isValid());
 
-    QVERIFY(valueSourceObject.objectType() == "Qt/SpringAnimation");
+    QVERIFY(valueSourceObject.objectType() == "QtQuick/SpringAnimation");
 
     const QDeclarativeDomValue springValue = valueSourceObject.property("spring").value();
     QVERIFY(!springValue.isInvalid());
@@ -310,7 +310,7 @@ void tst_qdeclarativedom::testValueSource()
 
 void tst_qdeclarativedom::testValueInterceptor()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "Rectangle { Behavior on height { NumberAnimation { duration: 100 } } }";
 
     QDeclarativeEngine freshEngine;
@@ -327,7 +327,7 @@ void tst_qdeclarativedom::testValueInterceptor()
     QDeclarativeDomObject valueInterceptorObject = valueInterceptor.object();
     QVERIFY(valueInterceptorObject.isValid());
 
-    QVERIFY(valueInterceptorObject.objectType() == "Qt/Behavior");
+    QVERIFY(valueInterceptorObject.objectType() == "QtQuick/Behavior");
 
     const QDeclarativeDomValue animationValue = valueInterceptorObject.property("animation").value();
     QVERIFY(!animationValue.isInvalid());
@@ -337,7 +337,7 @@ void tst_qdeclarativedom::testValueInterceptor()
 // Test QDeclarativeDomDocument::imports()
 void tst_qdeclarativedom::loadImports()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "import importlib.sublib 1.1\n"
                      "import importlib.sublib 1.0 as NewFoo\n"
                      "import 'import'\n"
@@ -353,9 +353,9 @@ void tst_qdeclarativedom::loadImports()
 
     QDeclarativeDomImport import = document.imports().at(0);
     QCOMPARE(import.type(), QDeclarativeDomImport::Library);
-    QCOMPARE(import.uri(), QLatin1String("Qt"));
+    QCOMPARE(import.uri(), QLatin1String("QtQuick"));
     QCOMPARE(import.qualifier(), QString());
-    QCOMPARE(import.version(), QLatin1String("4.7"));
+    QCOMPARE(import.version(), QLatin1String("1.0"));
 
     import = document.imports().at(1);
     QCOMPARE(import.type(), QDeclarativeDomImport::Library);
@@ -385,7 +385,7 @@ void tst_qdeclarativedom::loadImports()
 // Test loading a file with errors
 void tst_qdeclarativedom::loadErrors()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "Item {\n"
                      "  foo: 12\n"
                      "}";
@@ -405,7 +405,7 @@ void tst_qdeclarativedom::loadErrors()
 // Test loading a file with syntax errors
 void tst_qdeclarativedom::loadSyntaxErrors()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "asdf";
 
     QDeclarativeDomDocument document;
@@ -423,7 +423,7 @@ void tst_qdeclarativedom::loadSyntaxErrors()
 // Test attempting to load a file with remote references
 void tst_qdeclarativedom::loadRemoteErrors()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "import \"http://localhost/exampleQmlScript.js\" as Script\n"
                      "Item {\n"
                      "}";
@@ -443,7 +443,7 @@ void tst_qdeclarativedom::loadRemoteErrors()
 void tst_qdeclarativedom::loadDynamicProperty()
 {
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {\n"
                          "    property int a\n"
                          "    property bool b\n"
@@ -478,20 +478,20 @@ void tst_qdeclarativedom::loadDynamicProperty()
         QCOMPARE(d.length(), test_length); \
     } \
 
-        DP_TEST(0, a, QVariant::Int, 25, 14, "int");
-        DP_TEST(1, b, QVariant::Bool, 44, 15, "bool");
-        DP_TEST(2, c, QMetaType::QReal, 64, 17, "double");
-        DP_TEST(3, d, QMetaType::QReal, 86, 15, "real");
-        DP_TEST(4, e, QVariant::String, 106, 17, "string");
-        DP_TEST(5, f, QVariant::Url, 128, 14, "url");
-        DP_TEST(6, g, QVariant::Color, 147, 16, "color");
-        DP_TEST(7, h, QVariant::DateTime, 168, 15, "date");
-        DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 18, "variant");
-        DP_TEST(9, j, -1, 211, 19, "QtObject");
+        DP_TEST(0, a, QVariant::Int, 30, 14, "int");
+        DP_TEST(1, b, QVariant::Bool, 49, 15, "bool");
+        DP_TEST(2, c, QMetaType::QReal, 69, 17, "double");
+        DP_TEST(3, d, QMetaType::QReal, 91, 15, "real");
+        DP_TEST(4, e, QVariant::String, 111, 17, "string");
+        DP_TEST(5, f, QVariant::Url, 133, 14, "url");
+        DP_TEST(6, g, QVariant::Color, 152, 16, "color");
+        DP_TEST(7, h, QVariant::DateTime, 173, 15, "date");
+        DP_TEST(8, i, qMetaTypeId<QVariant>(), 193, 18, "variant");
+        DP_TEST(9, j, -1, 216, 19, "QtObject");
     }
 
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {\n"
                          "    property int a: 12\n"
                          "    property int b: a + 6\n"
@@ -535,7 +535,7 @@ void tst_qdeclarativedom::loadComponent()
 {
     // Explicit component
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {\n"
                          "    Component {\n"
                          "        id: myComponent\n"
@@ -564,9 +564,9 @@ void tst_qdeclarativedom::loadComponent()
 
         QDeclarativeDomComponent component = componentObject.toComponent();
         QVERIFY(component.isValid());
-        QVERIFY(component.objectType() == "Qt/Component");
-        QVERIFY(component.objectTypeMajorVersion() == 4);
-        QVERIFY(component.objectTypeMinorVersion() == 7);
+        QVERIFY(component.objectType() == "QtQuick/Component");
+        QVERIFY(component.objectTypeMajorVersion() == 1);
+        QVERIFY(component.objectTypeMinorVersion() == 0);
         QVERIFY(component.objectClassName() == "Component");
         QVERIFY(component.objectId() == "myComponent");
         QVERIFY(component.properties().isEmpty());
@@ -574,7 +574,7 @@ void tst_qdeclarativedom::loadComponent()
         QVERIFY(component.isCustomType() == false);
         QVERIFY(component.customTypeData() == "");
         QVERIFY(component.isComponent());
-        QCOMPARE(component.position(), 25);
+        QCOMPARE(component.position(), 30);
         QCOMPARE(component.length(), 57);
 
         QVERIFY(component.componentRoot().isValid());
@@ -583,7 +583,7 @@ void tst_qdeclarativedom::loadComponent()
 
     // Implicit component
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "ListView {\n"
                          "    delegate: Item {}\n"
                          "}";
@@ -604,7 +604,7 @@ void tst_qdeclarativedom::loadComponent()
 
         QDeclarativeDomComponent component = componentObject.toComponent();
         QVERIFY(component.isValid());
-        QVERIFY(component.objectType() == "Qt/Component");
+        QVERIFY(component.objectType() == "QtQuick/Component");
         QVERIFY(component.objectClassName() == "Component");
         QVERIFY(component.objectId() == "");
         QVERIFY(component.properties().isEmpty());
@@ -612,7 +612,7 @@ void tst_qdeclarativedom::loadComponent()
         QVERIFY(component.isCustomType() == false);
         QVERIFY(component.customTypeData() == "");
         QVERIFY(component.isComponent());
-        QCOMPARE(component.position(), 39);
+        QCOMPARE(component.position(), 44);
         QCOMPARE(component.length(), 7);
 
         QVERIFY(component.componentRoot().isValid());
@@ -633,7 +633,7 @@ void tst_qdeclarativedom::object_dynamicProperty()
 
     // Valid object, no dynamic properties
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {}";
 
         QDeclarativeDomDocument document;
@@ -648,7 +648,7 @@ void tst_qdeclarativedom::object_dynamicProperty()
 
     // Valid object, dynamic properties
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {\n"
                          "    property int a\n"
                          "}";
@@ -668,7 +668,7 @@ void tst_qdeclarativedom::object_dynamicProperty()
         QVERIFY(p.propertyType() == QVariant::Int);
         QVERIFY(p.propertyTypeName() == "int");
         QVERIFY(p.isDefaultProperty() == false);
-        QCOMPARE(p.position(), 25);
+        QCOMPARE(p.position(), 30);
         QCOMPARE(p.length(), 14);
     }
 
@@ -686,7 +686,7 @@ void tst_qdeclarativedom::object_property()
 
     // Valid object - no default
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {\n"
                          "    x: 10\n"
                          "    y: 12\n"
@@ -709,7 +709,7 @@ void tst_qdeclarativedom::object_property()
         QVERIFY(x.isDefaultProperty() == false);
         QVERIFY(x.value().isLiteral());
         QVERIFY(x.value().toLiteral().literal() == "10");
-        QCOMPARE(x.position(), 25);
+        QCOMPARE(x.position(), 30);
         QCOMPARE(x.length(), 1);
 
         QDeclarativeDomProperty y = rootObject.property("y");
@@ -720,13 +720,13 @@ void tst_qdeclarativedom::object_property()
         QVERIFY(y.isDefaultProperty() == false);
         QVERIFY(y.value().isLiteral());
         QVERIFY(y.value().toLiteral().literal() == "12");
-        QCOMPARE(y.position(), 35);
+        QCOMPARE(y.position(), 40);
         QCOMPARE(y.length(), 1);
     }
 
     // Valid object - with default
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {\n"
                          "    x: 10\n"
                          "    y: 12\n"
@@ -750,7 +750,7 @@ void tst_qdeclarativedom::object_property()
         QVERIFY(x.isDefaultProperty() == false);
         QVERIFY(x.value().isLiteral());
         QVERIFY(x.value().toLiteral().literal() == "10");
-        QCOMPARE(x.position(), 25);
+        QCOMPARE(x.position(), 30);
         QCOMPARE(x.length(), 1);
 
         QDeclarativeDomProperty y = rootObject.property("y");
@@ -761,7 +761,7 @@ void tst_qdeclarativedom::object_property()
         QVERIFY(y.isDefaultProperty() == false);
         QVERIFY(y.value().isLiteral());
         QVERIFY(y.value().toLiteral().literal() == "12");
-        QCOMPARE(y.position(), 35);
+        QCOMPARE(y.position(), 40);
         QCOMPARE(y.length(), 1);
 
         QDeclarativeDomProperty data = rootObject.property("data");
@@ -771,7 +771,7 @@ void tst_qdeclarativedom::object_property()
         QVERIFY(data.propertyNameParts().at(0) == "data");
         QVERIFY(data.isDefaultProperty() == true);
         QVERIFY(data.value().isList());
-        QCOMPARE(data.position(), 45);
+        QCOMPARE(data.position(), 50);
         QCOMPARE(data.length(), 0);
     }
 }
@@ -787,7 +787,7 @@ void tst_qdeclarativedom::object_url()
 
     // Valid builtin object
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "Item {}";
 
         QDeclarativeDomDocument document;
@@ -800,7 +800,7 @@ void tst_qdeclarativedom::object_url()
 
     // Valid composite object
     {
-        QByteArray qml = "import Qt 4.7\n"
+        QByteArray qml = "import QtQuick 1.0\n"
                          "MyItem {}";
 
         QUrl myUrl = QUrl::fromLocalFile(SRCDIR "/data/main.qml");
@@ -818,7 +818,7 @@ void tst_qdeclarativedom::object_url()
 // Test copy constructors and operators
 void tst_qdeclarativedom::copy()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "MyItem {\n"
                      "    id: myItem\n"
                      "    property int a: 10\n"
@@ -1193,7 +1193,7 @@ void tst_qdeclarativedom::copy()
 // Tests the position/length of various elements
 void tst_qdeclarativedom::position()
 {
-    QByteArray qml = "import Qt 4.7\n"
+    QByteArray qml = "import QtQuick 1.0\n"
                      "Item {\n"
                      "    id: myItem\n"
                      "    property int a: 10\n"
@@ -1215,32 +1215,32 @@ void tst_qdeclarativedom::position()
 
     // All QDeclarativeDomDynamicProperty
     QDeclarativeDomDynamicProperty dynProp = root.dynamicProperty("a");
-    QCOMPARE(dynProp.position(), 40);
+    QCOMPARE(dynProp.position(), 45);
     QCOMPARE(dynProp.length(), 18);
 
     // All QDeclarativeDomProperty
     QDeclarativeDomProperty x = root.property("x");
-    QCOMPARE(x.position(), 63);
+    QCOMPARE(x.position(), 68);
     QCOMPARE(x.length(), 1);
 
     QDeclarativeDomProperty y = root.property("y");
-    QCOMPARE(y.position(), 73);
+    QCOMPARE(y.position(), 78);
     QCOMPARE(y.length(), 1);
 
     QDeclarativeDomProperty z = root.property("z");
-    QCOMPARE(z.position(), 106);
+    QCOMPARE(z.position(), 111);
     QCOMPARE(z.length(), 1);
 
     QDeclarativeDomProperty opacity = root.property("opacity");
-    QCOMPARE(opacity.position(), 127);
+    QCOMPARE(opacity.position(), 132);
     QCOMPARE(opacity.length(), 7);
 
     QDeclarativeDomProperty data = root.property("data");
-    QCOMPARE(data.position(), 142);
+    QCOMPARE(data.position(), 147);
     QCOMPARE(data.length(), 0);
 
     QDeclarativeDomProperty children = root.property("children");
-    QCOMPARE(children.position(), 179);
+    QCOMPARE(children.position(), 184);
     QCOMPARE(children.length(), 8);
 
     QDeclarativeDomList dataList = data.value().toList();
@@ -1249,64 +1249,64 @@ void tst_qdeclarativedom::position()
     QCOMPARE(childrenList.values().count(), 2);
 
     // All QDeclarativeDomObject
-    QCOMPARE(root.position(), 14);
+    QCOMPARE(root.position(), 19);
     QCOMPARE(root.length(), 195);
 
     QDeclarativeDomObject numberAnimation = z.value().toValueSource().object();
-    QCOMPARE(numberAnimation.position(), 87);
+    QCOMPARE(numberAnimation.position(), 92);
     QCOMPARE(numberAnimation.length(), 23);
 
     QDeclarativeDomObject behavior = opacity.value().toValueInterceptor().object();
-    QCOMPARE(behavior.position(), 115);
+    QCOMPARE(behavior.position(), 120);
     QCOMPARE(behavior.length(), 22);
 
     QDeclarativeDomObject component = dataList.values().at(0).toObject();
-    QCOMPARE(component.position(), 142);
+    QCOMPARE(component.position(), 147);
     QCOMPARE(component.length(), 32);
 
     QDeclarativeDomObject componentRoot = component.toComponent().componentRoot();
-    QCOMPARE(componentRoot.position(), 162);
+    QCOMPARE(componentRoot.position(), 167);
     QCOMPARE(componentRoot.length(), 6);
 
     QDeclarativeDomObject child1 = childrenList.values().at(0).toObject();
-    QCOMPARE(child1.position(), 191);
+    QCOMPARE(child1.position(), 196);
     QCOMPARE(child1.length(), 6);
 
     QDeclarativeDomObject child2 = childrenList.values().at(1).toObject();
-    QCOMPARE(child2.position(), 199);
+    QCOMPARE(child2.position(), 204);
     QCOMPARE(child2.length(), 6);
 
     // All QDeclarativeDomValue
     QDeclarativeDomValue xValue = x.value();
-    QCOMPARE(xValue.position(), 66);
+    QCOMPARE(xValue.position(), 71);
     QCOMPARE(xValue.length(), 2);
 
     QDeclarativeDomValue yValue = y.value();
-    QCOMPARE(yValue.position(), 76);
+    QCOMPARE(yValue.position(), 81);
     QCOMPARE(yValue.length(), 6);
 
     QDeclarativeDomValue zValue = z.value();
-    QCOMPARE(zValue.position(), 87);
+    QCOMPARE(zValue.position(), 92);
     QCOMPARE(zValue.length(), 23);
 
     QDeclarativeDomValue opacityValue = opacity.value();
-    QCOMPARE(opacityValue.position(), 115);
+    QCOMPARE(opacityValue.position(), 120);
     QCOMPARE(opacityValue.length(), 22);
 
     QDeclarativeDomValue dataValue = data.value();
-    QCOMPARE(dataValue.position(), 142);
+    QCOMPARE(dataValue.position(), 147);
     QCOMPARE(dataValue.length(), 32);
 
     QDeclarativeDomValue child1Value = childrenList.values().at(0);
-    QCOMPARE(child1Value.position(), 191);
+    QCOMPARE(child1Value.position(), 196);
     QCOMPARE(child1Value.length(), 6);
 
     QDeclarativeDomValue child2Value = childrenList.values().at(1);
-    QCOMPARE(child2Value.position(), 199);
+    QCOMPARE(child2Value.position(), 204);
     QCOMPARE(child2Value.length(), 6);
 
     // All QDeclarativeDomList
-    QCOMPARE(childrenList.position(), 189);
+    QCOMPARE(childrenList.position(), 194);
     QCOMPARE(childrenList.length(), 18);
 }
 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
index 170d027..4a42518 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string greeting: "hello world"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
index e9a41ed..829d405 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     function testFunction() { return 19; }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
index 6e50b10..f542c64 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int b: obj.prop.a
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
index fe0492f..df494af 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property int a: 3
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml b/tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml
index e144de7..3427a3b 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property int children: root.children.length
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
index 515f80f..da6c795 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 MyQmlObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
index 1cd78a5..9443c01 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyTypeObject {
     Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml
index f31f142..c66ef69 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
index 88740dc..68dbcfa 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a: 10
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml
index 7530396..0f23297 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     objectProperty: MyQmlObject {}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml
index 1655905..58b7adb 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     //real
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
index 1dc0ada..1af77d5 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property CustomObject myObject
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml
index 9c46c3f..18a57ba 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyDeferredObject {
     value: undefined // error is resolved before complete
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml
index 6d23e5f7..131fa6f 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml
index 6fc1211..4de405d 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     function calculate() {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
index 2337e44..7ba51ef 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml b/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml
index aab39be..661cd5c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test1: false;        
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
index 14046f0..2102821 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 MyQmlObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
index 146f6f1..c197ef8 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 MyQmlObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
index dc78cd8..9738d2c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property MyExtendedObject a;
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
index c57e5f8..b0e897e 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyExtendedObject
 {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/function.qml b/tests/auto/declarative/qdeclarativeecmascript/data/function.qml
index 80d6ef4..6cd8751 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/function.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/function.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test1: false;
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml
index a893fb0..2ba02d1 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     function myFunction() {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
index e3b29ae..6dcdefc 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     objectProperty: if(1) otherObject
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
index 4746f3f..32b8611 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     objectProperty: otherObject
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/in.qml b/tests/auto/declarative/qdeclarativeecmascript/data/in.qml
index 0b5b0ba..f9cccb5 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/in.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/in.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include.qml
index 18543b2..61b0461 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/include.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "include.js" as IncludeTest
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml
index a39e821..1633eba 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "include_callback.js" as IncludeTest
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml
index 67b8cfd..a6489694 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "include_pragma_outer.js" as Script
 
 Item {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml
index 06bd174..0dfc74f 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "include_remote.js" as IncludeTest
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml
index 8e486b2..05a7399 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "include_remote_missing.js" as IncludeTest
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml
index e957018..e9f1c89 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "include_shared.js" as IncludeTest
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml
index d5d3329..6ab25f2 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml
index 29d7d01..87b2d7e 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
index fb4fa4d..e93007a 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int test
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml
index a945a16..c078942 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "libraryScriptAssert.js" as Test
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
index 3ba4183..7b94075 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
index 697530f..7940ab8 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test: children
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
index 269bd83..1090b48 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     function testFunction() { return 19; }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
index 2ea9cdb..34c50d6 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 MethodsObject {
     function testFunction2() { return 17; }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
index 0065add..bebdf3d 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property alias blah: item.x
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
index a8cb50e..d9c63e6 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string test: thing.stringProperty
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml
index 8be2d5b..9e0bcf0 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml b/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml
index daa9b0b..7e7da8d 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml
index 024d82e..e86cc96 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml
index 11472a0..cbd2d3e 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property QtObject test
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
index 4b51109..ef0e304 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml
index 231c9e5..53427b7 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Component.onCompleted: { var a = getObject(); a = null; }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml
index bef40fd..a778dcc 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml
index 22c4f0b..2e9e173 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int test: getObjects().length
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml
index cb5c4c9..02357d4 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string test: "aaaa"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml
index 56e7885..b7bb366 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "qtbug_11600.js" as Test
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml
index 6efb9c1..05c482c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml
index b6d31d5..e531efc 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
index d4d7eb2..95f34d8 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property int a: 0
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml
index 2548005..0b0770e 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 MyQmlObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
index 7f895ff..63dba2f 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml
index 5d8e29e..65697d9 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "scriptConnect.1.js" as Script
 MyQmlObject { 
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml
index 5681907..86ff798 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "scriptConnect.2.js" as Script
 
 MyQmlObject { 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml
index 40d8079..db2f005 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject { 
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml
index 0356650..a2d90ff 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject { 
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml
index 661f28e..21fac15 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject { 
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml
index 36655ee..4053091 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "scriptConnect.6.js" as Script
 
 MyQmlObject { 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml
index 0cb4d79..bbe7024 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "scriptDisconnect.1.js" as Script
 
 MyQmlObject { 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml
index 05ca7a4..8a166f4 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "scriptDisconnect.1.js" as Script
 
 MyQmlObject { 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml
index 2a66bed..548f2a1 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "scriptDisconnect.1.js" as Script
 
 MyQmlObject { 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml
index 7beb84e..11b22d7 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "scriptDisconnect.1.js" as Script
 
 MyQmlObject { 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml
index 817391d..2d090b8 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
index 823096b..7a6aba7 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property int test: myObject.object.a
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
index a2fb4d0..8410d33 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     property real base: 50
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml b/tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml
index ec49a95..2932c778 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test1: (a === true)
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml
index a36b4c0..1e5afdf 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
index 26d9596..60d39fa 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant obj: nested
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml b/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml
index 46e18e5..849dfad 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool runTest: false
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
index 56ebd73..092c83e 100644
--- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
+++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
@@ -200,7 +200,7 @@ void tst_qdeclarativeengine::clearComponentCache()
     {
         QFile file("temp.qml");
         QVERIFY(file.open(QIODevice::WriteOnly));
-        file.write("import Qt 4.7\nQtObject {\nproperty int test: 10\n}\n");
+        file.write("import QtQuick 1.0\nQtObject {\nproperty int test: 10\n}\n");
         file.close();
     }
 
@@ -217,7 +217,7 @@ void tst_qdeclarativeengine::clearComponentCache()
     {
         QFile file("temp.qml");
         QVERIFY(file.open(QIODevice::WriteOnly));
-        file.write("import Qt 4.7\nQtObject {\nproperty int test: 11\n}\n");
+        file.write("import QtQuick 1.0\nQtObject {\nproperty int test: 11\n}\n");
         file.close();
     }
 
@@ -256,7 +256,7 @@ void tst_qdeclarativeengine::outputWarningsToStandardError()
     QCOMPARE(engine.outputWarningsToStandardError(), true);
 
     QDeclarativeComponent c(&engine);
-    c.setData("import Qt 4.7; QtObject { property int a: undefined }", QUrl());
+    c.setData("import QtQuick 1.0; QtObject { property int a: undefined }", QUrl());
 
     QVERIFY(c.isReady() == true);
 
@@ -313,7 +313,7 @@ void tst_qdeclarativeengine::objectOwnership()
     {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine);
-    c.setData("import Qt 4.7; QtObject { property QtObject object: QtObject {} }", QUrl());
+    c.setData("import QtQuick 1.0; QtObject { property QtObject object: QtObject {} }", QUrl());
 
     QObject *o = c.create();
     QVERIFY(o != 0);
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
index 45272e3..c53ae3f 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Flickable {
 }
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
index 2550fcc..98925ae 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Flickable {
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
index 27fe653..a3e92fe 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Flickable {
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
index a840a01..fcc683a 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Flickable {
     property bool ok: false
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml
index 8e95a94..6cbf12c 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Flickable {
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index e7ded8a..25edb36 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -162,7 +162,7 @@ void tst_qdeclarativeflickable::properties()
 void tst_qdeclarativeflickable::boundsBehavior()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; Flickable { boundsBehavior: Flickable.StopAtBounds }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Flickable { boundsBehavior: Flickable.StopAtBounds }", QUrl::fromLocalFile(""));
     QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(boundsBehaviorChanged()));
 
@@ -191,7 +191,7 @@ void tst_qdeclarativeflickable::boundsBehavior()
 void tst_qdeclarativeflickable::maximumFlickVelocity()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile(""));
     QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(maximumFlickVelocityChanged()));
 
@@ -208,7 +208,7 @@ void tst_qdeclarativeflickable::maximumFlickVelocity()
 void tst_qdeclarativeflickable::flickDeceleration()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile(""));
     QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(flickDecelerationChanged()));
 
@@ -225,7 +225,7 @@ void tst_qdeclarativeflickable::flickDeceleration()
 void tst_qdeclarativeflickable::pressDelay()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; Flickable { pressDelay: 100; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Flickable { pressDelay: 100; }", QUrl::fromLocalFile(""));
     QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(pressDelayChanged()));
 
@@ -242,7 +242,7 @@ void tst_qdeclarativeflickable::pressDelay()
 void tst_qdeclarativeflickable::flickableDirection()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; Flickable { flickableDirection: Flickable.VerticalFlick; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Flickable { flickableDirection: Flickable.VerticalFlick; }", QUrl::fromLocalFile(""));
     QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(flickableDirectionChanged()));
 
diff --git a/tests/auto/declarative/qdeclarativeflipable/data/crash.qml b/tests/auto/declarative/qdeclarativeflipable/data/crash.qml
index fb369a6..bc5229b 100644
--- a/tests/auto/declarative/qdeclarativeflipable/data/crash.qml
+++ b/tests/auto/declarative/qdeclarativeflipable/data/crash.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
    transform: Rotation {
diff --git a/tests/auto/declarative/qdeclarativeflipable/data/flipable-abort.qml b/tests/auto/declarative/qdeclarativeflipable/data/flipable-abort.qml
index 41463fe..69ff4a2 100644
--- a/tests/auto/declarative/qdeclarativeflipable/data/flipable-abort.qml
+++ b/tests/auto/declarative/qdeclarativeflipable/data/flipable-abort.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     Flipable {
diff --git a/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml b/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
index 5ddf09d..02b69e0 100644
--- a/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
+++ b/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Flipable {
     id: flipable
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/chain.qml b/tests/auto/declarative/qdeclarativefocusscope/data/chain.qml
index 42b50cf..a40bc2c 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/chain.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/chain.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/forcefocus.qml b/tests/auto/declarative/qdeclarativefocusscope/data/forcefocus.qml
index 9144854..708e899 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/forcefocus.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/forcefocus.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 600
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml b/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml
index 07601c7..5850791 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test.qml
index 55be103..5983c19 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/test.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/test.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml
index 5ed701d..8c0b3b4 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test3.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test3.qml
index c6d112f..2e025cb 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/test3.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/test3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test4.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test4.qml
index 3c6d3bd..7192dee 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/test4.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/test4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml
index 4417d5f..01dada5 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index 8765426..158ee51 100644
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -87,7 +87,7 @@ tst_qdeclarativefontloader::tst_qdeclarativefontloader() :
 
 void tst_qdeclarativefontloader::noFont()
 {
-    QString componentStr = "import Qt 4.7\nFontLoader { }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
@@ -102,7 +102,7 @@ void tst_qdeclarativefontloader::noFont()
 
 void tst_qdeclarativefontloader::namedFont()
 {
-    QString componentStr = "import Qt 4.7\nFontLoader { name: \"Helvetica\" }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { name: \"Helvetica\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
@@ -115,7 +115,7 @@ void tst_qdeclarativefontloader::namedFont()
 
 void tst_qdeclarativefontloader::localFont()
 {
-    QString componentStr = "import Qt 4.7\nFontLoader { source: \"" SRCDIR  "/data/tarzeau_ocr_a.ttf\" }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { source: \"" SRCDIR  "/data/tarzeau_ocr_a.ttf\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
@@ -128,7 +128,7 @@ void tst_qdeclarativefontloader::localFont()
 
 void tst_qdeclarativefontloader::failLocalFont()
 {
-    QString componentStr = "import Qt 4.7\nFontLoader { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" }";
     QTest::ignoreMessage(QtWarningMsg, QString("file::2:1: QML FontLoader: Cannot load font: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\"").toUtf8().constData());
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
@@ -142,7 +142,7 @@ void tst_qdeclarativefontloader::failLocalFont()
 
 void tst_qdeclarativefontloader::webFont()
 {
-    QString componentStr = "import Qt 4.7\nFontLoader { source: \"http://localhost:14448/tarzeau_ocr_a.ttf\" }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { source: \"http://localhost:14448/tarzeau_ocr_a.ttf\" }";
     QDeclarativeComponent component(&engine);
 
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
@@ -158,7 +158,7 @@ void tst_qdeclarativefontloader::redirWebFont()
 {
     server.addRedirect("olddir/oldname.ttf","../tarzeau_ocr_a.ttf");
 
-    QString componentStr = "import Qt 4.7\nFontLoader { source: \"http://localhost:14448/olddir/oldname.ttf\" }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { source: \"http://localhost:14448/olddir/oldname.ttf\" }";
     QDeclarativeComponent component(&engine);
 
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
@@ -172,7 +172,7 @@ void tst_qdeclarativefontloader::redirWebFont()
 
 void tst_qdeclarativefontloader::failWebFont()
 {
-    QString componentStr = "import Qt 4.7\nFontLoader { source: \"http://localhost:14448/nonexist.ttf\" }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { source: \"http://localhost:14448/nonexist.ttf\" }";
     QTest::ignoreMessage(QtWarningMsg, "file::2:1: QML FontLoader: Cannot load font: \"http://localhost:14448/nonexist.ttf\"");
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
@@ -186,7 +186,7 @@ void tst_qdeclarativefontloader::failWebFont()
 
 void tst_qdeclarativefontloader::changeFont()
 {
-    QString componentStr = "import Qt 4.7\nFontLoader { source: font }";
+    QString componentStr = "import QtQuick 1.0\nFontLoader { source: font }";
     QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty("font", QUrl::fromLocalFile(SRCDIR "/data/tarzeau_ocr_a.ttf"));
     QDeclarativeComponent component(&engine);
diff --git a/tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml b/tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml
index 9c3c847..93f39ff 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativegridview/data/footer.qml b/tests/auto/declarative/qdeclarativegridview/data/footer.qml
index 170b2b5..ad69a25 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/footer.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/footer.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml
index 2fe173f..5719f43 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
index a5d651d..421f810 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property int current: grid.currentIndex
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
index 3d826dd..77c94ba 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
index 772255d..7559a7f 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 GridView {
     anchors.fill: parent
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
index f108e3d..ab4ceeb 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 GridView {
     anchors.fill: parent
diff --git a/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml b/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml
index 510fcc5..7bb2c95 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
 
diff --git a/tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml b/tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml
index 8e4e178..10df234 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 360; height: 120; color: "white"
diff --git a/tests/auto/declarative/qdeclarativegridview/data/setindex.qml b/tests/auto/declarative/qdeclarativegridview/data/setindex.qml
index 93ef69b..36bf67d 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/setindex.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/setindex.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 5fd373c..975cf8f 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -852,10 +852,10 @@ void tst_QDeclarativeGridView::componentChanges()
     QTRY_VERIFY(gridView);
 
     QDeclarativeComponent component(canvas->engine());
-    component.setData("import Qt 4.7; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
 
     QDeclarativeComponent delegateComponent(canvas->engine());
-    delegateComponent.setData("import Qt 4.7; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
+    delegateComponent.setData("import QtQuick 1.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
 
     QSignalSpy highlightSpy(gridView, SIGNAL(highlightChanged()));
     QSignalSpy delegateSpy(gridView, SIGNAL(delegateChanged()));
diff --git a/tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml b/tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml
index 402d33e..739299d 100644
--- a/tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml
+++ b/tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Image { 
     source: "heart.png"
diff --git a/tests/auto/declarative/qdeclarativeimage/data/tiling.qml b/tests/auto/declarative/qdeclarativeimage/data/tiling.qml
index 32839bb..49715ab 100644
--- a/tests/auto/declarative/qdeclarativeimage/data/tiling.qml
+++ b/tests/auto/declarative/qdeclarativeimage/data/tiling.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 600
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 2686127..6fce2ad 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -97,7 +97,7 @@ tst_qdeclarativeimage::tst_qdeclarativeimage()
 
 void tst_qdeclarativeimage::noSource()
 {
-    QString componentStr = "import Qt 4.7\nImage { source: \"\" }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -154,7 +154,7 @@ void tst_qdeclarativeimage::imageSource()
     if (!error.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
 
-    QString componentStr = "import Qt 4.7\nImage { source: \"" + source + "\"; asynchronous: "
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" + source + "\"; asynchronous: "
         + (async ? QLatin1String("true") : QLatin1String("false")) + " }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
@@ -184,7 +184,7 @@ void tst_qdeclarativeimage::imageSource()
 
 void tst_qdeclarativeimage::clearSource()
 {
-    QString componentStr = "import Qt 4.7\nImage { source: srcImage }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: srcImage }";
     QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
     QDeclarativeComponent component(&engine);
@@ -206,7 +206,7 @@ void tst_qdeclarativeimage::clearSource()
 
 void tst_qdeclarativeimage::resized()
 {
-    QString componentStr = "import Qt 4.7\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -241,7 +241,7 @@ void tst_qdeclarativeimage::preserveAspectRatio()
 
 void tst_qdeclarativeimage::smooth()
 {
-    QString componentStr = "import Qt 4.7\nImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -257,7 +257,7 @@ void tst_qdeclarativeimage::smooth()
 void tst_qdeclarativeimage::svg()
 {
     QString src = QUrl::fromLocalFile(SRCDIR "/data/heart.svg").toString();
-    QString componentStr = "import Qt 4.7\nImage { source: \"" + src + "\"; sourceSize.width: 300; sourceSize.height: 300 }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" + src + "\"; sourceSize.width: 300; sourceSize.height: 300 }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -292,7 +292,7 @@ void tst_qdeclarativeimage::big()
     // have to build a 400 MB image. That would be a bug in the JPEG loader.
 
     QString src = QUrl::fromLocalFile(SRCDIR "/data/big.jpeg").toString();
-    QString componentStr = "import Qt 4.7\nImage { source: \"" + src + "\"; width: 100; sourceSize.height: 256 }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" + src + "\"; width: 100; sourceSize.height: 256 }";
 
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
@@ -354,7 +354,7 @@ void tst_qdeclarativeimage::noLoading()
     server.serveDirectory(SRCDIR "/data");
     server.addRedirect("oldcolors.png", SERVER_ADDR "/colors.png");
 
-    QString componentStr = "import Qt 4.7\nImage { source: srcImage }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: srcImage }";
     QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/heart.png"));
     QDeclarativeComponent component(&engine);
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index d38160d..cd12e3a 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -192,7 +192,7 @@ void tst_qdeclarativeimageprovider::runTest(bool async, QDeclarativeImageProvide
     engine.addImageProvider("test", provider);
     QVERIFY(engine.imageProvider("test") != 0);
 
-    QString componentStr = "import Qt 4.7\nImage { source: \"" + source + "\"; " 
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" + source + "\"; " 
             + (async ? "asynchronous: true; " : "")
             + properties + " }";
     QDeclarativeComponent component(&engine);
@@ -271,7 +271,7 @@ void tst_qdeclarativeimageprovider::requestPixmap_async()
     QVERIFY(engine.imageProvider("test") != 0);
 
     // pixmaps are loaded synchronously regardless of 'asynchronous' value
-    QString componentStr = "import Qt 4.7\nImage { asynchronous: true; source: \"image://test/pixmap-async-test.png\" }";
+    QString componentStr = "import QtQuick 1.0\nImage { asynchronous: true; source: \"image://test/pixmap-async-test.png\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -298,7 +298,7 @@ void tst_qdeclarativeimageprovider::removeProvider()
     QVERIFY(engine.imageProvider("test") != 0);
 
     // add provider, confirm it works
-    QString componentStr = "import Qt 4.7\nImage { source: \"" + newImageFileName() + "\" }";
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" + newImageFileName() + "\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -359,7 +359,7 @@ void tst_qdeclarativeimageprovider::threadTest()
     engine.addImageProvider("test_thread", provider);
     QVERIFY(engine.imageProvider("test_thread") != 0);
 
-    QString componentStr = "import Qt 4.7\nItem { \n"
+    QString componentStr = "import QtQuick 1.0\nItem { \n"
             "Image { source: \"image://test_thread/blue\";  asynchronous: true; }\n"
             "Image { source: \"image://test_thread/red\";  asynchronous: true; }\n"
             "Image { source: \"image://test_thread/green\";  asynchronous: true; }\n"
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
index 30e8274..a2afb61 100644
--- a/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant nested
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
index 9bd8571..f3516c6 100644
--- a/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant nested
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
index 9bb6be7..937cd64 100644
--- a/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant nested
diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenProperty.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenProperty.qml
index 5958004..fab2367 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/childrenProperty.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/childrenProperty.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRect.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRect.qml
index f351b53..84f362f 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/childrenRect.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRect.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug.qml
index 4a2f056..2ab73a1 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug2.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug2.qml
index 225d8d4..d67ad0e 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug2.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width:360;
diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml
index 54b5b68..9d8e1e8 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300
diff --git a/tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml b/tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml
index 87e64c5..229f969 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Grid {
     columns: 2
diff --git a/tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml b/tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml
index 171536b..375a6b6 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Test 1.0
 
 KeyTestItem {
diff --git a/tests/auto/declarative/qdeclarativeitem/data/keystest.qml b/tests/auto/declarative/qdeclarativeitem/data/keystest.qml
index 8ff3e87..aedccd9 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/keystest.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/keystest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     focus: true
diff --git a/tests/auto/declarative/qdeclarativeitem/data/mapCoordinates.qml b/tests/auto/declarative/qdeclarativeitem/data/mapCoordinates.qml
index 4a92e9d..bb20ecc 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/mapCoordinates.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/mapCoordinates.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root; objectName: "root"
diff --git a/tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml b/tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml
index a562b8b..afa5397 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QGraphicsWidget {
     size: "200x100"
diff --git a/tests/auto/declarative/qdeclarativeitem/data/propertychanges.qml b/tests/auto/declarative/qdeclarativeitem/data/propertychanges.qml
index dd86453..f1ea933 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/propertychanges.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Item {
diff --git a/tests/auto/declarative/qdeclarativeitem/data/resourcesProperty.qml b/tests/auto/declarative/qdeclarativeitem/data/resourcesProperty.qml
index 852f242..e82cd02 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/resourcesProperty.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/resourcesProperty.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index 6b28c53..e9dad6b 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -436,7 +436,7 @@ void tst_QDeclarativeItem::keyNavigation()
 void tst_QDeclarativeItem::smooth()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7; Item { smooth: false; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Item { smooth: false; }", QUrl::fromLocalFile(""));
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QSignalSpy spy(item, SIGNAL(smoothChanged(bool)));
 
@@ -465,7 +465,7 @@ void tst_QDeclarativeItem::smooth()
 void tst_QDeclarativeItem::clip()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nItem { clip: false\n }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nItem { clip: false\n }", QUrl::fromLocalFile(""));
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QSignalSpy spy(item, SIGNAL(clipChanged(bool)));
 
@@ -572,7 +572,7 @@ void tst_QDeclarativeItem::transforms()
     QFETCH(QByteArray, qml);
     QFETCH(QMatrix, matrix);
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nItem { transform: "+qml+"}", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nItem { transform: "+qml+"}", QUrl::fromLocalFile(""));
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(item->sceneMatrix(), matrix);
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
index deb84a8..6a33def 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
index db205f1..919f5d8 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant other
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
index 04f5ba3..3f73538 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property alias obj : otherObj
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
index 80414ac..428790d 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Alias3 {}
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
index 4c78cd7..9349a93 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
index 61e6146..cf32b45 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
index 0275e21..0687ce3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
index 9746ab0..5de8a4a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int super_a: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
index 23d6ed9..3a7022b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant child
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml
index 8c953cb..f63283e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
index fdf4800..8aaddac 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property QtObject o1
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
index ee02335..0ba4bd6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     x: "You can't assign a string to a real!"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
index 5373959..c2ac5c8 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     property int a: Math.max(10, 9)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
index d5c6979..c3d0e1e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyQmlObject {
     property int a: Math.max(10, 9)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
index 291d47a..44167af 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
index 787eb77..7e5559a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
    property variant other
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
index bbd1901..0c839ee 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Test 1.0
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
index 2d99b64..663e8d0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property QtObject o;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
index 4ceff3d..ec5536e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property QtObject object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
index 5bf8702..d480611 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
    property variant other
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
index b8c71e1..0a49ad5 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
    property variant other
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml
index 59afe58..f04b1f6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
index 1009df7..ed214ff 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Test 1.0
 
 QtObject {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
index bac704e..ab6f3df 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: 1
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
index 2b1ef76..aab7ed2 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant a;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml
index 2f49418..3cde2e8 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml
@@ -1,4 +1,4 @@
-import Qt 4.7 as Qt47
+import QtQuick 1.0 as Qt47
 
 Qt47.QtObject {
     Qt47: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
index 3a78170..1e93225 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
@@ -1,6 +1,6 @@
 import Test 1.0
 import Test 1.0 as Namespace
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     MyQmlObject.value: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
index 730fffd..f4f66dd 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
index 7e7dd0f..7d677b5 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: myId
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
index f0d5f71..1b9af8b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Component {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
index 521adbc..806613c 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
index 9c3938b..e94022a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     x: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
index 9208722..8f81a5a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     id: QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml
index b81e0c3..94bf189 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     property int a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml
index 0b00890..69990ca 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     signal a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml
index c5f93c9..5db9815 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Component {
     function a() {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
index 725069e..d04da62 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
index f11abd9..6ac71ee 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     objectName: "Hello" + "World"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml
index 438e8e9..c1e4790 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int on
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
index 902b598..50bc2ae 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 ListModel {
     ListElement { a: 10 }
     ListElement { id: foo; a: 12 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
index 3230e49..4cf6827 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 ListModel {
     ListElement { a: 10 }
     ListElement { a: 12 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
index c241861..f15373f 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
index 0cd0338..d98dfdb 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyTypeObject {
     grouped {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
index b4203b5..87dc3d3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyContainer {
     QtObject {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml
index 54d080a..ba65d78 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     onDestroyed: print("Hello World!")
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml b/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml
index df048cc..0cdbdd7 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property QtObject object: DontDoubleCallClassBeginItem {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml
index c0ed52c..2b6dd5d 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     default property QtObject a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml
index 1f46b96..7d11d99 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml
index cf49062..b0f2828 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     signal a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml
index a14ec4c..e28cad3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     function a() {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml
index ea77cfd..8e4acc0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property UnknownType a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
index a1be43a..cdad72b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 MyCustomParserType {
     propa: a + 10
     propb: Math.min(a, 10)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
index df3de20..c03ec49 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
@@ -1,5 +1,5 @@
-import Qt 4.7 
-import Qt 4.7 as Qt47
+import QtQuick 1.0 
+import QtQuick 1.0 as Qt47
 
 Qt.QtObject {
     property Qt47.QtObject objectProperty
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
index c997356..ed25c4b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
@@ -1,6 +1,6 @@
 import Test 1.0
-import Qt 4.7
-import Qt 4.7 as Qt47
+import QtQuick 1.0
+import QtQuick 1.0 as Qt47
 
 QtObject {
     property QtObject objectProperty
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
index 6bcae0f..782adef 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 QtObject {
     default property int intProperty : 10
     property bool boolProperty: false
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
index cceb44b..64848fe 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 DynamicPropertiesNestedType {
     property int a: 13
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
index 9aa5e86..78978db 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 QtObject {
     signal signal1
     function slot1() {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml
index 6b5b451..3eda661 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Font {
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
index 3b80f0b..39e3846 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
@@ -1,4 +1,4 @@
 import Test 1.0 as Rectangle
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml
index 483cfec..9589692 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml
@@ -1,5 +1,5 @@
 // imports...
 import "will-not-be-found"
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
index 1ebec1b..a52bd23 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 MyContainer {
     Component {
         id: myComponent
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
index 6a47536..444e234 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 MyQmlObject {
     interfaceProperty: MyQmlObject {}
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml
index 985fb94..13bdb12 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property alias a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml
index a2ac91c..b6378c3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property alias a: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
index 84d39df..c6dc44c 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     MyQmlObject.foo: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
index 40e3926..4942c21 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
@@ -1,5 +1,5 @@
 import Test 1.0 as Namespace
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Namespace.MadeUpClass.foo: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
index 28f8220..e1fc8c1 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
@@ -1,5 +1,5 @@
 import Test 1.0 as Namespace
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Namespace.madeUpClass.foo: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
index f45f88f..6938122 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
@@ -1,5 +1,5 @@
 import Test 1.0 as Namespace
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Namespace.MyQmlObject.foo: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
index 64bc8bd..842600f 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     MyQmlObject: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
index ee3dedb..6f372a6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
@@ -1,5 +1,5 @@
 import Test 1.0 as Namespace
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Namespace.MyQmlObject: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
index 66cad2d..07eb6f3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     MyQmlObject: QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
index 90d80bc..b725674 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Test.MyQmlObject: QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
index 5293d55..50004ed 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     MyTypeObject.foo: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
index 6f319c1..7cdf5cd 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
@@ -1,5 +1,5 @@
 import Test 1.0 as Namespace
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Namespace.MyTypeObject.foo: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
index b7e1302..503e9fa 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     MadeUpClass.foo: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
index 671f5ab..94afb16 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7 
+import QtQuick 1.0 
 
 QtObject {
     property variant o;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
index f897cc8..d4fbf42 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7 
+import QtQuick 1.0 
 
 QtObject {
     property int o;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
index a65f5fd..034e937 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
@@ -1 +1 @@
-2:18:Invalid import qualifier ID
+2:23:Invalid import qualifier ID
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
index 00fc81b..580a0f3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
-import Qt 4.7 as qt
+import QtQuick 1.0
+import QtQuick 1.0 as qt
 
 QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml
index 6077de4..bd26bc5 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int parseInt
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
index 303b5a5..9985d33 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
@@ -1,2 +1,2 @@
-import Qt 4.7 as Qt47
+import QtQuick 1.0 as Qt47
 Qt47.Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
index 8c953cb..f63283e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml
index d09dea7..7f491eb 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
index 62e41a9..03bf25b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Image {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
index 303b5a5..9985d33 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
@@ -1,2 +1,2 @@
-import Qt 4.7 as Qt47
+import QtQuick 1.0 as Qt47
 Qt47.Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
index 8c953cb..f63283e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml
index 6c628e4..c02dd33 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 MyContainer {
     containerChildren: QtObject {}
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
index 0393382..85abbdc 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     ListModel {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
index 3027722..1f60951 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property list<QtObject> listProperty
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml
index a2d8799..a3f97f8 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     function MyMethod() {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
index 1a417a9..e0e8442 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 QtObject {
     onClicked: console.log("Hello world!")
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
index 0aa3405..bbd05a1 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     NestedErrorsType {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml b/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml
index 077abe1..548b7b8 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Keys {
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
index 71a7d26..e75f904 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyTypeObject {
     // We set a and b to ensure that onCompleted is executed after bindings and
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
index 1b1eef9..77fe2ff 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyTypeObject {
     // We set a and b to ensure that onCompleted is executed after bindings and
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
index b3384d4..0b46ceb 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property blah a;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
index 1ba9b17..3ff1686 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property invalidmodifier<int> a;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
index 261e7e3..b219120 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property invalidmodifier<QtObject> a;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
index 0a0f969..bfadc9d 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     readonly property int a
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
index 0340f79..1bb4850 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     readonly property int a: value
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml
index aad9e07..b5b3f42 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int Hello
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml
index 0246b2f..f9ec68a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int Hello: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
index d038ba3..dea52c9 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 QtObject {
 }
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
index 1eab9f6..18c65c3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 QtObject {
     MyQmlObject.value: 10
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
index cfe255a..c70a55c 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant child
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
index 63fd74f..7d1a9db 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     signal mySignal(nontype a)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
index c11ce17..e7780a0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     signal mySignal(,)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
index 771ea50..4289bce 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     signal mySignal(a)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml
index 37c938a..6ce417d 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     signal MySignal
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
index 1421361..0b054d0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
index 1421361..0b054d0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml b/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml
index e7aaf16..cc3f1c2 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int notifyCount: 0
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml
index 1ddccc0..0699d67 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 MyQmlObject {
     qmlobjectProperty: QtObject {}
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
index d5a61ae..289cd21 100644
--- a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Image { source: "pics/blue.png" }
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
index 1421361..0b054d0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
@@ -1,2 +1,2 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/UndeclaredLocal.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/UndeclaredLocal.qml
index d5a61ae..289cd21 100644
--- a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/UndeclaredLocal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/UndeclaredLocal.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Image { source: "pics/blue.png" }
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
index 43aeb74..76d11dc 100644
--- a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 1825991..f811555 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -1384,12 +1384,12 @@ void tst_qdeclarativelanguage::importsLocal_data()
         << "QDeclarativeRectangle"
         << "";
     QTest::newRow("local import second")
-        << "import Qt 4.7\nimport \"subdir\"\n"
+        << "import QtQuick 1.0\nimport \"subdir\"\n"
            "Test {}"
         << "QDeclarativeRectangle"
         << "";
     QTest::newRow("local import subsubdir")
-        << "import Qt 4.7\nimport \"subdir/subsubdir\"\n"
+        << "import QtQuick 1.0\nimport \"subdir/subsubdir\"\n"
            "SubTest {}"
         << "QDeclarativeRectangle"
         << "";
@@ -1603,24 +1603,24 @@ void tst_qdeclarativelanguage::importsOrder_data()
 
     QTest::newRow("installed import versus builtin 1") <<
            "import com.nokia.installedtest 1.5\n"
-           "import Qt 4.7\n"
+           "import QtQuick 1.0\n"
            "Rectangle {}"
            << (!qmlCheckTypes()?"QDeclarativeRectangle":"")
            << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in Qt and in lib/com/nokia/installedtest");
     QTest::newRow("installed import versus builtin 2") <<
-           "import Qt 4.7\n"
+           "import QtQuick 1.0\n"
            "import com.nokia.installedtest 1.5\n"
            "Rectangle {}"
            << (!qmlCheckTypes()?"QDeclarativeText":"")
            << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest and in Qt");
     QTest::newRow("namespaces cannot be overridden by types 1") <<
-           "import Qt 4.7 as Rectangle\n"
+           "import QtQuick 1.0 as Rectangle\n"
            "import com.nokia.installedtest 1.5\n"
            "Rectangle {}"
         << ""
         << "Namespace Rectangle cannot be used as a type";
     QTest::newRow("namespaces cannot be overridden by types 2") <<
-           "import Qt 4.7 as Rectangle\n"
+           "import QtQuick 1.0 as Rectangle\n"
            "import com.nokia.installedtest 1.5\n"
            "Rectangle.Image {}"
         << "QDeclarativeImage"
@@ -1675,7 +1675,7 @@ void tst_qdeclarativelanguage::qmlAttachedPropertiesObjectMethod()
 void tst_qdeclarativelanguage::crash1()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nComponent {}", QUrl());
+    component.setData("import QtQuick 1.0\nComponent {}", QUrl());
 }
 
 void tst_qdeclarativelanguage::crash2()
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml b/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
index ee881a2..3497133 100644
--- a/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
+++ b/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 LayoutItem {//Sized by the layout
     id: resizable
diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/enumerate.qml b/tests/auto/declarative/qdeclarativelistmodel/data/enumerate.qml
index 296cb9c..93697f3 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/data/enumerate.qml
+++ b/tests/auto/declarative/qdeclarativelistmodel/data/enumerate.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property string result
diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/model.qml b/tests/auto/declarative/qdeclarativelistmodel/data/model.qml
index f8a9175..bfd547e 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/data/model.qml
+++ b/tests/auto/declarative/qdeclarativelistmodel/data/model.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: item
diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml
index b8f2f32..cc6d9de 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml
+++ b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 ListView {
     width: 100
     height: 250
@@ -22,4 +22,4 @@ ListView {
             rounded: false
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 31cb545..b433570 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -149,7 +149,7 @@ void tst_qdeclarativelistmodel::static_i18n()
 {
     QString expect = QString::fromUtf8("na\303\257ve");
 
-    QString componentStr = "import Qt 4.7\nListModel { ListElement { prop1: \""+expect+"\"; prop2: QT_TR_NOOP(\""+expect+"\") } }";
+    QString componentStr = "import QtQuick 1.0\nListModel { ListElement { prop1: \""+expect+"\"; prop2: QT_TR_NOOP(\""+expect+"\") } }";
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
@@ -172,7 +172,7 @@ void tst_qdeclarativelistmodel::static_nestedElements()
     QString elementsStr = elements.join(",\n") + "\n";
 
     QString componentStr = 
-        "import Qt 4.7\n"
+        "import QtQuick 1.0\n"
         "ListModel {\n"
         "   ListElement {\n"
         "       attributes: [\n";
@@ -549,7 +549,7 @@ void tst_qdeclarativelistmodel::static_types()
     QFETCH(QString, qml);
     QFETCH(QVariant, value);
 
-    qml = "import Qt 4.7\nListModel { " + qml + " }";
+    qml = "import QtQuick 1.0\nListModel { " + qml + " }";
 
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -598,47 +598,47 @@ void tst_qdeclarativelistmodel::error_data()
     QTest::addColumn<QString>("error");
 
     QTest::newRow("id not allowed in ListElement")
-        << "import Qt 4.7\nListModel { ListElement { id: fred } }"
+        << "import QtQuick 1.0\nListModel { ListElement { id: fred } }"
         << "ListElement: cannot use reserved \"id\" property";
 
     QTest::newRow("id allowed in ListModel")
-        << "import Qt 4.7\nListModel { id:model }"
+        << "import QtQuick 1.0\nListModel { id:model }"
         << "";
 
     QTest::newRow("random properties not allowed in ListModel")
-        << "import Qt 4.7\nListModel { foo:123 }"
+        << "import QtQuick 1.0\nListModel { foo:123 }"
         << "ListModel: undefined property 'foo'";
 
     QTest::newRow("random properties allowed in ListElement")
-        << "import Qt 4.7\nListModel { ListElement { foo:123 } }"
+        << "import QtQuick 1.0\nListModel { ListElement { foo:123 } }"
         << "";
 
     QTest::newRow("bindings not allowed in ListElement")
-        << "import Qt 4.7\nRectangle { id: rect; ListModel { ListElement { foo: rect.color } } }"
+        << "import QtQuick 1.0\nRectangle { id: rect; ListModel { ListElement { foo: rect.color } } }"
         << "ListElement: cannot use script for property value";
 
     QTest::newRow("random object list properties allowed in ListElement")
-        << "import Qt 4.7\nListModel { ListElement { foo: [ ListElement { bar: 123 } ] } }"
+        << "import QtQuick 1.0\nListModel { ListElement { foo: [ ListElement { bar: 123 } ] } }"
         << "";
 
     QTest::newRow("default properties not allowed in ListElement")
-        << "import Qt 4.7\nListModel { ListElement { Item { } } }"
+        << "import QtQuick 1.0\nListModel { ListElement { Item { } } }"
         << "ListElement: cannot contain nested elements";
 
     QTest::newRow("QML elements not allowed in ListElement")
-        << "import Qt 4.7\nListModel { ListElement { a: Item { } } }"
+        << "import QtQuick 1.0\nListModel { ListElement { a: Item { } } }"
         << "ListElement: cannot contain nested elements";
 
     QTest::newRow("qualified ListElement supported")
-        << "import Qt 4.7 as Foo\nFoo.ListModel { Foo.ListElement { a: 123 } }"
+        << "import QtQuick 1.0 as Foo\nFoo.ListModel { Foo.ListElement { a: 123 } }"
         << "";
 
     QTest::newRow("qualified ListElement required")
-        << "import Qt 4.7 as Foo\nFoo.ListModel { ListElement { a: 123 } }"
+        << "import QtQuick 1.0 as Foo\nFoo.ListModel { ListElement { a: 123 } }"
         << "ListElement is not a type";
 
     QTest::newRow("unknown qualified ListElement not allowed")
-        << "import Qt 4.7\nListModel { Foo.ListElement { a: 123 } }"
+        << "import QtQuick 1.0\nListModel { Foo.ListElement { a: 123 } }"
         << "Foo.ListElement - Foo is not a namespace";
 }
 
@@ -700,7 +700,7 @@ void tst_qdeclarativelistmodel::get()
     QDeclarativeEngine eng;
     QDeclarativeComponent component(&eng);
     component.setData(
-        "import Qt 4.7\n"
+        "import QtQuick 1.0\n"
         "ListModel { \n"
             "ListElement { roleA: 100 }\n"
             "ListElement { roleA: 200; roleB: 400 } \n"
@@ -813,7 +813,7 @@ void tst_qdeclarativelistmodel::get_nested()
     QDeclarativeEngine eng;
     QDeclarativeComponent component(&eng);
     component.setData(
-        "import Qt 4.7\n"
+        "import QtQuick 1.0\n"
         "ListModel { \n"
             "ListElement {\n"
                 "listRoleA: [\n"
diff --git a/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml b/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
index 0275e21..0687ce3 100644
--- a/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
+++ b/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a
diff --git a/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml b/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
index 1ab5692..9ddc763 100644
--- a/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
+++ b/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property list<MyType> myList
diff --git a/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
index 13de975..39a49e8 100644
--- a/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
+++ b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property list<QtObject> myList;
diff --git a/tests/auto/declarative/qdeclarativelistview/data/displaylist.qml b/tests/auto/declarative/qdeclarativelistview/data/displaylist.qml
index defd13e..487b70e 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/displaylist.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/displaylist.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativelistview/data/footer.qml b/tests/auto/declarative/qdeclarativelistview/data/footer.qml
index 11cbe16..4cbd33b 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/footer.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/footer.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml b/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
index 9ea5953..fca2901 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
@@ -1,7 +1,7 @@
 // This example demonstrates placing items in a view using
 // a VisualItemModel
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightgray"
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
index 939a4d5..49dbcb3 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
index f3c2910..2c4cfab 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property int current: list.currentIndex
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
index 9a5ea55..283678b 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml b/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
index d5d3365..534540f 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativelistview/data/manual-highlight.qml b/tests/auto/declarative/qdeclarativelistview/data/manual-highlight.qml
index 4913ebe..d8cfd9a 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/manual-highlight.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/manual-highlight.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
 
diff --git a/tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml b/tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml
index 300fcb5..04bec59 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 180; height: 120; color: "white"
diff --git a/tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml b/tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml
index 6fc41fa..bb77a77 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     id: list
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index cd17fad..6452bae 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -1416,10 +1416,10 @@ void tst_QDeclarativeListView::componentChanges()
     QTRY_VERIFY(listView);
 
     QDeclarativeComponent component(canvas->engine());
-    component.setData("import Qt 4.7; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
 
     QDeclarativeComponent delegateComponent(canvas->engine());
-    delegateComponent.setData("import Qt 4.7; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
+    delegateComponent.setData("import QtQuick 1.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
 
     QSignalSpy highlightSpy(listView, SIGNAL(highlightChanged()));
     QSignalSpy delegateSpy(listView, SIGNAL(delegateChanged()));
diff --git a/tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml
index 5d02dae..7654c07 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300
diff --git a/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml b/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml
index f202fc8..d2da64d 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     objectName: "blue"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
index 3b851c1..139657b 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QGraphicsWidget {
     size: "250x250"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml b/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml
index 9b8f770..5aeb81e 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
index 72cd3b9..bb1030e 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200; height: 80
diff --git a/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
index 0cff506..5a31eff 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 200
diff --git a/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
index d808c51..5a35284 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 120
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
index d99dd01..fa2d3cb 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     function clear() {
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
index 81610ad..a855947 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader {
     width: 200
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
index a801a42..b6fd57f 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader {
     source: "GraphicsWidget250x250.qml"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
index 77aa8d9..36ce991 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader {
     source: "Rect120x60.qml"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
index 0098927..4fa945b 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader {
     width: 200; height: 80
diff --git a/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml b/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml
index 633f03d..a36c246 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 100; height: 100; color: "red"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/crash.qml b/tests/auto/declarative/qdeclarativeloader/data/crash.qml
index db9abca..c7a4407 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/crash.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/crash.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400
diff --git a/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml b/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml
index b32558b..043ce55 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader { source: "http://evil.place/evil.qml" }
diff --git a/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml b/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml
index 5ce003d..1d0ab5c 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader {
     sourceComponent: QtObject {}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml b/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml
index 812c1be..dbea969 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item { }
diff --git a/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml b/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml
index 91732a1..8ba13a0 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader { source: "sameorigin-load.qml" }
diff --git a/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml b/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml
index ae33e00..cfced31 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Loader {
     source: "VmeError.qml"
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index b62392d..8d04616 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -102,7 +102,7 @@ tst_QDeclarativeLoader::tst_QDeclarativeLoader()
 void tst_QDeclarativeLoader::url()
 {
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nLoader { property int did_load: 0; onLoaded: did_load=123; source: \"Rect120x60.qml\" }"), TEST_FILE(""));
+    component.setData(QByteArray("import QtQuick 1.0\nLoader { property int did_load: 0; onLoaded: did_load=123; source: \"Rect120x60.qml\" }"), TEST_FILE(""));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
     QVERIFY(loader->item());
@@ -140,7 +140,7 @@ void tst_QDeclarativeLoader::invalidUrl()
     QTest::ignoreMessage(QtWarningMsg, QString(QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ": File not found").toUtf8().constData());
 
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE(""));
+    component.setData(QByteArray("import QtQuick 1.0\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE(""));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
     QVERIFY(loader->item() == 0);
@@ -156,7 +156,7 @@ void tst_QDeclarativeLoader::clear()
     {
         QDeclarativeComponent component(&engine);
         component.setData(QByteArray(
-                    "import Qt 4.7\n"
+                    "import QtQuick 1.0\n"
                     " Loader { id: loader\n"
                     "  source: 'Rect120x60.qml'\n"
                     "  Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n"
@@ -220,7 +220,7 @@ void tst_QDeclarativeLoader::clear()
 void tst_QDeclarativeLoader::urlToComponent()
 {
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\n"
+    component.setData(QByteArray("import QtQuick 1.0\n"
                 "Loader {\n"
                 " id: loader\n"
                 " Component { id: myComp; Rectangle { width: 10; height: 10 } }\n"
@@ -445,7 +445,7 @@ void tst_QDeclarativeLoader::networkRequestUrl()
     server.serveDirectory(SRCDIR "/data");
 
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nLoader { property int did_load : 0; source: \"http://127.0.0.1:14450/Rect120x60.qml\"; onLoaded: did_load=123 }"), QUrl::fromLocalFile(SRCDIR "/dummy.qml"));
+    component.setData(QByteArray("import QtQuick 1.0\nLoader { property int did_load : 0; source: \"http://127.0.0.1:14450/Rect120x60.qml\"; onLoaded: did_load=123 }"), QUrl::fromLocalFile(SRCDIR "/dummy.qml"));
     if (component.isError())
         qDebug() << component.errors();
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -470,7 +470,7 @@ void tst_QDeclarativeLoader::networkComponent()
 
     QDeclarativeComponent component(&engine);
     component.setData(QByteArray(
-                "import Qt 4.7\n"
+                "import QtQuick 1.0\n"
                 "import \"http://127.0.0.1:14450/\" as NW\n"
                 "Item {\n"
                 " Component { id: comp; NW.SlowRect {} }\n"
@@ -502,7 +502,7 @@ void tst_QDeclarativeLoader::failNetworkRequest()
     QTest::ignoreMessage(QtWarningMsg, "http://127.0.0.1:14450/IDontExist.qml: File not found");
 
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nLoader { property int did_load: 123; source: \"http://127.0.0.1:14450/IDontExist.qml\"; onLoaded: did_load=456 }"), QUrl::fromLocalFile("http://127.0.0.1:14450/dummy.qml"));
+    component.setData(QByteArray("import QtQuick 1.0\nLoader { property int did_load: 123; source: \"http://127.0.0.1:14450/IDontExist.qml\"; onLoaded: did_load=456 }"), QUrl::fromLocalFile("http://127.0.0.1:14450/dummy.qml"));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
 
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/clickandhold.qml b/tests/auto/declarative/qdeclarativemousearea/data/clickandhold.qml
index f926daa..a6409e2 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/clickandhold.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/clickandhold.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/doubleclick.qml b/tests/auto/declarative/qdeclarativemousearea/data/doubleclick.qml
index 9cddf1b..2348444 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/doubleclick.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/doubleclick.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/dragging.qml b/tests/auto/declarative/qdeclarativemousearea/data/dragging.qml
index a28f049..dd89efb 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/dragging.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/dragging.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: whiteRect
     width: 200
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
index ba15250..7baefd5 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: whiteRect
     width: 200 
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml b/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml
index 789125b..c6d2e20 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: whiteRect
     width: 200 
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
index c01e938..fc8292d 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnClick.qml b/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnClick.qml
index 6008499..b77f743 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnClick.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnClick.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "#ffffff"
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnResize.qml b/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnResize.qml
index 2a2b905..6571d8b 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnResize.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnResize.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "#ffffff"
diff --git a/tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml b/tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml
index ec8f452..dad9746 100644
--- a/tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Rectangle {
diff --git a/tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml b/tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml
index af15665..c76fe9b 100644
--- a/tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Rectangle{
diff --git a/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
index fb3c910..1322025 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 PathView {
     id: pathview
diff --git a/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml b/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
index c82914f..88dfc57 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativepathview/data/emptymodel.qml b/tests/auto/declarative/qdeclarativepathview/data/emptymodel.qml
index 177c405..4deb45f 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/emptymodel.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/emptymodel.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 PathView {
     model: emptyModel
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathUpdateOnStartChanged.qml b/tests/auto/declarative/qdeclarativepathview/data/pathUpdateOnStartChanged.qml
index ce0f0c9..bd732ab 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathUpdateOnStartChanged.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathUpdateOnStartChanged.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathtest.qml b/tests/auto/declarative/qdeclarativepathview/data/pathtest.qml
index caa1586..b13c006 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathtest.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathtest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Path {
     startX: 120; startY: 100
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml
index ff6f224..04c7717 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
index c3d2f91..d1ac517 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 PathView {
 }
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
index 2ce66a2..1e1e893 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 PathView {
     id: photoPathView
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
index 066c531..cd1ba03 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 PathView {
     id: photoPathView
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml
index 082da13..f9157bd 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 800; height: 600
diff --git a/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml b/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml
index 6cc9d2a..c0cc855 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 350; height: 220; color: "white"
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index cbfbfbd..3b5d438 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -687,7 +687,7 @@ void tst_QDeclarativePathView::componentChanges()
     QVERIFY(pathView);
 
     QDeclarativeComponent delegateComponent(canvas->engine());
-    delegateComponent.setData("import Qt 4.7; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
+    delegateComponent.setData("import QtQuick 1.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
 
     QSignalSpy delegateSpy(pathView, SIGNAL(delegateChanged()));
 
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml b/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
index 6dd108e..51c8134 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 200;
@@ -13,4 +13,4 @@ Rectangle {
         Rectangle { color: "red"; width: 100; height: 50 }
         Rectangle { color: "blue"; width: 100; height: 50 }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
index 3ba015d..2810234 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 90
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
index 3a56be6..e13f078 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
index e098812..f037330 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml
index 8799366..5d4c337 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/gridtest.qml b/tests/auto/declarative/qdeclarativepositioners/data/gridtest.qml
index ab7238a..f3b17dd 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/gridtest.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/gridtest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml b/tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml
index 8e11f4e..169f974 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
index 20a6258..5b064cd 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
index 0e368c1..2b46bca 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
index 71ad6ec..919cecc 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/propertychangestest.qml b/tests/auto/declarative/qdeclarativepositioners/data/propertychangestest.qml
index a53ff82..3c95c4c 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/propertychangestest.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/propertychangestest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Grid {
     id: myGrid
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml b/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
index 531d716..1cba598 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
index 1499c1e..8899ac8 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
index f7e853a..5578961 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
index 9e3d6ab..310d791 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml b/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml
index c9c8607..c320714 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 887be50..57a8354 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -694,80 +694,80 @@ void tst_QDeclarativePositioners::test_conflictinganchors()
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
 
-    component.setData("import Qt 4.7\nColumn { Item {} }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nColumn { Item {} }", QUrl::fromLocalFile(""));
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QVERIFY(warningMessage.isEmpty());
 
-    component.setData("import Qt 4.7\nRow { Item {} }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nRow { Item {} }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QVERIFY(warningMessage.isEmpty());
 
-    component.setData("import Qt 4.7\nGrid { Item {} }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nGrid { Item {} }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QVERIFY(warningMessage.isEmpty());
 
-    component.setData("import Qt 4.7\nFlow { Item {} }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nFlow { Item {} }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QVERIFY(warningMessage.isEmpty());
 
-    component.setData("import Qt 4.7\nColumn { Item { anchors.top: parent.top } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nColumn { Item { anchors.top: parent.top } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column"));
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nColumn { Item { anchors.centerIn: parent } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nColumn { Item { anchors.centerIn: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column"));
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nColumn { Item { anchors.left: parent.left } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nColumn { Item { anchors.left: parent.left } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QVERIFY(warningMessage.isEmpty());
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nRow { Item { anchors.left: parent.left } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nRow { Item { anchors.left: parent.left } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row"));
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nRow { Item { anchors.fill: parent } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nRow { Item { anchors.fill: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row"));
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nRow { Item { anchors.top: parent.top } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nRow { Item { anchors.top: parent.top } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QVERIFY(warningMessage.isEmpty());
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nGrid { Item { anchors.horizontalCenter: parent.horizontalCenter } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nGrid { Item { anchors.horizontalCenter: parent.horizontalCenter } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid"));
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nGrid { Item { anchors.centerIn: parent } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nGrid { Item { anchors.centerIn: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid"));
     warningMessage.clear();
 
-    component.setData("import Qt 4.7\nFlow { Item { anchors.verticalCenter: parent.verticalCenter } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nFlow { Item { anchors.verticalCenter: parent.verticalCenter } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow"));
 
-    component.setData("import Qt 4.7\nFlow { Item { anchors.fill: parent } }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 1.0\nFlow { Item { anchors.fill: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow"));
diff --git a/tests/auto/declarative/qdeclarativeproperty/data/TestType.qml b/tests/auto/declarative/qdeclarativeproperty/data/TestType.qml
index 2177ae2..cef86b4 100644
--- a/tests/auto/declarative/qdeclarativeproperty/data/TestType.qml
+++ b/tests/auto/declarative/qdeclarativeproperty/data/TestType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a: 10
diff --git a/tests/auto/declarative/qdeclarativeproperty/data/readSynthesizedObject.qml b/tests/auto/declarative/qdeclarativeproperty/data/readSynthesizedObject.qml
index 0918e86..a91d3ed 100644
--- a/tests/auto/declarative/qdeclarativeproperty/data/readSynthesizedObject.qml
+++ b/tests/auto/declarative/qdeclarativeproperty/data/readSynthesizedObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property TestType test
diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
index f1d3bf0..c825e85 100644
--- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
+++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
@@ -138,7 +138,7 @@ void tst_QDeclarativePropertyMap::changed()
     QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty(QLatin1String("testdata"), &map);
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nText { text: { testdata.key1 = 'Hello World'; 'X' } }",
+    component.setData("import QtQuick 1.0\nText { text: { testdata.key1 = 'Hello World'; 'X' } }",
             QUrl::fromLocalFile(""));
     QVERIFY(component.isReady());
     QDeclarativeText *txt = qobject_cast<QDeclarativeText*>(component.create());
@@ -179,7 +179,7 @@ void tst_QDeclarativePropertyMap::crashBug()
     context.setContextProperty("map", &map);
 
     QDeclarativeComponent c(&engine);
-    c.setData("import Qt 4.7\nBinding { target: map; property: \"myProp\"; value: 10 + 23 }",QUrl());
+    c.setData("import QtQuick 1.0\nBinding { target: map; property: \"myProp\"; value: 10 + 23 }",QUrl());
     QObject *obj = c.create(&context);
     delete obj;
 }
diff --git a/tests/auto/declarative/qdeclarativeqt/data/atob.qml b/tests/auto/declarative/qdeclarativeqt/data/atob.qml
index 8355fa5..f74aae8 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/atob.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/atob.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string test1: Qt.atob()
diff --git a/tests/auto/declarative/qdeclarativeqt/data/btoa.qml b/tests/auto/declarative/qdeclarativeqt/data/btoa.qml
index c2993ff..63b58c0 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/btoa.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/btoa.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string test1: Qt.btoa()
diff --git a/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml b/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
index aa9e92a..fe47f3f 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
index f966931..9d0dd34 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool emptyArg: false
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
index dc3e0d3..6ac470e 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int test: 1913
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml
index 33203c7..5b8c1b1 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "createComponent_lib.js" as Test
 
 Item {
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
index ca3ff22..8c35ebf 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
@@ -1,14 +1,14 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
 
     // errors resulting in exceptions
     property QtObject incorrectArgCount1: Qt.createQmlObject()
-    property QtObject incorrectArgCount2: Qt.createQmlObject("import Qt 4.7\nQtObject{}", root, "main.qml", 10)
-    property QtObject noParent: Qt.createQmlObject("import Qt 4.7\nQtObject{\nproperty int test: 13}", 0)
-    property QtObject notAvailable: Qt.createQmlObject("import Qt 4.7\nQtObject{Blah{}}", root)
-    property QtObject errors: Qt.createQmlObject("import Qt 4.7\nQtObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml")
+    property QtObject incorrectArgCount2: Qt.createQmlObject("import QtQuick 1.0\nQtObject{}", root, "main.qml", 10)
+    property QtObject noParent: Qt.createQmlObject("import QtQuick 1.0\nQtObject{\nproperty int test: 13}", 0)
+    property QtObject notAvailable: Qt.createQmlObject("import QtQuick 1.0\nQtObject{Blah{}}", root)
+    property QtObject errors: Qt.createQmlObject("import QtQuick 1.0\nQtObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml")
 
     property bool emptyArg: false
 
@@ -18,14 +18,14 @@ Item {
         // errors resulting in nulls
         emptyArg = (Qt.createQmlObject("", root) == null);
         try {
-            Qt.createQmlObject("import Qt 4.7\nQtObject{property int test\nonTestChanged: QtObject{}\n}", root)
+            Qt.createQmlObject("import QtQuick 1.0\nQtObject{property int test\nonTestChanged: QtObject{}\n}", root)
         } catch (error) {
             console.log("RunTimeError: ",error.message);
         }
 
-        var o = Qt.createQmlObject("import Qt 4.7\nQtObject{\nproperty int test: 13\n}", root);
+        var o = Qt.createQmlObject("import QtQuick 1.0\nQtObject{\nproperty int test: 13\n}", root);
         success = (o.test == 13);
 
-        Qt.createQmlObject("import Qt 4.7\nItem {}\n", root);
+        Qt.createQmlObject("import QtQuick 1.0\nItem {}\n", root);
     }
 }
diff --git a/tests/auto/declarative/qdeclarativeqt/data/darker.qml b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
index 738095d..d2ef866 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/darker.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: Qt.darker(Qt.rgba(1, 0.8, 0.3))
diff --git a/tests/auto/declarative/qdeclarativeqt/data/enums.qml b/tests/auto/declarative/qdeclarativeqt/data/enums.qml
index a0190cc..aec6f63 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/enums.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/enums.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int test1: Qt.Key_Escape
diff --git a/tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml b/tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml
index e66c7be..c9f50d4 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: Qt.fontFamilies(10)
diff --git a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
index 7f48639..35c6a29 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property date date1: "2008-12-24"
diff --git a/tests/auto/declarative/qdeclarativeqt/data/hsla.qml b/tests/auto/declarative/qdeclarativeqt/data/hsla.qml
index 4ca67a3..3bcc791 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/hsla.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/hsla.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property color test1: Qt.hsla(1, 0, 0, 0.8);
diff --git a/tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml b/tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml
index 0f573c4..37b952d 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: root
diff --git a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
index ddaf78d..67f0d0f 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: Qt.lighter(Qt.rgba(1, 0.8, 0.3))
diff --git a/tests/auto/declarative/qdeclarativeqt/data/md5.qml b/tests/auto/declarative/qdeclarativeqt/data/md5.qml
index 07f719b..32e90c0 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/md5.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/md5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string test1: Qt.md5()
diff --git a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml b/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml
index 3ceb05d..c9fb25e 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     Component.onCompleted: Qt.openUrlExternally("test:url")
diff --git a/tests/auto/declarative/qdeclarativeqt/data/point.qml b/tests/auto/declarative/qdeclarativeqt/data/point.qml
index 0ada2d5..8b0188e 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/point.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/point.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: Qt.point(19, 34);
diff --git a/tests/auto/declarative/qdeclarativeqt/data/rect.qml b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
index fd38628..872bf50 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/rect.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: Qt.rect(10, 13, 100, 109)
diff --git a/tests/auto/declarative/qdeclarativeqt/data/rgba.qml b/tests/auto/declarative/qdeclarativeqt/data/rgba.qml
index 16606cd..bbafc6d 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/rgba.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/rgba.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property color test1: Qt.rgba(1, 0, 0, 0.8);
diff --git a/tests/auto/declarative/qdeclarativeqt/data/size.qml b/tests/auto/declarative/qdeclarativeqt/data/size.qml
index afcfb62..8e102eb 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/size.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/size.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: Qt.size(19, 34);
diff --git a/tests/auto/declarative/qdeclarativeqt/data/tint.qml b/tests/auto/declarative/qdeclarativeqt/data/tint.qml
index 25e7051..f873886 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/tint.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/tint.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property color test1: Qt.tint("red", "blue");
diff --git a/tests/auto/declarative/qdeclarativeqt/data/vector.qml b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
index b7708f5..f494fe0 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/vector.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property variant test1: Qt.vector3d(1, 0, 0.9);
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml b/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
index 9cd03c4..85e1608 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
index 4810736..590a9cd 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
@@ -1,7 +1,7 @@
 // This example demonstrates placing items in a view using
 // a VisualItemModel
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
index e1bd2e2..b47b042 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/properties.qml b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml
index 34bbde0..689a103 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/properties.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Row { 
     Repeater { 
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/repeater1.qml b/tests/auto/declarative/qdeclarativerepeater/data/repeater1.qml
index 3047435..2456b6d 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/repeater1.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/repeater1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml b/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
index 7f2f85a..02ef810 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 240
diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
index 360d90f..91a4d68 100644
--- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -397,7 +397,7 @@ void tst_QDeclarativeRepeater::properties()
     QSignalSpy delegateSpy(repeater, SIGNAL(delegateChanged()));
 
     QDeclarativeComponent rectComponent(&engine);
-    rectComponent.setData("import Qt 4.7; Rectangle {}", QUrl::fromLocalFile(""));
+    rectComponent.setData("import QtQuick 1.0; Rectangle {}", QUrl::fromLocalFile(""));
 
     repeater->setDelegate(&rectComponent);
     QCOMPARE(delegateSpy.count(),1);
diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml
index ad627ef..9096c32 100644
--- a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml
+++ b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 import "backtrace1.js" as Script
 
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml
index 1de5f16..3a2c4e3 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml
@@ -1,3 +1,3 @@
-import Qt 4.7
+import QtQuick 1.0
 
 SmoothedAnimation {}
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml
index 544e7e9..47935d4 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 SmoothedAnimation {
     to: 10; duration: 300; reversingMode: SmoothedAnimation.Immediate
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml
index c1f3af0..fe44cce 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 SmoothedAnimation {
     to: 10; velocity: 250; reversingMode: SmoothedAnimation.Sync
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml
index 3afeb7b..6561122 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
      width: 400; height: 400; color: "blue"
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml
index 53429e2..5036d5f 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 300;
diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
index 07587bd..8890a78 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 SpringAnimation {
 }
diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
index 562f44a..de75bb0 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 SpringAnimation {
     to: 1.44; velocity: 0.9
diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
index 9f70bf4..b68d769 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 SpringAnimation {
     to: 1.44; velocity: 0.9
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
index f92d7e8..b71ed91 100644
--- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
+++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
@@ -201,7 +201,7 @@ void tst_qdeclarativesqldatabase::testQml()
     QFETCH(QString, jsfile);
 
     QString qml=
-        "import Qt 4.7\n"
+        "import QtQuick 1.0\n"
         "import \""+jsfile+"\" as JS\n"
         "Text { text: JS.test() }";
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
index 28e083c..d91f504 100644
--- a/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: extendedRect
     objectName: "extendedRect"
diff --git a/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml b/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml
index 1872de8..6ad3b4a 100644
--- a/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Column {
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml
index e9c9d67..fad2708 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
index cee2ce5..e1d4d66 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
index 54dc34b..116b844 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
index 885c3ce..eaff373 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
index c3db72e..ea7b251 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml
index 861ef8f..ca96da8 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml b/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml
index e6b6020..6277111 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: container
     color: "red"
@@ -34,4 +34,4 @@ Rectangle {
             opacity: 0
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml b/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml
index 4ed2815..d8b02e9 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml b/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml
index e17823b..2cad050 100644
--- a/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: item
diff --git a/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
index 37e1e5a..ccd126f 100644
--- a/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: root
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
index d559691..2060f03 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
index a429b24..a329da3 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
index 26405d9..cb054d2 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
index 153a2c1..7a740e5 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
index fca7916..08ce787 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
index 72bd23e..ab97ba1 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
index 4fb1274..73ac34d 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml
index b2f02c9..b5df922 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml
@@ -1,5 +1,5 @@
 import Qt.test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyRectangle {
     id: rect
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
index abfe71a..58c9fbe 100644
--- a/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/deleting.qml b/tests/auto/declarative/qdeclarativestates/data/deleting.qml
index a8a66cb..d1b3fd3 100644
--- a/tests/auto/declarative/qdeclarativestates/data/deleting.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/deleting.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/deletingState.qml b/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
index fadb7d9..654e09c 100644
--- a/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/editProperties.qml b/tests/auto/declarative/qdeclarativestates/data/editProperties.qml
index 4cb1ddd..08d0209 100644
--- a/tests/auto/declarative/qdeclarativestates/data/editProperties.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/editProperties.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/explicit.qml b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
index 718b169..4267319 100644
--- a/tests/auto/declarative/qdeclarativestates/data/explicit.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     property color sourceColor: "blue"
diff --git a/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml b/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml
index a3c4827..a4b77b1 100644
--- a/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
index 44397b5..a98c96b 100644
--- a/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalObj.qml b/tests/auto/declarative/qdeclarativestates/data/illegalObj.qml
index 26d0f50..e644432 100644
--- a/tests/auto/declarative/qdeclarativestates/data/illegalObj.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/illegalObj.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myItem
diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
index 13cab18..c04b03c 100644
--- a/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: card
diff --git a/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
index f757da0..4d500d9 100644
--- a/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: card
diff --git a/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
index db9b017..4973b82c 100644
--- a/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange1.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange1.qml
index 8b0e3bf..2f7e80e 100644
--- a/tests/auto/declarative/qdeclarativestates/data/parentChange1.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 400
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
index 3a14dbe..bdd0c6c 100644
--- a/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: newParent
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
index 17c07e8..55f3ead 100644
--- a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 400
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
index 11d0831..ae05b05 100644
--- a/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 400
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
index 329d277..32a0b91 100644
--- a/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 400
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange6.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange6.qml
index be92aba..70ad894 100644
--- a/tests/auto/declarative/qdeclarativestates/data/parentChange6.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange6.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 400
diff --git a/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
index 8f9a7f2..3ab3c32 100644
--- a/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/declarative/qdeclarativestates/data/reset.qml
index 5725320..8799c97 100644
--- a/tests/auto/declarative/qdeclarativestates/data/reset.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/reset.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 640
diff --git a/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
index 621adf0..dfd7c17 100644
--- a/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/returnToBase.qml b/tests/auto/declarative/qdeclarativestates/data/returnToBase.qml
index e342331..a0d053c 100644
--- a/tests/auto/declarative/qdeclarativestates/data/returnToBase.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/returnToBase.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: theRect
diff --git a/tests/auto/declarative/qdeclarativestates/data/script.qml b/tests/auto/declarative/qdeclarativestates/data/script.qml
index cdb6be1..630aaf0 100644
--- a/tests/auto/declarative/qdeclarativestates/data/script.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/script.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     id: myRectangle
     width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
index c4ab96c..0eaf547 100644
--- a/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 MyRectangle {
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
index 65a8cea..ef26ff1 100644
--- a/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 MyRectangle {
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
index 8a0b51a..8e9b698 100644
--- a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.test 1.0
 
 MyRectangle {
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml
index 2215ee4..74df943 100644
--- a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myRect
diff --git a/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml b/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml
index a70840c..4425b4d 100644
--- a/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: theRect
diff --git a/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml b/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml
index 8995b56..743f540 100644
--- a/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "Implementation"
 
 Rectangle {
diff --git a/tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml b/tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml
index 08d0795..48aef5a 100644
--- a/tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property bool condition1: false
diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
index dd1fd7a..b8f5851 100644
--- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
+++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
@@ -75,7 +75,7 @@ tst_qdeclarativesystempalette::tst_qdeclarativesystempalette()
 
 void tst_qdeclarativesystempalette::activePalette()
 {
-    QString componentStr = "import Qt 4.7\nSystemPalette { }";
+    QString componentStr = "import QtQuick 1.0\nSystemPalette { }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
@@ -104,7 +104,7 @@ void tst_qdeclarativesystempalette::activePalette()
 
 void tst_qdeclarativesystempalette::inactivePalette()
 {
-    QString componentStr = "import Qt 4.7\nSystemPalette { colorGroup: SystemPalette.Inactive }";
+    QString componentStr = "import QtQuick 1.0\nSystemPalette { colorGroup: SystemPalette.Inactive }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
@@ -134,7 +134,7 @@ void tst_qdeclarativesystempalette::inactivePalette()
 
 void tst_qdeclarativesystempalette::disabledPalette()
 {
-    QString componentStr = "import Qt 4.7\nSystemPalette { colorGroup: SystemPalette.Disabled }";
+    QString componentStr = "import QtQuick 1.0\nSystemPalette { colorGroup: SystemPalette.Disabled }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
@@ -164,7 +164,7 @@ void tst_qdeclarativesystempalette::disabledPalette()
 
 void tst_qdeclarativesystempalette::paletteChanged()
 {
-    QString componentStr = "import Qt 4.7\nSystemPalette { }";
+    QString componentStr = "import QtQuick 1.0\nSystemPalette { }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
diff --git a/tests/auto/declarative/qdeclarativetext/data/alignments.qml b/tests/auto/declarative/qdeclarativetext/data/alignments.qml
index 762e2b6..25105f6 100644
--- a/tests/auto/declarative/qdeclarativetext/data/alignments.qml
+++ b/tests/auto/declarative/qdeclarativetext/data/alignments.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: top
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
index 877222f..ee9b95a 100644
--- a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Text {
     text: "<img src='http/exists.png'>"
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
index abc7077..4dc0d3e 100644
--- a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Text {
     text: "<img src='http/notexists.png'>"
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
index b6ca3e3..438f4a0 100644
--- a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Text {
     text: "<img src='http://127.0.0.1:14453/exists.png'>"
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
index fbfce9a..c24bf24 100644
--- a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Text {
     text: "<img src='http://127.0.0.1:14453/notexists.png'>"
diff --git a/tests/auto/declarative/qdeclarativetext/data/rotated.qml b/tests/auto/declarative/qdeclarativetext/data/rotated.qml
index 01eec44..1e893b9 100644
--- a/tests/auto/declarative/qdeclarativetext/data/rotated.qml
+++ b/tests/auto/declarative/qdeclarativetext/data/rotated.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width : 200
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index f683d98..d6c37ae 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -184,7 +184,7 @@ void tst_qdeclarativetext::text()
 {
     {
         QDeclarativeComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.7\nText { text: \"\" }", QUrl::fromLocalFile(""));
+        textComponent.setData("import QtQuick 1.0\nText { text: \"\" }", QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
@@ -196,7 +196,7 @@ void tst_qdeclarativetext::text()
 
     for (int i = 0; i < standard.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
 
@@ -209,7 +209,7 @@ void tst_qdeclarativetext::text()
 
     for (int i = 0; i < richText.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"" + richText.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -226,7 +226,7 @@ void tst_qdeclarativetext::width()
     // uses Font metrics to find the width for standard and document to find the width for rich
     {
         QDeclarativeComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.7\nText { text: \"\" }", QUrl::fromLocalFile(""));
+        textComponent.setData("import QtQuick 1.0\nText { text: \"\" }", QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
@@ -242,7 +242,7 @@ void tst_qdeclarativetext::width()
         qreal metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
         metricWidth = qCeil(metricWidth);
 
-        QString componentStr = "import Qt 4.7\nText { text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -263,7 +263,7 @@ void tst_qdeclarativetext::width()
 
         int documentWidth = document.idealWidth();
 
-        QString componentStr = "import Qt 4.7\nText { text: \"" + richText.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -280,7 +280,7 @@ void tst_qdeclarativetext::wrap()
     // for specified width and wrap set true
     {
         QDeclarativeComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.7\nText { text: \"Hello\"; wrapMode: Text.WordWrap; width: 300 }", QUrl::fromLocalFile(""));
+        textComponent.setData("import QtQuick 1.0\nText { text: \"Hello\"; wrapMode: Text.WordWrap; width: 300 }", QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
         textHeight = textObject->height();
 
@@ -291,7 +291,7 @@ void tst_qdeclarativetext::wrap()
 
     for (int i = 0; i < standard.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nText { wrapMode: Text.WordWrap; width: 30; text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nText { wrapMode: Text.WordWrap; width: 30; text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -307,7 +307,7 @@ void tst_qdeclarativetext::wrap()
 
     for (int i = 0; i < richText.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nText { wrapMode: Text.WordWrap; width: 30; text: \"" + richText.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nText { wrapMode: Text.WordWrap; width: 30; text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -324,7 +324,7 @@ void tst_qdeclarativetext::wrap()
     // richtext again with a fixed height
     for (int i = 0; i < richText.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nText { wrapMode: Text.WordWrap; width: 30; height: 50; text: \"" + richText.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nText { wrapMode: Text.WordWrap; width: 30; height: 50; text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -349,7 +349,7 @@ void tst_qdeclarativetext::elide()
 
         {
             QDeclarativeComponent textComponent(&engine);
-            textComponent.setData(("import Qt 4.7\nText { text: \"\"; "+elide+" width: 100 }").toLatin1(), QUrl::fromLocalFile(""));
+            textComponent.setData(("import QtQuick 1.0\nText { text: \"\"; "+elide+" width: 100 }").toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QCOMPARE(textObject->elideMode(), m);
@@ -358,7 +358,7 @@ void tst_qdeclarativetext::elide()
 
         for (int i = 0; i < standard.size(); i++)
         {
-            QString componentStr = "import Qt 4.7\nText { "+elide+" width: 100; text: \"" + standard.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { "+elide+" width: 100; text: \"" + standard.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -370,7 +370,7 @@ void tst_qdeclarativetext::elide()
         // richtext - does nothing
         for (int i = 0; i < richText.size(); i++)
         {
-            QString componentStr = "import Qt 4.7\nText { "+elide+" width: 100; text: \"" + richText.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { "+elide+" width: 100; text: \"" + richText.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -385,7 +385,7 @@ void tst_qdeclarativetext::textFormat()
 {
     {
         QDeclarativeComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.7\nText { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
+        textComponent.setData("import QtQuick 1.0\nText { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
@@ -393,7 +393,7 @@ void tst_qdeclarativetext::textFormat()
     }
     {
         QDeclarativeComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.7\nText { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
+        textComponent.setData("import QtQuick 1.0\nText { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
@@ -471,7 +471,7 @@ void tst_qdeclarativetext::horizontalAlignment()
     {
         for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -484,7 +484,7 @@ void tst_qdeclarativetext::horizontalAlignment()
     {
         for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -503,7 +503,7 @@ void tst_qdeclarativetext::verticalAlignment()
     {
         for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -517,7 +517,7 @@ void tst_qdeclarativetext::verticalAlignment()
     {
         for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -533,7 +533,7 @@ void tst_qdeclarativetext::font()
 {
     //test size, then bold, then italic, then family
     {
-        QString componentStr = "import Qt 4.7\nText { font.pointSize: 40; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.pointSize: 40; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -544,7 +544,7 @@ void tst_qdeclarativetext::font()
     }
 
     {
-        QString componentStr = "import Qt 4.7\nText { font.pixelSize: 40; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.pixelSize: 40; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -555,7 +555,7 @@ void tst_qdeclarativetext::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nText { font.bold: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.bold: true; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -565,7 +565,7 @@ void tst_qdeclarativetext::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nText { font.italic: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.italic: true; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -575,7 +575,7 @@ void tst_qdeclarativetext::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nText { font.family: \"Helvetica\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.family: \"Helvetica\"; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -586,7 +586,7 @@ void tst_qdeclarativetext::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nText { font.family: \"\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.family: \"\"; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -600,7 +600,7 @@ void tst_qdeclarativetext::style()
     //test style
     for (int i = 0; i < styles.size(); i++)
     { 
-        QString componentStr = "import Qt 4.7\nText { style: \"" + styleStrings.at(i) + "\"; styleColor: \"white\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { style: \"" + styleStrings.at(i) + "\"; styleColor: \"white\"; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -608,7 +608,7 @@ void tst_qdeclarativetext::style()
         QCOMPARE((int)textObject->style(), (int)styles.at(i));
         QCOMPARE(textObject->styleColor(), QColor("white"));
     }
-    QString componentStr = "import Qt 4.7\nText { text: \"Hello World\" }";
+    QString componentStr = "import QtQuick 1.0\nText { text: \"Hello World\" }";
     QDeclarativeComponent textComponent(&engine);
     textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -626,7 +626,7 @@ void tst_qdeclarativetext::color()
     //test style
     for (int i = 0; i < colorStrings.size(); i++)
     { 
-        QString componentStr = "import Qt 4.7\nText { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -637,7 +637,7 @@ void tst_qdeclarativetext::color()
 
     for (int i = 0; i < colorStrings.size(); i++)
     { 
-        QString componentStr = "import Qt 4.7\nText { styleColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { styleColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -651,7 +651,7 @@ void tst_qdeclarativetext::color()
     { 
         for (int j = 0; j < colorStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nText { color: \"" + colorStrings.at(i) + "\"; styleColor: \"" + colorStrings.at(j) + "\"; text: \"Hello World\" }";
+            QString componentStr = "import QtQuick 1.0\nText { color: \"" + colorStrings.at(i) + "\"; styleColor: \"" + colorStrings.at(j) + "\"; text: \"Hello World\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -665,7 +665,7 @@ void tst_qdeclarativetext::color()
         QColor testColor("#001234");
         testColor.setAlpha(170);
 
-        QString componentStr = "import Qt 4.7\nText { color: \"" + colorStr + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nText { color: \"" + colorStr + "\"; text: \"Hello World\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -679,14 +679,14 @@ void tst_qdeclarativetext::smooth()
     for (int i = 0; i < standard.size(); i++)
     {
         {
-            QString componentStr = "import Qt 4.7\nText { smooth: true; text: \"" + standard.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { smooth: true; text: \"" + standard.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
             QCOMPARE(textObject->smooth(), true);
         }
         {
-            QString componentStr = "import Qt 4.7\nText { text: \"" + standard.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { text: \"" + standard.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -696,14 +696,14 @@ void tst_qdeclarativetext::smooth()
     for (int i = 0; i < richText.size(); i++)
     {
         {
-            QString componentStr = "import Qt 4.7\nText { smooth: true; text: \"" + richText.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { smooth: true; text: \"" + richText.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
             QCOMPARE(textObject->smooth(), true);
         }
         {
-            QString componentStr = "import Qt 4.7\nText { text: \"" + richText.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nText { text: \"" + richText.at(i) + "\" }";
             QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -715,7 +715,7 @@ void tst_qdeclarativetext::smooth()
 void tst_qdeclarativetext::weight()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -724,7 +724,7 @@ void tst_qdeclarativetext::weight()
         QCOMPARE((int)textObject->font().weight(), (int)QDeclarativeFontValueType::Normal);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { font.weight: \"Bold\"; text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.weight: \"Bold\"; text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -737,7 +737,7 @@ void tst_qdeclarativetext::weight()
 void tst_qdeclarativetext::underline()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -746,7 +746,7 @@ void tst_qdeclarativetext::underline()
         QCOMPARE(textObject->font().underline(), false);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { font.underline: true; text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.underline: true; text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -759,7 +759,7 @@ void tst_qdeclarativetext::underline()
 void tst_qdeclarativetext::overline()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -768,7 +768,7 @@ void tst_qdeclarativetext::overline()
         QCOMPARE(textObject->font().overline(), false);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { font.overline: true; text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.overline: true; text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -781,7 +781,7 @@ void tst_qdeclarativetext::overline()
 void tst_qdeclarativetext::strikeout()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -790,7 +790,7 @@ void tst_qdeclarativetext::strikeout()
         QCOMPARE(textObject->font().strikeOut(), false);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { font.strikeout: true; text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { font.strikeout: true; text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -803,7 +803,7 @@ void tst_qdeclarativetext::strikeout()
 void tst_qdeclarativetext::capitalization()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -812,7 +812,7 @@ void tst_qdeclarativetext::capitalization()
         QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::MixedCase);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.capitalization: \"AllUppercase\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.capitalization: \"AllUppercase\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -821,7 +821,7 @@ void tst_qdeclarativetext::capitalization()
         QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::AllUppercase);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.capitalization: \"AllLowercase\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.capitalization: \"AllLowercase\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -830,7 +830,7 @@ void tst_qdeclarativetext::capitalization()
         QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::AllLowercase);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.capitalization: \"SmallCaps\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.capitalization: \"SmallCaps\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -839,7 +839,7 @@ void tst_qdeclarativetext::capitalization()
         QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::SmallCaps);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.capitalization: \"Capitalize\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.capitalization: \"Capitalize\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -852,7 +852,7 @@ void tst_qdeclarativetext::capitalization()
 void tst_qdeclarativetext::letterSpacing()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -861,7 +861,7 @@ void tst_qdeclarativetext::letterSpacing()
         QCOMPARE(textObject->font().letterSpacing(), 0.0);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.letterSpacing: -2 }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.letterSpacing: -2 }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -870,7 +870,7 @@ void tst_qdeclarativetext::letterSpacing()
         QCOMPARE(textObject->font().letterSpacing(), -2.);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.letterSpacing: 3 }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.letterSpacing: 3 }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -883,7 +883,7 @@ void tst_qdeclarativetext::letterSpacing()
 void tst_qdeclarativetext::wordSpacing()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -892,7 +892,7 @@ void tst_qdeclarativetext::wordSpacing()
         QCOMPARE(textObject->font().wordSpacing(), 0.0);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.wordSpacing: -50 }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.wordSpacing: -50 }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -901,7 +901,7 @@ void tst_qdeclarativetext::wordSpacing()
         QCOMPARE(textObject->font().wordSpacing(), -50.);
     }
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"Hello world!\"; font.wordSpacing: 200 }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"Hello world!\"; font.wordSpacing: 200 }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -949,7 +949,7 @@ public slots:
 void tst_qdeclarativetext::clickLink()
 {
     {
-        QString componentStr = "import Qt 4.7\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }";
+        QString componentStr = "import QtQuick 1.0\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }";
         QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/alignments.qml b/tests/auto/declarative/qdeclarativetextedit/data/alignments.qml
index 9281a06..bc977fc 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/alignments.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/alignments.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: top
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
index 586e606..c7c21fc 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 300; height: 300; color: "white"
     TextEdit {  text: "Hello world!"; id: textEditObject; objectName: "textEditObject"
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml b/tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml
index b39ba5b..fe2ae12 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 400; height: 500;
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
index b5c807e..fa7dbd1 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item{
     Fungus{
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
index df843d8..4989193 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     objectName: "delegateOkay"
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
index 1b41f8f..724c058 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 300; height: 300; color: "white"
     resources: [ 
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
index 51be3cf..6dcf785 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 300; height: 300; color: "white"
     resources: [ 
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
index 30c3fbd..5f441d0 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 300; height: 300; color: "white"
     resources: [ 
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
index a1ca58a..95f5d87 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 300; height: 300; color: "white"
     resources: [ 
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
index 8dfac48..466eb9d 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
index 8dfac48..466eb9d 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
index 8067edb..7df17f2 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextEdit {  
     text: "Hello world!"
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_default.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_default.qml
index f1cf86c..22a9871 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_default.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_default.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextEdit {
     focus: true
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false.qml
index f1cf86c..22a9871 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextEdit {
     focus: true
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true.qml
index 90383b9..d61da46 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextEdit {
     focus: true
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
index 7772687..9ee8a93 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property variant myInput: input
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
index a68e4b4..36177d3 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property variant myInput: input
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 84f4230..472c5ef 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -184,7 +184,7 @@ void tst_qdeclarativetextedit::text()
 {
     {
         QDeclarativeComponent texteditComponent(&engine);
-        texteditComponent.setData("import Qt 4.7\nTextEdit {  text: \"\"  }", QUrl());
+        texteditComponent.setData("import QtQuick 1.0\nTextEdit {  text: \"\"  }", QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
@@ -193,7 +193,7 @@ void tst_qdeclarativetextedit::text()
 
     for (int i = 0; i < standard.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextEdit { text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit { text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -204,7 +204,7 @@ void tst_qdeclarativetextedit::text()
 
     for (int i = 0; i < richText.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextEdit { text: \"" + richText.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit { text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -224,7 +224,7 @@ void tst_qdeclarativetextedit::width()
     // uses Font metrics to find the width for standard and document to find the width for rich
     {
         QDeclarativeComponent texteditComponent(&engine);
-        texteditComponent.setData("import Qt 4.7\nTextEdit {  text: \"\" }", QUrl());
+        texteditComponent.setData("import QtQuick 1.0\nTextEdit {  text: \"\" }", QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
@@ -238,7 +238,7 @@ void tst_qdeclarativetextedit::width()
         qreal metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
         metricWidth = ceil(metricWidth);
 
-        QString componentStr = "import Qt 4.7\nTextEdit { text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit { text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -255,7 +255,7 @@ void tst_qdeclarativetextedit::width()
 
         int documentWidth = ceil(document.idealWidth());
 
-        QString componentStr = "import Qt 4.7\nTextEdit { text: \"" + richText.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit { text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -270,7 +270,7 @@ void tst_qdeclarativetextedit::wrap()
     // for specified width and wrap set true
     {
         QDeclarativeComponent texteditComponent(&engine);
-        texteditComponent.setData("import Qt 4.7\nTextEdit {  text: \"\"; wrapMode: TextEdit.WordWrap; width: 300 }", QUrl());
+        texteditComponent.setData("import QtQuick 1.0\nTextEdit {  text: \"\"; wrapMode: TextEdit.WordWrap; width: 300 }", QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
@@ -279,7 +279,7 @@ void tst_qdeclarativetextedit::wrap()
 
     for (int i = 0; i < standard.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  wrapMode: TextEdit.WordWrap; width: 300; text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  wrapMode: TextEdit.WordWrap; width: 300; text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -290,7 +290,7 @@ void tst_qdeclarativetextedit::wrap()
 
     for (int i = 0; i < richText.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  wrapMode: TextEdit.WordWrap; width: 300; text: \"" + richText.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  wrapMode: TextEdit.WordWrap; width: 300; text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -305,7 +305,7 @@ void tst_qdeclarativetextedit::textFormat()
 {
     {
         QDeclarativeComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.7\nTextEdit { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
+        textComponent.setData("import QtQuick 1.0\nTextEdit { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
         QDeclarativeTextEdit *textObject = qobject_cast<QDeclarativeTextEdit*>(textComponent.create());
 
         QVERIFY(textObject != 0);
@@ -313,7 +313,7 @@ void tst_qdeclarativetextedit::textFormat()
     }
     {
         QDeclarativeComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.7\nTextEdit { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
+        textComponent.setData("import QtQuick 1.0\nTextEdit { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
         QDeclarativeTextEdit *textObject = qobject_cast<QDeclarativeTextEdit*>(textComponent.create());
 
         QVERIFY(textObject != 0);
@@ -381,7 +381,7 @@ void tst_qdeclarativetextedit::hAlign()
     {
         for (int j=0; j < hAlignmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
             QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
             QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -395,7 +395,7 @@ void tst_qdeclarativetextedit::hAlign()
     {
         for (int j=0; j < hAlignmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
             QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
             QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -415,7 +415,7 @@ void tst_qdeclarativetextedit::vAlign()
     {
         for (int j=0; j < vAlignmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
             QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
             QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -429,7 +429,7 @@ void tst_qdeclarativetextedit::vAlign()
     {
         for (int j=0; j < vAlignmentStrings.size(); j++)
         {
-            QString componentStr = "import Qt 4.7\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QString componentStr = "import QtQuick 1.0\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
             QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
             QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -445,7 +445,7 @@ void tst_qdeclarativetextedit::font()
 {
     //test size, then bold, then italic, then family
     { 
-        QString componentStr = "import Qt 4.7\nTextEdit {  font.pointSize: 40; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  font.pointSize: 40; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -457,7 +457,7 @@ void tst_qdeclarativetextedit::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nTextEdit {  font.bold: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  font.bold: true; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -468,7 +468,7 @@ void tst_qdeclarativetextedit::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nTextEdit {  font.italic: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  font.italic: true; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -479,7 +479,7 @@ void tst_qdeclarativetextedit::font()
     }
  
     { 
-        QString componentStr = "import Qt 4.7\nTextEdit {  font.family: \"Helvetica\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  font.family: \"Helvetica\"; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -491,7 +491,7 @@ void tst_qdeclarativetextedit::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nTextEdit {  font.family: \"\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  font.family: \"\"; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -505,7 +505,7 @@ void tst_qdeclarativetextedit::color()
 {
     //test initial color
     {
-        QString componentStr = "import Qt 4.7\nTextEdit { text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit { text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -523,7 +523,7 @@ void tst_qdeclarativetextedit::color()
     //test normal
     for (int i = 0; i < colorStrings.size(); i++)
     { 
-        QString componentStr = "import Qt 4.7\nTextEdit {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -535,7 +535,7 @@ void tst_qdeclarativetextedit::color()
     //test selection
     for (int i = 0; i < colorStrings.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -546,7 +546,7 @@ void tst_qdeclarativetextedit::color()
     //test selected text
     for (int i = 0; i < colorStrings.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -559,7 +559,7 @@ void tst_qdeclarativetextedit::color()
         QColor testColor("#001234");
         testColor.setAlpha(170);
 
-        QString componentStr = "import Qt 4.7\nTextEdit {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -572,7 +572,7 @@ void tst_qdeclarativetextedit::color()
 void tst_qdeclarativetextedit::textMargin()
 {
     for(qreal i=0; i<=10; i+=0.3){
-        QString componentStr = "import Qt 4.7\nTextEdit {  textMargin: " + QString::number(i) + "; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  textMargin: " + QString::number(i) + "; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -584,7 +584,7 @@ void tst_qdeclarativetextedit::textMargin()
 void tst_qdeclarativetextedit::persistentSelection()
 {
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  persistentSelection: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  persistentSelection: true; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -593,7 +593,7 @@ void tst_qdeclarativetextedit::persistentSelection()
     }
 
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  persistentSelection: false; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  persistentSelection: false; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -605,7 +605,7 @@ void tst_qdeclarativetextedit::persistentSelection()
 void tst_qdeclarativetextedit::focusOnPress()
 {
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  activeFocusOnPress: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  activeFocusOnPress: true; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -614,7 +614,7 @@ void tst_qdeclarativetextedit::focusOnPress()
     }
 
     {
-        QString componentStr = "import Qt 4.7\nTextEdit {  activeFocusOnPress: false; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextEdit {  activeFocusOnPress: false; text: \"Hello World\" }";
         QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -626,7 +626,7 @@ void tst_qdeclarativetextedit::focusOnPress()
 void tst_qdeclarativetextedit::selection()
 {
     QString testStr = standard[0];//TODO: What should happen for multiline/rich text?
-    QString componentStr = "import Qt 4.7\nTextEdit {  text: \""+ testStr +"\"; }";
+    QString componentStr = "import QtQuick 1.0\nTextEdit {  text: \""+ testStr +"\"; }";
     QDeclarativeComponent texteditComponent(&engine);
     texteditComponent.setData(componentStr.toLatin1(), QUrl());
     QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
@@ -866,7 +866,7 @@ void tst_qdeclarativetextedit::copyAndPaste() {
     }
 #endif
 
-    QString componentStr = "import Qt 4.7\nTextEdit { text: \"Hello world!\" }";
+    QString componentStr = "import QtQuick 1.0\nTextEdit { text: \"Hello world!\" }";
     QDeclarativeComponent textEditComponent(&engine);
     textEditComponent.setData(componentStr.toLatin1(), QUrl());
     QDeclarativeTextEdit *textEdit = qobject_cast<QDeclarativeTextEdit*>(textEditComponent.create());
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
index f0d1be5..73085c1 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle { width: 300; height: 300; color: "white"
     TextInput {  text: "Hello world!"; id: textInputObject; objectName: "textInputObject"
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/echoMode.qml b/tests/auto/declarative/qdeclarativetextinput/data/echoMode.qml
index 66a2017..0320872 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/echoMode.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/echoMode.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property QtObject myInput: input
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml b/tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml
index a9b50fe..353d0e2 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 400; height: 500;
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment.qml b/tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment.qml
index b97f18e..3114c48 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: top
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/inputmethods.qml b/tests/auto/declarative/qdeclarativetextinput/data/inputmethods.qml
index 405ee22..5063892 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/inputmethods.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/inputmethods.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextInput {
     text: "Hello world!"
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/masks.qml b/tests/auto/declarative/qdeclarativetextinput/data/masks.qml
index 141c243..c75764a 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/masks.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/masks.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextInput{
     focus: true
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml b/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
index c3d5994..95902bb 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextInput{
     focus: true
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
index 58866b7..af1b140 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property variant myInput: input
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/positionAt.qml b/tests/auto/declarative/qdeclarativetextinput/data/positionAt.qml
index 2800351..cbbf33d 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/positionAt.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/positionAt.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 TextInput{
     focus: true
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
index b10ea81..f173649 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     property variant myInput: input
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
index 4b1ba27..e26bcb3 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property variant intInput: intInput
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 7450d35..76e0102 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -144,7 +144,7 @@ void tst_qdeclarativetextinput::text()
 {
     {
         QDeclarativeComponent textinputComponent(&engine);
-        textinputComponent.setData("import Qt 4.7\nTextInput {  text: \"\"  }", QUrl());
+        textinputComponent.setData("import QtQuick 1.0\nTextInput {  text: \"\"  }", QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
@@ -155,7 +155,7 @@ void tst_qdeclarativetextinput::text()
 
     for (int i = 0; i < standard.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextInput { text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput { text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -173,7 +173,7 @@ void tst_qdeclarativetextinput::width()
     // uses Font metrics to find the width for standard
     {
         QDeclarativeComponent textinputComponent(&engine);
-        textinputComponent.setData("import Qt 4.7\nTextInput {  text: \"\" }", QUrl());
+        textinputComponent.setData("import QtQuick 1.0\nTextInput {  text: \"\" }", QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
@@ -188,7 +188,7 @@ void tst_qdeclarativetextinput::width()
         QFontMetricsF fm(f);
         qreal metricWidth = fm.width(standard.at(i));
 
-        QString componentStr = "import Qt 4.7\nTextInput { text: \"" + standard.at(i) + "\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput { text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -205,7 +205,7 @@ void tst_qdeclarativetextinput::font()
 {
     //test size, then bold, then italic, then family
     { 
-        QString componentStr = "import Qt 4.7\nTextInput {  font.pointSize: 40; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  font.pointSize: 40; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -219,7 +219,7 @@ void tst_qdeclarativetextinput::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nTextInput {  font.bold: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  font.bold: true; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -232,7 +232,7 @@ void tst_qdeclarativetextinput::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nTextInput {  font.italic: true; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  font.italic: true; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -245,7 +245,7 @@ void tst_qdeclarativetextinput::font()
     }
  
     { 
-        QString componentStr = "import Qt 4.7\nTextInput {  font.family: \"Helvetica\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  font.family: \"Helvetica\"; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -259,7 +259,7 @@ void tst_qdeclarativetextinput::font()
     }
 
     { 
-        QString componentStr = "import Qt 4.7\nTextInput {  font.family: \"\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  font.family: \"\"; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -276,7 +276,7 @@ void tst_qdeclarativetextinput::color()
     //test color
     for (int i = 0; i < colorStrings.size(); i++)
     { 
-        QString componentStr = "import Qt 4.7\nTextInput {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -289,7 +289,7 @@ void tst_qdeclarativetextinput::color()
     //test selection color
     for (int i = 0; i < colorStrings.size(); i++)
     {
-        QString componentStr = "import Qt 4.7\nTextInput {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -302,7 +302,7 @@ void tst_qdeclarativetextinput::color()
     //test selected text color
     for (int i = 0; i < colorStrings.size(); i++)
     { 
-        QString componentStr = "import Qt 4.7\nTextInput {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -317,7 +317,7 @@ void tst_qdeclarativetextinput::color()
         QColor testColor("#001234");
         testColor.setAlpha(170);
 
-        QString componentStr = "import Qt 4.7\nTextInput {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
+        QString componentStr = "import QtQuick 1.0\nTextInput {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
         QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
         QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -332,7 +332,7 @@ void tst_qdeclarativetextinput::color()
 void tst_qdeclarativetextinput::selection()
 {
     QString testStr = standard[0];
-    QString componentStr = "import Qt 4.7\nTextInput {  text: \""+ testStr +"\"; }";
+    QString componentStr = "import QtQuick 1.0\nTextInput {  text: \""+ testStr +"\"; }";
     QDeclarativeComponent textinputComponent(&engine);
     textinputComponent.setData(componentStr.toLatin1(), QUrl());
     QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
@@ -509,7 +509,7 @@ void tst_qdeclarativetextinput::maxLength()
 void tst_qdeclarativetextinput::masks()
 {
     //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit)
-    //QString componentStr = "import Qt 4.7\nTextInput {  inputMask: 'HHHHhhhh'; }";
+    //QString componentStr = "import QtQuick 1.0\nTextInput {  inputMask: 'HHHHhhhh'; }";
     QDeclarativeView *canvas = createView(SRCDIR "/data/masks.qml");
     canvas->show();
     canvas->setFocus();
@@ -713,7 +713,7 @@ void tst_qdeclarativetextinput::copyAndPaste() {
     }
 #endif
 
-    QString componentStr = "import Qt 4.7\nTextInput { text: \"Hello world!\" }";
+    QString componentStr = "import QtQuick 1.0\nTextInput { text: \"Hello world!\" }";
     QDeclarativeComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QDeclarativeTextInput *textInput = qobject_cast<QDeclarativeTextInput*>(textInputComponent.create());
@@ -771,7 +771,7 @@ void tst_qdeclarativetextinput::copyAndPaste() {
 
 void tst_qdeclarativetextinput::passwordCharacter()
 {
-    QString componentStr = "import Qt 4.7\nTextInput { text: \"Hello world!\"; font.family: \"Helvetica\"; echoMode: TextInput.Password }";
+    QString componentStr = "import QtQuick 1.0\nTextInput { text: \"Hello world!\"; font.family: \"Helvetica\"; echoMode: TextInput.Password }";
     QDeclarativeComponent textInputComponent(&engine);
     textInputComponent.setData(componentStr.toLatin1(), QUrl());
     QDeclarativeTextInput *textInput = qobject_cast<QDeclarativeTextInput*>(textInputComponent.create());
diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
index f49cbd0..8c3e618 100644
--- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
+++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
@@ -100,7 +100,7 @@ void tst_qdeclarativetimer::notRepeating()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nTimer { interval: 100; running: true }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nTimer { interval: 100; running: true }"), QUrl::fromLocalFile(""));
     QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
     QVERIFY(timer->isRunning());
@@ -121,7 +121,7 @@ void tst_qdeclarativetimer::notRepeatingStart()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nTimer { interval: 100 }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nTimer { interval: 100 }"), QUrl::fromLocalFile(""));
     QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
     QVERIFY(!timer->isRunning());
@@ -146,7 +146,7 @@ void tst_qdeclarativetimer::repeat()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nTimer { interval: 100; repeat: true; running: true }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nTimer { interval: 100; repeat: true; running: true }"), QUrl::fromLocalFile(""));
     QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
@@ -188,7 +188,7 @@ void tst_qdeclarativetimer::triggeredOnStart()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nTimer { interval: 100; running: true; triggeredOnStart: true }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nTimer { interval: 100; running: true; triggeredOnStart: true }"), QUrl::fromLocalFile(""));
     QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
     QVERIFY(timer->triggeredOnStart());
@@ -223,7 +223,7 @@ void tst_qdeclarativetimer::triggeredOnStartRepeat()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nTimer { interval: 100; running: true; triggeredOnStart: true; repeat: true }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nTimer { interval: 100; running: true; triggeredOnStart: true; repeat: true }"), QUrl::fromLocalFile(""));
     QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
@@ -247,7 +247,7 @@ void tst_qdeclarativetimer::noTriggerIfNotRunning()
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
     component.setData(QByteArray(
-        "import Qt 4.7\n"
+        "import QtQuick 1.0\n"
         "Item { property bool ok: true\n"
             "Timer { id: t1; interval: 100; repeat: true; running: true; onTriggered: if (!running) ok=false }"
             "Timer { interval: 10; running: true; onTriggered: t1.running=false }"
@@ -265,7 +265,7 @@ void tst_qdeclarativetimer::changeDuration()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nTimer { interval: 200; repeat: true; running: true }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nTimer { interval: 200; repeat: true; running: true }"), QUrl::fromLocalFile(""));
     QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
@@ -301,7 +301,7 @@ void tst_qdeclarativetimer::restart()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nTimer { interval: 500; repeat: true; running: true }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nTimer { interval: 500; repeat: true; running: true }"), QUrl::fromLocalFile(""));
     QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
@@ -328,7 +328,7 @@ void tst_qdeclarativetimer::parentProperty()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nItem { Timer { objectName: \"timer\"; running: parent.visible } }"), QUrl::fromLocalFile(""));
+    component.setData(QByteArray("import QtQuick 1.0\nItem { Timer { objectName: \"timer\"; running: parent.visible } }"), QUrl::fromLocalFile(""));
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item != 0);
     QDeclarativeTimer *timer = item->findChild<QDeclarativeTimer*>("timer");
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml
index 52591b1..e2e6962 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml
index 35005fe..0e09ff9 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml
index 4ae45a4..1f6646e 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
index 69b5bfd..391caba 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 import "deletedObject.js" as JS
 
 MyTypeObject {
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.3.qml
index b6767b0..082aed1 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.3.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.3.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyTypeObject {
     font.capitalization: Font.AllUppercase
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.4.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.4.qml
index 4227ebf..e5d9ab2 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.4.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.4.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7 as MyQt
+import QtQuick 1.0 as MyQt
 
 MyTypeObject {
     font.capitalization: MyQt.Font.AllUppercase
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.5.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.5.qml
index a66e9d6..8ec508c 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.5.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.5.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7 as MyQt
+import QtQuick 1.0 as MyQt
 
 MyTypeObject {
     MyQt.Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.5.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.5.qml
index cc51c31..2fdfddb 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.5.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Test 1.0
 
 Item {
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml
index 0615300..f1c1855 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyTypeObject {
     property bool test1: false;
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
index e962ab0..9299c8b 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Test 1.0
 
 MyTypeObject {
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_writeerror4.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_writeerror4.qml
index 045fc51..fc41ecf 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_writeerror4.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_writeerror4.qml
@@ -1,5 +1,5 @@
 import Test 1.0
-import Qt 4.7
+import QtQuick 1.0
 
 MyTypeObject {
     Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/varAssignment.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/varAssignment.qml
index e4715ab..ff80ff8 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/varAssignment.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/varAssignment.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int x;
diff --git a/tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml b/tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml
index 27c8454..e5501a1 100644
--- a/tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml
+++ b/tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Item {
     width: 200
     height: 200
diff --git a/tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml b/tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml
index 964810c..f270908 100644
--- a/tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml
+++ b/tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 QGraphicsWidget {
     width: 200
     height: 200
diff --git a/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml
index 57db82d..fb34312 100644
--- a/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml
+++ b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Rectangle {
     color: "black"
     width: (runtime.orientation == Orientation.Landscape || runtime.orientation == Orientation.LandscapeInverted) ? 300 : 200
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/data/datalist.qml b/tests/auto/declarative/qdeclarativevisualdatamodel/data/datalist.qml
index c5e945a..ebf1eea 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/data/datalist.qml
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/datalist.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 100
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml b/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml
index d030222..4134259 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 100
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole1.qml b/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole1.qml
index 7ea74f2..d72e128 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole1.qml
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 100
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole2.qml b/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole2.qml
index 6654d6b..b9e666c 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole2.qml
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 ListView {
     width: 100
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/data/visualdatamodel.qml b/tests/auto/declarative/qdeclarativevisualdatamodel/data/visualdatamodel.qml
index d70f82b..a5c44d0 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/data/visualdatamodel.qml
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/visualdatamodel.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 VisualDataModel {
     function setRoot() {
diff --git a/tests/auto/declarative/qdeclarativewebview/data/basic.qml b/tests/auto/declarative/qdeclarativewebview/data/basic.qml
index ff5d3fd..73330cd 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/basic.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/basic.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qdeclarativewebview/data/elements.qml b/tests/auto/declarative/qdeclarativewebview/data/elements.qml
index 3adfff8..b86dd9d 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/elements.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/elements.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml b/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
index 9f07a51..527e3b9 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qdeclarativewebview/data/loadError.qml b/tests/auto/declarative/qdeclarativewebview/data/loadError.qml
index a0cc4c8..baab1a0 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/loadError.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/loadError.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml b/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
index e5967b5..e66631d 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
@@ -1,6 +1,6 @@
 // Demonstrates opening new WebViews from HTML
 
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 Grid {
diff --git a/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
index 569f4a5..db06887 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 Item {
diff --git a/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml b/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
index 1edd436..7889704 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import QtWebKit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
index 2bded6b..1f460a3 100644
--- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -454,7 +454,7 @@ void tst_qdeclarativewebview::newWindowComponent()
     QTRY_COMPARE(wv->property("progress").toDouble(), 1.0);
 
     QDeclarativeComponent substituteComponent(&engine);
-    substituteComponent.setData("import Qt 4.7; WebView { objectName: 'newWebView'; url: 'basic.html'; }", QUrl::fromLocalFile(""));
+    substituteComponent.setData("import QtQuick 1.0; WebView { objectName: 'newWebView'; url: 'basic.html'; }", QUrl::fromLocalFile(""));
     QSignalSpy newWindowComponentSpy(wv, SIGNAL(newWindowComponentChanged()));
 
     wv->setProperty("newWindowComponent", QVariant::fromValue(&substituteComponent));
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml
index e06afa2..b419c83 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 WorkerScript {
     id: worker
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
index 1a20098..0c439c4 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 BaseWorker {
     source: "script.js"
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml
index 3b720ef..a8800ad 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 BaseWorker {
     source: "script_pragma.js"
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
index 24e4071..0196586 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string urlDummy
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
index e78ce63..aeea278 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url: "testdocument.html"
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
index 79d1355..fffc3d9 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url: "testdocument.html"
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
index 81d8e1d..5d5dd12 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool xmlTest: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
index cee07d6..ec6902d 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: obj
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
index 49bfebd..be60664 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool xmlTest: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
index ab033a5..0050f91 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool calledAsConstructor
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
index d66f283..77b2b94 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int readyState
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
index 1df43ef..faf3af0 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool xmlTest: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
index 827ff3f..0f32a64 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int index_size_err: DOMException.INDEX_SIZE_ERR
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
index e7a3fb4..daec950 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool xmlTest: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
index 157ae81..686e7e5 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
index 7008224..e8b7b77 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool exceptionThrown: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
index ff58710..1d4883e 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
index d6256ed..360286d 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
index 0f3cdef..f37545e 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
index a7a8bba..61ce9c6 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool exceptionThrown: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
index fc0f757..7cd91a2 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
index c5507a8..983ea1b 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
index d3cc845..79e06d4 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int unsent
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
index 8c603a4..68f22f5 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
@@ -1,4 +1,4 @@
-import Qt 4.7 
+import QtQuick 1.0 
 
 QtObject {
     property bool onreadystatechange: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
index 24bde60..4bb5b1d 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
index 86a6ac9..da6eb14 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool exceptionThrown: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
index 198219c..f003292 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool exceptionThrown: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
index dacc484..b87823d 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool exceptionThrown: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
index d38380b..9f8f309 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool exceptionThrown: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
index 2c072e4..2bec344 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
index 825ad60..70f2fa6 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
index cb8f869..f009ab7 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
index f895a8c..86337c4 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
index 268966e..cd125ad 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
index 22a9b96..da229f6 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
index d754921..393ff09 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool xmlNull: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
index 8f69a94..fd1c424 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool dataOK: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
index 7ab53d3..3dd851e 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
index 3a48e28..fb18936 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
index c68b821..9f2383e 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
index 8fee2cd..410820e 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
index ea214fa..f56c51b 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
index 524622c..d44864c 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
index a4828cd..427d9f4 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
index a1f46e2..c98555c 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string reqType
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
index 0efa40a..badd729 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
index b252f4a..5afab09 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
index e83cb72..4558f0e 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool exceptionThrown: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
index 3f9041c..b15318c 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
index b15b404..3b9a91e 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
index aadc580..327fa7f 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool test: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
index 97d42ac..bc22d87 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int unsent: XMLHttpRequest.UNSENT
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
index e28add2..7aa0874 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
index a44c6ba..d42e0cc 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property string url
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
index 63bfb08..e8c8731 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool xmlTest: false
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml
index 85bff29..0f9da30 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property bool dataOK: false
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
index 8354193..fdacb6c 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     source: "model.xml"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
index 09077b6..e56aafa 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     source: "model.xml"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml
index b014aa3..ed674ce 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     source: "model.xml"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
index 59b8ddc..6345101 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     source: "recipes.xml"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
index a905963..a0d846f 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     source: "model.xml"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
index eaf5f0a..d90cd61 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     query: "/data/item"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
index 3aa7b1f3..dab8ffa 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 XmlListModel {
     source: "model.xml"
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/basic1.qml
index c67aaaa..d55c997 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/basic2.qml
index 73c1b9a..31c802d 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/basic3.qml
index 44f74a5..be39ca1 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/basic4.qml
index e5d097b..906af63 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/ListView/itemlist.qml b/tests/auto/declarative/qmlvisual/ListView/itemlist.qml
index 2a00397..7e5d634 100644
--- a/tests/auto/declarative/qmlvisual/ListView/itemlist.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/itemlist.qml
@@ -1,7 +1,7 @@
 // This example demonstrates placing items in a view using
 // a VisualItemModel
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightgray"
diff --git a/tests/auto/declarative/qmlvisual/ListView/listview.qml b/tests/auto/declarative/qmlvisual/ListView/listview.qml
index 6e0b47a..341311d 100644
--- a/tests/auto/declarative/qmlvisual/ListView/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/listview.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 600; height: 300; color: "white"
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
index 9db0f0d..99379f1 100644
--- a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: root
diff --git a/tests/auto/declarative/qmlvisual/animation/bindinganimation/bindinganimation.qml b/tests/auto/declarative/qmlvisual/animation/bindinganimation/bindinganimation.qml
index 406e10b..611eaf5 100644
--- a/tests/auto/declarative/qmlvisual/animation/bindinganimation/bindinganimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/bindinganimation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/colorAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/colorAnimation/colorAnimation-visual.qml
index 49730fc..235ad9d 100644
--- a/tests/auto/declarative/qmlvisual/animation/colorAnimation/colorAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/colorAnimation-visual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: mainrect
diff --git a/tests/auto/declarative/qmlvisual/animation/easing/easing.qml b/tests/auto/declarative/qmlvisual/animation/easing/easing.qml
index d42f069..35b568a 100644
--- a/tests/auto/declarative/qmlvisual/animation/easing/easing.qml
+++ b/tests/auto/declarative/qmlvisual/animation/easing/easing.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: item
diff --git a/tests/auto/declarative/qmlvisual/animation/loop/loop.qml b/tests/auto/declarative/qmlvisual/animation/loop/loop.qml
index 78fbc68..6f62582 100644
--- a/tests/auto/declarative/qmlvisual/animation/loop/loop.qml
+++ b/tests/auto/declarative/qmlvisual/animation/loop/loop.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: wrapper
diff --git a/tests/auto/declarative/qmlvisual/animation/parallelAnimation/parallelAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/parallelAnimation-visual.qml
index 7e0374c..9a75763 100644
--- a/tests/auto/declarative/qmlvisual/animation/parallelAnimation/parallelAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/parallelAnimation-visual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
     This test verifies that a single animation animating two properties is visually the same as two
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
index b30281d..42cec3a 100644
--- a/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
 This test shows a green rectangle moving and growing from the upper-left corner
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/parentAnimation2.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/parentAnimation2.qml
index dfab108..f497943 100644
--- a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/parentAnimation2.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/parentAnimation2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
 Blue rect fills (with 10px margin) screen, then red, then green, then screen again.
diff --git a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
index cc9a639..1b315b2 100644
--- a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
 This test shows a bouncing logo.
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml
index 89c2c5b..6c3e52d 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
 This test starts with a red rectangle at 0,0. It should animate a color change to blue,
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml b/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
index f1a3ef7..9ccebfa 100644
--- a/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml b/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml
index 8f388bc..93ecd2e 100644
--- a/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 300
diff --git a/tests/auto/declarative/qmlvisual/animation/reanchor/reanchor.qml b/tests/auto/declarative/qmlvisual/animation/reanchor/reanchor.qml
index 7a10db1..e0a5a6d 100644
--- a/tests/auto/declarative/qmlvisual/animation/reanchor/reanchor.qml
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/reanchor.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: container
diff --git a/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml
index 5008356..1427c9d 100644
--- a/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
 This test starts with a red rectangle at 0,0. It should animate moving 50 pixels right,
diff --git a/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml b/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml
index 817ccc0..2ac98da 100644
--- a/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml
+++ b/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
     This is a static display test of the various Image fill modes. See the png file in the data
diff --git a/tests/auto/declarative/qmlvisual/focusscope/test.qml b/tests/auto/declarative/qmlvisual/focusscope/test.qml
index 24b4b99..6b2ee25 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/test.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qmlvisual/focusscope/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/test2.qml
index 19c8bed..4df75cf 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/test2.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qmlvisual/focusscope/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/test3.qml
index 7535c31..184763a 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/test3.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
index fdb4da3..8c21cee 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated.qml
index 730aeca..fb5cac0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "content"
 
 Rectangle {
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/borders.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/borders.qml
index 8956128..1a8b7a5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/borders.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/borders.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: page
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
index ce0c38c..f4ead54 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property alias horizontalMode: image.horizontalTileMode
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-horizontal.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-horizontal.qml
index 175a891..8aa2389 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-horizontal.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-horizontal.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightSteelBlue"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
index d845353..5f43f95 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "lightSteelBlue"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test-flipable.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test-flipable.qml
index da76ff9..8a178b3 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test-flipable.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test-flipable.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 240
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test_flipable_resize.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test_flipable_resize.qml
index fa68753..8aeb6c8 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test_flipable_resize.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test_flipable_resize.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Item { //realWindow
     width: 370
     height: 480
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
index 1b0bd65..c79e19f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 400; color: "black"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
index 30e2424..811e0e4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 300; height: 400; color: "black"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/drag.qml b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/drag.qml
index 6762645..99c898e 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/drag.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/drag.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
 this test shows a blue box being dragged around -- first roughly tracing the
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml
index e223f5e..70ea78c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 400; height: 480
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-visual.qml b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-visual.qml
index a686188..540866f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-visual.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-visual.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 /*
 This test displays 6 red rects -- 4 in the top row, 2 in the bottom.
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
index 1b64376..b36a220 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Rectangle {
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml
index aed6380..38368d4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 450
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
index e6e1a70..ce516ac 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 450
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
index 5981b12..8da3602 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     width: 400; height: 400;
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
index 91895c2..c318a99 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item{
     width: 200; height: 600
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml
index d17233e..ac0c141 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 240; color: "gray"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml
index 63dba47..720d2e6 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 800; height: 720; color: "gray"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
index c64497a..44c4dcd 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: clock
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
index 05b93df..0097449 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "#ffffff"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
index f04aa66..ec1f8b3 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: s; width: 600; height: 100; color: "lightsteelblue"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
index a4bf452..b96ecb3 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: childrenRect.width
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
index 1058b04..edf0cb5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 500
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
index 2b9c85c..6698421 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 500
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
index e268a60..25db179 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: s; width: 800; height: 1000; color: "lightsteelblue"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
index a883b9c..31b0e69 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: s; width: 800; height: 1000; color: "lightsteelblue"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
index 53538cb..c987568 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id:lineedit
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
index 686dd2c..c0eeb82 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
     Rectangle {
     resources: [
         Component { id: cursorA
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
index 277b9fc..b5bb102 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     Component { id: testableCursor
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
index 47b48d8..4cf7e97 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle{
     width: 600
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
index a1dc5bf..4afe417 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     height:400
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
index e863262..74c16e2 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id:lineedit
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
index 1de2f4f..973462a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
     Rectangle {
     resources: [
         Component { id: cursorA
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
index 5a12e2e..5d11403 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item{
     height: 50; width: 200
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
index 08df173..17e13fd 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item{
     width:600;
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml
index 2465866..318af0f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle{
     width: 600
diff --git a/tests/auto/declarative/qmlvisual/rect/GradientRect.qml b/tests/auto/declarative/qmlvisual/rect/GradientRect.qml
index 0272f84..dea5377 100644
--- a/tests/auto/declarative/qmlvisual/rect/GradientRect.qml
+++ b/tests/auto/declarative/qmlvisual/rect/GradientRect.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: rect
diff --git a/tests/auto/declarative/qmlvisual/rect/MyRect.qml b/tests/auto/declarative/qmlvisual/rect/MyRect.qml
index 7a315e8..a595f7d 100644
--- a/tests/auto/declarative/qmlvisual/rect/MyRect.qml
+++ b/tests/auto/declarative/qmlvisual/rect/MyRect.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: rect
diff --git a/tests/auto/declarative/qmlvisual/rect/rect-painting.qml b/tests/auto/declarative/qmlvisual/rect/rect-painting.qml
index 6abb03d..3c5d90c 100644
--- a/tests/auto/declarative/qmlvisual/rect/rect-painting.qml
+++ b/tests/auto/declarative/qmlvisual/rect/rect-painting.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 900; height: 500
diff --git a/tests/auto/declarative/qmlvisual/repeater/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/basic1.qml
index 3d31324..7f1ba84 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/repeater/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/basic2.qml
index 9cad9eb..b10420c 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/repeater/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/basic3.qml
index 6346412..a296801 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/repeater/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/basic4.qml
index 817d438..fa85835 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic4.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     color: "blue"
diff --git a/tests/auto/declarative/qmlvisual/selftest_noimages/selftest_noimages.qml b/tests/auto/declarative/qmlvisual/selftest_noimages/selftest_noimages.qml
index cd4dab1..3ef2a66 100644
--- a/tests/auto/declarative/qmlvisual/selftest_noimages/selftest_noimages.qml
+++ b/tests/auto/declarative/qmlvisual/selftest_noimages/selftest_noimages.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 Text {
     property string error: "not pressed"
     text: (new Date()).valueOf()
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
index c4a502e..b6280a6 100644
--- a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 // The WebView size is determined by the width, height,
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
index 4a72d7f..bee2618 100644
--- a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 Column {
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
index 4006b47..9e22e20 100644
--- a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 Column {
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
index 2f68f24..68acced 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
index c017cd9..4a0db01 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 Grid {
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
index 4f8d3b2..3d50664 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 Grid {
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
index 42220e4..ae5ddd2 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
index c9e3c02..1617bda 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
index 8174606..e46f726 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 Rectangle {
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
index b2638f9..e9189db 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
index bf7f9ff..52222be 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
index 5b4dd7a..dc973c2 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import org.webkit 1.0
 
 // Note that zooming is better done using zoomFactor and careful
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml b/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml
index 172bd65..768a4e2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml
+++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     function translate() {
diff --git a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml b/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
index 3f43579..b757900 100644
--- a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
+++ b/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/tests/benchmarks/declarative/creation/data/item.qml b/tests/benchmarks/declarative/creation/data/item.qml
index f1a7dbc..a6223d0 100644
--- a/tests/benchmarks/declarative/creation/data/item.qml
+++ b/tests/benchmarks/declarative/creation/data/item.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Item {}
diff --git a/tests/benchmarks/declarative/creation/data/qobject.qml b/tests/benchmarks/declarative/creation/data/qobject.qml
index bc6b152..33aeb57 100644
--- a/tests/benchmarks/declarative/creation/data/qobject.qml
+++ b/tests/benchmarks/declarative/creation/data/qobject.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
 }
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 94a67fd..6bf7943 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -130,7 +130,7 @@ void tst_creation::qobject_cpp()
 void tst_creation::qobject_qml()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nQtObject {}", QUrl());
+    component.setData("import QtQuick 1.0\nQtObject {}", QUrl());
     QObject *obj = component.create();
     delete obj;
 
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
index df0d5b2..e484ef7 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
@@ -39,6 +39,6 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {}
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
index 399aa78..3ce3296 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     id: blah
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
index 4b1d81c..073ed90 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Item { id:block
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
index 5d67d25..6cf304c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
index a22ba25..c4fc05c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property int a
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
index 8c2f46b..90145e8 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
@@ -39,6 +39,6 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {}
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
index 45748f5..29dfbe5 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     property int blah
diff --git a/tests/benchmarks/declarative/qmltime/example.qml b/tests/benchmarks/declarative/qmltime/example.qml
index dca1429..4b6de1d 100644
--- a/tests/benchmarks/declarative/qmltime/example.qml
+++ b/tests/benchmarks/declarative/qmltime/example.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
index 6d8be03..f9418f8 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
index 5371c3d..ef6839f 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
index bb43dc6..b719001 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
index 11bb6ba..d109313 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
index d40627f..6c055dc 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
index 0499201..eed5339 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
index 9064bc2..cc27f04 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
index d27b2b6..7f8909d 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
index 0867d0b..05e287b 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
index 416e0ea..7199a50 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     Rectangle {}
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
index f610eb0..a668423 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
index 334e1b4..7070d91 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
index 507ed34..7bf14de 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
index 1092a9f..2b95d60 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
index a125c54..417ec94 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
index 18c8fb4..3e9a076 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
index 2668c4c..d87aa32 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
index 424f768..dc2fcb4 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
index f803b82..3adefbc 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import QmlTime 1.0 as QmlTime
 
 Item {
diff --git a/tests/benchmarks/declarative/script/data/CustomObject.qml b/tests/benchmarks/declarative/script/data/CustomObject.qml
index 1656453..97f6d39 100644
--- a/tests/benchmarks/declarative/script/data/CustomObject.qml
+++ b/tests/benchmarks/declarative/script/data/CustomObject.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 QtObject {
     property real prop1: 0
diff --git a/tests/benchmarks/declarative/script/data/block.qml b/tests/benchmarks/declarative/script/data/block.qml
index f7b2ab3..4575050 100644
--- a/tests/benchmarks/declarative/script/data/block.qml
+++ b/tests/benchmarks/declarative/script/data/block.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 200; height: 200
diff --git a/tests/benchmarks/declarative/script/data/global_prop.qml b/tests/benchmarks/declarative/script/data/global_prop.qml
index 4fb7ee7..29bbb7d 100644
--- a/tests/benchmarks/declarative/script/data/global_prop.qml
+++ b/tests/benchmarks/declarative/script/data/global_prop.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import "global.js" as Program
 
 Rectangle {
diff --git a/tools/qml/browser/Browser.qml b/tools/qml/browser/Browser.qml
index ff2bb47..45fe84c 100644
--- a/tools/qml/browser/Browser.qml
+++ b/tools/qml/browser/Browser.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.folderlistmodel 1.0
 
 Rectangle {
diff --git a/tools/qml/startup/Logo.qml b/tools/qml/startup/Logo.qml
index 8d9708d..aa5648f 100644
--- a/tools/qml/startup/Logo.qml
+++ b/tools/qml/startup/Logo.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myApp
diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml
index ddc7217..9ca50a3 100644
--- a/tools/qml/startup/startup.qml
+++ b/tools/qml/startup/startup.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: treatsApp
-- 
cgit v0.12


From c2c367ebeb039c42cb4fec50b2b6495624837978 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 29 Sep 2010 12:14:44 +1000
Subject: Add test for Qt 4.7 module

Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 6f35701275ab0cd80daec45b3407725b10571693)
---
 tests/auto/declarative/declarative.pro             |  3 +-
 .../declarative/moduleqt47/data/importqt47.qml     | 80 ++++++++++++++++++++++
 tests/auto/declarative/moduleqt47/moduleqt47.pro   | 16 +++++
 .../auto/declarative/moduleqt47/tst_moduleqt47.cpp | 79 +++++++++++++++++++++
 .../tst_qdeclarativelanguage.cpp                   |  6 ++
 5 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/moduleqt47/data/importqt47.qml
 create mode 100644 tests/auto/declarative/moduleqt47/moduleqt47.pro
 create mode 100644 tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index a7fb3b8..f0fcfa9 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -69,7 +69,8 @@ SUBDIRS += \
            qdeclarativexmlhttprequest \
            qdeclarativexmllistmodel \
            qmlvisual \
-           qpacketprotocol
+           qpacketprotocol \
+           moduleqt47
 
 contains(QT_CONFIG, webkit) {
     SUBDIRS += \
diff --git a/tests/auto/declarative/moduleqt47/data/importqt47.qml b/tests/auto/declarative/moduleqt47/data/importqt47.qml
new file mode 100644
index 0000000..0a1b533
--- /dev/null
+++ b/tests/auto/declarative/moduleqt47/data/importqt47.qml
@@ -0,0 +1,80 @@
+import Qt 4.7
+
+Item {
+    QtObject {}
+
+    Component { Item {} }
+
+    // Util
+    states: [
+        State {
+            name: "bob"
+            AnchorChanges {}
+            ParentChange {}
+            StateChangeScript {}
+            PropertyChanges {}
+        }
+    ]
+    transitions: [
+        Transition {
+            AnchorAnimation {}
+            ColorAnimation {}
+            SmoothedAnimation {}
+            NumberAnimation {}
+            ParallelAnimation {}
+            ParentAnimation {}
+            PauseAnimation {}
+            PropertyAnimation {}
+            RotationAnimation {}
+            ScriptAction {}
+            SequentialAnimation {}
+            SpringAnimation {}
+            Vector3dAnimation {}
+        }
+    ]
+
+    Behavior on x {}
+    Binding {}
+    Connections {}
+    FontLoader {}
+    ListModel { ListElement {} }
+    SystemPalette {}
+    Timer {}
+
+    // graphic items
+    BorderImage {}
+    Column {}
+    MouseArea {}
+    Flickable {}
+    Flipable {}
+    Flow {}
+    FocusPanel {}
+    FocusScope {}
+    Rectangle { gradient: Gradient { GradientStop {} } }
+    Grid {}
+    GridView {}
+    Image {}
+    ListView {}
+    Loader {}
+    PathView {
+        path: Path {
+            PathLine {}
+            PathCubic {}
+            PathPercent {}
+            PathQuad {}
+            PathAttribute {}
+        }
+    }
+    Repeater {}
+    Rotation {}
+    Row {}
+    Translate {}
+    Scale {}
+    Text {}
+    TextEdit {}
+    TextInput {}
+    VisualItemModel {}
+    VisualDataModel {}
+
+    Keys.onPressed: console.log("Press")
+}
diff --git a/tests/auto/declarative/moduleqt47/moduleqt47.pro b/tests/auto/declarative/moduleqt47/moduleqt47.pro
new file mode 100644
index 0000000..4ee634e
--- /dev/null
+++ b/tests/auto/declarative/moduleqt47/moduleqt47.pro
@@ -0,0 +1,16 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_moduleqt47.cpp
+
+symbian: {
+    importFiles.sources = data
+    importFiles.path = .
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+CONFIG += parallel_test
+
diff --git a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
new file mode 100644
index 0000000..c1896a7
--- /dev/null
+++ b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+#define SRCDIR "."
+#endif
+
+class tst_moduleqt47 : public QObject
+{
+    Q_OBJECT
+public:
+    tst_moduleqt47();
+
+private slots:
+    void create();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_moduleqt47::tst_moduleqt47()
+{
+}
+
+void tst_moduleqt47::create()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/importqt47.qml"));
+    QObject *obj = qobject_cast<QObject*>(c.create());
+
+    QVERIFY(obj != 0);
+    delete obj;
+}
+
+QTEST_MAIN(tst_moduleqt47)
+
+#include "tst_moduleqt47.moc"
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index f811555..c6b2302 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -1715,6 +1715,9 @@ void tst_qdeclarativelanguage::initTestCase()
 {
     registerTypes();
 
+    // Registering the TestType class in other modules should have no adverse effects
+    qmlRegisterType<TestType>("com.nokia.TestPre", 1, 0, "Test");
+
     qmlRegisterType<TestType>("com.nokia.Test", 0, 0, "TestTP");
     qmlRegisterType<TestType>("com.nokia.Test", 1, 0, "Test");
     qmlRegisterType<TestType>("com.nokia.Test", 1, 5, "Test");
@@ -1722,6 +1725,9 @@ void tst_qdeclarativelanguage::initTestCase()
     qmlRegisterType<TestType>("com.nokia.Test", 1, 9, "OldTest");
     qmlRegisterType<TestType2>("com.nokia.Test", 1, 12, "Test");
 
+    // Registering the TestType class in other modules should have no adverse effects
+    qmlRegisterType<TestType>("com.nokia.TestPost", 1, 0, "Test");
+
     // Create locale-specific file
     // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
     // For iso8859-1 locale, this will just be data/I18nType?????.qml where ????? is 5 8-bit characters
-- 
cgit v0.12


From 6fd7f7933f12414979b19e34bad1bf17c4b6e2bf Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 29 Sep 2010 12:19:37 +1000
Subject: Replace "import Qt 4.7" with "import QtQuick 1.0"

Task-number: QTBUG-13799
(cherry picked from commit 1f43e68c4ca5b28444b046deff1658b1b4b1923d)
---
 tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml b/tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml
index ab7fa84..35c1a9a 100644
--- a/tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: wrapper
-- 
cgit v0.12


From 75c41435a05b383ca96647ae45df9ceca3fa3852 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 29 Sep 2010 13:48:42 +1000
Subject: Document "import QtQuick 1.0" change

Task-number: QTBUG-13799
(cherry picked from commit 1ab457d5db184c53d9857a7b425051e5aa5ff2e0)
---
 doc/src/declarative/declarativeui.qdoc |  1 +
 doc/src/declarative/whatsnew.qdoc      | 55 ++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 doc/src/declarative/whatsnew.qdoc

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index cb326a3..a8df4b1 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -73,6 +73,7 @@ Module.
 \section1 Getting Started
 
 \list
+\o \l{What's new in Qt Quick}
 \o \l{Introduction to the QML language}
 \o \l{QML for Qt Programmers}
 \o \l{Getting Started Programming with QML}
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
new file mode 100644
index 0000000..f8d1d0e
--- /dev/null
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\title What's new in Qt Quick
+\page qtquick-whatsnew.html
+
+\section1 4.7.1
+
+\section2 QtQuick namespace
+
+In prior Qt releases, all the Qt Quick elements were available in the \e Qt namespace.  
+Starting with Qt 4.7.1, the elements are also available in the \e QtQuick namespace, 
+which improves naming consistency, and allows the development of Qt Quick to occur at 
+a faster rate than Qt's usual minor release schedule.
+
+The change for developers is very simple - where you previously wrote \e {import Qt 4.7},
+just replace it with \e {import QtQuick 1.0}, like this:
+
+\code
+import QtQuick 1.0 
+
+Text {
+    text: "Welcome to QtQuick 1.0!"
+}
+\endcode
+
+\e {import Qt 4.7} continues to work so existing applications wont break even if they 
+aren't updated, but it is recommended that all import statements be modified to the new 
+form.
+*/
-- 
cgit v0.12


From c39da05c8d8b97141bf03507f6d0412e6371863c Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 29 Sep 2010 14:16:27 +1000
Subject: Autotest that new "import Qt 4.7"s aren't added accidentally

Task-number: QTBUG-13799
(cherry picked from commit f7a439a0a00b0bdd6ebeff8bfd5ee2285eab1398)
---
 .../auto/declarative/moduleqt47/tst_moduleqt47.cpp | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
index c1896a7..feae417 100644
--- a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
+++ b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <qtest.h>
+#include <QDir>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 
@@ -56,12 +57,20 @@ public:
 private slots:
     void create();
 
+    void accidentalImport_data();
+    void accidentalImport();
+
 private:
+    QStringList findFiles(const QDir &d);
+
     QDeclarativeEngine engine;
+    QStringList excludedFiles;
 };
 
 tst_moduleqt47::tst_moduleqt47()
 {
+    excludedFiles << "tests/auto/declarative/moduleqt47/data/importqt47.qml"
+                  << "doc/src/declarative/whatsnew.qdoc";
 }
 
 void tst_moduleqt47::create()
@@ -74,6 +83,54 @@ void tst_moduleqt47::create()
     delete obj;
 }
 
+QStringList tst_moduleqt47::findFiles(const QDir &d)
+{
+    QStringList rv;
+
+    QStringList files = d.entryList(QStringList() << QLatin1String("*.qml") << QLatin1String("*.qdoc"), QDir::Files);
+    foreach (const QString &file, files) {
+
+        QString absFile = d.absoluteFilePath(file);
+
+        bool skip = false;
+        for (int ii = 0; !skip && ii < excludedFiles.count(); ++ii) 
+            skip = (absFile.endsWith(excludedFiles.at(ii)));
+
+        if (!skip)
+            rv << absFile;
+    }
+
+    QStringList dirs = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+    foreach (const QString &dir, dirs) {
+        QDir sub = d;
+        sub.cd(dir);
+        rv << findFiles(sub);
+    }
+
+    return rv;
+}
+
+void tst_moduleqt47::accidentalImport_data()
+{
+    QTest::addColumn<QString>("file");
+    QStringList files = findFiles(QDir(SRCDIR "/../../../../"));
+
+    foreach(const QString &file, files) 
+        QTest::newRow(qPrintable(file)) << file;
+}
+
+void tst_moduleqt47::accidentalImport()
+{
+    QFETCH(QString, file);
+
+    QFile f(file);
+    if (!f.open(QIODevice::ReadOnly))
+        return;
+    QByteArray data = f.readAll();
+
+    QVERIFY(!data.contains("import Qt 4"));
+}
+
 QTEST_MAIN(tst_moduleqt47)
 
 #include "tst_moduleqt47.moc"
-- 
cgit v0.12


From 39f6657f74d78e5b856121310cf060a02bc1c352 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Mon, 27 Sep 2010 16:10:52 +0200
Subject: Add export to QDeclarativeBasePositioner

Bauhaus needs this export to manage layouts.
(cherry picked from commit 858469445ceb745c70dad9cd4f913acc34683e15)
---
 src/declarative/graphicsitems/qdeclarativepositioners_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
index f9ecc0a..15b91e5 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 class QDeclarativeBasePositionerPrivate;
 
-class Q_AUTOTEST_EXPORT QDeclarativeBasePositioner : public QDeclarativeItem
+class Q_DECLARATIVE_EXPORT QDeclarativeBasePositioner : public QDeclarativeItem
 {
     Q_OBJECT
 
-- 
cgit v0.12


From 0d31b86d1fd0fdbcc95c80ce91f505a2c8b0bc26 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Thu, 30 Sep 2010 17:23:27 +0200
Subject: Use setParentItem() instead of setParentItemHelper if
 componentComplete is true

This ensures that if the component has already been completed, itemChange()
is called. This is required to modify QDeclarativePositions in the visual
editor, while keeping a legal state. Without this patch notifications are
missing and the Positioner keeps track of already deleted children.
This resulted in a crash.

Reviewed-by: Thomas Hartmann
(cherry picked from commit 1f8bb573f06234a3d13fb57de5eb644824d5024f)
---
 .../graphicsitems/qdeclarativeflickable.cpp        | 24 +++++++++++++++++-----
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 19 +++++++++++++----
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 84b0ccf..29879fe 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1046,10 +1046,16 @@ void QDeclarativeFlickable::cancelFlick()
 void QDeclarativeFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
 {
     QGraphicsObject *i = qobject_cast<QGraphicsObject *>(o);
-    if (i)
-        i->setParentItem(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem);
-    else
+    if (i) {
+        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(i);
+        if (static_cast<QDeclarativeItemPrivate*>(d)->componentComplete) {
+            i->setParentItem(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem);
+        } else {
+            d->setParentItemHelper(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem, 0, 0);
+        }
+    } else {
         o->setParent(prop->object);
+    }
 }
 
 static inline int children_count_helper(QGraphicsObject *object)
@@ -1071,8 +1077,16 @@ static inline void children_clear_helper(QGraphicsObject *object)
 {
     QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
     int childCount = d->children.count();
-    for (int index = 0 ;index < childCount; index++)
-        QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    if (static_cast<QDeclarativeItemPrivate*>(d)->componentComplete) {
+        for (int index = 0 ;index < childCount; index++) {
+            d->children.at(0)->setParentItem(0);
+        }
+    } else {
+        for (int index = 0 ;index < childCount; index++) {
+            QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+        }
+    }
+
 }
 
 int QDeclarativeFlickablePrivate::data_count(QDeclarativeListProperty<QObject> *prop)
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 3c2f0a8..830f8e3 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1614,7 +1614,13 @@ void QDeclarativeItemPrivate::data_append(QDeclarativeListProperty<QObject> *pro
     while (mo && mo != &QGraphicsObject::staticMetaObject) mo = mo->d.superdata;
 
     if (mo) {
-        QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(o))->setParentItemHelper(that, 0, 0);
+        QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(o);
+        QDeclarativeItemPrivate *contentItemPrivate = static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(graphicsObject));
+        if (contentItemPrivate->componentComplete) {
+            graphicsObject->setParentItem(that);
+        } else {
+            contentItemPrivate->setParentItemHelper(that, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+        }
     } else {
         o->setParent(that);
     }
@@ -1637,10 +1643,15 @@ static inline QObject *children_at_helper(QDeclarativeListProperty<QObject> *pro
 
 static inline void children_clear_helper(QDeclarativeListProperty<QObject> *prop)
 {
-    QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(prop->object));
+    QDeclarativeItemPrivate *d = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(prop->object)));
     int childCount = d->children.count();
-    for (int index = 0 ;index < childCount; index++)
-        QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    if (d->componentComplete) {
+        for (int index = 0 ;index < childCount; index++)
+            d->children.at(0)->setParentItem(0);
+    } else {
+        for (int index = 0 ;index < childCount; index++)
+            QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    }
 }
 
 int QDeclarativeItemPrivate::data_count(QDeclarativeListProperty<QObject> *prop)
-- 
cgit v0.12


From 8ece6273489f8fe032ad3da30468ee65fe55573f Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Thu, 30 Sep 2010 16:27:25 +0200
Subject: Add sendParentChangeNotification to QGraphicsItem

Fixes crash in creator. If flag is true notifications are sent. It is important
that positioners work correctly and don't leak.

Reviewed-By: Alexis Menard
(cherry picked from commit 3b43389b78925ce87d660c343c925fa280b91e11)
---
 src/gui/graphicsview/qgraphicsitem.cpp | 16 +++++++++++++---
 src/gui/graphicsview/qgraphicsitem_p.h |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index b404692..3b18c31 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7669,7 +7669,12 @@ void QGraphicsObject::updateMicroFocus()
 
 void QGraphicsItemPrivate::children_append(QDeclarativeListProperty<QGraphicsObject> *list, QGraphicsObject *item)
 {
-    QGraphicsItemPrivate::get(item)->setParentItemHelper(static_cast<QGraphicsObject *>(list->object), /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(list->object);
+    if (QGraphicsItemPrivate::get(graphicsObject)->sendParentChangeNotification) {
+        item->setParentItem(graphicsObject);
+    } else {
+        QGraphicsItemPrivate::get(item)->setParentItemHelper(graphicsObject, 0, 0);
+    }
 }
 
 int QGraphicsItemPrivate::children_count(QDeclarativeListProperty<QGraphicsObject> *list)
@@ -7691,8 +7696,13 @@ void QGraphicsItemPrivate::children_clear(QDeclarativeListProperty<QGraphicsObje
 {
     QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(list->object));
     int childCount = d->children.count();
-    for (int index = 0; index < childCount; index++)
-        QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    if (d->sendParentChangeNotification) {
+        for (int index = 0; index < childCount; index++)
+            d->children.at(0)->setParentItem(0);
+    } else {
+        for (int index = 0; index < childCount; index++)
+            QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, 0, 0);
+    }
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 77e4054..c8a7699 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -238,6 +238,7 @@ public:
         pendingPolish(0),
         mayHaveChildWithGraphicsEffect(0),
         isDeclarativeItem(0),
+        sendParentChangeNotification(0),
         globalStackingOrder(-1),
         q_ptr(0)
     {
@@ -584,7 +585,8 @@ public:
     quint32 pendingPolish : 1;
     quint32 mayHaveChildWithGraphicsEffect : 1;
     quint32 isDeclarativeItem : 1;
-    quint32 padding : 23;
+    quint32 sendParentChangeNotification : 1;
+    quint32 padding : 22;
 
     // Optional stacking order
     int globalStackingOrder;
-- 
cgit v0.12


From ed1d7b364640d5d937a865bffdeb8db3808b86dc Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Wed, 4 Aug 2010 14:15:35 +0200
Subject: Add breakpad support

Breakpad is a portable crash handler. It sends the raw crash
information to a server for analysis. This analysis needs debug
information. Consequently, we compile with debug info even in release
mode if qt-breakpad integration is requested (via an environment
variable).

Reviewed-by: ossi
(cherry picked from commit 1a99cdbb36334e17c34b38dd5df1bdd70167b42a)
---
 mkspecs/common/g++.conf           |  2 +
 mkspecs/common/mac-g++.conf       |  3 ++
 mkspecs/features/default_post.prf | 88 +++++++++++++++++++++++++++++++++++++++
 mkspecs/win32-msvc2003/qmake.conf |  3 ++
 mkspecs/win32-msvc2005/qmake.conf |  3 ++
 mkspecs/win32-msvc2008/qmake.conf |  3 ++
 mkspecs/win32-msvc2010/qmake.conf |  3 ++
 7 files changed, 105 insertions(+)

diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
index d3db24a..0d511fc 100644
--- a/mkspecs/common/g++.conf
+++ b/mkspecs/common/g++.conf
@@ -8,6 +8,7 @@ QMAKE_CFLAGS_DEPS	+= -M
 QMAKE_CFLAGS_WARN_ON	+= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	+= -w
 QMAKE_CFLAGS_RELEASE	+= -O2
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
 QMAKE_CFLAGS_DEBUG	+= -g
 QMAKE_CFLAGS_SHLIB	+= -fPIC
 QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
@@ -22,6 +23,7 @@ QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf
index 446547d..29b7408 100644
--- a/mkspecs/common/mac-g++.conf
+++ b/mkspecs/common/mac-g++.conf
@@ -10,6 +10,7 @@ QMAKE_CFLAGS_DEPS	+= -M
 QMAKE_CFLAGS_WARN_ON	+= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	+= -w
 QMAKE_CFLAGS_RELEASE	+= -O2
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g  -gdwarf-2
 QMAKE_CFLAGS_DEBUG	+= -g
 QMAKE_CFLAGS_SHLIB	+= -fPIC
 QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
@@ -33,6 +34,7 @@ QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
@@ -52,6 +54,7 @@ QMAKE_LINK_C		 = $$QMAKE_CC
 QMAKE_LINK_C_SHLIB	 = $$QMAKE_CC
 QMAKE_LFLAGS		+= -headerpad_max_install_names
 QMAKE_LFLAGS_RELEASE	+=
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
 QMAKE_LFLAGS_DEBUG	+=
 QMAKE_LFLAGS_APP	+=
 QMAKE_LFLAGS_SHLIB	+= -single_module -dynamiclib
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index d844385..59a5e86 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -1,3 +1,15 @@
+QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
+!isEmpty(QT_BREAKPAD_ROOT_PATH): \   # quick test first whether requested ...
+        !staticlib:!static:CONFIG(release, debug|release):contains(TEMPLATE, .*(app|lib)): \   # is it applicable?
+        !contains(TARGET, .*phony_target.*): \   # monster hack, you don't really see this here, right? ;)
+        system($$QT_BREAKPAD_ROOT_PATH/qtbreakpadsymbols --breakpad-exists) {    # do we really have it?
+    CONFIG += breakpad
+    CONFIG -= no_debug_info separate_debug_info
+    QMAKE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+    QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO
+    QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
+}
+
 CONFIG(debug, debug|release):load(debug)
 else:load(release)
 debug_and_release:load(debug_and_release)
@@ -6,6 +18,82 @@ incredibuild_xge {
     CONFIG = incredibuild_xge $$CONFIG
 }
 
+breakpad {
+    !contains(DESTDIR, (/|.:[/\\\\]).*):TARGET_BASEPATH = $${OUT_PWD}/
+    !isEmpty(DESTDIR):TARGET_BASEPATH = $${TARGET_BASEPATH}$${DESTDIR}/
+
+    win32 {
+        TARGET_BASEPATH ~= s,/,\\,
+        contains(TEMPLATE, .*lib) {
+            isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) {
+                TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0)
+                isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT)
+            }
+            TARGET_EXT = .dll
+        } else {
+            TARGET_EXT = .exe
+        }
+
+        DEBUGFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}$${TARGET_EXT}
+        PDBFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}.pdb
+        DEBUGFILENAME ~= s,/,\\,
+        PDBFILENAME ~= s,/,\\,
+        QMAKE_CLEAN += $$PDBFILENAME  # for the debug case it is hardcoded in qmake
+    } else {
+        contains(TEMPLATE, .*lib):LIBPREFIX = lib
+
+        macx {
+            equals(TEMPLATE, lib) {
+                lib_bundle {
+                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
+                } else {
+                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
+                    !plugin {
+                        TEMP_VERSION = $$section(VERSION, ., 0, 0)
+                        isEmpty(TEMP_VERSION):TEMP_VERSION = 1
+                        TARGET_FILENAME = $${TARGET_FILENAME}.$${TEMP_VERSION}
+                    }
+                    TARGET_FILENAME = $${TARGET_FILENAME}.$${QMAKE_EXTENSION_SHLIB}
+                }
+            } else {
+                app_bundle {
+                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
+                } else {
+                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}
+                }
+            }
+            DEBUGFILENAME = $$TARGET_FILENAME
+        } else {
+            equals(TEMPLATE, lib) {
+                plugin {
+                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
+                } else {
+                    TEMP_VERSION = $$VERSION
+                    isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
+                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
+                }
+            } else {
+                TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
+            }
+            DEBUGFILENAME = $$TARGET_BASEPATH
+        }
+    }
+
+    PROJECTPATH = $$OUT_PWD
+    win32:PROJECTPATH ~= s,/,\\,
+
+    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)
+    QMAKE_POST_LINK += $$quote($${QT_BREAKPAD_ROOT_PATH}$${DIR_SEPARATOR}qtbreakpadsymbols \"$$DEBUGFILENAME\" \"$$PROJECTPATH\")
+    !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$quote($$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$QMAKE_STRIP \"$$DEBUGFILENAME\")
+
+    unset(TARGET_BASEPATH)
+    unset(TARGET_FILENAME)
+    unset(SYMBOLFILENAME)
+    unset(TARGET_EXT)
+    unset(TARGET_VERSION_EXT)
+    unset(TEMP_VERSION)
+}
+
 QMAKE_INCDIR += $$QMAKE_INCDIR_POST
 QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
 
diff --git a/mkspecs/win32-msvc2003/qmake.conf b/mkspecs/win32-msvc2003/qmake.conf
index 0230b30..63d1ffd 100644
--- a/mkspecs/win32-msvc2003/qmake.conf
+++ b/mkspecs/win32-msvc2003/qmake.conf
@@ -20,6 +20,7 @@ QMAKE_CFLAGS            = -nologo -Zm300
 QMAKE_CFLAGS_WARN_ON    = -W3
 QMAKE_CFLAGS_WARN_OFF   = -W0
 QMAKE_CFLAGS_RELEASE    = -O2 -MD
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 
@@ -28,6 +29,7 @@ QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189
 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_STL_ON   = -EHsc
@@ -51,6 +53,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 0406fd0..265d028 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -20,6 +20,7 @@ QMAKE_CFLAGS            = -nologo -Zm200 -Zc:wchar_t-
 QMAKE_CFLAGS_WARN_ON    = -W3
 QMAKE_CFLAGS_WARN_OFF   = -W0
 QMAKE_CFLAGS_RELEASE    = -O2 -MD
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
@@ -29,6 +30,7 @@ QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189
 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_LTCG     = $$QMAKE_CFLAGS_LTCG
@@ -53,6 +55,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 9a69aaa..1432645 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -20,6 +20,7 @@ QMAKE_CFLAGS            = -nologo -Zm200 -Zc:wchar_t-
 QMAKE_CFLAGS_WARN_ON    = -W3
 QMAKE_CFLAGS_WARN_OFF   = -W0
 QMAKE_CFLAGS_RELEASE    = -O2 -MD
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
@@ -30,6 +31,7 @@ QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189
 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_LTCG     = $$QMAKE_CFLAGS_LTCG
@@ -55,6 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 8331c14..84086e2 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -20,6 +20,7 @@ QMAKE_CFLAGS            = -nologo -Zm200 -Zc:wchar_t-
 QMAKE_CFLAGS_WARN_ON    = -W3
 QMAKE_CFLAGS_WARN_OFF   = -W0
 QMAKE_CFLAGS_RELEASE    = -O2 -MD
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
@@ -30,6 +31,7 @@ QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189
 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_LTCG     = $$QMAKE_CFLAGS_LTCG
@@ -55,6 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
-- 
cgit v0.12


From c0a6aede4d259ac6c998fb3067b09a80f037483e Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Wed, 22 Sep 2010 19:58:18 +0200
Subject: Qmake: Fix wrong path in the breakpad post link step

Reviewed-By: Oswald Buddenhagen
(cherry picked from commit 7412ac5b38d83b627a372a525f271c225f9c1f70)
---
 mkspecs/features/default_post.prf | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 59a5e86..09c6587 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -45,32 +45,32 @@ breakpad {
         macx {
             equals(TEMPLATE, lib) {
                 lib_bundle {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
                 } else {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
                     !plugin {
                         TEMP_VERSION = $$section(VERSION, ., 0, 0)
                         isEmpty(TEMP_VERSION):TEMP_VERSION = 1
-                        TARGET_FILENAME = $${TARGET_FILENAME}.$${TEMP_VERSION}
+                        TARGET_BASEPATH = $${TARGET_BASEPATH}.$${TEMP_VERSION}
                     }
-                    TARGET_FILENAME = $${TARGET_FILENAME}.$${QMAKE_EXTENSION_SHLIB}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}.$${QMAKE_EXTENSION_SHLIB}
                 }
             } else {
                 app_bundle {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
                 } else {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
                 }
             }
-            DEBUGFILENAME = $$TARGET_FILENAME
+            DEBUGFILENAME = $$TARGET_BASEPATH
         } else {
             equals(TEMPLATE, lib) {
                 plugin {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
                 } else {
                     TEMP_VERSION = $$VERSION
                     isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
                 }
             } else {
                 TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
@@ -87,7 +87,6 @@ breakpad {
     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$quote($$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$QMAKE_STRIP \"$$DEBUGFILENAME\")
 
     unset(TARGET_BASEPATH)
-    unset(TARGET_FILENAME)
     unset(SYMBOLFILENAME)
     unset(TARGET_EXT)
     unset(TARGET_VERSION_EXT)
-- 
cgit v0.12


From ac0eeca641214a60b13dcabb8749b92bad155fc8 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 21 Sep 2010 13:00:02 +0200
Subject: Add exports for Bauhaus

The QmlDesigner(Bauhaus) should not rely on -nokia-developer

Reviewed-by: Marco Bubke
(cherry picked from commit 8ad396891f2a4966ad3cf943f99e208211e956bb)
---
 src/declarative/util/qdeclarativeanimation_p.h | 2 +-
 src/declarative/util/qdeclarativetimer_p.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index cdd5041..8cb17e4 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -63,7 +63,7 @@ QT_MODULE(Declarative)
 
 class QDeclarativeAbstractAnimationPrivate;
 class QDeclarativeAnimationGroup;
-class Q_AUTOTEST_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
+class Q_DECLARATIVE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation)
diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h
index 93b0965..08c3d4e 100644
--- a/src/declarative/util/qdeclarativetimer_p.h
+++ b/src/declarative/util/qdeclarativetimer_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeTimerPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus
+class Q_DECLARATIVE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeTimer)
-- 
cgit v0.12


From a506b183332f313a9a197d5fd7359153eb1728c8 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 22 Sep 2010 21:03:57 +0200
Subject: Make QmlDebug protocol more robust

The protocol so far was client->server only. That is, there was no
sane way for a client to check whether a plugin on the server (service)
was available or not. E.g. calling Client::setEnabled(true) 'succeeded',
without a check whether there is actually a service to talk to.

The new protocol replaces this shortcoming by a service discovery
mechanism: Both client & service announce their available plugins at
handshake time, and later on if there are changes. The status is
reflected in Client::status() and Service::Status() , which are either

  NotConnected - no network connection, or not registered properly
  Unavailable - TCP/IP connection works, but no plugin with the same
name on the other side
  Enabled - You can connect to plugin on other side

The status changes happen automatically (no setEnabled() anymore).

Furthermore a version ID was added to the handshake, so that we can
extend the protocol further in the future :)
(cherry picked from commit fd9771c29d401d88779ab7c5d7715c9ca41dd723)
---
 src/declarative/debugger/qdeclarativedebug.cpp     |  56 ++++--
 src/declarative/debugger/qdeclarativedebug_p.h     |   7 +-
 .../debugger/qdeclarativedebugclient.cpp           | 199 +++++++++++++++------
 .../debugger/qdeclarativedebugclient_p.h           |  10 +-
 .../debugger/qdeclarativedebugservice.cpp          | 126 ++++++++++---
 .../debugger/qdeclarativedebugservice_p.h          |   9 +-
 .../debugger/qdeclarativedebugtrace.cpp            |   8 +-
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |   5 +-
 .../tst_qdeclarativedebugclient.cpp                |  60 +++----
 .../tst_qdeclarativedebugservice.cpp               |  41 ++---
 tests/auto/declarative/shared/debugutil.cpp        |  13 +-
 tests/auto/declarative/shared/debugutil_p.h        |   8 +-
 12 files changed, 362 insertions(+), 180 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp
index 1ffe441..7a5e5f6 100644
--- a/src/declarative/debugger/qdeclarativedebug.cpp
+++ b/src/declarative/debugger/qdeclarativedebug.cpp
@@ -55,10 +55,12 @@ public:
     QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client, QDeclarativeEngineDebugPrivate *p);
 
 protected:
+    virtual void statusChanged(Status status);
     virtual void messageReceived(const QByteArray &);
 
 private:
     QDeclarativeEngineDebugPrivate *priv;
+    friend class QDeclarativeEngineDebugPrivate;
 };
 
 class QDeclarativeEngineDebugPrivate : public QObjectPrivate
@@ -66,7 +68,9 @@ class QDeclarativeEngineDebugPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QDeclarativeEngineDebug)
 public:
     QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *);
+    ~QDeclarativeEngineDebugPrivate();
 
+    void statusChanged(QDeclarativeEngineDebug::Status status);
     void message(const QByteArray &);
 
     QDeclarativeEngineDebugClient *client;
@@ -93,12 +97,18 @@ QDeclarativeEngineDebugClient::QDeclarativeEngineDebugClient(QDeclarativeDebugCo
                                            QDeclarativeEngineDebugPrivate *p)
 : QDeclarativeDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p)
 {
-    setEnabled(true);
+}
+
+void QDeclarativeEngineDebugClient::statusChanged(Status status)
+{
+    if (priv)
+        priv->statusChanged(static_cast<QDeclarativeEngineDebug::Status>(status));
 }
 
 void QDeclarativeEngineDebugClient::messageReceived(const QByteArray &data)
 {
-    priv->message(data);
+    if (priv)
+        priv->message(data);
 }
 
 QDeclarativeEngineDebugPrivate::QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *c)
@@ -106,6 +116,12 @@ QDeclarativeEngineDebugPrivate::QDeclarativeEngineDebugPrivate(QDeclarativeDebug
 {
 }
 
+QDeclarativeEngineDebugPrivate::~QDeclarativeEngineDebugPrivate()
+{
+    if (client)
+        client->priv = 0;
+}
+
 int QDeclarativeEngineDebugPrivate::getId()
 {
     return nextId++;
@@ -228,6 +244,11 @@ void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugCo
     }
 }
 
+void QDeclarativeEngineDebugPrivate::statusChanged(QDeclarativeEngineDebug::Status status)
+{
+    emit q_func()->statusChanged(status);
+}
+
 void QDeclarativeEngineDebugPrivate::message(const QByteArray &data)
 {
     QDataStream ds(data);
@@ -350,12 +371,19 @@ QDeclarativeEngineDebug::QDeclarativeEngineDebug(QDeclarativeDebugConnection *cl
 {
 }
 
+QDeclarativeEngineDebug::Status QDeclarativeEngineDebug::status() const
+{
+    Q_D(const QDeclarativeEngineDebug);
+
+    return static_cast<QDeclarativeEngineDebug::Status>(d->client->status());
+}
+
 QDeclarativeDebugPropertyWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugPropertyReference &property, QObject *parent)
 {
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugPropertyWatch *watch = new QDeclarativeDebugPropertyWatch(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -384,7 +412,7 @@ QDeclarativeDebugObjectExpressionWatch *QDeclarativeEngineDebug::addWatch(const
 {
     Q_D(QDeclarativeEngineDebug);
     QDeclarativeDebugObjectExpressionWatch *watch = new QDeclarativeDebugObjectExpressionWatch(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -407,7 +435,7 @@ QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebu
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugWatch *watch = new QDeclarativeDebugWatch(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -443,7 +471,7 @@ void QDeclarativeEngineDebug::removeWatch(QDeclarativeDebugWatch *watch)
     
     d->watched.remove(watch->queryId());
 
-    if (d->client && d->client->isConnected()) {
+    if (d->client && d->client->status() == QDeclarativeDebugClient::Enabled) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("NO_WATCH") << watch->queryId();
@@ -456,7 +484,7 @@ QDeclarativeDebugEnginesQuery *QDeclarativeEngineDebug::queryAvailableEngines(QO
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugEnginesQuery *query = new QDeclarativeDebugEnginesQuery(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -478,7 +506,7 @@ QDeclarativeDebugRootContextQuery *QDeclarativeEngineDebug::queryRootContexts(co
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugRootContextQuery *query = new QDeclarativeDebugRootContextQuery(parent);
-    if (d->client->isConnected() && engine.debugId() != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && engine.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -500,7 +528,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclar
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
-    if (d->client->isConnected() && object.debugId() != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -523,7 +551,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(cons
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
-    if (d->client->isConnected() && object.debugId() != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -546,7 +574,7 @@ QDeclarativeDebugExpressionQuery *QDeclarativeEngineDebug::queryExpressionResult
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugExpressionQuery *query = new QDeclarativeDebugExpressionQuery(parent);
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         query->m_client = this;
         query->m_expr = expr;
         int queryId = d->getId();
@@ -570,7 +598,7 @@ bool QDeclarativeEngineDebug::setBindingForObject(int objectDebugId, const QStri
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("SET_BINDING") << objectDebugId << propertyName << bindingExpression << isLiteralValue;
@@ -585,7 +613,7 @@ bool QDeclarativeEngineDebug::resetBindingForObject(int objectDebugId, const QSt
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("RESET_BINDING") << objectDebugId << propertyName;
@@ -601,7 +629,7 @@ bool QDeclarativeEngineDebug::setMethodBody(int objectDebugId, const QString &me
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("SET_METHOD_BODY") << objectDebugId << methodName << methodBody;
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h
index 2b1a115..3d83e8a 100644
--- a/src/declarative/debugger/qdeclarativedebug_p.h
+++ b/src/declarative/debugger/qdeclarativedebug_p.h
@@ -69,7 +69,11 @@ class Q_DECLARATIVE_EXPORT QDeclarativeEngineDebug : public QObject
 {
 Q_OBJECT
 public:
-    QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0);
+    enum Status { NotConnected, Unavailable, Enabled };
+
+    explicit QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0);
+
+    Status status() const;
 
     QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &,
                             QObject *parent = 0);
@@ -101,6 +105,7 @@ public:
 
 Q_SIGNALS:
     void newObjects();
+    void statusChanged(Status status);
 
 private:
     Q_DECLARE_PRIVATE(QDeclarativeEngineDebug)
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index 2e52b40..f7d7243 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -50,6 +50,20 @@
 
 QT_BEGIN_NAMESPACE
 
+const int protocolVersion = 1;
+const QString serverId = QLatin1String("QDeclarativeDebugServer");
+const QString clientId = QLatin1String("QDeclarativeDebugClient");
+
+class QDeclarativeDebugClientPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
+public:
+    QDeclarativeDebugClientPrivate();
+
+    QString name;
+    QDeclarativeDebugConnection *client;
+};
+
 class QDeclarativeDebugConnectionPrivate : public QObject
 {
     Q_OBJECT
@@ -58,40 +72,123 @@ public:
     QDeclarativeDebugConnection *q;
     QPacketProtocol *protocol;
 
-    QStringList enabled;
+    bool gotHello;
+    QStringList serverPlugins;
     QHash<QString, QDeclarativeDebugClient *> plugins;
+
+    void advertisePlugins();
+
 public Q_SLOTS:
     void connected();
     void readyRead();
 };
 
 QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c)
-: QObject(c), q(c), protocol(0)
+: QObject(c), q(c), protocol(0), gotHello(false)
 {
     protocol = new QPacketProtocol(q, this);
     QObject::connect(c, SIGNAL(connected()), this, SLOT(connected()));
     QObject::connect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
 }
 
+void QDeclarativeDebugConnectionPrivate::advertisePlugins()
+{
+    if (!q->isConnected() || !gotHello)
+        return;
+
+    QPacket pack;
+    pack << serverId << 1 << plugins.keys();
+    protocol->send(pack);
+}
+
 void QDeclarativeDebugConnectionPrivate::connected()
 {
     QPacket pack;
-    pack << QString(QLatin1String("QDeclarativeDebugServer")) << enabled;
+    pack << serverId << 0 << protocolVersion << plugins.keys();
     protocol->send(pack);
 }
 
 void QDeclarativeDebugConnectionPrivate::readyRead()
 {
-    QPacket pack = protocol->read();
-    QString name; QByteArray message;
-    pack >> name >> message;
+    if (!gotHello) {
+        QPacket pack = protocol->read();
+        QString name;
+
+        pack >> name;
+
+        bool validHello = false;
+        if (name == clientId) {
+            int op = -1;
+            pack >> op;
+            if (op == 0) {
+                int version = -1;
+                pack >> version;
+                if (version == protocolVersion) {
+                    pack >> serverPlugins;
+                    validHello = true;
+                }
+            }
+        }
 
-    QHash<QString, QDeclarativeDebugClient *>::Iterator iter = 
-        plugins.find(name);
-    if (iter == plugins.end()) {
-        qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
-    } else {
-        (*iter)->messageReceived(message);
+        if (!validHello) {
+            qWarning("QDeclarativeDebugConnection: Invalid hello message");
+            QObject::disconnect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
+            return;
+        }
+
+        qDebug() << "Available server side plugins: " << serverPlugins;
+
+        QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+        for (; iter != plugins.end(); ++iter) {
+            QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+            if (serverPlugins.contains(iter.key()))
+                newStatus = QDeclarativeDebugClient::Enabled;
+            iter.value()->statusChanged(newStatus);
+        }
+        gotHello = true;
+    }
+
+    while (protocol->packetsAvailable()) {
+        QPacket pack = protocol->read();
+        QString name;
+        pack >> name;
+
+        if (name == clientId) {
+            int op = -1;
+            pack >> op;
+
+            if (op == 1) {
+                // Service Discovery
+                QStringList oldServerPlugins = serverPlugins;
+                pack >> serverPlugins;
+
+                QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+                for (; iter != plugins.end(); ++iter) {
+                    const QString pluginName = iter.key();
+                    QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+                    if (serverPlugins.contains(pluginName))
+                        newStatus = QDeclarativeDebugClient::Enabled;
+
+                    if (oldServerPlugins.contains(pluginName)
+                            != serverPlugins.contains(pluginName)) {
+                        iter.value()->statusChanged(newStatus);
+                    }
+                }
+            } else {
+                qWarning() << "QDeclarativeDebugConnection: Unknown control message id" << op;
+            }
+        } else {
+            QByteArray message;
+            pack >> message;
+
+            QHash<QString, QDeclarativeDebugClient *>::Iterator iter =
+                plugins.find(name);
+            if (iter == plugins.end()) {
+                qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
+            } else {
+                (*iter)->messageReceived(message);
+            }
+        }
     }
 }
 
@@ -100,24 +197,22 @@ QDeclarativeDebugConnection::QDeclarativeDebugConnection(QObject *parent)
 {
 }
 
-bool QDeclarativeDebugConnection::isConnected() const
+QDeclarativeDebugConnection::~QDeclarativeDebugConnection()
 {
-    return state() == ConnectedState;
+    QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
+    for (; iter != d->plugins.end(); ++iter) {
+         iter.value()->d_func()->client = 0;
+         iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
+    }
 }
 
-class QDeclarativeDebugClientPrivate : public QObjectPrivate
+bool QDeclarativeDebugConnection::isConnected() const
 {
-    Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
-public:
-    QDeclarativeDebugClientPrivate();
-
-    QString name;
-    QDeclarativeDebugConnection *client;
-    bool enabled;
-};
+    return state() == ConnectedState;
+}
 
 QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
-: client(0), enabled(false)
+: client(0)
 {
 }
 
@@ -137,60 +232,44 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
         d->client = 0;
     } else {
         d->client->d->plugins.insert(name, this);
+        d->client->d->advertisePlugins();
     }
 }
 
-QString QDeclarativeDebugClient::name() const
+QDeclarativeDebugClient::~QDeclarativeDebugClient()
 {
     Q_D(const QDeclarativeDebugClient);
-    return d->name;
+    if (d->client && d->client->d) {
+        d->client->d->plugins.remove(d->name);
+        d->client->d->advertisePlugins();
+    }
 }
 
-bool QDeclarativeDebugClient::isEnabled() const
+QString QDeclarativeDebugClient::name() const
 {
     Q_D(const QDeclarativeDebugClient);
-    return d->enabled;
-}
-
-void QDeclarativeDebugClient::setEnabled(bool e)
-{
-    Q_D(QDeclarativeDebugClient);
-    if (e == d->enabled)
-        return;
-
-    d->enabled = e;
-
-    if (d->client) {
-        if (e) 
-            d->client->d->enabled.append(d->name);
-        else
-            d->client->d->enabled.removeAll(d->name);
-
-        if (d->client->state() == QTcpSocket::ConnectedState) {
-            QPacket pack;
-            pack << QString(QLatin1String("QDeclarativeDebugServer"));
-            if (e) pack << (int)1;
-            else pack << (int)2;
-            pack << d->name;
-            d->client->d->protocol->send(pack);
-        }
-    }
+    return d->name;
 }
 
-bool QDeclarativeDebugClient::isConnected() const
+QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
 {
     Q_D(const QDeclarativeDebugClient);
+    if (!d->client
+            || !d->client->isConnected()
+            || !d->client->d->gotHello)
+        return NotConnected;
 
-    if (!d->client)
-        return false;
-    return d->client->isConnected();
+    if (d->client->d->serverPlugins.contains(d->name))
+        return Enabled;
+
+    return Unavailable;
 }
 
 void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
 {
     Q_D(QDeclarativeDebugClient);
 
-    if (!d->client || !d->client->isConnected())
+    if (status() != Enabled)
         return;
 
     QPacket pack;
@@ -198,6 +277,10 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
     d->client->d->protocol->send(pack);
 }
 
+void QDeclarativeDebugClient::statusChanged(Status status)
+{
+}
+
 void QDeclarativeDebugClient::messageReceived(const QByteArray &)
 {
 }
diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h
index 4144a66..8d1706d 100644
--- a/src/declarative/debugger/qdeclarativedebugclient_p.h
+++ b/src/declarative/debugger/qdeclarativedebugclient_p.h
@@ -57,6 +57,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugConnection : public QTcpSocket
     Q_DISABLE_COPY(QDeclarativeDebugConnection)
 public:
     QDeclarativeDebugConnection(QObject * = 0);
+    ~QDeclarativeDebugConnection();
 
     bool isConnected() const;
 private:
@@ -73,18 +74,19 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugClient : public QObject
     Q_DISABLE_COPY(QDeclarativeDebugClient)
 
 public:
+    enum Status { NotConnected, Unavailable, Enabled };
+
     QDeclarativeDebugClient(const QString &, QDeclarativeDebugConnection *parent);
+    ~QDeclarativeDebugClient();
 
     QString name() const;
 
-    bool isEnabled() const;
-    void setEnabled(bool);
-
-    bool isConnected() const;
+    Status status() const;
 
     void sendMessage(const QByteArray &);
 
 protected:
+    virtual void statusChanged(Status);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 1f2bf4f..0fbc1e3 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -54,6 +54,30 @@
 
 QT_BEGIN_NAMESPACE
 
+/*
+  QDeclarativeDebug Protocol (Version 1):
+
+  handshake:
+    1. Client sends
+         "QDeclarativeDebugServer" 0 version pluginNames
+       version: an int representing the highest protocol version the client knows
+       pluginNames: plugins available on client side
+    2. Server sends
+         "QDeclarativeDebugClient" 0 version pluginNames
+       version: an int representing the highest protocol version the client & server know
+       pluginNames: plugins available on server side. plugins both in the client and server message are enabled.
+  client plugin advertisement
+    1. Client sends
+         "QDeclarativeDebugServer" 1 pluginNames
+  server plugin advertisement
+    1. Server sends
+         "QDeclarativeDebugClient" 1 pluginNames
+  plugin communication:
+       Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin.
+  */
+
+const int protocolVersion = 1;
+
 class QDeclarativeDebugServerPrivate;
 class QDeclarativeDebugServer : public QObject
 {
@@ -82,11 +106,13 @@ class QDeclarativeDebugServerPrivate : public QObjectPrivate
 public:
     QDeclarativeDebugServerPrivate();
 
+    void advertisePlugins();
+
     int port;
     QTcpSocket *connection;
     QPacketProtocol *protocol;
     QHash<QString, QDeclarativeDebugService *> plugins;
-    QStringList enabledPlugins;
+    QStringList clientPlugins;
     QTcpServer *tcpServer;
     bool gotHello;
 };
@@ -106,6 +132,18 @@ QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate()
 {
 }
 
+void QDeclarativeDebugServerPrivate::advertisePlugins()
+{
+    if (!connection
+            || connection->state() != QTcpSocket::ConnectedState
+            || !gotHello)
+        return;
+
+    QPacket pack;
+    pack << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
+    protocol->send(pack);
+}
+
 void QDeclarativeDebugServer::listen()
 {
     Q_D(QDeclarativeDebugServer);
@@ -202,9 +240,13 @@ void QDeclarativeDebugServer::readyRead()
 
     if (!d->gotHello) {
         QPacket hello = d->protocol->read();
-        QString name; 
-        hello >> name >> d->enabledPlugins;
-        if (name != QLatin1String("QDeclarativeDebugServer")) {
+
+        QString name;
+        int op;
+        hello >> name >> op;
+
+        if (name != QLatin1String("QDeclarativeDebugServer")
+                || op != 0) {
             qWarning("QDeclarativeDebugServer: Invalid hello message");
             QObject::disconnect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
             d->protocol->deleteLater();
@@ -213,6 +255,23 @@ void QDeclarativeDebugServer::readyRead()
             d->connection = 0;
             return;
         }
+
+        int version;
+        hello >> version >> d->clientPlugins;
+
+        QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
+        for (; iter != d->plugins.end(); ++iter) {
+            QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+            if (d->clientPlugins.contains(iter.key()))
+                newStatus = QDeclarativeDebugService::Enabled;
+            iter.value()->statusChanged(newStatus);
+        }
+
+        QPacket helloAnswer;
+        helloAnswer << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys();
+        d->protocol->send(helloAnswer);
+        d->connection->flush();
+
         d->gotHello = true;
         qWarning("QDeclarativeDebugServer: Connection established");
     }
@@ -226,32 +285,29 @@ void QDeclarativeDebugServer::readyRead()
         pack >> name;
 
         if (name == debugServer) {
-            int op = -1; QString plugin;
-            pack >> op >> plugin;
+            int op = -1;
+            pack >> op;
 
             if (op == 1) {
-                // Enable
-                if (!d->enabledPlugins.contains(plugin)) {
-                    d->enabledPlugins.append(plugin);
-                    QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
-                        d->plugins.find(plugin);
-                    if (iter != d->plugins.end())
-                        (*iter)->enabledChanged(true);
-                }
-
-            } else if (op == 2) {
-                // Disable
-                if (d->enabledPlugins.contains(plugin)) {
-                    d->enabledPlugins.removeAll(plugin);
-                    QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
-                        d->plugins.find(plugin);
-                    if (iter != d->plugins.end())
-                        (*iter)->enabledChanged(false);
+                // Service Discovery
+                QStringList oldClientPlugins = d->clientPlugins;
+                pack >> d->clientPlugins;
+
+                QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
+                for (; iter != d->plugins.end(); ++iter) {
+                    const QString pluginName = iter.key();
+                    QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+                    if (d->clientPlugins.contains(pluginName))
+                        newStatus = QDeclarativeDebugService::Enabled;
+
+                    if (oldClientPlugins.contains(pluginName)
+                            != d->clientPlugins.contains(pluginName)) {
+                        iter.value()->statusChanged(newStatus);
+                    }
                 }
             } else {
                 qWarning("QDeclarativeDebugServer: Invalid control message %d", op);
             }
-
         } else {
             QByteArray message;
             pack >> message;
@@ -287,6 +343,16 @@ QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, QObject
         d->server = 0;
     } else {
         d->server->d_func()->plugins.insert(name, this);
+        d->server->d_func()->advertisePlugins();
+    }
+}
+
+QDeclarativeDebugService::~QDeclarativeDebugService()
+{
+    Q_D(const QDeclarativeDebugService);
+    if (d->server) {
+        d->server->d_func()->plugins.remove(d->name);
+        d->server->d_func()->advertisePlugins();
     }
 }
 
@@ -296,10 +362,16 @@ QString QDeclarativeDebugService::name() const
     return d->name;
 }
 
-bool QDeclarativeDebugService::isEnabled() const
+QDeclarativeDebugService::Status QDeclarativeDebugService::status() const
 {
     Q_D(const QDeclarativeDebugService);
-    return (d->server && d->server->d_func()->enabledPlugins.contains(d->name));
+    if (!d->server
+            || !d->server->hasDebuggingClient())
+        return NotConnected;
+    if (d->server->d_func()->clientPlugins.contains(d->name))
+        return Enabled;
+
+    return Unavailable;
 }
 
 namespace {
@@ -422,7 +494,7 @@ void QDeclarativeDebugService::sendMessage(const QByteArray &message)
     d->server->d_func()->connection->flush();
 }
 
-void QDeclarativeDebugService::enabledChanged(bool)
+void QDeclarativeDebugService::statusChanged(Status)
 {
 }
 
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h
index c461ddf..0cadbe5 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p.h
@@ -56,12 +56,15 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeDebugService)
     Q_DISABLE_COPY(QDeclarativeDebugService)
+
 public:
-    QDeclarativeDebugService(const QString &, QObject *parent = 0);
+    explicit QDeclarativeDebugService(const QString &, QObject *parent = 0);
+    ~QDeclarativeDebugService();
 
     QString name() const;
 
-    bool isEnabled() const;
+    enum Status { NotConnected, Unavailable, Enabled };
+    Status status() const;
 
     void sendMessage(const QByteArray &);
 
@@ -74,7 +77,7 @@ public:
     static bool hasDebuggingClient();
 
 protected:
-    virtual void enabledChanged(bool);
+    virtual void statusChanged(Status);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index b2b0c8a..03e2d56 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -78,7 +78,7 @@ void QDeclarativeDebugTrace::endRange(RangeType t)
 
 void QDeclarativeDebugTrace::addEventImpl(EventType event)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
@@ -89,7 +89,7 @@ void QDeclarativeDebugTrace::addEventImpl(EventType event)
 
 void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
@@ -100,7 +100,7 @@ void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
 
 void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &u)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
@@ -111,7 +111,7 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &u)
 
 void QDeclarativeDebugTrace::endRangeImpl(RangeType range)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 4a5bdf2..e6a81b8 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -324,13 +324,16 @@ void tst_QDeclarativeDebug::initTestCase()
     bool ok = m_conn->waitForConnected();
     Q_ASSERT(ok);
     QTRY_VERIFY(QDeclarativeDebugService::hasDebuggingClient());
-
     m_dbg = new QDeclarativeEngineDebug(m_conn, this);
+    QTRY_VERIFY(m_dbg->status() == QDeclarativeEngineDebug::Enabled);
 }
 
 void tst_QDeclarativeDebug::cleanupTestCase()
 {
+    delete m_dbg;
+    delete m_conn;
     qDeleteAll(m_components);
+    delete m_engine;
 }
 
 void tst_QDeclarativeDebug::setMethodBody()
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 7db0e60..72af3eb 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -66,9 +66,7 @@ private slots:
     void initTestCase();
 
     void name();
-    void isEnabled();
-    void setEnabled();
-    void isConnected();
+    void status();
     void sendMessage();
 };
 
@@ -96,46 +94,33 @@ void tst_QDeclarativeDebugClient::name()
     QCOMPARE(client.name(), name);
 }
 
-void tst_QDeclarativeDebugClient::isEnabled()
+void tst_QDeclarativeDebugClient::status()
 {
-    QDeclarativeDebugClient client("tst_QDeclarativeDebugClient::isEnabled()", m_conn);
-    QCOMPARE(client.isEnabled(), false);
-}
+    {
+        QDeclarativeDebugConnection dummyConn;
+        QDeclarativeDebugClient client("tst_QDeclarativeDebugClient::status()", &dummyConn);
+        QCOMPARE(client.status(), QDeclarativeDebugClient::NotConnected);
+    }
 
-void tst_QDeclarativeDebugClient::setEnabled()
-{
-    QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::setEnabled()");
-    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::setEnabled()", m_conn);
+    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::status()", m_conn);
+    QCOMPARE(client.status(), QDeclarativeDebugClient::Unavailable);
 
-    QCOMPARE(service.isEnabled(), false);
+    {
+        QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::status()");
+        QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
+        QCOMPARE(client.status(), QDeclarativeDebugClient::Enabled);
+    }
+    QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
 
-    client.setEnabled(true);
-    QCOMPARE(client.isEnabled(), true);
-    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.isEnabled(), true);
-
-    client.setEnabled(false);
-    QCOMPARE(client.isEnabled(), false);
-    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.isEnabled(), false);
-}
-
-void tst_QDeclarativeDebugClient::isConnected()
-{
-    QDeclarativeDebugClient client1("tst_QDeclarativeDebugClient::isConnected() A", m_conn);
-    QCOMPARE(client1.isConnected(), true);
-
-    QDeclarativeDebugConnection conn;
-    QDeclarativeDebugClient client2("tst_QDeclarativeDebugClient::isConnected() B", &conn);
-    QCOMPARE(client2.isConnected(), false);
-
-    QDeclarativeDebugClient client3("tst_QDeclarativeDebugClient::isConnected() C", 0);
-    QCOMPARE(client3.isConnected(), false);
+    QCOMPARE(client.status(), QDeclarativeDebugClient::Unavailable);
 
     // duplicate plugin name
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QDeclarativeDebugClient::isConnected() A\" ");
-    QDeclarativeDebugClient client4("tst_QDeclarativeDebugClient::isConnected() A", m_conn);
-    QCOMPARE(client4.isConnected(), false);
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QDeclarativeDebugClient::status()\" ");
+    QDeclarativeDebugClient client2("tst_QDeclarativeDebugClient::status()", m_conn);
+    QCOMPARE(client2.status(), QDeclarativeDebugClient::NotConnected);
+
+    QDeclarativeDebugClient client3("tst_QDeclarativeDebugClient::status3()", 0);
+    QCOMPARE(client3.status(), QDeclarativeDebugClient::NotConnected);
 }
 
 void tst_QDeclarativeDebugClient::sendMessage()
@@ -145,6 +130,7 @@ void tst_QDeclarativeDebugClient::sendMessage()
 
     QByteArray msg = "hello!";
 
+    QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
     client.sendMessage(msg);
     QByteArray resp = client.waitForResponse();
     QCOMPARE(resp, msg);
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 70679b9..945823a 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -66,8 +66,7 @@ private slots:
     void initTestCase();
 
     void name();
-    void isEnabled();
-    void enabledChanged();
+    void status();
     void sendMessage();
     void idForObject();
     void objectForId();
@@ -97,31 +96,24 @@ void tst_QDeclarativeDebugService::name()
     QCOMPARE(service.name(), name);
 }
 
-void tst_QDeclarativeDebugService::isEnabled()
+void tst_QDeclarativeDebugService::status()
 {
-    QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::isEnabled()", m_conn);
-    QCOMPARE(service.isEnabled(), false);
+    QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::status()");
+    QCOMPARE(service.status(), QDeclarativeDebugService::Unavailable);
 
-    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::isEnabled()", m_conn);
-    client.setEnabled(true);
-    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.isEnabled(), true);
+    {
+        QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::status()", m_conn);
+        QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(statusHasChanged()));
+        QCOMPARE(service.status(), QDeclarativeDebugService::Enabled);
+    }
 
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::isEnabled()\" ");
-    QDeclarativeDebugService duplicate("tst_QDeclarativeDebugService::isEnabled()", m_conn);
-    QCOMPARE(duplicate.isEnabled(), false);
-}
-
-void tst_QDeclarativeDebugService::enabledChanged()
-{
-    QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::enabledChanged()");
-    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::enabledChanged()", m_conn);
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(statusHasChanged()));
+    QCOMPARE(service.status(), QDeclarativeDebugService::Unavailable);
 
-    QCOMPARE(service.enabled, false);
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::status()\" ");
 
-    client.setEnabled(true);
-    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.enabled, true);
+    QDeclarativeDebugService duplicate("tst_QDeclarativeDebugService::status()");
+    QCOMPARE(duplicate.status(), QDeclarativeDebugService::NotConnected);
 }
 
 void tst_QDeclarativeDebugService::sendMessage()
@@ -131,6 +123,11 @@ void tst_QDeclarativeDebugService::sendMessage()
 
     QByteArray msg = "hello!";
 
+    if (service.status() != QDeclarativeDebugService::Enabled)
+        QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(statusHasChanged()));
+    if (client.status() != QDeclarativeDebugClient::Enabled)
+        QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
+
     client.sendMessage(msg);
     QByteArray resp = client.waitForResponse();
     QCOMPARE(resp, msg);
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp
index c0c3eca..5f68e44 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/shared/debugutil.cpp
@@ -60,7 +60,7 @@ bool QDeclarativeDebugTest::waitForSignal(QObject *receiver, const char *member,
 }
 
 QDeclarativeDebugTestService::QDeclarativeDebugTestService(const QString &s, QObject *parent)
-    : QDeclarativeDebugService(s, parent), enabled(false)
+    : QDeclarativeDebugService(s, parent)
 {
 }
 
@@ -69,10 +69,9 @@ void QDeclarativeDebugTestService::messageReceived(const QByteArray &ba)
     sendMessage(ba);
 }
 
-void QDeclarativeDebugTestService::enabledChanged(bool e)
+void QDeclarativeDebugTestService::statusChanged(Status)
 {
-    enabled = e;
-    emit enabledStateChanged();
+    emit statusHasChanged();
 }
 
 
@@ -92,9 +91,13 @@ QByteArray QDeclarativeDebugTestClient::waitForResponse()
     return lastMsg;
 }
 
+void QDeclarativeDebugTestClient::statusChanged(Status status)
+{
+    emit statusHasChanged();
+}
+
 void QDeclarativeDebugTestClient::messageReceived(const QByteArray &ba)
 {
     lastMsg = ba;
     emit serverMessage(ba);
 }
-
diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h
index e6bb7ad..434e053 100644
--- a/tests/auto/declarative/shared/debugutil_p.h
+++ b/tests/auto/declarative/shared/debugutil_p.h
@@ -62,15 +62,13 @@ class QDeclarativeDebugTestService : public QDeclarativeDebugService
     Q_OBJECT
 public:
     QDeclarativeDebugTestService(const QString &s, QObject *parent = 0);
-    bool enabled;
 
 signals:
-    void enabledStateChanged();
+    void statusHasChanged();
 
 protected:
     virtual void messageReceived(const QByteArray &ba);
-
-    virtual void enabledChanged(bool e);
+    virtual void statusChanged(Status status);
 };
 
 class QDeclarativeDebugTestClient : public QDeclarativeDebugClient
@@ -82,9 +80,11 @@ public:
     QByteArray waitForResponse();
 
 signals:
+    void statusHasChanged();
     void serverMessage(const QByteArray &);
 
 protected:
+    virtual void statusChanged(Status status);
     virtual void messageReceived(const QByteArray &ba);
 
 private:
-- 
cgit v0.12


From 69a39d7b48ef239248d1039a2d8f2f0dbf560b34 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 28 Sep 2010 12:24:55 +0200
Subject: QmlDebugService: Check that there is a receiver before sending
 messages

Reviewed-by: Christiaan Janssen
(cherry picked from commit 30959e88498b2c8591145e30c8b497a76c12d8f6)
---
 src/declarative/debugger/qdeclarativedebugservice.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 0fbc1e3..62f2f39 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -182,7 +182,9 @@ void QDeclarativeDebugServer::newConnection()
 bool QDeclarativeDebugServer::hasDebuggingClient() const
 {
     Q_D(const QDeclarativeDebugServer);
-    return d->gotHello;
+    return d->connection
+            && (d->connection->state() == QTcpSocket::ConnectedState)
+            && d->gotHello;
 }
 
 QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
@@ -485,7 +487,7 @@ void QDeclarativeDebugService::sendMessage(const QByteArray &message)
 {
     Q_D(QDeclarativeDebugService);
 
-    if (!d->server || !d->server->d_func()->connection)
+    if (status() != Enabled)
         return;
 
     QPacket pack;
-- 
cgit v0.12


From b4ccec4309f9d384056e743e9c0caf91097a57b4 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 28 Sep 2010 12:48:13 +0200
Subject: QDeclarativeDebugClient: Fix gcc warning (cherry picked from commit
 9caae83e1f2b9c56ee86b8523391e6a83ea724c5)

---
 src/declarative/debugger/qdeclarativedebugclient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index f7d7243..ce3faf6 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -277,7 +277,7 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
     d->client->d->protocol->send(pack);
 }
 
-void QDeclarativeDebugClient::statusChanged(Status status)
+void QDeclarativeDebugClient::statusChanged(Status)
 {
 }
 
-- 
cgit v0.12


From 000a95629a4dd07b600b5ae4d463654f8d2267af Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 30 Sep 2010 15:26:05 +0200
Subject: QDeclarativeDebugClient: Make sure status is consistent

When statusChanged() is called during handsake state() was not the same
as the argument passed. Fix this by setting gotHello = true _before_
notifying the clients.

Reviewed-by: Christiaan Janssen
Task-number: QTBUG-14087
(cherry picked from commit a1f050fe4217d3a642ab7f4df8e50c21aa51689c)
---
 src/declarative/debugger/qdeclarativedebugclient.cpp                 | 3 +--
 .../qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp          | 5 +++++
 tests/auto/declarative/shared/debugutil.cpp                          | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index ce3faf6..5baaf70 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -136,7 +136,7 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
             return;
         }
 
-        qDebug() << "Available server side plugins: " << serverPlugins;
+        gotHello = true;
 
         QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
         for (; iter != plugins.end(); ++iter) {
@@ -145,7 +145,6 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
                 newStatus = QDeclarativeDebugClient::Enabled;
             iter.value()->statusChanged(newStatus);
         }
-        gotHello = true;
     }
 
     while (protocol->packetsAvailable()) {
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 72af3eb..a5f9846 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -77,6 +77,10 @@ void tst_QDeclarativeDebugClient::initTestCase()
     new QDeclarativeEngine(this);
 
     m_conn = new QDeclarativeDebugConnection(this);
+
+    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::handshake()", m_conn);
+    QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::handshake()");
+
     m_conn->connectToHost("127.0.0.1", 3770);
 
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established");
@@ -84,6 +88,7 @@ void tst_QDeclarativeDebugClient::initTestCase()
     Q_ASSERT(ok);
 
     QTRY_VERIFY(QDeclarativeDebugService::hasDebuggingClient());
+    QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Enabled);
 }
 
 void tst_QDeclarativeDebugClient::name()
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp
index 5f68e44..cbd055b 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/shared/debugutil.cpp
@@ -91,8 +91,9 @@ QByteArray QDeclarativeDebugTestClient::waitForResponse()
     return lastMsg;
 }
 
-void QDeclarativeDebugTestClient::statusChanged(Status status)
+void QDeclarativeDebugTestClient::statusChanged(Status stat)
 {
+    QCOMPARE(stat, status());
     emit statusHasChanged();
 }
 
-- 
cgit v0.12


From c249db933aeb4b44b935924f3ff67669f3d94707 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 30 Sep 2010 17:49:19 +0200
Subject: QDeclarativeDebug: Make autotests more robust

Always flush sockets after sending data, and make autotests more robust
by using busy wait.

Reviewed-by: Christiaan Janssen
(cherry picked from commit cfe198948f1e4867918176df38b3e0b49757a4b8)
---
 src/declarative/debugger/qdeclarativedebugclient.cpp       |  3 +++
 src/declarative/debugger/qdeclarativedebugservice.cpp      |  1 +
 .../tst_qdeclarativedebugclient.cpp                        |  9 ++++-----
 .../tst_qdeclarativedebugservice.cpp                       | 14 ++++++--------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index 5baaf70..977e58e 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -99,6 +99,7 @@ void QDeclarativeDebugConnectionPrivate::advertisePlugins()
     QPacket pack;
     pack << serverId << 1 << plugins.keys();
     protocol->send(pack);
+    q->flush();
 }
 
 void QDeclarativeDebugConnectionPrivate::connected()
@@ -106,6 +107,7 @@ void QDeclarativeDebugConnectionPrivate::connected()
     QPacket pack;
     pack << serverId << 0 << protocolVersion << plugins.keys();
     protocol->send(pack);
+    q->flush();
 }
 
 void QDeclarativeDebugConnectionPrivate::readyRead()
@@ -274,6 +276,7 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
     QPacket pack;
     pack << d->name << message;
     d->client->d->protocol->send(pack);
+    d->client->d->q->flush();
 }
 
 void QDeclarativeDebugClient::statusChanged(Status)
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 62f2f39..d2ef00d 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -142,6 +142,7 @@ void QDeclarativeDebugServerPrivate::advertisePlugins()
     QPacket pack;
     pack << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
     protocol->send(pack);
+    connection->flush();
 }
 
 void QDeclarativeDebugServer::listen()
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index a5f9846..80241ba 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -112,12 +112,10 @@ void tst_QDeclarativeDebugClient::status()
 
     {
         QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::status()");
-        QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
-        QCOMPARE(client.status(), QDeclarativeDebugClient::Enabled);
+        QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Enabled);
     }
-    QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
 
-    QCOMPARE(client.status(), QDeclarativeDebugClient::Unavailable);
+    QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Unavailable);
 
     // duplicate plugin name
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QDeclarativeDebugClient::status()\" ");
@@ -135,7 +133,8 @@ void tst_QDeclarativeDebugClient::sendMessage()
 
     QByteArray msg = "hello!";
 
-    QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
+    QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Enabled);
+
     client.sendMessage(msg);
     QByteArray resp = client.waitForResponse();
     QCOMPARE(resp, msg);
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 945823a..653515a 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -103,12 +103,12 @@ void tst_QDeclarativeDebugService::status()
 
     {
         QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::status()", m_conn);
-        QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(statusHasChanged()));
-        QCOMPARE(service.status(), QDeclarativeDebugService::Enabled);
+        QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Enabled);
+        QTRY_COMPARE(service.status(), QDeclarativeDebugService::Enabled);
     }
 
-    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(statusHasChanged()));
-    QCOMPARE(service.status(), QDeclarativeDebugService::Unavailable);
+
+    QTRY_COMPARE(service.status(), QDeclarativeDebugService::Unavailable);
 
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::status()\" ");
 
@@ -123,10 +123,8 @@ void tst_QDeclarativeDebugService::sendMessage()
 
     QByteArray msg = "hello!";
 
-    if (service.status() != QDeclarativeDebugService::Enabled)
-        QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(statusHasChanged()));
-    if (client.status() != QDeclarativeDebugClient::Enabled)
-        QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged()));
+    QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Enabled);
+    QTRY_COMPARE(service.status(), QDeclarativeDebugService::Enabled);
 
     client.sendMessage(msg);
     QByteArray resp = client.waitForResponse();
-- 
cgit v0.12


From 5b2a4581bda34e20875402aac2a235fbee7e1222 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Thu, 30 Sep 2010 11:40:39 +0200
Subject: Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"

This reverts commit 62b5ef3cc1306e46a4042b14867f2f92d9a110f3.

The implementation of hfw from this patch is unfortunately not robust enough.
It doesn't manage correctly the constraints on the layouts and the cell spans.
It caused bad behaviour or regressions seen in tasks:
QTBUG-13547, QTBUG-13067, QTBUG-13549, and more

Reviewed-By: ogoffart
(cherry picked from commit 5bd6f7eb5c7d87c08539b6c2df416990cc417ec7)
---
 src/gui/graphicsview/qgraphicslayoutitem.cpp       |  51 +--
 src/gui/graphicsview/qgraphicslayoutitem_p.h       |   6 -
 src/gui/graphicsview/qgridlayoutengine.cpp         | 251 +-------------
 src/gui/graphicsview/qgridlayoutengine_p.h         |  23 +-
 .../tst_qgraphicsgridlayout.cpp                    | 364 +--------------------
 5 files changed, 17 insertions(+), 678 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index 634f68c..ad4b2b5 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -48,7 +48,6 @@
 #include "qgraphicslayoutitem.h"
 #include "qgraphicslayoutitem_p.h"
 #include "qwidget.h"
-#include "qgraphicswidget.h"
 
 #include <QtDebug>
 
@@ -140,11 +139,9 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint)
     if (!sizeHintCacheDirty && cachedConstraint == constraint)
         return cachedSizeHints;
 
-    const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0;
-
     for (int i = 0; i < Qt::NSizeHints; ++i) {
         cachedSizeHints[i] = constraint;
-        if (userSizeHints && !hasConstraint)
+        if (userSizeHints)
             combineSize(cachedSizeHints[i], userSizeHints[i]);
     }
 
@@ -262,52 +259,6 @@ void QGraphicsLayoutItemPrivate::setSizeComponent(
     q->updateGeometry();
 }
 
-
-bool QGraphicsLayoutItemPrivate::hasHeightForWidth() const
-{
-    Q_Q(const QGraphicsLayoutItem);
-    if (isLayout) {
-        const QGraphicsLayout *l = static_cast<const QGraphicsLayout *>(q);
-        for (int i = l->count() - 1; i >= 0; --i) {
-            if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasHeightForWidth())
-                return true;
-        }
-    } else if (QGraphicsItem *item = q->graphicsItem()) {
-        if (item->isWidget()) {
-            QGraphicsWidget *w = static_cast<QGraphicsWidget *>(item);
-            if (w->layout()) {
-                return QGraphicsLayoutItemPrivate::get(w->layout())->hasHeightForWidth();
-            }
-        }
-    }
-    return q->sizePolicy().hasHeightForWidth();
-}
-
-bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const
-{
-    // enable this code when we add QSizePolicy::hasWidthForHeight() (For 4.8)
-#if 1
-    return false;
-#else
-    Q_Q(const QGraphicsLayoutItem);
-    if (isLayout) {
-        const QGraphicsLayout *l = static_cast<const QGraphicsLayout *>(q);
-        for (int i = l->count() - 1; i >= 0; --i) {
-            if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasWidthForHeight())
-                return true;
-        }
-    } else if (QGraphicsItem *item = q->graphicsItem()) {
-        if (item->isWidget()) {
-            QGraphicsWidget *w = static_cast<QGraphicsWidget *>(item);
-            if (w->layout()) {
-                return QGraphicsLayoutItemPrivate::get(w->layout())->hasWidthForHeight();
-            }
-        }
-    }
-    return q->sizePolicy().hasWidthForHeight();
-#endif
-}
-
 /*!
     \class QGraphicsLayoutItem
     \brief The QGraphicsLayoutItem class can be inherited to allow your custom
diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h
index b752e03..15cc7a5 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem_p.h
+++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h
@@ -65,9 +65,6 @@ class Q_AUTOTEST_EXPORT QGraphicsLayoutItemPrivate
 public:
     virtual ~QGraphicsLayoutItemPrivate();
     QGraphicsLayoutItemPrivate(QGraphicsLayoutItem *parent, bool isLayout);
-    static QGraphicsLayoutItemPrivate *get(QGraphicsLayoutItem *q) { return q->d_func();}
-    static const QGraphicsLayoutItemPrivate *get(const QGraphicsLayoutItem *q) { return q->d_func();}
-
     void init();
     QSizeF *effectiveSizeHints(const QSizeF &constraint) const;
     QGraphicsItem *parentItem() const;
@@ -76,9 +73,6 @@ public:
     enum SizeComponent { Width, Height };
     void setSizeComponent(Qt::SizeHint which, SizeComponent component, qreal value);
 
-    bool hasHeightForWidth() const;
-    bool hasWidthForHeight() const;
-
     QSizePolicy sizePolicy;
     QGraphicsLayoutItem *parent;
 
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index f3b2026..4fba5ff 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -546,24 +546,6 @@ QSizePolicy::Policy QGridLayoutItem::sizePolicy(Qt::Orientation orientation) con
                                            : sizePolicy.verticalPolicy();
 }
 
-/*
-  returns true if the size policy returns true for either hasHeightForWidth()
-  or hasWidthForHeight()
- */
-bool QGridLayoutItem::hasDynamicConstraint() const
-{
-    return QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth()
-        || QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight();
-}
-
-Qt::Orientation QGridLayoutItem::dynamicConstraintOrientation() const
-{
-    if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth())
-        return Qt::Vertical;
-    else //if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight())
-        return Qt::Horizontal;
-}
-
 QSizePolicy::ControlTypes QGridLayoutItem::controlTypes(LayoutSide /* side */) const
 {
     return q_layoutItem->sizePolicy().controlType();
@@ -632,14 +614,7 @@ QRectF QGridLayoutItem::geometryWithin(qreal x, qreal y, qreal width, qreal heig
         qreal cellWidth = width;
         qreal cellHeight = height;
 
-        QSize constraint;
-        if (hasDynamicConstraint()) {
-            if (dynamicConstraintOrientation() == Qt::Vertical)
-                constraint.setWidth(cellWidth);
-            else
-                constraint.setHeight(cellHeight);
-        }
-        QSizeF size = effectiveMaxSize(constraint).boundedTo(QSizeF(cellWidth, cellHeight));
+        QSizeF size = effectiveMaxSize().boundedTo(QSizeF(cellWidth, cellHeight));
         width = size.width();
         height = size.height();
 
@@ -701,13 +676,13 @@ void QGridLayoutItem::insertOrRemoveRows(int row, int delta, Qt::Orientation ori
     Note that effectiveSizeHint does not take sizePolicy into consideration,
     (since it only evaluates the hints, as the name implies)
 */
-QSizeF QGridLayoutItem::effectiveMaxSize(const QSizeF &constraint) const
+QSizeF QGridLayoutItem::effectiveMaxSize() const
 {
-    QSizeF size = constraint;
+    QSizeF size;
     bool vGrow = (sizePolicy(Qt::Vertical) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag;
     bool hGrow = (sizePolicy(Qt::Horizontal) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag;
     if (!vGrow || !hGrow) {
-        QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize, constraint);
+        QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize);
         if (!vGrow)
             size.setHeight(pref.height());
         if (!hGrow)
@@ -715,7 +690,7 @@ QSizeF QGridLayoutItem::effectiveMaxSize(const QSizeF &constraint) const
     }
 
     if (!size.isValid()) {
-        QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize, constraint);
+        QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize);
         if (size.width() == -1)
             size.setWidth(maxSize.width());
         if (size.height() == -1)
@@ -1036,7 +1011,6 @@ void QGridLayoutEngine::invalidate()
     q_cachedEffectiveLastRows[Ver] = -1;
     q_cachedDataForStyleInfo.invalidate();
     q_cachedSize = QSizeF();
-    q_cachedConstraintOrientation = UnknownConstraint;
 }
 
 static void visualRect(QRectF *geom, Qt::LayoutDirection dir, const QRectF &contentsRect)
@@ -1101,13 +1075,10 @@ QRectF QGridLayoutEngine::cellRect(const QLayoutStyleInfo &styleInfo,
 }
 
 QSizeF QGridLayoutEngine::sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which,
-                                   const QSizeF &constraint) const
+                                   const QSizeF & /* constraint */) const
 {
     ensureColumnAndRowData(styleInfo);
 
-    if (hasDynamicConstraint())
-        return dynamicallyConstrainedSizeHint(which, constraint);
-
     switch (which) {
     case Qt::MinimumSize:
         return QSizeF(q_totalBoxes[Hor].q_minimumSize, q_totalBoxes[Ver].q_minimumSize);
@@ -1405,11 +1376,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData, const QLayoutSt
                         box = &multiCell.q_box;
                         multiCell.q_stretch = itemStretch;
                     }
-                    // Items with constraints are not included in the orientation that
-                    // they are constrained (since it depends on the hfw/constraint function).
-                    // They must be combined at a later stage.
-                    if (!item->hasDynamicConstraint() || orientation != item->dynamicConstraintOrientation())
-                        box->combine(item->box(orientation));
+                    box->combine(item->box(orientation));
 
                     if (effectiveRowSpan == 1) {
                         QSizePolicy::ControlTypes controls = item->controlTypes(top);
@@ -1566,138 +1533,6 @@ void QGridLayoutEngine::ensureColumnAndRowData(const QLayoutStyleInfo &styleInfo
     q_cachedDataForStyleInfo = styleInfo;
 }
 
-QSizeF QGridLayoutEngine::dynamicallyConstrainedSizeHint(Qt::SizeHint which,
-                                                         const QSizeF &constraint) const
-{
-    Q_ASSERT(hasDynamicConstraint());
-    if (constraint.width() < 0 && constraint.height() < 0) {
-        // Process the hfw / wfh items that we did not process in fillRowData()
-        const Qt::Orientation constraintOrient = constraintOrientation();
-
-        QGridLayoutRowData rowData = constraintOrient == Qt::Vertical ? q_rowData : q_columnData;
-        for (int i = q_items.count() - 1; i >= 0; --i) {
-            QGridLayoutItem *item = q_items.at(i);
-            if (item->hasDynamicConstraint()) {
-                QGridLayoutBox box = item->box(constraintOrient);
-                QGridLayoutBox &rowBox = rowData.boxes[item->firstRow(constraintOrient)];
-                rowBox.combine(box);
-            }
-        }
-
-        QGridLayoutBox totalBoxes[2];
-        if (constraintOrient == Qt::Vertical) {
-            totalBoxes[Hor] = q_columnData.totalBox(0, columnCount());
-            totalBoxes[Ver] = rowData.totalBox(0, rowCount());
-        } else {
-            totalBoxes[Hor] = rowData.totalBox(0, columnCount());
-            totalBoxes[Ver] = q_rowData.totalBox(0, rowCount());
-        }
-        return QSizeF(totalBoxes[Hor].q_sizes(which), totalBoxes[Ver].q_sizes(which));
-    }
-
-
-    Q_ASSERT(constraint.width() >= 0 || constraint.height() >= 0);
-    q_xx.resize(columnCount());
-    q_yy.resize(rowCount());
-    q_widths.resize(columnCount());
-    q_heights.resize(rowCount());
-    q_descents.resize(rowCount());
-
-
-    const Qt::Orientation orientation = constraintOrientation();
-    QGridLayoutRowData *colData;
-    QGridLayoutRowData constrainedRowData;
-    QGridLayoutBox *totalBox;
-    qreal *sizes;
-    qreal *pos;
-    qreal *descents;
-    qreal targetSize;
-    qreal cCount;
-    qreal rCount;
-
-    if (orientation == Qt::Vertical) {
-        // height for width
-        colData = &q_columnData;
-        totalBox = &q_totalBoxes[Hor];
-        sizes = q_widths.data();
-        pos = q_xx.data();
-        descents = 0;
-        targetSize = constraint.width();
-        cCount = columnCount();
-        rCount = rowCount();
-        constrainedRowData = q_rowData;
-    } else {
-        // width for height
-        colData = &q_rowData;
-        totalBox = &q_totalBoxes[Ver];
-        sizes = q_heights.data();
-        pos = q_yy.data();
-        descents = q_descents.data();
-        targetSize = constraint.height();
-        cCount = rowCount();
-        rCount = columnCount();
-        constrainedRowData = q_columnData;
-    }
-    colData->calculateGeometries(0, cCount, targetSize, pos, sizes, descents, *totalBox);
-    for (int i = q_items.count() - 1; i >= 0; --i) {
-        QGridLayoutItem *item = q_items.at(i);
-
-        if (item->hasDynamicConstraint()) {
-            const qreal size = sizes[item->firstColumn(orientation)];
-            QGridLayoutBox box = item->box(orientation, size);
-            QGridLayoutBox &rowBox = constrainedRowData.boxes[item->firstRow(orientation)];
-            rowBox.combine(box);
-        }
-    }
-    const qreal newSize = constrainedRowData.totalBox(0, rCount).q_sizes(which);
-
-    return (orientation == Qt::Vertical) ? QSizeF(targetSize, newSize) : QSizeF(newSize, targetSize);
-}
-
-
-/**
-   returns false if the layout has contradicting constraints (i.e. some items with a horizontal
-   constraint and other items with a vertical constraint)
- */
-bool QGridLayoutEngine::ensureDynamicConstraint() const
-{
-    if (q_cachedConstraintOrientation == UnknownConstraint) {
-        for (int i = q_items.count() - 1; i >= 0; --i) {
-            QGridLayoutItem *item = q_items.at(i);
-            if (item->hasDynamicConstraint()) {
-                Qt::Orientation itemConstraintOrientation = item->dynamicConstraintOrientation();
-                if (q_cachedConstraintOrientation == UnknownConstraint) {
-                    q_cachedConstraintOrientation = itemConstraintOrientation;
-                } else if (q_cachedConstraintOrientation != itemConstraintOrientation) {
-                    q_cachedConstraintOrientation = UnfeasibleConstraint;
-                    qWarning("QGridLayoutEngine: Unfeasible, cannot mix horizontal and"
-                             " vertical constraint in the same layout");
-                    return false;
-                }
-            }
-        }
-        if (q_cachedConstraintOrientation == UnknownConstraint)
-            q_cachedConstraintOrientation = NoConstraint;
-    }
-    return true;
-}
-
-bool QGridLayoutEngine::hasDynamicConstraint() const
-{
-    if (!ensureDynamicConstraint())
-        return false;
-    return q_cachedConstraintOrientation != NoConstraint;
-}
-
-/*
- * return value is only valid if hasConstraint() returns true
- */
-Qt::Orientation QGridLayoutEngine::constraintOrientation() const
-{
-    (void)ensureDynamicConstraint();
-    return (Qt::Orientation)q_cachedConstraintOrientation;
-}
-
 void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo,
                                          const QSizeF &size) const
 {
@@ -1710,74 +1545,10 @@ void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo,
     q_widths.resize(columnCount());
     q_heights.resize(rowCount());
     q_descents.resize(rowCount());
-
-
-    Qt::Orientation orientation = Qt::Vertical;
-    if (hasDynamicConstraint())
-        orientation = constraintOrientation();
-
-    /*
-      In order to do hfw we need to first distribute the columns, then the rows.
-      In order to do wfh we need to first distribute the rows, then the columns.
-
-      If there is no constraint, the order of distributing the rows or columns first is irrelevant.
-      We choose horizontal just to keep the same behaviour as before (however, there shouldn't
-      be any behaviour difference).
- */
-
-    QGridLayoutRowData *colData;
-    QGridLayoutRowData rowData;
-    qreal *widths;
-    qreal *heights;
-    qreal *xx;
-    qreal *yy;
-    qreal *xdescents = 0;
-    qreal *ydescents = 0;
-    qreal cCount;
-    qreal rCount;
-    QSizeF oSize = size;
-    if (orientation == Qt::Vertical) {
-        // height for width
-        colData = &q_columnData;
-        rowData = q_rowData;
-        widths = q_widths.data();
-        heights = q_heights.data();
-        xx = q_xx.data();
-        yy = q_yy.data();
-        cCount = columnCount();
-        rCount = rowCount();
-        ydescents = q_descents.data();
-    } else {
-        // width for height
-        colData = &q_rowData;
-        rowData = q_columnData;
-        widths = q_heights.data();
-        heights = q_widths.data();
-        xx = q_yy.data();
-        yy = q_xx.data();
-        cCount = rowCount();
-        rCount = columnCount();
-        xdescents = q_descents.data();
-        oSize.transpose();
-    }
-
-    colData->calculateGeometries(0, cCount, oSize.width(), xx, widths,
-                                 xdescents, q_totalBoxes[orientation == Qt::Horizontal]);
-    for (int i = q_items.count() - 1; i >= 0; --i) {
-        QGridLayoutItem *item = q_items.at(i);
-        const int col = item->firstColumn(orientation);
-        const int row = item->firstRow(orientation);
-        if (item->hasDynamicConstraint()) {
-            const qreal sz = widths[col];
-            QGridLayoutBox box = item->box(orientation, sz);
-            rowData.boxes[row].combine(box);
-        }
-    }
-
-    QGridLayoutBox &totalBox = q_totalBoxes[orientation == Qt::Vertical];
-    totalBox = rowData.totalBox(0, rCount);
-    rowData.calculateGeometries(0, rCount, oSize.height(), yy, heights,
-                                 ydescents, totalBox);
+    q_columnData.calculateGeometries(0, columnCount(), size.width(), q_xx.data(), q_widths.data(),
+                                     0, q_totalBoxes[Hor]);
+    q_rowData.calculateGeometries(0, rowCount(), size.height(), q_yy.data(), q_heights.data(),
+                                  q_descents.data(), q_totalBoxes[Ver]);
 
     q_cachedSize = size;
 }
diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h
index 580af7e..9ac9a8e 100644
--- a/src/gui/graphicsview/qgridlayoutengine_p.h
+++ b/src/gui/graphicsview/qgridlayoutengine_p.h
@@ -91,14 +91,6 @@ enum LayoutSide {
     Bottom
 };
 
-enum {
-    NoConstraint,
-    HorizontalConstraint,
-    VerticalConstraint,
-    UnknownConstraint,      // need to update cache
-    UnfeasibleConstraint    // not feasible, it be has some items with Vertical and others with Horizontal constraints
-};
-
 template <typename T>
 class QLayoutParameter
 {
@@ -278,10 +270,6 @@ public:
     inline void setAlignment(Qt::Alignment alignment) { q_alignment = alignment; }
 
     QSizePolicy::Policy sizePolicy(Qt::Orientation orientation) const;
-
-    bool hasDynamicConstraint() const;
-    Qt::Orientation dynamicConstraintOrientation() const;
-
     QSizePolicy::ControlTypes controlTypes(LayoutSide side) const;
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     QGridLayoutBox box(Qt::Orientation orientation, qreal constraint = -1.0) const;
@@ -292,7 +280,7 @@ public:
     void setGeometry(const QRectF &rect);
     void transpose();
     void insertOrRemoveRows(int row, int delta, Qt::Orientation orientation = Qt::Vertical);
-    QSizeF effectiveMaxSize(const QSizeF &constraint) const;
+    QSizeF effectiveMaxSize() const;
 
 #ifdef QT_DEBUG
     void dump(int indent = 0) const;
@@ -384,14 +372,6 @@ public:
                     int column, int rowSpan, int columnSpan) const;
     QSizeF sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which,
                     const QSizeF &constraint) const;
-
-    // heightForWidth / widthForHeight support
-    QSizeF dynamicallyConstrainedSizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
-    bool ensureDynamicConstraint() const;
-    bool hasDynamicConstraint() const;
-    Qt::Orientation constraintOrientation() const;
-
-
     QSizePolicy::ControlTypes controlTypes(LayoutSide side) const;
     void transpose();
     void setVisualDirection(Qt::LayoutDirection direction);
@@ -425,7 +405,6 @@ private:
     // Lazily computed from the above user input
     mutable int q_cachedEffectiveFirstRows[NOrientations];
     mutable int q_cachedEffectiveLastRows[NOrientations];
-    mutable quint8 q_cachedConstraintOrientation : 2;
 
     // Layout item input
     mutable QLayoutStyleInfo q_cachedDataForStyleInfo;
diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 03c1d5b..5b03767 100644
--- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -107,13 +107,12 @@ private slots:
     void avoidRecursionInInsertItem();
     void styleInfoLeak();
     void task236367_maxSizeHint();
-    void heightForWidth();
 };
 
 class RectWidget : public QGraphicsWidget
 {
 public:
-    RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {}
+    RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){}
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
     {
@@ -126,12 +125,9 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
     {
-        if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) {
+        if (m_sizeHints[which].isValid()) {
             return m_sizeHints[which];
         }
-        if (m_fnConstraint) {
-            return m_fnConstraint(which, constraint);
-        }
         return QGraphicsWidget::sizeHint(which, constraint);
     }
 
@@ -140,13 +136,7 @@ public:
         updateGeometry();
     }
 
-    void setConstraintFunction(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) {
-        m_fnConstraint = fnConstraint;
-    }
-
     QSizeF m_sizeHints[Qt::NSizeHints];
-    QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &);
-
 };
 
 struct ItemDesc
@@ -156,8 +146,7 @@ struct ItemDesc
       m_rowSpan(1),
       m_colSpan(1),
       m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)),
-      m_align(0),
-      m_fnConstraint(0)
+      m_align(0)
     {
     }
 
@@ -224,20 +213,8 @@ struct ItemDesc
         return (*this);
     }
 
-    ItemDesc &heightForWidth(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) {
-        m_fnConstraint = fnConstraint;
-        m_constraintOrientation = Qt::Vertical;
-        return (*this);
-    }
-
     void apply(QGraphicsGridLayout *layout, QGraphicsWidget *item) {
-        QSizePolicy sp = m_sizePolicy;
-        if (m_fnConstraint) {
-            sp.setHeightForWidth(m_constraintOrientation == Qt::Vertical);
-            //sp.setWidthForHeight(m_constraintOrientation == Qt::Horizontal);
-        }
-
-        item->setSizePolicy(sp);
+        item->setSizePolicy(m_sizePolicy);
         for (int i = 0; i < Qt::NSizeHints; ++i) {
             if (!m_sizes[i].isValid())
                 continue;
@@ -256,7 +233,6 @@ struct ItemDesc
                 break;
             }
         }
-
         layout->addItem(item, m_pos.first, m_pos.second, m_rowSpan, m_colSpan);
         layout->setAlignment(item, m_align);
     }
@@ -264,7 +240,6 @@ struct ItemDesc
     void apply(QGraphicsGridLayout *layout, RectWidget *item) {
         for (int i = 0; i < Qt::NSizeHints; ++i)
             item->setSizeHint((Qt::SizeHint)i, m_sizeHints[i]);
-        item->setConstraintFunction(m_fnConstraint);
         apply(layout, static_cast<QGraphicsWidget*>(item));
     }
 
@@ -276,9 +251,6 @@ struct ItemDesc
     QSizeF m_sizeHints[Qt::NSizeHints];
     QSizeF m_sizes[Qt::NSizeHints];
     Qt::Alignment m_align;
-
-    Qt::Orientation m_constraintOrientation;
-    QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &);
 };
 
 typedef QList<ItemDesc> ItemList;
@@ -2144,17 +2116,6 @@ void tst_QGraphicsGridLayout::alignment2()
     delete widget;
 }
 
-static QSizeF hfw1(Qt::SizeHint, const QSizeF &constraint)
-{
-    QSizeF result(constraint);
-    if (constraint.width() < 0 && constraint.height() < 0) {
-        return QSizeF(50, 400);
-    } else if (constraint.width() >= 0) {
-        result.setHeight(20000./constraint.width());
-    }
-    return result;
-}
-
 void tst_QGraphicsGridLayout::geometries_data()
 {
 
@@ -2184,186 +2145,6 @@ void tst_QGraphicsGridLayout::geometries_data()
                                 << QRectF(0, 0, 60,10) << QRectF(0, 10, 60,10)
                             );
 
-    // change layout height and verify
-    QTest::newRow("hfw-h401") << (ItemList()
-                                    << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(500, 500))
-                                        .heightForWidth(hfw1)
-                                )
-                            << QSizeF(100, 401)
-                            << (RectList()
-                                << QRectF(0, 0, 50,  1) << QRectF(50, 0, 50,  1)
-                                << QRectF(0, 1, 50,100) << QRectF(50, 1, 50,400)
-                            );
-
-
-    QTest::newRow("hfw-h408") << (ItemList()
-                                    << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(500, 500))
-                                        .heightForWidth(hfw1)
-                                )
-                            << QSizeF(100, 408)
-                            << (RectList()
-                                << QRectF(0, 0, 50,  8) << QRectF(50,  0, 50,  8)
-                                << QRectF(0, 8, 50,100) << QRectF(50,  8, 50,400)
-                            );
-
-    QTest::newRow("hfw-h410") << (ItemList()
-                                    << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(500, 500))
-                                        .heightForWidth(hfw1)
-                                )
-                            << QSizeF(100, 410)
-                            << (RectList()
-                                << QRectF(0, 0, 50,10) << QRectF(50, 0, 50,10)
-                                << QRectF(0, 10, 50,100) << QRectF(50, 10, 50,400)
-                            );
-
-    QTest::newRow("hfw-h470") << (ItemList()
-                                    << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(500, 500))
-                                        .heightForWidth(hfw1)
-                                )
-                            << QSizeF(100, 470)
-                            << (RectList()
-                                << QRectF(0, 0, 50,70) << QRectF(50, 0, 50,70)
-                                << QRectF(0, 70, 50,100) << QRectF(50, 70, 50,400)
-                            );
-
-
-    // change layout width and verify
-    QTest::newRow("hfw-w100") << (ItemList()
-                                    << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(5000, 5000))
-                                        .heightForWidth(hfw1)
-                                )
-                            << QSizeF(100, 401)
-                            << (RectList()
-                                << QRectF( 0, 0,  50,   1) << QRectF( 50,  0,  50,   1)
-                                << QRectF( 0, 1,  50, 100) << QRectF( 50,  1,  50, 400)
-                            );
-
-    QTest::newRow("hfw-w160") << (ItemList()
-                                    << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(5000, 5000))
-                                        .heightForWidth(hfw1)
-                                )
-                            << QSizeF(160, 401)
-                            << (RectList()
-                                << QRectF( 0,   0,  80, 100) << QRectF( 80,   0,  80, 100)
-                                << QRectF( 0, 100,  80, 100) << QRectF( 80, 100,  80, 250)
-                            );
-
-
-    QTest::newRow("hfw-w500") << (ItemList()
-                                    << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,0)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,10))
-                                        .maxSize(QSizeF(100, 100))
-                                    << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(5000, 5000))
-                                        .heightForWidth(hfw1)
-                                )
-                            << QSizeF(500, 401)
-                            << (RectList()
-                                << QRectF( 0,   0, 100, 100) << QRectF(100,   0, 100, 100)
-                                << QRectF( 0, 100, 100, 100) << QRectF(100, 100, 400,  50)
-                            );
-
 }
 
 void tst_QGraphicsGridLayout::geometries()
@@ -2434,143 +2215,6 @@ void tst_QGraphicsGridLayout::task236367_maxSizeHint()
     QCOMPARE(widget->size(), QSizeF(w, h));
 }
 
-/*
-static qreal hfw(qreal w)
-{
-    if (w == 0)
-        return 20000;
-    return 20000/w;
-}
-*/
-static QSizeF hfw(Qt::SizeHint /*which*/, const QSizeF &constraint)
-{
-    QSizeF result(constraint);
-    const qreal cw = constraint.width();
-    const qreal ch = constraint.height();
-    if (cw < 0 && ch < 0) {
-        return QSizeF(200, 100);
-    } else if (cw >= 0) {
-        result.setHeight(20000./cw);
-    } else if (cw == 0) {
-        result.setHeight(20000);
-    } else if (ch >= 0) {
-        result.setWidth(20000./ch);
-    } else if (ch == 0) {
-        result.setWidth(20000);
-    }
-
-    return result;
-}
-
-static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired)
-{
-    Q_ASSERT(sumDesired != 0.0);
-    return desired * qPow(sumAvailable / sumDesired, desired / sumDesired);
-}
-
-static void expectedWidth(qreal minSize1, qreal prefSize1,
-                          qreal minSize2, qreal prefSize2,
-                          qreal targetSize, qreal *width1, qreal *width2)
-{
-    qreal sumAvail,factor1,factor2;
-    // stretch behaviour is different below and above preferred size...
-    if (targetSize < prefSize1 + prefSize2) {
-        sumAvail = targetSize - minSize1 - minSize2;
-        const qreal desired1 = prefSize1 - minSize1;
-        const qreal desired2 = prefSize2 - minSize2;
-        const qreal sumDesired = desired1 + desired2;
-        factor1 = growthFactorBelowPreferredSize(desired1, sumAvail, sumDesired);
-        factor2 = growthFactorBelowPreferredSize(desired2, sumAvail, sumDesired);
-        const qreal sumFactors = factor1 + factor2;
-        *width1 = sumAvail*factor1/sumFactors + minSize1;
-        *width2 = sumAvail*factor2/sumFactors + minSize2;
-    } else {
-        sumAvail = targetSize - prefSize1 - prefSize2;
-        factor1 = prefSize1;
-        factor2 = prefSize2;
-        const qreal sumFactors = factor1 + factor2;
-        *width1 = sumAvail*factor1/sumFactors + prefSize1;
-        *width2 = sumAvail*factor2/sumFactors + prefSize2;
-    }
-}
-
-
-bool qFuzzyCompare(const QSizeF &a, const QSizeF &b)
-{
-    return qFuzzyCompare(a.width(), b.width()) && qFuzzyCompare(a.height(), b.height());
-}
-
-void tst_QGraphicsGridLayout::heightForWidth()
-{
-    QGraphicsWidget *widget = new QGraphicsWidget;
-    QGraphicsGridLayout *layout = new QGraphicsGridLayout;
-    widget->setLayout(layout);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(0);
-    RectWidget *w00 = new RectWidget;
-    w00->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
-    w00->setSizeHint(Qt::PreferredSize, QSizeF(10,10));
-    w00->setSizeHint(Qt::MaximumSize, QSizeF(100,100));
-    layout->addItem(w00, 0, 0);
-
-    RectWidget *w01 = new RectWidget;
-    w01->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
-    w01->setSizeHint(Qt::PreferredSize, QSizeF(10,10));
-    w01->setSizeHint(Qt::MaximumSize, QSizeF(100,100));
-    layout->addItem(w01, 0, 1);
-
-    RectWidget *w10 = new RectWidget;
-    w10->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
-    w10->setSizeHint(Qt::PreferredSize, QSizeF(10,10));
-    w10->setSizeHint(Qt::MaximumSize, QSizeF(100,100));
-    layout->addItem(w10, 1, 0);
-
-    RectWidget *w11 = new RectWidget;
-    w11->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
-    w11->setSizeHint(Qt::MaximumSize, QSizeF(30000,30000));
-    w11->setConstraintFunction(hfw);
-    QSizePolicy sp(QSizePolicy::Preferred, QSizePolicy::Preferred);
-    sp.setHeightForWidth(true);
-    w11->setSizePolicy(sp);
-    layout->addItem(w11, 1, 1);
-
-    QSizeF prefSize = layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1));
-    QCOMPARE(prefSize, QSizeF(10+200, 10+100));
-
-    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(2, -1)), QSizeF(2, 20001));
-    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(2, -1)), QSizeF(2, 20010));
-    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(2, -1)), QSizeF(2, 20100));
-    qreal width1;
-    qreal width2;
-    expectedWidth(1, 10, 1, 200, 20, &width1, &width2);
-    QSizeF expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1);
-    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(20, -1)), expectedSize);
-    expectedSize.rheight()+=9;
-    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(20, -1)), expectedSize);
-    expectedSize.rheight()+=90;
-    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(20, -1)), expectedSize);
-
-    expectedWidth(1, 10, 1, 200, 300, &width1, &width2);
-    expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1);
-    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(300, -1)), expectedSize);
-    expectedSize.rheight()+=9;
-    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(300, -1)), expectedSize);
-    // the height of the hfw widget is shorter than the one to the left, which is 100, so
-    // the total height of the last row is 100 (which leaves the layout height to be 200)
-    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(300, -1)), QSizeF(300, 200));
-
-    // the hfw item is shorter than the item to the left
-    expectedWidth(1, 10, 1, 200, 500, &width1, &width2);
-    expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1);
-    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(500, -1)), expectedSize);
-    expectedSize.rheight()+=9;
-    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(500, -1)), expectedSize);
-    // the height of the hfw widget is shorter than the one to the left, which is 100, so
-    // the total height of the last row is 100 (which leaves the layout height to be 200)
-    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(500, -1)), QSizeF(500, 200));
-
-}
-
 QTEST_MAIN(tst_QGraphicsGridLayout)
 #include "tst_qgraphicsgridlayout.moc"
 
-- 
cgit v0.12


From 8683e35e958fe5363e6ebc22f76042525151a40b Mon Sep 17 00:00:00 2001
From: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
Date: Wed, 29 Sep 2010 18:41:38 +0200
Subject: Fixed parsing of SVGs with absolute font sizes.

Task-number: QTBUG-14070
Reviewed-by: Gunnar
(cherry picked from commit 4cd4160d85dc1e158a545422cac895792b14eda6)
---
 src/svg/qsvghandler.cpp | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index bf19a88..c17ca7a 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1282,8 +1282,39 @@ static void parseFont(QSvgNode *node,
         fontStyle->setFamily(attributes.fontFamily.toString().trimmed());
 
     if (!attributes.fontSize.isEmpty() && attributes.fontSize != QT_INHERIT) {
+        // TODO: Support relative sizes 'larger' and 'smaller'.
         QSvgHandler::LengthType dummy; // should always be pixel size
-        fontStyle->setSize(parseLength(attributes.fontSize.toString(), dummy, handler));
+        qreal size = 0;
+        static const qreal sizeTable[] = { qreal(6.9), qreal(8.3), qreal(10.0), qreal(12.0), qreal(14.4), qreal(17.3), qreal(20.7) };
+        enum AbsFontSize { XXSmall, XSmall, Small, Medium, Large, XLarge, XXLarge };
+        switch (attributes.fontSize.at(0).unicode()) {
+        case 'x':
+            if (attributes.fontSize == QLatin1String("xx-small"))
+                size = sizeTable[XXSmall];
+            else if (attributes.fontSize == QLatin1String("x-small"))
+                size = sizeTable[XSmall];
+            else if (attributes.fontSize == QLatin1String("x-large"))
+                size = sizeTable[XLarge];
+            else if (attributes.fontSize == QLatin1String("xx-large"))
+                size = sizeTable[XXLarge];
+            break;
+        case 's':
+            if (attributes.fontSize == QLatin1String("small"))
+                size = sizeTable[Small];
+            break;
+        case 'm':
+            if (attributes.fontSize == QLatin1String("medium"))
+                size = sizeTable[Medium];
+            break;
+        case 'l':
+            if (attributes.fontSize == QLatin1String("large"))
+                size = sizeTable[Large];
+            break;
+        default:
+            size = parseLength(attributes.fontSize.toString(), dummy, handler);
+            break;
+        }
+        fontStyle->setSize(size);
     }
 
     if (!attributes.fontStyle.isEmpty() && attributes.fontStyle != QT_INHERIT) {
-- 
cgit v0.12


From 6c53410d8104064b53beccb1f2014c980735aefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 27 Sep 2010 13:02:47 +0200
Subject: Fixed performance regression in curve stroking.

Change c46688b8a88da made us use m_curve_threshold for both
QBezier::shifted and QBezier::toPolygon, and adjusted the threshold
dynamically based on the painter scale. Since the threshold in shifted
was already relative to the pen width, it is independent from the
painter scale. Instead, we need to set a separate threshold for dashing.

Also, in several places we were calling setCurveThresholdForTransform
with the painter matrix even though we were transforming the points into
device coordinate space before stroking.

Task-number: QTBUG-13894
Reviewed-by: Gunnar Sletta
(cherry picked from commit d60dc7cba21794866c9382f83080fab1a129eb08)
---
 src/gui/painting/qpaintengineex.cpp | 2 +-
 src/gui/painting/qstroker.cpp       | 9 +++++----
 src/gui/painting/qstroker_p.h       | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index 1e857e4..c1e3d66 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -517,7 +517,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
             QPainterPath painterPath = state()->matrix.map(path.convertToPainterPath());
             d->activeStroker->strokePath(painterPath, d->strokeHandler, QTransform());
         } else {
-            d->activeStroker->setCurveThresholdFromTransform(state()->matrix);
+            d->activeStroker->setCurveThresholdFromTransform(QTransform());
             d->activeStroker->begin(d->strokeHandler);
             if (types) {
                 while (points < lastPoint) {
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index 9cff339..9decf41 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -190,6 +190,7 @@ static inline qreal adapted_angle_on_x(const QLineF &line)
 QStrokerOps::QStrokerOps()
     : m_elements(0)
     , m_curveThreshold(qt_real_to_fixed(0.25))
+    , m_dashThreshold(qt_real_to_fixed(0.25))
     , m_customData(0)
     , m_moveTo(0)
     , m_lineTo(0)
@@ -243,7 +244,7 @@ void QStrokerOps::strokePath(const QPainterPath &path, void *customData, const Q
     if (path.isEmpty())
         return;
 
-    setCurveThresholdFromTransform(matrix);
+    setCurveThresholdFromTransform(QTransform());
     begin(customData);
     int count = path.elementCount();
     if (matrix.isIdentity()) {
@@ -315,7 +316,7 @@ void QStrokerOps::strokePolygon(const QPointF *points, int pointCount, bool impl
     if (!pointCount)
         return;
 
-    setCurveThresholdFromTransform(matrix);
+    setCurveThresholdFromTransform(QTransform());
     begin(data);
     if (matrix.isIdentity()) {
         moveTo(qt_real_to_fixed(points[0].x()), qt_real_to_fixed(points[0].y()));
@@ -356,7 +357,7 @@ void QStrokerOps::strokeEllipse(const QRectF &rect, void *data, const QTransform
         }
     }
 
-    setCurveThresholdFromTransform(matrix);
+    setCurveThresholdFromTransform(QTransform());
     begin(data);
     moveTo(qt_real_to_fixed(start.x()), qt_real_to_fixed(start.y()));
     for (int i=0; i<12; i+=3) {
@@ -1142,7 +1143,7 @@ void QDashStroker::processCurrentSubpath()
 
     QPainterPath dashPath;
 
-    QSubpathFlatIterator it(&m_elements, m_curveThreshold);
+    QSubpathFlatIterator it(&m_elements, m_dashThreshold);
     qfixed2d prev = it.next();
 
     bool clipping = !m_clip_rect.isEmpty();
diff --git a/src/gui/painting/qstroker_p.h b/src/gui/painting/qstroker_p.h
index d646135..5607a8e 100644
--- a/src/gui/painting/qstroker_p.h
+++ b/src/gui/painting/qstroker_p.h
@@ -168,7 +168,7 @@ public:
     {
         qreal scale;
         qt_scaleForTransform(transform, &scale);
-        setCurveThreshold(scale == 0 ? qreal(0.5) : (qreal(0.5) / scale));
+        m_dashThreshold = scale == 0 ? qreal(0.5) : (qreal(0.5) / scale);
     }
 
     void setCurveThreshold(qfixed threshold) { m_curveThreshold = threshold; }
@@ -184,6 +184,7 @@ protected:
 
     QRectF m_clip_rect;
     qfixed m_curveThreshold;
+    qfixed m_dashThreshold;
 
     void *m_customData;
     qStrokerMoveToHook m_moveTo;
-- 
cgit v0.12


From acc1dc498ea733bab2a1f5ef9983829adbbf5735 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 29 Sep 2010 12:56:38 +0200
Subject: Fix double painting when adding an item into a linear layout

the problem was that the item is first painted at its default position,
then moved by the layout and finally repainted.
We now made sure the item is laid out before the first paint event
occurs.

Task-number: QTBUG-13865
Reviewed-by: bnilsen
(cherry picked from commit 33f525e636ef8fa64a15d3e66c56adaea0075bda)
---
 src/gui/graphicsview/qgraphicslinearlayout.cpp     |  8 +++--
 tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 40 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp
index 1588364..7e8d19f 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp
@@ -275,13 +275,17 @@ void QGraphicsLinearLayout::insertItem(int index, QGraphicsLayoutItem *item)
         qWarning("QGraphicsLinearLayout::insertItem: cannot insert itself");
         return;
     }
+    Q_ASSERT(item);
+
+    //the order of the following instructions is very important because
+    //invalidating the layout before adding the child item will make the layout happen
+    //before we try to paint the item
+    invalidate();
     d->addChildLayoutItem(item);
 
-    Q_ASSERT(item);
     d->fixIndex(&index);
     d->engine.insertRow(index, d->orientation);
     new QGridLayoutItem(&d->engine, item, d->gridRow(index), d->gridColumn(index), 1, 1, 0, index);
-    invalidate();
 }
 
 /*!
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index ddc4f73..7f24ddc 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -184,6 +184,7 @@ private slots:
     void task250119_shortcutContext();
     void QT_BUG_6544_tabFocusFirstUnsetWhenRemovingItems();
     void QT_BUG_12056_tabFocusFirstUnsetWhenRemovingItems();
+    void QT_BUG_13865_doublePaintWhenAddingASubItem();
 };
 
 
@@ -3321,6 +3322,45 @@ void tst_QGraphicsWidget::QT_BUG_12056_tabFocusFirstUnsetWhenRemovingItems()
     //This should not crash
 }
 
+
+struct GreenWidget : public QGraphicsWidget
+{
+    GreenWidget() : count(0)
+    {
+    }
+
+    void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * )
+    {
+        count++;
+        painter->setPen(Qt::green);
+        painter->drawRect(option->rect.adjusted(0,0,-1,-1));
+    }
+
+    int count;
+};
+
+void tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    QGraphicsWidget *widget =  new QGraphicsWidget;
+    widget->resize(100, 100);
+    scene.addItem(widget);
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(widget);
+
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+
+
+    GreenWidget *sub =  new GreenWidget;
+    layout->addItem(sub);
+
+    QTest::qWait(100);
+    QCOMPARE(sub->count, 1); //it should only be painted once
+
+}
+
+
 QTEST_MAIN(tst_QGraphicsWidget)
 #include "tst_qgraphicswidget.moc"
 
-- 
cgit v0.12


From a808b5e596bdd2a0f9801e4acf726066d7b9aafd Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Mon, 27 Sep 2010 11:39:05 +0200
Subject: Doc update for the support of MSVC 2010 64-bit

MS has released a hotfix for the support of MSVC 2010 64-bit.
It fixes the optimizer that could generate code that crashes.

Reviewed-by: Trust-Me
Task-number: QTBUG-11445
(cherry picked from commit ce2a273bab9b9094a1f0f3f60309797e11e59404)
---
 doc/src/platforms/compiler-notes.qdoc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
index 3870e8f..bcf7cb4 100644
--- a/doc/src/platforms/compiler-notes.qdoc
+++ b/doc/src/platforms/compiler-notes.qdoc
@@ -267,8 +267,9 @@
     for more information.
     
     There currently is a problem when compiling Qt with Visual Studio 2010 for 64-bit.
-    Its optimizer causes trouble and crashes for the release builds and it is not supported
-    in that configuration. See task http://bugreports.qt.nokia.com/browse/QTBUG-11445.
+    Its optimizer causes trouble and generates code that crashes for the release builds.
+    To avoid the crashes, You need to apply the hotfix in the following article
+    http://support.microsoft.com/kb/2280741.
 
     \section1 IBM xlC (AIX)
 
-- 
cgit v0.12


From 9dc4889b8ae8c598a671c0fab3b71cf128cd7311 Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Thu, 30 Sep 2010 11:43:10 +0200
Subject: Build fix for -qtnamespace.

Reviewed-by: Thiago Macieira
(cherry picked from commit b8089f0b7a0fef9318070aea9c8344bfe987bac9)
---
 src/corelib/plugin/qsystemlibrary.cpp | 5 +++++
 src/corelib/plugin/qsystemlibrary_p.h | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp
index eeb142b..1b8d8fe 100644
--- a/src/corelib/plugin/qsystemlibrary.cpp
+++ b/src/corelib/plugin/qsystemlibrary.cpp
@@ -77,6 +77,9 @@
     in the documentation for LoadLibrary for Windows CE at MSDN.
     (http://msdn.microsoft.com/en-us/library/ms886736.aspx)
 */
+
+QT_BEGIN_NAMESPACE
+
 #if defined(Q_OS_WINCE)
 HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */)
 {
@@ -134,3 +137,5 @@ HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirect
 }
 
 #endif  //Q_OS_WINCE
+
+QT_END_NAMESPACE
diff --git a/src/corelib/plugin/qsystemlibrary_p.h b/src/corelib/plugin/qsystemlibrary_p.h
index 3251a3c..8000a61 100644
--- a/src/corelib/plugin/qsystemlibrary_p.h
+++ b/src/corelib/plugin/qsystemlibrary_p.h
@@ -47,6 +47,8 @@
 #include <qt_windows.h>
 #include <QtCore/qstring.h>
 
+QT_BEGIN_NAMESPACE
+
 class QSystemLibrary
 {
 public:
@@ -101,6 +103,8 @@ private:
     bool m_didLoad;
 };
 
+QT_END_NAMESPACE
+
 #endif  //Q_OS_WIN
 
 #endif  //QSYSTEMLIBRARY_P_H
-- 
cgit v0.12


From fb439760468f55d7884f5b14172fff9cc0a2107f Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Thu, 30 Sep 2010 11:38:14 +0200
Subject: Fixed a layout issue where you could get NaN as dimensions

The problem is that with empty layouts we could sometimes divide by 0.
Note: This doesn't fix the whole task...

Task-number: QTBUG-13547
Reviewed-by: ogoffart
(cherry picked from commit c1f9978c9d61bcbdb2f280185a3abdea13d7f532)
---
 src/gui/graphicsview/qgridlayoutengine.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index 4fba5ff..ae5bf90 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -306,20 +306,19 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
                         ultimatePreferredSize = ultimatePreferredSize * 3 / 2;
                         ultimateSumPreferredSizes = ultimateSumPreferredSizes * 3 / 2;
 
-                        qreal ultimateFactor = (stretch * ultimateSumPreferredSizes
-                                                / sumStretches)
-                                               - (box.q_preferredSize);
-                        qreal transitionalFactor = sumCurrentAvailable
-                                                   * (ultimatePreferredSize - box.q_preferredSize)
-                                                   / (ultimateSumPreferredSizes
-                                                      - sumPreferredSizes);
-
-                        qreal alpha = qMin(sumCurrentAvailable,
-                                           ultimateSumPreferredSizes - sumPreferredSizes);
                         qreal beta = ultimateSumPreferredSizes - sumPreferredSizes;
+                        if (!beta) {
+                            factors[i] = 1;
+                        } else {
+                            qreal alpha = qMin(sumCurrentAvailable, beta);
+                            qreal ultimateFactor = (stretch * ultimateSumPreferredSizes / sumStretches)
+                                                   - (box.q_preferredSize);
+                            qreal transitionalFactor = sumCurrentAvailable * (ultimatePreferredSize - box.q_preferredSize) / beta;
+
+                            factors[i] = ((alpha * ultimateFactor)
+                                          + ((beta - alpha) * transitionalFactor)) / beta;
+                        }
 
-                        factors[i] = ((alpha * ultimateFactor)
-                                      + ((beta - alpha) * transitionalFactor)) / beta;
                     }
                     sumFactors += factors[i];
                     if (desired < sumCurrentAvailable)
-- 
cgit v0.12


From 8eccccd6306bc5ec8cbe30243e7e96f5367f0acb Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 5 Oct 2010 20:11:47 +1000
Subject: Update .def files for recent cherry-picks.

---
 src/s60installs/bwins/QtDeclarativeu.def | 131 ++++++++++++++++++++++++++--
 src/s60installs/bwins/QtGuiu.def         |   2 +
 src/s60installs/eabi/QtDeclarativeu.def  | 144 +++++++++++++++++++++++++++++--
 3 files changed, 267 insertions(+), 10 deletions(-)

diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index bd2026d..581c3b8 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -142,7 +142,7 @@ EXPORTS
 	?setEnumOrFlag@QMetaPropertyBuilder@@QAEX_N@Z @ 141 NONAME ; void QMetaPropertyBuilder::setEnumOrFlag(bool)
 	?getStaticMetaObject@QDeclarativeRectangle@@SAABUQMetaObject@@XZ @ 142 NONAME ; struct QMetaObject const & QDeclarativeRectangle::getStaticMetaObject(void)
 	?isValid@QDeclarativeProperty@@QBE_NXZ @ 143 NONAME ; bool QDeclarativeProperty::isValid(void) const
-	?isConnected@QDeclarativeDebugClient@@QBE_NXZ @ 144 NONAME ; bool QDeclarativeDebugClient::isConnected(void) const
+	?isConnected@QDeclarativeDebugClient@@QBE_NXZ @ 144 NONAME ABSENT ; bool QDeclarativeDebugClient::isConnected(void) const
 	?enabled@QDeclarativeBinding@@QBE_NXZ @ 145 NONAME ; bool QDeclarativeBinding::enabled(void) const
 	?setSource@QDeclarativeView@@QAEXABVQUrl@@@Z @ 146 NONAME ; void QDeclarativeView::setSource(class QUrl const &)
 	??_EQDeclarativeDebugService@@UAE@I@Z @ 147 NONAME ; QDeclarativeDebugService::~QDeclarativeDebugService(unsigned int)
@@ -461,7 +461,7 @@ EXPORTS
 	?qt_metacall@QDeclarativeContext@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 460 NONAME ; int QDeclarativeContext::qt_metacall(enum QMetaObject::Call, int, void * *)
 	??_EQDeclarativeValueType@@UAE@I@Z @ 461 NONAME ; QDeclarativeValueType::~QDeclarativeValueType(unsigned int)
 	?qt_metacall@QDeclarativeState@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 462 NONAME ; int QDeclarativeState::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?isEnabled@QDeclarativeDebugService@@QBE_NXZ @ 463 NONAME ; bool QDeclarativeDebugService::isEnabled(void) const
+	?isEnabled@QDeclarativeDebugService@@QBE_NXZ @ 463 NONAME ABSENT ; bool QDeclarativeDebugService::isEnabled(void) const
 	?stateChanged@QDeclarativeDebugWatch@@IAEXW4State@1@@Z @ 464 NONAME ; void QDeclarativeDebugWatch::stateChanged(enum QDeclarativeDebugWatch::State)
 	??0QMetaMethodBuilder@@AAE@PBVQMetaObjectBuilder@@H@Z @ 465 NONAME ; QMetaMethodBuilder::QMetaMethodBuilder(class QMetaObjectBuilder const *, int)
 	??4QDeclarativeListReference@@QAEAAV0@ABV0@@Z @ 466 NONAME ; class QDeclarativeListReference & QDeclarativeListReference::operator=(class QDeclarativeListReference const &)
@@ -1028,7 +1028,7 @@ EXPORTS
 	?qmlInfo@@YA?AVQDeclarativeInfo@@PBVQObject@@ABVQDeclarativeError@@@Z @ 1027 NONAME ; class QDeclarativeInfo qmlInfo(class QObject const *, class QDeclarativeError const &)
 	?staticMetaObject@QDeclarativeText@@2UQMetaObject@@B @ 1028 NONAME ; struct QMetaObject const QDeclarativeText::staticMetaObject
 	?color@QDeclarativeRectangle@@QBE?AVQColor@@XZ @ 1029 NONAME ; class QColor QDeclarativeRectangle::color(void) const
-	?isEnabled@QDeclarativeDebugClient@@QBE_NXZ @ 1030 NONAME ; bool QDeclarativeDebugClient::isEnabled(void) const
+	?isEnabled@QDeclarativeDebugClient@@QBE_NXZ @ 1030 NONAME ABSENT ; bool QDeclarativeDebugClient::isEnabled(void) const
 	?send@QPacketProtocol@@QAEXABVQPacket@@@Z @ 1031 NONAME ; void QPacketProtocol::send(class QPacket const &)
 	?width@QDeclarativePixmap@@QBEHXZ @ 1032 NONAME ; int QDeclarativePixmap::width(void) const
 	?error@QDeclarativeCustomParser@@IAEXABVQDeclarativeCustomParserNode@@ABVQString@@@Z @ 1033 NONAME ; void QDeclarativeCustomParser::error(class QDeclarativeCustomParserNode const &, class QString const &)
@@ -1147,7 +1147,7 @@ EXPORTS
 	?removeNotifySignal@QMetaPropertyBuilder@@QAEXXZ @ 1146 NONAME ; void QMetaPropertyBuilder::removeNotifySignal(void)
 	?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 1147 NONAME ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *)
 	?setImportPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 1148 NONAME ; void QDeclarativeEngine::setImportPathList(class QStringList const &)
-	?enabledChanged@QDeclarativeDebugService@@MAEX_N@Z @ 1149 NONAME ; void QDeclarativeDebugService::enabledChanged(bool)
+	?enabledChanged@QDeclarativeDebugService@@MAEX_N@Z @ 1149 NONAME ABSENT ; void QDeclarativeDebugService::enabledChanged(bool)
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugWatch@@ABVQDeclarativeDebugObjectReference@@PAVQObject@@@Z @ 1150 NONAME ; class QDeclarativeDebugWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugObjectReference const &, class QObject *)
 	?asAST@Variant@QDeclarativeParser@@QBEPAVNode@AST@QDeclarativeJS@@XZ @ 1151 NONAME ; class QDeclarativeJS::AST::Node * QDeclarativeParser::Variant::asAST(void) const
 	?indexOfClassInfo@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1152 NONAME ; int QMetaObjectBuilder::indexOfClassInfo(class QByteArray const &)
@@ -1386,7 +1386,7 @@ EXPORTS
 	?qmlTypes@QDeclarativeMetaType@@SA?AV?$QList@PAVQDeclarativeType@@@@XZ @ 1385 NONAME ; class QList<class QDeclarativeType *> QDeclarativeMetaType::qmlTypes(void)
 	?valueTypeCoreIndex@QDeclarativePropertyPrivate@@SAHABVQDeclarativeProperty@@@Z @ 1386 NONAME ; int QDeclarativePropertyPrivate::valueTypeCoreIndex(class QDeclarativeProperty const &)
 	?writeEnumProperty@QDeclarativePropertyPrivate@@SA_NABVQMetaProperty@@HPAVQObject@@ABVQVariant@@H@Z @ 1387 NONAME ; bool QDeclarativePropertyPrivate::writeEnumProperty(class QMetaProperty const &, int, class QObject *, class QVariant const &, int)
-	?setEnabled@QDeclarativeDebugClient@@QAEX_N@Z @ 1388 NONAME ; void QDeclarativeDebugClient::setEnabled(bool)
+	?setEnabled@QDeclarativeDebugClient@@QAEX_N@Z @ 1388 NONAME ABSENT ; void QDeclarativeDebugClient::setEnabled(bool)
 	??1QMetaObjectBuilder@@UAE@XZ @ 1389 NONAME ; QMetaObjectBuilder::~QMetaObjectBuilder(void)
 	?tr@QDeclarativeStateOperation@@SA?AVQString@@PBD0@Z @ 1390 NONAME ; class QString QDeclarativeStateOperation::tr(char const *, char const *)
 	?clear@QPacket@@QAEXXZ @ 1391 NONAME ; void QPacket::clear(void)
@@ -1717,4 +1717,125 @@ EXPORTS
 	?canMove@QDeclarativeListModel@@ABE_NHHH@Z @ 1716 NONAME ; bool QDeclarativeListModel::canMove(int, int, int) const
 	?getScriptEngine@QDeclarativeDebugHelper@@SAPAVQScriptEngine@@PAVQDeclarativeEngine@@@Z @ 1717 NONAME ; class QScriptEngine * QDeclarativeDebugHelper::getScriptEngine(class QDeclarativeEngine *)
 	?setAnimationSlowDownFactor@QDeclarativeDebugHelper@@SAXM@Z @ 1718 NONAME ; void QDeclarativeDebugHelper::setAnimationSlowDownFactor(float)
+	?add@QDeclarativeBasePositioner@@QBEPAVQDeclarativeTransition@@XZ @ 1719 NONAME ; class QDeclarativeTransition * QDeclarativeBasePositioner::add(void) const
+	?setLoops@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1720 NONAME ; void QDeclarativeAbstractAnimation::setLoops(int)
+	?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1721 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *)
+	?tr@QDeclarativeBasePositioner@@SA?AVQString@@PBD0@Z @ 1722 NONAME ; class QString QDeclarativeBasePositioner::tr(char const *, char const *)
+	?staticMetaObject@QDeclarativeAbstractAnimation@@2UQMetaObject@@B @ 1723 NONAME ; struct QMetaObject const QDeclarativeAbstractAnimation::staticMetaObject
+	?setMove@QDeclarativeBasePositioner@@QAEXPAVQDeclarativeTransition@@@Z @ 1724 NONAME ; void QDeclarativeBasePositioner::setMove(class QDeclarativeTransition *)
+	?setRunning@QDeclarativeTimer@@QAEX_N@Z @ 1725 NONAME ; void QDeclarativeTimer::setRunning(bool)
+	?tr@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1726 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *)
+	?qt_metacall@QDeclarativeTimer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1727 NONAME ; int QDeclarativeTimer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setPaused@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1728 NONAME ; void QDeclarativeAbstractAnimation::setPaused(bool)
+	?d_func@QDeclarativeBasePositioner@@ABEPBVQDeclarativeBasePositionerPrivate@@XZ @ 1729 NONAME ; class QDeclarativeBasePositionerPrivate const * QDeclarativeBasePositioner::d_func(void) const
+	?setRepeating@QDeclarativeTimer@@QAEX_N@Z @ 1730 NONAME ; void QDeclarativeTimer::setRepeating(bool)
+	?interval@QDeclarativeTimer@@QBEHXZ @ 1731 NONAME ; int QDeclarativeTimer::interval(void) const
+	?start@QDeclarativeTimer@@QAEXXZ @ 1732 NONAME ; void QDeclarativeTimer::start(void)
+	?transition@QDeclarativeAbstractAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@1@@Z @ 1733 NONAME ; void QDeclarativeAbstractAnimation::transition(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, enum QDeclarativeAbstractAnimation::TransitionDirection)
+	?componentComplete@QDeclarativeAbstractAnimation@@UAEXXZ @ 1734 NONAME ; void QDeclarativeAbstractAnimation::componentComplete(void)
+	?statusChanged@QDeclarativeDebugService@@MAEXW4Status@1@@Z @ 1735 NONAME ; void QDeclarativeDebugService::statusChanged(enum QDeclarativeDebugService::Status)
+	?runningChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1736 NONAME ; void QDeclarativeAbstractAnimation::runningChanged(bool)
+	?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1737 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *, int)
+	??_EQDeclarativeBasePositioner@@UAE@I@Z @ 1738 NONAME ; QDeclarativeBasePositioner::~QDeclarativeBasePositioner(unsigned int)
+	?metaObject@QDeclarativeTimer@@UBEPBUQMetaObject@@XZ @ 1739 NONAME ; struct QMetaObject const * QDeclarativeTimer::metaObject(void) const
+	?setGroup@QDeclarativeAbstractAnimation@@QAEXPAVQDeclarativeAnimationGroup@@@Z @ 1740 NONAME ; void QDeclarativeAbstractAnimation::setGroup(class QDeclarativeAnimationGroup *)
+	?isRepeating@QDeclarativeTimer@@QBE_NXZ @ 1741 NONAME ; bool QDeclarativeTimer::isRepeating(void) const
+	?setTriggeredOnStart@QDeclarativeTimer@@QAEX_N@Z @ 1742 NONAME ; void QDeclarativeTimer::setTriggeredOnStart(bool)
+	?currentTime@QDeclarativeAbstractAnimation@@QAEHXZ @ 1743 NONAME ; int QDeclarativeAbstractAnimation::currentTime(void)
+	?status@QDeclarativeEngineDebug@@QBE?AW4Status@1@XZ @ 1744 NONAME ; enum QDeclarativeEngineDebug::Status QDeclarativeEngineDebug::status(void) const
+	??1QDeclarativeAbstractAnimation@@UAE@XZ @ 1745 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(void)
+	?triggered@QDeclarativeTimer@@IAEXXZ @ 1746 NONAME ; void QDeclarativeTimer::triggered(void)
+	?getStaticMetaObject@QDeclarativeBasePositioner@@SAABUQMetaObject@@XZ @ 1747 NONAME ; struct QMetaObject const & QDeclarativeBasePositioner::getStaticMetaObject(void)
+	?finished@QDeclarativeTimer@@AAEXXZ @ 1748 NONAME ; void QDeclarativeTimer::finished(void)
+	?pausedChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1749 NONAME ; void QDeclarativeAbstractAnimation::pausedChanged(bool)
+	?complete@QDeclarativeAbstractAnimation@@QAEXXZ @ 1750 NONAME ; void QDeclarativeAbstractAnimation::complete(void)
+	?setRunning@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1751 NONAME ; void QDeclarativeAbstractAnimation::setRunning(bool)
+	?trUtf8@QDeclarativeBasePositioner@@SA?AVQString@@PBD0H@Z @ 1752 NONAME ; class QString QDeclarativeBasePositioner::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeBasePositioner@@SA?AVQString@@PBD0@Z @ 1753 NONAME ; class QString QDeclarativeBasePositioner::trUtf8(char const *, char const *)
+	?completed@QDeclarativeAbstractAnimation@@IAEXXZ @ 1754 NONAME ; void QDeclarativeAbstractAnimation::completed(void)
+	?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1755 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *)
+	?loopCountChanged@QDeclarativeAbstractAnimation@@IAEXH@Z @ 1756 NONAME ; void QDeclarativeAbstractAnimation::loopCountChanged(int)
+	?repeatChanged@QDeclarativeTimer@@IAEXXZ @ 1757 NONAME ; void QDeclarativeTimer::repeatChanged(void)
+	?setDisableUserControl@QDeclarativeAbstractAnimation@@QAEXXZ @ 1758 NONAME ; void QDeclarativeAbstractAnimation::setDisableUserControl(void)
+	?componentComplete@QDeclarativeBasePositioner@@MAEXXZ @ 1759 NONAME ; void QDeclarativeBasePositioner::componentComplete(void)
+	?setDefaultTarget@QDeclarativeAbstractAnimation@@QAEXABVQDeclarativeProperty@@@Z @ 1760 NONAME ; void QDeclarativeAbstractAnimation::setDefaultTarget(class QDeclarativeProperty const &)
+	?staticMetaObject@QDeclarativeBasePositioner@@2UQMetaObject@@B @ 1761 NONAME ; struct QMetaObject const QDeclarativeBasePositioner::staticMetaObject
+	?triggeredOnStart@QDeclarativeTimer@@QBE_NXZ @ 1762 NONAME ; bool QDeclarativeTimer::triggeredOnStart(void) const
+	?notifyRunningChanged@QDeclarativeAbstractAnimation@@AAEX_N@Z @ 1763 NONAME ; void QDeclarativeAbstractAnimation::notifyRunningChanged(bool)
+	?statusChanged@QDeclarativeDebugClient@@MAEXW4Status@1@@Z @ 1764 NONAME ; void QDeclarativeDebugClient::statusChanged(enum QDeclarativeDebugClient::Status)
+	??0QDeclarativeBasePositioner@@IAE@AAVQDeclarativeBasePositionerPrivate@@W4PositionerType@0@PAVQDeclarativeItem@@@Z @ 1765 NONAME ; QDeclarativeBasePositioner::QDeclarativeBasePositioner(class QDeclarativeBasePositionerPrivate &, enum QDeclarativeBasePositioner::PositionerType, class QDeclarativeItem *)
+	?componentComplete@QDeclarativeTimer@@MAEXXZ @ 1766 NONAME ; void QDeclarativeTimer::componentComplete(void)
+	?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1767 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *)
+	?isRunning@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1768 NONAME ; bool QDeclarativeAbstractAnimation::isRunning(void) const
+	?d_func@QDeclarativeAbstractAnimation@@ABEPBVQDeclarativeAbstractAnimationPrivate@@XZ @ 1769 NONAME ; class QDeclarativeAbstractAnimationPrivate const * QDeclarativeAbstractAnimation::d_func(void) const
+	??_EQDeclarativeAbstractAnimation@@UAE@I@Z @ 1770 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(unsigned int)
+	??0QDeclarativeBasePositioner@@QAE@W4PositionerType@0@PAVQDeclarativeItem@@@Z @ 1771 NONAME ; QDeclarativeBasePositioner::QDeclarativeBasePositioner(enum QDeclarativeBasePositioner::PositionerType, class QDeclarativeItem *)
+	?qt_metacall@QDeclarativeBasePositioner@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1772 NONAME ; int QDeclarativeBasePositioner::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?status@QDeclarativeDebugClient@@QBE?AW4Status@1@XZ @ 1773 NONAME ; enum QDeclarativeDebugClient::Status QDeclarativeDebugClient::status(void) const
+	?prePositioning@QDeclarativeBasePositioner@@IAEXXZ @ 1774 NONAME ; void QDeclarativeBasePositioner::prePositioning(void)
+	?finishApplyTransitions@QDeclarativeBasePositioner@@IAEXXZ @ 1775 NONAME ; void QDeclarativeBasePositioner::finishApplyTransitions(void)
+	?d_func@QDeclarativeAbstractAnimation@@AAEPAVQDeclarativeAbstractAnimationPrivate@@XZ @ 1776 NONAME ; class QDeclarativeAbstractAnimationPrivate * QDeclarativeAbstractAnimation::d_func(void)
+	?componentFinalized@QDeclarativeAbstractAnimation@@AAEXXZ @ 1777 NONAME ; void QDeclarativeAbstractAnimation::componentFinalized(void)
+	??_EQDeclarativeTimer@@UAE@I@Z @ 1778 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(unsigned int)
+	?pause@QDeclarativeAbstractAnimation@@QAEXXZ @ 1779 NONAME ; void QDeclarativeAbstractAnimation::pause(void)
+	?stop@QDeclarativeTimer@@QAEXXZ @ 1780 NONAME ; void QDeclarativeTimer::stop(void)
+	?timelineComplete@QDeclarativeAbstractAnimation@@AAEXXZ @ 1781 NONAME ; void QDeclarativeAbstractAnimation::timelineComplete(void)
+	?d_func@QDeclarativeBasePositioner@@AAEPAVQDeclarativeBasePositionerPrivate@@XZ @ 1782 NONAME ; class QDeclarativeBasePositionerPrivate * QDeclarativeBasePositioner::d_func(void)
+	?setAlwaysRunToEnd@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1783 NONAME ; void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool)
+	?classBegin@QDeclarativeAbstractAnimation@@UAEXXZ @ 1784 NONAME ; void QDeclarativeAbstractAnimation::classBegin(void)
+	?d_func@QDeclarativeTimer@@AAEPAVQDeclarativeTimerPrivate@@XZ @ 1785 NONAME ; class QDeclarativeTimerPrivate * QDeclarativeTimer::d_func(void)
+	?spacing@QDeclarativeBasePositioner@@QBEHXZ @ 1786 NONAME ; int QDeclarativeBasePositioner::spacing(void) const
+	??0QDeclarativeAbstractAnimation@@QAE@PAVQObject@@@Z @ 1787 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QObject *)
+	?metaObject@QDeclarativeAbstractAnimation@@UBEPBUQMetaObject@@XZ @ 1788 NONAME ; struct QMetaObject const * QDeclarativeAbstractAnimation::metaObject(void) const
+	?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1789 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *, int)
+	?started@QDeclarativeAbstractAnimation@@IAEXXZ @ 1790 NONAME ; void QDeclarativeAbstractAnimation::started(void)
+	?setInterval@QDeclarativeTimer@@QAEXH@Z @ 1791 NONAME ; void QDeclarativeTimer::setInterval(int)
+	?statusChanged@QDeclarativeEngineDebug@@IAEXW4Status@1@@Z @ 1792 NONAME ; void QDeclarativeEngineDebug::statusChanged(enum QDeclarativeEngineDebug::Status)
+	?d_func@QDeclarativeTimer@@ABEPBVQDeclarativeTimerPrivate@@XZ @ 1793 NONAME ; class QDeclarativeTimerPrivate const * QDeclarativeTimer::d_func(void) const
+	?setSpacing@QDeclarativeBasePositioner@@QAEXH@Z @ 1794 NONAME ; void QDeclarativeBasePositioner::setSpacing(int)
+	?staticMetaObject@QDeclarativeTimer@@2UQMetaObject@@B @ 1795 NONAME ; struct QMetaObject const QDeclarativeTimer::staticMetaObject
+	?positionY@QDeclarativeBasePositioner@@IAEXHABVPositionedItem@1@@Z @ 1796 NONAME ; void QDeclarativeBasePositioner::positionY(int, class QDeclarativeBasePositioner::PositionedItem const &)
+	?qt_metacast@QDeclarativeAbstractAnimation@@UAEPAXPBD@Z @ 1797 NONAME ; void * QDeclarativeAbstractAnimation::qt_metacast(char const *)
+	?setAdd@QDeclarativeBasePositioner@@QAEXPAVQDeclarativeTransition@@@Z @ 1798 NONAME ; void QDeclarativeBasePositioner::setAdd(class QDeclarativeTransition *)
+	?setCurrentTime@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1799 NONAME ; void QDeclarativeAbstractAnimation::setCurrentTime(int)
+	?attachedPropertiesId@QDeclarativeType@@QBEHXZ @ 1800 NONAME ; int QDeclarativeType::attachedPropertiesId(void) const
+	?positionX@QDeclarativeBasePositioner@@IAEXHABVPositionedItem@1@@Z @ 1801 NONAME ; void QDeclarativeBasePositioner::positionX(int, class QDeclarativeBasePositioner::PositionedItem const &)
+	?restart@QDeclarativeAbstractAnimation@@QAEXXZ @ 1802 NONAME ; void QDeclarativeAbstractAnimation::restart(void)
+	?itemChange@QDeclarativeBasePositioner@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1803 NONAME ; class QVariant QDeclarativeBasePositioner::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &)
+	??0QDeclarativeAbstractAnimation@@IAE@AAVQDeclarativeAbstractAnimationPrivate@@PAVQObject@@@Z @ 1804 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QDeclarativeAbstractAnimationPrivate &, class QObject *)
+	?resume@QDeclarativeAbstractAnimation@@QAEXXZ @ 1805 NONAME ; void QDeclarativeAbstractAnimation::resume(void)
+	?runningChanged@QDeclarativeTimer@@IAEXXZ @ 1806 NONAME ; void QDeclarativeTimer::runningChanged(void)
+	?ticked@QDeclarativeTimer@@AAEXXZ @ 1807 NONAME ; void QDeclarativeTimer::ticked(void)
+	?graphicsWidgetGeometryChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1808 NONAME ; void QDeclarativeBasePositioner::graphicsWidgetGeometryChanged(void)
+	?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1809 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *, int)
+	??0QDeclarativeTimer@@QAE@PAVQObject@@@Z @ 1810 NONAME ; QDeclarativeTimer::QDeclarativeTimer(class QObject *)
+	?loops@QDeclarativeAbstractAnimation@@QBEHXZ @ 1811 NONAME ; int QDeclarativeAbstractAnimation::loops(void) const
+	?setTarget@QDeclarativeAbstractAnimation@@EAEXABVQDeclarativeProperty@@@Z @ 1812 NONAME ; void QDeclarativeAbstractAnimation::setTarget(class QDeclarativeProperty const &)
+	?alwaysRunToEnd@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1813 NONAME ; bool QDeclarativeAbstractAnimation::alwaysRunToEnd(void) const
+	?tr@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1814 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *, int)
+	?status@QDeclarativeDebugService@@QBE?AW4Status@1@XZ @ 1815 NONAME ; enum QDeclarativeDebugService::Status QDeclarativeDebugService::status(void) const
+	?intervalChanged@QDeclarativeTimer@@IAEXXZ @ 1816 NONAME ; void QDeclarativeTimer::intervalChanged(void)
+	?isPaused@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1817 NONAME ; bool QDeclarativeAbstractAnimation::isPaused(void) const
+	?getStaticMetaObject@QDeclarativeAbstractAnimation@@SAABUQMetaObject@@XZ @ 1818 NONAME ; struct QMetaObject const & QDeclarativeAbstractAnimation::getStaticMetaObject(void)
+	?group@QDeclarativeAbstractAnimation@@QBEPAVQDeclarativeAnimationGroup@@XZ @ 1819 NONAME ; class QDeclarativeAnimationGroup * QDeclarativeAbstractAnimation::group(void) const
+	?classBegin@QDeclarativeTimer@@MAEXXZ @ 1820 NONAME ; void QDeclarativeTimer::classBegin(void)
+	?restart@QDeclarativeTimer@@QAEXXZ @ 1821 NONAME ; void QDeclarativeTimer::restart(void)
+	?move@QDeclarativeBasePositioner@@QBEPAVQDeclarativeTransition@@XZ @ 1822 NONAME ; class QDeclarativeTransition * QDeclarativeBasePositioner::move(void) const
+	?spacingChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1823 NONAME ; void QDeclarativeBasePositioner::spacingChanged(void)
+	?qt_metacast@QDeclarativeBasePositioner@@UAEPAXPBD@Z @ 1824 NONAME ; void * QDeclarativeBasePositioner::qt_metacast(char const *)
+	??1QDeclarativeTimer@@UAE@XZ @ 1825 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(void)
+	?getStaticMetaObject@QDeclarativeTimer@@SAABUQMetaObject@@XZ @ 1826 NONAME ; struct QMetaObject const & QDeclarativeTimer::getStaticMetaObject(void)
+	?tr@QDeclarativeBasePositioner@@SA?AVQString@@PBD0H@Z @ 1827 NONAME ; class QString QDeclarativeBasePositioner::tr(char const *, char const *, int)
+	??1QDeclarativeBasePositioner@@UAE@XZ @ 1828 NONAME ; QDeclarativeBasePositioner::~QDeclarativeBasePositioner(void)
+	?moveChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1829 NONAME ; void QDeclarativeBasePositioner::moveChanged(void)
+	?qt_metacast@QDeclarativeTimer@@UAEPAXPBD@Z @ 1830 NONAME ; void * QDeclarativeTimer::qt_metacast(char const *)
+	?metaObject@QDeclarativeBasePositioner@@UBEPBUQMetaObject@@XZ @ 1831 NONAME ; struct QMetaObject const * QDeclarativeBasePositioner::metaObject(void) const
+	?alwaysRunToEndChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1832 NONAME ; void QDeclarativeAbstractAnimation::alwaysRunToEndChanged(bool)
+	?triggeredOnStartChanged@QDeclarativeTimer@@IAEXXZ @ 1833 NONAME ; void QDeclarativeTimer::triggeredOnStartChanged(void)
+	?isRunning@QDeclarativeTimer@@QBE_NXZ @ 1834 NONAME ; bool QDeclarativeTimer::isRunning(void) const
+	?update@QDeclarativeTimer@@AAEXXZ @ 1835 NONAME ; void QDeclarativeTimer::update(void)
+	?stop@QDeclarativeAbstractAnimation@@QAEXXZ @ 1836 NONAME ; void QDeclarativeAbstractAnimation::stop(void)
+	?addChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1837 NONAME ; void QDeclarativeBasePositioner::addChanged(void)
+	?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1838 NONAME ; void QDeclarativeAbstractAnimation::start(void)
+	?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1839 NONAME ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *)
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 7805dae..aacc03a 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12892,4 +12892,6 @@ EXPORTS
 	?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12891 NONAME ; void QTapAndHoldGesture::setTimeout(int)
 	?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ; class QString QApplicationPrivate::qmljsDebugArguments
 	?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const
+	?maxTextureHeight@QTextureGlyphCache@@UBEHXZ @ 12894 NONAME ; int QTextureGlyphCache::maxTextureHeight(void) const
+	?maxTextureWidth@QTextureGlyphCache@@UBEHXZ @ 12895 NONAME ; int QTextureGlyphCache::maxTextureWidth(void) const
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 9762c55..b3bb7f5 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -673,7 +673,7 @@ EXPORTS
 	_ZN22QDeclarativeTransitionD0Ev @ 672 NONAME
 	_ZN22QDeclarativeTransitionD1Ev @ 673 NONAME
 	_ZN22QDeclarativeTransitionD2Ev @ 674 NONAME
-	_ZN23QDeclarativeDebugClient10setEnabledEb @ 675 NONAME
+	_ZN23QDeclarativeDebugClient10setEnabledEb @ 675 NONAME ABSENT
 	_ZN23QDeclarativeDebugClient11qt_metacallEN11QMetaObject4CallEiPPv @ 676 NONAME
 	_ZN23QDeclarativeDebugClient11qt_metacastEPKc @ 677 NONAME
 	_ZN23QDeclarativeDebugClient11sendMessageERK10QByteArray @ 678 NONAME
@@ -766,7 +766,7 @@ EXPORTS
 	_ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME
 	_ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME
 	_ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME
-	_ZN24QDeclarativeDebugService14enabledChangedEb @ 768 NONAME
+	_ZN24QDeclarativeDebugService14enabledChangedEb @ 768 NONAME ABSENT
 	_ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME
 	_ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME
 	_ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16
@@ -1390,9 +1390,9 @@ EXPORTS
 	_ZNK22QDeclarativeTransition7toStateEv @ 1389 NONAME
 	_ZNK22QDeclarativeTransition9fromStateEv @ 1390 NONAME
 	_ZNK23QDeclarativeDebugClient10metaObjectEv @ 1391 NONAME
-	_ZNK23QDeclarativeDebugClient11isConnectedEv @ 1392 NONAME
+	_ZNK23QDeclarativeDebugClient11isConnectedEv @ 1392 NONAME ABSENT
 	_ZNK23QDeclarativeDebugClient4nameEv @ 1393 NONAME
-	_ZNK23QDeclarativeDebugClient9isEnabledEv @ 1394 NONAME
+	_ZNK23QDeclarativeDebugClient9isEnabledEv @ 1394 NONAME ABSENT
 	_ZNK23QDeclarativeDomDocument10rootObjectEv @ 1395 NONAME
 	_ZNK23QDeclarativeDomDocument6errorsEv @ 1396 NONAME
 	_ZNK23QDeclarativeDomDocument7importsEv @ 1397 NONAME
@@ -1427,7 +1427,7 @@ EXPORTS
 	_ZNK24QDeclarativeCustomParser12evaluateEnumERK10QByteArray @ 1426 NONAME
 	_ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME
 	_ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME
-	_ZNK24QDeclarativeDebugService9isEnabledEv @ 1429 NONAME
+	_ZNK24QDeclarativeDebugService9isEnabledEv @ 1429 NONAME ABSENT
 	_ZNK24QDeclarativeDomComponent13componentRootEv @ 1430 NONAME
 	_ZNK24QDeclarativeScriptString11scopeObjectEv @ 1431 NONAME
 	_ZNK24QDeclarativeScriptString6scriptEv @ 1432 NONAME
@@ -1749,4 +1749,138 @@ EXPORTS
 	_ZNK21QDeclarativeListModel14inWorkerThreadEv @ 1748 NONAME
 	_ZN23QDeclarativeDebugHelper15getScriptEngineEP18QDeclarativeEngine @ 1749 NONAME
 	_ZN23QDeclarativeDebugHelper26setAnimationSlowDownFactorEf @ 1750 NONAME
+	_ZN17QDeclarativeTimer10classBeginEv @ 1751 NONAME
+	_ZN17QDeclarativeTimer10setRunningEb @ 1752 NONAME
+	_ZN17QDeclarativeTimer11qt_metacallEN11QMetaObject4CallEiPPv @ 1753 NONAME
+	_ZN17QDeclarativeTimer11qt_metacastEPKc @ 1754 NONAME
+	_ZN17QDeclarativeTimer11setIntervalEi @ 1755 NONAME
+	_ZN17QDeclarativeTimer12setRepeatingEb @ 1756 NONAME
+	_ZN17QDeclarativeTimer13repeatChangedEv @ 1757 NONAME
+	_ZN17QDeclarativeTimer14runningChangedEv @ 1758 NONAME
+	_ZN17QDeclarativeTimer15intervalChangedEv @ 1759 NONAME
+	_ZN17QDeclarativeTimer16staticMetaObjectE @ 1760 NONAME DATA 16
+	_ZN17QDeclarativeTimer17componentCompleteEv @ 1761 NONAME
+	_ZN17QDeclarativeTimer19getStaticMetaObjectEv @ 1762 NONAME
+	_ZN17QDeclarativeTimer19setTriggeredOnStartEb @ 1763 NONAME
+	_ZN17QDeclarativeTimer23triggeredOnStartChangedEv @ 1764 NONAME
+	_ZN17QDeclarativeTimer4stopEv @ 1765 NONAME
+	_ZN17QDeclarativeTimer5startEv @ 1766 NONAME
+	_ZN17QDeclarativeTimer6tickedEv @ 1767 NONAME
+	_ZN17QDeclarativeTimer6updateEv @ 1768 NONAME
+	_ZN17QDeclarativeTimer7restartEv @ 1769 NONAME
+	_ZN17QDeclarativeTimer8finishedEv @ 1770 NONAME
+	_ZN17QDeclarativeTimer9triggeredEv @ 1771 NONAME
+	_ZN17QDeclarativeTimerC1EP7QObject @ 1772 NONAME
+	_ZN17QDeclarativeTimerC2EP7QObject @ 1773 NONAME
+	_ZN23QDeclarativeDebugClient13statusChangedENS_6StatusE @ 1774 NONAME
+	_ZN23QDeclarativeDebugClientD0Ev @ 1775 NONAME
+	_ZN23QDeclarativeDebugClientD1Ev @ 1776 NONAME
+	_ZN23QDeclarativeDebugClientD2Ev @ 1777 NONAME
+	_ZN23QDeclarativeEngineDebug13statusChangedENS_6StatusE @ 1778 NONAME
+	_ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME
+	_ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME
+	_ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME
+	_ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME
+	_ZN26QDeclarativeBasePositioner10addChangedEv @ 1783 NONAME
+	_ZN26QDeclarativeBasePositioner10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 1784 NONAME
+	_ZN26QDeclarativeBasePositioner10setSpacingEi @ 1785 NONAME
+	_ZN26QDeclarativeBasePositioner11moveChangedEv @ 1786 NONAME
+	_ZN26QDeclarativeBasePositioner11qt_metacallEN11QMetaObject4CallEiPPv @ 1787 NONAME
+	_ZN26QDeclarativeBasePositioner11qt_metacastEPKc @ 1788 NONAME
+	_ZN26QDeclarativeBasePositioner14prePositioningEv @ 1789 NONAME
+	_ZN26QDeclarativeBasePositioner14spacingChangedEv @ 1790 NONAME
+	_ZN26QDeclarativeBasePositioner16staticMetaObjectE @ 1791 NONAME DATA 16
+	_ZN26QDeclarativeBasePositioner17componentCompleteEv @ 1792 NONAME
+	_ZN26QDeclarativeBasePositioner19getStaticMetaObjectEv @ 1793 NONAME
+	_ZN26QDeclarativeBasePositioner22finishApplyTransitionsEv @ 1794 NONAME
+	_ZN26QDeclarativeBasePositioner29graphicsWidgetGeometryChangedEv @ 1795 NONAME
+	_ZN26QDeclarativeBasePositioner6setAddEP22QDeclarativeTransition @ 1796 NONAME
+	_ZN26QDeclarativeBasePositioner7setMoveEP22QDeclarativeTransition @ 1797 NONAME
+	_ZN26QDeclarativeBasePositioner9positionXEiRKNS_14PositionedItemE @ 1798 NONAME
+	_ZN26QDeclarativeBasePositioner9positionYEiRKNS_14PositionedItemE @ 1799 NONAME
+	_ZN26QDeclarativeBasePositionerC2ENS_14PositionerTypeEP16QDeclarativeItem @ 1800 NONAME
+	_ZN26QDeclarativeBasePositionerC2ER33QDeclarativeBasePositionerPrivateNS_14PositionerTypeEP16QDeclarativeItem @ 1801 NONAME
+	_ZN26QDeclarativeBasePositionerD0Ev @ 1802 NONAME
+	_ZN26QDeclarativeBasePositionerD1Ev @ 1803 NONAME
+	_ZN26QDeclarativeBasePositionerD2Ev @ 1804 NONAME
+	_ZN27QDeclarativeDebugConnectionD0Ev @ 1805 NONAME
+	_ZN27QDeclarativeDebugConnectionD1Ev @ 1806 NONAME
+	_ZN27QDeclarativeDebugConnectionD2Ev @ 1807 NONAME
+	_ZN29QDeclarativeAbstractAnimation10classBeginEv @ 1808 NONAME
+	_ZN29QDeclarativeAbstractAnimation10setRunningEb @ 1809 NONAME
+	_ZN29QDeclarativeAbstractAnimation10transitionER5QListI18QDeclarativeActionERS0_I20QDeclarativePropertyENS_19TransitionDirectionE @ 1810 NONAME
+	_ZN29QDeclarativeAbstractAnimation11currentTimeEv @ 1811 NONAME
+	_ZN29QDeclarativeAbstractAnimation11qt_metacallEN11QMetaObject4CallEiPPv @ 1812 NONAME
+	_ZN29QDeclarativeAbstractAnimation11qt_metacastEPKc @ 1813 NONAME
+	_ZN29QDeclarativeAbstractAnimation13pausedChangedEb @ 1814 NONAME
+	_ZN29QDeclarativeAbstractAnimation14runningChangedEb @ 1815 NONAME
+	_ZN29QDeclarativeAbstractAnimation14setCurrentTimeEi @ 1816 NONAME
+	_ZN29QDeclarativeAbstractAnimation16loopCountChangedEi @ 1817 NONAME
+	_ZN29QDeclarativeAbstractAnimation16setDefaultTargetERK20QDeclarativeProperty @ 1818 NONAME
+	_ZN29QDeclarativeAbstractAnimation16staticMetaObjectE @ 1819 NONAME DATA 16
+	_ZN29QDeclarativeAbstractAnimation16timelineCompleteEv @ 1820 NONAME
+	_ZN29QDeclarativeAbstractAnimation17componentCompleteEv @ 1821 NONAME
+	_ZN29QDeclarativeAbstractAnimation17setAlwaysRunToEndEb @ 1822 NONAME
+	_ZN29QDeclarativeAbstractAnimation18componentFinalizedEv @ 1823 NONAME
+	_ZN29QDeclarativeAbstractAnimation19getStaticMetaObjectEv @ 1824 NONAME
+	_ZN29QDeclarativeAbstractAnimation20notifyRunningChangedEb @ 1825 NONAME
+	_ZN29QDeclarativeAbstractAnimation21alwaysRunToEndChangedEb @ 1826 NONAME
+	_ZN29QDeclarativeAbstractAnimation21setDisableUserControlEv @ 1827 NONAME
+	_ZN29QDeclarativeAbstractAnimation4stopEv @ 1828 NONAME
+	_ZN29QDeclarativeAbstractAnimation5pauseEv @ 1829 NONAME
+	_ZN29QDeclarativeAbstractAnimation5startEv @ 1830 NONAME
+	_ZN29QDeclarativeAbstractAnimation6resumeEv @ 1831 NONAME
+	_ZN29QDeclarativeAbstractAnimation7restartEv @ 1832 NONAME
+	_ZN29QDeclarativeAbstractAnimation7startedEv @ 1833 NONAME
+	_ZN29QDeclarativeAbstractAnimation8completeEv @ 1834 NONAME
+	_ZN29QDeclarativeAbstractAnimation8setGroupEP26QDeclarativeAnimationGroup @ 1835 NONAME
+	_ZN29QDeclarativeAbstractAnimation8setLoopsEi @ 1836 NONAME
+	_ZN29QDeclarativeAbstractAnimation9completedEv @ 1837 NONAME
+	_ZN29QDeclarativeAbstractAnimation9setPausedEb @ 1838 NONAME
+	_ZN29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1839 NONAME
+	_ZN29QDeclarativeAbstractAnimationC2EP7QObject @ 1840 NONAME
+	_ZN29QDeclarativeAbstractAnimationC2ER36QDeclarativeAbstractAnimationPrivateP7QObject @ 1841 NONAME
+	_ZN29QDeclarativeAbstractAnimationD0Ev @ 1842 NONAME
+	_ZN29QDeclarativeAbstractAnimationD1Ev @ 1843 NONAME
+	_ZN29QDeclarativeAbstractAnimationD2Ev @ 1844 NONAME
+	_ZNK16QDeclarativeType20attachedPropertiesIdEv @ 1845 NONAME
+	_ZNK17QDeclarativeTimer10metaObjectEv @ 1846 NONAME
+	_ZNK17QDeclarativeTimer11isRepeatingEv @ 1847 NONAME
+	_ZNK17QDeclarativeTimer16triggeredOnStartEv @ 1848 NONAME
+	_ZNK17QDeclarativeTimer8intervalEv @ 1849 NONAME
+	_ZNK17QDeclarativeTimer9isRunningEv @ 1850 NONAME
+	_ZNK23QDeclarativeDebugClient6statusEv @ 1851 NONAME
+	_ZNK23QDeclarativeEngineDebug6statusEv @ 1852 NONAME
+	_ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME
+	_ZNK26QDeclarativeBasePositioner10metaObjectEv @ 1854 NONAME
+	_ZNK26QDeclarativeBasePositioner3addEv @ 1855 NONAME
+	_ZNK26QDeclarativeBasePositioner4moveEv @ 1856 NONAME
+	_ZNK26QDeclarativeBasePositioner7spacingEv @ 1857 NONAME
+	_ZNK29QDeclarativeAbstractAnimation10metaObjectEv @ 1858 NONAME
+	_ZNK29QDeclarativeAbstractAnimation14alwaysRunToEndEv @ 1859 NONAME
+	_ZNK29QDeclarativeAbstractAnimation5groupEv @ 1860 NONAME
+	_ZNK29QDeclarativeAbstractAnimation5loopsEv @ 1861 NONAME
+	_ZNK29QDeclarativeAbstractAnimation8isPausedEv @ 1862 NONAME
+	_ZNK29QDeclarativeAbstractAnimation9isRunningEv @ 1863 NONAME
+	_ZTI17QDeclarativeTimer @ 1864 NONAME
+	_ZTI26QDeclarativeBasePositioner @ 1865 NONAME
+	_ZTI29QDeclarativeAbstractAnimation @ 1866 NONAME
+	_ZTV17QDeclarativeTimer @ 1867 NONAME
+	_ZTV26QDeclarativeBasePositioner @ 1868 NONAME
+	_ZTV29QDeclarativeAbstractAnimation @ 1869 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimation10classBeginEv @ 1870 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimation17componentCompleteEv @ 1871 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimationD0Ev @ 1872 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimationD1Ev @ 1873 NONAME
+	_ZThn16_N26QDeclarativeBasePositioner17componentCompleteEv @ 1874 NONAME
+	_ZThn16_N26QDeclarativeBasePositionerD0Ev @ 1875 NONAME
+	_ZThn16_N26QDeclarativeBasePositionerD1Ev @ 1876 NONAME
+	_ZThn8_N17QDeclarativeTimer10classBeginEv @ 1877 NONAME
+	_ZThn8_N17QDeclarativeTimer17componentCompleteEv @ 1878 NONAME
+	_ZThn8_N26QDeclarativeBasePositioner10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 1879 NONAME
+	_ZThn8_N26QDeclarativeBasePositionerD0Ev @ 1880 NONAME
+	_ZThn8_N26QDeclarativeBasePositionerD1Ev @ 1881 NONAME
+	_ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1882 NONAME
+	_ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1883 NONAME
+	_ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1884 NONAME
 
-- 
cgit v0.12


From 512e44f4595a807b0eae968521a28659a70eb387 Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Tue, 5 Oct 2010 16:43:33 +0300
Subject: QS60Style: QDateEdit - Layout issues

In portrait orientation, QDateEdit's calendar popup (QCalendarWidget)
does not fit into screen.

As a fix, the pixel metric PM_FocusFrameHMargin, is reduced from
13 to 3 in qHD screens (640*360). Also, the explicit halving of
the pixel metric for QTableViews is removed.

The pixel metric resulted in 27 pixel text margins (2 * pm + 1)for
calendar widgets, which is clearly a bit too much.

Task-number: QTBUG-14126
Reviewed-by: Miikka Heikkinen
(cherry picked from commit b3f895fd97deda0c7c5bfd704c04450e7afee748)
---
 src/gui/styles/qs60style.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 5996032..866e922 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -106,8 +106,8 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** generated pixel metrics ***
 {5,0,-909,0,0,2,0,0,-1,7,12,22,15,15,7,198,-909,-909,-909,20,13,2,0,0,21,7,18,30,3,3,1,-909,-909,0,1,0,0,12,20,15,15,18,18,1,115,18,0,-909,-909,-909,-909,0,0,16,2,-909,0,0,-909,16,-909,-909,-909,-909,32,18,55,24,55,4,4,4,9,13,-909,5,51,11,5,0,3,3,6,8,3,3,-909,2,-909,-909,-909,-909,5,5,3,1,106},
 {5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,8,27,28,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,3,3,5,10,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,2,-909,-909,-909,-909,6,6,3,1,106},
-{7,0,-909,0,0,2,0,0,-1,25,69,46,37,37,9,258,-909,-909,-909,23,19,26,0,0,32,25,72,44,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,13,13,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135},
-{7,0,-909,0,0,2,0,0,-1,25,68,46,37,37,9,258,-909,-909,-909,31,19,6,0,0,32,25,60,52,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,96,35,96,12,12,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135},
+{7,0,-909,0,0,2,0,0,-1,25,69,46,37,37,9,258,-909,-909,-909,23,19,26,0,0,32,25,72,44,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,13,3,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135},
+{7,0,-909,0,0,2,0,0,-1,25,68,46,37,37,9,258,-909,-909,-909,31,19,6,0,0,32,25,60,52,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,96,35,96,12,3,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135},
 {7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,7,32,30,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,6,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,5,6,8,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1,106}
 // *** End of generated data ***
 };
@@ -2530,11 +2530,6 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const
             //without having to define custom pixel metric
             metricValue *= 2;
 
-    if (widget && (metric == PM_FocusFrameHMargin))
-        if (qobject_cast<const QTableView *>(widget))
-            //Halve the focus frame margin for table items
-            metricValue /= 2;
-
     return metricValue;
 }
 
-- 
cgit v0.12


From d566c9cd0a5f403c30cdb65a024cec489bfc46aa Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani.hautakangas@nokia.com>
Date: Mon, 4 Oct 2010 15:42:51 +0300
Subject: Revert "When using complex transformations rendering goes easily off
 by one pixel."

This reverts commit 2acdc634ee895af4a9738c0f6c2496e388afba38.

Originally this fixed QT-3791 but it caused lots of problems in
other sites. So reverting this will fix QT-4001 but reopens
QT-3791. QT-4001 blocks Qt 4.7.1 but QT-3791 doesn't.

Task-number: QT-4001
Reviewed-by: Jason Barron
(cherry picked from commit 25ddfb434f13aa3bbc6ac303aa17dbe9582bf3f0)
---
 src/openvg/qpaintengine_vg.cpp | 158 +++++++++++++++++------------------------
 1 file changed, 66 insertions(+), 92 deletions(-)

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 74395a2..f6d2435 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -196,9 +196,7 @@ public:
 #endif
 
     QTransform transform;   // Currently active transform.
-    bool affineTransform;   // True if the transform is non-projective.
-    bool simpleTransform;   // True if the transform is simple translate
-                            // or 0, 90, 180, and 270 degree rotation
+    bool simpleTransform;   // True if the transform is simple (non-projective).
     qreal penScale;         // Pen scaling factor from "transform".
 
     QTransform pathTransform;  // Calculated VG path transformation.
@@ -379,7 +377,6 @@ void QVGPaintEnginePrivate::init()
     roundRectPath = 0;
 #endif
 
-    affineTransform = true;
     simpleTransform = true;
     pathTransformSet = false;
     penScale = 1.0;
@@ -532,59 +529,12 @@ void QVGPaintEnginePrivate::setTransform
     vgLoadMatrix(mat);
 }
 
-// Determine if a co-ordinate transform is simple enough to allow
-// rectangle-based clipping with vgMask() and rounding translation
-// to integers. Simple transforms most often result from origin translations.
-static inline bool transformIsSimple(const QTransform& transform)
-{
-    QTransform::TransformationType type = transform.type();
-    if (type == QTransform::TxNone || type == QTransform::TxTranslate) {
-        return true;
-    } else if (type == QTransform::TxScale) {
-        // Check for 0 and 180 degree rotations.
-        // (0 might happen after 4 rotations of 90 degrees).
-        qreal m11 = transform.m11();
-        qreal m12 = transform.m12();
-        qreal m21 = transform.m21();
-        qreal m22 = transform.m22();
-        if (m12 == 0.0f && m21 == 0.0f) {
-            if (m11 == 1.0f && m22 == 1.0f)
-                return true; // 0 degrees
-            else if (m11 == -1.0f && m22 == -1.0f)
-                return true; // 180 degrees.
-            if(m11 == 1.0f && m22 == -1.0f)
-                return true; // 0 degrees inverted y.
-            else if(m11 == -1.0f && m22 == 1.0f)
-                return true; // 180 degrees inverted y.
-        }
-    } else if (type == QTransform::TxRotate) {
-        // Check for 90, and 270 degree rotations.
-        qreal m11 = transform.m11();
-        qreal m12 = transform.m12();
-        qreal m21 = transform.m21();
-        qreal m22 = transform.m22();
-        if (m11 == 0.0f && m22 == 0.0f) {
-            if (m12 == 1.0f && m21 == -1.0f)
-                return true; // 90 degrees.
-            else if (m12 == -1.0f && m21 == 1.0f)
-                return true; // 270 degrees.
-            else if (m12 == -1.0f && m21 == -1.0f)
-                return true; // 90 degrees inverted y.
-            else if (m12 == 1.0f && m21 == 1.0f)
-                return true; // 270 degrees inverted y.
-        }
-    }
-    return false;
-}
-
 Q_DECL_IMPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
 
 void QVGPaintEnginePrivate::updateTransform(QPaintDevice *pdev)
 {
     VGfloat devh = pdev->height();
 
-    simpleTransform = transformIsSimple(transform);
-
     // Construct the VG transform by combining the Qt transform with
     // the following viewport transformation:
     //        | 1  0  0   |
@@ -607,9 +557,9 @@ void QVGPaintEnginePrivate::updateTransform(QPaintDevice *pdev)
         // so we will have to convert the co-ordinates ourselves.
         // Change the matrix to just the viewport transformation.
         pathTransform = viewport;
-        affineTransform = false;
+        simpleTransform = false;
     } else {
-        affineTransform = true;
+        simpleTransform = true;
     }
     pathTransformSet = false;
 
@@ -638,7 +588,7 @@ VGPath QVGPaintEnginePrivate::vectorPathToVGPath(const QVectorPath& path)
     // Size is sufficient segments for drawRoundedRect() paths.
     QVarLengthArray<VGubyte, 20> segments;
 
-    if (sizeof(qreal) == sizeof(VGfloat) && elements && affineTransform) {
+    if (sizeof(qreal) == sizeof(VGfloat) && elements && simpleTransform) {
         // If Qt was compiled with qreal the same size as VGfloat,
         // then convert the segment types and use the incoming
         // points array directly.
@@ -673,7 +623,7 @@ VGPath QVGPaintEnginePrivate::vectorPathToVGPath(const QVectorPath& path)
     int curvePos = 0;
     QPointF temp;
 
-    if (elements && affineTransform) {
+    if (elements && simpleTransform) {
         // Convert the members of the element array.
         for (int i = 0; i < count; ++i) {
             switch (elements[i]) {
@@ -717,7 +667,7 @@ VGPath QVGPaintEnginePrivate::vectorPathToVGPath(const QVectorPath& path)
             }
             points += 2;
         }
-    } else if (elements && !affineTransform) {
+    } else if (elements && !simpleTransform) {
         // Convert the members of the element array after applying the
         // current transform to the path locally.
         for (int i = 0; i < count; ++i) {
@@ -766,7 +716,7 @@ VGPath QVGPaintEnginePrivate::vectorPathToVGPath(const QVectorPath& path)
             }
             points += 2;
         }
-    } else if (count > 0 && affineTransform) {
+    } else if (count > 0 && simpleTransform) {
         // If there is no element array, then the path is assumed
         // to be a MoveTo followed by several LineTo's.
         coords.append(points[0]);
@@ -779,7 +729,7 @@ VGPath QVGPaintEnginePrivate::vectorPathToVGPath(const QVectorPath& path)
             segments.append(VG_LINE_TO_ABS);
             --count;
         }
-    } else if (count > 0 && !affineTransform) {
+    } else if (count > 0 && !simpleTransform) {
         // Convert a simple path, and apply the transform locally.
         temp = transform.map(QPointF(points[0], points[1]));
         coords.append(temp.x());
@@ -840,7 +790,7 @@ VGPath QVGPaintEnginePrivate::painterPathToVGPath(const QPainterPath& path)
     bool haveStart = false;
     bool haveEnd = false;
 
-    if (affineTransform) {
+    if (simpleTransform) {
         // Convert the members of the element array.
         for (int i = 0; i < count; ++i) {
             switch (elements[i].type) {
@@ -1615,6 +1565,36 @@ void QVGPaintEngine::stroke(const QVectorPath &path, const QPen &pen)
     vgDestroyPath(vgpath);
 }
 
+// Determine if a co-ordinate transform is simple enough to allow
+// rectangle-based clipping with vgMask().  Simple transforms most
+// often result from origin translations.
+static inline bool clipTransformIsSimple(const QTransform& transform)
+{
+    QTransform::TransformationType type = transform.type();
+    if (type == QTransform::TxNone || type == QTransform::TxTranslate)
+        return true;
+    if (type == QTransform::TxRotate) {
+        // Check for 0, 90, 180, and 270 degree rotations.
+        // (0 might happen after 4 rotations of 90 degrees).
+        qreal m11 = transform.m11();
+        qreal m12 = transform.m12();
+        qreal m21 = transform.m21();
+        qreal m22 = transform.m22();
+        if (m11 == 0.0f && m22 == 0.0f) {
+            if (m12 == 1.0f && m21 == -1.0f)
+                return true;    // 90 degrees.
+            else if (m12 == -1.0f && m21 == 1.0f)
+                return true;    // 270 degrees.
+        } else if (m12 == 0.0f && m21 == 0.0f) {
+            if (m11 == -1.0f && m22 == -1.0f)
+                return true;    // 180 degrees.
+            else if (m11 == 1.0f && m22 == 1.0f)
+                return true;    // 0 degrees.
+        }
+    }
+    return false;
+}
+
 #if defined(QVG_SCISSOR_CLIP)
 
 void QVGPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op)
@@ -1632,7 +1612,7 @@ void QVGPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op)
 
     // We aren't using masking, so handle simple QRectF's only.
     if (path.shape() == QVectorPath::RectangleHint &&
-            path.elementCount() == 4 && d->simpleTransform) {
+            path.elementCount() == 4 && clipTransformIsSimple(d->transform)) {
         // Clipping region that resulted from QPainter::setClipRect(QRectF).
         // Convert it into a QRect and apply.
         const qreal *points = path.points();
@@ -1782,7 +1762,7 @@ void QVGPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op)
 
     // We don't have vgRenderToMask(), so handle simple QRectF's only.
     if (path.shape() == QVectorPath::RectangleHint &&
-            path.elementCount() == 4 && d->simpleTransform) {
+            path.elementCount() == 4 && clipTransformIsSimple(d->transform)) {
         // Clipping region that resulted from QPainter::setClipRect(QRectF).
         // Convert it into a QRect and apply.
         const qreal *points = path.points();
@@ -1834,7 +1814,7 @@ void QVGPaintEngine::clip(const QRect &rect, Qt::ClipOperation op)
     d->dirty |= QPaintEngine::DirtyClipRegion;
 
     // If we have a non-simple transform, then use path-based clipping.
-    if (op != Qt::NoClip && !d->simpleTransform) {
+    if (op != Qt::NoClip && !clipTransformIsSimple(d->transform)) {
         QPaintEngineEx::clip(rect, op);
         return;
     }
@@ -1953,7 +1933,7 @@ void QVGPaintEngine::clip(const QRegion &region, Qt::ClipOperation op)
     d->dirty |= QPaintEngine::DirtyClipRegion;
 
     // If we have a non-simple transform, then use path-based clipping.
-    if (op != Qt::NoClip && !d->simpleTransform) {
+    if (op != Qt::NoClip && !clipTransformIsSimple(d->transform)) {
         QPaintEngineEx::clip(region, op);
         return;
     }
@@ -2530,14 +2510,14 @@ void QVGPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
 
     // Check to see if we can use vgClear() for faster filling.
     if (brush.style() == Qt::SolidPattern && brush.isOpaque() &&
-            d->simpleTransform && d->opacity == 1.0f &&
+            clipTransformIsSimple(d->transform) && d->opacity == 1.0f &&
             clearRect(rect, brush.color())) {
         return;
     }
 
 #if !defined(QVG_NO_MODIFY_PATH)
     VGfloat coords[8];
-    if (d->affineTransform) {
+    if (d->simpleTransform) {
         coords[0] = rect.x();
         coords[1] = rect.y();
         coords[2] = rect.x() + rect.width();
@@ -2572,14 +2552,14 @@ void QVGPaintEngine::fillRect(const QRectF &rect, const QColor &color)
     Q_D(QVGPaintEngine);
 
     // Check to see if we can use vgClear() for faster filling.
-    if (d->simpleTransform && d->opacity == 1.0f && color.alpha() == 255 &&
+    if (clipTransformIsSimple(d->transform) && d->opacity == 1.0f && color.alpha() == 255 &&
             clearRect(rect, color)) {
         return;
     }
 
 #if !defined(QVG_NO_MODIFY_PATH)
     VGfloat coords[8];
-    if (d->affineTransform) {
+    if (d->simpleTransform) {
         coords[0] = rect.x();
         coords[1] = rect.y();
         coords[2] = rect.x() + rect.width();
@@ -2612,7 +2592,7 @@ void QVGPaintEngine::fillRect(const QRectF &rect, const QColor &color)
 void QVGPaintEngine::drawRoundedRect(const QRectF &rect, qreal xrad, qreal yrad, Qt::SizeMode mode)
 {
     Q_D(QVGPaintEngine);
-    if (d->affineTransform) {
+    if (d->simpleTransform) {
         QVGPainterState *s = state();
         VGPath vgpath = d->roundedRectPath(rect, xrad, yrad, mode);
         d->draw(vgpath, s->pen, s->brush);
@@ -2631,7 +2611,7 @@ void QVGPaintEngine::drawRects(const QRect *rects, int rectCount)
     QVGPainterState *s = state();
     for (int i = 0; i < rectCount; ++i, ++rects) {
         VGfloat coords[8];
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords[0] = rects->x();
             coords[1] = rects->y();
             coords[2] = rects->x() + rects->width();
@@ -2672,7 +2652,7 @@ void QVGPaintEngine::drawRects(const QRectF *rects, int rectCount)
     QVGPainterState *s = state();
     for (int i = 0; i < rectCount; ++i, ++rects) {
         VGfloat coords[8];
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords[0] = rects->x();
             coords[1] = rects->y();
             coords[2] = rects->x() + rects->width();
@@ -2710,7 +2690,7 @@ void QVGPaintEngine::drawLines(const QLine *lines, int lineCount)
     QVGPainterState *s = state();
     for (int i = 0; i < lineCount; ++i, ++lines) {
         VGfloat coords[4];
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords[0] = lines->x1();
             coords[1] = lines->y1();
             coords[2] = lines->x2();
@@ -2738,7 +2718,7 @@ void QVGPaintEngine::drawLines(const QLineF *lines, int lineCount)
     QVGPainterState *s = state();
     for (int i = 0; i < lineCount; ++i, ++lines) {
         VGfloat coords[4];
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords[0] = lines->x1();
             coords[1] = lines->y1();
             coords[2] = lines->x2();
@@ -2764,7 +2744,7 @@ void QVGPaintEngine::drawEllipse(const QRectF &r)
     // Based on the description of vguEllipse() in the OpenVG specification.
     // We don't use vguEllipse(), to avoid unnecessary library dependencies.
     Q_D(QVGPaintEngine);
-    if (d->affineTransform) {
+    if (d->simpleTransform) {
         QVGPainterState *s = state();
         VGPath path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
                                    VG_PATH_DATATYPE_F,
@@ -2837,7 +2817,7 @@ void QVGPaintEngine::drawPoints(const QPointF *points, int pointCount)
 
     for (int i = 0; i < pointCount; ++i, ++points) {
         VGfloat coords[4];
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords[0] = points->x();
             coords[1] = points->y();
             coords[2] = coords[0];
@@ -2871,7 +2851,7 @@ void QVGPaintEngine::drawPoints(const QPoint *points, int pointCount)
 
     for (int i = 0; i < pointCount; ++i, ++points) {
         VGfloat coords[4];
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords[0] = points->x();
             coords[1] = points->y();
             coords[2] = coords[0];
@@ -2905,7 +2885,7 @@ void QVGPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonD
     QVarLengthArray<VGfloat, 16> coords;
     QVarLengthArray<VGubyte, 10> segments;
     for (int i = 0; i < pointCount; ++i, ++points) {
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords.append(points->x());
             coords.append(points->y());
         } else {
@@ -2952,7 +2932,7 @@ void QVGPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDr
     QVarLengthArray<VGfloat, 16> coords;
     QVarLengthArray<VGubyte, 10> segments;
     for (int i = 0; i < pointCount; ++i, ++points) {
-        if (d->affineTransform) {
+        if (d->simpleTransform) {
             coords.append(points->x());
             coords.append(points->y());
         } else {
@@ -2987,7 +2967,7 @@ void QVGPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDr
 
 void QVGPaintEnginePrivate::setImageOptions()
 {
-    if (opacity != 1.0f && affineTransform) {
+    if (opacity != 1.0f && simpleTransform) {
         if (opacity != paintOpacity) {
             VGfloat values[4];
             values[0] = 1.0f;
@@ -3034,10 +3014,7 @@ static void drawVGImage(QVGPaintEnginePrivate *d,
     QTransform transform(d->imageTransform);
     VGfloat scaleX = sr.width() == 0.0f ? 0.0f : r.width() / sr.width();
     VGfloat scaleY = sr.height() == 0.0f ? 0.0f : r.height() / sr.height();
-    if (d->simpleTransform)
-        transform.translate(qRound(r.x()), qRound(r.y()));
-    else
-        transform.translate(r.x(), r.y());
+    transform.translate(r.x(), r.y());
     transform.scale(scaleX, scaleY);
     d->setTransform(VG_MATRIX_IMAGE_USER_TO_SURFACE, transform);
 
@@ -3055,10 +3032,7 @@ static void drawVGImage(QVGPaintEnginePrivate *d,
         return;
 
     QTransform transform(d->imageTransform);
-    if(d->simpleTransform)
-        transform.translate(qRound(pos.x()), qRound(pos.y()));
-    else
-        transform.translate(pos.x(), pos.y());
+    transform.translate(pos.x(), pos.y());
     d->setTransform(VG_MATRIX_IMAGE_USER_TO_SURFACE, transform);
 
     d->setImageOptions();
@@ -3101,7 +3075,7 @@ void QVGPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF
         QVGPixmapData *vgpd = static_cast<QVGPixmapData *>(pd);
         if (!vgpd->isValid())
             return;
-        if (d->affineTransform)
+        if (d->simpleTransform)
             drawVGImage(d, r, vgpd->toVGImage(), vgpd->size(), sr);
         else
             drawVGImage(d, r, vgpd->toVGImage(d->opacity), vgpd->size(), sr);
@@ -3120,7 +3094,7 @@ void QVGPaintEngine::drawPixmap(const QPointF &pos, const QPixmap &pm)
         QVGPixmapData *vgpd = static_cast<QVGPixmapData *>(pd);
         if (!vgpd->isValid())
             return;
-        if (d->affineTransform)
+        if (d->simpleTransform)
             drawVGImage(d, pos, vgpd->toVGImage());
         else
             drawVGImage(d, pos, vgpd->toVGImage(d->opacity));
@@ -3135,7 +3109,7 @@ void QVGPaintEngine::drawImage
 {
     Q_D(QVGPaintEngine);
     VGImage vgImg;
-    if (d->affineTransform || d->opacity == 1.0f)
+    if (d->simpleTransform || d->opacity == 1.0f)
         vgImg = toVGImageSubRect(image, sr.toRect(), flags);
     else
         vgImg = toVGImageWithOpacitySubRect(image, d->opacity, sr.toRect());
@@ -3158,7 +3132,7 @@ void QVGPaintEngine::drawImage(const QPointF &pos, const QImage &image)
 {
     Q_D(QVGPaintEngine);
     VGImage vgImg;
-    if (d->affineTransform || d->opacity == 1.0f)
+    if (d->simpleTransform || d->opacity == 1.0f)
         vgImg = toVGImage(image);
     else
         vgImg = toVGImageWithOpacity(image, d->opacity);
@@ -3191,7 +3165,7 @@ void QVGPaintEngine::drawPixmapFragments(const QPainter::PixmapFragment *drawing
     QPixmapData *pd = pixmap.pixmapData();
     if (!pd)
         return; // null QPixmap
-    if (pd->classId() != QPixmapData::OpenVGClass || !d->affineTransform) {
+    if (pd->classId() != QPixmapData::OpenVGClass || !d->simpleTransform) {
         QPaintEngineEx::drawPixmapFragments(drawingData, dataCount, pixmap, hints);
         return;
     }
@@ -3416,7 +3390,7 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem)
 
     // If we are not using a simple transform, then fall back
     // to the default Qt path stroking algorithm.
-    if (!d->affineTransform) {
+    if (!d->simpleTransform) {
         QPaintEngineEx::drawTextItem(p, textItem);
         return;
     }
-- 
cgit v0.12


From bf5d0fa36d257b6deb8531f9b80bbdae07a69434 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Thu, 23 Sep 2010 11:00:11 +0200
Subject: My Qt 4.7.1 changes (cherry picked from commit
 77b9b5dc93662d505b2c69211d001e5672d8a2cb)

---
 dist/changes-4.7.1 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index c8b26c2..fd5a9f2 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -40,6 +40,15 @@ QtCore
 QtGui
 -----
 
+ - QGraphicsWidget
+	* [QTBUG-13188] Make sure a font that has propagated from a parent can
+	  be set on a QPainter.
+	  
+	  
+ - QStaticText
+    * [QTBUG-12614] Fix crash with zero-width string.
+	* [QTBUG-12540] Fix rendering of large glyphs with OpenGL2 paint engine.
+
 
 QtDBus
 ------
-- 
cgit v0.12


From c3c4e685361dfc8aa609dac9a3ef0545acdfc01f Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Thu, 23 Sep 2010 11:15:45 +0200
Subject: my changes for 4.7.1 (cherry picked from commit
 f2be9f394972edffa0eebc9c30fe00a4fce81abc)

---
 dist/changes-4.7.1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index fd5a9f2..30c2efd 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -60,6 +60,10 @@ QtMultimedia
 
 QtNetwork
 ---------
+ - QSslConfiguration
+    * [QTBUG-13265] fix crash with empty configuration
+ - QSslCertificate
+    * [QTBUG-12489] support dates > 2049
 
 
 QtOpenGL
@@ -81,6 +85,12 @@ QtSql
 QtSvg
 -----
 
+QtXmlPatterns
+-------------
+ - XML Schema internals:
+    * [QTBUG-11559] Only parse 3 digits of time fraction
+
+
 
 Qt Plugins
 ----------
-- 
cgit v0.12


From 5abb4bdbaf306c7b40e4f18728a4a2a6768094ec Mon Sep 17 00:00:00 2001
From: Benjamin Poulain <benjamin.poulain@nokia.com>
Date: Thu, 23 Sep 2010 12:22:15 +0200
Subject: Update the changelog with the SSE work done for Qt 4.7.1 (cherry
 picked from commit 9c97aa4946a1d6b22bdcd8475f32b5ead7051976)

---
 dist/changes-4.7.1 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 30c2efd..d3ae280 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -26,6 +26,11 @@ Optimizations
  - Improved the benchmarking library's timing code
     * Uses a faster access to the system clock
 
+ - Introduction of SSSE3 for alpha blending of images.
+
+ - On x86 and 86_64, the memory access has been improved for alpha blending
+   and for some composition functions.
+
  * See list of Important Behavior Changes below
 
 
@@ -107,7 +112,7 @@ Qt for Unix (X11 and Mac OS X)
 
 Qt for Linux/X11
 ----------------
-
+ - The configure script now detects all vector extensions of x86 and x86_64
 
 Qt for Windows
 --------------
@@ -115,7 +120,7 @@ Qt for Windows
 
 Qt for Mac OS X
 ---------------
-
+ - The configure script now detects all vector extensions of x86 and x86_64
 
 Qt for Symbian
 --------------
-- 
cgit v0.12


From 6daecd573fb3663bf3f6305a8cf73bea52e7eede Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 23 Sep 2010 15:49:46 +0200
Subject: Changelog: 4.7.1 (uic/Designer). (cherry picked from commit
 f160e04ebe2926d09c20ef3960def1388a566db7)

---
 dist/changes-4.7.1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index d3ae280..7676368 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -134,6 +134,7 @@ Qt for Symbian
  - Designer
 
  - uic
+  * Improve warnings and error reports
 
 ****************************************************************************
 *                     Important Behavior Changes                           *
-- 
cgit v0.12


From c770ad8124bce99b45bdbe72ebaa067fb17bf23d Mon Sep 17 00:00:00 2001
From: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
Date: Fri, 24 Sep 2010 12:27:34 +0200
Subject: Updated changes-4.7.1. (cherry picked from commit
 bed3d1eca213f24dae13cbd4cda4df94d9f0738b)

---
 dist/changes-4.7.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 7676368..fdfecb7 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -100,7 +100,9 @@ QtXmlPatterns
 Qt Plugins
 ----------
 
-
+ - Jpeg image IO plugin
+    * [QTBUG-13653] Fixed infinite loop when loading jpeg without EOI marker
+      from memory.
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
-- 
cgit v0.12


From f843d4e1703533d208b538a615abf8ea20bfa836 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Fri, 24 Sep 2010 12:44:17 +0200
Subject: dist/changes: QML Debugging changes (cherry picked from commit
 baa2d6bee64e458f547b290d7cd1acdfc6292e05)

---
 dist/changes-4.7.1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index fdfecb7..5f33ce8 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -95,7 +95,11 @@ QtXmlPatterns
  - XML Schema internals:
     * [QTBUG-11559] Only parse 3 digits of time fraction
 
-
+QtDeclarative
+-------------
+ - QML debugging:
+    * [QTBUG-5162] The debugger is now activated with -qmljsdebugger command
+    line arg to enable support for platforms without environment variables
 
 Qt Plugins
 ----------
-- 
cgit v0.12


From fece9253d419ad450ee87a033c3623ee7b3f6ed1 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 27 Sep 2010 16:34:04 +0200
Subject: Added my changes to the changelog. (cherry picked from commit
 fbf91dc787c15f561686cd708735ff8f45984aba)

---
 dist/changes-4.7.1 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 5f33ce8..29b4d41 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -131,6 +131,18 @@ Qt for Mac OS X
 Qt for Symbian
 --------------
 
+ - configure
+   * [QTBUG-11671] Fixed audio-backend detection in configure tests.
+
+ - qmake
+   * [QTBUG-13523] Added support for using -L notation in the LIBS variable
+     when building with the symbian/linux-armcc or gcce mkspec.
+
+ - QInputContext
+   * [QTBUG-12949] Fixed a bug where passwords would not be committed when
+     confirming.
+   * [QTBUG-13472] Fixed crash in input methods when using symbols menu and
+     numbers only.
 
 
 ****************************************************************************
-- 
cgit v0.12


From a69fd02e4e27a669b41b3c00619b242c55211994 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@nokia.com>
Date: Tue, 28 Sep 2010 09:44:06 -0400
Subject: Added note to changes-4.7.1

Reviewed-by: Frederik Gladhorn
(cherry picked from commit 02de74f0b2d443e410154e96321357cfe2ef9aad)
---
 dist/changes-4.7.1 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 29b4d41..d1ef791 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -55,6 +55,15 @@ QtGui
 	* [QTBUG-12540] Fix rendering of large glyphs with OpenGL2 paint engine.
 
 
+ - QPinchGesture
+    * The scaleFactor and totalScaleFactor now represent a value that allows
+      an object to track a touchpoint during a Pinch Gesture even when using
+      sequences for zooming.
+      Therefor the scale factors are initialized to 1.0 and for every new
+      sequence the totalScaleFactor is multiplied with the scaleFactor of the
+      new sequence.
+
+
 QtDBus
 ------
 
-- 
cgit v0.12


From 51f31b1b41ceb4dfde5779787c64aeb79c054ac9 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 29 Sep 2010 17:02:06 +1000
Subject: My changes. (cherry picked from commit
 2b70a3a6d5ebef36e90f52076c5d942d8cc171d7)

---
 dist/changes-4.7.1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index d1ef791..2c22fea 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -78,6 +78,8 @@ QtNetwork
     * [QTBUG-13265] fix crash with empty configuration
  - QSslCertificate
     * [QTBUG-12489] support dates > 2049
+ - Bearer Management
+    * Improved reliability on Symbian and Maemo.
 
 
 QtOpenGL
-- 
cgit v0.12


From 2b38401f6a68a6d087368075f9ec4ac90a552fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Wed, 29 Sep 2010 09:49:29 +0200
Subject: Updated changes-4.7.1 (cherry picked from commit
 2d1e3b9778328046d3ba94dd51c37c507e618721)

---
 dist/changes-4.7.1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 2c22fea..bbf8c3d 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -48,7 +48,10 @@ QtGui
  - QGraphicsWidget
 	* [QTBUG-13188] Make sure a font that has propagated from a parent can
 	  be set on a QPainter.
-	  
+
+ - QPainter
+    * [QTBUG-13429] Fixed scale point drawing with square cap in the raster
+      engine, plus some potential floating point overflows in the rasterizer.
 	  
  - QStaticText
     * [QTBUG-12614] Fix crash with zero-width string.
-- 
cgit v0.12


From 1af6507a8fed1e9606566e5e595191968d6002b2 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Wed, 29 Sep 2010 10:13:22 +0200
Subject: Changes done for 4.7.1 (cherry picked from commit
 583ca462caf656af17bea1c3f05d88ae7785ae91)

---
 dist/changes-4.7.1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index bbf8c3d..a18c4ad 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -141,6 +141,10 @@ Qt for Windows
 Qt for Mac OS X
 ---------------
  - The configure script now detects all vector extensions of x86 and x86_64
+    * [QTBUG-10500] Fixed a bug which causes the QMainWindow geometry
+      to be calculated wrongly, when used with native toolbars.
+    * [QTBUG-13878] Application menu entries can now also be translated
+      using the QMenuBar context.
 
 Qt for Symbian
 --------------
-- 
cgit v0.12


From 33e4a7dcacc9e413bd6f19c8281e2855e4142490 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 29 Sep 2010 10:22:26 +0200
Subject: added my and Jan-Arve's change to changelog for 4.7.1 (cherry picked
 from commit c1a9c50d53ae41b19bdcd7930eec0805498e01c6)

---
 dist/changes-4.7.1 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index a18c4ad..e442951 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -41,6 +41,9 @@ Optimizations
 QtCore
 ------
 
+ - QLibrary
+    * [QT-3825] System libraries are only loaded from the system directories
+
 
 QtGui
 -----
@@ -66,6 +69,12 @@ QtGui
       sequence the totalScaleFactor is multiplied with the scaleFactor of the
       new sequence.
 
+ - QLineEdit
+    * [QTBUG-13520] Fixed the scrolling of text with right alignment
+
+ - QPixmap
+    * [QTBUG-12560] Fixed a regression preventing loading images without extensions
+
 
 QtDBus
 ------
@@ -136,6 +145,8 @@ Qt for Linux/X11
 
 Qt for Windows
 --------------
+ - Drag & Drop:
+   * [QTBUG-13787] Fixed a possible crash with mingw
 
 
 Qt for Mac OS X
-- 
cgit v0.12


From f4e76aee217ddd6931516c17e62f0f4c086c1b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond.kjernasen@nokia.com>
Date: Wed, 29 Sep 2010 11:22:53 +0200
Subject: My 4.7.1 changes. (cherry picked from commit
 99340cf858731f531af29be1e1368e4991e8564e)

---
 dist/changes-4.7.1 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index e442951..2be9760 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -55,7 +55,7 @@ QtGui
  - QPainter
     * [QTBUG-13429] Fixed scale point drawing with square cap in the raster
       engine, plus some potential floating point overflows in the rasterizer.
-	  
+
  - QStaticText
     * [QTBUG-12614] Fix crash with zero-width string.
 	* [QTBUG-12540] Fix rendering of large glyphs with OpenGL2 paint engine.
@@ -96,7 +96,9 @@ QtNetwork
 
 QtOpenGL
 --------
-
+ - QGL2PaintEngineEx
+    * Fixed drawing a large number of glyphs with the same font on systems
+      with small texure size limits.
 
 QtOpenVG
 --------
@@ -148,6 +150,13 @@ Qt for Windows
  - Drag & Drop:
    * [QTBUG-13787] Fixed a possible crash with mingw
 
+ - QPrinter
+   * [QTBUG-12263] Strokes were in some cases not printed with the correct
+     color under Windows.
+
+ - QGLWidget
+   * [QTBUG-13141] Fixed multi-sampling support for ATI based cards under
+     Windows.
 
 Qt for Mac OS X
 ---------------
-- 
cgit v0.12


From 0738176c2c3ec1fa411b8a0ae49a70d1d7ab8963 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Wed, 29 Sep 2010 11:34:29 +0200
Subject: my contributions to dist/changes-4.7.1 (cherry picked from commit
 3519840ef2c5cb7cbc5b32ffc9976a8638187d64)

---
 dist/changes-4.7.1 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 2be9760..ea2e949 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -44,6 +44,8 @@ QtCore
  - QLibrary
     * [QT-3825] System libraries are only loaded from the system directories
 
+ - QUuid
+    * [QTBUG-11213] QUuid::createUuid() should not generate identical sequences on UNIX
 
 QtGui
 -----
@@ -139,7 +141,8 @@ Qt Plugins
 
 Qt for Unix (X11 and Mac OS X)
 ------------------------------
-
+ - Event System:
+   * [QT_3553] Fix invalid memory write during recursive timer activation.
 
 Qt for Linux/X11
 ----------------
@@ -147,6 +150,9 @@ Qt for Linux/X11
 
 Qt for Windows
 --------------
+ - Event System:
+   * [QTBUG-12721] Fix Qt applications freezing until mouse/keyboard events occur.
+
  - Drag & Drop:
    * [QTBUG-13787] Fixed a possible crash with mingw
 
-- 
cgit v0.12


From d2acbb699efae07f761762909884822aa9629718 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Wed, 29 Sep 2010 11:33:18 +0200
Subject: Update changelog (cherry picked from commit
 8050dc45c8c9a134875196dcddf010d4194fd974)

---
 dist/changes-4.7.1 | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index ea2e949..dbfa0b3 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -41,12 +41,21 @@ Optimizations
 QtCore
 ------
 
+ - Containers
+    * [QTBUG-13079] Fix assingment of a container included in the container itself
+
  - QLibrary
     * [QT-3825] System libraries are only loaded from the system directories
 
+
  - QUuid
     * [QTBUG-11213] QUuid::createUuid() should not generate identical sequences on UNIX
 
+ - QEventDispatcherUnix
+    * [QTBUG-13633] Do not process too many timer events if other events need
+     to be processed first
+
+
 QtGui
 -----
 
@@ -57,6 +66,7 @@ QtGui
  - QPainter
     * [QTBUG-13429] Fixed scale point drawing with square cap in the raster
       engine, plus some potential floating point overflows in the rasterizer.
+    * Optimized pixmap drawing with SmoothPixmapTransform.
 
  - QStaticText
     * [QTBUG-12614] Fix crash with zero-width string.
@@ -77,6 +87,9 @@ QtGui
  - QPixmap
     * [QTBUG-12560] Fixed a regression preventing loading images without extensions
 
+ - QTreeView
+    * [QTBUG-13567] Do not scroll to top if last item is removed
+
 
 QtDBus
 ------
@@ -117,6 +130,10 @@ QtSql
 QtSvg
 -----
 
+QtXml
+-----
+ * Fixed a crash when parsing invalid tag names.
+
 QtXmlPatterns
 -------------
  - XML Schema internals:
@@ -127,6 +144,10 @@ QtDeclarative
  - QML debugging:
     * [QTBUG-5162] The debugger is now activated with -qmljsdebugger command
     line arg to enable support for platforms without environment variables
+    * Various improvements to ease debugging in creator
+ - QDeclarativeImageProvider:
+    * Fixed memory leak
+    * Improved concurrency when using in assynchronus mode.
 
 Qt Plugins
 ----------
@@ -198,6 +219,9 @@ Qt for Symbian
  - uic
   * Improve warnings and error reports
 
+ - moc
+  * Show an error if NOTIFY refer to a wrong signal in Q_PROPERTY
+
 ****************************************************************************
 *                     Important Behavior Changes                           *
 ****************************************************************************
-- 
cgit v0.12


From cbfdce47d2e348341358d308bfaea9ba603421fe Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Wed, 29 Sep 2010 13:58:51 +0200
Subject: updated changes-4.7.1 (cherry picked from commit
 0ce33ebfa8b99c2988b56d0157ddc039a9ab06ae)

---
 dist/changes-4.7.1 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index dbfa0b3..c68f9e0 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -197,11 +197,19 @@ Qt for Symbian
 --------------
 
  - configure
+   * [QTBUG-4586] Fixed wrong paths in include/ActiveQt/headers.pri.
    * [QTBUG-11671] Fixed audio-backend detection in configure tests.
 
  - qmake
    * [QTBUG-13523] Added support for using -L notation in the LIBS variable
      when building with the symbian/linux-armcc or gcce mkspec.
+   * [QTBUG-12851] Fix assertion on Windows when DESTDIR is empty in static
+     libs.
+   * [QTBUG-12802] Fix vcxproj generator when using /Fd in QMAKE_CXXFLAGS.
+   * [QTBUG-13080] vcxproj generator: fix bug when using CharacterSet=1 in
+     .pro file.
+   * [QTBUG-13081] vc[x]proj generators: support /MAP option without file
+     name.
 
  - QInputContext
    * [QTBUG-12949] Fixed a bug where passwords would not be committed when
@@ -209,6 +217,10 @@ Qt for Symbian
    * [QTBUG-13472] Fixed crash in input methods when using symbols menu and
      numbers only.
 
+Qt for Windows CE
+-----------------
+ - Gui
+   * [QTBUG-8408] Show the [X] button on Windows mobile when maximizing.
 
 ****************************************************************************
 *                          Tools                                           *
-- 
cgit v0.12


From 4bb9c55b0105aebfe9004fc82585ab72d5149675 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 29 Sep 2010 14:31:46 +0200
Subject: My changelog entries for 4.7.1 (cherry picked from commit
 646c37a670b101487a76b1e787fd298187b49430)

---
 dist/changes-4.7.1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index c68f9e0..e9458c9 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -107,6 +107,10 @@ QtNetwork
     * [QTBUG-12489] support dates > 2049
  - Bearer Management
     * Improved reliability on Symbian and Maemo.
+ - IPv6
+    * Disable on Symbian until OpenC properly supports it
+ - QNetworkAccessManager
+    * [QTBUG-12285] Crash fix related to aborted uploads
 
 
 QtOpenGL
-- 
cgit v0.12


From 6978061fdfbaf97b1b887e43b2f4d0ac7f2b2890 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Thu, 30 Sep 2010 15:00:47 +1000
Subject: connman backend (cherry picked from commit
 ba698e20b32defcb0840293fc4ac5948f7c190c9)

---
 dist/changes-4.7.1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index e9458c9..993e596 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -107,6 +107,7 @@ QtNetwork
     * [QTBUG-12489] support dates > 2049
  - Bearer Management
     * Improved reliability on Symbian and Maemo.
+    * Added connman/meego backend.
  - IPv6
     * Disable on Symbian until OpenC properly supports it
  - QNetworkAccessManager
-- 
cgit v0.12


From 745bc005d988daee0df2a31951fc6b80851d8ad5 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Thu, 30 Sep 2010 18:03:43 +1000
Subject: Add declarative changelog entries for 4.7.1

Task-number:
Reviewed-by: Yann Bodson
(cherry picked from commit 753d366ced1a62a97d5207eb2708817efc35bc4d)
---
 dist/changes-4.7.1 | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 993e596..9a3e543 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -146,10 +146,97 @@ QtXmlPatterns
 
 QtDeclarative
 -------------
+ - QML language
+    * [QTBUG-13799] QML core module renamed to QtQuick to decouple it from Qt releases.
+      Old "import Qt 4.7" will co-exist with "import QtQuick 1.0' at least during Qt 4.7 releases.
+    * [QTBUG-13047] Support passing QObject derived types to QML methods
+    * [QTBUG-12837] Support JS "in" operator on QML objects
+    * [QTBUG-13045] Prevent calling deleteLater() from QML
+    * [QTBUG-13043] Ignore non-scriptable properties in QML
+    * [QTBUG-13114] Don't double call classBegin()
+    * [QTBUG-12946] Ensure the onDestruction handlers are called before the expressions are cleared
+    * [QTBUG-12599] Re-enabled script program caching on Symbian
+    * [QTBUG-13374] Don't modify the signal order on the second dynamic meta object pass
+    * Support for qsTrId and meta-data in comments for QML
  - QML debugging:
     * [QTBUG-5162] The debugger is now activated with -qmljsdebugger command
     line arg to enable support for platforms without environment variables
     * Various improvements to ease debugging in creator
+ - AnchorAnimation
+    * [QTBUG-13398] Fix AnchorAnimation for multiple AnchorChanges with dependancies
+ - AnchorChanges
+    * [QTBUG-11834] Restore any absolute geometry changed by AnchorChanges when returning to the base state
+ - Component
+    * [QTBUG-13170] Complete Component::createObject() creation after setting the parent
+ - GridView
+    * [QTBUG-13166] GridView.view property should not be writable
+ - Flickable 
+    * [QTBUG-13095] Ensure Flickable visibleArea is updated when view height changes
+    * [QTBUG-13176] Avoid Flickable view jumping when drag threashold is exceeded
+    * [QTBUG-13078] Fix poor flicking behavior with slower flicks
+    * Handle QGraphicsWidgets in Flickable
+ - FocusScope
+    * [QTBUG-12649] Make sure onFocusChanged is correctly emitted for items in a FocusScope.
+ - FontLoader
+    * [QTBUG-13419] Don't add the same font to the font database multiple times 
+ - ListModel
+    * [QTBUG-12363] Modifying an object returned by ListModel.get(0) didn't update the view
+    * [QTBUG-13666] Calling set() and setProperty() on ListModel from a WorkerScript didn't update the view
+    * Fix Worker ListModel to emit the right signal when items change
+    * Fix crash with invalid role indexes
+    * improved ListModel error messages
+ - ListView
+    * [QTBUG-13664] Models with a single role didn't always update correctly
+    * [QTBUG-13543] Ensure flickable velocity is updated when view is moved by setCurrentIndex
+    * [QTBUG-12664] Ensure highlight is positioned correctly in positionViewAtIndex()
+    * [QTBUG-13166] Fix ListView.view attached property with VisualItemModel
+    * [QTBUG-13039] Fix crash in synchronization of ListModel in WorkerThread
+    * [QTBUG-11341] Flicking a ListView sometimes made it loose focus
+    * [QTBUG-13166] ListView.view property should not be writable
+ - PathView 
+    * [QTBUG-13689] Moving items in a PathView caused PathView.onPath to be set to false
+    * [QTBUG-13687] PathView didn't accept mouse events, preventing it from working in a Flickable
+    * [QTBUG-13416] Fix PathView item position on insertion and removal
+    * [QTBUG-13017] Fix PathView when setting an empty model that is later filled
+    * [QTBUG-12747] PathView required some diagonal movement before a drag was initiated
+ - Positioners
+    * made positioners work with QGraphicsWidgets
+ - PropertyChanges
+    * [QTBUG-12559] Correctly apply PropertyChanges when entering an extended state directly from the base state
+ - VisualDataModel
+    * [QTBUG-13754] Fixed a crash when updating a property in ListModel with multiple roles
+    * [QTBUG-13038] Fix VisualDataModel model update handling when rootIndex is specified
+    * [QTBUG-13146] Handle layoutChanged() properly in QML views
+ - XmlListModel 
+    * [QTBUG-13041] XmlListModel thread was left hanging on Symbian application exit
+ - ParentChange
+    * [QTBUG-13554] ParentChange fails to apply rotation changes of exactly 180 degrees
+ - MouseArea 
+    * [QTBUG-12250] When onDoubleClicked: is handled don't emit a second onPressed/onClicked
+ - Image
+    * [QTBUG-13454] Changing the Image 'source' no longer goes through the 'Loading' state if the image is cached.
+    * [QTBUG-13383] Do not reset sourceSize when changing image source url
+    * [QTBUG-13002] Setting one dimension of the sourceSize should set the other dimensio
+    * [QTBUG-12302] Fix remote image url redirects are done in the right thread
+    * Ensure all image states are updated before emitting statusChanged signals
+ - NumberAnimation
+    * [QTBUG-12805] Clear previous animation data for non-triggering animations
+ - Repeater
+    * [QTBUG-12905] Emit countChanged where appropriate in Repeater
+ - SmoothedAnimation
+    * [QTBUG-12336] Update running animations if a SmoothedAnimation is changed
+ - SpringAnimation
+    * [QTBUG-13044] SpringAnimation velocity animation stop logic was fragile
+ - Text
+    * [QTBUG-13453] Fix jerky scrolling caused by unnecessary repaints of Text element 
+    * [QTBUG-13142] Fix alignment of shadow for rich text when using text styles
+    * [QTBUG-11002] Improve QML text rendering when LCD smoothing is enabled for OS X
+ - TextInput
+    * [QTBUG-11127] Fix autoScroll implementation
+ - XmlHttpRequest
+    * [QTBUG-13117] Fix responseText to check the charset encoding field and also to not assume that the data is xml
+ - WebView
+    * [QTBUG-13342] Ensure WebView gets focus when an editable node is clicked on
  - QDeclarativeImageProvider:
     * Fixed memory leak
     * Improved concurrency when using in assynchronus mode.
@@ -239,6 +326,11 @@ Qt for Windows CE
  - moc
   * Show an error if NOTIFY refer to a wrong signal in Q_PROPERTY
 
+ - QML Viewer
+    * [QTBUG-13347] Paused orientation sensors in Qml Viewer when the application window is not active to save device battery 
+    * [QTBUG-11019] Add a menu option to open remote files in the QML viewer
+    * QML Viewer is deployed under QtDemos folder instead of QtExamples folder in Symbian application menu
+
 ****************************************************************************
 *                     Important Behavior Changes                           *
 ****************************************************************************
-- 
cgit v0.12


From 42e1282f210d9a9a30b02c274af60edf3d785de9 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
Date: Thu, 30 Sep 2010 11:00:33 +0200
Subject: Update changes (cherry picked from commit
 7d5afd371d634e35192ab27f65c6dc895f7bbb5c)

---
 dist/changes-4.7.1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 9a3e543..2c25699 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -90,6 +90,8 @@ QtGui
  - QTreeView
     * [QTBUG-13567] Do not scroll to top if last item is removed
 
+ - QGtkStyle
+    * [QTBUG-13125] Fixed a regression with custom itemview background color.
 
 QtDBus
 ------
-- 
cgit v0.12


From c3d2287f3bd9a3a0bb00fdc3f6214a4bdf76b01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= <bjorn.nilsen@nokia.com>
Date: Thu, 30 Sep 2010 16:46:26 +0200
Subject: Some 4.7.1 changes. (cherry picked from commit
 72fd8399aa36395e41f497fff79842496d6f9b03)

---
 dist/changes-4.7.1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 2c25699..2d79ac1 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -62,6 +62,16 @@ QtGui
  - QGraphicsWidget
 	* [QTBUG-13188] Make sure a font that has propagated from a parent can
 	  be set on a QPainter.
+    * [QT-3808] Issues when applying effects in combination with ItemHasNoContents flag.
+
+ - QGraphicsItem
+    * [QTBUG-3633, QT-3828] Wrong children bounding rect when applying effects.
+
+ - QGraphicsEffect
+    * [QT-3633] Wrong bounding rect.
+
+ - QGraphicsScene
+    * [QT-3674] Spurious assert triggered from render().
 
  - QPainter
     * [QTBUG-13429] Fixed scale point drawing with square cap in the raster
-- 
cgit v0.12


From 6ac4acce8a759f32cd70336065f77d38a9baf2df Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 7 Oct 2010 19:05:27 +1000
Subject: Support device orientation in harmattan

Task-number: QTBUG-14137
Reviewed-by: Aaron Kennedy
(cherry picked from commit f9a8c4ec598a0070b9d2d861efe5ee69d5045a1f)
---
 tools/qml/deviceorientation_harmattan.cpp | 161 ++++++++++++++++++++++++++++++
 tools/qml/qml.pri                         |   5 +
 2 files changed, 166 insertions(+)
 create mode 100644 tools/qml/deviceorientation_harmattan.cpp

diff --git a/tools/qml/deviceorientation_harmattan.cpp b/tools/qml/deviceorientation_harmattan.cpp
new file mode 100644
index 0000000..22f9f4c
--- /dev/null
+++ b/tools/qml/deviceorientation_harmattan.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "deviceorientation.h"
+#include <QtDBus>
+#include <QDebug>
+
+#define ORIENTATION_SERVICE "com.nokia.SensorService"
+#define ORIENTATION_PATH "/org/maemo/contextkit/Screen/TopEdge"
+#define CONTEXT_INTERFACE "org.maemo.contextkit.Property"
+#define CONTEXT_CHANGED "ValueChanged"
+#define CONTEXT_SUBSCRIBE "Subscribe"
+#define CONTEXT_UNSUBSCRIBE "Unsubscribe"
+#define CONTEXT_GET "Get"
+
+
+class HarmattanOrientation : public DeviceOrientation
+{
+    Q_OBJECT
+public:
+    HarmattanOrientation()
+        : o(UnknownOrientation), sensorEnabled(false)
+    {
+        resumeListening();
+        // connect to the orientation change signal
+        bool ok = QDBusConnection::systemBus().connect(ORIENTATION_SERVICE, ORIENTATION_PATH,
+                CONTEXT_INTERFACE,
+                CONTEXT_CHANGED,
+                this,
+                SLOT(deviceOrientationChanged(QList<QVariant>,quint64)));
+//        qDebug() << "connection OK" << ok;
+        QDBusMessage reply = QDBusConnection::systemBus().call(
+                QDBusMessage::createMethodCall(ORIENTATION_SERVICE, ORIENTATION_PATH,
+                                               CONTEXT_INTERFACE, CONTEXT_GET));
+        if (reply.type() != QDBusMessage::ErrorMessage) {
+            QList<QVariant> args;
+            qvariant_cast<QDBusArgument>(reply.arguments().at(0)) >> args;
+            deviceOrientationChanged(args, 0);
+        }
+    }
+
+    ~HarmattanOrientation()
+    {
+        // unsubscribe from the orientation sensor
+        if (sensorEnabled)
+            QDBusConnection::systemBus().call(
+                QDBusMessage::createMethodCall(ORIENTATION_SERVICE, ORIENTATION_PATH,
+                                               CONTEXT_INTERFACE, CONTEXT_UNSUBSCRIBE));
+    }
+
+    inline Orientation orientation() const
+    {
+        return o;
+    }
+
+    void setOrientation(Orientation)
+    {
+    }
+
+    void pauseListening() {
+        if (sensorEnabled) {
+            // unsubscribe from the orientation sensor
+            QDBusConnection::systemBus().call(
+                    QDBusMessage::createMethodCall(ORIENTATION_SERVICE, ORIENTATION_PATH,
+                                                   CONTEXT_INTERFACE, CONTEXT_UNSUBSCRIBE));
+            sensorEnabled = false;
+        }
+    }
+
+    void resumeListening() {
+        if (!sensorEnabled) {
+            // subscribe to the orientation sensor
+            QDBusMessage reply = QDBusConnection::systemBus().call(
+                    QDBusMessage::createMethodCall(ORIENTATION_SERVICE, ORIENTATION_PATH,
+                                                   CONTEXT_INTERFACE, CONTEXT_SUBSCRIBE));
+
+            if (reply.type() == QDBusMessage::ErrorMessage) {
+                qWarning("Unable to retrieve device orientation: %s", qPrintable(reply.errorMessage()));
+            } else {
+                sensorEnabled = true;
+            }
+        }
+    }
+
+private Q_SLOTS:
+    void deviceOrientationChanged(QList<QVariant> args,quint64)
+    {
+        if (args.count() == 0)
+            return;
+        Orientation newOrientation = toOrientation(args.at(0).toString());
+        if (newOrientation != o) {
+            o = newOrientation;
+            emit orientationChanged();
+        }
+//        qDebug() << "orientation" << args.at(0).toString();
+    }
+
+private:
+    static Orientation toOrientation(const QString &nativeOrientation)
+    {
+        if (nativeOrientation == "top")
+            return Landscape;
+        else if (nativeOrientation == "left")
+            return Portrait;
+        else if (nativeOrientation == "bottom")
+            return LandscapeInverted;
+        else if (nativeOrientation == "right")
+            return PortraitInverted;
+        return UnknownOrientation;
+    }
+
+private:
+    Orientation o;
+    bool sensorEnabled;
+};
+
+DeviceOrientation* DeviceOrientation::instance()
+{
+    static HarmattanOrientation *o = new HarmattanOrientation;
+    return o;
+}
+
+#include "deviceorientation_harmattan.moc"
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index e5b2c7f..5db7678 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -29,6 +29,11 @@ symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
     SOURCES += $$PWD/deviceorientation_maemo5.cpp
     FORMS = $$PWD/recopts_maemo5.ui \
             $$PWD/proxysettings_maemo5.ui
+} else:linux-g++-maemo {
+    QT += dbus
+    SOURCES += $$PWD/deviceorientation_harmattan.cpp
+    FORMS = $$PWD/recopts.ui \
+            $$PWD/proxysettings.ui
 } else {
     SOURCES += $$PWD/deviceorientation.cpp
     FORMS = $$PWD/recopts.ui \
-- 
cgit v0.12


From 4652008c01b23eefdba3b02fe8101c5bde857d41 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 6 Oct 2010 13:59:19 +1000
Subject: Ensure PathView updates positions when path changes.

Fixes regression caused by optimization added in commit
35a51442ed21f58c06b21293eeb56e843251ee82.

Task-number: QTBUG-14239
Reviewed-by: Martin Jones
---
 src/declarative/graphicsitems/qdeclarativepathview.cpp | 17 +++++++++++++++--
 src/declarative/graphicsitems/qdeclarativepathview_p.h |  1 +
 .../qdeclarativepathview/data/pathUpdate.qml           | 18 ++++++++++++++++++
 .../qdeclarativepathview/tst_qdeclarativepathview.cpp  | 18 ++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/pathUpdate.qml

diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index d134929..3ae8788 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -300,6 +300,19 @@ void QDeclarativePathViewPrivate::setHighlightPosition(qreal pos)
     }
 }
 
+void QDeclarativePathView::pathUpdated()
+{
+    Q_D(QDeclarativePathView);
+    QList<QDeclarativeItem*>::iterator it = d->items.begin();
+    while (it != d->items.end()) {
+        QDeclarativeItem *item = *it;
+        if (QDeclarativePathViewAttached *att = d->attached(item))
+            att->m_percent = -1;
+        ++it;
+    }
+    refill();
+}
+
 void QDeclarativePathViewPrivate::updateItem(QDeclarativeItem *item, qreal percent)
 {
     if (QDeclarativePathViewAttached *att = attached(item)) {
@@ -526,9 +539,9 @@ void QDeclarativePathView::setPath(QDeclarativePath *path)
     if (d->path == path)
         return;
     if (d->path)
-        disconnect(d->path, SIGNAL(changed()), this, SLOT(refill()));
+        disconnect(d->path, SIGNAL(changed()), this, SLOT(pathUpdated()));
     d->path = path;
-    connect(d->path, SIGNAL(changed()), this, SLOT(refill()));
+    connect(d->path, SIGNAL(changed()), this, SLOT(pathUpdated()));
     if (d->isValid() && isComponentComplete()) {
         d->clear();
         if (d->attType) {
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index 62a8c44..7775b1c 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -186,6 +186,7 @@ private Q_SLOTS:
     void modelReset();
     void createdItem(int index, QDeclarativeItem *item);
     void destroyingItem(QDeclarativeItem *item);
+    void pathUpdated();
 
 private:
     friend class QDeclarativePathViewAttached;
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathUpdate.qml b/tests/auto/declarative/qdeclarativepathview/data/pathUpdate.qml
new file mode 100644
index 0000000..0c99e7f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathUpdate.qml
@@ -0,0 +1,18 @@
+import Qt 4.7
+
+Rectangle {
+   width: 400
+   height: 400
+
+   PathView {
+       id: view
+       objectName: "pathView"
+       anchors.fill: parent
+       model: 10
+       delegate: Rectangle { objectName: "wrapper"; color: "green"; width: 100; height: 100 }
+       path: Path {
+           startX: view.width/2; startY: 0
+           PathLine { x: view.width/2; y: view.height }
+       }
+   }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 3b5d438..eb4bdbb 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -85,6 +85,7 @@ private slots:
     void pathUpdateOnStartChanged();
     void package();
     void emptyModel();
+    void pathUpdate();
 
 private:
     QDeclarativeView *createView();
@@ -787,6 +788,23 @@ void tst_QDeclarativePathView::emptyModel()
 }
 
 
+// QTBUG-14239
+void tst_QDeclarativePathView::pathUpdate()
+{
+    QDeclarativeView *canvas = createView();
+    QVERIFY(canvas);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathUpdate.qml"));
+
+    QDeclarativePathView *pathView = canvas->rootObject()->findChild<QDeclarativePathView*>("pathView");
+    QVERIFY(pathView);
+
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(pathView, "wrapper", 0);
+    QVERIFY(item);
+    QCOMPARE(item->x(), 150.0);
+
+    delete canvas;
+}
+
 QDeclarativeView *tst_QDeclarativePathView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
-- 
cgit v0.12


From b3ccb9f7b7795dab6520e7328c75537d58d08577 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Wed, 6 Oct 2010 14:01:56 +1000
Subject: Fix minehunt execution from QtDemo

Task-number: QTBUG-14250
Reviewed-by: Martin Jones
(cherry picked from commit 695b54e671b55bd8103dee8b30ee76309dbd26c1)
---
 demos/declarative/minehunt/main.cpp     |  2 +-
 demos/declarative/minehunt/minehunt.pro |  1 +
 demos/declarative/minehunt/minehunt.qrc | 20 ++++++++++++++++++++
 demos/qtdemo/menumanager.cpp            |  1 +
 demos/qtdemo/xml/examples.xml           |  2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 demos/declarative/minehunt/minehunt.qrc

diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 8bbaee9..2b286ef 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     canvas.setResizeMode(QDeclarativeView::SizeRootObjectToView);
 #endif
     canvas.engine()->rootContext()->setContextObject(game);        
-    canvas.setSource(QString("minehunt.qml"));
+    canvas.setSource(QString("qrc:minehunt.qml"));
     QObject::connect(canvas.engine(), SIGNAL(quit()), &app, SLOT(quit()));
     
 #ifdef Q_OS_SYMBIAN
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 7a491ab..753ca4e 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -6,6 +6,7 @@ CONFIG += qt plugin
 # Input
 HEADERS += minehunt.h
 SOURCES += main.cpp minehunt.cpp
+RESOURCES = minehunt.qrc
 
 sources.files = minehunt.qml minehunt.pro MinehuntCore
 sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt
diff --git a/demos/declarative/minehunt/minehunt.qrc b/demos/declarative/minehunt/minehunt.qrc
new file mode 100644
index 0000000..fa8e27d
--- /dev/null
+++ b/demos/declarative/minehunt/minehunt.qrc
@@ -0,0 +1,20 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>minehunt.qml</file>
+    <file>MinehuntCore/Explosion.qml</file>
+    <file>MinehuntCore/Tile.qml</file>
+    <file>MinehuntCore/qmldir</file>
+    <file>MinehuntCore/pics/background.png</file>
+    <file>MinehuntCore/pics/back.png</file>
+    <file>MinehuntCore/pics/bomb-color.png</file>
+    <file>MinehuntCore/pics/bomb.png</file>
+    <file>MinehuntCore/pics/face-sad.png</file>
+    <file>MinehuntCore/pics/face-smile-big.png</file>
+    <file>MinehuntCore/pics/face-smile.png</file>
+    <file>MinehuntCore/pics/flag-color.png</file>
+    <file>MinehuntCore/pics/flag.png</file>
+    <file>MinehuntCore/pics/front.png</file>
+    <file>MinehuntCore/pics/quit.png</file>
+    <file>MinehuntCore/pics/star.png</file>
+</qresource>
+</RCC>
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index fe3c5aa..ea9146e 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -518,6 +518,7 @@ QString MenuManager::resolveExeFile(const QString &name)
     dir.cd(dirName);
     dir.cd(fileName);
 
+    fileName = fileName.split("/").last();
     QFile unixFile(dir.path() + "/" + fileName);
     if (unixFile.exists()) return unixFile.fileName();
     QFile winR(dir.path() + "\\release\\" + fileName + ".exe");
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 0ab048e..27f72bb 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -18,7 +18,7 @@
     <example filename="boxes" name="Boxes" />
     <example filename="sub-attaq" name="Sub-attaq" />
     <example filename="spectrum" name="Spectrum Analyzer" />
-    <example filename="declarative/minehunt" name="Minehunt" executable="false" qml="true"/>
+    <example filename="declarative/minehunt" name="Minehunt"/>
     <example filename="declarative/snake" name="Snake" executable="false" qml="true"/>
     <example filename="deform" name="Vector Deformation" />
     <example filename="books" name="Books" />
-- 
cgit v0.12


From 000540cfd13bfdb7743fc5c9e931989ba982dbc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= <bjorn.nilsen@nokia.com>
Date: Wed, 6 Oct 2010 14:19:44 +0200
Subject: QGraphicsItem device coordinate cache unefficient in portrait mode

Problem was that we always invalidated the cache whenever the item was
rotated. This is however not required for simple rotations such as
90, 180 and 270 degrees. This commit also removes the somewhat arbitrary
logic which takes the desktop size into account. We now use the viewport
size instead.

Auto test included.

Task-number: QT-3779
Reviewed-by: yoann
(cherry picked from commit e84ab1fee7f44a28ee82793f83b0b27d04d28c09)
---
 src/gui/graphicsview/qgraphicsscene.cpp        | 76 ++++++++++++++++++++------
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 76 ++++++++++++++++++++++++++
 2 files changed, 134 insertions(+), 18 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index c166c30..83fe56a 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -4362,6 +4362,50 @@ static void _q_paintIntoCache(QPixmap *pix, QGraphicsItem *item, const QRegion &
     }
 }
 
+// Copied from qpaintengine_vg.cpp
+// Returns true for 90, 180, and 270 degree rotations.
+static inline bool transformIsSimple(const QTransform& transform)
+{
+    QTransform::TransformationType type = transform.type();
+    if (type == QTransform::TxNone || type == QTransform::TxTranslate) {
+        return true;
+    } else if (type == QTransform::TxScale) {
+        // Check for 0 and 180 degree rotations.
+        // (0 might happen after 4 rotations of 90 degrees).
+        qreal m11 = transform.m11();
+        qreal m12 = transform.m12();
+        qreal m21 = transform.m21();
+        qreal m22 = transform.m22();
+        if (m12 == 0.0f && m21 == 0.0f) {
+            if (m11 == 1.0f && m22 == 1.0f)
+                return true; // 0 degrees
+            else if (m11 == -1.0f && m22 == -1.0f)
+                return true; // 180 degrees.
+            if(m11 == 1.0f && m22 == -1.0f)
+                return true; // 0 degrees inverted y.
+            else if(m11 == -1.0f && m22 == 1.0f)
+                return true; // 180 degrees inverted y.
+        }
+    } else if (type == QTransform::TxRotate) {
+        // Check for 90, and 270 degree rotations.
+        qreal m11 = transform.m11();
+        qreal m12 = transform.m12();
+        qreal m21 = transform.m21();
+        qreal m22 = transform.m22();
+        if (m11 == 0.0f && m22 == 0.0f) {
+            if (m12 == 1.0f && m21 == -1.0f)
+                return true; // 90 degrees.
+            else if (m12 == -1.0f && m21 == 1.0f)
+                return true; // 270 degrees.
+            else if (m12 == -1.0f && m21 == -1.0f)
+                return true; // 90 degrees inverted y.
+            else if (m12 == 1.0f && m21 == 1.0f)
+                return true; // 270 degrees inverted y.
+        }
+    }
+    return false;
+}
+
 /*!
     \internal
 
@@ -4530,32 +4574,28 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
         if (invertable)
             diff *= painter->worldTransform();
         deviceData->lastTransform = painter->worldTransform();
-        if (!invertable
-            || diff.type() > QTransform::TxTranslate
-            || painter->worldTransform().type() > QTransform::TxScale) {
+        bool allowPartialCacheExposure = false;
+        bool simpleTransform = invertable && diff.type() <= QTransform::TxTranslate
+                               && transformIsSimple(painter->worldTransform());
+        if (!simpleTransform) {
             pixModified = true;
             itemCache->allExposed = true;
             itemCache->exposed.clear();
+            deviceData->cacheIndent = QPoint();
             pix = QPixmap();
+        } else {
+            allowPartialCacheExposure = deviceData->cacheIndent != QPoint();
         }
 
-        // ### This is a pretty bad way to determine when to start partial
-        // exposure for DeviceCoordinateCache but it's the least intrusive
-        // approach for now.
-#if 0
-        // Only if the device rect isn't fully contained.
-        bool allowPartialCacheExposure = !viewRect.contains(deviceRect);
-#else
-        // Only if deviceRect is 20% taller or wider than the desktop.
-        bool allowPartialCacheExposure = false;
-        if (widget) {
-            QRect desktopRect = QApplication::desktop()->availableGeometry(widget);
-            allowPartialCacheExposure = (desktopRect.width() * 1.2 < deviceRect.width()
-                                         || desktopRect.height() * 1.2 < deviceRect.height());
+        // Allow partial cache exposure if the device rect isn't fully contained and
+        // deviceRect is 20% taller or wider than the viewRect.
+        if (!allowPartialCacheExposure && !viewRect.contains(deviceRect)) {
+            allowPartialCacheExposure = (viewRect.width() * 1.2 < deviceRect.width())
+                                         || (viewRect.height() * 1.2 < deviceRect.height());
         }
-#endif
+
         QRegion scrollExposure;
-        if (deviceData->cacheIndent != QPoint() || allowPartialCacheExposure) {
+        if (allowPartialCacheExposure) {
             // Part of pixmap is drawn. Either device contains viewrect (big
             // item covers whole screen) or parts of device are outside the
             // viewport. In either case the device rect must be the intersect
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 4476084..a1909e7 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -444,6 +444,7 @@ private slots:
     void textItem_shortcuts();
     void scroll();
     void stopClickFocusPropagation();
+    void deviceCoordinateCache_simpleRotations();
 
     // task specific tests below me
     void task141694_textItemEnsureVisible();
@@ -10372,6 +10373,81 @@ void tst_QGraphicsItem::stopClickFocusPropagation()
     QVERIFY(itemWithFocus->hasFocus());
 }
 
+void tst_QGraphicsItem::deviceCoordinateCache_simpleRotations()
+{
+    // Make sure we don't invalidate the cache when applying simple
+    // (90, 180, 270, 360) rotation transforms to the item.
+    QGraphicsRectItem *item = new QGraphicsRectItem(0, 0, 300, 200);
+    item->setBrush(Qt::red);
+    item->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+
+    QGraphicsScene scene;
+    scene.setSceneRect(0, 0, 300, 200);
+    scene.addItem(item);
+
+    MyGraphicsView view(&scene);
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+    QTRY_VERIFY(view.repaints > 0);
+
+    QGraphicsItemCache *itemCache = QGraphicsItemPrivate::get(item)->extraItemCache();
+    Q_ASSERT(itemCache);
+    QPixmapCache::Key currentKey = itemCache->deviceData.value(view.viewport()).key;
+
+    // Trigger an update and verify that the cache is unchanged.
+    QPixmapCache::Key oldKey = currentKey;
+    view.reset();
+    view.viewport()->update();
+    QTRY_VERIFY(view.repaints > 0);
+    currentKey = itemCache->deviceData.value(view.viewport()).key;
+    QCOMPARE(currentKey, oldKey);
+
+    // Check 90, 180, 270 and 360 degree rotations.
+    for (int angle = 90; angle <= 360; angle += 90) {
+        // Rotate item and verify that the cache was invalidated.
+        oldKey = currentKey;
+        view.reset();
+        QTransform transform;
+        transform.translate(150, 100);
+        transform.rotate(angle);
+        transform.translate(-150, -100);
+        item->setTransform(transform);
+        QTRY_VERIFY(view.repaints > 0);
+        currentKey = itemCache->deviceData.value(view.viewport()).key;
+        QVERIFY(currentKey != oldKey);
+
+        // IMPORTANT PART:
+        // Trigger an update and verify that the cache is unchanged.
+        oldKey = currentKey;
+        view.reset();
+        view.viewport()->update();
+        QTRY_VERIFY(view.repaints > 0);
+        currentKey = itemCache->deviceData.value(view.viewport()).key;
+        QCOMPARE(currentKey, oldKey);
+    }
+
+    // 45 degree rotation.
+    oldKey = currentKey;
+    view.reset();
+    QTransform transform;
+    transform.translate(150, 100);
+    transform.rotate(45);
+    transform.translate(-150, -100);
+    item->setTransform(transform);
+    QTRY_VERIFY(view.repaints > 0);
+    currentKey = itemCache->deviceData.value(view.viewport()).key;
+    QVERIFY(currentKey != oldKey);
+
+    // Trigger an update and verify that the cache was invalidated.
+    // We should always invalidate the cache for non-trivial transforms.
+    oldKey = currentKey;
+    view.reset();
+    view.viewport()->update();
+    QTRY_VERIFY(view.repaints > 0);
+    currentKey = itemCache->deviceData.value(view.viewport()).key;
+    QVERIFY(currentKey != oldKey);
+}
+
 void tst_QGraphicsItem::QTBUG_5418_textItemSetDefaultColor()
 {
     struct Item : public QGraphicsTextItem
-- 
cgit v0.12


From e1568b04816465df45b7f974a1031791943bf4f0 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 6 Oct 2010 11:48:24 +0200
Subject: Fixes assert in QDeclarativeWebView

If QDeclarativeWebView was instantiated twice
an assert was triggered by QWebSettings::enablePersistentStorage();

This patch is crtical for tooling (Bauhaus)

Task-number: QTBUG-14278
Reviewed-by: Aaron Kennedy
(cherry picked from commit f532679ca11914b453e22342f2ae5e9f790ce47a)
---
 src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index 94f08bd..e4f70de 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -249,7 +249,11 @@ void QDeclarativeWebView::init()
 {
     d = new QDeclarativeWebViewPrivate(this);
 
-    QWebSettings::enablePersistentStorage();
+    if (QWebSettings::iconDatabasePath().isNull() &&
+        QWebSettings::globalSettings()->localStoragePath().isNull() &&
+        QWebSettings::offlineStoragePath().isNull() &&
+        QWebSettings::offlineWebApplicationCachePath().isNull()) 
+        QWebSettings::enablePersistentStorage();
 
     setAcceptedMouseButtons(Qt::LeftButton);
     setFlag(QGraphicsItem::ItemHasNoContents, true);
-- 
cgit v0.12


From dc5299e1a59e066e4b804c081114edaa8b104438 Mon Sep 17 00:00:00 2001
From: Benjamin Poulain <benjamin.poulain@nokia.com>
Date: Sat, 9 Oct 2010 17:28:06 +0200
Subject: Add missing data for the autotest of in-place conversion for Pixmap

The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image
which was not commited with the patch.
(cherry picked from commit f0c1f381af7d6338ded9f65d00ed54b1b9405ba9)
---
 .../loadFromData/designer_indexed8_no_alpha_animated.gif | Bin 0 -> 4075 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif

diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif b/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif
new file mode 100644
index 0000000..86a3a2e
Binary files /dev/null and b/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif differ
-- 
cgit v0.12


From 6f596b07a7c035b36bc1005a83b283057669e4ac Mon Sep 17 00:00:00 2001
From: Benjamin Poulain <benjamin.poulain@nokia.com>
Date: Fri, 8 Oct 2010 14:21:10 +0200
Subject: Avoid in-place convertion of images with multiple references

The decoding from image reader was assuming the image reader do not
keep the image internally. This is not true for the GIF plugins because
the previous image can be used to compose the current image.

This was causing crash on ARM because the 16 bits color depth causes
the image memory to be reduce by half. When the plugin was accessing
the memory, it assumes the images has not changed and is on 32 bits.

This patch disable the in-place conversion if a detach is required.
Regular conversion is the correct solution in this case, and it can
also be made faster by converting while copying.

Reviewed-by: Andreas Kling
(cherry picked from commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b)
---
 src/gui/image/qimage.cpp           |  4 ++++
 tests/auto/qpixmap/tst_qpixmap.cpp | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index ac148ee..1157b93 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -6607,6 +6607,10 @@ bool QImageData::convertInPlace(QImage::Format newFormat, Qt::ImageConversionFla
     if (format == newFormat)
         return true;
 
+    // No in-place conversion if we have to detach
+    if (ref > 1)
+        return false;
+
     const InPlace_Image_Converter *const converterPtr = &inplace_converter_map[format][newFormat];
     InPlace_Image_Converter converter = *converterPtr;
     if (converter)
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 8005ec5..24cbb21 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -179,6 +179,7 @@ private slots:
     void fromImageReader_data();
     void fromImageReader();
 
+    void fromImageReaderAnimatedGif_data();
     void fromImageReaderAnimatedGif();
 
     void preserveDepth();
@@ -1605,6 +1606,8 @@ void tst_QPixmap::fromImageReader_data()
     QTest::newRow("designer_indexed8_no_alpha.gif") << prefix + "/designer_indexed8_no_alpha.gif";
     QTest::newRow("designer_indexed8_with_alpha.gif") << prefix + "/designer_indexed8_with_alpha.gif";
     QTest::newRow("designer_rgb32.jpg") << prefix + "/designer_rgb32.jpg";
+    QTest::newRow("designer_indexed8_with_alpha_animated") << prefix + "/designer_indexed8_with_alpha_animated.gif";
+    QTest::newRow("designer_indexed8_with_alpha_animated") << prefix + "/designer_indexed8_no_alpha_animated.gif";
 }
 
 void tst_QPixmap::fromImageReader()
@@ -1621,14 +1624,22 @@ void tst_QPixmap::fromImageReader()
     QVERIFY(pixmapsAreEqual(&pixmapWithCopy, &directLoadingPixmap));
 }
 
+void tst_QPixmap::fromImageReaderAnimatedGif_data()
+{
+    QTest::addColumn<QString>("imagePath");
+    QTest::newRow("gif with alpha") << QString::fromLatin1("/designer_indexed8_with_alpha_animated.gif");
+    QTest::newRow("gif without alpha") << QString::fromLatin1("/designer_indexed8_no_alpha_animated.gif");
+}
+
 void tst_QPixmap::fromImageReaderAnimatedGif()
 {
+    QFETCH(QString, imagePath);
 #ifdef Q_OS_SYMBIAN
     const QString prefix = QLatin1String(SRCDIR) + "loadFromData";
 #else
     const QString prefix = QLatin1String(SRCDIR) + "/loadFromData";
 #endif
-    const QString path = prefix + QString::fromLatin1("/designer_indexed8_with_alpha_animated.gif");
+    const QString path = prefix + imagePath;
 
     QImageReader referenceReader(path);
     QImageReader pixmapReader(path);
-- 
cgit v0.12


From 47827b076d3546e630dbfd6cfcfb8b627f41d13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond.kjernasen@nokia.com>
Date: Tue, 12 Oct 2010 12:54:15 +0200
Subject: Revert "Don't define highp/mediump/lowp if desktop GL has them"

This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd.
The GL_ARB_ES2_compatibility extension does not mention the lowp,
mediump or highp keywords.

Task-number: QTBUG-14384
Reviewed-by: Samuel
Reviewed-by: Prasanth
(cherry picked from commit 7cd0a90344d340f22b6b2d3afeef092dbaf2cd51)
---
 dist/changes-4.6.4              |  4 +---
 src/opengl/qgl.cpp              |  3 ---
 src/opengl/qgl_p.h              |  3 +--
 src/opengl/qglshaderprogram.cpp | 10 ++--------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4
index 389aa3a..3949b9a 100644
--- a/dist/changes-4.6.4
+++ b/dist/changes-4.6.4
@@ -66,8 +66,6 @@ QtOpenGL
  - QGLShaderProgram
     * [QTBUG-12478] Don't resolve GLSL extensions if no shaders.
     * [QTBUG-12591] setUniformValue(QSize) was setting (w,w) not (w,h).
-    * [QTBUG-12862] Don't #define highp/mediump/lowp if the desktop OpenGL
-      implementation has the GL_ARB_ES2_compatibility extension.
     * [QTBUG-12554] Wrong OpenGLVersionFlags on OpenGL 4.0 systems.
 
 QtScript
@@ -109,7 +107,7 @@ Third party components
 Qt for Unix (X11 and Mac OS X)
 ------------------------------
 
- - 
+ -
 
 Qt for Linux/X11
 ----------------
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 15070d4..3a4a244 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -5261,8 +5261,6 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions()
         glExtensions |= FragmentShader;
     if (extensions.match("GL_ARB_shader_objects"))
         glExtensions |= FragmentShader;
-    if (extensions.match("GL_ARB_ES2_compatibility"))
-        glExtensions |= ES2Compatibility;
     if (extensions.match("GL_ARB_texture_mirrored_repeat"))
         glExtensions |= MirroredRepeat;
     if (extensions.match("GL_EXT_framebuffer_object"))
@@ -5283,7 +5281,6 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions()
     glExtensions |= FramebufferObject;
     glExtensions |= GenerateMipmap;
     glExtensions |= FragmentShader;
-    glExtensions |= ES2Compatibility;
 #endif
 #if defined(QT_OPENGL_ES_1)
     if (extensions.match("GL_OES_framebuffer_object"))
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 623eeaf..387c8f7 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -284,8 +284,7 @@ public:
         DDSTextureCompression   = 0x00008000,
         ETC1TextureCompression  = 0x00010000,
         PVRTCTextureCompression = 0x00020000,
-        FragmentShader          = 0x00040000,
-        ES2Compatibility        = 0x00080000
+        FragmentShader          = 0x00040000
     };
     Q_DECLARE_FLAGS(Extensions, Extension)
 
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index bc1c009..74382b0 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -97,10 +97,6 @@ QT_BEGIN_NAMESPACE
     to just features that are present in GLSL/ES, and avoid
     standard variable names that only work on the desktop.
 
-    If the \c{GL_ARB_ES2_compatibility} extension is present,
-    then the above prefix is not added because the desktop OpenGL
-    implementation supports precision qualifiers.
-
     \section1 Simple shader example
 
     \snippet doc/src/snippets/code/src_opengl_qglshaderprogram.cpp 1
@@ -398,10 +394,8 @@ bool QGLShader::compileSourceCode(const char *source)
             srclen.append(GLint(headerLen));
         }
 #ifdef QGL_DEFINE_QUALIFIERS
-        if (!(QGLExtensions::glExtensions() & QGLExtensions::ES2Compatibility)) {
-            src.append(qualifierDefines);
-            srclen.append(GLint(sizeof(qualifierDefines) - 1));
-        }
+        src.append(qualifierDefines);
+        srclen.append(GLint(sizeof(qualifierDefines) - 1));
 #endif
 #ifdef QGL_REDEFINE_HIGHP
         if (d->shaderType == Fragment) {
-- 
cgit v0.12


From 11c3a750147f9f79d555a60915d8229e86108ca9 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Fri, 1 Oct 2010 17:18:39 +1000
Subject: Update change log. (cherry picked from commit
 976391c5ce2bbe3b992298e140bbbbc596ca756f)

---
 dist/changes-4.7.1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 2d79ac1..68b23ba 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -109,7 +109,11 @@ QtDBus
 
 QtMultimedia
 ------------
-
+ - QAudioOutput
+    * [QTBUG-11586] Support audio with more than two channels.
+    * [QTBUG-11755] Fixed outputing audio in push mode with ALSA.
+    * [QTBUG-11883] Fixed segmentation fault when closing a QAudioInput or
+      QAudioOutput.
 
 QtNetwork
 ---------
-- 
cgit v0.12


From 9559ec4082563b4b46d13d179dc13360f63566d3 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 4 Oct 2010 14:27:10 +0300
Subject: My changes for 4.7.1

Reviewed-by: TrustMe
(cherry picked from commit 0b905d602ffb24b8cad4f09d84a5f762cc6a6603)
---
 dist/changes-4.7.1 | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 68b23ba..51a10a3 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -308,7 +308,7 @@ Qt for Symbian
    * [QTBUG-4586] Fixed wrong paths in include/ActiveQt/headers.pri.
    * [QTBUG-11671] Fixed audio-backend detection in configure tests.
 
- - qmake
+ - qmake & mkspecs
    * [QTBUG-13523] Added support for using -L notation in the LIBS variable
      when building with the symbian/linux-armcc or gcce mkspec.
    * [QTBUG-12851] Fix assertion on Windows when DESTDIR is empty in static
@@ -318,6 +318,31 @@ Qt for Symbian
      .pro file.
    * [QTBUG-13081] vc[x]proj generators: support /MAP option without file
      name.
+   * [QTBUG-13902] Added support for unsigned smart installer package creation.
+   * [QTBUG-13991] No longer need to manually edit smart installer pkg file for publishing.
+   * [QT-3949] Load environment.prf from Symbian SDK if it exists there.
+   * [QTBUG-13499] Provide a way to compile with RVCT 4.0 using generated Makefile.
+   * [QTBUG-13336] Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
+   * [QTBUG-13363] Fix Symbian handling of projects with special characters in TARGET.
+   * [QTBUG-12762 & QTBUG-13307] Gcce building support for symbian-sbsv2
+   * [QTBUG-13147] Added support for DEPLOYMENT.pkg_build_version
+   * [QTBUG-12884] Fix "installer_sis" and "deploy" targets when TARGET has path.
+   * [QTBUG-12879] Fix check to remove unnecessary deployments in Symbian.
+   * [QTBUG-12716] Make bld.inf target in Symbian mkspecs to depend on .pro file.
+   * [QTBUG-12715] Rename Symbian generated mmp/mk files to include target in filename.
+   * [QTBUG-12617] Fix package header in cases where VERSION doesn't contain all values.
+   * Fix run and runonphone targets for projects that have TARGET with path.
+   * Fix QT_LIBINFIX for QT_PLUGINS_BASE_DIR.
+   * No longer require PRE_TARGETDEPS items to be absolute for symbian-sbsv2 mkspec.
+   * Do smart command replacement for commands containing $$QMAKE_*
+     command variables, such as $$QMAKE_COPY, when generating bld.inf
+     extensions for QMAKE_EXTRA_* variables for symbian-sbsv2 mkspec.
+
+ - s60installs
+   * Fixed qsymbianbearer.qtplugin exports in s60installs.pro.
+
+ - patch_capabilities.pl
+   * [QTBUG-13760] Improved output of patch_capabilities.pl script.
 
  - QInputContext
    * [QTBUG-12949] Fixed a bug where passwords would not be committed when
@@ -325,6 +350,23 @@ Qt for Symbian
    * [QTBUG-13472] Fixed crash in input methods when using symbols menu and
      numbers only.
 
+ - QDesktopWidget
+   * [QTBUG-14058] Fix QApplication::desktop()->availableGeometry().
+
+ - QtCore
+   * [QTBUG-13802] Symbian^4 platform detection for QSysInfo::symbianVersion().
+   * [QTBUG-13612] Do not wait for QThread exit when destroying global statics.
+   * [QT-3895] Change RLibrary handle in QS60PluginResolver to be process wide.
+   * [QTBUG-11218] Fix QProcessManager destruction.
+
+ - Qt Plugins
+   * [QT-3949] Remove pre-Symbian3 plugins from Symbian3 and later builds and
+     Check S60_VERSION instead of existence of certain files in bearer plugin.
+
+ - Demos & Examples
+   * [QTBUG-13461] Remove some .pro statements left behind after IAP usage cleanup
+   * [QTBUG-12276] Assigned valid UID3 for fortuneserver example.
+
 Qt for Windows CE
 -----------------
  - Gui
-- 
cgit v0.12


From 671e13acdd0b5b65e1842bad7e47d2f8c170f586 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 15 Oct 2010 13:36:02 +1000
Subject: Cleanup changelog for 4.7.1. (cherry picked from commit
 eb625b3112c241047e8d08146b63545165d33ebf)

---
 dist/changes-4.7.1 | 328 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 173 insertions(+), 155 deletions(-)

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 51a10a3..b25b95c 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -13,7 +13,6 @@ corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task
 Tracker, or the Merge Request queue of the public source repository.
 
 Qt Bug Tracker: http://bugreports.qt.nokia.com
-Task Tracker:   http://qt.nokia.com/developer/task-tracker
 Merge Request:  http://qt.gitorious.org
 
 ****************************************************************************
@@ -31,8 +30,6 @@ Optimizations
  - On x86 and 86_64, the memory access has been improved for alpha blending
    and for some composition functions.
 
- * See list of Important Behavior Changes below
-
 
 ****************************************************************************
 *                          Library                                         *
@@ -42,69 +39,68 @@ QtCore
 ------
 
  - Containers
-    * [QTBUG-13079] Fix assingment of a container included in the container itself
+    * [QTBUG-13079] Fix assignment of a container included in the container
+      itself.
 
- - QLibrary
-    * [QT-3825] System libraries are only loaded from the system directories
+ - QEventDispatcherUnix
+    * [QTBUG-13633] Do not process too many timer events if other events need
+      to be processed first.
 
+ - QLibrary
+    * [QT-3825] System libraries are only loaded from the system directories.
 
  - QUuid
-    * [QTBUG-11213] QUuid::createUuid() should not generate identical sequences on UNIX
-
- - QEventDispatcherUnix
-    * [QTBUG-13633] Do not process too many timer events if other events need
-     to be processed first
+    * [QTBUG-11213] QUuid::createUuid() should not generate identical sequences
+      on UNIX.
 
 
 QtGui
 -----
 
- - QGraphicsWidget
-	* [QTBUG-13188] Make sure a font that has propagated from a parent can
-	  be set on a QPainter.
-    * [QT-3808] Issues when applying effects in combination with ItemHasNoContents flag.
+ - QGraphicsEffect
+    * [QT-3633] Wrong bounding rect.
 
  - QGraphicsItem
     * [QTBUG-3633, QT-3828] Wrong children bounding rect when applying effects.
 
- - QGraphicsEffect
-    * [QT-3633] Wrong bounding rect.
-
  - QGraphicsScene
     * [QT-3674] Spurious assert triggered from render().
 
+ - QGraphicsWidget
+    * [QTBUG-13188] Make sure a font that has propagated from a parent can
+       be set on a QPainter.
+    * [QT-3808] Issues when applying effects in combination with
+      ItemHasNoContents flag.
+
+ - QGtkStyle
+    * [QTBUG-13125] Fixed a regression with custom itemview background color.
+
+ - QLineEdit
+    * [QTBUG-13520] Fixed the scrolling of text with right alignment.
+
  - QPainter
     * [QTBUG-13429] Fixed scale point drawing with square cap in the raster
       engine, plus some potential floating point overflows in the rasterizer.
     * Optimized pixmap drawing with SmoothPixmapTransform.
 
- - QStaticText
-    * [QTBUG-12614] Fix crash with zero-width string.
-	* [QTBUG-12540] Fix rendering of large glyphs with OpenGL2 paint engine.
-
-
  - QPinchGesture
     * The scaleFactor and totalScaleFactor now represent a value that allows
       an object to track a touchpoint during a Pinch Gesture even when using
       sequences for zooming.
-      Therefor the scale factors are initialized to 1.0 and for every new
+      Therefore the scale factors are initialized to 1.0 and for every new
       sequence the totalScaleFactor is multiplied with the scaleFactor of the
       new sequence.
 
- - QLineEdit
-    * [QTBUG-13520] Fixed the scrolling of text with right alignment
-
  - QPixmap
-    * [QTBUG-12560] Fixed a regression preventing loading images without extensions
+    * [QTBUG-12560] Fixed a regression preventing loading images without
+      extensions.
 
- - QTreeView
-    * [QTBUG-13567] Do not scroll to top if last item is removed
-
- - QGtkStyle
-    * [QTBUG-13125] Fixed a regression with custom itemview background color.
+ - QStaticText
+    * [QTBUG-12614] Fix crash with zero-width string.
+    * [QTBUG-12540] Fix rendering of large glyphs with OpenGL2 paint engine.
 
-QtDBus
-------
+ - QTreeView
+    * [QTBUG-13567] Do not scroll to top if last item is removed.
 
 
 QtMultimedia
@@ -115,151 +111,170 @@ QtMultimedia
     * [QTBUG-11883] Fixed segmentation fault when closing a QAudioInput or
       QAudioOutput.
 
+
 QtNetwork
 ---------
- - QSslConfiguration
-    * [QTBUG-13265] fix crash with empty configuration
- - QSslCertificate
-    * [QTBUG-12489] support dates > 2049
  - Bearer Management
     * Improved reliability on Symbian and Maemo.
     * Added connman/meego backend.
  - IPv6
-    * Disable on Symbian until OpenC properly supports it
+    * Disable on Symbian until OpenC properly supports it.
+ - QSslConfiguration
+    * [QTBUG-13265] Fixed crash with empty configuration.
+ - QSslCertificate
+    * [QTBUG-12489] Support dates > 2049.
  - QNetworkAccessManager
-    * [QTBUG-12285] Crash fix related to aborted uploads
+    * [QTBUG-12285] Crash fix related to aborted uploads.
 
 
 QtOpenGL
 --------
  - QGL2PaintEngineEx
     * Fixed drawing a large number of glyphs with the same font on systems
-      with small texure size limits.
-
-QtOpenVG
---------
-
-
-QtWebKit
---------
-
-
-QtSql
------
-
+      with small texture size limits.
 
-QtSvg
------
 
 QtXml
 -----
  * Fixed a crash when parsing invalid tag names.
 
+
 QtXmlPatterns
 -------------
  - XML Schema internals:
-    * [QTBUG-11559] Only parse 3 digits of time fraction
+    * [QTBUG-11559] Only parse 3 digits of time fraction.
+
 
 QtDeclarative
 -------------
  - QML language
-    * [QTBUG-13799] QML core module renamed to QtQuick to decouple it from Qt releases.
-      Old "import Qt 4.7" will co-exist with "import QtQuick 1.0' at least during Qt 4.7 releases.
-    * [QTBUG-13047] Support passing QObject derived types to QML methods
-    * [QTBUG-12837] Support JS "in" operator on QML objects
-    * [QTBUG-13045] Prevent calling deleteLater() from QML
-    * [QTBUG-13043] Ignore non-scriptable properties in QML
-    * [QTBUG-13114] Don't double call classBegin()
-    * [QTBUG-12946] Ensure the onDestruction handlers are called before the expressions are cleared
-    * [QTBUG-12599] Re-enabled script program caching on Symbian
-    * [QTBUG-13374] Don't modify the signal order on the second dynamic meta object pass
-    * Support for qsTrId and meta-data in comments for QML
- - QML debugging:
+    * [QTBUG-13799] QML core module renamed to QtQuick to decouple it from Qt
+      releases.  Old "import Qt 4.7" will co-exist with "import QtQuick 1.0' at
+      least during Qt 4.7 releases.
+    * [QTBUG-13047] Support passing QObject derived types to QML methods.
+    * [QTBUG-12837] Support JS "in" operator on QML objects.
+    * [QTBUG-13045] Prevent calling deleteLater() from QML.
+    * [QTBUG-13043] Ignore non-scriptable properties in QML.
+    * [QTBUG-13114] Don't double call classBegin().
+    * [QTBUG-12946] Ensure the onDestruction handlers are called before the
+      expressions are cleared.
+    * [QTBUG-12599] Re-enabled script program caching on Symbian.
+    * [QTBUG-13374] Don't modify the signal order on the second dynamic meta
+      object pass.
+    * Support for qsTrId and meta-data in comments for QML.
+ - QML debugging
     * [QTBUG-5162] The debugger is now activated with -qmljsdebugger command
-    line arg to enable support for platforms without environment variables
-    * Various improvements to ease debugging in creator
+      line arg to enable support for platforms without environment variables.
+    * Various improvements to ease debugging in creator.
  - AnchorAnimation
-    * [QTBUG-13398] Fix AnchorAnimation for multiple AnchorChanges with dependancies
+    * [QTBUG-13398] Fix AnchorAnimation for multiple AnchorChanges with
+      dependancies.
  - AnchorChanges
-    * [QTBUG-11834] Restore any absolute geometry changed by AnchorChanges when returning to the base state
+    * [QTBUG-11834] Restore any absolute geometry changed by AnchorChanges when
+      returning to the base state.
  - Component
-    * [QTBUG-13170] Complete Component::createObject() creation after setting the parent
+    * [QTBUG-13170] Complete Component::createObject() creation after setting
+      the parent.
  - GridView
-    * [QTBUG-13166] GridView.view property should not be writable
+    * [QTBUG-13166] GridView.view property should not be writable.
  - Flickable 
-    * [QTBUG-13095] Ensure Flickable visibleArea is updated when view height changes
-    * [QTBUG-13176] Avoid Flickable view jumping when drag threashold is exceeded
-    * [QTBUG-13078] Fix poor flicking behavior with slower flicks
-    * Handle QGraphicsWidgets in Flickable
+    * [QTBUG-13095] Ensure Flickable visibleArea is updated when view height
+      changes.
+    * [QTBUG-13176] Avoid Flickable view jumping when drag threashold is
+      exceeded.
+    * [QTBUG-13078] Fix poor flicking behavior with slower flicks.
+    * Handle QGraphicsWidgets in Flickable.
  - FocusScope
-    * [QTBUG-12649] Make sure onFocusChanged is correctly emitted for items in a FocusScope.
+    * [QTBUG-12649] Make sure onFocusChanged is correctly emitted for items
+      in a FocusScope.
  - FontLoader
-    * [QTBUG-13419] Don't add the same font to the font database multiple times 
+    * [QTBUG-13419] Don't add the same font to the font database multiple
+      times.
+ - Image
+    * [QTBUG-13454] Changing the Image 'source' no longer goes through the
+      'Loading' state if the image is cached.
+    * [QTBUG-13383] Do not reset sourceSize when changing image source url.
+    * [QTBUG-13002] Setting one dimension of the sourceSize should set the other
+      dimension.
+    * [QTBUG-12302] Fix remote image url redirects are done in the right thread.
+    * Ensure all image states are updated before emitting statusChanged signals.
  - ListModel
-    * [QTBUG-12363] Modifying an object returned by ListModel.get(0) didn't update the view
-    * [QTBUG-13666] Calling set() and setProperty() on ListModel from a WorkerScript didn't update the view
-    * Fix Worker ListModel to emit the right signal when items change
-    * Fix crash with invalid role indexes
-    * improved ListModel error messages
+    * [QTBUG-12363] Modifying an object returned by ListModel.get(0) didn't
+      update the view.
+    * [QTBUG-13666] Calling set() and setProperty() on ListModel from a
+      WorkerScript didn't update the view.
+    * Fix Worker ListModel to emit the right signal when items change.
+    * Fix crash with invalid role indexes.
+    * improved ListModel error messages.
  - ListView
-    * [QTBUG-13664] Models with a single role didn't always update correctly
-    * [QTBUG-13543] Ensure flickable velocity is updated when view is moved by setCurrentIndex
-    * [QTBUG-12664] Ensure highlight is positioned correctly in positionViewAtIndex()
-    * [QTBUG-13166] Fix ListView.view attached property with VisualItemModel
-    * [QTBUG-13039] Fix crash in synchronization of ListModel in WorkerThread
-    * [QTBUG-11341] Flicking a ListView sometimes made it loose focus
-    * [QTBUG-13166] ListView.view property should not be writable
+    * [QTBUG-13664] Models with a single role didn't always update correctly.
+    * [QTBUG-13543] Ensure flickable velocity is updated when view is moved by
+      setCurrentIndex.
+    * [QTBUG-12664] Ensure highlight is positioned correctly in
+      positionViewAtIndex().
+    * [QTBUG-13166] Fix ListView.view attached property with VisualItemModel.
+    * [QTBUG-13039] Fix crash in synchronization of ListModel in WorkerThread.
+    * [QTBUG-11341] Flicking a ListView sometimes made it lose focus.
+    * [QTBUG-13166] ListView.view property should not be writable.
+ - MouseArea 
+    * [QTBUG-12250] When onDoubleClicked: is handled don't emit a second
+      onPressed/onClicked.
+ - NumberAnimation
+    * [QTBUG-12805] Clear previous animation data for non-triggering animations.
+ - ParentChange
+    * [QTBUG-13554] ParentChange fails to apply rotation changes of exactly 180
+      degrees.
  - PathView 
-    * [QTBUG-13689] Moving items in a PathView caused PathView.onPath to be set to false
-    * [QTBUG-13687] PathView didn't accept mouse events, preventing it from working in a Flickable
-    * [QTBUG-13416] Fix PathView item position on insertion and removal
-    * [QTBUG-13017] Fix PathView when setting an empty model that is later filled
-    * [QTBUG-12747] PathView required some diagonal movement before a drag was initiated
+    * [QTBUG-13689] Moving items in a PathView caused PathView.onPath to be set
+      to false.
+    * [QTBUG-13687] PathView didn't accept mouse events, preventing it from
+      working in a Flickable.
+    * [QTBUG-13416] Fix PathView item position on insertion and removal.
+    * [QTBUG-13017] Fix PathView when setting an empty model that is later
+      filled.
+    * [QTBUG-12747] PathView required some diagonal movement before a drag was
+      initiated.
  - Positioners
-    * made positioners work with QGraphicsWidgets
+    * made positioners work with QGraphicsWidgets.
  - PropertyChanges
-    * [QTBUG-12559] Correctly apply PropertyChanges when entering an extended state directly from the base state
- - VisualDataModel
-    * [QTBUG-13754] Fixed a crash when updating a property in ListModel with multiple roles
-    * [QTBUG-13038] Fix VisualDataModel model update handling when rootIndex is specified
-    * [QTBUG-13146] Handle layoutChanged() properly in QML views
- - XmlListModel 
-    * [QTBUG-13041] XmlListModel thread was left hanging on Symbian application exit
- - ParentChange
-    * [QTBUG-13554] ParentChange fails to apply rotation changes of exactly 180 degrees
- - MouseArea 
-    * [QTBUG-12250] When onDoubleClicked: is handled don't emit a second onPressed/onClicked
- - Image
-    * [QTBUG-13454] Changing the Image 'source' no longer goes through the 'Loading' state if the image is cached.
-    * [QTBUG-13383] Do not reset sourceSize when changing image source url
-    * [QTBUG-13002] Setting one dimension of the sourceSize should set the other dimensio
-    * [QTBUG-12302] Fix remote image url redirects are done in the right thread
-    * Ensure all image states are updated before emitting statusChanged signals
- - NumberAnimation
-    * [QTBUG-12805] Clear previous animation data for non-triggering animations
+    * [QTBUG-12559] Correctly apply PropertyChanges when entering an extended
+      state directly from the base state.
+ - QDeclarativeImageProvider:
+    * Fixed memory leak.
+    * Improved concurrency when using in asynchronus mode.
  - Repeater
-    * [QTBUG-12905] Emit countChanged where appropriate in Repeater
+    * [QTBUG-12905] Emit countChanged where appropriate in Repeater.
  - SmoothedAnimation
-    * [QTBUG-12336] Update running animations if a SmoothedAnimation is changed
+    * [QTBUG-12336] Update running animations if a SmoothedAnimation is changed.
  - SpringAnimation
-    * [QTBUG-13044] SpringAnimation velocity animation stop logic was fragile
+    * [QTBUG-13044] SpringAnimation velocity animation stop logic was fragile.
  - Text
-    * [QTBUG-13453] Fix jerky scrolling caused by unnecessary repaints of Text element 
-    * [QTBUG-13142] Fix alignment of shadow for rich text when using text styles
-    * [QTBUG-11002] Improve QML text rendering when LCD smoothing is enabled for OS X
+    * [QTBUG-13453] Fix jerky scrolling caused by unnecessary repaints of Text
+      element.
+    * [QTBUG-13142] Fix alignment of shadow for rich text when using text
+      styles.
+    * [QTBUG-11002] Improve QML text rendering when LCD smoothing is enabled
+      for OS X.
  - TextInput
-    * [QTBUG-11127] Fix autoScroll implementation
- - XmlHttpRequest
-    * [QTBUG-13117] Fix responseText to check the charset encoding field and also to not assume that the data is xml
+    * [QTBUG-11127] Fix autoScroll implementation.
+ - VisualDataModel
+    * [QTBUG-13754] Fixed a crash when updating a property in ListModel with
+      multiple roles.
+    * [QTBUG-13038] Fix VisualDataModel model update handling when rootIndex is
+      specified.
+    * [QTBUG-13146] Handle layoutChanged() properly in QML views.
  - WebView
-    * [QTBUG-13342] Ensure WebView gets focus when an editable node is clicked on
- - QDeclarativeImageProvider:
-    * Fixed memory leak
-    * Improved concurrency when using in assynchronus mode.
+    * [QTBUG-13342] Ensure WebView gets focus when an editable node is clicked.
+ - XmlHttpRequest
+    * [QTBUG-13117] Fix responseText to check the charset encoding field and
+      also to not assume that the data is xml.
+ - XmlListModel 
+    * [QTBUG-13041] XmlListModel thread was left hanging on Symbian application
+      exit.
+
 
 Qt Plugins
 ----------
-
  - Jpeg image IO plugin
     * [QTBUG-13653] Fixed infinite loop when loading jpeg without EOI marker
       from memory.
@@ -275,15 +290,16 @@ Qt for Unix (X11 and Mac OS X)
 
 Qt for Linux/X11
 ----------------
- - The configure script now detects all vector extensions of x86 and x86_64
+ - The configure script now detects all vector extensions of x86 and x86_64.
 
 Qt for Windows
 --------------
  - Event System:
-   * [QTBUG-12721] Fix Qt applications freezing until mouse/keyboard events occur.
+   * [QTBUG-12721] Fix Qt applications freezing until mouse/keyboard events
+     occur.
 
  - Drag & Drop:
-   * [QTBUG-13787] Fixed a possible crash with mingw
+   * [QTBUG-13787] Fixed a possible crash with mingw.
 
  - QPrinter
    * [QTBUG-12263] Strokes were in some cases not printed with the correct
@@ -303,7 +319,6 @@ Qt for Mac OS X
 
 Qt for Symbian
 --------------
-
  - configure
    * [QTBUG-4586] Fixed wrong paths in include/ActiveQt/headers.pri.
    * [QTBUG-11671] Fixed audio-backend detection in configure tests.
@@ -319,21 +334,27 @@ Qt for Symbian
    * [QTBUG-13081] vc[x]proj generators: support /MAP option without file
      name.
    * [QTBUG-13902] Added support for unsigned smart installer package creation.
-   * [QTBUG-13991] No longer need to manually edit smart installer pkg file for publishing.
+   * [QTBUG-13991] No longer need to manually edit smart installer pkg file for
+     publishing.
    * [QT-3949] Load environment.prf from Symbian SDK if it exists there.
-   * [QTBUG-13499] Provide a way to compile with RVCT 4.0 using generated Makefile.
+   * [QTBUG-13499] Provide a way to compile with RVCT 4.0 using generated
+     Makefile.
    * [QTBUG-13336] Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
-   * [QTBUG-13363] Fix Symbian handling of projects with special characters in TARGET.
+   * [QTBUG-13363] Fix Symbian handling of projects with special characters in
+     TARGET.
    * [QTBUG-12762 & QTBUG-13307] Gcce building support for symbian-sbsv2
    * [QTBUG-13147] Added support for DEPLOYMENT.pkg_build_version
    * [QTBUG-12884] Fix "installer_sis" and "deploy" targets when TARGET has path.
    * [QTBUG-12879] Fix check to remove unnecessary deployments in Symbian.
    * [QTBUG-12716] Make bld.inf target in Symbian mkspecs to depend on .pro file.
-   * [QTBUG-12715] Rename Symbian generated mmp/mk files to include target in filename.
-   * [QTBUG-12617] Fix package header in cases where VERSION doesn't contain all values.
+   * [QTBUG-12715] Rename Symbian generated mmp/mk files to include target in 
+     filename.
+   * [QTBUG-12617] Fix package header in cases where VERSION doesn't contain all
+     values.
    * Fix run and runonphone targets for projects that have TARGET with path.
    * Fix QT_LIBINFIX for QT_PLUGINS_BASE_DIR.
-   * No longer require PRE_TARGETDEPS items to be absolute for symbian-sbsv2 mkspec.
+   * No longer require PRE_TARGETDEPS items to be absolute for symbian-sbsv2
+     mkspec.
    * Do smart command replacement for commands containing $$QMAKE_*
      command variables, such as $$QMAKE_COPY, when generating bld.inf
      extensions for QMAKE_EXTRA_* variables for symbian-sbsv2 mkspec.
@@ -364,7 +385,8 @@ Qt for Symbian
      Check S60_VERSION instead of existence of certain files in bearer plugin.
 
  - Demos & Examples
-   * [QTBUG-13461] Remove some .pro statements left behind after IAP usage cleanup
+   * [QTBUG-13461] Remove some .pro statements left behind after IAP usage
+     cleanup.
    * [QTBUG-12276] Assigned valid UID3 for fortuneserver example.
 
 Qt for Windows CE
@@ -372,25 +394,21 @@ Qt for Windows CE
  - Gui
    * [QTBUG-8408] Show the [X] button on Windows mobile when maximizing.
 
+
 ****************************************************************************
 *                          Tools                                           *
 ****************************************************************************
 
- - Designer
-
  - uic
-  * Improve warnings and error reports
+  * Improve warnings and error reports.
 
  - moc
-  * Show an error if NOTIFY refer to a wrong signal in Q_PROPERTY
+  * Show an error if NOTIFY refer to a wrong signal in Q_PROPERTY.
 
  - QML Viewer
-    * [QTBUG-13347] Paused orientation sensors in Qml Viewer when the application window is not active to save device battery 
-    * [QTBUG-11019] Add a menu option to open remote files in the QML viewer
-    * QML Viewer is deployed under QtDemos folder instead of QtExamples folder in Symbian application menu
-
-****************************************************************************
-*                     Important Behavior Changes                           *
-****************************************************************************
-
+    * [QTBUG-13347] Paused orientation sensors in Qml Viewer when the
+      application window is not active to save device battery.
+    * [QTBUG-11019] Add a menu option to open remote files in the QML viewer.
+    * QML Viewer is deployed under QtDemos folder instead of QtExamples
+      folder in Symbian application menu.
 
-- 
cgit v0.12


From 98161f191ba6f3353404c61829e88419d7c4688a Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jkobus@trolltech.com>
Date: Thu, 14 Oct 2010 15:21:28 +0200
Subject: Workaround for QFileSystemWatcher regression

Don't call removePath() when it was not added before.

Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-14435
(cherry picked from commit f38e8394eae20f7290688629ab66720ebacd64c9)
---
 tools/designer/src/lib/shared/qtresourcemodel.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/designer/src/lib/shared/qtresourcemodel.cpp b/tools/designer/src/lib/shared/qtresourcemodel.cpp
index 709f389..e3fc805 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/tools/designer/src/lib/shared/qtresourcemodel.cpp
@@ -428,10 +428,10 @@ void QtResourceModelPrivate::removeOldPaths(QtResourceSet *resourceSet, const QS
 
 void QtResourceModelPrivate::setWatcherEnabled(const QString &path, bool enable)
 {
-    m_fileWatcher->removePath(path);
-
-    if (!enable)
+    if (!enable) {
+        m_fileWatcher->removePath(path);
         return;
+    }
 
     QFileInfo fi(path);
     if (fi.exists())
-- 
cgit v0.12


From 6a007684823298721ba2bdb26c8c0f726201547a Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 13 Oct 2010 11:42:10 +0200
Subject: Adjust the parent index for the itemsMoved call.

Not doing this causes the parent QModelIndexes to be out of sync with
the model.

The fix in fe350ca756df6392b3d0b7840351fccc89f9ef6f is extended to also
use adjusted indexes in the itemMove call.

Merge-request: 849
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 62dc9c9602987f4381481cc5642e3ea0782bb418)
---
 src/corelib/kernel/qabstractitemmodel.cpp                | 8 ++++----
 tests/auto/modeltest/dynamictreemodel.cpp                | 7 +++++++
 tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp | 6 ++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index 9a99ea1..05cb271 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -2637,8 +2637,6 @@ void QAbstractItemModel::endMoveRows()
     QAbstractItemModelPrivate::Change insertChange = d->changes.pop();
     QAbstractItemModelPrivate::Change removeChange = d->changes.pop();
 
-    d->itemsMoved(removeChange.parent, removeChange.first, removeChange.last, insertChange.parent, insertChange.first, Qt::Vertical);
-
     QModelIndex adjustedSource = removeChange.parent;
     QModelIndex adjustedDestination = insertChange.parent;
 
@@ -2649,6 +2647,8 @@ void QAbstractItemModel::endMoveRows()
     if (removeChange.needsAdjust)
       adjustedSource = createIndex(adjustedSource.row() + numMoved, adjustedSource.column(), adjustedSource.internalPointer());
 
+    d->itemsMoved(adjustedSource, removeChange.first, removeChange.last, adjustedDestination, insertChange.first, Qt::Vertical);
+
     emit rowsMoved(adjustedSource, removeChange.first, removeChange.last, adjustedDestination, insertChange.first);
     emit layoutChanged();
 }
@@ -2861,8 +2861,6 @@ void QAbstractItemModel::endMoveColumns()
     QAbstractItemModelPrivate::Change insertChange = d->changes.pop();
     QAbstractItemModelPrivate::Change removeChange = d->changes.pop();
 
-    d->itemsMoved(removeChange.parent, removeChange.first, removeChange.last, insertChange.parent, insertChange.first, Qt::Horizontal);
-
     QModelIndex adjustedSource = removeChange.parent;
     QModelIndex adjustedDestination = insertChange.parent;
 
@@ -2873,6 +2871,8 @@ void QAbstractItemModel::endMoveColumns()
     if (removeChange.needsAdjust)
       adjustedSource = createIndex(adjustedSource.row(), adjustedSource.column() + numMoved, adjustedSource.internalPointer());
 
+    d->itemsMoved(adjustedSource, removeChange.first, removeChange.last, adjustedDestination, insertChange.first, Qt::Horizontal);
+
     emit columnsMoved(adjustedSource, removeChange.first, removeChange.last, adjustedDestination, insertChange.first);
     emit layoutChanged();
 }
diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/modeltest/dynamictreemodel.cpp
index b572eb1..fa634b6 100644
--- a/tests/auto/modeltest/dynamictreemodel.cpp
+++ b/tests/auto/modeltest/dynamictreemodel.cpp
@@ -63,6 +63,13 @@ QModelIndex DynamicTreeModel::index(int row, int column, const QModelIndex &pare
 
   QList<QList<qint64> > childIdColumns = m_childItems.value(parent.internalId());
 
+  const qint64 grandParent = findParentId(parent.internalId());
+  if (grandParent >= 0) {
+    QList<QList<qint64> > parentTable = m_childItems.value(grandParent);
+    Q_ASSERT(parent.column() < parentTable.size());
+    QList<qint64> parentSiblings = parentTable.at(parent.column());
+    Q_ASSERT(parent.row() < parentSiblings.size());
+  }
 
   if (childIdColumns.size() == 0)
     return QModelIndex();
diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
index dbcccc9..b723253 100644
--- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -1167,6 +1167,7 @@ void tst_QAbstractItemModel::testMoveToGrandParent_data()
 
     // Moving everything from one parent to another
     QTest::newRow("move12") << 0 << 9 << 10;
+    QTest::newRow("move13") << 0 << 9 << 0;
 }
 
 void tst_QAbstractItemModel::testMoveToGrandParent()
@@ -1314,6 +1315,11 @@ void tst_QAbstractItemModel::testMoveToSibling_data()
     QTest::newRow("move09") << 8 << 8 << 4;
     QTest::newRow("move10") << 8 << 8 << 5;
     QTest::newRow("move11") << 8 << 8 << 6;
+
+    // Move such that the destination parent no longer valid after the move.
+    // The destination parent is always QMI(5, 0), but after this move the
+    // row count is 5, so (5, 0) (used internally in QAIM) no longer refers to a valid index.
+    QTest::newRow("move12") << 0 << 4 << 0;
 }
 
 void tst_QAbstractItemModel::testMoveToSibling()
-- 
cgit v0.12


From d093af32cd780a13a3e43e9c292c53ce9160151e Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 18 Oct 2010 20:52:13 +1000
Subject: Update license headers to release version.

---
 bin/createpackage.bat                              | 26 ++++----
 bin/createpackage.pl                               | 26 ++++----
 bin/patch_capabilities.pl                          | 26 ++++----
 bin/setcepaths.bat                                 | 26 ++++----
 bin/syncqt.bat                                     | 26 ++++----
 config.tests/mac/corewlan/corewlantest.mm          | 26 ++++----
 config.tests/mac/crc/main.cpp                      | 26 ++++----
 config.tests/mac/xcodeversion.cpp                  | 26 ++++----
 config.tests/qws/ahi/ahi.cpp                       | 26 ++++----
 config.tests/qws/directfb/directfb.cpp             | 26 ++++----
 config.tests/qws/sound/sound.cpp                   | 26 ++++----
 config.tests/qws/svgalib/svgalib.cpp               | 26 ++++----
 config.tests/symbian/audio/audio.cpp               | 26 ++++----
 config.tests/symbian/simple/main.cpp               | 26 ++++----
 config.tests/unix/3dnow/3dnow.cpp                  | 26 ++++----
 config.tests/unix/alsa/alsatest.cpp                | 26 ++++----
 config.tests/unix/avx/avx.cpp                      | 26 ++++----
 config.tests/unix/clock-gettime/clock-gettime.cpp  | 26 ++++----
 .../unix/clock-monotonic/clock-monotonic.cpp       | 26 ++++----
 config.tests/unix/cups/cups.cpp                    | 26 ++++----
 config.tests/unix/db2/db2.cpp                      | 26 ++++----
 config.tests/unix/dbus/dbus.cpp                    | 26 ++++----
 .../unix/doubleformat/doubleformattest.cpp         | 26 ++++----
 config.tests/unix/egl/egl.cpp                      | 26 ++++----
 config.tests/unix/egl4gles1/egl4gles1.cpp          | 26 ++++----
 config.tests/unix/endian/endiantest.cpp            | 26 ++++----
 config.tests/unix/floatmath/floatmath.cpp          | 26 ++++----
 config.tests/unix/freetype/freetype.cpp            | 26 ++++----
 config.tests/unix/getaddrinfo/getaddrinfotest.cpp  | 26 ++++----
 config.tests/unix/getifaddrs/getifaddrs.cpp        | 26 ++++----
 config.tests/unix/glib/glib.cpp                    | 26 ++++----
 config.tests/unix/gnu-libiconv/gnu-libiconv.cpp    | 26 ++++----
 config.tests/unix/gstreamer/gstreamer.cpp          | 26 ++++----
 config.tests/unix/ibase/ibase.cpp                  | 26 ++++----
 config.tests/unix/icd/icd.cpp                      | 26 ++++----
 config.tests/unix/iconv/iconv.cpp                  | 26 ++++----
 config.tests/unix/inotify/inotifytest.cpp          | 26 ++++----
 config.tests/unix/iodbc/iodbc.cpp                  | 26 ++++----
 config.tests/unix/ipv6/ipv6test.cpp                | 26 ++++----
 config.tests/unix/ipv6ifname/ipv6ifname.cpp        | 26 ++++----
 config.tests/unix/iwmmxt/iwmmxt.cpp                | 26 ++++----
 .../unix/javascriptcore-jit/hwcap_test.cpp         | 26 ++++----
 config.tests/unix/libjpeg/libjpeg.cpp              | 26 ++++----
 config.tests/unix/libmng/libmng.cpp                | 26 ++++----
 config.tests/unix/libpng/libpng.cpp                | 26 ++++----
 config.tests/unix/libtiff/libtiff.cpp              | 26 ++++----
 config.tests/unix/mmx/mmx.cpp                      | 26 ++++----
 config.tests/unix/mremap/mremap.cpp                | 26 ++++----
 config.tests/unix/mysql/mysql.cpp                  | 26 ++++----
 config.tests/unix/neon/neon.cpp                    | 26 ++++----
 config.tests/unix/nis/nis.cpp                      | 26 ++++----
 config.tests/unix/oci/oci.cpp                      | 26 ++++----
 config.tests/unix/odbc/odbc.cpp                    | 26 ++++----
 config.tests/unix/opengles1/opengles1.cpp          | 26 ++++----
 config.tests/unix/opengles2/opengles2.cpp          | 26 ++++----
 config.tests/unix/openssl/openssl.cpp              | 26 ++++----
 config.tests/unix/openvg/openvg.cpp                | 26 ++++----
 config.tests/unix/psql/psql.cpp                    | 26 ++++----
 config.tests/unix/ptrsize/ptrsizetest.cpp          | 26 ++++----
 config.tests/unix/pulseaudio/pulseaudio.cpp        | 26 ++++----
 config.tests/unix/shivavg/shivavg.cpp              | 26 ++++----
 config.tests/unix/sqlite/sqlite.cpp                | 26 ++++----
 config.tests/unix/sqlite2/sqlite2.cpp              | 26 ++++----
 config.tests/unix/sse/sse.cpp                      | 26 ++++----
 config.tests/unix/sse2/sse2.cpp                    | 26 ++++----
 config.tests/unix/sse3/sse3.cpp                    | 26 ++++----
 config.tests/unix/sse4_1/sse4_1.cpp                | 26 ++++----
 config.tests/unix/sse4_2/sse4_2.cpp                | 26 ++++----
 config.tests/unix/ssse3/ssse3.cpp                  | 26 ++++----
 config.tests/unix/stdint/main.cpp                  | 26 ++++----
 config.tests/unix/stl/stltest.cpp                  | 26 ++++----
 config.tests/unix/tds/tds.cpp                      | 26 ++++----
 config.tests/unix/tslib/tslib.cpp                  | 26 ++++----
 config.tests/unix/zlib/zlib.cpp                    | 26 ++++----
 config.tests/x11/fontconfig/fontconfig.cpp         | 26 ++++----
 config.tests/x11/glxfbconfig/glxfbconfig.cpp       | 26 ++++----
 config.tests/x11/mitshm/mitshm.cpp                 | 26 ++++----
 config.tests/x11/notype/notypetest.cpp             | 26 ++++----
 config.tests/x11/opengl/opengl.cpp                 | 26 ++++----
 config.tests/x11/sm/sm.cpp                         | 26 ++++----
 config.tests/x11/xcursor/xcursor.cpp               | 26 ++++----
 config.tests/x11/xfixes/xfixes.cpp                 | 26 ++++----
 config.tests/x11/xinerama/xinerama.cpp             | 26 ++++----
 config.tests/x11/xinput/xinput.cpp                 | 26 ++++----
 config.tests/x11/xkb/xkb.cpp                       | 26 ++++----
 config.tests/x11/xlib/xlib.cpp                     | 26 ++++----
 config.tests/x11/xrandr/xrandr.cpp                 | 26 ++++----
 config.tests/x11/xrender/xrender.cpp               | 26 ++++----
 config.tests/x11/xshape/xshape.cpp                 | 26 ++++----
 config.tests/x11/xsync/xsync.cpp                   | 26 ++++----
 config.tests/x11/xvideo/xvideo.cpp                 | 26 ++++----
 configure                                          | 26 ++++----
 demos/affine/main.cpp                              | 26 ++++----
 demos/affine/xform.cpp                             | 26 ++++----
 demos/affine/xform.h                               | 26 ++++----
 demos/arthurplugin/plugin.cpp                      | 26 ++++----
 demos/books/bookdelegate.cpp                       | 26 ++++----
 demos/books/bookdelegate.h                         | 26 ++++----
 demos/books/bookwindow.cpp                         | 26 ++++----
 demos/books/bookwindow.h                           | 26 ++++----
 demos/books/initdb.h                               | 26 ++++----
 demos/books/main.cpp                               | 26 ++++----
 demos/boxes/basic.fsh                              | 26 ++++----
 demos/boxes/basic.vsh                              | 26 ++++----
 demos/boxes/dotted.fsh                             | 26 ++++----
 demos/boxes/fresnel.fsh                            | 26 ++++----
 demos/boxes/glass.fsh                              | 26 ++++----
 demos/boxes/glbuffers.cpp                          | 26 ++++----
 demos/boxes/glbuffers.h                            | 26 ++++----
 demos/boxes/glextensions.cpp                       | 26 ++++----
 demos/boxes/glextensions.h                         | 26 ++++----
 demos/boxes/gltrianglemesh.h                       | 26 ++++----
 demos/boxes/granite.fsh                            | 26 ++++----
 demos/boxes/main.cpp                               | 26 ++++----
 demos/boxes/marble.fsh                             | 26 ++++----
 demos/boxes/qtbox.cpp                              | 26 ++++----
 demos/boxes/qtbox.h                                | 26 ++++----
 demos/boxes/reflection.fsh                         | 26 ++++----
 demos/boxes/refraction.fsh                         | 26 ++++----
 demos/boxes/roundedbox.cpp                         | 26 ++++----
 demos/boxes/roundedbox.h                           | 26 ++++----
 demos/boxes/scene.cpp                              | 26 ++++----
 demos/boxes/scene.h                                | 26 ++++----
 demos/boxes/trackball.cpp                          | 26 ++++----
 demos/boxes/trackball.h                            | 26 ++++----
 demos/boxes/wood.fsh                               | 26 ++++----
 demos/browser/autosaver.cpp                        | 26 ++++----
 demos/browser/autosaver.h                          | 26 ++++----
 demos/browser/bookmarks.cpp                        | 26 ++++----
 demos/browser/bookmarks.h                          | 26 ++++----
 demos/browser/browserapplication.cpp               | 26 ++++----
 demos/browser/browserapplication.h                 | 26 ++++----
 demos/browser/browsermainwindow.cpp                | 26 ++++----
 demos/browser/browsermainwindow.h                  | 26 ++++----
 demos/browser/chasewidget.cpp                      | 26 ++++----
 demos/browser/chasewidget.h                        | 26 ++++----
 demos/browser/cookiejar.cpp                        | 26 ++++----
 demos/browser/cookiejar.h                          | 26 ++++----
 demos/browser/downloadmanager.cpp                  | 26 ++++----
 demos/browser/downloadmanager.h                    | 26 ++++----
 demos/browser/edittableview.cpp                    | 26 ++++----
 demos/browser/edittableview.h                      | 26 ++++----
 demos/browser/edittreeview.cpp                     | 26 ++++----
 demos/browser/edittreeview.h                       | 26 ++++----
 demos/browser/history.cpp                          | 26 ++++----
 demos/browser/history.h                            | 26 ++++----
 demos/browser/main.cpp                             | 26 ++++----
 demos/browser/modelmenu.cpp                        | 26 ++++----
 demos/browser/modelmenu.h                          | 26 ++++----
 demos/browser/networkaccessmanager.cpp             | 26 ++++----
 demos/browser/networkaccessmanager.h               | 26 ++++----
 demos/browser/searchlineedit.cpp                   | 26 ++++----
 demos/browser/searchlineedit.h                     | 26 ++++----
 demos/browser/settings.cpp                         | 26 ++++----
 demos/browser/settings.h                           | 26 ++++----
 demos/browser/squeezelabel.cpp                     | 26 ++++----
 demos/browser/squeezelabel.h                       | 26 ++++----
 demos/browser/tabwidget.cpp                        | 26 ++++----
 demos/browser/tabwidget.h                          | 26 ++++----
 demos/browser/toolbarsearch.cpp                    | 26 ++++----
 demos/browser/toolbarsearch.h                      | 26 ++++----
 demos/browser/urllineedit.cpp                      | 26 ++++----
 demos/browser/urllineedit.h                        | 26 ++++----
 demos/browser/webview.cpp                          | 26 ++++----
 demos/browser/webview.h                            | 26 ++++----
 demos/browser/xbel.cpp                             | 26 ++++----
 demos/browser/xbel.h                               | 26 ++++----
 demos/chip/chip.cpp                                | 26 ++++----
 demos/chip/chip.h                                  | 26 ++++----
 demos/chip/main.cpp                                | 26 ++++----
 demos/chip/mainwindow.cpp                          | 26 ++++----
 demos/chip/mainwindow.h                            | 26 ++++----
 demos/chip/view.cpp                                | 26 ++++----
 demos/chip/view.h                                  | 26 ++++----
 demos/composition/composition.cpp                  | 26 ++++----
 demos/composition/composition.h                    | 26 ++++----
 demos/composition/main.cpp                         | 26 ++++----
 demos/declarative/calculator/Core/Button.qml       | 26 ++++----
 demos/declarative/calculator/Core/Display.qml      | 26 ++++----
 demos/declarative/calculator/calculator.qml        | 26 ++++----
 demos/declarative/flickr/common/Progress.qml       | 26 ++++----
 demos/declarative/flickr/common/RssModel.qml       | 26 ++++----
 demos/declarative/flickr/common/ScrollBar.qml      | 26 ++++----
 demos/declarative/flickr/common/Slider.qml         | 26 ++++----
 demos/declarative/flickr/flickr-90.qml             | 26 ++++----
 demos/declarative/flickr/flickr.qml                | 26 ++++----
 demos/declarative/flickr/mobile/Button.qml         | 26 ++++----
 demos/declarative/flickr/mobile/GridDelegate.qml   | 26 ++++----
 demos/declarative/flickr/mobile/ImageDetails.qml   | 26 ++++----
 demos/declarative/flickr/mobile/ListDelegate.qml   | 26 ++++----
 demos/declarative/flickr/mobile/TitleBar.qml       | 26 ++++----
 demos/declarative/flickr/mobile/ToolBar.qml        | 26 ++++----
 .../minehunt/MinehuntCore/Explosion.qml            | 26 ++++----
 demos/declarative/minehunt/MinehuntCore/Tile.qml   | 26 ++++----
 demos/declarative/minehunt/main.cpp                | 26 ++++----
 demos/declarative/minehunt/minehunt.cpp            | 26 ++++----
 demos/declarative/minehunt/minehunt.h              | 26 ++++----
 demos/declarative/minehunt/minehunt.qml            | 26 ++++----
 .../photoviewer/PhotoViewerCore/AlbumDelegate.qml  | 26 ++++----
 .../photoviewer/PhotoViewerCore/BusyIndicator.qml  | 26 ++++----
 .../photoviewer/PhotoViewerCore/Button.qml         | 26 ++++----
 .../photoviewer/PhotoViewerCore/EditableButton.qml | 26 ++++----
 .../photoviewer/PhotoViewerCore/PhotoDelegate.qml  | 26 ++++----
 .../photoviewer/PhotoViewerCore/ProgressBar.qml    | 26 ++++----
 .../photoviewer/PhotoViewerCore/RssModel.qml       | 26 ++++----
 .../photoviewer/PhotoViewerCore/Tag.qml            | 26 ++++----
 demos/declarative/photoviewer/photoviewer.qml      | 26 ++++----
 .../declarative/rssnews/content/BusyIndicator.qml  | 26 ++++----
 .../rssnews/content/CategoryDelegate.qml           | 26 ++++----
 demos/declarative/rssnews/content/NewsDelegate.qml | 26 ++++----
 demos/declarative/rssnews/content/RssFeeds.qml     | 26 ++++----
 demos/declarative/rssnews/content/ScrollBar.qml    | 26 ++++----
 demos/declarative/rssnews/rssnews.qml              | 26 ++++----
 .../samegame/SamegameCore/BoomBlock.qml            | 26 ++++----
 demos/declarative/samegame/SamegameCore/Button.qml | 26 ++++----
 demos/declarative/samegame/SamegameCore/Dialog.qml | 26 ++++----
 demos/declarative/samegame/samegame.qml            | 26 ++++----
 demos/declarative/snake/content/Button.qml         | 26 ++++----
 demos/declarative/snake/content/Cookie.qml         | 26 ++++----
 demos/declarative/snake/content/HighScoreModel.qml | 26 ++++----
 demos/declarative/snake/content/Link.qml           | 26 ++++----
 demos/declarative/snake/content/Skull.qml          | 26 ++++----
 demos/declarative/snake/snake.qml                  | 26 ++++----
 demos/declarative/twitter/TwitterCore/Button.qml   | 26 ++++----
 .../twitter/TwitterCore/FatDelegate.qml            | 26 ++++----
 demos/declarative/twitter/TwitterCore/Input.qml    | 26 ++++----
 demos/declarative/twitter/TwitterCore/Loading.qml  | 26 ++++----
 .../twitter/TwitterCore/MultiTitleBar.qml          | 26 ++++----
 demos/declarative/twitter/TwitterCore/RssModel.qml | 26 ++++----
 .../declarative/twitter/TwitterCore/SearchView.qml | 26 ++++----
 demos/declarative/twitter/TwitterCore/TitleBar.qml | 26 ++++----
 demos/declarative/twitter/TwitterCore/ToolBar.qml  | 26 ++++----
 .../declarative/twitter/TwitterCore/UserModel.qml  | 26 ++++----
 demos/declarative/twitter/twitter.qml              | 26 ++++----
 demos/declarative/webbrowser/content/Button.qml    | 26 ++++----
 .../webbrowser/content/FlickableWebView.qml        | 26 ++++----
 demos/declarative/webbrowser/content/Header.qml    | 26 ++++----
 demos/declarative/webbrowser/content/ScrollBar.qml | 26 ++++----
 demos/declarative/webbrowser/content/UrlInput.qml  | 26 ++++----
 demos/declarative/webbrowser/webbrowser.qml        | 26 ++++----
 demos/deform/main.cpp                              | 26 ++++----
 demos/deform/pathdeform.cpp                        | 26 ++++----
 demos/deform/pathdeform.h                          | 26 ++++----
 demos/embedded/anomaly/src/AddressBar.cpp          | 26 ++++----
 demos/embedded/anomaly/src/AddressBar.h            | 26 ++++----
 demos/embedded/anomaly/src/BookmarksView.cpp       | 26 ++++----
 demos/embedded/anomaly/src/BookmarksView.h         | 26 ++++----
 demos/embedded/anomaly/src/BrowserView.cpp         | 26 ++++----
 demos/embedded/anomaly/src/BrowserView.h           | 26 ++++----
 demos/embedded/anomaly/src/BrowserWindow.cpp       | 26 ++++----
 demos/embedded/anomaly/src/BrowserWindow.h         | 26 ++++----
 demos/embedded/anomaly/src/ControlStrip.cpp        | 26 ++++----
 demos/embedded/anomaly/src/ControlStrip.h          | 26 ++++----
 demos/embedded/anomaly/src/HomeView.cpp            | 26 ++++----
 demos/embedded/anomaly/src/HomeView.h              | 26 ++++----
 demos/embedded/anomaly/src/Main.cpp                | 26 ++++----
 demos/embedded/anomaly/src/TitleBar.cpp            | 26 ++++----
 demos/embedded/anomaly/src/TitleBar.h              | 26 ++++----
 demos/embedded/anomaly/src/ZoomStrip.cpp           | 26 ++++----
 demos/embedded/anomaly/src/ZoomStrip.h             | 26 ++++----
 demos/embedded/anomaly/src/flickcharm.cpp          | 26 ++++----
 demos/embedded/anomaly/src/flickcharm.h            | 26 ++++----
 demos/embedded/anomaly/src/webview.cpp             | 26 ++++----
 demos/embedded/anomaly/src/webview.h               | 26 ++++----
 demos/embedded/desktopservices/contenttab.cpp      | 26 ++++----
 demos/embedded/desktopservices/contenttab.h        | 26 ++++----
 demos/embedded/desktopservices/desktopwidget.cpp   | 26 ++++----
 demos/embedded/desktopservices/desktopwidget.h     | 26 ++++----
 demos/embedded/desktopservices/linktab.cpp         | 26 ++++----
 demos/embedded/desktopservices/linktab.h           | 26 ++++----
 demos/embedded/desktopservices/main.cpp            | 26 ++++----
 demos/embedded/digiflip/digiflip.cpp               | 26 ++++----
 .../embeddedsvgviewer/embeddedsvgviewer.cpp        | 26 ++++----
 .../embedded/embeddedsvgviewer/embeddedsvgviewer.h | 26 ++++----
 demos/embedded/embeddedsvgviewer/main.cpp          | 26 ++++----
 demos/embedded/flickable/flickable.cpp             | 26 ++++----
 demos/embedded/flickable/flickable.h               | 26 ++++----
 demos/embedded/flickable/main.cpp                  | 26 ++++----
 demos/embedded/flightinfo/flightinfo.cpp           | 26 ++++----
 demos/embedded/fluidlauncher/demoapplication.cpp   | 26 ++++----
 demos/embedded/fluidlauncher/demoapplication.h     | 26 ++++----
 demos/embedded/fluidlauncher/fluidlauncher.cpp     | 26 ++++----
 demos/embedded/fluidlauncher/fluidlauncher.h       | 26 ++++----
 demos/embedded/fluidlauncher/main.cpp              | 26 ++++----
 demos/embedded/fluidlauncher/slideshow.cpp         | 26 ++++----
 demos/embedded/fluidlauncher/slideshow.h           | 26 ++++----
 demos/embedded/lightmaps/lightmaps.cpp             | 26 ++++----
 demos/embedded/qmlcalculator/qmlcalculator.cpp     | 26 ++++----
 demos/embedded/qmlclocks/qmlclocks.cpp             | 26 ++++----
 demos/embedded/qmldialcontrol/qmldialcontrol.cpp   | 26 ++++----
 demos/embedded/qmleasing/qmleasing.cpp             | 26 ++++----
 demos/embedded/qmlflickr/qmlflickr.cpp             | 26 ++++----
 demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp   | 26 ++++----
 demos/embedded/qmltwitter/qmltwitter.cpp           | 26 ++++----
 demos/embedded/raycasting/raycasting.cpp           | 26 ++++----
 demos/embedded/styledemo/main.cpp                  | 26 ++++----
 demos/embedded/styledemo/stylewidget.cpp           | 26 ++++----
 demos/embedded/styledemo/stylewidget.h             | 26 ++++----
 demos/embedded/weatherinfo/weatherinfo.cpp         | 26 ++++----
 demos/embeddeddialogs/customproxy.cpp              | 26 ++++----
 demos/embeddeddialogs/customproxy.h                | 26 ++++----
 demos/embeddeddialogs/embeddeddialog.cpp           | 26 ++++----
 demos/embeddeddialogs/embeddeddialog.h             | 26 ++++----
 demos/embeddeddialogs/main.cpp                     | 26 ++++----
 demos/gradients/gradients.cpp                      | 26 ++++----
 demos/gradients/gradients.h                        | 26 ++++----
 demos/gradients/main.cpp                           | 26 ++++----
 demos/interview/main.cpp                           | 26 ++++----
 demos/interview/model.cpp                          | 26 ++++----
 demos/interview/model.h                            | 26 ++++----
 demos/macmainwindow/macmainwindow.h                | 26 ++++----
 demos/macmainwindow/macmainwindow.mm               | 26 ++++----
 demos/macmainwindow/main.cpp                       | 26 ++++----
 demos/mainwindow/colorswatch.cpp                   | 26 ++++----
 demos/mainwindow/colorswatch.h                     | 26 ++++----
 demos/mainwindow/main.cpp                          | 26 ++++----
 demos/mainwindow/mainwindow.cpp                    | 26 ++++----
 demos/mainwindow/mainwindow.h                      | 26 ++++----
 demos/mainwindow/toolbar.cpp                       | 26 ++++----
 demos/mainwindow/toolbar.h                         | 26 ++++----
 demos/pathstroke/main.cpp                          | 26 ++++----
 demos/pathstroke/pathstroke.cpp                    | 26 ++++----
 demos/pathstroke/pathstroke.h                      | 26 ++++----
 demos/qmediaplayer/main.cpp                        | 26 ++++----
 demos/qmediaplayer/mediaplayer.cpp                 | 26 ++++----
 demos/qmediaplayer/mediaplayer.h                   | 26 ++++----
 demos/qtdemo/colors.cpp                            | 26 ++++----
 demos/qtdemo/colors.h                              | 26 ++++----
 demos/qtdemo/demoitem.cpp                          | 26 ++++----
 demos/qtdemo/demoitem.h                            | 26 ++++----
 demos/qtdemo/demoitemanimation.cpp                 | 26 ++++----
 demos/qtdemo/demoitemanimation.h                   | 26 ++++----
 demos/qtdemo/demoscene.cpp                         | 26 ++++----
 demos/qtdemo/demoscene.h                           | 26 ++++----
 demos/qtdemo/demotextitem.cpp                      | 26 ++++----
 demos/qtdemo/demotextitem.h                        | 26 ++++----
 demos/qtdemo/dockitem.cpp                          | 26 ++++----
 demos/qtdemo/dockitem.h                            | 26 ++++----
 demos/qtdemo/examplecontent.cpp                    | 26 ++++----
 demos/qtdemo/examplecontent.h                      | 26 ++++----
 demos/qtdemo/guide.cpp                             | 26 ++++----
 demos/qtdemo/guide.h                               | 26 ++++----
 demos/qtdemo/guidecircle.cpp                       | 26 ++++----
 demos/qtdemo/guidecircle.h                         | 26 ++++----
 demos/qtdemo/guideline.cpp                         | 26 ++++----
 demos/qtdemo/guideline.h                           | 26 ++++----
 demos/qtdemo/headingitem.cpp                       | 26 ++++----
 demos/qtdemo/headingitem.h                         | 26 ++++----
 demos/qtdemo/imageitem.cpp                         | 26 ++++----
 demos/qtdemo/imageitem.h                           | 26 ++++----
 demos/qtdemo/itemcircleanimation.cpp               | 26 ++++----
 demos/qtdemo/itemcircleanimation.h                 | 26 ++++----
 demos/qtdemo/letteritem.cpp                        | 26 ++++----
 demos/qtdemo/letteritem.h                          | 26 ++++----
 demos/qtdemo/main.cpp                              | 26 ++++----
 demos/qtdemo/mainwindow.cpp                        | 26 ++++----
 demos/qtdemo/mainwindow.h                          | 26 ++++----
 demos/qtdemo/menucontent.cpp                       | 26 ++++----
 demos/qtdemo/menucontent.h                         | 26 ++++----
 demos/qtdemo/menumanager.cpp                       | 26 ++++----
 demos/qtdemo/menumanager.h                         | 26 ++++----
 demos/qtdemo/qmlShell.qml                          | 26 ++++----
 demos/qtdemo/scanitem.cpp                          | 26 ++++----
 demos/qtdemo/scanitem.h                            | 26 ++++----
 demos/qtdemo/score.cpp                             | 26 ++++----
 demos/qtdemo/score.h                               | 26 ++++----
 demos/qtdemo/textbutton.cpp                        | 26 ++++----
 demos/qtdemo/textbutton.h                          | 26 ++++----
 demos/shared/arthurstyle.cpp                       | 26 ++++----
 demos/shared/arthurstyle.h                         | 26 ++++----
 demos/shared/arthurwidgets.cpp                     | 26 ++++----
 demos/shared/arthurwidgets.h                       | 26 ++++----
 demos/shared/hoverpoints.cpp                       | 26 ++++----
 demos/shared/hoverpoints.h                         | 26 ++++----
 demos/spreadsheet/main.cpp                         | 26 ++++----
 demos/spreadsheet/printview.cpp                    | 26 ++++----
 demos/spreadsheet/printview.h                      | 26 ++++----
 demos/spreadsheet/spreadsheet.cpp                  | 26 ++++----
 demos/spreadsheet/spreadsheet.h                    | 26 ++++----
 demos/spreadsheet/spreadsheetdelegate.cpp          | 26 ++++----
 demos/spreadsheet/spreadsheetdelegate.h            | 26 ++++----
 demos/spreadsheet/spreadsheetitem.cpp              | 26 ++++----
 demos/spreadsheet/spreadsheetitem.h                | 26 ++++----
 demos/sqlbrowser/browser.cpp                       | 26 ++++----
 demos/sqlbrowser/browser.h                         | 26 ++++----
 demos/sqlbrowser/connectionwidget.cpp              | 26 ++++----
 demos/sqlbrowser/connectionwidget.h                | 26 ++++----
 demos/sqlbrowser/main.cpp                          | 26 ++++----
 demos/sqlbrowser/qsqlconnectiondialog.cpp          | 26 ++++----
 demos/sqlbrowser/qsqlconnectiondialog.h            | 26 ++++----
 demos/sub-attaq/animationmanager.cpp               | 26 ++++----
 demos/sub-attaq/animationmanager.h                 | 26 ++++----
 demos/sub-attaq/boat.cpp                           | 26 ++++----
 demos/sub-attaq/boat.h                             | 26 ++++----
 demos/sub-attaq/boat_p.h                           | 26 ++++----
 demos/sub-attaq/bomb.cpp                           | 26 ++++----
 demos/sub-attaq/bomb.h                             | 26 ++++----
 demos/sub-attaq/graphicsscene.cpp                  | 26 ++++----
 demos/sub-attaq/graphicsscene.h                    | 26 ++++----
 demos/sub-attaq/main.cpp                           | 26 ++++----
 demos/sub-attaq/mainwindow.cpp                     | 26 ++++----
 demos/sub-attaq/mainwindow.h                       | 26 ++++----
 demos/sub-attaq/pixmapitem.cpp                     | 26 ++++----
 demos/sub-attaq/pixmapitem.h                       | 26 ++++----
 demos/sub-attaq/progressitem.cpp                   | 26 ++++----
 demos/sub-attaq/progressitem.h                     | 26 ++++----
 demos/sub-attaq/qanimationstate.cpp                | 26 ++++----
 demos/sub-attaq/qanimationstate.h                  | 26 ++++----
 demos/sub-attaq/states.cpp                         | 26 ++++----
 demos/sub-attaq/states.h                           | 26 ++++----
 demos/sub-attaq/submarine.cpp                      | 26 ++++----
 demos/sub-attaq/submarine.h                        | 26 ++++----
 demos/sub-attaq/submarine_p.h                      | 26 ++++----
 demos/sub-attaq/textinformationitem.cpp            | 26 ++++----
 demos/sub-attaq/textinformationitem.h              | 26 ++++----
 demos/sub-attaq/torpedo.cpp                        | 26 ++++----
 demos/sub-attaq/torpedo.h                          | 26 ++++----
 demos/textedit/main.cpp                            | 26 ++++----
 demos/textedit/textedit.cpp                        | 26 ++++----
 demos/textedit/textedit.h                          | 26 ++++----
 demos/undo/commands.cpp                            | 26 ++++----
 demos/undo/commands.h                              | 26 ++++----
 demos/undo/document.cpp                            | 26 ++++----
 demos/undo/document.h                              | 26 ++++----
 demos/undo/main.cpp                                | 26 ++++----
 demos/undo/mainwindow.cpp                          | 26 ++++----
 demos/undo/mainwindow.h                            | 26 ++++----
 doc/src/classes/qpatternistdummy.cpp               | 26 ++++----
 .../diagrams/contentspropagation/customwidget.py   | 26 ++++----
 .../contentspropagation/standardwidgets.py         | 26 ++++----
 doc/src/diagrams/programs/easingcurve/main.cpp     | 26 ++++----
 doc/src/diagrams/programs/mdiarea.py               | 26 ++++----
 doc/src/diagrams/programs/qpen-dashpattern.py      | 26 ++++----
 doc/src/diagrams/programs/standard_views.py        | 26 ++++----
 .../snippets/code/doc_src_examples_hellotr.qdoc    | 26 ++++----
 doc/src/snippets/declarative/loader/KeyReader.qml  | 26 ++++----
 doc/src/snippets/declarative/loader/MyItem.qml     | 26 ++++----
 .../snippets/declarative/loader/connections.qml    | 26 ++++----
 doc/src/snippets/declarative/loader/focus.qml      | 26 ++++----
 doc/src/snippets/declarative/loader/simple.qml     | 26 ++++----
 .../cppextensions/qwidgets/qwidgets.cpp            | 26 ++++----
 .../declarative/screenorientation/Core/Bubble.qml  | 26 ++++----
 .../declarative/screenorientation/Core/Button.qml  | 26 ++++----
 .../screenorientation/Core/screenorientation.js    | 26 ++++----
 .../screenorientation/screenorientation.qml        | 26 ++++----
 .../text/textselection/textselection.qml           | 26 ++++----
 examples/ja_JP/linguist/hellotr/main.cpp           | 26 ++++----
 header.LGPL                                        | 26 ++++----
 mkspecs/aix-g++-64/qplatformdefs.h                 | 26 ++++----
 mkspecs/aix-g++/qplatformdefs.h                    | 26 ++++----
 mkspecs/aix-xlc-64/qplatformdefs.h                 | 26 ++++----
 mkspecs/aix-xlc/qplatformdefs.h                    | 26 ++++----
 mkspecs/common/aix/qplatformdefs.h                 | 26 ++++----
 mkspecs/common/c89/qplatformdefs.h                 | 26 ++++----
 mkspecs/common/posix/qplatformdefs.h               | 26 ++++----
 mkspecs/common/symbian/qplatformdefs.h             | 26 ++++----
 mkspecs/common/wince/qplatformdefs.h               | 26 ++++----
 mkspecs/cygwin-g++/qplatformdefs.h                 | 26 ++++----
 mkspecs/darwin-g++/qplatformdefs.h                 | 26 ++++----
 mkspecs/freebsd-g++/qplatformdefs.h                | 26 ++++----
 mkspecs/freebsd-g++34/qplatformdefs.h              | 26 ++++----
 mkspecs/freebsd-g++40/qplatformdefs.h              | 26 ++++----
 mkspecs/freebsd-icc/qplatformdefs.h                | 26 ++++----
 mkspecs/hpux-acc-64/qplatformdefs.h                | 26 ++++----
 mkspecs/hpux-acc-o64/qplatformdefs.h               | 26 ++++----
 mkspecs/hpux-acc/qplatformdefs.h                   | 26 ++++----
 mkspecs/hpux-g++-64/qplatformdefs.h                | 26 ++++----
 mkspecs/hpux-g++/qplatformdefs.h                   | 26 ++++----
 mkspecs/hpuxi-acc-32/qplatformdefs.h               | 26 ++++----
 mkspecs/hpuxi-acc-64/qplatformdefs.h               | 26 ++++----
 mkspecs/hpuxi-g++-64/qplatformdefs.h               | 26 ++++----
 mkspecs/hurd-g++/qplatformdefs.h                   | 26 ++++----
 mkspecs/irix-cc-64/qplatformdefs.h                 | 26 ++++----
 mkspecs/irix-cc/qplatformdefs.h                    | 26 ++++----
 mkspecs/irix-g++-64/qplatformdefs.h                | 26 ++++----
 mkspecs/irix-g++/qplatformdefs.h                   | 26 ++++----
 mkspecs/linux-cxx/qplatformdefs.h                  | 26 ++++----
 mkspecs/linux-ecc-64/qplatformdefs.h               | 26 ++++----
 mkspecs/linux-g++-32/qplatformdefs.h               | 26 ++++----
 mkspecs/linux-g++-64/qplatformdefs.h               | 26 ++++----
 mkspecs/linux-g++-maemo/qplatformdefs.h            | 26 ++++----
 mkspecs/linux-g++/qplatformdefs.h                  | 26 ++++----
 mkspecs/linux-icc-32/qplatformdefs.h               | 26 ++++----
 mkspecs/linux-icc-64/qplatformdefs.h               | 26 ++++----
 mkspecs/linux-icc/qplatformdefs.h                  | 26 ++++----
 mkspecs/linux-kcc/qplatformdefs.h                  | 26 ++++----
 mkspecs/linux-llvm/qplatformdefs.h                 | 26 ++++----
 mkspecs/linux-lsb-g++/qplatformdefs.h              | 26 ++++----
 mkspecs/linux-pgcc/qplatformdefs.h                 | 26 ++++----
 mkspecs/lynxos-g++/qplatformdefs.h                 | 26 ++++----
 mkspecs/macx-g++/qplatformdefs.h                   | 26 ++++----
 mkspecs/macx-g++40/qplatformdefs.h                 | 26 ++++----
 mkspecs/macx-g++42/qplatformdefs.h                 | 26 ++++----
 mkspecs/macx-icc/qplatformdefs.h                   | 26 ++++----
 mkspecs/macx-llvm/qplatformdefs.h                  | 26 ++++----
 mkspecs/macx-pbuilder/qplatformdefs.h              | 26 ++++----
 mkspecs/macx-xcode/qplatformdefs.h                 | 26 ++++----
 mkspecs/macx-xlc/qplatformdefs.h                   | 26 ++++----
 mkspecs/netbsd-g++/qplatformdefs.h                 | 26 ++++----
 mkspecs/openbsd-g++/qplatformdefs.h                | 26 ++++----
 mkspecs/qws/freebsd-generic-g++/qplatformdefs.h    | 26 ++++----
 mkspecs/qws/linux-arm-g++/qplatformdefs.h          | 26 ++++----
 mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h  | 26 ++++----
 mkspecs/qws/linux-armv6-g++/qplatformdefs.h        | 26 ++++----
 mkspecs/qws/linux-avr32-g++/qplatformdefs.h        | 26 ++++----
 mkspecs/qws/linux-cellon-g++/qplatformdefs.h       | 26 ++++----
 mkspecs/qws/linux-dm7000-g++/qplatformdefs.h       | 26 ++++----
 mkspecs/qws/linux-dm800-g++/qplatformdefs.h        | 26 ++++----
 mkspecs/qws/linux-generic-g++-32/qplatformdefs.h   | 26 ++++----
 mkspecs/qws/linux-generic-g++/qplatformdefs.h      | 26 ++++----
 mkspecs/qws/linux-ipaq-g++/qplatformdefs.h         | 26 ++++----
 mkspecs/qws/linux-lsb-g++/qplatformdefs.h          | 26 ++++----
 mkspecs/qws/linux-mips-g++/qplatformdefs.h         | 26 ++++----
 mkspecs/qws/linux-powerpc-g++/qplatformdefs.h      | 26 ++++----
 mkspecs/qws/linux-sh-g++/qplatformdefs.h           | 26 ++++----
 mkspecs/qws/linux-sh4al-g++/qplatformdefs.h        | 26 ++++----
 mkspecs/qws/linux-sharp-g++/qplatformdefs.h        | 26 ++++----
 mkspecs/qws/linux-x86-g++/qplatformdefs.h          | 26 ++++----
 mkspecs/qws/linux-x86_64-g++/qplatformdefs.h       | 26 ++++----
 mkspecs/qws/linux-zylonite-g++/qplatformdefs.h     | 26 ++++----
 mkspecs/qws/macx-generic-g++/qplatformdefs.h       | 26 ++++----
 mkspecs/qws/solaris-generic-g++/qplatformdefs.h    | 26 ++++----
 mkspecs/sco-cc/qplatformdefs.h                     | 26 ++++----
 mkspecs/sco-g++/qplatformdefs.h                    | 26 ++++----
 mkspecs/solaris-cc-64-stlport/qplatformdefs.h      | 26 ++++----
 mkspecs/solaris-cc-64/qplatformdefs.h              | 26 ++++----
 mkspecs/solaris-cc-stlport/qplatformdefs.h         | 26 ++++----
 mkspecs/solaris-cc/qplatformdefs.h                 | 26 ++++----
 mkspecs/solaris-g++-64/qplatformdefs.h             | 26 ++++----
 mkspecs/solaris-g++/qplatformdefs.h                | 26 ++++----
 mkspecs/symbian-abld/qplatformdefs.h               | 26 ++++----
 mkspecs/symbian-sbsv2/qplatformdefs.h              | 26 ++++----
 mkspecs/symbian/linux-armcc/qplatformdefs.h        | 26 ++++----
 mkspecs/symbian/linux-gcce/qplatformdefs.h         | 26 ++++----
 mkspecs/tru64-cxx/qplatformdefs.h                  | 26 ++++----
 mkspecs/tru64-g++/qplatformdefs.h                  | 26 ++++----
 mkspecs/unixware-cc/qplatformdefs.h                | 26 ++++----
 mkspecs/unixware-g++/qplatformdefs.h               | 26 ++++----
 mkspecs/unsupported/linux-host-g++/qplatformdefs.h | 26 ++++----
 .../linux-scratchbox2-g++/qplatformdefs.h          | 26 ++++----
 mkspecs/unsupported/qnx-g++/qplatformdefs.h        | 26 ++++----
 mkspecs/unsupported/qws/qnx-641/qplatformdefs.h    | 26 ++++----
 .../qws/qnx-generic-g++/qplatformdefs.h            | 26 ++++----
 .../unsupported/qws/qnx-i386-g++/qplatformdefs.h   | 26 ++++----
 .../unsupported/qws/qnx-ppc-g++/qplatformdefs.h    | 26 ++++----
 .../unsupported/vxworks-ppc-dcc/qplatformdefs.h    | 26 ++++----
 .../unsupported/vxworks-ppc-g++/qplatformdefs.h    | 26 ++++----
 .../vxworks-simpentium-dcc/qplatformdefs.h         | 26 ++++----
 .../vxworks-simpentium-g++/qplatformdefs.h         | 26 ++++----
 .../unsupported/win32-g++-cross/qplatformdefs.h    | 26 ++++----
 mkspecs/win32-borland/qplatformdefs.h              | 26 ++++----
 mkspecs/win32-g++/qplatformdefs.h                  | 26 ++++----
 mkspecs/win32-icc/qplatformdefs.h                  | 26 ++++----
 mkspecs/win32-msvc2003/qplatformdefs.h             | 26 ++++----
 mkspecs/win32-msvc2005/qplatformdefs.h             | 26 ++++----
 mkspecs/win32-msvc2008/qplatformdefs.h             | 26 ++++----
 mkspecs/win32-msvc2010/qplatformdefs.h             | 26 ++++----
 .../qplatformdefs.h                                | 26 ++++----
 .../qplatformdefs.h                                | 26 ++++----
 .../qplatformdefs.h                                | 26 ++++----
 .../qplatformdefs.h                                | 26 ++++----
 .../qplatformdefs.h                                | 26 ++++----
 .../qplatformdefs.h                                | 26 ++++----
 .../wince50standard-sh4-msvc2005/qplatformdefs.h   | 26 ++++----
 .../wince50standard-sh4-msvc2008/qplatformdefs.h   | 26 ++++----
 .../wince50standard-x86-msvc2005/qplatformdefs.h   | 26 ++++----
 .../wince50standard-x86-msvc2008/qplatformdefs.h   | 26 ++++----
 .../qplatformdefs.h                                | 26 ++++----
 .../wince60standard-x86-msvc2005/qplatformdefs.h   | 26 ++++----
 mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h   | 26 ++++----
 mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h   | 26 ++++----
 mkspecs/wincewm50smart-msvc2005/qplatformdefs.h    | 26 ++++----
 mkspecs/wincewm50smart-msvc2008/qplatformdefs.h    | 26 ++++----
 .../wincewm60professional-msvc2005/qplatformdefs.h | 26 ++++----
 .../wincewm60professional-msvc2008/qplatformdefs.h | 26 ++++----
 mkspecs/wincewm60standard-msvc2005/qplatformdefs.h | 26 ++++----
 mkspecs/wincewm60standard-msvc2008/qplatformdefs.h | 26 ++++----
 .../wincewm65professional-msvc2005/qplatformdefs.h | 26 ++++----
 .../wincewm65professional-msvc2008/qplatformdefs.h | 26 ++++----
 qmake/cachekeys.h                                  | 26 ++++----
 qmake/generators/mac/pbuilder_pbx.cpp              | 26 ++++----
 qmake/generators/mac/pbuilder_pbx.h                | 26 ++++----
 qmake/generators/makefile.cpp                      | 26 ++++----
 qmake/generators/makefile.h                        | 26 ++++----
 qmake/generators/makefiledeps.cpp                  | 26 ++++----
 qmake/generators/makefiledeps.h                    | 26 ++++----
 qmake/generators/metamakefile.cpp                  | 26 ++++----
 qmake/generators/metamakefile.h                    | 26 ++++----
 qmake/generators/projectgenerator.cpp              | 26 ++++----
 qmake/generators/projectgenerator.h                | 26 ++++----
 .../symbian/initprojectdeploy_symbian.cpp          | 26 ++++----
 .../generators/symbian/initprojectdeploy_symbian.h | 26 ++++----
 qmake/generators/symbian/symbian_makefile.h        | 26 ++++----
 qmake/generators/symbian/symbiancommon.cpp         | 26 ++++----
 qmake/generators/symbian/symbiancommon.h           | 26 ++++----
 qmake/generators/symbian/symmake.cpp               | 26 ++++----
 qmake/generators/symbian/symmake.h                 | 26 ++++----
 qmake/generators/symbian/symmake_abld.cpp          | 26 ++++----
 qmake/generators/symbian/symmake_abld.h            | 26 ++++----
 qmake/generators/symbian/symmake_sbsv2.cpp         | 26 ++++----
 qmake/generators/symbian/symmake_sbsv2.h           | 26 ++++----
 qmake/generators/unix/unixmake.cpp                 | 26 ++++----
 qmake/generators/unix/unixmake.h                   | 26 ++++----
 qmake/generators/unix/unixmake2.cpp                | 26 ++++----
 qmake/generators/win32/borland_bmake.cpp           | 26 ++++----
 qmake/generators/win32/borland_bmake.h             | 26 ++++----
 qmake/generators/win32/mingw_make.cpp              | 26 ++++----
 qmake/generators/win32/mingw_make.h                | 26 ++++----
 qmake/generators/win32/msbuild_objectmodel.cpp     | 26 ++++----
 qmake/generators/win32/msbuild_objectmodel.h       | 26 ++++----
 qmake/generators/win32/msvc_nmake.cpp              | 26 ++++----
 qmake/generators/win32/msvc_nmake.h                | 26 ++++----
 qmake/generators/win32/msvc_objectmodel.cpp        | 26 ++++----
 qmake/generators/win32/msvc_objectmodel.h          | 26 ++++----
 qmake/generators/win32/msvc_vcproj.cpp             | 26 ++++----
 qmake/generators/win32/msvc_vcproj.h               | 26 ++++----
 qmake/generators/win32/msvc_vcxproj.cpp            | 26 ++++----
 qmake/generators/win32/msvc_vcxproj.h              | 26 ++++----
 qmake/generators/win32/winmakefile.cpp             | 26 ++++----
 qmake/generators/win32/winmakefile.h               | 26 ++++----
 qmake/generators/xmloutput.cpp                     | 26 ++++----
 qmake/generators/xmloutput.h                       | 26 ++++----
 qmake/main.cpp                                     | 26 ++++----
 qmake/meta.cpp                                     | 26 ++++----
 qmake/meta.h                                       | 26 ++++----
 qmake/option.cpp                                   | 26 ++++----
 qmake/option.h                                     | 26 ++++----
 qmake/project.cpp                                  | 26 ++++----
 qmake/project.h                                    | 26 ++++----
 qmake/property.cpp                                 | 26 ++++----
 qmake/property.h                                   | 26 ++++----
 qmake/qmake_pch.h                                  | 26 ++++----
 src/3rdparty/s60/eiksoftkeyimage.h                 | 26 ++++----
 src/3rdparty/sha1/sha1.cpp                         | 26 ++++----
 src/corelib/animation/qabstractanimation.cpp       | 26 ++++----
 src/corelib/animation/qabstractanimation.h         | 26 ++++----
 src/corelib/animation/qabstractanimation_p.h       | 26 ++++----
 src/corelib/animation/qanimationgroup.cpp          | 26 ++++----
 src/corelib/animation/qanimationgroup.h            | 26 ++++----
 src/corelib/animation/qanimationgroup_p.h          | 26 ++++----
 src/corelib/animation/qparallelanimationgroup.cpp  | 26 ++++----
 src/corelib/animation/qparallelanimationgroup.h    | 26 ++++----
 src/corelib/animation/qparallelanimationgroup_p.h  | 26 ++++----
 src/corelib/animation/qpauseanimation.cpp          | 26 ++++----
 src/corelib/animation/qpauseanimation.h            | 26 ++++----
 src/corelib/animation/qpropertyanimation.cpp       | 26 ++++----
 src/corelib/animation/qpropertyanimation.h         | 26 ++++----
 src/corelib/animation/qpropertyanimation_p.h       | 26 ++++----
 .../animation/qsequentialanimationgroup.cpp        | 26 ++++----
 src/corelib/animation/qsequentialanimationgroup.h  | 26 ++++----
 .../animation/qsequentialanimationgroup_p.h        | 26 ++++----
 src/corelib/animation/qvariantanimation.cpp        | 26 ++++----
 src/corelib/animation/qvariantanimation.h          | 26 ++++----
 src/corelib/animation/qvariantanimation_p.h        | 26 ++++----
 src/corelib/arch/alpha/qatomic_alpha.s             | 26 ++++----
 src/corelib/arch/arm/qatomic_arm.cpp               | 26 ++++----
 src/corelib/arch/armv6/qatomic_generic_armv6.cpp   | 26 ++++----
 src/corelib/arch/generic/qatomic_generic_unix.cpp  | 26 ++++----
 .../arch/generic/qatomic_generic_windows.cpp       | 26 ++++----
 src/corelib/arch/ia64/qatomic_ia64.s               | 26 ++++----
 src/corelib/arch/macosx/qatomic32_ppc.s            | 26 ++++----
 src/corelib/arch/mips/qatomic_mips32.s             | 26 ++++----
 src/corelib/arch/mips/qatomic_mips64.s             | 26 ++++----
 src/corelib/arch/parisc/q_ldcw.s                   | 26 ++++----
 src/corelib/arch/parisc/qatomic_parisc.cpp         | 26 ++++----
 src/corelib/arch/powerpc/qatomic32.s               | 26 ++++----
 src/corelib/arch/powerpc/qatomic64.s               | 26 ++++----
 src/corelib/arch/qatomic_alpha.h                   | 26 ++++----
 src/corelib/arch/qatomic_arch.h                    | 26 ++++----
 src/corelib/arch/qatomic_arm.h                     | 26 ++++----
 src/corelib/arch/qatomic_armv6.h                   | 26 ++++----
 src/corelib/arch/qatomic_avr32.h                   | 26 ++++----
 src/corelib/arch/qatomic_bfin.h                    | 26 ++++----
 src/corelib/arch/qatomic_bootstrap.h               | 26 ++++----
 src/corelib/arch/qatomic_generic.h                 | 26 ++++----
 src/corelib/arch/qatomic_i386.h                    | 26 ++++----
 src/corelib/arch/qatomic_ia64.h                    | 26 ++++----
 src/corelib/arch/qatomic_macosx.h                  | 26 ++++----
 src/corelib/arch/qatomic_mips.h                    | 26 ++++----
 src/corelib/arch/qatomic_parisc.h                  | 26 ++++----
 src/corelib/arch/qatomic_powerpc.h                 | 26 ++++----
 src/corelib/arch/qatomic_s390.h                    | 26 ++++----
 src/corelib/arch/qatomic_sh.h                      | 26 ++++----
 src/corelib/arch/qatomic_sh4a.h                    | 26 ++++----
 src/corelib/arch/qatomic_sparc.h                   | 26 ++++----
 src/corelib/arch/qatomic_symbian.h                 | 26 ++++----
 src/corelib/arch/qatomic_vxworks.h                 | 26 ++++----
 src/corelib/arch/qatomic_windows.h                 | 26 ++++----
 src/corelib/arch/qatomic_windowsce.h               | 26 ++++----
 src/corelib/arch/qatomic_x86_64.h                  | 26 ++++----
 src/corelib/arch/sh/qatomic_sh.cpp                 | 26 ++++----
 src/corelib/arch/sparc/qatomic32.s                 | 26 ++++----
 src/corelib/arch/sparc/qatomic64.s                 | 26 ++++----
 src/corelib/arch/sparc/qatomic_sparc.cpp           | 26 ++++----
 src/corelib/arch/symbian/qatomic_symbian.cpp       | 26 ++++----
 src/corelib/codecs/qfontlaocodec.cpp               | 26 ++++----
 src/corelib/codecs/qfontlaocodec_p.h               | 26 ++++----
 src/corelib/codecs/qiconvcodec.cpp                 | 26 ++++----
 src/corelib/codecs/qiconvcodec_p.h                 | 26 ++++----
 src/corelib/codecs/qisciicodec.cpp                 | 26 ++++----
 src/corelib/codecs/qisciicodec_p.h                 | 26 ++++----
 src/corelib/codecs/qlatincodec.cpp                 | 26 ++++----
 src/corelib/codecs/qlatincodec_p.h                 | 26 ++++----
 src/corelib/codecs/qsimplecodec.cpp                | 26 ++++----
 src/corelib/codecs/qsimplecodec_p.h                | 26 ++++----
 src/corelib/codecs/qtextcodec.cpp                  | 26 ++++----
 src/corelib/codecs/qtextcodec.h                    | 26 ++++----
 src/corelib/codecs/qtextcodec_p.h                  | 26 ++++----
 src/corelib/codecs/qtextcodec_symbian.cpp          | 26 ++++----
 src/corelib/codecs/qtextcodecplugin.cpp            | 26 ++++----
 src/corelib/codecs/qtextcodecplugin.h              | 26 ++++----
 src/corelib/codecs/qtsciicodec.cpp                 | 26 ++++----
 src/corelib/codecs/qtsciicodec_p.h                 | 26 ++++----
 src/corelib/codecs/qutfcodec.cpp                   | 26 ++++----
 src/corelib/codecs/qutfcodec_p.h                   | 26 ++++----
 src/corelib/concurrent/qfuture.cpp                 | 26 ++++----
 src/corelib/concurrent/qfuture.h                   | 26 ++++----
 src/corelib/concurrent/qfutureinterface.cpp        | 26 ++++----
 src/corelib/concurrent/qfutureinterface.h          | 26 ++++----
 src/corelib/concurrent/qfutureinterface_p.h        | 26 ++++----
 src/corelib/concurrent/qfuturesynchronizer.cpp     | 26 ++++----
 src/corelib/concurrent/qfuturesynchronizer.h       | 26 ++++----
 src/corelib/concurrent/qfuturewatcher.cpp          | 26 ++++----
 src/corelib/concurrent/qfuturewatcher.h            | 26 ++++----
 src/corelib/concurrent/qfuturewatcher_p.h          | 26 ++++----
 src/corelib/concurrent/qrunnable.cpp               | 26 ++++----
 src/corelib/concurrent/qrunnable.h                 | 26 ++++----
 src/corelib/concurrent/qtconcurrentcompilertest.h  | 26 ++++----
 src/corelib/concurrent/qtconcurrentexception.cpp   | 26 ++++----
 src/corelib/concurrent/qtconcurrentexception.h     | 26 ++++----
 src/corelib/concurrent/qtconcurrentfilter.cpp      | 26 ++++----
 src/corelib/concurrent/qtconcurrentfilter.h        | 26 ++++----
 src/corelib/concurrent/qtconcurrentfilterkernel.h  | 26 ++++----
 .../concurrent/qtconcurrentfunctionwrappers.h      | 26 ++++----
 .../concurrent/qtconcurrentiteratekernel.cpp       | 26 ++++----
 src/corelib/concurrent/qtconcurrentiteratekernel.h | 26 ++++----
 src/corelib/concurrent/qtconcurrentmap.cpp         | 26 ++++----
 src/corelib/concurrent/qtconcurrentmap.h           | 26 ++++----
 src/corelib/concurrent/qtconcurrentmapkernel.h     | 26 ++++----
 src/corelib/concurrent/qtconcurrentmedian.h        | 26 ++++----
 src/corelib/concurrent/qtconcurrentreducekernel.h  | 26 ++++----
 src/corelib/concurrent/qtconcurrentresultstore.cpp | 26 ++++----
 src/corelib/concurrent/qtconcurrentresultstore.h   | 26 ++++----
 src/corelib/concurrent/qtconcurrentrun.cpp         | 26 ++++----
 src/corelib/concurrent/qtconcurrentrun.h           | 26 ++++----
 src/corelib/concurrent/qtconcurrentrunbase.h       | 26 ++++----
 .../concurrent/qtconcurrentstoredfunctioncall.h    | 26 ++++----
 .../concurrent/qtconcurrentthreadengine.cpp        | 26 ++++----
 src/corelib/concurrent/qtconcurrentthreadengine.h  | 26 ++++----
 src/corelib/concurrent/qthreadpool.cpp             | 26 ++++----
 src/corelib/concurrent/qthreadpool.h               | 26 ++++----
 src/corelib/concurrent/qthreadpool_p.h             | 26 ++++----
 src/corelib/global/qconfig-dist.h                  | 26 ++++----
 src/corelib/global/qconfig-large.h                 | 26 ++++----
 src/corelib/global/qconfig-medium.h                | 26 ++++----
 src/corelib/global/qconfig-minimal.h               | 26 ++++----
 src/corelib/global/qconfig-small.h                 | 26 ++++----
 src/corelib/global/qendian.h                       | 26 ++++----
 src/corelib/global/qfeatures.h                     | 26 ++++----
 src/corelib/global/qglobal.cpp                     | 26 ++++----
 src/corelib/global/qglobal.h                       | 26 ++++----
 src/corelib/global/qlibraryinfo.cpp                | 26 ++++----
 src/corelib/global/qlibraryinfo.h                  | 26 ++++----
 src/corelib/global/qmalloc.cpp                     | 26 ++++----
 src/corelib/global/qnamespace.h                    | 26 ++++----
 src/corelib/global/qnumeric.cpp                    | 26 ++++----
 src/corelib/global/qnumeric.h                      | 26 ++++----
 src/corelib/global/qnumeric_p.h                    | 26 ++++----
 src/corelib/global/qt_pch.h                        | 26 ++++----
 src/corelib/global/qt_windows.h                    | 26 ++++----
 src/corelib/io/qabstractfileengine.cpp             | 26 ++++----
 src/corelib/io/qabstractfileengine.h               | 26 ++++----
 src/corelib/io/qabstractfileengine_p.h             | 26 ++++----
 src/corelib/io/qbuffer.cpp                         | 26 ++++----
 src/corelib/io/qbuffer.h                           | 26 ++++----
 src/corelib/io/qdatastream.cpp                     | 26 ++++----
 src/corelib/io/qdatastream.h                       | 26 ++++----
 src/corelib/io/qdatastream_p.h                     | 26 ++++----
 src/corelib/io/qdataurl.cpp                        | 26 ++++----
 src/corelib/io/qdataurl_p.h                        | 26 ++++----
 src/corelib/io/qdebug.cpp                          | 26 ++++----
 src/corelib/io/qdebug.h                            | 26 ++++----
 src/corelib/io/qdir.cpp                            | 26 ++++----
 src/corelib/io/qdir.h                              | 26 ++++----
 src/corelib/io/qdiriterator.cpp                    | 26 ++++----
 src/corelib/io/qdiriterator.h                      | 26 ++++----
 src/corelib/io/qfile.cpp                           | 26 ++++----
 src/corelib/io/qfile.h                             | 26 ++++----
 src/corelib/io/qfile_p.h                           | 26 ++++----
 src/corelib/io/qfileinfo.cpp                       | 26 ++++----
 src/corelib/io/qfileinfo.h                         | 26 ++++----
 src/corelib/io/qfileinfo_p.h                       | 26 ++++----
 src/corelib/io/qfilesystemwatcher.cpp              | 26 ++++----
 src/corelib/io/qfilesystemwatcher.h                | 26 ++++----
 src/corelib/io/qfilesystemwatcher_dnotify.cpp      | 26 ++++----
 src/corelib/io/qfilesystemwatcher_dnotify_p.h      | 26 ++++----
 src/corelib/io/qfilesystemwatcher_fsevents.cpp     | 26 ++++----
 src/corelib/io/qfilesystemwatcher_fsevents_p.h     | 26 ++++----
 src/corelib/io/qfilesystemwatcher_inotify.cpp      | 26 ++++----
 src/corelib/io/qfilesystemwatcher_inotify_p.h      | 26 ++++----
 src/corelib/io/qfilesystemwatcher_kqueue.cpp       | 26 ++++----
 src/corelib/io/qfilesystemwatcher_kqueue_p.h       | 26 ++++----
 src/corelib/io/qfilesystemwatcher_p.h              | 26 ++++----
 src/corelib/io/qfilesystemwatcher_symbian.cpp      | 26 ++++----
 src/corelib/io/qfilesystemwatcher_symbian_p.h      | 26 ++++----
 src/corelib/io/qfilesystemwatcher_win.cpp          | 26 ++++----
 src/corelib/io/qfilesystemwatcher_win_p.h          | 26 ++++----
 src/corelib/io/qfsfileengine.cpp                   | 26 ++++----
 src/corelib/io/qfsfileengine.h                     | 26 ++++----
 src/corelib/io/qfsfileengine_iterator.cpp          | 26 ++++----
 src/corelib/io/qfsfileengine_iterator_p.h          | 26 ++++----
 src/corelib/io/qfsfileengine_iterator_unix.cpp     | 26 ++++----
 src/corelib/io/qfsfileengine_iterator_win.cpp      | 26 ++++----
 src/corelib/io/qfsfileengine_p.h                   | 26 ++++----
 src/corelib/io/qfsfileengine_unix.cpp              | 26 ++++----
 src/corelib/io/qfsfileengine_win.cpp               | 26 ++++----
 src/corelib/io/qiodevice.cpp                       | 26 ++++----
 src/corelib/io/qiodevice.h                         | 26 ++++----
 src/corelib/io/qiodevice_p.h                       | 26 ++++----
 src/corelib/io/qnoncontiguousbytedevice.cpp        | 26 ++++----
 src/corelib/io/qnoncontiguousbytedevice_p.h        | 26 ++++----
 src/corelib/io/qprocess.cpp                        | 26 ++++----
 src/corelib/io/qprocess.h                          | 26 ++++----
 src/corelib/io/qprocess_p.h                        | 26 ++++----
 src/corelib/io/qprocess_symbian.cpp                | 26 ++++----
 src/corelib/io/qprocess_unix.cpp                   | 26 ++++----
 src/corelib/io/qprocess_win.cpp                    | 26 ++++----
 src/corelib/io/qresource.cpp                       | 26 ++++----
 src/corelib/io/qresource.h                         | 26 ++++----
 src/corelib/io/qresource_iterator.cpp              | 26 ++++----
 src/corelib/io/qresource_iterator_p.h              | 26 ++++----
 src/corelib/io/qresource_p.h                       | 26 ++++----
 src/corelib/io/qsettings.cpp                       | 26 ++++----
 src/corelib/io/qsettings.h                         | 26 ++++----
 src/corelib/io/qsettings_mac.cpp                   | 26 ++++----
 src/corelib/io/qsettings_p.h                       | 26 ++++----
 src/corelib/io/qsettings_win.cpp                   | 26 ++++----
 src/corelib/io/qtemporaryfile.cpp                  | 26 ++++----
 src/corelib/io/qtemporaryfile.h                    | 26 ++++----
 src/corelib/io/qtextstream.cpp                     | 26 ++++----
 src/corelib/io/qtextstream.h                       | 26 ++++----
 src/corelib/io/qurl.cpp                            | 26 ++++----
 src/corelib/io/qurl.h                              | 26 ++++----
 src/corelib/io/qwindowspipewriter.cpp              | 26 ++++----
 src/corelib/io/qwindowspipewriter_p.h              | 26 ++++----
 src/corelib/kernel/qabstracteventdispatcher.cpp    | 26 ++++----
 src/corelib/kernel/qabstracteventdispatcher.h      | 26 ++++----
 src/corelib/kernel/qabstracteventdispatcher_p.h    | 26 ++++----
 src/corelib/kernel/qabstractitemmodel.cpp          | 26 ++++----
 src/corelib/kernel/qabstractitemmodel.h            | 26 ++++----
 src/corelib/kernel/qabstractitemmodel_p.h          | 26 ++++----
 src/corelib/kernel/qbasictimer.cpp                 | 26 ++++----
 src/corelib/kernel/qbasictimer.h                   | 26 ++++----
 src/corelib/kernel/qcore_mac.cpp                   | 26 ++++----
 src/corelib/kernel/qcore_mac_p.h                   | 26 ++++----
 src/corelib/kernel/qcore_symbian_p.cpp             | 26 ++++----
 src/corelib/kernel/qcore_symbian_p.h               | 26 ++++----
 src/corelib/kernel/qcore_unix.cpp                  | 26 ++++----
 src/corelib/kernel/qcore_unix_p.h                  | 26 ++++----
 src/corelib/kernel/qcoreapplication.cpp            | 26 ++++----
 src/corelib/kernel/qcoreapplication.h              | 26 ++++----
 src/corelib/kernel/qcoreapplication_mac.cpp        | 26 ++++----
 src/corelib/kernel/qcoreapplication_p.h            | 26 ++++----
 src/corelib/kernel/qcoreapplication_win.cpp        | 26 ++++----
 src/corelib/kernel/qcorecmdlineargs_p.h            | 26 ++++----
 src/corelib/kernel/qcoreevent.cpp                  | 26 ++++----
 src/corelib/kernel/qcoreevent.h                    | 26 ++++----
 src/corelib/kernel/qcoreglobaldata.cpp             | 26 ++++----
 src/corelib/kernel/qcoreglobaldata_p.h             | 26 ++++----
 src/corelib/kernel/qcrashhandler.cpp               | 26 ++++----
 src/corelib/kernel/qcrashhandler_p.h               | 26 ++++----
 src/corelib/kernel/qeventdispatcher_glib.cpp       | 26 ++++----
 src/corelib/kernel/qeventdispatcher_glib_p.h       | 26 ++++----
 src/corelib/kernel/qeventdispatcher_symbian.cpp    | 26 ++++----
 src/corelib/kernel/qeventdispatcher_symbian_p.h    | 26 ++++----
 src/corelib/kernel/qeventdispatcher_unix.cpp       | 26 ++++----
 src/corelib/kernel/qeventdispatcher_unix_p.h       | 26 ++++----
 src/corelib/kernel/qeventdispatcher_win.cpp        | 26 ++++----
 src/corelib/kernel/qeventdispatcher_win_p.h        | 26 ++++----
 src/corelib/kernel/qeventloop.cpp                  | 26 ++++----
 src/corelib/kernel/qeventloop.h                    | 26 ++++----
 src/corelib/kernel/qfunctions_p.h                  | 26 ++++----
 src/corelib/kernel/qfunctions_vxworks.cpp          | 26 ++++----
 src/corelib/kernel/qfunctions_vxworks.h            | 26 ++++----
 src/corelib/kernel/qfunctions_wince.cpp            | 26 ++++----
 src/corelib/kernel/qfunctions_wince.h              | 26 ++++----
 src/corelib/kernel/qmath.cpp                       | 26 ++++----
 src/corelib/kernel/qmath.h                         | 26 ++++----
 src/corelib/kernel/qmetaobject.cpp                 | 26 ++++----
 src/corelib/kernel/qmetaobject.h                   | 26 ++++----
 src/corelib/kernel/qmetaobject_p.h                 | 26 ++++----
 src/corelib/kernel/qmetatype.cpp                   | 26 ++++----
 src/corelib/kernel/qmetatype.h                     | 26 ++++----
 src/corelib/kernel/qmimedata.cpp                   | 26 ++++----
 src/corelib/kernel/qmimedata.h                     | 26 ++++----
 src/corelib/kernel/qobject.cpp                     | 26 ++++----
 src/corelib/kernel/qobject.h                       | 26 ++++----
 src/corelib/kernel/qobject_p.h                     | 26 ++++----
 src/corelib/kernel/qobjectcleanuphandler.cpp       | 26 ++++----
 src/corelib/kernel/qobjectcleanuphandler.h         | 26 ++++----
 src/corelib/kernel/qobjectdefs.h                   | 26 ++++----
 src/corelib/kernel/qpointer.cpp                    | 26 ++++----
 src/corelib/kernel/qpointer.h                      | 26 ++++----
 src/corelib/kernel/qsharedmemory.cpp               | 26 ++++----
 src/corelib/kernel/qsharedmemory.h                 | 26 ++++----
 src/corelib/kernel/qsharedmemory_p.h               | 26 ++++----
 src/corelib/kernel/qsharedmemory_symbian.cpp       | 26 ++++----
 src/corelib/kernel/qsharedmemory_unix.cpp          | 26 ++++----
 src/corelib/kernel/qsharedmemory_win.cpp           | 26 ++++----
 src/corelib/kernel/qsignalmapper.cpp               | 26 ++++----
 src/corelib/kernel/qsignalmapper.h                 | 26 ++++----
 src/corelib/kernel/qsocketnotifier.cpp             | 26 ++++----
 src/corelib/kernel/qsocketnotifier.h               | 26 ++++----
 src/corelib/kernel/qsystemsemaphore.cpp            | 26 ++++----
 src/corelib/kernel/qsystemsemaphore.h              | 26 ++++----
 src/corelib/kernel/qsystemsemaphore_p.h            | 26 ++++----
 src/corelib/kernel/qsystemsemaphore_symbian.cpp    | 26 ++++----
 src/corelib/kernel/qsystemsemaphore_unix.cpp       | 26 ++++----
 src/corelib/kernel/qsystemsemaphore_win.cpp        | 26 ++++----
 src/corelib/kernel/qtcore_eval.cpp                 | 26 ++++----
 src/corelib/kernel/qtimer.cpp                      | 26 ++++----
 src/corelib/kernel/qtimer.h                        | 26 ++++----
 src/corelib/kernel/qtranslator.cpp                 | 26 ++++----
 src/corelib/kernel/qtranslator.h                   | 26 ++++----
 src/corelib/kernel/qtranslator_p.h                 | 26 ++++----
 src/corelib/kernel/qvariant.cpp                    | 26 ++++----
 src/corelib/kernel/qvariant.h                      | 26 ++++----
 src/corelib/kernel/qvariant_p.h                    | 26 ++++----
 src/corelib/kernel/qwineventnotifier_p.cpp         | 26 ++++----
 src/corelib/kernel/qwineventnotifier_p.h           | 26 ++++----
 src/corelib/plugin/qfactoryinterface.h             | 26 ++++----
 src/corelib/plugin/qfactoryloader.cpp              | 26 ++++----
 src/corelib/plugin/qfactoryloader_p.h              | 26 ++++----
 src/corelib/plugin/qlibrary.cpp                    | 26 ++++----
 src/corelib/plugin/qlibrary.h                      | 26 ++++----
 src/corelib/plugin/qlibrary_p.h                    | 26 ++++----
 src/corelib/plugin/qlibrary_unix.cpp               | 26 ++++----
 src/corelib/plugin/qlibrary_win.cpp                | 26 ++++----
 src/corelib/plugin/qplugin.h                       | 26 ++++----
 src/corelib/plugin/qpluginloader.cpp               | 26 ++++----
 src/corelib/plugin/qpluginloader.h                 | 26 ++++----
 src/corelib/plugin/qsystemlibrary.cpp              | 26 ++++----
 src/corelib/plugin/qsystemlibrary_p.h              | 26 ++++----
 src/corelib/plugin/quuid.cpp                       | 26 ++++----
 src/corelib/plugin/quuid.h                         | 26 ++++----
 src/corelib/statemachine/qabstractstate.cpp        | 26 ++++----
 src/corelib/statemachine/qabstractstate.h          | 26 ++++----
 src/corelib/statemachine/qabstractstate_p.h        | 26 ++++----
 src/corelib/statemachine/qabstracttransition.cpp   | 26 ++++----
 src/corelib/statemachine/qabstracttransition.h     | 26 ++++----
 src/corelib/statemachine/qabstracttransition_p.h   | 26 ++++----
 src/corelib/statemachine/qeventtransition.cpp      | 26 ++++----
 src/corelib/statemachine/qeventtransition.h        | 26 ++++----
 src/corelib/statemachine/qeventtransition_p.h      | 26 ++++----
 src/corelib/statemachine/qfinalstate.cpp           | 26 ++++----
 src/corelib/statemachine/qfinalstate.h             | 26 ++++----
 src/corelib/statemachine/qhistorystate.cpp         | 26 ++++----
 src/corelib/statemachine/qhistorystate.h           | 26 ++++----
 src/corelib/statemachine/qhistorystate_p.h         | 26 ++++----
 src/corelib/statemachine/qsignaleventgenerator_p.h | 26 ++++----
 src/corelib/statemachine/qsignaltransition.cpp     | 26 ++++----
 src/corelib/statemachine/qsignaltransition.h       | 26 ++++----
 src/corelib/statemachine/qsignaltransition_p.h     | 26 ++++----
 src/corelib/statemachine/qstate.cpp                | 26 ++++----
 src/corelib/statemachine/qstate.h                  | 26 ++++----
 src/corelib/statemachine/qstate_p.h                | 26 ++++----
 src/corelib/statemachine/qstatemachine.cpp         | 26 ++++----
 src/corelib/statemachine/qstatemachine.h           | 26 ++++----
 src/corelib/statemachine/qstatemachine_p.h         | 26 ++++----
 src/corelib/thread/qatomic.cpp                     | 26 ++++----
 src/corelib/thread/qatomic.h                       | 26 ++++----
 src/corelib/thread/qbasicatomic.h                  | 26 ++++----
 src/corelib/thread/qmutex.cpp                      | 26 ++++----
 src/corelib/thread/qmutex.h                        | 26 ++++----
 src/corelib/thread/qmutex_p.h                      | 26 ++++----
 src/corelib/thread/qmutex_unix.cpp                 | 26 ++++----
 src/corelib/thread/qmutex_win.cpp                  | 26 ++++----
 src/corelib/thread/qmutexpool.cpp                  | 26 ++++----
 src/corelib/thread/qmutexpool_p.h                  | 26 ++++----
 src/corelib/thread/qorderedmutexlocker_p.h         | 26 ++++----
 src/corelib/thread/qreadwritelock.cpp              | 26 ++++----
 src/corelib/thread/qreadwritelock.h                | 26 ++++----
 src/corelib/thread/qreadwritelock_p.h              | 26 ++++----
 src/corelib/thread/qsemaphore.cpp                  | 26 ++++----
 src/corelib/thread/qsemaphore.h                    | 26 ++++----
 src/corelib/thread/qthread.cpp                     | 26 ++++----
 src/corelib/thread/qthread.h                       | 26 ++++----
 src/corelib/thread/qthread_p.h                     | 26 ++++----
 src/corelib/thread/qthread_unix.cpp                | 26 ++++----
 src/corelib/thread/qthread_win.cpp                 | 26 ++++----
 src/corelib/thread/qthreadstorage.cpp              | 26 ++++----
 src/corelib/thread/qthreadstorage.h                | 26 ++++----
 src/corelib/thread/qwaitcondition.h                | 26 ++++----
 src/corelib/thread/qwaitcondition_unix.cpp         | 26 ++++----
 src/corelib/thread/qwaitcondition_win.cpp          | 26 ++++----
 src/corelib/tools/qalgorithms.h                    | 26 ++++----
 src/corelib/tools/qbitarray.cpp                    | 26 ++++----
 src/corelib/tools/qbitarray.h                      | 26 ++++----
 src/corelib/tools/qbytearray.cpp                   | 26 ++++----
 src/corelib/tools/qbytearray.h                     | 26 ++++----
 src/corelib/tools/qbytearraymatcher.cpp            | 26 ++++----
 src/corelib/tools/qbytearraymatcher.h              | 26 ++++----
 src/corelib/tools/qbytedata_p.h                    | 26 ++++----
 src/corelib/tools/qcache.h                         | 26 ++++----
 src/corelib/tools/qchar.cpp                        | 26 ++++----
 src/corelib/tools/qchar.h                          | 26 ++++----
 src/corelib/tools/qcontainerfwd.h                  | 26 ++++----
 src/corelib/tools/qcontiguouscache.cpp             | 26 ++++----
 src/corelib/tools/qcontiguouscache.h               | 26 ++++----
 src/corelib/tools/qcryptographichash.cpp           | 26 ++++----
 src/corelib/tools/qcryptographichash.h             | 26 ++++----
 src/corelib/tools/qdatetime.cpp                    | 26 ++++----
 src/corelib/tools/qdatetime.h                      | 26 ++++----
 src/corelib/tools/qdatetime_p.h                    | 26 ++++----
 src/corelib/tools/qeasingcurve.cpp                 | 26 ++++----
 src/corelib/tools/qeasingcurve.h                   | 26 ++++----
 src/corelib/tools/qelapsedtimer.cpp                | 26 ++++----
 src/corelib/tools/qelapsedtimer.h                  | 26 ++++----
 src/corelib/tools/qelapsedtimer_generic.cpp        | 26 ++++----
 src/corelib/tools/qelapsedtimer_mac.cpp            | 26 ++++----
 src/corelib/tools/qelapsedtimer_symbian.cpp        | 26 ++++----
 src/corelib/tools/qelapsedtimer_unix.cpp           | 26 ++++----
 src/corelib/tools/qelapsedtimer_win.cpp            | 26 ++++----
 src/corelib/tools/qharfbuzz.cpp                    | 26 ++++----
 src/corelib/tools/qharfbuzz_p.h                    | 26 ++++----
 src/corelib/tools/qhash.cpp                        | 26 ++++----
 src/corelib/tools/qhash.h                          | 26 ++++----
 src/corelib/tools/qiterator.h                      | 26 ++++----
 src/corelib/tools/qline.cpp                        | 26 ++++----
 src/corelib/tools/qline.h                          | 26 ++++----
 src/corelib/tools/qlinkedlist.cpp                  | 26 ++++----
 src/corelib/tools/qlinkedlist.h                    | 26 ++++----
 src/corelib/tools/qlist.cpp                        | 26 ++++----
 src/corelib/tools/qlist.h                          | 26 ++++----
 src/corelib/tools/qlocale.cpp                      | 26 ++++----
 src/corelib/tools/qlocale.h                        | 26 ++++----
 src/corelib/tools/qlocale_data_p.h                 | 26 ++++----
 src/corelib/tools/qlocale_p.h                      | 26 ++++----
 src/corelib/tools/qlocale_symbian.cpp              | 26 ++++----
 src/corelib/tools/qmap.cpp                         | 26 ++++----
 src/corelib/tools/qmap.h                           | 26 ++++----
 src/corelib/tools/qmargins.cpp                     | 26 ++++----
 src/corelib/tools/qmargins.h                       | 26 ++++----
 src/corelib/tools/qpair.h                          | 26 ++++----
 src/corelib/tools/qpodlist_p.h                     | 26 ++++----
 src/corelib/tools/qpoint.cpp                       | 26 ++++----
 src/corelib/tools/qpoint.h                         | 26 ++++----
 src/corelib/tools/qqueue.cpp                       | 26 ++++----
 src/corelib/tools/qqueue.h                         | 26 ++++----
 src/corelib/tools/qrect.cpp                        | 26 ++++----
 src/corelib/tools/qrect.h                          | 26 ++++----
 src/corelib/tools/qregexp.cpp                      | 26 ++++----
 src/corelib/tools/qregexp.h                        | 26 ++++----
 src/corelib/tools/qringbuffer_p.h                  | 26 ++++----
 src/corelib/tools/qscopedpointer.cpp               | 26 ++++----
 src/corelib/tools/qscopedpointer.h                 | 26 ++++----
 src/corelib/tools/qscopedpointer_p.h               | 26 ++++----
 src/corelib/tools/qset.h                           | 26 ++++----
 src/corelib/tools/qshareddata.cpp                  | 26 ++++----
 src/corelib/tools/qshareddata.h                    | 26 ++++----
 src/corelib/tools/qsharedpointer.cpp               | 26 ++++----
 src/corelib/tools/qsharedpointer.h                 | 26 ++++----
 src/corelib/tools/qsharedpointer_impl.h            | 26 ++++----
 src/corelib/tools/qsimd.cpp                        | 26 ++++----
 src/corelib/tools/qsimd_p.h                        | 26 ++++----
 src/corelib/tools/qsize.cpp                        | 26 ++++----
 src/corelib/tools/qsize.h                          | 26 ++++----
 src/corelib/tools/qstack.cpp                       | 26 ++++----
 src/corelib/tools/qstack.h                         | 26 ++++----
 src/corelib/tools/qstring.cpp                      | 26 ++++----
 src/corelib/tools/qstring.h                        | 26 ++++----
 src/corelib/tools/qstringbuilder.cpp               | 26 ++++----
 src/corelib/tools/qstringbuilder.h                 | 26 ++++----
 src/corelib/tools/qstringlist.cpp                  | 26 ++++----
 src/corelib/tools/qstringlist.h                    | 26 ++++----
 src/corelib/tools/qstringmatcher.cpp               | 26 ++++----
 src/corelib/tools/qstringmatcher.h                 | 26 ++++----
 src/corelib/tools/qtextboundaryfinder.cpp          | 26 ++++----
 src/corelib/tools/qtextboundaryfinder.h            | 26 ++++----
 src/corelib/tools/qtimeline.cpp                    | 26 ++++----
 src/corelib/tools/qtimeline.h                      | 26 ++++----
 src/corelib/tools/qtools_p.h                       | 26 ++++----
 src/corelib/tools/qunicodetables.cpp               | 26 ++++----
 src/corelib/tools/qunicodetables_p.h               | 26 ++++----
 src/corelib/tools/qvarlengtharray.h                | 26 ++++----
 src/corelib/tools/qvector.cpp                      | 26 ++++----
 src/corelib/tools/qvector.h                        | 26 ++++----
 src/corelib/tools/qvsnprintf.cpp                   | 26 ++++----
 src/corelib/xml/make-parser.sh                     | 26 ++++----
 src/corelib/xml/qxmlstream.cpp                     | 26 ++++----
 src/corelib/xml/qxmlstream.g                       | 26 ++++----
 src/corelib/xml/qxmlstream.h                       | 26 ++++----
 src/corelib/xml/qxmlstream_p.h                     | 26 ++++----
 src/corelib/xml/qxmlutils.cpp                      | 26 ++++----
 src/corelib/xml/qxmlutils_p.h                      | 26 ++++----
 src/dbus/qdbus_symbols.cpp                         | 26 ++++----
 src/dbus/qdbus_symbols_p.h                         | 26 ++++----
 src/dbus/qdbusabstractadaptor.cpp                  | 26 ++++----
 src/dbus/qdbusabstractadaptor.h                    | 26 ++++----
 src/dbus/qdbusabstractadaptor_p.h                  | 26 ++++----
 src/dbus/qdbusabstractinterface.cpp                | 26 ++++----
 src/dbus/qdbusabstractinterface.h                  | 26 ++++----
 src/dbus/qdbusabstractinterface_p.h                | 26 ++++----
 src/dbus/qdbusargument.cpp                         | 26 ++++----
 src/dbus/qdbusargument.h                           | 26 ++++----
 src/dbus/qdbusargument_p.h                         | 26 ++++----
 src/dbus/qdbusconnection.cpp                       | 26 ++++----
 src/dbus/qdbusconnection.h                         | 26 ++++----
 src/dbus/qdbusconnection_p.h                       | 26 ++++----
 src/dbus/qdbusconnectioninterface.cpp              | 26 ++++----
 src/dbus/qdbusconnectioninterface.h                | 26 ++++----
 src/dbus/qdbuscontext.cpp                          | 26 ++++----
 src/dbus/qdbuscontext.h                            | 26 ++++----
 src/dbus/qdbuscontext_p.h                          | 26 ++++----
 src/dbus/qdbusdemarshaller.cpp                     | 26 ++++----
 src/dbus/qdbuserror.cpp                            | 26 ++++----
 src/dbus/qdbuserror.h                              | 26 ++++----
 src/dbus/qdbusextratypes.cpp                       | 26 ++++----
 src/dbus/qdbusextratypes.h                         | 26 ++++----
 src/dbus/qdbusintegrator.cpp                       | 26 ++++----
 src/dbus/qdbusintegrator_p.h                       | 26 ++++----
 src/dbus/qdbusinterface.cpp                        | 26 ++++----
 src/dbus/qdbusinterface.h                          | 26 ++++----
 src/dbus/qdbusinterface_p.h                        | 26 ++++----
 src/dbus/qdbusinternalfilters.cpp                  | 26 ++++----
 src/dbus/qdbusintrospection.cpp                    | 26 ++++----
 src/dbus/qdbusintrospection_p.h                    | 26 ++++----
 src/dbus/qdbusmacros.h                             | 26 ++++----
 src/dbus/qdbusmarshaller.cpp                       | 26 ++++----
 src/dbus/qdbusmessage.cpp                          | 26 ++++----
 src/dbus/qdbusmessage.h                            | 26 ++++----
 src/dbus/qdbusmessage_p.h                          | 26 ++++----
 src/dbus/qdbusmetaobject.cpp                       | 26 ++++----
 src/dbus/qdbusmetaobject_p.h                       | 26 ++++----
 src/dbus/qdbusmetatype.cpp                         | 26 ++++----
 src/dbus/qdbusmetatype.h                           | 26 ++++----
 src/dbus/qdbusmetatype_p.h                         | 26 ++++----
 src/dbus/qdbusmisc.cpp                             | 26 ++++----
 src/dbus/qdbuspendingcall.cpp                      | 26 ++++----
 src/dbus/qdbuspendingcall.h                        | 26 ++++----
 src/dbus/qdbuspendingcall_p.h                      | 26 ++++----
 src/dbus/qdbuspendingreply.cpp                     | 26 ++++----
 src/dbus/qdbuspendingreply.h                       | 26 ++++----
 src/dbus/qdbusreply.cpp                            | 26 ++++----
 src/dbus/qdbusreply.h                              | 26 ++++----
 src/dbus/qdbusserver.cpp                           | 26 ++++----
 src/dbus/qdbusserver.h                             | 26 ++++----
 src/dbus/qdbusservicewatcher.cpp                   | 26 ++++----
 src/dbus/qdbusservicewatcher.h                     | 26 ++++----
 src/dbus/qdbusthreaddebug_p.h                      | 26 ++++----
 src/dbus/qdbusutil.cpp                             | 26 ++++----
 src/dbus/qdbusutil_p.h                             | 26 ++++----
 src/dbus/qdbusxmlgenerator.cpp                     | 26 ++++----
 src/dbus/qdbusxmlparser.cpp                        | 26 ++++----
 src/dbus/qdbusxmlparser_p.h                        | 26 ++++----
 src/declarative/debugger/qdeclarativedebug.cpp     | 26 ++++----
 src/declarative/debugger/qdeclarativedebug_p.h     | 26 ++++----
 .../debugger/qdeclarativedebugclient.cpp           | 26 ++++----
 .../debugger/qdeclarativedebugclient_p.h           | 26 ++++----
 .../debugger/qdeclarativedebuggerstatus.cpp        | 26 ++++----
 .../debugger/qdeclarativedebuggerstatus_p.h        | 26 ++++----
 .../debugger/qdeclarativedebughelper.cpp           | 26 ++++----
 .../debugger/qdeclarativedebughelper_p.h           | 26 ++++----
 .../debugger/qdeclarativedebugservice.cpp          | 26 ++++----
 .../debugger/qdeclarativedebugservice_p.h          | 26 ++++----
 .../debugger/qdeclarativedebugtrace.cpp            | 26 ++++----
 .../debugger/qdeclarativedebugtrace_p.h            | 26 ++++----
 src/declarative/debugger/qpacketprotocol.cpp       | 26 ++++----
 src/declarative/debugger/qpacketprotocol_p.h       | 26 ++++----
 .../graphicsitems/qdeclarativeanchors.cpp          | 26 ++++----
 .../graphicsitems/qdeclarativeanchors_p.h          | 26 ++++----
 .../graphicsitems/qdeclarativeanchors_p_p.h        | 26 ++++----
 .../graphicsitems/qdeclarativeanimatedimage.cpp    | 26 ++++----
 .../graphicsitems/qdeclarativeanimatedimage_p.h    | 26 ++++----
 .../graphicsitems/qdeclarativeanimatedimage_p_p.h  | 26 ++++----
 .../graphicsitems/qdeclarativeborderimage.cpp      | 26 ++++----
 .../graphicsitems/qdeclarativeborderimage_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativeborderimage_p_p.h    | 26 ++++----
 .../graphicsitems/qdeclarativeevents.cpp           | 26 ++++----
 .../graphicsitems/qdeclarativeevents_p_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativeflickable.cpp        | 26 ++++----
 .../graphicsitems/qdeclarativeflickable_p.h        | 26 ++++----
 .../graphicsitems/qdeclarativeflickable_p_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativeflipable.cpp         | 26 ++++----
 .../graphicsitems/qdeclarativeflipable_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativefocuspanel.cpp       | 26 ++++----
 .../graphicsitems/qdeclarativefocuspanel_p.h       | 26 ++++----
 .../graphicsitems/qdeclarativefocusscope.cpp       | 26 ++++----
 .../graphicsitems/qdeclarativefocusscope_p.h       | 26 ++++----
 .../graphicsitems/qdeclarativegraphicswidget.cpp   | 26 ++++----
 .../graphicsitems/qdeclarativegraphicswidget_p.h   | 26 ++++----
 .../graphicsitems/qdeclarativegridview.cpp         | 26 ++++----
 .../graphicsitems/qdeclarativegridview_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativeimage.cpp            | 26 ++++----
 .../graphicsitems/qdeclarativeimage_p.h            | 26 ++++----
 .../graphicsitems/qdeclarativeimage_p_p.h          | 26 ++++----
 .../graphicsitems/qdeclarativeimagebase.cpp        | 26 ++++----
 .../graphicsitems/qdeclarativeimagebase_p.h        | 26 ++++----
 .../graphicsitems/qdeclarativeimagebase_p_p.h      | 26 ++++----
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 26 ++++----
 src/declarative/graphicsitems/qdeclarativeitem.h   | 26 ++++----
 src/declarative/graphicsitems/qdeclarativeitem_p.h | 26 ++++----
 .../qdeclarativeitemchangelistener_p.h             | 26 ++++----
 .../graphicsitems/qdeclarativeitemsmodule.cpp      | 26 ++++----
 .../graphicsitems/qdeclarativeitemsmodule_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativelayoutitem.cpp       | 26 ++++----
 .../graphicsitems/qdeclarativelayoutitem_p.h       | 26 ++++----
 .../graphicsitems/qdeclarativelistview.cpp         | 26 ++++----
 .../graphicsitems/qdeclarativelistview_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativeloader.cpp           | 26 ++++----
 .../graphicsitems/qdeclarativeloader_p.h           | 26 ++++----
 .../graphicsitems/qdeclarativeloader_p_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativemousearea.cpp        | 26 ++++----
 .../graphicsitems/qdeclarativemousearea_p.h        | 26 ++++----
 .../graphicsitems/qdeclarativemousearea_p_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativepainteditem.cpp      | 26 ++++----
 .../graphicsitems/qdeclarativepainteditem_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativepainteditem_p_p.h    | 26 ++++----
 src/declarative/graphicsitems/qdeclarativepath.cpp | 26 ++++----
 src/declarative/graphicsitems/qdeclarativepath_p.h | 26 ++++----
 .../graphicsitems/qdeclarativepath_p_p.h           | 26 ++++----
 .../graphicsitems/qdeclarativepathview.cpp         | 26 ++++----
 .../graphicsitems/qdeclarativepathview_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativepathview_p_p.h       | 26 ++++----
 .../graphicsitems/qdeclarativepositioners.cpp      | 26 ++++----
 .../graphicsitems/qdeclarativepositioners_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativepositioners_p_p.h    | 26 ++++----
 .../graphicsitems/qdeclarativerectangle.cpp        | 26 ++++----
 .../graphicsitems/qdeclarativerectangle_p.h        | 26 ++++----
 .../graphicsitems/qdeclarativerectangle_p_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativerepeater.cpp         | 26 ++++----
 .../graphicsitems/qdeclarativerepeater_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativerepeater_p_p.h       | 26 ++++----
 .../graphicsitems/qdeclarativescalegrid.cpp        | 26 ++++----
 .../graphicsitems/qdeclarativescalegrid_p_p.h      | 26 ++++----
 src/declarative/graphicsitems/qdeclarativetext.cpp | 26 ++++----
 src/declarative/graphicsitems/qdeclarativetext_p.h | 26 ++++----
 .../graphicsitems/qdeclarativetext_p_p.h           | 26 ++++----
 .../graphicsitems/qdeclarativetextedit.cpp         | 26 ++++----
 .../graphicsitems/qdeclarativetextedit_p.h         | 26 ++++----
 .../graphicsitems/qdeclarativetextedit_p_p.h       | 26 ++++----
 .../graphicsitems/qdeclarativetextinput.cpp        | 26 ++++----
 .../graphicsitems/qdeclarativetextinput_p.h        | 26 ++++----
 .../graphicsitems/qdeclarativetextinput_p_p.h      | 26 ++++----
 .../graphicsitems/qdeclarativetranslate.cpp        | 26 ++++----
 .../graphicsitems/qdeclarativetranslate_p.h        | 26 ++++----
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  | 26 ++++----
 .../graphicsitems/qdeclarativevisualitemmodel_p.h  | 26 ++++----
 src/declarative/qml/parser/qdeclarativejs.g        | 52 +++++++--------
 src/declarative/qml/parser/qdeclarativejsast.cpp   | 26 ++++----
 src/declarative/qml/parser/qdeclarativejsast_p.h   | 26 ++++----
 .../qml/parser/qdeclarativejsastfwd_p.h            | 26 ++++----
 .../qml/parser/qdeclarativejsastvisitor.cpp        | 26 ++++----
 .../qml/parser/qdeclarativejsastvisitor_p.h        | 26 ++++----
 .../qml/parser/qdeclarativejsengine_p.cpp          | 26 ++++----
 .../qml/parser/qdeclarativejsengine_p.h            | 26 ++++----
 .../qml/parser/qdeclarativejsglobal_p.h            | 26 ++++----
 .../qml/parser/qdeclarativejsgrammar.cpp           | 26 ++++----
 .../qml/parser/qdeclarativejsgrammar_p.h           | 26 ++++----
 src/declarative/qml/parser/qdeclarativejslexer.cpp | 26 ++++----
 src/declarative/qml/parser/qdeclarativejslexer_p.h | 26 ++++----
 .../qml/parser/qdeclarativejsmemorypool_p.h        | 26 ++++----
 .../qml/parser/qdeclarativejsnodepool_p.h          | 26 ++++----
 .../qml/parser/qdeclarativejsparser.cpp            | 26 ++++----
 .../qml/parser/qdeclarativejsparser_p.h            | 26 ++++----
 src/declarative/qml/qbitfield_p.h                  | 26 ++++----
 src/declarative/qml/qdeclarative.h                 | 26 ++++----
 src/declarative/qml/qdeclarativebinding.cpp        | 26 ++++----
 src/declarative/qml/qdeclarativebinding_p.h        | 26 ++++----
 src/declarative/qml/qdeclarativebinding_p_p.h      | 26 ++++----
 src/declarative/qml/qdeclarativeboundsignal.cpp    | 26 ++++----
 src/declarative/qml/qdeclarativeboundsignal_p.h    | 26 ++++----
 src/declarative/qml/qdeclarativeclassfactory.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativeclassfactory_p.h   | 26 ++++----
 src/declarative/qml/qdeclarativecleanup.cpp        | 26 ++++----
 src/declarative/qml/qdeclarativecleanup_p.h        | 26 ++++----
 .../qml/qdeclarativecompiledbindings.cpp           | 26 ++++----
 .../qml/qdeclarativecompiledbindings_p.h           | 26 ++++----
 src/declarative/qml/qdeclarativecompileddata.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativecompiler.cpp       | 26 ++++----
 src/declarative/qml/qdeclarativecompiler_p.h       | 26 ++++----
 src/declarative/qml/qdeclarativecomponent.cpp      | 26 ++++----
 src/declarative/qml/qdeclarativecomponent.h        | 26 ++++----
 src/declarative/qml/qdeclarativecomponent_p.h      | 26 ++++----
 src/declarative/qml/qdeclarativecontext.cpp        | 26 ++++----
 src/declarative/qml/qdeclarativecontext.h          | 26 ++++----
 src/declarative/qml/qdeclarativecontext_p.h        | 26 ++++----
 .../qml/qdeclarativecontextscriptclass.cpp         | 26 ++++----
 .../qml/qdeclarativecontextscriptclass_p.h         | 26 ++++----
 src/declarative/qml/qdeclarativecustomparser.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativecustomparser_p.h   | 26 ++++----
 src/declarative/qml/qdeclarativecustomparser_p_p.h | 26 ++++----
 src/declarative/qml/qdeclarativedata_p.h           | 26 ++++----
 src/declarative/qml/qdeclarativedirparser.cpp      | 26 ++++----
 src/declarative/qml/qdeclarativedirparser_p.h      | 26 ++++----
 src/declarative/qml/qdeclarativedom.cpp            | 26 ++++----
 src/declarative/qml/qdeclarativedom_p.h            | 26 ++++----
 src/declarative/qml/qdeclarativedom_p_p.h          | 26 ++++----
 src/declarative/qml/qdeclarativeengine.cpp         | 26 ++++----
 src/declarative/qml/qdeclarativeengine.h           | 26 ++++----
 src/declarative/qml/qdeclarativeengine_p.h         | 26 ++++----
 src/declarative/qml/qdeclarativeenginedebug.cpp    | 26 ++++----
 src/declarative/qml/qdeclarativeenginedebug_p.h    | 26 ++++----
 src/declarative/qml/qdeclarativeerror.cpp          | 26 ++++----
 src/declarative/qml/qdeclarativeerror.h            | 26 ++++----
 src/declarative/qml/qdeclarativeexpression.cpp     | 26 ++++----
 src/declarative/qml/qdeclarativeexpression.h       | 26 ++++----
 src/declarative/qml/qdeclarativeexpression_p.h     | 26 ++++----
 .../qml/qdeclarativeextensioninterface.h           | 26 ++++----
 .../qml/qdeclarativeextensionplugin.cpp            | 26 ++++----
 src/declarative/qml/qdeclarativeextensionplugin.h  | 26 ++++----
 src/declarative/qml/qdeclarativefastproperties.cpp | 26 ++++----
 src/declarative/qml/qdeclarativefastproperties_p.h | 26 ++++----
 src/declarative/qml/qdeclarativeglobal_p.h         | 26 ++++----
 .../qml/qdeclarativeglobalscriptclass.cpp          | 26 ++++----
 .../qml/qdeclarativeglobalscriptclass_p.h          | 26 ++++----
 src/declarative/qml/qdeclarativeguard_p.h          | 26 ++++----
 src/declarative/qml/qdeclarativeimageprovider.cpp  | 26 ++++----
 src/declarative/qml/qdeclarativeimageprovider.h    | 26 ++++----
 src/declarative/qml/qdeclarativeimport.cpp         | 26 ++++----
 src/declarative/qml/qdeclarativeimport_p.h         | 26 ++++----
 src/declarative/qml/qdeclarativeinclude.cpp        | 26 ++++----
 src/declarative/qml/qdeclarativeinclude_p.h        | 26 ++++----
 src/declarative/qml/qdeclarativeinfo.cpp           | 26 ++++----
 src/declarative/qml/qdeclarativeinfo.h             | 26 ++++----
 src/declarative/qml/qdeclarativeinstruction.cpp    | 26 ++++----
 src/declarative/qml/qdeclarativeinstruction_p.h    | 26 ++++----
 src/declarative/qml/qdeclarativeintegercache.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativeintegercache_p.h   | 26 ++++----
 src/declarative/qml/qdeclarativelist.cpp           | 26 ++++----
 src/declarative/qml/qdeclarativelist.h             | 26 ++++----
 src/declarative/qml/qdeclarativelist_p.h           | 26 ++++----
 .../qml/qdeclarativelistscriptclass.cpp            | 26 ++++----
 .../qml/qdeclarativelistscriptclass_p.h            | 26 ++++----
 src/declarative/qml/qdeclarativemetatype.cpp       | 26 ++++----
 src/declarative/qml/qdeclarativemetatype_p.h       | 26 ++++----
 .../qdeclarativenetworkaccessmanagerfactory.cpp    | 26 ++++----
 .../qml/qdeclarativenetworkaccessmanagerfactory.h  | 26 ++++----
 src/declarative/qml/qdeclarativenotifier.cpp       | 26 ++++----
 src/declarative/qml/qdeclarativenotifier_p.h       | 26 ++++----
 .../qml/qdeclarativeobjectscriptclass.cpp          | 26 ++++----
 .../qml/qdeclarativeobjectscriptclass_p.h          | 26 ++++----
 src/declarative/qml/qdeclarativeparser.cpp         | 26 ++++----
 src/declarative/qml/qdeclarativeparser_p.h         | 26 ++++----
 src/declarative/qml/qdeclarativeparserstatus.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativeparserstatus.h     | 26 ++++----
 src/declarative/qml/qdeclarativeprivate.h          | 26 ++++----
 src/declarative/qml/qdeclarativeproperty.cpp       | 26 ++++----
 src/declarative/qml/qdeclarativeproperty.h         | 26 ++++----
 src/declarative/qml/qdeclarativeproperty_p.h       | 26 ++++----
 src/declarative/qml/qdeclarativepropertycache.cpp  | 26 ++++----
 src/declarative/qml/qdeclarativepropertycache_p.h  | 26 ++++----
 .../qml/qdeclarativepropertyvalueinterceptor.cpp   | 26 ++++----
 .../qml/qdeclarativepropertyvalueinterceptor.h     | 26 ++++----
 .../qml/qdeclarativepropertyvaluesource.cpp        | 26 ++++----
 .../qml/qdeclarativepropertyvaluesource.h          | 26 ++++----
 .../qml/qdeclarativeproxymetaobject.cpp            | 26 ++++----
 .../qml/qdeclarativeproxymetaobject_p.h            | 26 ++++----
 src/declarative/qml/qdeclarativerefcount.cpp       | 26 ++++----
 src/declarative/qml/qdeclarativerefcount_p.h       | 26 ++++----
 src/declarative/qml/qdeclarativerewrite.cpp        | 26 ++++----
 src/declarative/qml/qdeclarativerewrite_p.h        | 26 ++++----
 src/declarative/qml/qdeclarativescriptparser.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativescriptparser_p.h   | 26 ++++----
 src/declarative/qml/qdeclarativescriptstring.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativescriptstring.h     | 26 ++++----
 src/declarative/qml/qdeclarativesqldatabase.cpp    | 26 ++++----
 src/declarative/qml/qdeclarativesqldatabase_p.h    | 26 ++++----
 .../qml/qdeclarativestringconverters.cpp           | 26 ++++----
 .../qml/qdeclarativestringconverters_p.h           | 26 ++++----
 src/declarative/qml/qdeclarativetypeloader.cpp     | 26 ++++----
 src/declarative/qml/qdeclarativetypeloader_p.h     | 26 ++++----
 src/declarative/qml/qdeclarativetypenamecache.cpp  | 26 ++++----
 src/declarative/qml/qdeclarativetypenamecache_p.h  | 26 ++++----
 .../qml/qdeclarativetypenamescriptclass.cpp        | 26 ++++----
 .../qml/qdeclarativetypenamescriptclass_p.h        | 26 ++++----
 .../qml/qdeclarativetypenotavailable.cpp           | 26 ++++----
 .../qml/qdeclarativetypenotavailable_p.h           | 26 ++++----
 src/declarative/qml/qdeclarativevaluetype.cpp      | 26 ++++----
 src/declarative/qml/qdeclarativevaluetype_p.h      | 26 ++++----
 .../qml/qdeclarativevaluetypescriptclass.cpp       | 26 ++++----
 .../qml/qdeclarativevaluetypescriptclass_p.h       | 26 ++++----
 src/declarative/qml/qdeclarativevme.cpp            | 26 ++++----
 src/declarative/qml/qdeclarativevme_p.h            | 26 ++++----
 src/declarative/qml/qdeclarativevmemetaobject.cpp  | 26 ++++----
 src/declarative/qml/qdeclarativevmemetaobject_p.h  | 26 ++++----
 src/declarative/qml/qdeclarativewatcher.cpp        | 26 ++++----
 src/declarative/qml/qdeclarativewatcher_p.h        | 26 ++++----
 src/declarative/qml/qdeclarativeworkerscript.cpp   | 26 ++++----
 src/declarative/qml/qdeclarativeworkerscript_p.h   | 26 ++++----
 src/declarative/qml/qdeclarativexmlhttprequest.cpp | 26 ++++----
 src/declarative/qml/qdeclarativexmlhttprequest_p.h | 26 ++++----
 src/declarative/qml/qmetaobjectbuilder.cpp         | 26 ++++----
 src/declarative/qml/qmetaobjectbuilder_p.h         | 26 ++++----
 src/declarative/qml/qpodvector_p.h                 | 26 ++++----
 src/declarative/qml/rewriter/rewriter.cpp          | 26 ++++----
 src/declarative/qml/rewriter/rewriter_p.h          | 26 ++++----
 src/declarative/qml/rewriter/textwriter.cpp        | 26 ++++----
 src/declarative/qml/rewriter/textwriter_p.h        | 26 ++++----
 src/declarative/util/qdeclarativeanimation.cpp     | 26 ++++----
 src/declarative/util/qdeclarativeanimation_p.h     | 26 ++++----
 src/declarative/util/qdeclarativeanimation_p_p.h   | 26 ++++----
 src/declarative/util/qdeclarativebehavior.cpp      | 26 ++++----
 src/declarative/util/qdeclarativebehavior_p.h      | 26 ++++----
 src/declarative/util/qdeclarativebind.cpp          | 26 ++++----
 src/declarative/util/qdeclarativebind_p.h          | 26 ++++----
 src/declarative/util/qdeclarativeconnections.cpp   | 26 ++++----
 src/declarative/util/qdeclarativeconnections_p.h   | 26 ++++----
 src/declarative/util/qdeclarativefontloader.cpp    | 26 ++++----
 src/declarative/util/qdeclarativefontloader_p.h    | 26 ++++----
 src/declarative/util/qdeclarativelistaccessor.cpp  | 26 ++++----
 src/declarative/util/qdeclarativelistaccessor_p.h  | 26 ++++----
 src/declarative/util/qdeclarativelistmodel.cpp     | 26 ++++----
 src/declarative/util/qdeclarativelistmodel_p.h     | 26 ++++----
 src/declarative/util/qdeclarativelistmodel_p_p.h   | 26 ++++----
 .../util/qdeclarativelistmodelworkeragent.cpp      | 26 ++++----
 .../util/qdeclarativelistmodelworkeragent_p.h      | 26 ++++----
 .../util/qdeclarativenullablevalue_p_p.h           | 26 ++++----
 .../util/qdeclarativeopenmetaobject.cpp            | 26 ++++----
 .../util/qdeclarativeopenmetaobject_p.h            | 26 ++++----
 src/declarative/util/qdeclarativepackage.cpp       | 26 ++++----
 src/declarative/util/qdeclarativepackage_p.h       | 26 ++++----
 src/declarative/util/qdeclarativepixmapcache.cpp   | 26 ++++----
 src/declarative/util/qdeclarativepixmapcache_p.h   | 26 ++++----
 .../util/qdeclarativepropertychanges.cpp           | 26 ++++----
 .../util/qdeclarativepropertychanges_p.h           | 26 ++++----
 src/declarative/util/qdeclarativepropertymap.cpp   | 26 ++++----
 src/declarative/util/qdeclarativepropertymap.h     | 26 ++++----
 .../util/qdeclarativesmoothedanimation.cpp         | 26 ++++----
 .../util/qdeclarativesmoothedanimation_p.h         | 26 ++++----
 .../util/qdeclarativesmoothedanimation_p_p.h       | 26 ++++----
 .../util/qdeclarativespringanimation.cpp           | 26 ++++----
 .../util/qdeclarativespringanimation_p.h           | 26 ++++----
 src/declarative/util/qdeclarativestate.cpp         | 26 ++++----
 src/declarative/util/qdeclarativestate_p.h         | 26 ++++----
 src/declarative/util/qdeclarativestate_p_p.h       | 26 ++++----
 src/declarative/util/qdeclarativestategroup.cpp    | 26 ++++----
 src/declarative/util/qdeclarativestategroup_p.h    | 26 ++++----
 .../util/qdeclarativestateoperations.cpp           | 26 ++++----
 .../util/qdeclarativestateoperations_p.h           | 26 ++++----
 src/declarative/util/qdeclarativestyledtext.cpp    | 26 ++++----
 src/declarative/util/qdeclarativestyledtext_p.h    | 26 ++++----
 src/declarative/util/qdeclarativesystempalette.cpp | 26 ++++----
 src/declarative/util/qdeclarativesystempalette_p.h | 26 ++++----
 src/declarative/util/qdeclarativetimeline.cpp      | 26 ++++----
 src/declarative/util/qdeclarativetimeline_p_p.h    | 26 ++++----
 src/declarative/util/qdeclarativetimer.cpp         | 26 ++++----
 src/declarative/util/qdeclarativetimer_p.h         | 26 ++++----
 src/declarative/util/qdeclarativetransition.cpp    | 26 ++++----
 src/declarative/util/qdeclarativetransition_p.h    | 26 ++++----
 .../util/qdeclarativetransitionmanager.cpp         | 26 ++++----
 .../util/qdeclarativetransitionmanager_p_p.h       | 26 ++++----
 src/declarative/util/qdeclarativeutilmodule.cpp    | 26 ++++----
 src/declarative/util/qdeclarativeutilmodule_p.h    | 26 ++++----
 src/declarative/util/qdeclarativeview.cpp          | 26 ++++----
 src/declarative/util/qdeclarativeview.h            | 26 ++++----
 src/declarative/util/qdeclarativexmllistmodel.cpp  | 26 ++++----
 src/declarative/util/qdeclarativexmllistmodel_p.h  | 26 ++++----
 src/declarative/util/qlistmodelinterface.cpp       | 26 ++++----
 src/declarative/util/qlistmodelinterface_p.h       | 26 ++++----
 src/gui/accessible/qaccessible.cpp                 | 26 ++++----
 src/gui/accessible/qaccessible.h                   | 26 ++++----
 src/gui/accessible/qaccessible2.cpp                | 26 ++++----
 src/gui/accessible/qaccessible2.h                  | 26 ++++----
 src/gui/accessible/qaccessible_mac.mm              | 26 ++++----
 src/gui/accessible/qaccessible_mac_carbon.cpp      | 26 ++++----
 src/gui/accessible/qaccessible_mac_cocoa.mm        | 26 ++++----
 src/gui/accessible/qaccessible_mac_p.h             | 26 ++++----
 src/gui/accessible/qaccessible_unix.cpp            | 26 ++++----
 src/gui/accessible/qaccessible_win.cpp             | 26 ++++----
 src/gui/accessible/qaccessiblebridge.cpp           | 26 ++++----
 src/gui/accessible/qaccessiblebridge.h             | 26 ++++----
 src/gui/accessible/qaccessibleobject.cpp           | 26 ++++----
 src/gui/accessible/qaccessibleobject.h             | 26 ++++----
 src/gui/accessible/qaccessibleplugin.cpp           | 26 ++++----
 src/gui/accessible/qaccessibleplugin.h             | 26 ++++----
 src/gui/accessible/qaccessiblewidget.cpp           | 26 ++++----
 src/gui/accessible/qaccessiblewidget.h             | 26 ++++----
 src/gui/animation/qguivariantanimation.cpp         | 26 ++++----
 src/gui/dialogs/qabstractpagesetupdialog.cpp       | 26 ++++----
 src/gui/dialogs/qabstractpagesetupdialog.h         | 26 ++++----
 src/gui/dialogs/qabstractpagesetupdialog_p.h       | 26 ++++----
 src/gui/dialogs/qabstractprintdialog.cpp           | 26 ++++----
 src/gui/dialogs/qabstractprintdialog.h             | 26 ++++----
 src/gui/dialogs/qabstractprintdialog_p.h           | 26 ++++----
 src/gui/dialogs/qcolordialog.cpp                   | 26 ++++----
 src/gui/dialogs/qcolordialog.h                     | 26 ++++----
 src/gui/dialogs/qcolordialog_mac.mm                | 26 ++++----
 src/gui/dialogs/qcolordialog_p.h                   | 26 ++++----
 src/gui/dialogs/qdialog.cpp                        | 26 ++++----
 src/gui/dialogs/qdialog.h                          | 26 ++++----
 src/gui/dialogs/qdialog_p.h                        | 26 ++++----
 src/gui/dialogs/qdialogsbinarycompat_win.cpp       | 26 ++++----
 src/gui/dialogs/qerrormessage.cpp                  | 26 ++++----
 src/gui/dialogs/qerrormessage.h                    | 26 ++++----
 src/gui/dialogs/qfiledialog.cpp                    | 26 ++++----
 src/gui/dialogs/qfiledialog.h                      | 26 ++++----
 src/gui/dialogs/qfiledialog.ui                     | 26 ++++----
 src/gui/dialogs/qfiledialog_embedded.ui            | 26 ++++----
 src/gui/dialogs/qfiledialog_mac.mm                 | 26 ++++----
 src/gui/dialogs/qfiledialog_p.h                    | 26 ++++----
 src/gui/dialogs/qfiledialog_win.cpp                | 26 ++++----
 src/gui/dialogs/qfiledialog_win_p.h                | 26 ++++----
 src/gui/dialogs/qfileinfogatherer.cpp              | 26 ++++----
 src/gui/dialogs/qfileinfogatherer_p.h              | 26 ++++----
 src/gui/dialogs/qfilesystemmodel.cpp               | 26 ++++----
 src/gui/dialogs/qfilesystemmodel.h                 | 26 ++++----
 src/gui/dialogs/qfilesystemmodel_p.h               | 26 ++++----
 src/gui/dialogs/qfontdialog.cpp                    | 26 ++++----
 src/gui/dialogs/qfontdialog.h                      | 26 ++++----
 src/gui/dialogs/qfontdialog_mac.mm                 | 26 ++++----
 src/gui/dialogs/qfontdialog_p.h                    | 26 ++++----
 src/gui/dialogs/qfscompleter_p.h                   | 26 ++++----
 src/gui/dialogs/qinputdialog.cpp                   | 26 ++++----
 src/gui/dialogs/qinputdialog.h                     | 26 ++++----
 src/gui/dialogs/qmessagebox.cpp                    | 26 ++++----
 src/gui/dialogs/qmessagebox.h                      | 26 ++++----
 src/gui/dialogs/qnspanelproxy_mac.mm               | 26 ++++----
 src/gui/dialogs/qpagesetupdialog.cpp               | 26 ++++----
 src/gui/dialogs/qpagesetupdialog.h                 | 26 ++++----
 src/gui/dialogs/qpagesetupdialog_mac.mm            | 26 ++++----
 src/gui/dialogs/qpagesetupdialog_unix.cpp          | 26 ++++----
 src/gui/dialogs/qpagesetupdialog_unix_p.h          | 26 ++++----
 src/gui/dialogs/qpagesetupdialog_win.cpp           | 26 ++++----
 src/gui/dialogs/qprintdialog.h                     | 26 ++++----
 src/gui/dialogs/qprintdialog_mac.mm                | 26 ++++----
 src/gui/dialogs/qprintdialog_qws.cpp               | 26 ++++----
 src/gui/dialogs/qprintdialog_unix.cpp              | 26 ++++----
 src/gui/dialogs/qprintdialog_win.cpp               | 26 ++++----
 src/gui/dialogs/qprintpreviewdialog.cpp            | 26 ++++----
 src/gui/dialogs/qprintpreviewdialog.h              | 26 ++++----
 src/gui/dialogs/qprogressdialog.cpp                | 26 ++++----
 src/gui/dialogs/qprogressdialog.h                  | 26 ++++----
 src/gui/dialogs/qsidebar.cpp                       | 26 ++++----
 src/gui/dialogs/qsidebar_p.h                       | 26 ++++----
 src/gui/dialogs/qwizard.cpp                        | 26 ++++----
 src/gui/dialogs/qwizard.h                          | 26 ++++----
 src/gui/dialogs/qwizard_win.cpp                    | 26 ++++----
 src/gui/dialogs/qwizard_win_p.h                    | 26 ++++----
 src/gui/effects/qgraphicseffect.cpp                | 26 ++++----
 src/gui/effects/qgraphicseffect.h                  | 26 ++++----
 src/gui/effects/qgraphicseffect_p.h                | 26 ++++----
 src/gui/egl/qegl.cpp                               | 26 ++++----
 src/gui/egl/qegl_p.h                               | 26 ++++----
 src/gui/egl/qegl_qws.cpp                           | 26 ++++----
 src/gui/egl/qegl_stub.cpp                          | 26 ++++----
 src/gui/egl/qegl_symbian.cpp                       | 26 ++++----
 src/gui/egl/qegl_wince.cpp                         | 26 ++++----
 src/gui/egl/qegl_x11.cpp                           | 26 ++++----
 src/gui/egl/qeglcontext_p.h                        | 26 ++++----
 src/gui/egl/qeglproperties.cpp                     | 26 ++++----
 src/gui/egl/qeglproperties_p.h                     | 26 ++++----
 src/gui/egl/qeglproperties_stub.cpp                | 26 ++++----
 src/gui/embedded/qcopchannel_qws.cpp               | 26 ++++----
 src/gui/embedded/qcopchannel_qws.h                 | 26 ++++----
 src/gui/embedded/qdecoration_qws.cpp               | 26 ++++----
 src/gui/embedded/qdecoration_qws.h                 | 26 ++++----
 src/gui/embedded/qdecorationdefault_qws.cpp        | 26 ++++----
 src/gui/embedded/qdecorationdefault_qws.h          | 26 ++++----
 src/gui/embedded/qdecorationfactory_qws.cpp        | 26 ++++----
 src/gui/embedded/qdecorationfactory_qws.h          | 26 ++++----
 src/gui/embedded/qdecorationplugin_qws.cpp         | 26 ++++----
 src/gui/embedded/qdecorationplugin_qws.h           | 26 ++++----
 src/gui/embedded/qdecorationstyled_qws.cpp         | 26 ++++----
 src/gui/embedded/qdecorationstyled_qws.h           | 26 ++++----
 src/gui/embedded/qdecorationwindows_qws.cpp        | 26 ++++----
 src/gui/embedded/qdecorationwindows_qws.h          | 26 ++++----
 src/gui/embedded/qdirectpainter_qws.cpp            | 26 ++++----
 src/gui/embedded/qdirectpainter_qws.h              | 26 ++++----
 src/gui/embedded/qkbd_defaultmap_qws_p.h           | 26 ++++----
 src/gui/embedded/qkbd_qws.cpp                      | 26 ++++----
 src/gui/embedded/qkbd_qws.h                        | 26 ++++----
 src/gui/embedded/qkbd_qws_p.h                      | 26 ++++----
 src/gui/embedded/qkbddriverfactory_qws.cpp         | 26 ++++----
 src/gui/embedded/qkbddriverfactory_qws.h           | 26 ++++----
 src/gui/embedded/qkbddriverplugin_qws.cpp          | 26 ++++----
 src/gui/embedded/qkbddriverplugin_qws.h            | 26 ++++----
 src/gui/embedded/qkbdlinuxinput_qws.cpp            | 26 ++++----
 src/gui/embedded/qkbdlinuxinput_qws.h              | 26 ++++----
 src/gui/embedded/qkbdqnx_qws.cpp                   | 26 ++++----
 src/gui/embedded/qkbdqnx_qws.h                     | 26 ++++----
 src/gui/embedded/qkbdtty_qws.cpp                   | 26 ++++----
 src/gui/embedded/qkbdtty_qws.h                     | 26 ++++----
 src/gui/embedded/qkbdum_qws.cpp                    | 26 ++++----
 src/gui/embedded/qkbdum_qws.h                      | 26 ++++----
 src/gui/embedded/qkbdvfb_qws.cpp                   | 26 ++++----
 src/gui/embedded/qkbdvfb_qws.h                     | 26 ++++----
 src/gui/embedded/qlock.cpp                         | 26 ++++----
 src/gui/embedded/qlock_p.h                         | 26 ++++----
 src/gui/embedded/qmouse_qws.cpp                    | 26 ++++----
 src/gui/embedded/qmouse_qws.h                      | 26 ++++----
 src/gui/embedded/qmousedriverfactory_qws.cpp       | 26 ++++----
 src/gui/embedded/qmousedriverfactory_qws.h         | 26 ++++----
 src/gui/embedded/qmousedriverplugin_qws.cpp        | 26 ++++----
 src/gui/embedded/qmousedriverplugin_qws.h          | 26 ++++----
 src/gui/embedded/qmouselinuxinput_qws.cpp          | 26 ++++----
 src/gui/embedded/qmouselinuxinput_qws.h            | 26 ++++----
 src/gui/embedded/qmouselinuxtp_qws.cpp             | 26 ++++----
 src/gui/embedded/qmouselinuxtp_qws.h               | 26 ++++----
 src/gui/embedded/qmousepc_qws.cpp                  | 26 ++++----
 src/gui/embedded/qmousepc_qws.h                    | 26 ++++----
 src/gui/embedded/qmouseqnx_qws.cpp                 | 26 ++++----
 src/gui/embedded/qmouseqnx_qws.h                   | 26 ++++----
 src/gui/embedded/qmousetslib_qws.cpp               | 26 ++++----
 src/gui/embedded/qmousetslib_qws.h                 | 26 ++++----
 src/gui/embedded/qmousevfb_qws.cpp                 | 26 ++++----
 src/gui/embedded/qmousevfb_qws.h                   | 26 ++++----
 src/gui/embedded/qscreen_qws.cpp                   | 26 ++++----
 src/gui/embedded/qscreen_qws.h                     | 26 ++++----
 src/gui/embedded/qscreendriverfactory_qws.cpp      | 26 ++++----
 src/gui/embedded/qscreendriverfactory_qws.h        | 26 ++++----
 src/gui/embedded/qscreendriverplugin_qws.cpp       | 26 ++++----
 src/gui/embedded/qscreendriverplugin_qws.h         | 26 ++++----
 src/gui/embedded/qscreenlinuxfb_qws.cpp            | 26 ++++----
 src/gui/embedded/qscreenlinuxfb_qws.h              | 26 ++++----
 src/gui/embedded/qscreenmulti_qws.cpp              | 26 ++++----
 src/gui/embedded/qscreenmulti_qws_p.h              | 26 ++++----
 src/gui/embedded/qscreenproxy_qws.cpp              | 26 ++++----
 src/gui/embedded/qscreenproxy_qws.h                | 26 ++++----
 src/gui/embedded/qscreenqnx_qws.cpp                | 26 ++++----
 src/gui/embedded/qscreenqnx_qws.h                  | 26 ++++----
 src/gui/embedded/qscreentransformed_qws.cpp        | 26 ++++----
 src/gui/embedded/qscreentransformed_qws.h          | 26 ++++----
 src/gui/embedded/qscreenvfb_qws.cpp                | 26 ++++----
 src/gui/embedded/qscreenvfb_qws.h                  | 26 ++++----
 src/gui/embedded/qsoundqss_qws.cpp                 | 26 ++++----
 src/gui/embedded/qsoundqss_qws.h                   | 26 ++++----
 src/gui/embedded/qtransportauth_qws.cpp            | 26 ++++----
 src/gui/embedded/qtransportauth_qws.h              | 26 ++++----
 src/gui/embedded/qtransportauth_qws_p.h            | 26 ++++----
 src/gui/embedded/qtransportauthdefs_qws.h          | 26 ++++----
 src/gui/embedded/qunixsocket.cpp                   | 26 ++++----
 src/gui/embedded/qunixsocket_p.h                   | 26 ++++----
 src/gui/embedded/qunixsocketserver.cpp             | 26 ++++----
 src/gui/embedded/qunixsocketserver_p.h             | 26 ++++----
 src/gui/embedded/qvfbhdr.h                         | 26 ++++----
 src/gui/embedded/qwindowsystem_p.h                 | 26 ++++----
 src/gui/embedded/qwindowsystem_qws.cpp             | 26 ++++----
 src/gui/embedded/qwindowsystem_qws.h               | 26 ++++----
 src/gui/embedded/qwscommand_qws.cpp                | 26 ++++----
 src/gui/embedded/qwscommand_qws_p.h                | 26 ++++----
 src/gui/embedded/qwscursor_qws.cpp                 | 26 ++++----
 src/gui/embedded/qwscursor_qws.h                   | 26 ++++----
 src/gui/embedded/qwsdisplay_qws.h                  | 26 ++++----
 src/gui/embedded/qwsdisplay_qws_p.h                | 26 ++++----
 src/gui/embedded/qwsembedwidget.cpp                | 26 ++++----
 src/gui/embedded/qwsembedwidget.h                  | 26 ++++----
 src/gui/embedded/qwsevent_qws.cpp                  | 26 ++++----
 src/gui/embedded/qwsevent_qws.h                    | 26 ++++----
 src/gui/embedded/qwslock.cpp                       | 26 ++++----
 src/gui/embedded/qwslock_p.h                       | 26 ++++----
 src/gui/embedded/qwsmanager_p.h                    | 26 ++++----
 src/gui/embedded/qwsmanager_qws.cpp                | 26 ++++----
 src/gui/embedded/qwsmanager_qws.h                  | 26 ++++----
 src/gui/embedded/qwsproperty_qws.cpp               | 26 ++++----
 src/gui/embedded/qwsproperty_qws.h                 | 26 ++++----
 src/gui/embedded/qwsprotocolitem_qws.h             | 26 ++++----
 src/gui/embedded/qwssharedmemory.cpp               | 26 ++++----
 src/gui/embedded/qwssharedmemory_p.h               | 26 ++++----
 src/gui/embedded/qwssignalhandler.cpp              | 26 ++++----
 src/gui/embedded/qwssignalhandler_p.h              | 26 ++++----
 src/gui/embedded/qwssocket_qws.cpp                 | 26 ++++----
 src/gui/embedded/qwssocket_qws.h                   | 26 ++++----
 src/gui/embedded/qwsutils_qws.h                    | 26 ++++----
 src/gui/graphicsview/qgraph_p.h                    | 26 ++++----
 src/gui/graphicsview/qgraphicsanchorlayout.cpp     | 26 ++++----
 src/gui/graphicsview/qgraphicsanchorlayout.h       | 26 ++++----
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp   | 26 ++++----
 src/gui/graphicsview/qgraphicsanchorlayout_p.h     | 26 ++++----
 src/gui/graphicsview/qgraphicsgridlayout.cpp       | 26 ++++----
 src/gui/graphicsview/qgraphicsgridlayout.h         | 26 ++++----
 src/gui/graphicsview/qgraphicsitem.cpp             | 26 ++++----
 src/gui/graphicsview/qgraphicsitem.h               | 26 ++++----
 src/gui/graphicsview/qgraphicsitem_p.h             | 26 ++++----
 src/gui/graphicsview/qgraphicsitemanimation.cpp    | 26 ++++----
 src/gui/graphicsview/qgraphicsitemanimation.h      | 26 ++++----
 src/gui/graphicsview/qgraphicslayout.cpp           | 26 ++++----
 src/gui/graphicsview/qgraphicslayout.h             | 26 ++++----
 src/gui/graphicsview/qgraphicslayout_p.cpp         | 26 ++++----
 src/gui/graphicsview/qgraphicslayout_p.h           | 26 ++++----
 src/gui/graphicsview/qgraphicslayoutitem.cpp       | 26 ++++----
 src/gui/graphicsview/qgraphicslayoutitem.h         | 26 ++++----
 src/gui/graphicsview/qgraphicslayoutitem_p.h       | 26 ++++----
 src/gui/graphicsview/qgraphicslinearlayout.cpp     | 26 ++++----
 src/gui/graphicsview/qgraphicslinearlayout.h       | 26 ++++----
 src/gui/graphicsview/qgraphicsproxywidget.cpp      | 26 ++++----
 src/gui/graphicsview/qgraphicsproxywidget.h        | 26 ++++----
 src/gui/graphicsview/qgraphicsproxywidget_p.h      | 26 ++++----
 src/gui/graphicsview/qgraphicsscene.cpp            | 26 ++++----
 src/gui/graphicsview/qgraphicsscene.h              | 26 ++++----
 src/gui/graphicsview/qgraphicsscene_bsp.cpp        | 26 ++++----
 src/gui/graphicsview/qgraphicsscene_bsp_p.h        | 26 ++++----
 src/gui/graphicsview/qgraphicsscene_p.h            | 26 ++++----
 .../graphicsview/qgraphicsscenebsptreeindex.cpp    | 26 ++++----
 .../graphicsview/qgraphicsscenebsptreeindex_p.h    | 26 ++++----
 src/gui/graphicsview/qgraphicssceneevent.cpp       | 26 ++++----
 src/gui/graphicsview/qgraphicssceneevent.h         | 26 ++++----
 src/gui/graphicsview/qgraphicssceneindex.cpp       | 26 ++++----
 src/gui/graphicsview/qgraphicssceneindex_p.h       | 26 ++++----
 src/gui/graphicsview/qgraphicsscenelinearindex.cpp | 26 ++++----
 src/gui/graphicsview/qgraphicsscenelinearindex_p.h | 26 ++++----
 src/gui/graphicsview/qgraphicstransform.cpp        | 26 ++++----
 src/gui/graphicsview/qgraphicstransform.h          | 26 ++++----
 src/gui/graphicsview/qgraphicstransform_p.h        | 26 ++++----
 src/gui/graphicsview/qgraphicsview.cpp             | 26 ++++----
 src/gui/graphicsview/qgraphicsview.h               | 26 ++++----
 src/gui/graphicsview/qgraphicsview_p.h             | 26 ++++----
 src/gui/graphicsview/qgraphicswidget.cpp           | 26 ++++----
 src/gui/graphicsview/qgraphicswidget.h             | 26 ++++----
 src/gui/graphicsview/qgraphicswidget_p.cpp         | 26 ++++----
 src/gui/graphicsview/qgraphicswidget_p.h           | 26 ++++----
 src/gui/graphicsview/qgridlayoutengine.cpp         | 26 ++++----
 src/gui/graphicsview/qgridlayoutengine_p.h         | 26 ++++----
 src/gui/graphicsview/qsimplex_p.cpp                | 26 ++++----
 src/gui/graphicsview/qsimplex_p.h                  | 26 ++++----
 src/gui/image/qbitmap.cpp                          | 26 ++++----
 src/gui/image/qbitmap.h                            | 26 ++++----
 src/gui/image/qbmphandler.cpp                      | 26 ++++----
 src/gui/image/qbmphandler_p.h                      | 26 ++++----
 src/gui/image/qgifhandler.cpp                      | 26 ++++----
 src/gui/image/qgifhandler_p.h                      | 26 ++++----
 src/gui/image/qicon.cpp                            | 26 ++++----
 src/gui/image/qicon.h                              | 26 ++++----
 src/gui/image/qicon_p.h                            | 26 ++++----
 src/gui/image/qiconengine.cpp                      | 26 ++++----
 src/gui/image/qiconengine.h                        | 26 ++++----
 src/gui/image/qiconengineplugin.cpp                | 26 ++++----
 src/gui/image/qiconengineplugin.h                  | 26 ++++----
 src/gui/image/qiconloader.cpp                      | 26 ++++----
 src/gui/image/qiconloader_p.h                      | 26 ++++----
 src/gui/image/qimage.cpp                           | 26 ++++----
 src/gui/image/qimage.h                             | 26 ++++----
 src/gui/image/qimage_neon.cpp                      | 26 ++++----
 src/gui/image/qimage_p.h                           | 26 ++++----
 src/gui/image/qimage_sse2.cpp                      | 26 ++++----
 src/gui/image/qimage_ssse3.cpp                     | 26 ++++----
 src/gui/image/qimageiohandler.cpp                  | 26 ++++----
 src/gui/image/qimageiohandler.h                    | 26 ++++----
 src/gui/image/qimagepixmapcleanuphooks.cpp         | 26 ++++----
 src/gui/image/qimagepixmapcleanuphooks_p.h         | 26 ++++----
 src/gui/image/qimagereader.cpp                     | 26 ++++----
 src/gui/image/qimagereader.h                       | 26 ++++----
 src/gui/image/qimagewriter.cpp                     | 26 ++++----
 src/gui/image/qimagewriter.h                       | 26 ++++----
 src/gui/image/qjpeghandler.cpp                     | 26 ++++----
 src/gui/image/qjpeghandler_p.h                     | 26 ++++----
 src/gui/image/qmnghandler.cpp                      | 26 ++++----
 src/gui/image/qmnghandler_p.h                      | 26 ++++----
 src/gui/image/qmovie.cpp                           | 26 ++++----
 src/gui/image/qmovie.h                             | 26 ++++----
 src/gui/image/qnativeimage.cpp                     | 26 ++++----
 src/gui/image/qnativeimage_p.h                     | 26 ++++----
 src/gui/image/qpaintengine_pic.cpp                 | 26 ++++----
 src/gui/image/qpaintengine_pic_p.h                 | 26 ++++----
 src/gui/image/qpicture.cpp                         | 26 ++++----
 src/gui/image/qpicture.h                           | 26 ++++----
 src/gui/image/qpicture_p.h                         | 26 ++++----
 src/gui/image/qpictureformatplugin.cpp             | 26 ++++----
 src/gui/image/qpictureformatplugin.h               | 26 ++++----
 src/gui/image/qpixmap.cpp                          | 26 ++++----
 src/gui/image/qpixmap.h                            | 26 ++++----
 src/gui/image/qpixmap_mac.cpp                      | 26 ++++----
 src/gui/image/qpixmap_mac_p.h                      | 26 ++++----
 src/gui/image/qpixmap_qws.cpp                      | 26 ++++----
 src/gui/image/qpixmap_raster.cpp                   | 26 ++++----
 src/gui/image/qpixmap_raster_p.h                   | 26 ++++----
 src/gui/image/qpixmap_s60.cpp                      | 26 ++++----
 src/gui/image/qpixmap_s60_p.h                      | 26 ++++----
 src/gui/image/qpixmap_win.cpp                      | 26 ++++----
 src/gui/image/qpixmap_x11.cpp                      | 26 ++++----
 src/gui/image/qpixmap_x11_p.h                      | 26 ++++----
 src/gui/image/qpixmapcache.cpp                     | 26 ++++----
 src/gui/image/qpixmapcache.h                       | 26 ++++----
 src/gui/image/qpixmapcache_p.h                     | 26 ++++----
 src/gui/image/qpixmapdata.cpp                      | 26 ++++----
 src/gui/image/qpixmapdata_p.h                      | 26 ++++----
 src/gui/image/qpixmapdatafactory.cpp               | 26 ++++----
 src/gui/image/qpixmapdatafactory_p.h               | 26 ++++----
 src/gui/image/qpixmapfilter.cpp                    | 26 ++++----
 src/gui/image/qpixmapfilter_p.h                    | 26 ++++----
 src/gui/image/qpnghandler.cpp                      | 26 ++++----
 src/gui/image/qpnghandler_p.h                      | 26 ++++----
 src/gui/image/qppmhandler.cpp                      | 26 ++++----
 src/gui/image/qppmhandler_p.h                      | 26 ++++----
 src/gui/image/qtiffhandler.cpp                     | 26 ++++----
 src/gui/image/qtiffhandler_p.h                     | 26 ++++----
 src/gui/image/qxbmhandler.cpp                      | 26 ++++----
 src/gui/image/qxbmhandler_p.h                      | 26 ++++----
 src/gui/image/qxpmhandler.cpp                      | 26 ++++----
 src/gui/image/qxpmhandler_p.h                      | 26 ++++----
 src/gui/inputmethod/qcoefepinputcontext_p.h        | 26 ++++----
 src/gui/inputmethod/qcoefepinputcontext_s60.cpp    | 26 ++++----
 src/gui/inputmethod/qinputcontext.cpp              | 26 ++++----
 src/gui/inputmethod/qinputcontext.h                | 26 ++++----
 src/gui/inputmethod/qinputcontext_p.h              | 26 ++++----
 src/gui/inputmethod/qinputcontextfactory.cpp       | 26 ++++----
 src/gui/inputmethod/qinputcontextfactory.h         | 26 ++++----
 src/gui/inputmethod/qinputcontextplugin.cpp        | 26 ++++----
 src/gui/inputmethod/qinputcontextplugin.h          | 26 ++++----
 src/gui/inputmethod/qmacinputcontext_mac.cpp       | 26 ++++----
 src/gui/inputmethod/qmacinputcontext_p.h           | 26 ++++----
 src/gui/inputmethod/qwininputcontext_p.h           | 26 ++++----
 src/gui/inputmethod/qwininputcontext_win.cpp       | 26 ++++----
 src/gui/inputmethod/qwsinputcontext_p.h            | 26 ++++----
 src/gui/inputmethod/qwsinputcontext_qws.cpp        | 26 ++++----
 src/gui/inputmethod/qximinputcontext_p.h           | 26 ++++----
 src/gui/inputmethod/qximinputcontext_x11.cpp       | 26 ++++----
 src/gui/itemviews/qabstractitemdelegate.cpp        | 26 ++++----
 src/gui/itemviews/qabstractitemdelegate.h          | 26 ++++----
 src/gui/itemviews/qabstractitemview.cpp            | 26 ++++----
 src/gui/itemviews/qabstractitemview.h              | 26 ++++----
 src/gui/itemviews/qabstractitemview_p.h            | 26 ++++----
 src/gui/itemviews/qabstractproxymodel.cpp          | 26 ++++----
 src/gui/itemviews/qabstractproxymodel.h            | 26 ++++----
 src/gui/itemviews/qabstractproxymodel_p.h          | 26 ++++----
 src/gui/itemviews/qbsptree.cpp                     | 26 ++++----
 src/gui/itemviews/qbsptree_p.h                     | 26 ++++----
 src/gui/itemviews/qcolumnview.cpp                  | 26 ++++----
 src/gui/itemviews/qcolumnview.h                    | 26 ++++----
 src/gui/itemviews/qcolumnview_p.h                  | 26 ++++----
 src/gui/itemviews/qcolumnviewgrip.cpp              | 26 ++++----
 src/gui/itemviews/qcolumnviewgrip_p.h              | 26 ++++----
 src/gui/itemviews/qdatawidgetmapper.cpp            | 26 ++++----
 src/gui/itemviews/qdatawidgetmapper.h              | 26 ++++----
 src/gui/itemviews/qdirmodel.cpp                    | 26 ++++----
 src/gui/itemviews/qdirmodel.h                      | 26 ++++----
 src/gui/itemviews/qfileiconprovider.cpp            | 26 ++++----
 src/gui/itemviews/qfileiconprovider.h              | 26 ++++----
 src/gui/itemviews/qheaderview.cpp                  | 26 ++++----
 src/gui/itemviews/qheaderview.h                    | 26 ++++----
 src/gui/itemviews/qheaderview_p.h                  | 26 ++++----
 src/gui/itemviews/qitemdelegate.cpp                | 26 ++++----
 src/gui/itemviews/qitemdelegate.h                  | 26 ++++----
 src/gui/itemviews/qitemeditorfactory.cpp           | 26 ++++----
 src/gui/itemviews/qitemeditorfactory.h             | 26 ++++----
 src/gui/itemviews/qitemeditorfactory_p.h           | 26 ++++----
 src/gui/itemviews/qitemselectionmodel.cpp          | 26 ++++----
 src/gui/itemviews/qitemselectionmodel.h            | 26 ++++----
 src/gui/itemviews/qitemselectionmodel_p.h          | 26 ++++----
 src/gui/itemviews/qlistview.cpp                    | 26 ++++----
 src/gui/itemviews/qlistview.h                      | 26 ++++----
 src/gui/itemviews/qlistview_p.h                    | 26 ++++----
 src/gui/itemviews/qlistwidget.cpp                  | 26 ++++----
 src/gui/itemviews/qlistwidget.h                    | 26 ++++----
 src/gui/itemviews/qlistwidget_p.h                  | 26 ++++----
 src/gui/itemviews/qproxymodel.cpp                  | 26 ++++----
 src/gui/itemviews/qproxymodel.h                    | 26 ++++----
 src/gui/itemviews/qproxymodel_p.h                  | 26 ++++----
 src/gui/itemviews/qsortfilterproxymodel.cpp        | 26 ++++----
 src/gui/itemviews/qsortfilterproxymodel.h          | 26 ++++----
 src/gui/itemviews/qstandarditemmodel.cpp           | 26 ++++----
 src/gui/itemviews/qstandarditemmodel.h             | 26 ++++----
 src/gui/itemviews/qstandarditemmodel_p.h           | 26 ++++----
 src/gui/itemviews/qstringlistmodel.cpp             | 26 ++++----
 src/gui/itemviews/qstringlistmodel.h               | 26 ++++----
 src/gui/itemviews/qstyleditemdelegate.cpp          | 26 ++++----
 src/gui/itemviews/qstyleditemdelegate.h            | 26 ++++----
 src/gui/itemviews/qtableview.cpp                   | 26 ++++----
 src/gui/itemviews/qtableview.h                     | 26 ++++----
 src/gui/itemviews/qtableview_p.h                   | 26 ++++----
 src/gui/itemviews/qtablewidget.cpp                 | 26 ++++----
 src/gui/itemviews/qtablewidget.h                   | 26 ++++----
 src/gui/itemviews/qtablewidget_p.h                 | 26 ++++----
 src/gui/itemviews/qtreeview.cpp                    | 26 ++++----
 src/gui/itemviews/qtreeview.h                      | 26 ++++----
 src/gui/itemviews/qtreeview_p.h                    | 26 ++++----
 src/gui/itemviews/qtreewidget.cpp                  | 26 ++++----
 src/gui/itemviews/qtreewidget.h                    | 26 ++++----
 src/gui/itemviews/qtreewidget_p.h                  | 26 ++++----
 src/gui/itemviews/qtreewidgetitemiterator.cpp      | 26 ++++----
 src/gui/itemviews/qtreewidgetitemiterator.h        | 26 ++++----
 src/gui/itemviews/qtreewidgetitemiterator_p.h      | 26 ++++----
 src/gui/itemviews/qwidgetitemdata_p.h              | 26 ++++----
 src/gui/kernel/qaction.cpp                         | 26 ++++----
 src/gui/kernel/qaction.h                           | 26 ++++----
 src/gui/kernel/qaction_p.h                         | 26 ++++----
 src/gui/kernel/qactiongroup.cpp                    | 26 ++++----
 src/gui/kernel/qactiongroup.h                      | 26 ++++----
 src/gui/kernel/qapplication.cpp                    | 26 ++++----
 src/gui/kernel/qapplication.h                      | 26 ++++----
 src/gui/kernel/qapplication_mac.mm                 | 26 ++++----
 src/gui/kernel/qapplication_p.h                    | 26 ++++----
 src/gui/kernel/qapplication_qws.cpp                | 26 ++++----
 src/gui/kernel/qapplication_s60.cpp                | 26 ++++----
 src/gui/kernel/qapplication_win.cpp                | 26 ++++----
 src/gui/kernel/qapplication_x11.cpp                | 26 ++++----
 src/gui/kernel/qboxlayout.cpp                      | 26 ++++----
 src/gui/kernel/qboxlayout.h                        | 26 ++++----
 src/gui/kernel/qclipboard.cpp                      | 26 ++++----
 src/gui/kernel/qclipboard.h                        | 26 ++++----
 src/gui/kernel/qclipboard_mac.cpp                  | 26 ++++----
 src/gui/kernel/qclipboard_p.h                      | 26 ++++----
 src/gui/kernel/qclipboard_qws.cpp                  | 26 ++++----
 src/gui/kernel/qclipboard_s60.cpp                  | 26 ++++----
 src/gui/kernel/qclipboard_win.cpp                  | 26 ++++----
 src/gui/kernel/qclipboard_x11.cpp                  | 26 ++++----
 src/gui/kernel/qcocoaapplication_mac.mm            | 26 ++++----
 src/gui/kernel/qcocoaapplication_mac_p.h           | 26 ++++----
 src/gui/kernel/qcocoaapplicationdelegate_mac.mm    | 26 ++++----
 src/gui/kernel/qcocoaapplicationdelegate_mac_p.h   | 26 ++++----
 src/gui/kernel/qcocoamenuloader_mac.mm             | 26 ++++----
 src/gui/kernel/qcocoamenuloader_mac_p.h            | 26 ++++----
 src/gui/kernel/qcocoapanel_mac.mm                  | 26 ++++----
 src/gui/kernel/qcocoapanel_mac_p.h                 | 26 ++++----
 src/gui/kernel/qcocoasharedwindowmethods_mac_p.h   | 26 ++++----
 src/gui/kernel/qcocoaview_mac.mm                   | 26 ++++----
 src/gui/kernel/qcocoaview_mac_p.h                  | 26 ++++----
 src/gui/kernel/qcocoawindow_mac.mm                 | 26 ++++----
 src/gui/kernel/qcocoawindow_mac_p.h                | 26 ++++----
 src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm | 26 ++++----
 .../kernel/qcocoawindowcustomthemeframe_mac_p.h    | 26 ++++----
 src/gui/kernel/qcocoawindowdelegate_mac.mm         | 26 ++++----
 src/gui/kernel/qcocoawindowdelegate_mac_p.h        | 26 ++++----
 src/gui/kernel/qcursor.cpp                         | 26 ++++----
 src/gui/kernel/qcursor.h                           | 26 ++++----
 src/gui/kernel/qcursor_mac.mm                      | 26 ++++----
 src/gui/kernel/qcursor_p.h                         | 26 ++++----
 src/gui/kernel/qcursor_qws.cpp                     | 26 ++++----
 src/gui/kernel/qcursor_s60.cpp                     | 26 ++++----
 src/gui/kernel/qcursor_win.cpp                     | 26 ++++----
 src/gui/kernel/qcursor_x11.cpp                     | 26 ++++----
 src/gui/kernel/qdesktopwidget.cpp                  | 26 ++++----
 src/gui/kernel/qdesktopwidget.h                    | 26 ++++----
 src/gui/kernel/qdesktopwidget_mac.mm               | 26 ++++----
 src/gui/kernel/qdesktopwidget_mac_p.h              | 26 ++++----
 src/gui/kernel/qdesktopwidget_qws.cpp              | 26 ++++----
 src/gui/kernel/qdesktopwidget_s60.cpp              | 26 ++++----
 src/gui/kernel/qdesktopwidget_win.cpp              | 26 ++++----
 src/gui/kernel/qdesktopwidget_x11.cpp              | 26 ++++----
 src/gui/kernel/qdnd.cpp                            | 26 ++++----
 src/gui/kernel/qdnd_mac.mm                         | 26 ++++----
 src/gui/kernel/qdnd_p.h                            | 26 ++++----
 src/gui/kernel/qdnd_qws.cpp                        | 26 ++++----
 src/gui/kernel/qdnd_s60.cpp                        | 26 ++++----
 src/gui/kernel/qdnd_win.cpp                        | 26 ++++----
 src/gui/kernel/qdnd_x11.cpp                        | 26 ++++----
 src/gui/kernel/qdrag.cpp                           | 26 ++++----
 src/gui/kernel/qdrag.h                             | 26 ++++----
 src/gui/kernel/qevent.cpp                          | 26 ++++----
 src/gui/kernel/qevent.h                            | 26 ++++----
 src/gui/kernel/qevent_p.h                          | 26 ++++----
 src/gui/kernel/qeventdispatcher_glib_qws.cpp       | 26 ++++----
 src/gui/kernel/qeventdispatcher_glib_qws_p.h       | 26 ++++----
 src/gui/kernel/qeventdispatcher_mac.mm             | 26 ++++----
 src/gui/kernel/qeventdispatcher_mac_p.h            | 26 ++++----
 src/gui/kernel/qeventdispatcher_qws.cpp            | 26 ++++----
 src/gui/kernel/qeventdispatcher_qws_p.h            | 26 ++++----
 src/gui/kernel/qeventdispatcher_s60.cpp            | 26 ++++----
 src/gui/kernel/qeventdispatcher_s60_p.h            | 26 ++++----
 src/gui/kernel/qeventdispatcher_x11.cpp            | 26 ++++----
 src/gui/kernel/qeventdispatcher_x11_p.h            | 26 ++++----
 src/gui/kernel/qformlayout.cpp                     | 26 ++++----
 src/gui/kernel/qformlayout.h                       | 26 ++++----
 src/gui/kernel/qgesture.cpp                        | 26 ++++----
 src/gui/kernel/qgesture.h                          | 26 ++++----
 src/gui/kernel/qgesture_p.h                        | 26 ++++----
 src/gui/kernel/qgesturemanager.cpp                 | 26 ++++----
 src/gui/kernel/qgesturemanager_p.h                 | 26 ++++----
 src/gui/kernel/qgesturerecognizer.cpp              | 26 ++++----
 src/gui/kernel/qgesturerecognizer.h                | 26 ++++----
 src/gui/kernel/qgridlayout.cpp                     | 26 ++++----
 src/gui/kernel/qgridlayout.h                       | 26 ++++----
 src/gui/kernel/qguieventdispatcher_glib.cpp        | 26 ++++----
 src/gui/kernel/qguieventdispatcher_glib_p.h        | 26 ++++----
 src/gui/kernel/qguifunctions_wince.cpp             | 26 ++++----
 src/gui/kernel/qguifunctions_wince.h               | 26 ++++----
 src/gui/kernel/qguiplatformplugin.cpp              | 26 ++++----
 src/gui/kernel/qguiplatformplugin_p.h              | 26 ++++----
 src/gui/kernel/qguivariant.cpp                     | 26 ++++----
 src/gui/kernel/qkde.cpp                            | 26 ++++----
 src/gui/kernel/qkde_p.h                            | 26 ++++----
 src/gui/kernel/qkeymapper.cpp                      | 26 ++++----
 src/gui/kernel/qkeymapper_mac.cpp                  | 26 ++++----
 src/gui/kernel/qkeymapper_p.h                      | 26 ++++----
 src/gui/kernel/qkeymapper_qws.cpp                  | 26 ++++----
 src/gui/kernel/qkeymapper_s60.cpp                  | 26 ++++----
 src/gui/kernel/qkeymapper_win.cpp                  | 26 ++++----
 src/gui/kernel/qkeymapper_x11.cpp                  | 26 ++++----
 src/gui/kernel/qkeymapper_x11_p.cpp                | 26 ++++----
 src/gui/kernel/qkeysequence.cpp                    | 26 ++++----
 src/gui/kernel/qkeysequence.h                      | 26 ++++----
 src/gui/kernel/qkeysequence_p.h                    | 26 ++++----
 src/gui/kernel/qlayout.cpp                         | 26 ++++----
 src/gui/kernel/qlayout.h                           | 26 ++++----
 src/gui/kernel/qlayout_p.h                         | 26 ++++----
 src/gui/kernel/qlayoutengine.cpp                   | 26 ++++----
 src/gui/kernel/qlayoutengine_p.h                   | 26 ++++----
 src/gui/kernel/qlayoutitem.cpp                     | 26 ++++----
 src/gui/kernel/qlayoutitem.h                       | 26 ++++----
 src/gui/kernel/qmacdefines_mac.h                   | 26 ++++----
 src/gui/kernel/qmacgesturerecognizer_mac.mm        | 26 ++++----
 src/gui/kernel/qmacgesturerecognizer_mac_p.h       | 26 ++++----
 src/gui/kernel/qmime.cpp                           | 26 ++++----
 src/gui/kernel/qmime.h                             | 26 ++++----
 src/gui/kernel/qmime_mac.cpp                       | 26 ++++----
 src/gui/kernel/qmime_win.cpp                       | 26 ++++----
 src/gui/kernel/qmotifdnd_x11.cpp                   | 26 ++++----
 src/gui/kernel/qmultitouch_mac.mm                  | 26 ++++----
 src/gui/kernel/qmultitouch_mac_p.h                 | 26 ++++----
 src/gui/kernel/qnsframeview_mac_p.h                | 26 ++++----
 src/gui/kernel/qnsthemeframe_mac_p.h               | 26 ++++----
 src/gui/kernel/qnstitledframe_mac_p.h              | 26 ++++----
 src/gui/kernel/qole_win.cpp                        | 26 ++++----
 src/gui/kernel/qpalette.cpp                        | 26 ++++----
 src/gui/kernel/qpalette.h                          | 26 ++++----
 src/gui/kernel/qsessionmanager.h                   | 26 ++++----
 src/gui/kernel/qsessionmanager_qws.cpp             | 26 ++++----
 src/gui/kernel/qshortcut.cpp                       | 26 ++++----
 src/gui/kernel/qshortcut.h                         | 26 ++++----
 src/gui/kernel/qshortcutmap.cpp                    | 26 ++++----
 src/gui/kernel/qshortcutmap_p.h                    | 26 ++++----
 src/gui/kernel/qsizepolicy.h                       | 26 ++++----
 src/gui/kernel/qsoftkeymanager.cpp                 | 26 ++++----
 src/gui/kernel/qsoftkeymanager_common_p.h          | 26 ++++----
 src/gui/kernel/qsoftkeymanager_p.h                 | 26 ++++----
 src/gui/kernel/qsoftkeymanager_s60.cpp             | 26 ++++----
 src/gui/kernel/qsoftkeymanager_s60_p.h             | 26 ++++----
 src/gui/kernel/qsound.cpp                          | 26 ++++----
 src/gui/kernel/qsound.h                            | 26 ++++----
 src/gui/kernel/qsound_mac.mm                       | 26 ++++----
 src/gui/kernel/qsound_p.h                          | 26 ++++----
 src/gui/kernel/qsound_qws.cpp                      | 26 ++++----
 src/gui/kernel/qsound_s60.cpp                      | 26 ++++----
 src/gui/kernel/qsound_win.cpp                      | 26 ++++----
 src/gui/kernel/qsound_x11.cpp                      | 26 ++++----
 src/gui/kernel/qstackedlayout.cpp                  | 26 ++++----
 src/gui/kernel/qstackedlayout.h                    | 26 ++++----
 src/gui/kernel/qstandardgestures.cpp               | 26 ++++----
 src/gui/kernel/qstandardgestures_p.h               | 26 ++++----
 src/gui/kernel/qt_cocoa_helpers_mac.mm             | 26 ++++----
 src/gui/kernel/qt_cocoa_helpers_mac_p.h            | 26 ++++----
 src/gui/kernel/qt_gui_pch.h                        | 26 ++++----
 src/gui/kernel/qt_mac.cpp                          | 26 ++++----
 src/gui/kernel/qt_mac_p.h                          | 26 ++++----
 src/gui/kernel/qt_s60_p.h                          | 26 ++++----
 src/gui/kernel/qt_x11_p.h                          | 26 ++++----
 src/gui/kernel/qtooltip.cpp                        | 26 ++++----
 src/gui/kernel/qtooltip.h                          | 26 ++++----
 src/gui/kernel/qwhatsthis.cpp                      | 26 ++++----
 src/gui/kernel/qwhatsthis.h                        | 26 ++++----
 src/gui/kernel/qwidget.cpp                         | 26 ++++----
 src/gui/kernel/qwidget.h                           | 26 ++++----
 src/gui/kernel/qwidget_mac.mm                      | 26 ++++----
 src/gui/kernel/qwidget_p.h                         | 26 ++++----
 src/gui/kernel/qwidget_qws.cpp                     | 26 ++++----
 src/gui/kernel/qwidget_s60.cpp                     | 26 ++++----
 src/gui/kernel/qwidget_win.cpp                     | 26 ++++----
 src/gui/kernel/qwidget_wince.cpp                   | 26 ++++----
 src/gui/kernel/qwidget_x11.cpp                     | 26 ++++----
 src/gui/kernel/qwidgetaction.cpp                   | 26 ++++----
 src/gui/kernel/qwidgetaction.h                     | 26 ++++----
 src/gui/kernel/qwidgetaction_p.h                   | 26 ++++----
 src/gui/kernel/qwidgetcreate_x11.cpp               | 26 ++++----
 src/gui/kernel/qwindowdefs.h                       | 26 ++++----
 src/gui/kernel/qwindowdefs_win.h                   | 26 ++++----
 .../kernel/qwinnativepangesturerecognizer_win.cpp  | 26 ++++----
 .../kernel/qwinnativepangesturerecognizer_win_p.h  | 26 ++++----
 src/gui/kernel/qx11embed_x11.cpp                   | 26 ++++----
 src/gui/kernel/qx11embed_x11.h                     | 26 ++++----
 src/gui/kernel/qx11info_x11.cpp                    | 26 ++++----
 src/gui/kernel/qx11info_x11.h                      | 26 ++++----
 src/gui/math3d/qgenericmatrix.cpp                  | 26 ++++----
 src/gui/math3d/qgenericmatrix.h                    | 26 ++++----
 src/gui/math3d/qmatrix4x4.cpp                      | 26 ++++----
 src/gui/math3d/qmatrix4x4.h                        | 26 ++++----
 src/gui/math3d/qquaternion.cpp                     | 26 ++++----
 src/gui/math3d/qquaternion.h                       | 26 ++++----
 src/gui/math3d/qvector2d.cpp                       | 26 ++++----
 src/gui/math3d/qvector2d.h                         | 26 ++++----
 src/gui/math3d/qvector3d.cpp                       | 26 ++++----
 src/gui/math3d/qvector3d.h                         | 26 ++++----
 src/gui/math3d/qvector4d.cpp                       | 26 ++++----
 src/gui/math3d/qvector4d.h                         | 26 ++++----
 src/gui/painting/makepsheader.pl                   | 26 ++++----
 src/gui/painting/qbackingstore.cpp                 | 26 ++++----
 src/gui/painting/qbackingstore_p.h                 | 26 ++++----
 src/gui/painting/qbezier.cpp                       | 26 ++++----
 src/gui/painting/qbezier_p.h                       | 26 ++++----
 src/gui/painting/qblendfunctions.cpp               | 26 ++++----
 src/gui/painting/qblendfunctions_armv6_rvct.s      | 26 ++++----
 src/gui/painting/qblendfunctions_p.h               | 26 ++++----
 src/gui/painting/qbrush.cpp                        | 26 ++++----
 src/gui/painting/qbrush.h                          | 26 ++++----
 src/gui/painting/qcolor.cpp                        | 26 ++++----
 src/gui/painting/qcolor.h                          | 26 ++++----
 src/gui/painting/qcolor_p.cpp                      | 26 ++++----
 src/gui/painting/qcolor_p.h                        | 26 ++++----
 src/gui/painting/qcolormap.h                       | 26 ++++----
 src/gui/painting/qcolormap_mac.cpp                 | 26 ++++----
 src/gui/painting/qcolormap_qws.cpp                 | 26 ++++----
 src/gui/painting/qcolormap_s60.cpp                 | 26 ++++----
 src/gui/painting/qcolormap_win.cpp                 | 26 ++++----
 src/gui/painting/qcolormap_x11.cpp                 | 26 ++++----
 src/gui/painting/qcssutil.cpp                      | 26 ++++----
 src/gui/painting/qcssutil_p.h                      | 26 ++++----
 src/gui/painting/qcups.cpp                         | 26 ++++----
 src/gui/painting/qcups_p.h                         | 26 ++++----
 src/gui/painting/qdatabuffer_p.h                   | 26 ++++----
 src/gui/painting/qdrawhelper.cpp                   | 26 ++++----
 src/gui/painting/qdrawhelper_armv6_p.h             | 26 ++++----
 src/gui/painting/qdrawhelper_armv6_rvct.inc        | 26 ++++----
 src/gui/painting/qdrawhelper_armv6_rvct.s          | 26 ++++----
 src/gui/painting/qdrawhelper_iwmmxt.cpp            | 26 ++++----
 src/gui/painting/qdrawhelper_mmx.cpp               | 26 ++++----
 src/gui/painting/qdrawhelper_mmx3dnow.cpp          | 26 ++++----
 src/gui/painting/qdrawhelper_mmx_p.h               | 26 ++++----
 src/gui/painting/qdrawhelper_neon.cpp              | 26 ++++----
 src/gui/painting/qdrawhelper_neon_asm.S            | 26 ++++----
 src/gui/painting/qdrawhelper_neon_p.h              | 26 ++++----
 src/gui/painting/qdrawhelper_p.h                   | 26 ++++----
 src/gui/painting/qdrawhelper_sse.cpp               | 26 ++++----
 src/gui/painting/qdrawhelper_sse2.cpp              | 26 ++++----
 src/gui/painting/qdrawhelper_sse3dnow.cpp          | 26 ++++----
 src/gui/painting/qdrawhelper_sse_p.h               | 26 ++++----
 src/gui/painting/qdrawhelper_ssse3.cpp             | 26 ++++----
 src/gui/painting/qdrawhelper_x86_p.h               | 26 ++++----
 src/gui/painting/qdrawingprimitive_sse2_p.h        | 26 ++++----
 src/gui/painting/qdrawutil.cpp                     | 26 ++++----
 src/gui/painting/qdrawutil.h                       | 26 ++++----
 src/gui/painting/qemulationpaintengine.cpp         | 26 ++++----
 src/gui/painting/qemulationpaintengine_p.h         | 26 ++++----
 src/gui/painting/qfixed_p.h                        | 26 ++++----
 src/gui/painting/qgraphicssystem.cpp               | 26 ++++----
 src/gui/painting/qgraphicssystem_mac.cpp           | 26 ++++----
 src/gui/painting/qgraphicssystem_mac_p.h           | 26 ++++----
 src/gui/painting/qgraphicssystem_p.h               | 26 ++++----
 src/gui/painting/qgraphicssystem_qws.cpp           | 26 ++++----
 src/gui/painting/qgraphicssystem_qws_p.h           | 26 ++++----
 src/gui/painting/qgraphicssystem_raster.cpp        | 26 ++++----
 src/gui/painting/qgraphicssystem_raster_p.h        | 26 ++++----
 src/gui/painting/qgraphicssystem_runtime.cpp       | 26 ++++----
 src/gui/painting/qgraphicssystem_runtime_p.h       | 26 ++++----
 src/gui/painting/qgraphicssystemfactory.cpp        | 26 ++++----
 src/gui/painting/qgraphicssystemfactory_p.h        | 26 ++++----
 src/gui/painting/qgraphicssystemplugin.cpp         | 26 ++++----
 src/gui/painting/qgraphicssystemplugin_p.h         | 26 ++++----
 src/gui/painting/qgrayraster.c                     | 26 ++++----
 src/gui/painting/qgrayraster_p.h                   | 26 ++++----
 src/gui/painting/qimagescale.cpp                   | 26 ++++----
 src/gui/painting/qimagescale_p.h                   | 26 ++++----
 src/gui/painting/qmath_p.h                         | 26 ++++----
 src/gui/painting/qmatrix.cpp                       | 26 ++++----
 src/gui/painting/qmatrix.h                         | 26 ++++----
 src/gui/painting/qmemrotate.cpp                    | 26 ++++----
 src/gui/painting/qmemrotate_p.h                    | 26 ++++----
 src/gui/painting/qoutlinemapper.cpp                | 26 ++++----
 src/gui/painting/qoutlinemapper_p.h                | 26 ++++----
 src/gui/painting/qpaintbuffer.cpp                  | 26 ++++----
 src/gui/painting/qpaintbuffer_p.h                  | 26 ++++----
 src/gui/painting/qpaintdevice.cpp                  | 26 ++++----
 src/gui/painting/qpaintdevice.h                    | 26 ++++----
 src/gui/painting/qpaintdevice_mac.cpp              | 26 ++++----
 src/gui/painting/qpaintdevice_qws.cpp              | 26 ++++----
 src/gui/painting/qpaintdevice_win.cpp              | 26 ++++----
 src/gui/painting/qpaintdevice_x11.cpp              | 26 ++++----
 src/gui/painting/qpaintengine.cpp                  | 26 ++++----
 src/gui/painting/qpaintengine.h                    | 26 ++++----
 src/gui/painting/qpaintengine_alpha.cpp            | 26 ++++----
 src/gui/painting/qpaintengine_alpha_p.h            | 26 ++++----
 src/gui/painting/qpaintengine_mac.cpp              | 26 ++++----
 src/gui/painting/qpaintengine_mac_p.h              | 26 ++++----
 src/gui/painting/qpaintengine_p.h                  | 26 ++++----
 src/gui/painting/qpaintengine_preview.cpp          | 26 ++++----
 src/gui/painting/qpaintengine_preview_p.h          | 26 ++++----
 src/gui/painting/qpaintengine_raster.cpp           | 26 ++++----
 src/gui/painting/qpaintengine_raster_p.h           | 26 ++++----
 src/gui/painting/qpaintengine_s60.cpp              | 26 ++++----
 src/gui/painting/qpaintengine_s60_p.h              | 26 ++++----
 src/gui/painting/qpaintengine_x11.cpp              | 26 ++++----
 src/gui/painting/qpaintengine_x11_p.h              | 26 ++++----
 src/gui/painting/qpaintengineex.cpp                | 26 ++++----
 src/gui/painting/qpaintengineex_p.h                | 26 ++++----
 src/gui/painting/qpainter.cpp                      | 26 ++++----
 src/gui/painting/qpainter.h                        | 26 ++++----
 src/gui/painting/qpainter_p.h                      | 26 ++++----
 src/gui/painting/qpainterpath.cpp                  | 26 ++++----
 src/gui/painting/qpainterpath.h                    | 26 ++++----
 src/gui/painting/qpainterpath_p.h                  | 26 ++++----
 src/gui/painting/qpathclipper.cpp                  | 26 ++++----
 src/gui/painting/qpathclipper_p.h                  | 26 ++++----
 src/gui/painting/qpdf.cpp                          | 26 ++++----
 src/gui/painting/qpdf_p.h                          | 26 ++++----
 src/gui/painting/qpen.cpp                          | 26 ++++----
 src/gui/painting/qpen.h                            | 26 ++++----
 src/gui/painting/qpen_p.h                          | 26 ++++----
 src/gui/painting/qpolygon.cpp                      | 26 ++++----
 src/gui/painting/qpolygon.h                        | 26 ++++----
 src/gui/painting/qpolygonclipper_p.h               | 26 ++++----
 src/gui/painting/qprintengine.h                    | 26 ++++----
 src/gui/painting/qprintengine_mac.mm               | 26 ++++----
 src/gui/painting/qprintengine_mac_p.h              | 26 ++++----
 src/gui/painting/qprintengine_pdf.cpp              | 26 ++++----
 src/gui/painting/qprintengine_pdf_p.h              | 26 ++++----
 src/gui/painting/qprintengine_ps.cpp               | 26 ++++----
 src/gui/painting/qprintengine_ps_p.h               | 26 ++++----
 src/gui/painting/qprintengine_qws.cpp              | 26 ++++----
 src/gui/painting/qprintengine_qws_p.h              | 26 ++++----
 src/gui/painting/qprintengine_win.cpp              | 26 ++++----
 src/gui/painting/qprintengine_win_p.h              | 26 ++++----
 src/gui/painting/qprinter.cpp                      | 26 ++++----
 src/gui/painting/qprinter.h                        | 26 ++++----
 src/gui/painting/qprinter_p.h                      | 26 ++++----
 src/gui/painting/qprinterinfo.h                    | 26 ++++----
 src/gui/painting/qprinterinfo_mac.cpp              | 26 ++++----
 src/gui/painting/qprinterinfo_unix.cpp             | 26 ++++----
 src/gui/painting/qprinterinfo_unix_p.h             | 26 ++++----
 src/gui/painting/qprinterinfo_win.cpp              | 26 ++++----
 src/gui/painting/qrasterdefs_p.h                   | 26 ++++----
 src/gui/painting/qrasterizer.cpp                   | 26 ++++----
 src/gui/painting/qrasterizer_p.h                   | 26 ++++----
 src/gui/painting/qregion.cpp                       | 26 ++++----
 src/gui/painting/qregion.h                         | 26 ++++----
 src/gui/painting/qregion_mac.cpp                   | 26 ++++----
 src/gui/painting/qregion_qws.cpp                   | 26 ++++----
 src/gui/painting/qregion_s60.cpp                   | 26 ++++----
 src/gui/painting/qregion_win.cpp                   | 26 ++++----
 src/gui/painting/qregion_x11.cpp                   | 26 ++++----
 src/gui/painting/qrgb.h                            | 26 ++++----
 src/gui/painting/qstroker.cpp                      | 26 ++++----
 src/gui/painting/qstroker_p.h                      | 26 ++++----
 src/gui/painting/qstylepainter.cpp                 | 26 ++++----
 src/gui/painting/qstylepainter.h                   | 26 ++++----
 src/gui/painting/qtessellator.cpp                  | 26 ++++----
 src/gui/painting/qtessellator_p.h                  | 26 ++++----
 src/gui/painting/qtextureglyphcache.cpp            | 26 ++++----
 src/gui/painting/qtextureglyphcache_p.h            | 26 ++++----
 src/gui/painting/qtransform.cpp                    | 26 ++++----
 src/gui/painting/qtransform.h                      | 26 ++++----
 src/gui/painting/qvectorpath_p.h                   | 26 ++++----
 src/gui/painting/qwindowsurface.cpp                | 26 ++++----
 src/gui/painting/qwindowsurface_mac.cpp            | 26 ++++----
 src/gui/painting/qwindowsurface_mac_p.h            | 26 ++++----
 src/gui/painting/qwindowsurface_p.h                | 26 ++++----
 src/gui/painting/qwindowsurface_qws.cpp            | 26 ++++----
 src/gui/painting/qwindowsurface_qws_p.h            | 26 ++++----
 src/gui/painting/qwindowsurface_raster.cpp         | 26 ++++----
 src/gui/painting/qwindowsurface_raster_p.h         | 26 ++++----
 src/gui/painting/qwindowsurface_s60.cpp            | 26 ++++----
 src/gui/painting/qwindowsurface_s60_p.h            | 26 ++++----
 src/gui/painting/qwindowsurface_x11.cpp            | 26 ++++----
 src/gui/painting/qwindowsurface_x11_p.h            | 26 ++++----
 src/gui/painting/qwmatrix.h                        | 26 ++++----
 src/gui/s60framework/qs60mainapplication.cpp       | 26 ++++----
 src/gui/s60framework/qs60mainapplication.h         | 26 ++++----
 src/gui/s60framework/qs60mainapplication_p.h       | 26 ++++----
 src/gui/s60framework/qs60mainappui.cpp             | 26 ++++----
 src/gui/s60framework/qs60mainappui.h               | 26 ++++----
 src/gui/s60framework/qs60maindocument.cpp          | 26 ++++----
 src/gui/s60framework/qs60maindocument.h            | 26 ++++----
 src/gui/s60framework/s60main.rss                   | 26 ++++----
 src/gui/statemachine/qbasickeyeventtransition.cpp  | 26 ++++----
 src/gui/statemachine/qbasickeyeventtransition_p.h  | 26 ++++----
 .../statemachine/qbasicmouseeventtransition.cpp    | 26 ++++----
 .../statemachine/qbasicmouseeventtransition_p.h    | 26 ++++----
 src/gui/statemachine/qguistatemachine.cpp          | 26 ++++----
 src/gui/statemachine/qkeyeventtransition.cpp       | 26 ++++----
 src/gui/statemachine/qkeyeventtransition.h         | 26 ++++----
 src/gui/statemachine/qmouseeventtransition.cpp     | 26 ++++----
 src/gui/statemachine/qmouseeventtransition.h       | 26 ++++----
 src/gui/styles/qcdestyle.cpp                       | 26 ++++----
 src/gui/styles/qcdestyle.h                         | 26 ++++----
 src/gui/styles/qcleanlooksstyle.cpp                | 26 ++++----
 src/gui/styles/qcleanlooksstyle.h                  | 26 ++++----
 src/gui/styles/qcleanlooksstyle_p.h                | 26 ++++----
 src/gui/styles/qcommonstyle.cpp                    | 26 ++++----
 src/gui/styles/qcommonstyle.h                      | 26 ++++----
 src/gui/styles/qcommonstyle_p.h                    | 26 ++++----
 src/gui/styles/qcommonstylepixmaps_p.h             | 26 ++++----
 src/gui/styles/qgtkpainter.cpp                     | 26 ++++----
 src/gui/styles/qgtkpainter_p.h                     | 26 ++++----
 src/gui/styles/qgtkstyle.cpp                       | 26 ++++----
 src/gui/styles/qgtkstyle.h                         | 26 ++++----
 src/gui/styles/qgtkstyle_p.cpp                     | 26 ++++----
 src/gui/styles/qgtkstyle_p.h                       | 26 ++++----
 src/gui/styles/qmacstyle_mac.h                     | 26 ++++----
 src/gui/styles/qmacstyle_mac.mm                    | 26 ++++----
 src/gui/styles/qmacstyle_mac_p.h                   | 26 ++++----
 src/gui/styles/qmacstylepixmaps_mac_p.h            | 26 ++++----
 src/gui/styles/qmotifstyle.cpp                     | 26 ++++----
 src/gui/styles/qmotifstyle.h                       | 26 ++++----
 src/gui/styles/qmotifstyle_p.h                     | 26 ++++----
 src/gui/styles/qplastiquestyle.cpp                 | 26 ++++----
 src/gui/styles/qplastiquestyle.h                   | 26 ++++----
 src/gui/styles/qproxystyle.cpp                     | 26 ++++----
 src/gui/styles/qproxystyle.h                       | 26 ++++----
 src/gui/styles/qproxystyle_p.h                     | 26 ++++----
 src/gui/styles/qs60style.cpp                       | 26 ++++----
 src/gui/styles/qs60style.h                         | 26 ++++----
 src/gui/styles/qs60style_p.h                       | 26 ++++----
 src/gui/styles/qs60style_s60.cpp                   | 26 ++++----
 src/gui/styles/qs60style_simulated.cpp             | 26 ++++----
 src/gui/styles/qs60style_stub.cpp                  | 26 ++++----
 src/gui/styles/qstyle.cpp                          | 26 ++++----
 src/gui/styles/qstyle.h                            | 26 ++++----
 src/gui/styles/qstyle_p.h                          | 26 ++++----
 src/gui/styles/qstylefactory.cpp                   | 26 ++++----
 src/gui/styles/qstylefactory.h                     | 26 ++++----
 src/gui/styles/qstylehelper.cpp                    | 26 ++++----
 src/gui/styles/qstylehelper_p.h                    | 26 ++++----
 src/gui/styles/qstyleoption.cpp                    | 26 ++++----
 src/gui/styles/qstyleoption.h                      | 26 ++++----
 src/gui/styles/qstyleplugin.cpp                    | 26 ++++----
 src/gui/styles/qstyleplugin.h                      | 26 ++++----
 src/gui/styles/qstylesheetstyle.cpp                | 26 ++++----
 src/gui/styles/qstylesheetstyle_default.cpp        | 26 ++++----
 src/gui/styles/qstylesheetstyle_p.h                | 26 ++++----
 src/gui/styles/qwindowscestyle.cpp                 | 26 ++++----
 src/gui/styles/qwindowscestyle.h                   | 26 ++++----
 src/gui/styles/qwindowscestyle_p.h                 | 26 ++++----
 src/gui/styles/qwindowsmobilestyle.cpp             | 26 ++++----
 src/gui/styles/qwindowsmobilestyle.h               | 26 ++++----
 src/gui/styles/qwindowsmobilestyle_p.h             | 26 ++++----
 src/gui/styles/qwindowsstyle.cpp                   | 26 ++++----
 src/gui/styles/qwindowsstyle.h                     | 26 ++++----
 src/gui/styles/qwindowsstyle_p.h                   | 26 ++++----
 src/gui/styles/qwindowsvistastyle.cpp              | 26 ++++----
 src/gui/styles/qwindowsvistastyle.h                | 26 ++++----
 src/gui/styles/qwindowsvistastyle_p.h              | 26 ++++----
 src/gui/styles/qwindowsxpstyle.cpp                 | 26 ++++----
 src/gui/styles/qwindowsxpstyle.h                   | 26 ++++----
 src/gui/styles/qwindowsxpstyle_p.h                 | 26 ++++----
 src/gui/symbian/qsymbianevent.cpp                  | 26 ++++----
 src/gui/symbian/qsymbianevent.h                    | 26 ++++----
 src/gui/text/qabstractfontengine_p.h               | 26 ++++----
 src/gui/text/qabstractfontengine_qws.cpp           | 26 ++++----
 src/gui/text/qabstractfontengine_qws.h             | 26 ++++----
 src/gui/text/qabstracttextdocumentlayout.cpp       | 26 ++++----
 src/gui/text/qabstracttextdocumentlayout.h         | 26 ++++----
 src/gui/text/qabstracttextdocumentlayout_p.h       | 26 ++++----
 src/gui/text/qcssparser.cpp                        | 26 ++++----
 src/gui/text/qcssparser_p.h                        | 26 ++++----
 src/gui/text/qcssscanner.cpp                       | 26 ++++----
 src/gui/text/qfont.cpp                             | 26 ++++----
 src/gui/text/qfont.h                               | 26 ++++----
 src/gui/text/qfont_mac.cpp                         | 26 ++++----
 src/gui/text/qfont_p.h                             | 26 ++++----
 src/gui/text/qfont_qws.cpp                         | 26 ++++----
 src/gui/text/qfont_s60.cpp                         | 26 ++++----
 src/gui/text/qfont_win.cpp                         | 26 ++++----
 src/gui/text/qfont_x11.cpp                         | 26 ++++----
 src/gui/text/qfontdatabase.cpp                     | 26 ++++----
 src/gui/text/qfontdatabase.h                       | 26 ++++----
 src/gui/text/qfontdatabase_mac.cpp                 | 26 ++++----
 src/gui/text/qfontdatabase_qws.cpp                 | 26 ++++----
 src/gui/text/qfontdatabase_s60.cpp                 | 26 ++++----
 src/gui/text/qfontdatabase_win.cpp                 | 26 ++++----
 src/gui/text/qfontdatabase_x11.cpp                 | 26 ++++----
 src/gui/text/qfontengine.cpp                       | 26 ++++----
 src/gui/text/qfontengine_ft.cpp                    | 26 ++++----
 src/gui/text/qfontengine_ft_p.h                    | 26 ++++----
 src/gui/text/qfontengine_mac.mm                    | 26 ++++----
 src/gui/text/qfontengine_p.h                       | 26 ++++----
 src/gui/text/qfontengine_qpf.cpp                   | 26 ++++----
 src/gui/text/qfontengine_qpf_p.h                   | 26 ++++----
 src/gui/text/qfontengine_qws.cpp                   | 26 ++++----
 src/gui/text/qfontengine_s60.cpp                   | 26 ++++----
 src/gui/text/qfontengine_s60_p.h                   | 26 ++++----
 src/gui/text/qfontengine_win.cpp                   | 26 ++++----
 src/gui/text/qfontengine_win_p.h                   | 26 ++++----
 src/gui/text/qfontengine_x11.cpp                   | 26 ++++----
 src/gui/text/qfontengine_x11_p.h                   | 26 ++++----
 src/gui/text/qfontengineglyphcache_p.h             | 26 ++++----
 src/gui/text/qfontinfo.h                           | 26 ++++----
 src/gui/text/qfontmetrics.cpp                      | 26 ++++----
 src/gui/text/qfontmetrics.h                        | 26 ++++----
 src/gui/text/qfontsubset.cpp                       | 26 ++++----
 src/gui/text/qfontsubset_p.h                       | 26 ++++----
 src/gui/text/qfragmentmap.cpp                      | 26 ++++----
 src/gui/text/qfragmentmap_p.h                      | 26 ++++----
 src/gui/text/qpfutil.cpp                           | 26 ++++----
 src/gui/text/qstatictext.cpp                       | 26 ++++----
 src/gui/text/qstatictext.h                         | 26 ++++----
 src/gui/text/qstatictext_p.h                       | 26 ++++----
 src/gui/text/qsyntaxhighlighter.cpp                | 26 ++++----
 src/gui/text/qsyntaxhighlighter.h                  | 26 ++++----
 src/gui/text/qtextcontrol.cpp                      | 26 ++++----
 src/gui/text/qtextcontrol_p.h                      | 26 ++++----
 src/gui/text/qtextcontrol_p_p.h                    | 26 ++++----
 src/gui/text/qtextcursor.cpp                       | 26 ++++----
 src/gui/text/qtextcursor.h                         | 26 ++++----
 src/gui/text/qtextcursor_p.h                       | 26 ++++----
 src/gui/text/qtextdocument.cpp                     | 26 ++++----
 src/gui/text/qtextdocument.h                       | 26 ++++----
 src/gui/text/qtextdocument_p.cpp                   | 26 ++++----
 src/gui/text/qtextdocument_p.h                     | 26 ++++----
 src/gui/text/qtextdocumentfragment.cpp             | 26 ++++----
 src/gui/text/qtextdocumentfragment.h               | 26 ++++----
 src/gui/text/qtextdocumentfragment_p.h             | 26 ++++----
 src/gui/text/qtextdocumentlayout.cpp               | 26 ++++----
 src/gui/text/qtextdocumentlayout_p.h               | 26 ++++----
 src/gui/text/qtextdocumentwriter.cpp               | 26 ++++----
 src/gui/text/qtextdocumentwriter.h                 | 26 ++++----
 src/gui/text/qtextengine.cpp                       | 26 ++++----
 src/gui/text/qtextengine_mac.cpp                   | 26 ++++----
 src/gui/text/qtextengine_p.h                       | 26 ++++----
 src/gui/text/qtextformat.cpp                       | 26 ++++----
 src/gui/text/qtextformat.h                         | 26 ++++----
 src/gui/text/qtextformat_p.h                       | 26 ++++----
 src/gui/text/qtexthtmlparser.cpp                   | 26 ++++----
 src/gui/text/qtexthtmlparser_p.h                   | 26 ++++----
 src/gui/text/qtextimagehandler.cpp                 | 26 ++++----
 src/gui/text/qtextimagehandler_p.h                 | 26 ++++----
 src/gui/text/qtextlayout.cpp                       | 26 ++++----
 src/gui/text/qtextlayout.h                         | 26 ++++----
 src/gui/text/qtextlist.cpp                         | 26 ++++----
 src/gui/text/qtextlist.h                           | 26 ++++----
 src/gui/text/qtextobject.cpp                       | 26 ++++----
 src/gui/text/qtextobject.h                         | 26 ++++----
 src/gui/text/qtextobject_p.h                       | 26 ++++----
 src/gui/text/qtextodfwriter.cpp                    | 26 ++++----
 src/gui/text/qtextodfwriter_p.h                    | 26 ++++----
 src/gui/text/qtextoption.cpp                       | 26 ++++----
 src/gui/text/qtextoption.h                         | 26 ++++----
 src/gui/text/qtexttable.cpp                        | 26 ++++----
 src/gui/text/qtexttable.h                          | 26 ++++----
 src/gui/text/qtexttable_p.h                        | 26 ++++----
 src/gui/text/qzip.cpp                              | 26 ++++----
 src/gui/text/qzipreader_p.h                        | 26 ++++----
 src/gui/text/qzipwriter_p.h                        | 26 ++++----
 src/gui/util/qcompleter.cpp                        | 26 ++++----
 src/gui/util/qcompleter.h                          | 26 ++++----
 src/gui/util/qcompleter_p.h                        | 26 ++++----
 src/gui/util/qdesktopservices.cpp                  | 26 ++++----
 src/gui/util/qdesktopservices.h                    | 26 ++++----
 src/gui/util/qdesktopservices_mac.cpp              | 26 ++++----
 src/gui/util/qdesktopservices_qws.cpp              | 26 ++++----
 src/gui/util/qdesktopservices_s60.cpp              | 26 ++++----
 src/gui/util/qdesktopservices_win.cpp              | 26 ++++----
 src/gui/util/qdesktopservices_x11.cpp              | 26 ++++----
 src/gui/util/qsystemtrayicon.cpp                   | 26 ++++----
 src/gui/util/qsystemtrayicon.h                     | 26 ++++----
 src/gui/util/qsystemtrayicon_mac.mm                | 26 ++++----
 src/gui/util/qsystemtrayicon_p.h                   | 26 ++++----
 src/gui/util/qsystemtrayicon_qws.cpp               | 26 ++++----
 src/gui/util/qsystemtrayicon_win.cpp               | 26 ++++----
 src/gui/util/qsystemtrayicon_wince.cpp             | 26 ++++----
 src/gui/util/qsystemtrayicon_x11.cpp               | 26 ++++----
 src/gui/util/qundogroup.cpp                        | 26 ++++----
 src/gui/util/qundogroup.h                          | 26 ++++----
 src/gui/util/qundostack.cpp                        | 26 ++++----
 src/gui/util/qundostack.h                          | 26 ++++----
 src/gui/util/qundostack_p.h                        | 26 ++++----
 src/gui/util/qundoview.cpp                         | 26 ++++----
 src/gui/util/qundoview.h                           | 26 ++++----
 src/gui/widgets/qabstractbutton.cpp                | 26 ++++----
 src/gui/widgets/qabstractbutton.h                  | 26 ++++----
 src/gui/widgets/qabstractbutton_p.h                | 26 ++++----
 src/gui/widgets/qabstractscrollarea.cpp            | 26 ++++----
 src/gui/widgets/qabstractscrollarea.h              | 26 ++++----
 src/gui/widgets/qabstractscrollarea_p.h            | 26 ++++----
 src/gui/widgets/qabstractslider.cpp                | 26 ++++----
 src/gui/widgets/qabstractslider.h                  | 26 ++++----
 src/gui/widgets/qabstractslider_p.h                | 26 ++++----
 src/gui/widgets/qabstractspinbox.cpp               | 26 ++++----
 src/gui/widgets/qabstractspinbox.h                 | 26 ++++----
 src/gui/widgets/qabstractspinbox_p.h               | 26 ++++----
 src/gui/widgets/qbuttongroup.cpp                   | 26 ++++----
 src/gui/widgets/qbuttongroup.h                     | 26 ++++----
 src/gui/widgets/qcalendartextnavigator_p.h         | 26 ++++----
 src/gui/widgets/qcalendarwidget.cpp                | 26 ++++----
 src/gui/widgets/qcalendarwidget.h                  | 26 ++++----
 src/gui/widgets/qcheckbox.cpp                      | 26 ++++----
 src/gui/widgets/qcheckbox.h                        | 26 ++++----
 src/gui/widgets/qcocoamenu_mac.mm                  | 26 ++++----
 src/gui/widgets/qcocoamenu_mac_p.h                 | 26 ++++----
 src/gui/widgets/qcocoatoolbardelegate_mac.mm       | 26 ++++----
 src/gui/widgets/qcocoatoolbardelegate_mac_p.h      | 26 ++++----
 src/gui/widgets/qcombobox.cpp                      | 26 ++++----
 src/gui/widgets/qcombobox.h                        | 26 ++++----
 src/gui/widgets/qcombobox_p.h                      | 26 ++++----
 src/gui/widgets/qcommandlinkbutton.cpp             | 26 ++++----
 src/gui/widgets/qcommandlinkbutton.h               | 26 ++++----
 src/gui/widgets/qdatetimeedit.cpp                  | 26 ++++----
 src/gui/widgets/qdatetimeedit.h                    | 26 ++++----
 src/gui/widgets/qdatetimeedit_p.h                  | 26 ++++----
 src/gui/widgets/qdial.cpp                          | 26 ++++----
 src/gui/widgets/qdial.h                            | 26 ++++----
 src/gui/widgets/qdialogbuttonbox.cpp               | 26 ++++----
 src/gui/widgets/qdialogbuttonbox.h                 | 26 ++++----
 src/gui/widgets/qdockarealayout.cpp                | 26 ++++----
 src/gui/widgets/qdockarealayout_p.h                | 26 ++++----
 src/gui/widgets/qdockwidget.cpp                    | 26 ++++----
 src/gui/widgets/qdockwidget.h                      | 26 ++++----
 src/gui/widgets/qdockwidget_p.h                    | 26 ++++----
 src/gui/widgets/qeffects.cpp                       | 26 ++++----
 src/gui/widgets/qeffects_p.h                       | 26 ++++----
 src/gui/widgets/qfocusframe.cpp                    | 26 ++++----
 src/gui/widgets/qfocusframe.h                      | 26 ++++----
 src/gui/widgets/qfontcombobox.cpp                  | 26 ++++----
 src/gui/widgets/qfontcombobox.h                    | 26 ++++----
 src/gui/widgets/qframe.cpp                         | 26 ++++----
 src/gui/widgets/qframe.h                           | 26 ++++----
 src/gui/widgets/qframe_p.h                         | 26 ++++----
 src/gui/widgets/qgroupbox.cpp                      | 26 ++++----
 src/gui/widgets/qgroupbox.h                        | 26 ++++----
 src/gui/widgets/qlabel.cpp                         | 26 ++++----
 src/gui/widgets/qlabel.h                           | 26 ++++----
 src/gui/widgets/qlabel_p.h                         | 26 ++++----
 src/gui/widgets/qlcdnumber.cpp                     | 26 ++++----
 src/gui/widgets/qlcdnumber.h                       | 26 ++++----
 src/gui/widgets/qlinecontrol.cpp                   | 26 ++++----
 src/gui/widgets/qlinecontrol_p.h                   | 26 ++++----
 src/gui/widgets/qlineedit.cpp                      | 26 ++++----
 src/gui/widgets/qlineedit.h                        | 26 ++++----
 src/gui/widgets/qlineedit_p.cpp                    | 26 ++++----
 src/gui/widgets/qlineedit_p.h                      | 26 ++++----
 src/gui/widgets/qmaccocoaviewcontainer_mac.h       | 26 ++++----
 src/gui/widgets/qmaccocoaviewcontainer_mac.mm      | 26 ++++----
 src/gui/widgets/qmacnativewidget_mac.h             | 26 ++++----
 src/gui/widgets/qmacnativewidget_mac.mm            | 26 ++++----
 src/gui/widgets/qmainwindow.cpp                    | 26 ++++----
 src/gui/widgets/qmainwindow.h                      | 26 ++++----
 src/gui/widgets/qmainwindowlayout.cpp              | 26 ++++----
 src/gui/widgets/qmainwindowlayout_mac.mm           | 26 ++++----
 src/gui/widgets/qmainwindowlayout_p.h              | 26 ++++----
 src/gui/widgets/qmdiarea.cpp                       | 26 ++++----
 src/gui/widgets/qmdiarea.h                         | 26 ++++----
 src/gui/widgets/qmdiarea_p.h                       | 26 ++++----
 src/gui/widgets/qmdisubwindow.cpp                  | 26 ++++----
 src/gui/widgets/qmdisubwindow.h                    | 26 ++++----
 src/gui/widgets/qmdisubwindow_p.h                  | 26 ++++----
 src/gui/widgets/qmenu.cpp                          | 26 ++++----
 src/gui/widgets/qmenu.h                            | 26 ++++----
 src/gui/widgets/qmenu_mac.mm                       | 26 ++++----
 src/gui/widgets/qmenu_p.h                          | 26 ++++----
 src/gui/widgets/qmenu_symbian.cpp                  | 26 ++++----
 src/gui/widgets/qmenu_wince.cpp                    | 26 ++++----
 src/gui/widgets/qmenu_wince_resource_p.h           | 26 ++++----
 src/gui/widgets/qmenubar.cpp                       | 26 ++++----
 src/gui/widgets/qmenubar.h                         | 26 ++++----
 src/gui/widgets/qmenubar_p.h                       | 26 ++++----
 src/gui/widgets/qmenudata.cpp                      | 26 ++++----
 src/gui/widgets/qmenudata.h                        | 26 ++++----
 src/gui/widgets/qplaintextedit.cpp                 | 26 ++++----
 src/gui/widgets/qplaintextedit.h                   | 26 ++++----
 src/gui/widgets/qplaintextedit_p.h                 | 26 ++++----
 src/gui/widgets/qprintpreviewwidget.cpp            | 26 ++++----
 src/gui/widgets/qprintpreviewwidget.h              | 26 ++++----
 src/gui/widgets/qprogressbar.cpp                   | 26 ++++----
 src/gui/widgets/qprogressbar.h                     | 26 ++++----
 src/gui/widgets/qpushbutton.cpp                    | 26 ++++----
 src/gui/widgets/qpushbutton.h                      | 26 ++++----
 src/gui/widgets/qpushbutton_p.h                    | 26 ++++----
 src/gui/widgets/qradiobutton.cpp                   | 26 ++++----
 src/gui/widgets/qradiobutton.h                     | 26 ++++----
 src/gui/widgets/qrubberband.cpp                    | 26 ++++----
 src/gui/widgets/qrubberband.h                      | 26 ++++----
 src/gui/widgets/qscrollarea.cpp                    | 26 ++++----
 src/gui/widgets/qscrollarea.h                      | 26 ++++----
 src/gui/widgets/qscrollarea_p.h                    | 26 ++++----
 src/gui/widgets/qscrollbar.cpp                     | 26 ++++----
 src/gui/widgets/qscrollbar.h                       | 26 ++++----
 src/gui/widgets/qsizegrip.cpp                      | 26 ++++----
 src/gui/widgets/qsizegrip.h                        | 26 ++++----
 src/gui/widgets/qslider.cpp                        | 26 ++++----
 src/gui/widgets/qslider.h                          | 26 ++++----
 src/gui/widgets/qspinbox.cpp                       | 26 ++++----
 src/gui/widgets/qspinbox.h                         | 26 ++++----
 src/gui/widgets/qsplashscreen.cpp                  | 26 ++++----
 src/gui/widgets/qsplashscreen.h                    | 26 ++++----
 src/gui/widgets/qsplitter.cpp                      | 26 ++++----
 src/gui/widgets/qsplitter.h                        | 26 ++++----
 src/gui/widgets/qsplitter_p.h                      | 26 ++++----
 src/gui/widgets/qstackedwidget.cpp                 | 26 ++++----
 src/gui/widgets/qstackedwidget.h                   | 26 ++++----
 src/gui/widgets/qstatusbar.cpp                     | 26 ++++----
 src/gui/widgets/qstatusbar.h                       | 26 ++++----
 src/gui/widgets/qtabbar.cpp                        | 26 ++++----
 src/gui/widgets/qtabbar.h                          | 26 ++++----
 src/gui/widgets/qtabbar_p.h                        | 26 ++++----
 src/gui/widgets/qtabwidget.cpp                     | 26 ++++----
 src/gui/widgets/qtabwidget.h                       | 26 ++++----
 src/gui/widgets/qtextbrowser.cpp                   | 26 ++++----
 src/gui/widgets/qtextbrowser.h                     | 26 ++++----
 src/gui/widgets/qtextedit.cpp                      | 26 ++++----
 src/gui/widgets/qtextedit.h                        | 26 ++++----
 src/gui/widgets/qtextedit_p.h                      | 26 ++++----
 src/gui/widgets/qtoolbar.cpp                       | 26 ++++----
 src/gui/widgets/qtoolbar.h                         | 26 ++++----
 src/gui/widgets/qtoolbar_p.h                       | 26 ++++----
 src/gui/widgets/qtoolbararealayout.cpp             | 26 ++++----
 src/gui/widgets/qtoolbararealayout_p.h             | 26 ++++----
 src/gui/widgets/qtoolbarextension.cpp              | 26 ++++----
 src/gui/widgets/qtoolbarextension_p.h              | 26 ++++----
 src/gui/widgets/qtoolbarlayout.cpp                 | 26 ++++----
 src/gui/widgets/qtoolbarlayout_p.h                 | 26 ++++----
 src/gui/widgets/qtoolbarseparator.cpp              | 26 ++++----
 src/gui/widgets/qtoolbarseparator_p.h              | 26 ++++----
 src/gui/widgets/qtoolbox.cpp                       | 26 ++++----
 src/gui/widgets/qtoolbox.h                         | 26 ++++----
 src/gui/widgets/qtoolbutton.cpp                    | 26 ++++----
 src/gui/widgets/qtoolbutton.h                      | 26 ++++----
 src/gui/widgets/qvalidator.cpp                     | 26 ++++----
 src/gui/widgets/qvalidator.h                       | 26 ++++----
 src/gui/widgets/qwidgetanimator.cpp                | 26 ++++----
 src/gui/widgets/qwidgetanimator_p.h                | 26 ++++----
 src/gui/widgets/qwidgetresizehandler.cpp           | 26 ++++----
 src/gui/widgets/qwidgetresizehandler_p.h           | 26 ++++----
 src/gui/widgets/qworkspace.cpp                     | 26 ++++----
 src/gui/widgets/qworkspace.h                       | 26 ++++----
 .../qdeclarativefolderlistmodel.cpp                | 26 ++++----
 .../folderlistmodel/qdeclarativefolderlistmodel.h  | 26 ++++----
 src/imports/gestures/plugin.cpp                    | 26 ++++----
 src/imports/gestures/qdeclarativegesturearea.cpp   | 26 ++++----
 src/imports/gestures/qdeclarativegesturearea_p.h   | 26 ++++----
 src/imports/particles/particles.cpp                | 26 ++++----
 src/imports/particles/qdeclarativeparticles.cpp    | 26 ++++----
 src/imports/particles/qdeclarativeparticles_p.h    | 26 ++++----
 src/multimedia/audio/qaudio.cpp                    | 26 ++++----
 src/multimedia/audio/qaudio.h                      | 26 ++++----
 src/multimedia/audio/qaudio_mac.cpp                | 26 ++++----
 src/multimedia/audio/qaudio_mac_p.h                | 26 ++++----
 src/multimedia/audio/qaudio_symbian_p.cpp          | 26 ++++----
 src/multimedia/audio/qaudio_symbian_p.h            | 26 ++++----
 src/multimedia/audio/qaudiodevicefactory.cpp       | 26 ++++----
 src/multimedia/audio/qaudiodevicefactory_p.h       | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo.cpp          | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo.h            | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp   | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo_alsa_p.h     | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp    | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo_mac_p.h      | 26 ++++----
 .../audio/qaudiodeviceinfo_symbian_p.cpp           | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo_symbian_p.h  | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp  | 26 ++++----
 src/multimedia/audio/qaudiodeviceinfo_win32_p.h    | 26 ++++----
 src/multimedia/audio/qaudioengine.cpp              | 26 ++++----
 src/multimedia/audio/qaudioengine.h                | 26 ++++----
 src/multimedia/audio/qaudioengineplugin.cpp        | 26 ++++----
 src/multimedia/audio/qaudioengineplugin.h          | 26 ++++----
 src/multimedia/audio/qaudioformat.cpp              | 26 ++++----
 src/multimedia/audio/qaudioformat.h                | 26 ++++----
 src/multimedia/audio/qaudioinput.cpp               | 26 ++++----
 src/multimedia/audio/qaudioinput.h                 | 26 ++++----
 src/multimedia/audio/qaudioinput_alsa_p.cpp        | 26 ++++----
 src/multimedia/audio/qaudioinput_alsa_p.h          | 26 ++++----
 src/multimedia/audio/qaudioinput_mac_p.cpp         | 26 ++++----
 src/multimedia/audio/qaudioinput_mac_p.h           | 26 ++++----
 src/multimedia/audio/qaudioinput_symbian_p.cpp     | 26 ++++----
 src/multimedia/audio/qaudioinput_symbian_p.h       | 26 ++++----
 src/multimedia/audio/qaudioinput_win32_p.cpp       | 26 ++++----
 src/multimedia/audio/qaudioinput_win32_p.h         | 26 ++++----
 src/multimedia/audio/qaudiooutput.cpp              | 26 ++++----
 src/multimedia/audio/qaudiooutput.h                | 26 ++++----
 src/multimedia/audio/qaudiooutput_alsa_p.cpp       | 26 ++++----
 src/multimedia/audio/qaudiooutput_alsa_p.h         | 26 ++++----
 src/multimedia/audio/qaudiooutput_mac_p.cpp        | 26 ++++----
 src/multimedia/audio/qaudiooutput_mac_p.h          | 26 ++++----
 src/multimedia/audio/qaudiooutput_symbian_p.cpp    | 26 ++++----
 src/multimedia/audio/qaudiooutput_symbian_p.h      | 26 ++++----
 src/multimedia/audio/qaudiooutput_win32_p.cpp      | 26 ++++----
 src/multimedia/audio/qaudiooutput_win32_p.h        | 26 ++++----
 src/multimedia/video/qabstractvideobuffer.cpp      | 26 ++++----
 src/multimedia/video/qabstractvideobuffer.h        | 26 ++++----
 src/multimedia/video/qabstractvideobuffer_p.h      | 26 ++++----
 src/multimedia/video/qabstractvideosurface.cpp     | 26 ++++----
 src/multimedia/video/qabstractvideosurface.h       | 26 ++++----
 src/multimedia/video/qabstractvideosurface_p.h     | 26 ++++----
 src/multimedia/video/qimagevideobuffer.cpp         | 26 ++++----
 src/multimedia/video/qimagevideobuffer_p.h         | 26 ++++----
 src/multimedia/video/qmemoryvideobuffer.cpp        | 26 ++++----
 src/multimedia/video/qmemoryvideobuffer_p.h        | 26 ++++----
 src/multimedia/video/qvideoframe.cpp               | 26 ++++----
 src/multimedia/video/qvideoframe.h                 | 26 ++++----
 src/multimedia/video/qvideosurfaceformat.cpp       | 26 ++++----
 src/multimedia/video/qvideosurfaceformat.h         | 26 ++++----
 src/network/access/qabstractnetworkcache.cpp       | 26 ++++----
 src/network/access/qabstractnetworkcache.h         | 26 ++++----
 src/network/access/qabstractnetworkcache_p.h       | 26 ++++----
 src/network/access/qfilenetworkreply.cpp           | 26 ++++----
 src/network/access/qfilenetworkreply_p.h           | 26 ++++----
 src/network/access/qftp.cpp                        | 26 ++++----
 src/network/access/qftp.h                          | 26 ++++----
 src/network/access/qhttp.cpp                       | 26 ++++----
 src/network/access/qhttp.h                         | 26 ++++----
 src/network/access/qhttpnetworkconnection.cpp      | 26 ++++----
 src/network/access/qhttpnetworkconnection_p.h      | 26 ++++----
 .../access/qhttpnetworkconnectionchannel.cpp       | 26 ++++----
 .../access/qhttpnetworkconnectionchannel_p.h       | 26 ++++----
 src/network/access/qhttpnetworkheader.cpp          | 26 ++++----
 src/network/access/qhttpnetworkheader_p.h          | 26 ++++----
 src/network/access/qhttpnetworkreply.cpp           | 26 ++++----
 src/network/access/qhttpnetworkreply_p.h           | 26 ++++----
 src/network/access/qhttpnetworkrequest.cpp         | 26 ++++----
 src/network/access/qhttpnetworkrequest_p.h         | 26 ++++----
 src/network/access/qnetworkaccessbackend.cpp       | 26 ++++----
 src/network/access/qnetworkaccessbackend_p.h       | 26 ++++----
 src/network/access/qnetworkaccesscache.cpp         | 26 ++++----
 src/network/access/qnetworkaccesscache_p.h         | 26 ++++----
 src/network/access/qnetworkaccesscachebackend.cpp  | 26 ++++----
 src/network/access/qnetworkaccesscachebackend_p.h  | 26 ++++----
 src/network/access/qnetworkaccessdatabackend.cpp   | 26 ++++----
 src/network/access/qnetworkaccessdatabackend_p.h   | 26 ++++----
 .../access/qnetworkaccessdebugpipebackend.cpp      | 26 ++++----
 .../access/qnetworkaccessdebugpipebackend_p.h      | 26 ++++----
 src/network/access/qnetworkaccessfilebackend.cpp   | 26 ++++----
 src/network/access/qnetworkaccessfilebackend_p.h   | 26 ++++----
 src/network/access/qnetworkaccessftpbackend.cpp    | 26 ++++----
 src/network/access/qnetworkaccessftpbackend_p.h    | 26 ++++----
 src/network/access/qnetworkaccesshttpbackend.cpp   | 26 ++++----
 src/network/access/qnetworkaccesshttpbackend_p.h   | 26 ++++----
 src/network/access/qnetworkaccessmanager.cpp       | 26 ++++----
 src/network/access/qnetworkaccessmanager.h         | 26 ++++----
 src/network/access/qnetworkaccessmanager_p.h       | 26 ++++----
 src/network/access/qnetworkcookie.cpp              | 26 ++++----
 src/network/access/qnetworkcookie.h                | 26 ++++----
 src/network/access/qnetworkcookie_p.h              | 26 ++++----
 src/network/access/qnetworkcookiejar.cpp           | 26 ++++----
 src/network/access/qnetworkcookiejar.h             | 26 ++++----
 src/network/access/qnetworkcookiejar_p.h           | 26 ++++----
 src/network/access/qnetworkdiskcache.cpp           | 26 ++++----
 src/network/access/qnetworkdiskcache.h             | 26 ++++----
 src/network/access/qnetworkdiskcache_p.h           | 26 ++++----
 src/network/access/qnetworkreply.cpp               | 26 ++++----
 src/network/access/qnetworkreply.h                 | 26 ++++----
 src/network/access/qnetworkreply_p.h               | 26 ++++----
 src/network/access/qnetworkreplyimpl.cpp           | 26 ++++----
 src/network/access/qnetworkreplyimpl_p.h           | 26 ++++----
 src/network/access/qnetworkrequest.cpp             | 26 ++++----
 src/network/access/qnetworkrequest.h               | 26 ++++----
 src/network/access/qnetworkrequest_p.h             | 26 ++++----
 src/network/bearer/qbearerengine.cpp               | 26 ++++----
 src/network/bearer/qbearerengine_p.h               | 26 ++++----
 src/network/bearer/qbearerplugin.cpp               | 26 ++++----
 src/network/bearer/qbearerplugin_p.h               | 26 ++++----
 src/network/bearer/qnetworkconfigmanager.cpp       | 26 ++++----
 src/network/bearer/qnetworkconfigmanager.h         | 26 ++++----
 src/network/bearer/qnetworkconfigmanager_p.cpp     | 26 ++++----
 src/network/bearer/qnetworkconfigmanager_p.h       | 26 ++++----
 src/network/bearer/qnetworkconfiguration.cpp       | 26 ++++----
 src/network/bearer/qnetworkconfiguration.h         | 26 ++++----
 src/network/bearer/qnetworkconfiguration_p.h       | 26 ++++----
 src/network/bearer/qnetworksession.cpp             | 26 ++++----
 src/network/bearer/qnetworksession.h               | 26 ++++----
 src/network/bearer/qnetworksession_p.h             | 26 ++++----
 src/network/kernel/qauthenticator.cpp              | 26 ++++----
 src/network/kernel/qauthenticator.h                | 26 ++++----
 src/network/kernel/qauthenticator_p.h              | 26 ++++----
 src/network/kernel/qhostaddress.cpp                | 26 ++++----
 src/network/kernel/qhostaddress.h                  | 26 ++++----
 src/network/kernel/qhostaddress_p.h                | 26 ++++----
 src/network/kernel/qhostinfo.cpp                   | 26 ++++----
 src/network/kernel/qhostinfo.h                     | 26 ++++----
 src/network/kernel/qhostinfo_p.h                   | 26 ++++----
 src/network/kernel/qhostinfo_unix.cpp              | 26 ++++----
 src/network/kernel/qhostinfo_win.cpp               | 26 ++++----
 src/network/kernel/qnetworkinterface.cpp           | 26 ++++----
 src/network/kernel/qnetworkinterface.h             | 26 ++++----
 src/network/kernel/qnetworkinterface_p.h           | 26 ++++----
 src/network/kernel/qnetworkinterface_symbian.cpp   | 26 ++++----
 src/network/kernel/qnetworkinterface_unix.cpp      | 26 ++++----
 src/network/kernel/qnetworkinterface_win.cpp       | 26 ++++----
 src/network/kernel/qnetworkinterface_win_p.h       | 26 ++++----
 src/network/kernel/qnetworkproxy.cpp               | 26 ++++----
 src/network/kernel/qnetworkproxy.h                 | 26 ++++----
 src/network/kernel/qnetworkproxy_generic.cpp       | 26 ++++----
 src/network/kernel/qnetworkproxy_mac.cpp           | 26 ++++----
 src/network/kernel/qnetworkproxy_p.h               | 26 ++++----
 src/network/kernel/qnetworkproxy_win.cpp           | 26 ++++----
 src/network/kernel/qurlinfo.cpp                    | 26 ++++----
 src/network/kernel/qurlinfo.h                      | 26 ++++----
 src/network/socket/qabstractsocket.cpp             | 26 ++++----
 src/network/socket/qabstractsocket.h               | 26 ++++----
 src/network/socket/qabstractsocket_p.h             | 26 ++++----
 src/network/socket/qabstractsocketengine.cpp       | 26 ++++----
 src/network/socket/qabstractsocketengine_p.h       | 26 ++++----
 src/network/socket/qhttpsocketengine.cpp           | 26 ++++----
 src/network/socket/qhttpsocketengine_p.h           | 26 ++++----
 src/network/socket/qlocalserver.cpp                | 26 ++++----
 src/network/socket/qlocalserver.h                  | 26 ++++----
 src/network/socket/qlocalserver_p.h                | 26 ++++----
 src/network/socket/qlocalserver_tcp.cpp            | 26 ++++----
 src/network/socket/qlocalserver_unix.cpp           | 26 ++++----
 src/network/socket/qlocalserver_win.cpp            | 26 ++++----
 src/network/socket/qlocalsocket.cpp                | 26 ++++----
 src/network/socket/qlocalsocket.h                  | 26 ++++----
 src/network/socket/qlocalsocket_p.h                | 26 ++++----
 src/network/socket/qlocalsocket_tcp.cpp            | 26 ++++----
 src/network/socket/qlocalsocket_unix.cpp           | 26 ++++----
 src/network/socket/qlocalsocket_win.cpp            | 26 ++++----
 src/network/socket/qnativesocketengine.cpp         | 26 ++++----
 src/network/socket/qnativesocketengine_p.h         | 26 ++++----
 src/network/socket/qnativesocketengine_unix.cpp    | 26 ++++----
 src/network/socket/qnativesocketengine_win.cpp     | 26 ++++----
 src/network/socket/qnet_unix_p.h                   | 26 ++++----
 src/network/socket/qsocks5socketengine.cpp         | 26 ++++----
 src/network/socket/qsocks5socketengine_p.h         | 26 ++++----
 src/network/socket/qtcpserver.cpp                  | 26 ++++----
 src/network/socket/qtcpserver.h                    | 26 ++++----
 src/network/socket/qtcpsocket.cpp                  | 26 ++++----
 src/network/socket/qtcpsocket.h                    | 26 ++++----
 src/network/socket/qtcpsocket_p.h                  | 26 ++++----
 src/network/socket/qudpsocket.cpp                  | 26 ++++----
 src/network/socket/qudpsocket.h                    | 26 ++++----
 src/network/ssl/qssl.cpp                           | 26 ++++----
 src/network/ssl/qssl.h                             | 26 ++++----
 src/network/ssl/qsslcertificate.cpp                | 26 ++++----
 src/network/ssl/qsslcertificate.h                  | 26 ++++----
 src/network/ssl/qsslcertificate_p.h                | 26 ++++----
 src/network/ssl/qsslcipher.cpp                     | 26 ++++----
 src/network/ssl/qsslcipher.h                       | 26 ++++----
 src/network/ssl/qsslcipher_p.h                     | 26 ++++----
 src/network/ssl/qsslconfiguration.cpp              | 26 ++++----
 src/network/ssl/qsslconfiguration.h                | 26 ++++----
 src/network/ssl/qsslconfiguration_p.h              | 26 ++++----
 src/network/ssl/qsslerror.cpp                      | 26 ++++----
 src/network/ssl/qsslerror.h                        | 26 ++++----
 src/network/ssl/qsslkey.cpp                        | 26 ++++----
 src/network/ssl/qsslkey.h                          | 26 ++++----
 src/network/ssl/qsslkey_p.h                        | 26 ++++----
 src/network/ssl/qsslsocket.cpp                     | 26 ++++----
 src/network/ssl/qsslsocket.h                       | 26 ++++----
 src/network/ssl/qsslsocket_openssl.cpp             | 26 ++++----
 src/network/ssl/qsslsocket_openssl_p.h             | 26 ++++----
 src/network/ssl/qsslsocket_openssl_symbols.cpp     | 26 ++++----
 src/network/ssl/qsslsocket_openssl_symbols_p.h     | 26 ++++----
 src/network/ssl/qsslsocket_p.h                     | 26 ++++----
 src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp | 26 ++++----
 src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h | 26 ++++----
 .../gl2paintengineex/qglcustomshaderstage.cpp      | 26 ++++----
 .../gl2paintengineex/qglcustomshaderstage_p.h      | 26 ++++----
 .../gl2paintengineex/qglengineshadermanager.cpp    | 26 ++++----
 .../gl2paintengineex/qglengineshadermanager_p.h    | 26 ++++----
 .../gl2paintengineex/qglengineshadersource_p.h     | 26 ++++----
 src/opengl/gl2paintengineex/qglgradientcache.cpp   | 26 ++++----
 src/opengl/gl2paintengineex/qglgradientcache_p.h   | 26 ++++----
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 26 ++++----
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    | 26 ++++----
 .../gl2paintengineex/qtextureglyphcache_gl.cpp     | 26 ++++----
 .../gl2paintengineex/qtextureglyphcache_gl_p.h     | 26 ++++----
 .../gl2paintengineex/qtriangulatingstroker.cpp     | 26 ++++----
 .../gl2paintengineex/qtriangulatingstroker_p.h     | 26 ++++----
 src/opengl/gl2paintengineex/qtriangulator.cpp      | 26 ++++----
 src/opengl/gl2paintengineex/qtriangulator_p.h      | 26 ++++----
 src/opengl/qgl.cpp                                 | 26 ++++----
 src/opengl/qgl.h                                   | 26 ++++----
 src/opengl/qgl_egl.cpp                             | 26 ++++----
 src/opengl/qgl_egl_p.h                             | 26 ++++----
 src/opengl/qgl_mac.mm                              | 26 ++++----
 src/opengl/qgl_p.h                                 | 26 ++++----
 src/opengl/qgl_qws.cpp                             | 26 ++++----
 src/opengl/qgl_symbian.cpp                         | 26 ++++----
 src/opengl/qgl_win.cpp                             | 26 ++++----
 src/opengl/qgl_wince.cpp                           | 26 ++++----
 src/opengl/qgl_x11.cpp                             | 26 ++++----
 src/opengl/qgl_x11egl.cpp                          | 26 ++++----
 src/opengl/qglbuffer.cpp                           | 26 ++++----
 src/opengl/qglbuffer.h                             | 26 ++++----
 src/opengl/qglcolormap.cpp                         | 26 ++++----
 src/opengl/qglcolormap.h                           | 26 ++++----
 src/opengl/qglextensions.cpp                       | 26 ++++----
 src/opengl/qglextensions_p.h                       | 26 ++++----
 src/opengl/qglframebufferobject.cpp                | 26 ++++----
 src/opengl/qglframebufferobject.h                  | 26 ++++----
 src/opengl/qglframebufferobject_p.h                | 26 ++++----
 src/opengl/qglpaintdevice.cpp                      | 26 ++++----
 src/opengl/qglpaintdevice_p.h                      | 26 ++++----
 src/opengl/qglpixelbuffer.cpp                      | 26 ++++----
 src/opengl/qglpixelbuffer.h                        | 26 ++++----
 src/opengl/qglpixelbuffer_egl.cpp                  | 26 ++++----
 src/opengl/qglpixelbuffer_mac.mm                   | 26 ++++----
 src/opengl/qglpixelbuffer_p.h                      | 26 ++++----
 src/opengl/qglpixelbuffer_win.cpp                  | 26 ++++----
 src/opengl/qglpixelbuffer_x11.cpp                  | 26 ++++----
 src/opengl/qglpixmapfilter.cpp                     | 26 ++++----
 src/opengl/qglpixmapfilter_p.h                     | 26 ++++----
 src/opengl/qglscreen_qws.cpp                       | 26 ++++----
 src/opengl/qglscreen_qws.h                         | 26 ++++----
 src/opengl/qglshaderprogram.cpp                    | 26 ++++----
 src/opengl/qglshaderprogram.h                      | 26 ++++----
 src/opengl/qglwindowsurface_qws.cpp                | 26 ++++----
 src/opengl/qglwindowsurface_qws_p.h                | 26 ++++----
 src/opengl/qgraphicsshadereffect.cpp               | 26 ++++----
 src/opengl/qgraphicsshadereffect_p.h               | 26 ++++----
 src/opengl/qgraphicssystem_gl.cpp                  | 26 ++++----
 src/opengl/qgraphicssystem_gl_p.h                  | 26 ++++----
 src/opengl/qpaintengine_opengl.cpp                 | 26 ++++----
 src/opengl/qpaintengine_opengl_p.h                 | 26 ++++----
 src/opengl/qpixmapdata_gl.cpp                      | 26 ++++----
 src/opengl/qpixmapdata_gl_p.h                      | 26 ++++----
 src/opengl/qpixmapdata_x11gl_egl.cpp               | 26 ++++----
 src/opengl/qpixmapdata_x11gl_p.h                   | 26 ++++----
 src/opengl/qwindowsurface_gl.cpp                   | 26 ++++----
 src/opengl/qwindowsurface_gl_p.h                   | 26 ++++----
 src/opengl/qwindowsurface_x11gl.cpp                | 26 ++++----
 src/opengl/qwindowsurface_x11gl_p.h                | 26 ++++----
 src/opengl/util/fragmentprograms_p.h               | 26 ++++----
 src/opengl/util/generator.cpp                      | 52 +++++++--------
 src/opengl/util/glsl_to_include.sh                 | 26 ++++----
 src/openvg/qpaintengine_vg.cpp                     | 26 ++++----
 src/openvg/qpaintengine_vg_p.h                     | 26 ++++----
 src/openvg/qpixmapdata_vg.cpp                      | 26 ++++----
 src/openvg/qpixmapdata_vg_p.h                      | 26 ++++----
 src/openvg/qpixmapfilter_vg.cpp                    | 26 ++++----
 src/openvg/qpixmapfilter_vg_p.h                    | 26 ++++----
 src/openvg/qvg.h                                   | 26 ++++----
 src/openvg/qvg_p.h                                 | 26 ++++----
 src/openvg/qvg_symbian.cpp                         | 26 ++++----
 src/openvg/qvgcompositionhelper_p.h                | 26 ++++----
 src/openvg/qvgfontglyphcache_p.h                   | 26 ++++----
 src/openvg/qvgimagepool.cpp                        | 26 ++++----
 src/openvg/qvgimagepool_p.h                        | 26 ++++----
 src/openvg/qwindowsurface_vg.cpp                   | 26 ++++----
 src/openvg/qwindowsurface_vg_p.h                   | 26 ++++----
 src/openvg/qwindowsurface_vgegl.cpp                | 26 ++++----
 src/openvg/qwindowsurface_vgegl_p.h                | 26 ++++----
 src/plugins/accessible/compat/main.cpp             | 26 ++++----
 src/plugins/accessible/compat/q3complexwidgets.cpp | 26 ++++----
 src/plugins/accessible/compat/q3complexwidgets.h   | 26 ++++----
 src/plugins/accessible/compat/q3simplewidgets.cpp  | 26 ++++----
 src/plugins/accessible/compat/q3simplewidgets.h    | 26 ++++----
 .../accessible/compat/qaccessiblecompat.cpp        | 26 ++++----
 src/plugins/accessible/compat/qaccessiblecompat.h  | 26 ++++----
 src/plugins/accessible/widgets/complexwidgets.cpp  | 26 ++++----
 src/plugins/accessible/widgets/complexwidgets.h    | 26 ++++----
 src/plugins/accessible/widgets/main.cpp            | 26 ++++----
 src/plugins/accessible/widgets/qaccessiblemenu.cpp | 26 ++++----
 src/plugins/accessible/widgets/qaccessiblemenu.h   | 26 ++++----
 .../accessible/widgets/qaccessiblewidgets.cpp      | 26 ++++----
 .../accessible/widgets/qaccessiblewidgets.h        | 26 ++++----
 src/plugins/accessible/widgets/rangecontrols.cpp   | 26 ++++----
 src/plugins/accessible/widgets/rangecontrols.h     | 26 ++++----
 src/plugins/accessible/widgets/simplewidgets.cpp   | 26 ++++----
 src/plugins/accessible/widgets/simplewidgets.h     | 26 ++++----
 src/plugins/bearer/connman/main.cpp                | 26 ++++----
 src/plugins/bearer/connman/qconnmanengine.cpp      | 26 ++++----
 src/plugins/bearer/connman/qconnmanengine.h        | 26 ++++----
 .../bearer/connman/qconnmanservice_linux.cpp       | 26 ++++----
 .../bearer/connman/qconnmanservice_linux_p.h       | 26 ++++----
 src/plugins/bearer/connman/qofonoservice_linux.cpp | 26 ++++----
 src/plugins/bearer/connman/qofonoservice_linux_p.h | 26 ++++----
 src/plugins/bearer/corewlan/main.cpp               | 26 ++++----
 src/plugins/bearer/corewlan/qcorewlanengine.h      | 26 ++++----
 src/plugins/bearer/corewlan/qcorewlanengine.mm     | 26 ++++----
 src/plugins/bearer/generic/main.cpp                | 26 ++++----
 src/plugins/bearer/generic/qgenericengine.cpp      | 26 ++++----
 src/plugins/bearer/generic/qgenericengine.h        | 26 ++++----
 src/plugins/bearer/icd/dbusdispatcher.cpp          | 26 ++++----
 src/plugins/bearer/icd/dbusdispatcher.h            | 26 ++++----
 src/plugins/bearer/icd/iapconf.cpp                 | 26 ++++----
 src/plugins/bearer/icd/iapconf.h                   | 26 ++++----
 src/plugins/bearer/icd/iapmonitor.cpp              | 26 ++++----
 src/plugins/bearer/icd/iapmonitor.h                | 26 ++++----
 src/plugins/bearer/icd/maemo_icd.cpp               | 26 ++++----
 src/plugins/bearer/icd/maemo_icd.h                 | 26 ++++----
 src/plugins/bearer/icd/main.cpp                    | 26 ++++----
 src/plugins/bearer/icd/proxyconf.cpp               | 26 ++++----
 src/plugins/bearer/icd/proxyconf.h                 | 26 ++++----
 src/plugins/bearer/icd/qicdengine.cpp              | 26 ++++----
 src/plugins/bearer/icd/qicdengine.h                | 26 ++++----
 src/plugins/bearer/icd/qnetworksession_impl.cpp    | 26 ++++----
 src/plugins/bearer/icd/qnetworksession_impl.h      | 26 ++++----
 src/plugins/bearer/icd/wlan-utils.h                | 26 ++++----
 src/plugins/bearer/nativewifi/main.cpp             | 26 ++++----
 src/plugins/bearer/nativewifi/platformdefs.h       | 26 ++++----
 .../bearer/nativewifi/qnativewifiengine.cpp        | 26 ++++----
 src/plugins/bearer/nativewifi/qnativewifiengine.h  | 26 ++++----
 src/plugins/bearer/networkmanager/main.cpp         | 26 ++++----
 .../networkmanager/qnetworkmanagerengine.cpp       | 26 ++++----
 .../bearer/networkmanager/qnetworkmanagerengine.h  | 26 ++++----
 .../networkmanager/qnetworkmanagerservice.cpp      | 26 ++++----
 .../bearer/networkmanager/qnetworkmanagerservice.h | 26 ++++----
 .../bearer/networkmanager/qnmdbushelper.cpp        | 26 ++++----
 src/plugins/bearer/networkmanager/qnmdbushelper.h  | 26 ++++----
 src/plugins/bearer/nla/main.cpp                    | 26 ++++----
 src/plugins/bearer/nla/qnlaengine.cpp              | 26 ++++----
 src/plugins/bearer/nla/qnlaengine.h                | 26 ++++----
 src/plugins/bearer/platformdefs_win.h              | 26 ++++----
 src/plugins/bearer/qbearerengine_impl.h            | 26 ++++----
 src/plugins/bearer/qnetworksession_impl.cpp        | 26 ++++----
 src/plugins/bearer/qnetworksession_impl.h          | 26 ++++----
 src/plugins/bearer/symbian/main.cpp                | 26 ++++----
 .../bearer/symbian/qnetworksession_impl.cpp        | 26 ++++----
 src/plugins/bearer/symbian/qnetworksession_impl.h  | 26 ++++----
 src/plugins/bearer/symbian/symbianengine.cpp       | 26 ++++----
 src/plugins/bearer/symbian/symbianengine.h         | 26 ++++----
 src/plugins/codecs/cn/main.cpp                     | 26 ++++----
 src/plugins/codecs/cn/qgb18030codec.cpp            | 26 ++++----
 src/plugins/codecs/cn/qgb18030codec.h              | 26 ++++----
 src/plugins/codecs/jp/main.cpp                     | 26 ++++----
 src/plugins/codecs/jp/qeucjpcodec.cpp              | 26 ++++----
 src/plugins/codecs/jp/qeucjpcodec.h                | 26 ++++----
 src/plugins/codecs/jp/qfontjpcodec.cpp             | 26 ++++----
 src/plugins/codecs/jp/qfontjpcodec.h               | 26 ++++----
 src/plugins/codecs/jp/qjiscodec.cpp                | 26 ++++----
 src/plugins/codecs/jp/qjiscodec.h                  | 26 ++++----
 src/plugins/codecs/jp/qjpunicode.cpp               | 26 ++++----
 src/plugins/codecs/jp/qjpunicode.h                 | 26 ++++----
 src/plugins/codecs/jp/qsjiscodec.cpp               | 26 ++++----
 src/plugins/codecs/jp/qsjiscodec.h                 | 26 ++++----
 src/plugins/codecs/kr/cp949codetbl.h               | 26 ++++----
 src/plugins/codecs/kr/main.cpp                     | 26 ++++----
 src/plugins/codecs/kr/qeuckrcodec.cpp              | 26 ++++----
 src/plugins/codecs/kr/qeuckrcodec.h                | 26 ++++----
 src/plugins/codecs/tw/main.cpp                     | 26 ++++----
 src/plugins/codecs/tw/qbig5codec.cpp               | 26 ++++----
 src/plugins/codecs/tw/qbig5codec.h                 | 26 ++++----
 src/plugins/decorations/default/main.cpp           | 26 ++++----
 src/plugins/decorations/styled/main.cpp            | 26 ++++----
 src/plugins/decorations/windows/main.cpp           | 26 ++++----
 src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp      | 26 ++++----
 src/plugins/gfxdrivers/ahi/qscreenahi_qws.h        | 26 ++++----
 src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp    | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbkeyboard.cpp      | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbkeyboard.h        | 26 ++++----
 src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp | 26 ++++----
 src/plugins/gfxdrivers/directfb/qdirectfbmouse.h   | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbpaintdevice.cpp   | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbpaintdevice.h     | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbpaintengine.h     | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbpixmap.cpp        | 26 ++++----
 src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h  | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbscreen.cpp        | 26 ++++----
 src/plugins/gfxdrivers/directfb/qdirectfbscreen.h  | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbscreenplugin.cpp  | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 26 ++++----
 .../gfxdrivers/directfb/qdirectfbwindowsurface.h   | 26 ++++----
 src/plugins/gfxdrivers/linuxfb/main.cpp            | 26 ++++----
 .../gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c   | 26 ++++----
 .../gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h   | 26 ++++----
 .../gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h | 26 ++++----
 .../gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c      | 26 ++++----
 .../powervr/pvreglscreen/pvreglscreen.cpp          | 26 ++++----
 .../gfxdrivers/powervr/pvreglscreen/pvreglscreen.h | 26 ++++----
 .../powervr/pvreglscreen/pvreglscreenplugin.cpp    | 26 ++++----
 .../powervr/pvreglscreen/pvreglwindowsurface.cpp   | 26 ++++----
 .../powervr/pvreglscreen/pvreglwindowsurface.h     | 26 ++++----
 src/plugins/gfxdrivers/qvfb/main.cpp               | 26 ++++----
 src/plugins/gfxdrivers/transformed/main.cpp        | 26 ++++----
 src/plugins/gfxdrivers/vnc/main.cpp                | 26 ++++----
 src/plugins/gfxdrivers/vnc/qscreenvnc_p.h          | 26 ++++----
 src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp      | 26 ++++----
 src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h        | 26 ++++----
 .../graphicssystems/meego/qmeegoextensions.cpp     | 26 ++++----
 .../graphicssystems/meego/qmeegoextensions.h       | 26 ++++----
 .../graphicssystems/meego/qmeegographicssystem.cpp | 26 ++++----
 .../graphicssystems/meego/qmeegographicssystem.h   | 26 ++++----
 .../meego/qmeegographicssystemplugin.cpp           | 26 ++++----
 .../meego/qmeegographicssystemplugin.h             | 26 ++++----
 .../graphicssystems/meego/qmeegopixmapdata.cpp     | 26 ++++----
 .../graphicssystems/meego/qmeegopixmapdata.h       | 26 ++++----
 src/plugins/graphicssystems/opengl/main.cpp        | 26 ++++----
 src/plugins/graphicssystems/openvg/main.cpp        | 26 ++++----
 .../graphicssystems/openvg/qgraphicssystem_vg.cpp  | 26 ++++----
 .../graphicssystems/openvg/qgraphicssystem_vg_p.h  | 26 ++++----
 src/plugins/graphicssystems/shivavg/main.cpp       | 26 ++++----
 .../shivavg/shivavggraphicssystem.cpp              | 26 ++++----
 .../shivavg/shivavggraphicssystem.h                | 26 ++++----
 .../shivavg/shivavgwindowsurface.cpp               | 26 ++++----
 .../graphicssystems/shivavg/shivavgwindowsurface.h | 26 ++++----
 src/plugins/graphicssystems/trace/main.cpp         | 26 ++++----
 .../trace/qgraphicssystem_trace.cpp                | 26 ++++----
 .../trace/qgraphicssystem_trace_p.h                | 26 ++++----
 src/plugins/iconengines/svgiconengine/main.cpp     | 26 ++++----
 .../iconengines/svgiconengine/qsvgiconengine.cpp   | 26 ++++----
 .../iconengines/svgiconengine/qsvgiconengine.h     | 26 ++++----
 src/plugins/imageformats/gif/main.cpp              | 26 ++++----
 src/plugins/imageformats/ico/main.cpp              | 26 ++++----
 src/plugins/imageformats/ico/qicohandler.cpp       | 26 ++++----
 src/plugins/imageformats/ico/qicohandler.h         | 26 ++++----
 src/plugins/imageformats/jpeg/main.cpp             | 26 ++++----
 src/plugins/imageformats/mng/main.cpp              | 26 ++++----
 src/plugins/imageformats/svg/main.cpp              | 26 ++++----
 src/plugins/imageformats/svg/qsvgiohandler.cpp     | 26 ++++----
 src/plugins/imageformats/svg/qsvgiohandler.h       | 26 ++++----
 src/plugins/imageformats/tiff/main.cpp             | 26 ++++----
 .../inputmethods/imsw-multi/qmultiinputcontext.cpp | 26 ++++----
 .../inputmethods/imsw-multi/qmultiinputcontext.h   | 26 ++++----
 .../imsw-multi/qmultiinputcontextplugin.cpp        | 26 ++++----
 .../imsw-multi/qmultiinputcontextplugin.h          | 26 ++++----
 src/plugins/kbddrivers/linuxinput/main.cpp         | 26 ++++----
 src/plugins/mousedrivers/linuxtp/main.cpp          | 26 ++++----
 src/plugins/mousedrivers/pc/main.cpp               | 26 ++++----
 src/plugins/mousedrivers/tslib/main.cpp            | 26 ++++----
 src/plugins/s60/src/qcoreapplication_3_1.cpp       | 26 ++++----
 src/plugins/s60/src/qcoreapplication_3_2.cpp       | 26 ++++----
 src/plugins/s60/src/qdesktopservices_3_1.cpp       | 26 ++++----
 src/plugins/s60/src/qdesktopservices_3_2.cpp       | 26 ++++----
 src/plugins/s60/src/qlocale_3_1.cpp                | 26 ++++----
 src/plugins/s60/src/qlocale_3_2.cpp                | 26 ++++----
 src/plugins/script/qtdbus/main.cpp                 | 26 ++++----
 src/plugins/script/qtdbus/main.h                   | 26 ++++----
 src/plugins/sqldrivers/db2/main.cpp                | 26 ++++----
 src/plugins/sqldrivers/ibase/main.cpp              | 26 ++++----
 src/plugins/sqldrivers/mysql/main.cpp              | 26 ++++----
 src/plugins/sqldrivers/oci/main.cpp                | 26 ++++----
 src/plugins/sqldrivers/odbc/main.cpp               | 26 ++++----
 src/plugins/sqldrivers/psql/main.cpp               | 26 ++++----
 src/plugins/sqldrivers/sqlite/smain.cpp            | 26 ++++----
 src/plugins/sqldrivers/sqlite2/smain.cpp           | 26 ++++----
 src/plugins/sqldrivers/tds/main.cpp                | 26 ++++----
 src/qt3support/canvas/q3canvas.cpp                 | 26 ++++----
 src/qt3support/canvas/q3canvas.h                   | 26 ++++----
 src/qt3support/dialogs/q3filedialog.cpp            | 26 ++++----
 src/qt3support/dialogs/q3filedialog.h              | 26 ++++----
 src/qt3support/dialogs/q3filedialog_mac.cpp        | 26 ++++----
 src/qt3support/dialogs/q3filedialog_win.cpp        | 26 ++++----
 src/qt3support/dialogs/q3progressdialog.cpp        | 26 ++++----
 src/qt3support/dialogs/q3progressdialog.h          | 26 ++++----
 src/qt3support/dialogs/q3tabdialog.cpp             | 26 ++++----
 src/qt3support/dialogs/q3tabdialog.h               | 26 ++++----
 src/qt3support/dialogs/q3wizard.cpp                | 26 ++++----
 src/qt3support/dialogs/q3wizard.h                  | 26 ++++----
 src/qt3support/itemviews/q3iconview.cpp            | 26 ++++----
 src/qt3support/itemviews/q3iconview.h              | 26 ++++----
 src/qt3support/itemviews/q3listbox.cpp             | 26 ++++----
 src/qt3support/itemviews/q3listbox.h               | 26 ++++----
 src/qt3support/itemviews/q3listview.cpp            | 26 ++++----
 src/qt3support/itemviews/q3listview.h              | 26 ++++----
 src/qt3support/itemviews/q3table.cpp               | 26 ++++----
 src/qt3support/itemviews/q3table.h                 | 26 ++++----
 src/qt3support/network/q3dns.cpp                   | 26 ++++----
 src/qt3support/network/q3dns.h                     | 26 ++++----
 src/qt3support/network/q3ftp.cpp                   | 26 ++++----
 src/qt3support/network/q3ftp.h                     | 26 ++++----
 src/qt3support/network/q3http.cpp                  | 26 ++++----
 src/qt3support/network/q3http.h                    | 26 ++++----
 src/qt3support/network/q3localfs.cpp               | 26 ++++----
 src/qt3support/network/q3localfs.h                 | 26 ++++----
 src/qt3support/network/q3network.cpp               | 26 ++++----
 src/qt3support/network/q3network.h                 | 26 ++++----
 src/qt3support/network/q3networkprotocol.cpp       | 26 ++++----
 src/qt3support/network/q3networkprotocol.h         | 26 ++++----
 src/qt3support/network/q3serversocket.cpp          | 26 ++++----
 src/qt3support/network/q3serversocket.h            | 26 ++++----
 src/qt3support/network/q3socket.cpp                | 26 ++++----
 src/qt3support/network/q3socket.h                  | 26 ++++----
 src/qt3support/network/q3socketdevice.cpp          | 26 ++++----
 src/qt3support/network/q3socketdevice.h            | 26 ++++----
 src/qt3support/network/q3socketdevice_unix.cpp     | 26 ++++----
 src/qt3support/network/q3socketdevice_win.cpp      | 26 ++++----
 src/qt3support/network/q3url.cpp                   | 26 ++++----
 src/qt3support/network/q3url.h                     | 26 ++++----
 src/qt3support/network/q3urloperator.cpp           | 26 ++++----
 src/qt3support/network/q3urloperator.h             | 26 ++++----
 src/qt3support/other/q3accel.cpp                   | 26 ++++----
 src/qt3support/other/q3accel.h                     | 26 ++++----
 src/qt3support/other/q3boxlayout.cpp               | 26 ++++----
 src/qt3support/other/q3boxlayout.h                 | 26 ++++----
 src/qt3support/other/q3dragobject.cpp              | 26 ++++----
 src/qt3support/other/q3dragobject.h                | 26 ++++----
 src/qt3support/other/q3dropsite.cpp                | 26 ++++----
 src/qt3support/other/q3dropsite.h                  | 26 ++++----
 src/qt3support/other/q3gridlayout.h                | 26 ++++----
 src/qt3support/other/q3membuf.cpp                  | 26 ++++----
 src/qt3support/other/q3membuf_p.h                  | 26 ++++----
 src/qt3support/other/q3mimefactory.cpp             | 26 ++++----
 src/qt3support/other/q3mimefactory.h               | 26 ++++----
 src/qt3support/other/q3polygonscanner.cpp          | 26 ++++----
 src/qt3support/other/q3polygonscanner.h            | 26 ++++----
 src/qt3support/other/q3process.cpp                 | 26 ++++----
 src/qt3support/other/q3process.h                   | 26 ++++----
 src/qt3support/other/q3process_unix.cpp            | 26 ++++----
 src/qt3support/other/q3process_win.cpp             | 26 ++++----
 src/qt3support/other/qiconset.h                    | 26 ++++----
 src/qt3support/other/qt_compat_pch.h               | 26 ++++----
 src/qt3support/painting/q3paintdevicemetrics.cpp   | 26 ++++----
 src/qt3support/painting/q3paintdevicemetrics.h     | 26 ++++----
 src/qt3support/painting/q3paintengine_svg.cpp      | 26 ++++----
 src/qt3support/painting/q3paintengine_svg_p.h      | 26 ++++----
 src/qt3support/painting/q3painter.cpp              | 26 ++++----
 src/qt3support/painting/q3painter.h                | 26 ++++----
 src/qt3support/painting/q3picture.cpp              | 26 ++++----
 src/qt3support/painting/q3picture.h                | 26 ++++----
 src/qt3support/painting/q3pointarray.cpp           | 26 ++++----
 src/qt3support/painting/q3pointarray.h             | 26 ++++----
 src/qt3support/sql/q3databrowser.cpp               | 26 ++++----
 src/qt3support/sql/q3databrowser.h                 | 26 ++++----
 src/qt3support/sql/q3datatable.cpp                 | 26 ++++----
 src/qt3support/sql/q3datatable.h                   | 26 ++++----
 src/qt3support/sql/q3dataview.cpp                  | 26 ++++----
 src/qt3support/sql/q3dataview.h                    | 26 ++++----
 src/qt3support/sql/q3editorfactory.cpp             | 26 ++++----
 src/qt3support/sql/q3editorfactory.h               | 26 ++++----
 src/qt3support/sql/q3sqlcursor.cpp                 | 26 ++++----
 src/qt3support/sql/q3sqlcursor.h                   | 26 ++++----
 src/qt3support/sql/q3sqleditorfactory.cpp          | 26 ++++----
 src/qt3support/sql/q3sqleditorfactory.h            | 26 ++++----
 src/qt3support/sql/q3sqlfieldinfo.h                | 26 ++++----
 src/qt3support/sql/q3sqlform.cpp                   | 26 ++++----
 src/qt3support/sql/q3sqlform.h                     | 26 ++++----
 src/qt3support/sql/q3sqlmanager_p.cpp              | 26 ++++----
 src/qt3support/sql/q3sqlmanager_p.h                | 26 ++++----
 src/qt3support/sql/q3sqlpropertymap.cpp            | 26 ++++----
 src/qt3support/sql/q3sqlpropertymap.h              | 26 ++++----
 src/qt3support/sql/q3sqlrecordinfo.h               | 26 ++++----
 src/qt3support/sql/q3sqlselectcursor.cpp           | 26 ++++----
 src/qt3support/sql/q3sqlselectcursor.h             | 26 ++++----
 src/qt3support/text/q3multilineedit.cpp            | 26 ++++----
 src/qt3support/text/q3multilineedit.h              | 26 ++++----
 src/qt3support/text/q3richtext.cpp                 | 26 ++++----
 src/qt3support/text/q3richtext_p.cpp               | 26 ++++----
 src/qt3support/text/q3richtext_p.h                 | 26 ++++----
 src/qt3support/text/q3simplerichtext.cpp           | 26 ++++----
 src/qt3support/text/q3simplerichtext.h             | 26 ++++----
 src/qt3support/text/q3stylesheet.cpp               | 26 ++++----
 src/qt3support/text/q3stylesheet.h                 | 26 ++++----
 src/qt3support/text/q3syntaxhighlighter.cpp        | 26 ++++----
 src/qt3support/text/q3syntaxhighlighter.h          | 26 ++++----
 src/qt3support/text/q3syntaxhighlighter_p.h        | 26 ++++----
 src/qt3support/text/q3textbrowser.cpp              | 26 ++++----
 src/qt3support/text/q3textbrowser.h                | 26 ++++----
 src/qt3support/text/q3textedit.cpp                 | 26 ++++----
 src/qt3support/text/q3textedit.h                   | 26 ++++----
 src/qt3support/text/q3textstream.cpp               | 26 ++++----
 src/qt3support/text/q3textstream.h                 | 26 ++++----
 src/qt3support/text/q3textview.cpp                 | 26 ++++----
 src/qt3support/text/q3textview.h                   | 26 ++++----
 src/qt3support/tools/q3asciicache.h                | 26 ++++----
 src/qt3support/tools/q3asciidict.h                 | 26 ++++----
 src/qt3support/tools/q3cache.h                     | 26 ++++----
 src/qt3support/tools/q3cleanuphandler.h            | 26 ++++----
 src/qt3support/tools/q3cstring.cpp                 | 26 ++++----
 src/qt3support/tools/q3cstring.h                   | 26 ++++----
 src/qt3support/tools/q3deepcopy.cpp                | 26 ++++----
 src/qt3support/tools/q3deepcopy.h                  | 26 ++++----
 src/qt3support/tools/q3dict.h                      | 26 ++++----
 src/qt3support/tools/q3garray.cpp                  | 26 ++++----
 src/qt3support/tools/q3garray.h                    | 26 ++++----
 src/qt3support/tools/q3gcache.cpp                  | 26 ++++----
 src/qt3support/tools/q3gcache.h                    | 26 ++++----
 src/qt3support/tools/q3gdict.cpp                   | 26 ++++----
 src/qt3support/tools/q3gdict.h                     | 26 ++++----
 src/qt3support/tools/q3glist.cpp                   | 26 ++++----
 src/qt3support/tools/q3glist.h                     | 26 ++++----
 src/qt3support/tools/q3gvector.cpp                 | 26 ++++----
 src/qt3support/tools/q3gvector.h                   | 26 ++++----
 src/qt3support/tools/q3intcache.h                  | 26 ++++----
 src/qt3support/tools/q3intdict.h                   | 26 ++++----
 src/qt3support/tools/q3memarray.h                  | 26 ++++----
 src/qt3support/tools/q3objectdict.h                | 26 ++++----
 src/qt3support/tools/q3ptrcollection.cpp           | 26 ++++----
 src/qt3support/tools/q3ptrcollection.h             | 26 ++++----
 src/qt3support/tools/q3ptrdict.h                   | 26 ++++----
 src/qt3support/tools/q3ptrlist.h                   | 26 ++++----
 src/qt3support/tools/q3ptrqueue.h                  | 26 ++++----
 src/qt3support/tools/q3ptrstack.h                  | 26 ++++----
 src/qt3support/tools/q3ptrvector.h                 | 26 ++++----
 src/qt3support/tools/q3semaphore.cpp               | 26 ++++----
 src/qt3support/tools/q3semaphore.h                 | 26 ++++----
 src/qt3support/tools/q3shared.cpp                  | 26 ++++----
 src/qt3support/tools/q3shared.h                    | 26 ++++----
 src/qt3support/tools/q3signal.cpp                  | 26 ++++----
 src/qt3support/tools/q3signal.h                    | 26 ++++----
 src/qt3support/tools/q3sortedlist.h                | 26 ++++----
 src/qt3support/tools/q3strlist.h                   | 26 ++++----
 src/qt3support/tools/q3strvec.h                    | 26 ++++----
 src/qt3support/tools/q3tl.h                        | 26 ++++----
 src/qt3support/tools/q3valuelist.h                 | 26 ++++----
 src/qt3support/tools/q3valuestack.h                | 26 ++++----
 src/qt3support/tools/q3valuevector.h               | 26 ++++----
 src/qt3support/widgets/q3action.cpp                | 26 ++++----
 src/qt3support/widgets/q3action.h                  | 26 ++++----
 src/qt3support/widgets/q3button.cpp                | 26 ++++----
 src/qt3support/widgets/q3button.h                  | 26 ++++----
 src/qt3support/widgets/q3buttongroup.cpp           | 26 ++++----
 src/qt3support/widgets/q3buttongroup.h             | 26 ++++----
 src/qt3support/widgets/q3combobox.cpp              | 26 ++++----
 src/qt3support/widgets/q3combobox.h                | 26 ++++----
 src/qt3support/widgets/q3datetimeedit.cpp          | 26 ++++----
 src/qt3support/widgets/q3datetimeedit.h            | 26 ++++----
 src/qt3support/widgets/q3dockarea.cpp              | 26 ++++----
 src/qt3support/widgets/q3dockarea.h                | 26 ++++----
 src/qt3support/widgets/q3dockwindow.cpp            | 26 ++++----
 src/qt3support/widgets/q3dockwindow.h              | 26 ++++----
 src/qt3support/widgets/q3frame.cpp                 | 26 ++++----
 src/qt3support/widgets/q3frame.h                   | 26 ++++----
 src/qt3support/widgets/q3grid.cpp                  | 26 ++++----
 src/qt3support/widgets/q3grid.h                    | 26 ++++----
 src/qt3support/widgets/q3gridview.cpp              | 26 ++++----
 src/qt3support/widgets/q3gridview.h                | 26 ++++----
 src/qt3support/widgets/q3groupbox.cpp              | 26 ++++----
 src/qt3support/widgets/q3groupbox.h                | 26 ++++----
 src/qt3support/widgets/q3hbox.cpp                  | 26 ++++----
 src/qt3support/widgets/q3hbox.h                    | 26 ++++----
 src/qt3support/widgets/q3header.cpp                | 26 ++++----
 src/qt3support/widgets/q3header.h                  | 26 ++++----
 src/qt3support/widgets/q3hgroupbox.cpp             | 26 ++++----
 src/qt3support/widgets/q3hgroupbox.h               | 26 ++++----
 src/qt3support/widgets/q3mainwindow.cpp            | 26 ++++----
 src/qt3support/widgets/q3mainwindow.h              | 26 ++++----
 src/qt3support/widgets/q3mainwindow_p.h            | 26 ++++----
 src/qt3support/widgets/q3popupmenu.cpp             | 26 ++++----
 src/qt3support/widgets/q3popupmenu.h               | 26 ++++----
 src/qt3support/widgets/q3progressbar.cpp           | 26 ++++----
 src/qt3support/widgets/q3progressbar.h             | 26 ++++----
 src/qt3support/widgets/q3rangecontrol.cpp          | 26 ++++----
 src/qt3support/widgets/q3rangecontrol.h            | 26 ++++----
 src/qt3support/widgets/q3scrollview.cpp            | 26 ++++----
 src/qt3support/widgets/q3scrollview.h              | 26 ++++----
 src/qt3support/widgets/q3spinwidget.cpp            | 26 ++++----
 src/qt3support/widgets/q3titlebar.cpp              | 26 ++++----
 src/qt3support/widgets/q3titlebar_p.h              | 26 ++++----
 src/qt3support/widgets/q3toolbar.cpp               | 26 ++++----
 src/qt3support/widgets/q3toolbar.h                 | 26 ++++----
 src/qt3support/widgets/q3vbox.cpp                  | 26 ++++----
 src/qt3support/widgets/q3vbox.h                    | 26 ++++----
 src/qt3support/widgets/q3vgroupbox.cpp             | 26 ++++----
 src/qt3support/widgets/q3vgroupbox.h               | 26 ++++----
 src/qt3support/widgets/q3whatsthis.cpp             | 26 ++++----
 src/qt3support/widgets/q3whatsthis.h               | 26 ++++----
 src/qt3support/widgets/q3widgetstack.cpp           | 26 ++++----
 src/qt3support/widgets/q3widgetstack.h             | 26 ++++----
 src/script/parser/make-parser.sh                   | 26 ++++----
 src/script/parser/qscript.g                        | 52 +++++++--------
 .../debugging/qscriptbreakpointdata.cpp            | 26 ++++----
 .../debugging/qscriptbreakpointdata_p.h            | 26 ++++----
 .../debugging/qscriptbreakpointsmodel.cpp          | 26 ++++----
 .../debugging/qscriptbreakpointsmodel_p.h          | 26 ++++----
 .../debugging/qscriptbreakpointswidget.cpp         | 26 ++++----
 .../debugging/qscriptbreakpointswidget_p.h         | 26 ++++----
 .../qscriptbreakpointswidgetinterface.cpp          | 26 ++++----
 .../qscriptbreakpointswidgetinterface_p.h          | 26 ++++----
 .../qscriptbreakpointswidgetinterface_p_p.h        | 26 ++++----
 .../qscriptcompletionproviderinterface_p.h         | 26 ++++----
 .../debugging/qscriptcompletiontask.cpp            | 26 ++++----
 .../debugging/qscriptcompletiontask_p.h            | 26 ++++----
 .../debugging/qscriptcompletiontaskinterface.cpp   | 26 ++++----
 .../debugging/qscriptcompletiontaskinterface_p.h   | 26 ++++----
 .../debugging/qscriptcompletiontaskinterface_p_p.h | 26 ++++----
 src/scripttools/debugging/qscriptdebugger.cpp      | 26 ++++----
 src/scripttools/debugging/qscriptdebugger_p.h      | 26 ++++----
 src/scripttools/debugging/qscriptdebuggeragent.cpp | 26 ++++----
 src/scripttools/debugging/qscriptdebuggeragent_p.h | 26 ++++----
 .../debugging/qscriptdebuggeragent_p_p.h           | 26 ++++----
 .../debugging/qscriptdebuggerbackend.cpp           | 26 ++++----
 .../debugging/qscriptdebuggerbackend_p.h           | 26 ++++----
 .../debugging/qscriptdebuggerbackend_p_p.h         | 26 ++++----
 .../debugging/qscriptdebuggercodefinderwidget.cpp  | 26 ++++----
 .../debugging/qscriptdebuggercodefinderwidget_p.h  | 26 ++++----
 .../qscriptdebuggercodefinderwidgetinterface.cpp   | 26 ++++----
 .../qscriptdebuggercodefinderwidgetinterface_p.h   | 26 ++++----
 .../qscriptdebuggercodefinderwidgetinterface_p_p.h | 26 ++++----
 .../debugging/qscriptdebuggercodeview.cpp          | 26 ++++----
 .../debugging/qscriptdebuggercodeview_p.h          | 26 ++++----
 .../debugging/qscriptdebuggercodeviewinterface.cpp | 26 ++++----
 .../debugging/qscriptdebuggercodeviewinterface_p.h | 26 ++++----
 .../qscriptdebuggercodeviewinterface_p_p.h         | 26 ++++----
 .../debugging/qscriptdebuggercodewidget.cpp        | 26 ++++----
 .../debugging/qscriptdebuggercodewidget_p.h        | 26 ++++----
 .../qscriptdebuggercodewidgetinterface.cpp         | 26 ++++----
 .../qscriptdebuggercodewidgetinterface_p.h         | 26 ++++----
 .../qscriptdebuggercodewidgetinterface_p_p.h       | 26 ++++----
 .../debugging/qscriptdebuggercommand.cpp           | 26 ++++----
 .../debugging/qscriptdebuggercommand_p.h           | 26 ++++----
 .../debugging/qscriptdebuggercommandexecutor.cpp   | 26 ++++----
 .../debugging/qscriptdebuggercommandexecutor_p.h   | 26 ++++----
 .../qscriptdebuggercommandschedulerfrontend.cpp    | 26 ++++----
 .../qscriptdebuggercommandschedulerfrontend_p.h    | 26 ++++----
 .../qscriptdebuggercommandschedulerinterface_p.h   | 26 ++++----
 .../qscriptdebuggercommandschedulerjob.cpp         | 26 ++++----
 .../qscriptdebuggercommandschedulerjob_p.h         | 26 ++++----
 .../qscriptdebuggercommandschedulerjob_p_p.h       | 26 ++++----
 .../debugging/qscriptdebuggerconsole.cpp           | 26 ++++----
 .../debugging/qscriptdebuggerconsole_p.h           | 26 ++++----
 .../debugging/qscriptdebuggerconsolecommand.cpp    | 26 ++++----
 .../debugging/qscriptdebuggerconsolecommand_p.h    | 26 ++++----
 .../debugging/qscriptdebuggerconsolecommand_p_p.h  | 26 ++++----
 .../qscriptdebuggerconsolecommandgroupdata.cpp     | 26 ++++----
 .../qscriptdebuggerconsolecommandgroupdata_p.h     | 26 ++++----
 .../debugging/qscriptdebuggerconsolecommandjob.cpp | 26 ++++----
 .../debugging/qscriptdebuggerconsolecommandjob_p.h | 26 ++++----
 .../qscriptdebuggerconsolecommandjob_p_p.h         | 26 ++++----
 .../qscriptdebuggerconsolecommandmanager.cpp       | 26 ++++----
 .../qscriptdebuggerconsolecommandmanager_p.h       | 26 ++++----
 .../qscriptdebuggerconsoleglobalobject.cpp         | 26 ++++----
 .../qscriptdebuggerconsoleglobalobject_p.h         | 26 ++++----
 .../qscriptdebuggerconsolehistorianinterface_p.h   | 26 ++++----
 .../debugging/qscriptdebuggerconsolewidget.cpp     | 26 ++++----
 .../debugging/qscriptdebuggerconsolewidget_p.h     | 26 ++++----
 .../qscriptdebuggerconsolewidgetinterface.cpp      | 26 ++++----
 .../qscriptdebuggerconsolewidgetinterface_p.h      | 26 ++++----
 .../qscriptdebuggerconsolewidgetinterface_p_p.h    | 26 ++++----
 src/scripttools/debugging/qscriptdebuggerevent.cpp | 26 ++++----
 src/scripttools/debugging/qscriptdebuggerevent_p.h | 26 ++++----
 .../qscriptdebuggereventhandlerinterface_p.h       | 26 ++++----
 .../debugging/qscriptdebuggerfrontend.cpp          | 26 ++++----
 .../debugging/qscriptdebuggerfrontend_p.h          | 26 ++++----
 .../debugging/qscriptdebuggerfrontend_p_p.h        | 26 ++++----
 src/scripttools/debugging/qscriptdebuggerjob.cpp   | 26 ++++----
 src/scripttools/debugging/qscriptdebuggerjob_p.h   | 26 ++++----
 src/scripttools/debugging/qscriptdebuggerjob_p_p.h | 26 ++++----
 .../qscriptdebuggerjobschedulerinterface_p.h       | 26 ++++----
 .../debugging/qscriptdebuggerlocalsmodel.cpp       | 26 ++++----
 .../debugging/qscriptdebuggerlocalsmodel_p.h       | 26 ++++----
 .../debugging/qscriptdebuggerlocalswidget.cpp      | 26 ++++----
 .../debugging/qscriptdebuggerlocalswidget_p.h      | 26 ++++----
 .../qscriptdebuggerlocalswidgetinterface.cpp       | 26 ++++----
 .../qscriptdebuggerlocalswidgetinterface_p.h       | 26 ++++----
 .../qscriptdebuggerlocalswidgetinterface_p_p.h     | 26 ++++----
 .../qscriptdebuggerobjectsnapshotdelta_p.h         | 26 ++++----
 .../debugging/qscriptdebuggerresponse.cpp          | 26 ++++----
 .../debugging/qscriptdebuggerresponse_p.h          | 26 ++++----
 .../qscriptdebuggerresponsehandlerinterface_p.h    | 26 ++++----
 .../qscriptdebuggerscriptedconsolecommand.cpp      | 26 ++++----
 .../qscriptdebuggerscriptedconsolecommand_p.h      | 26 ++++----
 .../debugging/qscriptdebuggerscriptsmodel.cpp      | 26 ++++----
 .../debugging/qscriptdebuggerscriptsmodel_p.h      | 26 ++++----
 .../debugging/qscriptdebuggerscriptswidget.cpp     | 26 ++++----
 .../debugging/qscriptdebuggerscriptswidget_p.h     | 26 ++++----
 .../qscriptdebuggerscriptswidgetinterface.cpp      | 26 ++++----
 .../qscriptdebuggerscriptswidgetinterface_p.h      | 26 ++++----
 .../qscriptdebuggerscriptswidgetinterface_p_p.h    | 26 ++++----
 .../debugging/qscriptdebuggerstackmodel.cpp        | 26 ++++----
 .../debugging/qscriptdebuggerstackmodel_p.h        | 26 ++++----
 .../debugging/qscriptdebuggerstackwidget.cpp       | 26 ++++----
 .../debugging/qscriptdebuggerstackwidget_p.h       | 26 ++++----
 .../qscriptdebuggerstackwidgetinterface.cpp        | 26 ++++----
 .../qscriptdebuggerstackwidgetinterface_p.h        | 26 ++++----
 .../qscriptdebuggerstackwidgetinterface_p_p.h      | 26 ++++----
 .../qscriptdebuggerstandardwidgetfactory.cpp       | 26 ++++----
 .../qscriptdebuggerstandardwidgetfactory_p.h       | 26 ++++----
 src/scripttools/debugging/qscriptdebuggervalue.cpp | 26 ++++----
 src/scripttools/debugging/qscriptdebuggervalue_p.h | 26 ++++----
 .../debugging/qscriptdebuggervalueproperty.cpp     | 26 ++++----
 .../debugging/qscriptdebuggervalueproperty_p.h     | 26 ++++----
 .../qscriptdebuggerwidgetfactoryinterface_p.h      | 26 ++++----
 .../debugging/qscriptdebugoutputwidget.cpp         | 26 ++++----
 .../debugging/qscriptdebugoutputwidget_p.h         | 26 ++++----
 .../qscriptdebugoutputwidgetinterface.cpp          | 26 ++++----
 .../qscriptdebugoutputwidgetinterface_p.h          | 26 ++++----
 .../qscriptdebugoutputwidgetinterface_p_p.h        | 26 ++++----
 src/scripttools/debugging/qscriptedit.cpp          | 26 ++++----
 src/scripttools/debugging/qscriptedit_p.h          | 26 ++++----
 .../debugging/qscriptenginedebugger.cpp            | 26 ++++----
 src/scripttools/debugging/qscriptenginedebugger.h  | 26 ++++----
 .../debugging/qscriptenginedebuggerfrontend.cpp    | 26 ++++----
 .../debugging/qscriptenginedebuggerfrontend_p.h    | 26 ++++----
 .../debugging/qscripterrorlogwidget.cpp            | 26 ++++----
 .../debugging/qscripterrorlogwidget_p.h            | 26 ++++----
 .../debugging/qscripterrorlogwidgetinterface.cpp   | 26 ++++----
 .../debugging/qscripterrorlogwidgetinterface_p.h   | 26 ++++----
 .../debugging/qscripterrorlogwidgetinterface_p_p.h | 26 ++++----
 .../debugging/qscriptmessagehandlerinterface_p.h   | 26 ++++----
 .../debugging/qscriptobjectsnapshot.cpp            | 26 ++++----
 .../debugging/qscriptobjectsnapshot_p.h            | 26 ++++----
 src/scripttools/debugging/qscriptscriptdata.cpp    | 26 ++++----
 src/scripttools/debugging/qscriptscriptdata_p.h    | 26 ++++----
 .../debugging/qscriptstdmessagehandler.cpp         | 26 ++++----
 .../debugging/qscriptstdmessagehandler_p.h         | 26 ++++----
 .../debugging/qscriptsyntaxhighlighter.cpp         | 26 ++++----
 .../debugging/qscriptsyntaxhighlighter_p.h         | 26 ++++----
 .../debugging/qscripttooltipproviderinterface_p.h  | 26 ++++----
 src/scripttools/debugging/qscriptvalueproperty.cpp | 26 ++++----
 src/scripttools/debugging/qscriptvalueproperty_p.h | 26 ++++----
 src/scripttools/debugging/qscriptxmlparser.cpp     | 26 ++++----
 src/scripttools/debugging/qscriptxmlparser_p.h     | 26 ++++----
 src/sql/drivers/db2/qsql_db2.cpp                   | 26 ++++----
 src/sql/drivers/db2/qsql_db2.h                     | 26 ++++----
 src/sql/drivers/ibase/qsql_ibase.cpp               | 26 ++++----
 src/sql/drivers/ibase/qsql_ibase.h                 | 26 ++++----
 src/sql/drivers/mysql/qsql_mysql.cpp               | 26 ++++----
 src/sql/drivers/mysql/qsql_mysql.h                 | 26 ++++----
 src/sql/drivers/oci/qsql_oci.cpp                   | 26 ++++----
 src/sql/drivers/oci/qsql_oci.h                     | 26 ++++----
 src/sql/drivers/odbc/qsql_odbc.cpp                 | 26 ++++----
 src/sql/drivers/odbc/qsql_odbc.h                   | 26 ++++----
 src/sql/drivers/psql/qsql_psql.cpp                 | 26 ++++----
 src/sql/drivers/psql/qsql_psql.h                   | 26 ++++----
 src/sql/drivers/sqlite/qsql_sqlite.cpp             | 26 ++++----
 src/sql/drivers/sqlite/qsql_sqlite.h               | 26 ++++----
 src/sql/drivers/sqlite2/qsql_sqlite2.cpp           | 26 ++++----
 src/sql/drivers/sqlite2/qsql_sqlite2.h             | 26 ++++----
 src/sql/drivers/tds/qsql_tds.cpp                   | 26 ++++----
 src/sql/drivers/tds/qsql_tds.h                     | 26 ++++----
 src/sql/kernel/qsql.h                              | 26 ++++----
 src/sql/kernel/qsqlcachedresult.cpp                | 26 ++++----
 src/sql/kernel/qsqlcachedresult_p.h                | 26 ++++----
 src/sql/kernel/qsqldatabase.cpp                    | 26 ++++----
 src/sql/kernel/qsqldatabase.h                      | 26 ++++----
 src/sql/kernel/qsqldriver.cpp                      | 26 ++++----
 src/sql/kernel/qsqldriver.h                        | 26 ++++----
 src/sql/kernel/qsqldriverplugin.cpp                | 26 ++++----
 src/sql/kernel/qsqldriverplugin.h                  | 26 ++++----
 src/sql/kernel/qsqlerror.cpp                       | 26 ++++----
 src/sql/kernel/qsqlerror.h                         | 26 ++++----
 src/sql/kernel/qsqlfield.cpp                       | 26 ++++----
 src/sql/kernel/qsqlfield.h                         | 26 ++++----
 src/sql/kernel/qsqlindex.cpp                       | 26 ++++----
 src/sql/kernel/qsqlindex.h                         | 26 ++++----
 src/sql/kernel/qsqlnulldriver_p.h                  | 26 ++++----
 src/sql/kernel/qsqlquery.cpp                       | 26 ++++----
 src/sql/kernel/qsqlquery.h                         | 26 ++++----
 src/sql/kernel/qsqlrecord.cpp                      | 26 ++++----
 src/sql/kernel/qsqlrecord.h                        | 26 ++++----
 src/sql/kernel/qsqlresult.cpp                      | 26 ++++----
 src/sql/kernel/qsqlresult.h                        | 26 ++++----
 src/sql/models/qsqlquerymodel.cpp                  | 26 ++++----
 src/sql/models/qsqlquerymodel.h                    | 26 ++++----
 src/sql/models/qsqlquerymodel_p.h                  | 26 ++++----
 src/sql/models/qsqlrelationaldelegate.cpp          | 26 ++++----
 src/sql/models/qsqlrelationaldelegate.h            | 26 ++++----
 src/sql/models/qsqlrelationaltablemodel.cpp        | 26 ++++----
 src/sql/models/qsqlrelationaltablemodel.h          | 26 ++++----
 src/sql/models/qsqltablemodel.cpp                  | 26 ++++----
 src/sql/models/qsqltablemodel.h                    | 26 ++++----
 src/sql/models/qsqltablemodel_p.h                  | 26 ++++----
 src/svg/qgraphicssvgitem.cpp                       | 26 ++++----
 src/svg/qgraphicssvgitem.h                         | 26 ++++----
 src/svg/qsvgfont.cpp                               | 26 ++++----
 src/svg/qsvgfont_p.h                               | 26 ++++----
 src/svg/qsvggenerator.cpp                          | 26 ++++----
 src/svg/qsvggenerator.h                            | 26 ++++----
 src/svg/qsvggraphics.cpp                           | 26 ++++----
 src/svg/qsvggraphics_p.h                           | 26 ++++----
 src/svg/qsvghandler.cpp                            | 26 ++++----
 src/svg/qsvghandler_p.h                            | 26 ++++----
 src/svg/qsvgnode.cpp                               | 26 ++++----
 src/svg/qsvgnode_p.h                               | 26 ++++----
 src/svg/qsvgrenderer.cpp                           | 26 ++++----
 src/svg/qsvgrenderer.h                             | 26 ++++----
 src/svg/qsvgstructure.cpp                          | 26 ++++----
 src/svg/qsvgstructure_p.h                          | 26 ++++----
 src/svg/qsvgstyle.cpp                              | 26 ++++----
 src/svg/qsvgstyle_p.h                              | 26 ++++----
 src/svg/qsvgtinydocument.cpp                       | 26 ++++----
 src/svg/qsvgtinydocument_p.h                       | 26 ++++----
 src/svg/qsvgwidget.cpp                             | 26 ++++----
 src/svg/qsvgwidget.h                               | 26 ++++----
 src/testlib/qabstracttestlogger.cpp                | 26 ++++----
 src/testlib/qabstracttestlogger_p.h                | 26 ++++----
 src/testlib/qasciikey.cpp                          | 26 ++++----
 src/testlib/qbenchmark.cpp                         | 26 ++++----
 src/testlib/qbenchmark.h                           | 26 ++++----
 src/testlib/qbenchmark_p.h                         | 26 ++++----
 src/testlib/qbenchmarkevent.cpp                    | 26 ++++----
 src/testlib/qbenchmarkevent_p.h                    | 26 ++++----
 src/testlib/qbenchmarkmeasurement.cpp              | 26 ++++----
 src/testlib/qbenchmarkmeasurement_p.h              | 26 ++++----
 src/testlib/qbenchmarkmetric.cpp                   | 26 ++++----
 src/testlib/qbenchmarkmetric.h                     | 26 ++++----
 src/testlib/qbenchmarkmetric_p.h                   | 26 ++++----
 src/testlib/qbenchmarkvalgrind.cpp                 | 26 ++++----
 src/testlib/qbenchmarkvalgrind_p.h                 | 26 ++++----
 src/testlib/qplaintestlogger.cpp                   | 26 ++++----
 src/testlib/qplaintestlogger_p.h                   | 26 ++++----
 src/testlib/qsignaldumper.cpp                      | 26 ++++----
 src/testlib/qsignaldumper_p.h                      | 26 ++++----
 src/testlib/qsignalspy.h                           | 26 ++++----
 src/testlib/qtest.h                                | 26 ++++----
 src/testlib/qtest_global.h                         | 26 ++++----
 src/testlib/qtest_gui.h                            | 26 ++++----
 src/testlib/qtestaccessible.h                      | 26 ++++----
 src/testlib/qtestassert.h                          | 26 ++++----
 src/testlib/qtestbasicstreamer.cpp                 | 26 ++++----
 src/testlib/qtestbasicstreamer.h                   | 26 ++++----
 src/testlib/qtestcase.cpp                          | 26 ++++----
 src/testlib/qtestcase.h                            | 26 ++++----
 src/testlib/qtestcoreelement.h                     | 26 ++++----
 src/testlib/qtestcorelist.h                        | 26 ++++----
 src/testlib/qtestdata.cpp                          | 26 ++++----
 src/testlib/qtestdata.h                            | 26 ++++----
 src/testlib/qtestelement.cpp                       | 26 ++++----
 src/testlib/qtestelement.h                         | 26 ++++----
 src/testlib/qtestelementattribute.cpp              | 26 ++++----
 src/testlib/qtestelementattribute.h                | 26 ++++----
 src/testlib/qtestevent.h                           | 26 ++++----
 src/testlib/qtesteventloop.h                       | 26 ++++----
 src/testlib/qtestfilelogger.cpp                    | 26 ++++----
 src/testlib/qtestfilelogger.h                      | 26 ++++----
 src/testlib/qtestkeyboard.h                        | 26 ++++----
 src/testlib/qtestlightxmlstreamer.cpp              | 26 ++++----
 src/testlib/qtestlightxmlstreamer.h                | 26 ++++----
 src/testlib/qtestlog.cpp                           | 26 ++++----
 src/testlib/qtestlog_p.h                           | 26 ++++----
 src/testlib/qtestlogger.cpp                        | 26 ++++----
 src/testlib/qtestlogger_p.h                        | 26 ++++----
 src/testlib/qtestmouse.h                           | 26 ++++----
 src/testlib/qtestresult.cpp                        | 26 ++++----
 src/testlib/qtestresult_p.h                        | 26 ++++----
 src/testlib/qtestspontaneevent.h                   | 26 ++++----
 src/testlib/qtestsystem.h                          | 26 ++++----
 src/testlib/qtesttable.cpp                         | 26 ++++----
 src/testlib/qtesttable_p.h                         | 26 ++++----
 src/testlib/qtesttouch.h                           | 26 ++++----
 src/testlib/qtestxmlstreamer.cpp                   | 26 ++++----
 src/testlib/qtestxmlstreamer.h                     | 26 ++++----
 src/testlib/qtestxunitstreamer.cpp                 | 26 ++++----
 src/testlib/qtestxunitstreamer.h                   | 26 ++++----
 src/testlib/qxmltestlogger.cpp                     | 26 ++++----
 src/testlib/qxmltestlogger_p.h                     | 26 ++++----
 src/tools/idc/main.cpp                             | 26 ++++----
 src/tools/moc/generator.cpp                        | 26 ++++----
 src/tools/moc/generator.h                          | 26 ++++----
 src/tools/moc/keywords.cpp                         | 26 ++++----
 src/tools/moc/main.cpp                             | 26 ++++----
 src/tools/moc/moc.cpp                              | 26 ++++----
 src/tools/moc/moc.h                                | 26 ++++----
 src/tools/moc/mwerks_mac.cpp                       | 26 ++++----
 src/tools/moc/mwerks_mac.h                         | 26 ++++----
 src/tools/moc/outputrevision.h                     | 26 ++++----
 src/tools/moc/parser.cpp                           | 26 ++++----
 src/tools/moc/parser.h                             | 26 ++++----
 src/tools/moc/ppkeywords.cpp                       | 26 ++++----
 src/tools/moc/preprocessor.cpp                     | 26 ++++----
 src/tools/moc/preprocessor.h                       | 26 ++++----
 src/tools/moc/symbols.h                            | 26 ++++----
 src/tools/moc/token.cpp                            | 26 ++++----
 src/tools/moc/token.h                              | 26 ++++----
 src/tools/moc/util/generate.sh                     | 26 ++++----
 src/tools/moc/util/generate_keywords.cpp           | 26 ++++----
 src/tools/moc/util/licenseheader.txt               | 26 ++++----
 src/tools/moc/utils.h                              | 26 ++++----
 src/tools/rcc/main.cpp                             | 26 ++++----
 src/tools/rcc/rcc.cpp                              | 26 ++++----
 src/tools/rcc/rcc.h                                | 26 ++++----
 src/tools/uic/cpp/cppextractimages.cpp             | 26 ++++----
 src/tools/uic/cpp/cppextractimages.h               | 26 ++++----
 src/tools/uic/cpp/cppwritedeclaration.cpp          | 26 ++++----
 src/tools/uic/cpp/cppwritedeclaration.h            | 26 ++++----
 src/tools/uic/cpp/cppwriteicondata.cpp             | 26 ++++----
 src/tools/uic/cpp/cppwriteicondata.h               | 26 ++++----
 src/tools/uic/cpp/cppwriteicondeclaration.cpp      | 26 ++++----
 src/tools/uic/cpp/cppwriteicondeclaration.h        | 26 ++++----
 src/tools/uic/cpp/cppwriteiconinitialization.cpp   | 26 ++++----
 src/tools/uic/cpp/cppwriteiconinitialization.h     | 26 ++++----
 src/tools/uic/cpp/cppwriteincludes.cpp             | 26 ++++----
 src/tools/uic/cpp/cppwriteincludes.h               | 26 ++++----
 src/tools/uic/cpp/cppwriteinitialization.cpp       | 26 ++++----
 src/tools/uic/cpp/cppwriteinitialization.h         | 26 ++++----
 src/tools/uic/customwidgetsinfo.cpp                | 26 ++++----
 src/tools/uic/customwidgetsinfo.h                  | 26 ++++----
 src/tools/uic/databaseinfo.cpp                     | 26 ++++----
 src/tools/uic/databaseinfo.h                       | 26 ++++----
 src/tools/uic/driver.cpp                           | 26 ++++----
 src/tools/uic/driver.h                             | 26 ++++----
 src/tools/uic/globaldefs.h                         | 26 ++++----
 src/tools/uic/main.cpp                             | 26 ++++----
 src/tools/uic/option.h                             | 26 ++++----
 src/tools/uic/treewalker.cpp                       | 26 ++++----
 src/tools/uic/treewalker.h                         | 26 ++++----
 src/tools/uic/ui4.cpp                              | 26 ++++----
 src/tools/uic/ui4.h                                | 26 ++++----
 src/tools/uic/uic.cpp                              | 26 ++++----
 src/tools/uic/uic.h                                | 26 ++++----
 src/tools/uic/utils.h                              | 26 ++++----
 src/tools/uic/validator.cpp                        | 26 ++++----
 src/tools/uic/validator.h                          | 26 ++++----
 src/tools/uic3/converter.cpp                       | 26 ++++----
 src/tools/uic3/deps.cpp                            | 26 ++++----
 src/tools/uic3/domtool.cpp                         | 26 ++++----
 src/tools/uic3/domtool.h                           | 26 ++++----
 src/tools/uic3/embed.cpp                           | 26 ++++----
 src/tools/uic3/form.cpp                            | 26 ++++----
 src/tools/uic3/main.cpp                            | 26 ++++----
 src/tools/uic3/object.cpp                          | 26 ++++----
 src/tools/uic3/parser.cpp                          | 26 ++++----
 src/tools/uic3/parser.h                            | 26 ++++----
 src/tools/uic3/qt3to4.cpp                          | 26 ++++----
 src/tools/uic3/qt3to4.h                            | 26 ++++----
 src/tools/uic3/subclassing.cpp                     | 26 ++++----
 src/tools/uic3/ui3reader.cpp                       | 26 ++++----
 src/tools/uic3/ui3reader.h                         | 26 ++++----
 src/tools/uic3/uic.cpp                             | 26 ++++----
 src/tools/uic3/uic.h                               | 26 ++++----
 src/tools/uic3/widgetinfo.cpp                      | 26 ++++----
 src/tools/uic3/widgetinfo.h                        | 26 ++++----
 src/xml/dom/qdom.cpp                               | 26 ++++----
 src/xml/dom/qdom.h                                 | 26 ++++----
 src/xml/sax/qxml.cpp                               | 26 ++++----
 src/xml/sax/qxml.h                                 | 26 ++++----
 src/xml/stream/qxmlstream.h                        | 26 ++++----
 src/xmlpatterns/Mainpage.dox                       | 26 ++++----
 src/xmlpatterns/acceltree/qacceliterators.cpp      | 26 ++++----
 src/xmlpatterns/acceltree/qacceliterators_p.h      | 26 ++++----
 src/xmlpatterns/acceltree/qacceltree.cpp           | 26 ++++----
 src/xmlpatterns/acceltree/qacceltree_p.h           | 26 ++++----
 src/xmlpatterns/acceltree/qacceltreebuilder.cpp    | 26 ++++----
 src/xmlpatterns/acceltree/qacceltreebuilder_p.h    | 26 ++++----
 .../acceltree/qacceltreeresourceloader.cpp         | 26 ++++----
 .../acceltree/qacceltreeresourceloader_p.h         | 26 ++++----
 .../acceltree/qcompressedwhitespace.cpp            | 26 ++++----
 .../acceltree/qcompressedwhitespace_p.h            | 26 ++++----
 src/xmlpatterns/api/qabstractmessagehandler.cpp    | 26 ++++----
 src/xmlpatterns/api/qabstractmessagehandler.h      | 26 ++++----
 src/xmlpatterns/api/qabstracturiresolver.cpp       | 26 ++++----
 src/xmlpatterns/api/qabstracturiresolver.h         | 26 ++++----
 .../api/qabstractxmlforwarditerator.cpp            | 26 ++++----
 .../api/qabstractxmlforwarditerator_p.h            | 26 ++++----
 src/xmlpatterns/api/qabstractxmlnodemodel.cpp      | 26 ++++----
 src/xmlpatterns/api/qabstractxmlnodemodel.h        | 26 ++++----
 src/xmlpatterns/api/qabstractxmlnodemodel_p.h      | 26 ++++----
 src/xmlpatterns/api/qabstractxmlpullprovider.cpp   | 26 ++++----
 src/xmlpatterns/api/qabstractxmlpullprovider_p.h   | 26 ++++----
 src/xmlpatterns/api/qabstractxmlreceiver.cpp       | 26 ++++----
 src/xmlpatterns/api/qabstractxmlreceiver.h         | 26 ++++----
 src/xmlpatterns/api/qabstractxmlreceiver_p.h       | 26 ++++----
 src/xmlpatterns/api/qcoloringmessagehandler.cpp    | 26 ++++----
 src/xmlpatterns/api/qcoloringmessagehandler_p.h    | 26 ++++----
 src/xmlpatterns/api/qcoloroutput.cpp               | 26 ++++----
 src/xmlpatterns/api/qcoloroutput_p.h               | 26 ++++----
 src/xmlpatterns/api/qdeviceresourceloader_p.h      | 26 ++++----
 src/xmlpatterns/api/qiodevicedelegate.cpp          | 26 ++++----
 src/xmlpatterns/api/qiodevicedelegate_p.h          | 26 ++++----
 src/xmlpatterns/api/qnetworkaccessdelegator.cpp    | 26 ++++----
 src/xmlpatterns/api/qnetworkaccessdelegator_p.h    | 26 ++++----
 src/xmlpatterns/api/qpullbridge.cpp                | 26 ++++----
 src/xmlpatterns/api/qpullbridge_p.h                | 26 ++++----
 src/xmlpatterns/api/qreferencecountedvalue_p.h     | 26 ++++----
 src/xmlpatterns/api/qresourcedelegator.cpp         | 26 ++++----
 src/xmlpatterns/api/qresourcedelegator_p.h         | 26 ++++----
 src/xmlpatterns/api/qsimplexmlnodemodel.cpp        | 26 ++++----
 src/xmlpatterns/api/qsimplexmlnodemodel.h          | 26 ++++----
 src/xmlpatterns/api/qsourcelocation.cpp            | 26 ++++----
 src/xmlpatterns/api/qsourcelocation.h              | 26 ++++----
 src/xmlpatterns/api/quriloader.cpp                 | 26 ++++----
 src/xmlpatterns/api/quriloader_p.h                 | 26 ++++----
 src/xmlpatterns/api/qvariableloader.cpp            | 26 ++++----
 src/xmlpatterns/api/qvariableloader_p.h            | 26 ++++----
 src/xmlpatterns/api/qxmlformatter.cpp              | 26 ++++----
 src/xmlpatterns/api/qxmlformatter.h                | 26 ++++----
 src/xmlpatterns/api/qxmlname.cpp                   | 26 ++++----
 src/xmlpatterns/api/qxmlname.h                     | 26 ++++----
 src/xmlpatterns/api/qxmlnamepool.cpp               | 26 ++++----
 src/xmlpatterns/api/qxmlnamepool.h                 | 26 ++++----
 src/xmlpatterns/api/qxmlpatternistcli_p.h          | 26 ++++----
 src/xmlpatterns/api/qxmlquery.cpp                  | 26 ++++----
 src/xmlpatterns/api/qxmlquery.h                    | 26 ++++----
 src/xmlpatterns/api/qxmlquery_p.h                  | 26 ++++----
 src/xmlpatterns/api/qxmlresultitems.cpp            | 26 ++++----
 src/xmlpatterns/api/qxmlresultitems.h              | 26 ++++----
 src/xmlpatterns/api/qxmlresultitems_p.h            | 26 ++++----
 src/xmlpatterns/api/qxmlschema.cpp                 | 26 ++++----
 src/xmlpatterns/api/qxmlschema.h                   | 26 ++++----
 src/xmlpatterns/api/qxmlschema_p.cpp               | 26 ++++----
 src/xmlpatterns/api/qxmlschema_p.h                 | 26 ++++----
 src/xmlpatterns/api/qxmlschemavalidator.cpp        | 26 ++++----
 src/xmlpatterns/api/qxmlschemavalidator.h          | 26 ++++----
 src/xmlpatterns/api/qxmlschemavalidator_p.h        | 26 ++++----
 src/xmlpatterns/api/qxmlserializer.cpp             | 26 ++++----
 src/xmlpatterns/api/qxmlserializer.h               | 26 ++++----
 src/xmlpatterns/api/qxmlserializer_p.h             | 26 ++++----
 src/xmlpatterns/data/qabstractdatetime.cpp         | 26 ++++----
 src/xmlpatterns/data/qabstractdatetime_p.h         | 26 ++++----
 src/xmlpatterns/data/qabstractduration.cpp         | 26 ++++----
 src/xmlpatterns/data/qabstractduration_p.h         | 26 ++++----
 src/xmlpatterns/data/qabstractfloat.cpp            | 26 ++++----
 src/xmlpatterns/data/qabstractfloat_p.h            | 26 ++++----
 src/xmlpatterns/data/qabstractfloatcasters.cpp     | 26 ++++----
 src/xmlpatterns/data/qabstractfloatcasters_p.h     | 26 ++++----
 .../data/qabstractfloatmathematician.cpp           | 26 ++++----
 .../data/qabstractfloatmathematician_p.h           | 26 ++++----
 src/xmlpatterns/data/qanyuri.cpp                   | 26 ++++----
 src/xmlpatterns/data/qanyuri_p.h                   | 26 ++++----
 src/xmlpatterns/data/qatomiccaster.cpp             | 26 ++++----
 src/xmlpatterns/data/qatomiccaster_p.h             | 26 ++++----
 src/xmlpatterns/data/qatomiccasters.cpp            | 26 ++++----
 src/xmlpatterns/data/qatomiccasters_p.h            | 26 ++++----
 src/xmlpatterns/data/qatomiccomparator.cpp         | 26 ++++----
 src/xmlpatterns/data/qatomiccomparator_p.h         | 26 ++++----
 src/xmlpatterns/data/qatomiccomparators.cpp        | 26 ++++----
 src/xmlpatterns/data/qatomiccomparators_p.h        | 26 ++++----
 src/xmlpatterns/data/qatomicmathematician.cpp      | 26 ++++----
 src/xmlpatterns/data/qatomicmathematician_p.h      | 26 ++++----
 src/xmlpatterns/data/qatomicmathematicians.cpp     | 26 ++++----
 src/xmlpatterns/data/qatomicmathematicians_p.h     | 26 ++++----
 src/xmlpatterns/data/qatomicstring.cpp             | 26 ++++----
 src/xmlpatterns/data/qatomicstring_p.h             | 26 ++++----
 src/xmlpatterns/data/qatomicvalue.cpp              | 26 ++++----
 src/xmlpatterns/data/qbase64binary.cpp             | 26 ++++----
 src/xmlpatterns/data/qbase64binary_p.h             | 26 ++++----
 src/xmlpatterns/data/qboolean.cpp                  | 26 ++++----
 src/xmlpatterns/data/qboolean_p.h                  | 26 ++++----
 src/xmlpatterns/data/qcommonvalues.cpp             | 26 ++++----
 src/xmlpatterns/data/qcommonvalues_p.h             | 26 ++++----
 src/xmlpatterns/data/qcomparisonfactory.cpp        | 26 ++++----
 src/xmlpatterns/data/qcomparisonfactory_p.h        | 26 ++++----
 src/xmlpatterns/data/qdate.cpp                     | 26 ++++----
 src/xmlpatterns/data/qdate_p.h                     | 26 ++++----
 src/xmlpatterns/data/qdaytimeduration.cpp          | 26 ++++----
 src/xmlpatterns/data/qdaytimeduration_p.h          | 26 ++++----
 src/xmlpatterns/data/qdecimal.cpp                  | 26 ++++----
 src/xmlpatterns/data/qdecimal_p.h                  | 26 ++++----
 src/xmlpatterns/data/qderivedinteger_p.h           | 26 ++++----
 src/xmlpatterns/data/qderivedstring_p.h            | 26 ++++----
 src/xmlpatterns/data/qduration.cpp                 | 26 ++++----
 src/xmlpatterns/data/qduration_p.h                 | 26 ++++----
 src/xmlpatterns/data/qgday.cpp                     | 26 ++++----
 src/xmlpatterns/data/qgday_p.h                     | 26 ++++----
 src/xmlpatterns/data/qgmonth.cpp                   | 26 ++++----
 src/xmlpatterns/data/qgmonth_p.h                   | 26 ++++----
 src/xmlpatterns/data/qgmonthday.cpp                | 26 ++++----
 src/xmlpatterns/data/qgmonthday_p.h                | 26 ++++----
 src/xmlpatterns/data/qgyear.cpp                    | 26 ++++----
 src/xmlpatterns/data/qgyear_p.h                    | 26 ++++----
 src/xmlpatterns/data/qgyearmonth.cpp               | 26 ++++----
 src/xmlpatterns/data/qgyearmonth_p.h               | 26 ++++----
 src/xmlpatterns/data/qhexbinary.cpp                | 26 ++++----
 src/xmlpatterns/data/qhexbinary_p.h                | 26 ++++----
 src/xmlpatterns/data/qinteger.cpp                  | 26 ++++----
 src/xmlpatterns/data/qinteger_p.h                  | 26 ++++----
 src/xmlpatterns/data/qitem.cpp                     | 26 ++++----
 src/xmlpatterns/data/qitem_p.h                     | 26 ++++----
 src/xmlpatterns/data/qnodebuilder.cpp              | 26 ++++----
 src/xmlpatterns/data/qnodebuilder_p.h              | 26 ++++----
 src/xmlpatterns/data/qnodemodel.cpp                | 26 ++++----
 src/xmlpatterns/data/qqnamevalue.cpp               | 26 ++++----
 src/xmlpatterns/data/qqnamevalue_p.h               | 26 ++++----
 src/xmlpatterns/data/qresourceloader.cpp           | 26 ++++----
 src/xmlpatterns/data/qresourceloader_p.h           | 26 ++++----
 src/xmlpatterns/data/qschemadatetime.cpp           | 26 ++++----
 src/xmlpatterns/data/qschemadatetime_p.h           | 26 ++++----
 src/xmlpatterns/data/qschemanumeric.cpp            | 26 ++++----
 src/xmlpatterns/data/qschemanumeric_p.h            | 26 ++++----
 src/xmlpatterns/data/qschematime.cpp               | 26 ++++----
 src/xmlpatterns/data/qschematime_p.h               | 26 ++++----
 src/xmlpatterns/data/qsequencereceiver.cpp         | 26 ++++----
 src/xmlpatterns/data/qsequencereceiver_p.h         | 26 ++++----
 src/xmlpatterns/data/qsorttuple.cpp                | 26 ++++----
 src/xmlpatterns/data/qsorttuple_p.h                | 26 ++++----
 src/xmlpatterns/data/quntypedatomic.cpp            | 26 ++++----
 src/xmlpatterns/data/quntypedatomic_p.h            | 26 ++++----
 src/xmlpatterns/data/qvalidationerror.cpp          | 26 ++++----
 src/xmlpatterns/data/qvalidationerror_p.h          | 26 ++++----
 src/xmlpatterns/data/qvaluefactory.cpp             | 26 ++++----
 src/xmlpatterns/data/qvaluefactory_p.h             | 26 ++++----
 src/xmlpatterns/data/qyearmonthduration.cpp        | 26 ++++----
 src/xmlpatterns/data/qyearmonthduration_p.h        | 26 ++++----
 src/xmlpatterns/documentationGroups.dox            | 26 ++++----
 src/xmlpatterns/environment/createReportContext.sh | 26 ++++----
 .../environment/createReportContext.xsl            | 52 +++++++--------
 .../environment/qcurrentitemcontext.cpp            | 26 ++++----
 .../environment/qcurrentitemcontext_p.h            | 26 ++++----
 .../environment/qdelegatingdynamiccontext.cpp      | 26 ++++----
 .../environment/qdelegatingdynamiccontext_p.h      | 26 ++++----
 .../environment/qdelegatingstaticcontext.cpp       | 26 ++++----
 .../environment/qdelegatingstaticcontext_p.h       | 26 ++++----
 src/xmlpatterns/environment/qdynamiccontext.cpp    | 26 ++++----
 src/xmlpatterns/environment/qdynamiccontext_p.h    | 26 ++++----
 src/xmlpatterns/environment/qfocus.cpp             | 26 ++++----
 src/xmlpatterns/environment/qfocus_p.h             | 26 ++++----
 .../environment/qgenericdynamiccontext.cpp         | 26 ++++----
 .../environment/qgenericdynamiccontext_p.h         | 26 ++++----
 .../environment/qgenericstaticcontext.cpp          | 26 ++++----
 .../environment/qgenericstaticcontext_p.h          | 26 ++++----
 .../environment/qreceiverdynamiccontext.cpp        | 26 ++++----
 .../environment/qreceiverdynamiccontext_p.h        | 26 ++++----
 src/xmlpatterns/environment/qreportcontext.cpp     | 26 ++++----
 src/xmlpatterns/environment/qreportcontext_p.h     | 26 ++++----
 src/xmlpatterns/environment/qstackcontextbase.cpp  | 26 ++++----
 src/xmlpatterns/environment/qstackcontextbase_p.h  | 26 ++++----
 .../environment/qstaticbaseuricontext.cpp          | 26 ++++----
 .../environment/qstaticbaseuricontext_p.h          | 26 ++++----
 .../environment/qstaticcompatibilitycontext.cpp    | 26 ++++----
 .../environment/qstaticcompatibilitycontext_p.h    | 26 ++++----
 src/xmlpatterns/environment/qstaticcontext.cpp     | 26 ++++----
 src/xmlpatterns/environment/qstaticcontext_p.h     | 26 ++++----
 .../environment/qstaticcurrentcontext.cpp          | 26 ++++----
 .../environment/qstaticcurrentcontext_p.h          | 26 ++++----
 .../environment/qstaticfocuscontext.cpp            | 26 ++++----
 .../environment/qstaticfocuscontext_p.h            | 26 ++++----
 .../environment/qstaticnamespacecontext.cpp        | 26 ++++----
 .../environment/qstaticnamespacecontext_p.h        | 26 ++++----
 src/xmlpatterns/expr/qandexpression.cpp            | 26 ++++----
 src/xmlpatterns/expr/qandexpression_p.h            | 26 ++++----
 src/xmlpatterns/expr/qapplytemplate.cpp            | 26 ++++----
 src/xmlpatterns/expr/qapplytemplate_p.h            | 26 ++++----
 src/xmlpatterns/expr/qargumentreference.cpp        | 26 ++++----
 src/xmlpatterns/expr/qargumentreference_p.h        | 26 ++++----
 src/xmlpatterns/expr/qarithmeticexpression.cpp     | 26 ++++----
 src/xmlpatterns/expr/qarithmeticexpression_p.h     | 26 ++++----
 src/xmlpatterns/expr/qattributeconstructor.cpp     | 26 ++++----
 src/xmlpatterns/expr/qattributeconstructor_p.h     | 26 ++++----
 src/xmlpatterns/expr/qattributenamevalidator.cpp   | 26 ++++----
 src/xmlpatterns/expr/qattributenamevalidator_p.h   | 26 ++++----
 src/xmlpatterns/expr/qaxisstep.cpp                 | 26 ++++----
 src/xmlpatterns/expr/qaxisstep_p.h                 | 26 ++++----
 src/xmlpatterns/expr/qcachecells_p.h               | 26 ++++----
 src/xmlpatterns/expr/qcallsite.cpp                 | 26 ++++----
 src/xmlpatterns/expr/qcallsite_p.h                 | 26 ++++----
 src/xmlpatterns/expr/qcalltargetdescription.cpp    | 26 ++++----
 src/xmlpatterns/expr/qcalltargetdescription_p.h    | 26 ++++----
 src/xmlpatterns/expr/qcalltemplate.cpp             | 26 ++++----
 src/xmlpatterns/expr/qcalltemplate_p.h             | 26 ++++----
 src/xmlpatterns/expr/qcastableas.cpp               | 26 ++++----
 src/xmlpatterns/expr/qcastableas_p.h               | 26 ++++----
 src/xmlpatterns/expr/qcastas.cpp                   | 26 ++++----
 src/xmlpatterns/expr/qcastas_p.h                   | 26 ++++----
 src/xmlpatterns/expr/qcastingplatform.cpp          | 26 ++++----
 src/xmlpatterns/expr/qcastingplatform_p.h          | 26 ++++----
 src/xmlpatterns/expr/qcollationchecker.cpp         | 26 ++++----
 src/xmlpatterns/expr/qcollationchecker_p.h         | 26 ++++----
 src/xmlpatterns/expr/qcombinenodes.cpp             | 26 ++++----
 src/xmlpatterns/expr/qcombinenodes_p.h             | 26 ++++----
 src/xmlpatterns/expr/qcommentconstructor.cpp       | 26 ++++----
 src/xmlpatterns/expr/qcommentconstructor_p.h       | 26 ++++----
 src/xmlpatterns/expr/qcomparisonplatform.cpp       | 26 ++++----
 src/xmlpatterns/expr/qcomparisonplatform_p.h       | 26 ++++----
 .../expr/qcomputednamespaceconstructor.cpp         | 26 ++++----
 .../expr/qcomputednamespaceconstructor_p.h         | 26 ++++----
 src/xmlpatterns/expr/qcontextitem.cpp              | 26 ++++----
 src/xmlpatterns/expr/qcontextitem_p.h              | 26 ++++----
 src/xmlpatterns/expr/qcopyof.cpp                   | 26 ++++----
 src/xmlpatterns/expr/qcopyof_p.h                   | 26 ++++----
 src/xmlpatterns/expr/qcurrentitemstore.cpp         | 26 ++++----
 src/xmlpatterns/expr/qcurrentitemstore_p.h         | 26 ++++----
 src/xmlpatterns/expr/qdocumentconstructor.cpp      | 26 ++++----
 src/xmlpatterns/expr/qdocumentconstructor_p.h      | 26 ++++----
 src/xmlpatterns/expr/qdocumentcontentvalidator.cpp | 26 ++++----
 src/xmlpatterns/expr/qdocumentcontentvalidator_p.h | 26 ++++----
 src/xmlpatterns/expr/qdynamiccontextstore.cpp      | 26 ++++----
 src/xmlpatterns/expr/qdynamiccontextstore_p.h      | 26 ++++----
 src/xmlpatterns/expr/qelementconstructor.cpp       | 26 ++++----
 src/xmlpatterns/expr/qelementconstructor_p.h       | 26 ++++----
 src/xmlpatterns/expr/qemptycontainer.cpp           | 26 ++++----
 src/xmlpatterns/expr/qemptycontainer_p.h           | 26 ++++----
 src/xmlpatterns/expr/qemptysequence.cpp            | 26 ++++----
 src/xmlpatterns/expr/qemptysequence_p.h            | 26 ++++----
 src/xmlpatterns/expr/qevaluationcache.cpp          | 26 ++++----
 src/xmlpatterns/expr/qevaluationcache_p.h          | 26 ++++----
 src/xmlpatterns/expr/qexpression.cpp               | 26 ++++----
 src/xmlpatterns/expr/qexpression_p.h               | 26 ++++----
 src/xmlpatterns/expr/qexpressiondispatch_p.h       | 26 ++++----
 src/xmlpatterns/expr/qexpressionfactory.cpp        | 26 ++++----
 src/xmlpatterns/expr/qexpressionfactory_p.h        | 26 ++++----
 src/xmlpatterns/expr/qexpressionsequence.cpp       | 26 ++++----
 src/xmlpatterns/expr/qexpressionsequence_p.h       | 26 ++++----
 .../expr/qexpressionvariablereference.cpp          | 26 ++++----
 .../expr/qexpressionvariablereference_p.h          | 26 ++++----
 src/xmlpatterns/expr/qexternalvariableloader.cpp   | 26 ++++----
 src/xmlpatterns/expr/qexternalvariableloader_p.h   | 26 ++++----
 .../expr/qexternalvariablereference.cpp            | 26 ++++----
 .../expr/qexternalvariablereference_p.h            | 26 ++++----
 src/xmlpatterns/expr/qfirstitempredicate.cpp       | 26 ++++----
 src/xmlpatterns/expr/qfirstitempredicate_p.h       | 26 ++++----
 src/xmlpatterns/expr/qforclause.cpp                | 26 ++++----
 src/xmlpatterns/expr/qforclause_p.h                | 26 ++++----
 src/xmlpatterns/expr/qgeneralcomparison.cpp        | 26 ++++----
 src/xmlpatterns/expr/qgeneralcomparison_p.h        | 26 ++++----
 src/xmlpatterns/expr/qgenericpredicate.cpp         | 26 ++++----
 src/xmlpatterns/expr/qgenericpredicate_p.h         | 26 ++++----
 src/xmlpatterns/expr/qifthenclause.cpp             | 26 ++++----
 src/xmlpatterns/expr/qifthenclause_p.h             | 26 ++++----
 src/xmlpatterns/expr/qinstanceof.cpp               | 26 ++++----
 src/xmlpatterns/expr/qinstanceof_p.h               | 26 ++++----
 src/xmlpatterns/expr/qletclause.cpp                | 26 ++++----
 src/xmlpatterns/expr/qletclause_p.h                | 26 ++++----
 src/xmlpatterns/expr/qliteral.cpp                  | 26 ++++----
 src/xmlpatterns/expr/qliteral_p.h                  | 26 ++++----
 src/xmlpatterns/expr/qliteralsequence.cpp          | 26 ++++----
 src/xmlpatterns/expr/qliteralsequence_p.h          | 26 ++++----
 src/xmlpatterns/expr/qnamespaceconstructor.cpp     | 26 ++++----
 src/xmlpatterns/expr/qnamespaceconstructor_p.h     | 26 ++++----
 src/xmlpatterns/expr/qncnameconstructor.cpp        | 26 ++++----
 src/xmlpatterns/expr/qncnameconstructor_p.h        | 26 ++++----
 src/xmlpatterns/expr/qnodecomparison.cpp           | 26 ++++----
 src/xmlpatterns/expr/qnodecomparison_p.h           | 26 ++++----
 src/xmlpatterns/expr/qnodesort.cpp                 | 26 ++++----
 src/xmlpatterns/expr/qnodesort_p.h                 | 26 ++++----
 src/xmlpatterns/expr/qoperandsiterator_p.h         | 26 ++++----
 src/xmlpatterns/expr/qoptimizationpasses.cpp       | 26 ++++----
 src/xmlpatterns/expr/qoptimizationpasses_p.h       | 26 ++++----
 src/xmlpatterns/expr/qoptimizerblocks.cpp          | 26 ++++----
 src/xmlpatterns/expr/qoptimizerblocks_p.h          | 26 ++++----
 src/xmlpatterns/expr/qoptimizerframework.cpp       | 26 ++++----
 src/xmlpatterns/expr/qoptimizerframework_p.h       | 26 ++++----
 src/xmlpatterns/expr/qorderby.cpp                  | 26 ++++----
 src/xmlpatterns/expr/qorderby_p.h                  | 26 ++++----
 src/xmlpatterns/expr/qorexpression.cpp             | 26 ++++----
 src/xmlpatterns/expr/qorexpression_p.h             | 26 ++++----
 src/xmlpatterns/expr/qpaircontainer.cpp            | 26 ++++----
 src/xmlpatterns/expr/qpaircontainer_p.h            | 26 ++++----
 src/xmlpatterns/expr/qparentnodeaxis.cpp           | 26 ++++----
 src/xmlpatterns/expr/qparentnodeaxis_p.h           | 26 ++++----
 src/xmlpatterns/expr/qpath.cpp                     | 26 ++++----
 src/xmlpatterns/expr/qpath_p.h                     | 26 ++++----
 .../expr/qpositionalvariablereference.cpp          | 26 ++++----
 .../expr/qpositionalvariablereference_p.h          | 26 ++++----
 .../expr/qprocessinginstructionconstructor.cpp     | 26 ++++----
 .../expr/qprocessinginstructionconstructor_p.h     | 26 ++++----
 src/xmlpatterns/expr/qqnameconstructor.cpp         | 26 ++++----
 src/xmlpatterns/expr/qqnameconstructor_p.h         | 26 ++++----
 src/xmlpatterns/expr/qquantifiedexpression.cpp     | 26 ++++----
 src/xmlpatterns/expr/qquantifiedexpression_p.h     | 26 ++++----
 src/xmlpatterns/expr/qrangeexpression.cpp          | 26 ++++----
 src/xmlpatterns/expr/qrangeexpression_p.h          | 26 ++++----
 src/xmlpatterns/expr/qrangevariablereference.cpp   | 26 ++++----
 src/xmlpatterns/expr/qrangevariablereference_p.h   | 26 ++++----
 src/xmlpatterns/expr/qreturnorderby.cpp            | 26 ++++----
 src/xmlpatterns/expr/qreturnorderby_p.h            | 26 ++++----
 src/xmlpatterns/expr/qsimplecontentconstructor.cpp | 26 ++++----
 src/xmlpatterns/expr/qsimplecontentconstructor_p.h | 26 ++++----
 src/xmlpatterns/expr/qsinglecontainer.cpp          | 26 ++++----
 src/xmlpatterns/expr/qsinglecontainer_p.h          | 26 ++++----
 src/xmlpatterns/expr/qsourcelocationreflection.cpp | 26 ++++----
 src/xmlpatterns/expr/qsourcelocationreflection_p.h | 26 ++++----
 src/xmlpatterns/expr/qstaticbaseuristore.cpp       | 26 ++++----
 src/xmlpatterns/expr/qstaticbaseuristore_p.h       | 26 ++++----
 src/xmlpatterns/expr/qstaticcompatibilitystore.cpp | 26 ++++----
 src/xmlpatterns/expr/qstaticcompatibilitystore_p.h | 26 ++++----
 src/xmlpatterns/expr/qtemplate.cpp                 | 26 ++++----
 src/xmlpatterns/expr/qtemplate_p.h                 | 26 ++++----
 src/xmlpatterns/expr/qtemplateinvoker.cpp          | 26 ++++----
 src/xmlpatterns/expr/qtemplateinvoker_p.h          | 26 ++++----
 src/xmlpatterns/expr/qtemplatemode.cpp             | 26 ++++----
 src/xmlpatterns/expr/qtemplatemode_p.h             | 26 ++++----
 .../expr/qtemplateparameterreference.cpp           | 26 ++++----
 .../expr/qtemplateparameterreference_p.h           | 26 ++++----
 src/xmlpatterns/expr/qtemplatepattern_p.h          | 26 ++++----
 src/xmlpatterns/expr/qtextnodeconstructor.cpp      | 26 ++++----
 src/xmlpatterns/expr/qtextnodeconstructor_p.h      | 26 ++++----
 src/xmlpatterns/expr/qtreatas.cpp                  | 26 ++++----
 src/xmlpatterns/expr/qtreatas_p.h                  | 26 ++++----
 src/xmlpatterns/expr/qtriplecontainer.cpp          | 26 ++++----
 src/xmlpatterns/expr/qtriplecontainer_p.h          | 26 ++++----
 src/xmlpatterns/expr/qtruthpredicate.cpp           | 26 ++++----
 src/xmlpatterns/expr/qtruthpredicate_p.h           | 26 ++++----
 src/xmlpatterns/expr/qunaryexpression.cpp          | 26 ++++----
 src/xmlpatterns/expr/qunaryexpression_p.h          | 26 ++++----
 src/xmlpatterns/expr/qunlimitedcontainer.cpp       | 26 ++++----
 src/xmlpatterns/expr/qunlimitedcontainer_p.h       | 26 ++++----
 .../expr/qunresolvedvariablereference.cpp          | 26 ++++----
 .../expr/qunresolvedvariablereference_p.h          | 26 ++++----
 src/xmlpatterns/expr/quserfunction.cpp             | 26 ++++----
 src/xmlpatterns/expr/quserfunction_p.h             | 26 ++++----
 src/xmlpatterns/expr/quserfunctioncallsite.cpp     | 26 ++++----
 src/xmlpatterns/expr/quserfunctioncallsite_p.h     | 26 ++++----
 src/xmlpatterns/expr/qvalidate.cpp                 | 26 ++++----
 src/xmlpatterns/expr/qvalidate_p.h                 | 26 ++++----
 src/xmlpatterns/expr/qvaluecomparison.cpp          | 26 ++++----
 src/xmlpatterns/expr/qvaluecomparison_p.h          | 26 ++++----
 src/xmlpatterns/expr/qvariabledeclaration.cpp      | 26 ++++----
 src/xmlpatterns/expr/qvariabledeclaration_p.h      | 26 ++++----
 src/xmlpatterns/expr/qvariablereference.cpp        | 26 ++++----
 src/xmlpatterns/expr/qvariablereference_p.h        | 26 ++++----
 src/xmlpatterns/expr/qwithparam_p.h                | 26 ++++----
 .../expr/qxsltsimplecontentconstructor.cpp         | 26 ++++----
 .../expr/qxsltsimplecontentconstructor_p.h         | 26 ++++----
 .../functions/qabstractfunctionfactory.cpp         | 26 ++++----
 .../functions/qabstractfunctionfactory_p.h         | 26 ++++----
 src/xmlpatterns/functions/qaccessorfns.cpp         | 26 ++++----
 src/xmlpatterns/functions/qaccessorfns_p.h         | 26 ++++----
 src/xmlpatterns/functions/qaggregatefns.cpp        | 26 ++++----
 src/xmlpatterns/functions/qaggregatefns_p.h        | 26 ++++----
 src/xmlpatterns/functions/qaggregator.cpp          | 26 ++++----
 src/xmlpatterns/functions/qaggregator_p.h          | 26 ++++----
 src/xmlpatterns/functions/qassemblestringfns.cpp   | 26 ++++----
 src/xmlpatterns/functions/qassemblestringfns_p.h   | 26 ++++----
 src/xmlpatterns/functions/qbooleanfns.cpp          | 26 ++++----
 src/xmlpatterns/functions/qbooleanfns_p.h          | 26 ++++----
 src/xmlpatterns/functions/qcomparescaseaware.cpp   | 26 ++++----
 src/xmlpatterns/functions/qcomparescaseaware_p.h   | 26 ++++----
 src/xmlpatterns/functions/qcomparestringfns.cpp    | 26 ++++----
 src/xmlpatterns/functions/qcomparestringfns_p.h    | 26 ++++----
 src/xmlpatterns/functions/qcomparingaggregator.cpp | 26 ++++----
 src/xmlpatterns/functions/qcomparingaggregator_p.h | 26 ++++----
 .../functions/qconstructorfunctionsfactory.cpp     | 26 ++++----
 .../functions/qconstructorfunctionsfactory_p.h     | 26 ++++----
 src/xmlpatterns/functions/qcontextfns.cpp          | 26 ++++----
 src/xmlpatterns/functions/qcontextfns_p.h          | 26 ++++----
 src/xmlpatterns/functions/qcontextnodechecker.cpp  | 26 ++++----
 src/xmlpatterns/functions/qcontextnodechecker_p.h  | 26 ++++----
 src/xmlpatterns/functions/qcurrentfn.cpp           | 26 ++++----
 src/xmlpatterns/functions/qcurrentfn_p.h           | 26 ++++----
 src/xmlpatterns/functions/qdatetimefn.cpp          | 26 ++++----
 src/xmlpatterns/functions/qdatetimefn_p.h          | 26 ++++----
 src/xmlpatterns/functions/qdatetimefns.cpp         | 26 ++++----
 src/xmlpatterns/functions/qdatetimefns_p.h         | 26 ++++----
 src/xmlpatterns/functions/qdeepequalfn.cpp         | 26 ++++----
 src/xmlpatterns/functions/qdeepequalfn_p.h         | 26 ++++----
 src/xmlpatterns/functions/qdocumentfn.cpp          | 26 ++++----
 src/xmlpatterns/functions/qdocumentfn_p.h          | 26 ++++----
 src/xmlpatterns/functions/qelementavailablefn.cpp  | 26 ++++----
 src/xmlpatterns/functions/qelementavailablefn_p.h  | 26 ++++----
 src/xmlpatterns/functions/qerrorfn.cpp             | 26 ++++----
 src/xmlpatterns/functions/qerrorfn_p.h             | 26 ++++----
 src/xmlpatterns/functions/qfunctionargument.cpp    | 26 ++++----
 src/xmlpatterns/functions/qfunctionargument_p.h    | 26 ++++----
 src/xmlpatterns/functions/qfunctionavailablefn.cpp | 26 ++++----
 src/xmlpatterns/functions/qfunctionavailablefn_p.h | 26 ++++----
 src/xmlpatterns/functions/qfunctioncall.cpp        | 26 ++++----
 src/xmlpatterns/functions/qfunctioncall_p.h        | 26 ++++----
 src/xmlpatterns/functions/qfunctionfactory.cpp     | 26 ++++----
 src/xmlpatterns/functions/qfunctionfactory_p.h     | 26 ++++----
 .../functions/qfunctionfactorycollection.cpp       | 26 ++++----
 .../functions/qfunctionfactorycollection_p.h       | 26 ++++----
 src/xmlpatterns/functions/qfunctionsignature.cpp   | 26 ++++----
 src/xmlpatterns/functions/qfunctionsignature_p.h   | 26 ++++----
 src/xmlpatterns/functions/qgenerateidfn.cpp        | 26 ++++----
 src/xmlpatterns/functions/qgenerateidfn_p.h        | 26 ++++----
 src/xmlpatterns/functions/qnodefns.cpp             | 26 ++++----
 src/xmlpatterns/functions/qnodefns_p.h             | 26 ++++----
 src/xmlpatterns/functions/qnumericfns.cpp          | 26 ++++----
 src/xmlpatterns/functions/qnumericfns_p.h          | 26 ++++----
 src/xmlpatterns/functions/qpatternmatchingfns.cpp  | 26 ++++----
 src/xmlpatterns/functions/qpatternmatchingfns_p.h  | 26 ++++----
 src/xmlpatterns/functions/qpatternplatform.cpp     | 26 ++++----
 src/xmlpatterns/functions/qpatternplatform_p.h     | 26 ++++----
 src/xmlpatterns/functions/qqnamefns.cpp            | 26 ++++----
 src/xmlpatterns/functions/qqnamefns_p.h            | 26 ++++----
 src/xmlpatterns/functions/qresolveurifn.cpp        | 26 ++++----
 src/xmlpatterns/functions/qresolveurifn_p.h        | 26 ++++----
 src/xmlpatterns/functions/qsequencefns.cpp         | 26 ++++----
 src/xmlpatterns/functions/qsequencefns_p.h         | 26 ++++----
 .../functions/qsequencegeneratingfns.cpp           | 26 ++++----
 .../functions/qsequencegeneratingfns_p.h           | 26 ++++----
 .../functions/qstaticbaseuricontainer_p.h          | 26 ++++----
 .../functions/qstaticnamespacescontainer.cpp       | 26 ++++----
 .../functions/qstaticnamespacescontainer_p.h       | 26 ++++----
 src/xmlpatterns/functions/qstringvaluefns.cpp      | 26 ++++----
 src/xmlpatterns/functions/qstringvaluefns_p.h      | 26 ++++----
 src/xmlpatterns/functions/qsubstringfns.cpp        | 26 ++++----
 src/xmlpatterns/functions/qsubstringfns_p.h        | 26 ++++----
 src/xmlpatterns/functions/qsystempropertyfn.cpp    | 26 ++++----
 src/xmlpatterns/functions/qsystempropertyfn_p.h    | 26 ++++----
 src/xmlpatterns/functions/qtimezonefns.cpp         | 26 ++++----
 src/xmlpatterns/functions/qtimezonefns_p.h         | 26 ++++----
 src/xmlpatterns/functions/qtracefn.cpp             | 26 ++++----
 src/xmlpatterns/functions/qtracefn_p.h             | 26 ++++----
 src/xmlpatterns/functions/qtypeavailablefn.cpp     | 26 ++++----
 src/xmlpatterns/functions/qtypeavailablefn_p.h     | 26 ++++----
 .../functions/qunparsedentitypublicidfn.cpp        | 26 ++++----
 .../functions/qunparsedentitypublicidfn_p.h        | 26 ++++----
 src/xmlpatterns/functions/qunparsedentityurifn.cpp | 26 ++++----
 src/xmlpatterns/functions/qunparsedentityurifn_p.h | 26 ++++----
 .../functions/qunparsedtextavailablefn.cpp         | 26 ++++----
 .../functions/qunparsedtextavailablefn_p.h         | 26 ++++----
 src/xmlpatterns/functions/qunparsedtextfn.cpp      | 26 ++++----
 src/xmlpatterns/functions/qunparsedtextfn_p.h      | 26 ++++----
 .../functions/qxpath10corefunctions.cpp            | 26 ++++----
 .../functions/qxpath10corefunctions_p.h            | 26 ++++----
 .../functions/qxpath20corefunctions.cpp            | 26 ++++----
 .../functions/qxpath20corefunctions_p.h            | 26 ++++----
 src/xmlpatterns/functions/qxslt20corefunctions.cpp | 26 ++++----
 src/xmlpatterns/functions/qxslt20corefunctions_p.h | 26 ++++----
 src/xmlpatterns/iterators/qcachingiterator.cpp     | 26 ++++----
 src/xmlpatterns/iterators/qcachingiterator_p.h     | 26 ++++----
 src/xmlpatterns/iterators/qdeduplicateiterator.cpp | 26 ++++----
 src/xmlpatterns/iterators/qdeduplicateiterator_p.h | 26 ++++----
 src/xmlpatterns/iterators/qdistinctiterator.cpp    | 26 ++++----
 src/xmlpatterns/iterators/qdistinctiterator_p.h    | 26 ++++----
 src/xmlpatterns/iterators/qemptyiterator_p.h       | 26 ++++----
 src/xmlpatterns/iterators/qexceptiterator.cpp      | 26 ++++----
 src/xmlpatterns/iterators/qexceptiterator_p.h      | 26 ++++----
 src/xmlpatterns/iterators/qindexofiterator.cpp     | 26 ++++----
 src/xmlpatterns/iterators/qindexofiterator_p.h     | 26 ++++----
 src/xmlpatterns/iterators/qinsertioniterator.cpp   | 26 ++++----
 src/xmlpatterns/iterators/qinsertioniterator_p.h   | 26 ++++----
 src/xmlpatterns/iterators/qintersectiterator.cpp   | 26 ++++----
 src/xmlpatterns/iterators/qintersectiterator_p.h   | 26 ++++----
 src/xmlpatterns/iterators/qitemmappingiterator_p.h | 26 ++++----
 src/xmlpatterns/iterators/qrangeiterator.cpp       | 26 ++++----
 src/xmlpatterns/iterators/qrangeiterator_p.h       | 26 ++++----
 src/xmlpatterns/iterators/qremovaliterator.cpp     | 26 ++++----
 src/xmlpatterns/iterators/qremovaliterator_p.h     | 26 ++++----
 .../iterators/qsequencemappingiterator_p.h         | 26 ++++----
 src/xmlpatterns/iterators/qsingletoniterator_p.h   | 26 ++++----
 src/xmlpatterns/iterators/qsubsequenceiterator.cpp | 26 ++++----
 src/xmlpatterns/iterators/qsubsequenceiterator_p.h | 26 ++++----
 .../iterators/qtocodepointsiterator.cpp            | 26 ++++----
 .../iterators/qtocodepointsiterator_p.h            | 26 ++++----
 src/xmlpatterns/iterators/qunioniterator.cpp       | 26 ++++----
 src/xmlpatterns/iterators/qunioniterator_p.h       | 26 ++++----
 src/xmlpatterns/janitors/qargumentconverter.cpp    | 26 ++++----
 src/xmlpatterns/janitors/qargumentconverter_p.h    | 26 ++++----
 src/xmlpatterns/janitors/qatomizer.cpp             | 26 ++++----
 src/xmlpatterns/janitors/qatomizer_p.h             | 26 ++++----
 src/xmlpatterns/janitors/qcardinalityverifier.cpp  | 26 ++++----
 src/xmlpatterns/janitors/qcardinalityverifier_p.h  | 26 ++++----
 src/xmlpatterns/janitors/qebvextractor.cpp         | 26 ++++----
 src/xmlpatterns/janitors/qebvextractor_p.h         | 26 ++++----
 src/xmlpatterns/janitors/qitemverifier.cpp         | 26 ++++----
 src/xmlpatterns/janitors/qitemverifier_p.h         | 26 ++++----
 .../janitors/quntypedatomicconverter.cpp           | 26 ++++----
 .../janitors/quntypedatomicconverter_p.h           | 26 ++++----
 src/xmlpatterns/parser/TokenLookup.gperf           | 26 ++++----
 src/xmlpatterns/parser/createParser.sh             | 26 ++++----
 src/xmlpatterns/parser/createTokenLookup.sh        | 26 ++++----
 src/xmlpatterns/parser/createXSLTTokenLookup.sh    | 26 ++++----
 src/xmlpatterns/parser/qmaintainingreader.cpp      | 26 ++++----
 src/xmlpatterns/parser/qmaintainingreader_p.h      | 26 ++++----
 src/xmlpatterns/parser/qparsercontext.cpp          | 26 ++++----
 src/xmlpatterns/parser/qparsercontext_p.h          | 26 ++++----
 src/xmlpatterns/parser/qquerytransformparser.cpp   | 26 ++++----
 src/xmlpatterns/parser/qquerytransformparser_p.h   | 26 ++++----
 src/xmlpatterns/parser/qtokenizer_p.h              | 26 ++++----
 src/xmlpatterns/parser/qtokenlookup.cpp            | 26 ++++----
 src/xmlpatterns/parser/qtokenrevealer.cpp          | 26 ++++----
 src/xmlpatterns/parser/qtokenrevealer_p.h          | 26 ++++----
 src/xmlpatterns/parser/qtokensource.cpp            | 26 ++++----
 src/xmlpatterns/parser/qtokensource_p.h            | 26 ++++----
 src/xmlpatterns/parser/querytransformparser.ypp    | 52 +++++++--------
 src/xmlpatterns/parser/qxquerytokenizer.cpp        | 26 ++++----
 src/xmlpatterns/parser/qxquerytokenizer_p.h        | 26 ++++----
 src/xmlpatterns/parser/qxslttokenizer.cpp          | 26 ++++----
 src/xmlpatterns/parser/qxslttokenizer_p.h          | 26 ++++----
 src/xmlpatterns/parser/qxslttokenlookup.cpp        | 26 ++++----
 src/xmlpatterns/parser/qxslttokenlookup.xml        | 26 ++++----
 src/xmlpatterns/parser/qxslttokenlookup_p.h        | 26 ++++----
 src/xmlpatterns/parser/trolltechHeader.txt         | 26 ++++----
 src/xmlpatterns/projection/qdocumentprojector.cpp  | 26 ++++----
 src/xmlpatterns/projection/qdocumentprojector_p.h  | 26 ++++----
 .../projection/qprojectedexpression_p.h            | 26 ++++----
 src/xmlpatterns/qtokenautomaton/exampleFile.xml    | 26 ++++----
 src/xmlpatterns/schema/qnamespacesupport.cpp       | 26 ++++----
 src/xmlpatterns/schema/qnamespacesupport_p.h       | 26 ++++----
 src/xmlpatterns/schema/qxsdalternative.cpp         | 26 ++++----
 src/xmlpatterns/schema/qxsdalternative_p.h         | 26 ++++----
 src/xmlpatterns/schema/qxsdannotated.cpp           | 26 ++++----
 src/xmlpatterns/schema/qxsdannotated_p.h           | 26 ++++----
 src/xmlpatterns/schema/qxsdannotation.cpp          | 26 ++++----
 src/xmlpatterns/schema/qxsdannotation_p.h          | 26 ++++----
 .../schema/qxsdapplicationinformation.cpp          | 26 ++++----
 .../schema/qxsdapplicationinformation_p.h          | 26 ++++----
 src/xmlpatterns/schema/qxsdassertion.cpp           | 26 ++++----
 src/xmlpatterns/schema/qxsdassertion_p.h           | 26 ++++----
 src/xmlpatterns/schema/qxsdattribute.cpp           | 26 ++++----
 src/xmlpatterns/schema/qxsdattribute_p.h           | 26 ++++----
 src/xmlpatterns/schema/qxsdattributegroup.cpp      | 26 ++++----
 src/xmlpatterns/schema/qxsdattributegroup_p.h      | 26 ++++----
 src/xmlpatterns/schema/qxsdattributereference.cpp  | 26 ++++----
 src/xmlpatterns/schema/qxsdattributereference_p.h  | 26 ++++----
 src/xmlpatterns/schema/qxsdattributeterm.cpp       | 26 ++++----
 src/xmlpatterns/schema/qxsdattributeterm_p.h       | 26 ++++----
 src/xmlpatterns/schema/qxsdattributeuse.cpp        | 26 ++++----
 src/xmlpatterns/schema/qxsdattributeuse_p.h        | 26 ++++----
 src/xmlpatterns/schema/qxsdcomplextype.cpp         | 26 ++++----
 src/xmlpatterns/schema/qxsdcomplextype_p.h         | 26 ++++----
 src/xmlpatterns/schema/qxsddocumentation.cpp       | 26 ++++----
 src/xmlpatterns/schema/qxsddocumentation_p.h       | 26 ++++----
 src/xmlpatterns/schema/qxsdelement.cpp             | 26 ++++----
 src/xmlpatterns/schema/qxsdelement_p.h             | 26 ++++----
 src/xmlpatterns/schema/qxsdfacet.cpp               | 26 ++++----
 src/xmlpatterns/schema/qxsdfacet_p.h               | 26 ++++----
 src/xmlpatterns/schema/qxsdidcache.cpp             | 26 ++++----
 src/xmlpatterns/schema/qxsdidcache_p.h             | 26 ++++----
 src/xmlpatterns/schema/qxsdidchelper.cpp           | 26 ++++----
 src/xmlpatterns/schema/qxsdidchelper_p.h           | 26 ++++----
 src/xmlpatterns/schema/qxsdidentityconstraint.cpp  | 26 ++++----
 src/xmlpatterns/schema/qxsdidentityconstraint_p.h  | 26 ++++----
 src/xmlpatterns/schema/qxsdinstancereader.cpp      | 26 ++++----
 src/xmlpatterns/schema/qxsdinstancereader_p.h      | 26 ++++----
 src/xmlpatterns/schema/qxsdmodelgroup.cpp          | 26 ++++----
 src/xmlpatterns/schema/qxsdmodelgroup_p.h          | 26 ++++----
 src/xmlpatterns/schema/qxsdnotation.cpp            | 26 ++++----
 src/xmlpatterns/schema/qxsdnotation_p.h            | 26 ++++----
 src/xmlpatterns/schema/qxsdparticle.cpp            | 26 ++++----
 src/xmlpatterns/schema/qxsdparticle_p.h            | 26 ++++----
 src/xmlpatterns/schema/qxsdparticlechecker.cpp     | 26 ++++----
 src/xmlpatterns/schema/qxsdparticlechecker_p.h     | 26 ++++----
 src/xmlpatterns/schema/qxsdreference.cpp           | 26 ++++----
 src/xmlpatterns/schema/qxsdreference_p.h           | 26 ++++----
 src/xmlpatterns/schema/qxsdschema.cpp              | 26 ++++----
 src/xmlpatterns/schema/qxsdschema_p.h              | 26 ++++----
 src/xmlpatterns/schema/qxsdschemachecker.cpp       | 26 ++++----
 .../schema/qxsdschemachecker_helper.cpp            | 26 ++++----
 src/xmlpatterns/schema/qxsdschemachecker_p.h       | 26 ++++----
 src/xmlpatterns/schema/qxsdschemachecker_setup.cpp | 26 ++++----
 src/xmlpatterns/schema/qxsdschemacontext.cpp       | 26 ++++----
 src/xmlpatterns/schema/qxsdschemacontext_p.h       | 26 ++++----
 src/xmlpatterns/schema/qxsdschemadebugger.cpp      | 26 ++++----
 src/xmlpatterns/schema/qxsdschemadebugger_p.h      | 26 ++++----
 src/xmlpatterns/schema/qxsdschemahelper.cpp        | 26 ++++----
 src/xmlpatterns/schema/qxsdschemahelper_p.h        | 26 ++++----
 src/xmlpatterns/schema/qxsdschemamerger.cpp        | 26 ++++----
 src/xmlpatterns/schema/qxsdschemamerger_p.h        | 26 ++++----
 src/xmlpatterns/schema/qxsdschemaparser.cpp        | 26 ++++----
 src/xmlpatterns/schema/qxsdschemaparser_p.h        | 26 ++++----
 src/xmlpatterns/schema/qxsdschemaparser_setup.cpp  | 26 ++++----
 src/xmlpatterns/schema/qxsdschemaparsercontext.cpp | 26 ++++----
 src/xmlpatterns/schema/qxsdschemaparsercontext_p.h | 26 ++++----
 src/xmlpatterns/schema/qxsdschemaresolver.cpp      | 26 ++++----
 src/xmlpatterns/schema/qxsdschemaresolver_p.h      | 26 ++++----
 src/xmlpatterns/schema/qxsdschematoken.cpp         | 26 ++++----
 src/xmlpatterns/schema/qxsdschematoken_p.h         | 26 ++++----
 src/xmlpatterns/schema/qxsdschematypesfactory.cpp  | 26 ++++----
 src/xmlpatterns/schema/qxsdschematypesfactory_p.h  | 26 ++++----
 src/xmlpatterns/schema/qxsdsimpletype.cpp          | 26 ++++----
 src/xmlpatterns/schema/qxsdsimpletype_p.h          | 26 ++++----
 src/xmlpatterns/schema/qxsdstatemachine.cpp        | 26 ++++----
 src/xmlpatterns/schema/qxsdstatemachine_p.h        | 26 ++++----
 src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp | 26 ++++----
 src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h | 26 ++++----
 src/xmlpatterns/schema/qxsdterm.cpp                | 26 ++++----
 src/xmlpatterns/schema/qxsdterm_p.h                | 26 ++++----
 src/xmlpatterns/schema/qxsdtypechecker.cpp         | 26 ++++----
 src/xmlpatterns/schema/qxsdtypechecker_p.h         | 26 ++++----
 src/xmlpatterns/schema/qxsduserschematype.cpp      | 26 ++++----
 src/xmlpatterns/schema/qxsduserschematype_p.h      | 26 ++++----
 .../schema/qxsdvalidatedxmlnodemodel.cpp           | 26 ++++----
 .../schema/qxsdvalidatedxmlnodemodel_p.h           | 26 ++++----
 .../schema/qxsdvalidatinginstancereader.cpp        | 26 ++++----
 .../schema/qxsdvalidatinginstancereader_p.h        | 26 ++++----
 src/xmlpatterns/schema/qxsdwildcard.cpp            | 26 ++++----
 src/xmlpatterns/schema/qxsdwildcard_p.h            | 26 ++++----
 src/xmlpatterns/schema/qxsdxpathexpression.cpp     | 26 ++++----
 src/xmlpatterns/schema/qxsdxpathexpression_p.h     | 26 ++++----
 src/xmlpatterns/schema/tokens.xml                  | 26 ++++----
 src/xmlpatterns/type/qabstractnodetest.cpp         | 26 ++++----
 src/xmlpatterns/type/qabstractnodetest_p.h         | 26 ++++----
 src/xmlpatterns/type/qanyitemtype.cpp              | 26 ++++----
 src/xmlpatterns/type/qanyitemtype_p.h              | 26 ++++----
 src/xmlpatterns/type/qanynodetype.cpp              | 26 ++++----
 src/xmlpatterns/type/qanynodetype_p.h              | 26 ++++----
 src/xmlpatterns/type/qanysimpletype.cpp            | 26 ++++----
 src/xmlpatterns/type/qanysimpletype_p.h            | 26 ++++----
 src/xmlpatterns/type/qanytype.cpp                  | 26 ++++----
 src/xmlpatterns/type/qanytype_p.h                  | 26 ++++----
 src/xmlpatterns/type/qatomiccasterlocator.cpp      | 26 ++++----
 src/xmlpatterns/type/qatomiccasterlocator_p.h      | 26 ++++----
 src/xmlpatterns/type/qatomiccasterlocators.cpp     | 26 ++++----
 src/xmlpatterns/type/qatomiccasterlocators_p.h     | 26 ++++----
 src/xmlpatterns/type/qatomiccomparatorlocator.cpp  | 26 ++++----
 src/xmlpatterns/type/qatomiccomparatorlocator_p.h  | 26 ++++----
 src/xmlpatterns/type/qatomiccomparatorlocators.cpp | 26 ++++----
 src/xmlpatterns/type/qatomiccomparatorlocators_p.h | 26 ++++----
 .../type/qatomicmathematicianlocator.cpp           | 26 ++++----
 .../type/qatomicmathematicianlocator_p.h           | 26 ++++----
 .../type/qatomicmathematicianlocators.cpp          | 26 ++++----
 .../type/qatomicmathematicianlocators_p.h          | 26 ++++----
 src/xmlpatterns/type/qatomictype.cpp               | 26 ++++----
 src/xmlpatterns/type/qatomictype_p.h               | 26 ++++----
 src/xmlpatterns/type/qatomictypedispatch_p.h       | 26 ++++----
 src/xmlpatterns/type/qbasictypesfactory.cpp        | 26 ++++----
 src/xmlpatterns/type/qbasictypesfactory_p.h        | 26 ++++----
 src/xmlpatterns/type/qbuiltinatomictype.cpp        | 26 ++++----
 src/xmlpatterns/type/qbuiltinatomictype_p.h        | 26 ++++----
 src/xmlpatterns/type/qbuiltinatomictypes.cpp       | 26 ++++----
 src/xmlpatterns/type/qbuiltinatomictypes_p.h       | 26 ++++----
 src/xmlpatterns/type/qbuiltinnodetype.cpp          | 26 ++++----
 src/xmlpatterns/type/qbuiltinnodetype_p.h          | 26 ++++----
 src/xmlpatterns/type/qbuiltintypes.cpp             | 26 ++++----
 src/xmlpatterns/type/qbuiltintypes_p.h             | 26 ++++----
 src/xmlpatterns/type/qcardinality.cpp              | 26 ++++----
 src/xmlpatterns/type/qcardinality_p.h              | 26 ++++----
 src/xmlpatterns/type/qcommonsequencetypes.cpp      | 26 ++++----
 src/xmlpatterns/type/qcommonsequencetypes_p.h      | 26 ++++----
 src/xmlpatterns/type/qebvtype.cpp                  | 26 ++++----
 src/xmlpatterns/type/qebvtype_p.h                  | 26 ++++----
 src/xmlpatterns/type/qemptysequencetype.cpp        | 26 ++++----
 src/xmlpatterns/type/qemptysequencetype_p.h        | 26 ++++----
 src/xmlpatterns/type/qgenericsequencetype.cpp      | 26 ++++----
 src/xmlpatterns/type/qgenericsequencetype_p.h      | 26 ++++----
 src/xmlpatterns/type/qitemtype.cpp                 | 26 ++++----
 src/xmlpatterns/type/qitemtype_p.h                 | 26 ++++----
 src/xmlpatterns/type/qlocalnametest.cpp            | 26 ++++----
 src/xmlpatterns/type/qlocalnametest_p.h            | 26 ++++----
 src/xmlpatterns/type/qmultiitemtype.cpp            | 26 ++++----
 src/xmlpatterns/type/qmultiitemtype_p.h            | 26 ++++----
 src/xmlpatterns/type/qnamedschemacomponent.cpp     | 26 ++++----
 src/xmlpatterns/type/qnamedschemacomponent_p.h     | 26 ++++----
 src/xmlpatterns/type/qnamespacenametest.cpp        | 26 ++++----
 src/xmlpatterns/type/qnamespacenametest_p.h        | 26 ++++----
 src/xmlpatterns/type/qnonetype.cpp                 | 26 ++++----
 src/xmlpatterns/type/qnonetype_p.h                 | 26 ++++----
 src/xmlpatterns/type/qnumerictype.cpp              | 26 ++++----
 src/xmlpatterns/type/qnumerictype_p.h              | 26 ++++----
 src/xmlpatterns/type/qprimitives_p.h               | 26 ++++----
 src/xmlpatterns/type/qqnametest.cpp                | 26 ++++----
 src/xmlpatterns/type/qqnametest_p.h                | 26 ++++----
 src/xmlpatterns/type/qschemacomponent.cpp          | 26 ++++----
 src/xmlpatterns/type/qschemacomponent_p.h          | 26 ++++----
 src/xmlpatterns/type/qschematype.cpp               | 26 ++++----
 src/xmlpatterns/type/qschematype_p.h               | 26 ++++----
 src/xmlpatterns/type/qschematypefactory.cpp        | 26 ++++----
 src/xmlpatterns/type/qschematypefactory_p.h        | 26 ++++----
 src/xmlpatterns/type/qsequencetype.cpp             | 26 ++++----
 src/xmlpatterns/type/qsequencetype_p.h             | 26 ++++----
 src/xmlpatterns/type/qtypechecker.cpp              | 26 ++++----
 src/xmlpatterns/type/qtypechecker_p.h              | 26 ++++----
 src/xmlpatterns/type/quntyped.cpp                  | 26 ++++----
 src/xmlpatterns/type/quntyped_p.h                  | 26 ++++----
 src/xmlpatterns/type/qxsltnodetest.cpp             | 26 ++++----
 src/xmlpatterns/type/qxsltnodetest_p.h             | 26 ++++----
 src/xmlpatterns/utils/qautoptr.cpp                 | 26 ++++----
 src/xmlpatterns/utils/qautoptr_p.h                 | 26 ++++----
 src/xmlpatterns/utils/qcommonnamespaces_p.h        | 26 ++++----
 src/xmlpatterns/utils/qcppcastinghelper_p.h        | 26 ++++----
 src/xmlpatterns/utils/qdebug_p.h                   | 26 ++++----
 .../utils/qdelegatingnamespaceresolver.cpp         | 26 ++++----
 .../utils/qdelegatingnamespaceresolver_p.h         | 26 ++++----
 .../utils/qgenericnamespaceresolver.cpp            | 26 ++++----
 .../utils/qgenericnamespaceresolver_p.h            | 26 ++++----
 src/xmlpatterns/utils/qnamepool.cpp                | 26 ++++----
 src/xmlpatterns/utils/qnamepool_p.h                | 26 ++++----
 src/xmlpatterns/utils/qnamespacebinding_p.h        | 26 ++++----
 src/xmlpatterns/utils/qnamespaceresolver.cpp       | 26 ++++----
 src/xmlpatterns/utils/qnamespaceresolver_p.h       | 26 ++++----
 src/xmlpatterns/utils/qnodenamespaceresolver.cpp   | 26 ++++----
 src/xmlpatterns/utils/qnodenamespaceresolver_p.h   | 26 ++++----
 src/xmlpatterns/utils/qoutputvalidator.cpp         | 26 ++++----
 src/xmlpatterns/utils/qoutputvalidator_p.h         | 26 ++++----
 src/xmlpatterns/utils/qpatternistlocale.cpp        | 26 ++++----
 src/xmlpatterns/utils/qpatternistlocale_p.h        | 26 ++++----
 src/xmlpatterns/utils/qxpathhelper.cpp             | 26 ++++----
 src/xmlpatterns/utils/qxpathhelper_p.h             | 26 ++++----
 tests/arthur/common/framework.cpp                  | 26 ++++----
 tests/arthur/common/framework.h                    | 26 ++++----
 tests/arthur/common/paintcommands.cpp              | 26 ++++----
 tests/arthur/common/paintcommands.h                | 26 ++++----
 tests/arthur/common/qengines.cpp                   | 26 ++++----
 tests/arthur/common/qengines.h                     | 26 ++++----
 tests/arthur/common/xmldata.cpp                    | 26 ++++----
 tests/arthur/common/xmldata.h                      | 26 ++++----
 tests/arthur/datagenerator/datagenerator.cpp       | 26 ++++----
 tests/arthur/datagenerator/datagenerator.h         | 26 ++++----
 tests/arthur/datagenerator/main.cpp                | 26 ++++----
 tests/arthur/datagenerator/xmlgenerator.cpp        | 26 ++++----
 tests/arthur/datagenerator/xmlgenerator.h          | 26 ++++----
 tests/arthur/htmlgenerator/htmlgenerator.cpp       | 26 ++++----
 tests/arthur/htmlgenerator/htmlgenerator.h         | 26 ++++----
 tests/arthur/htmlgenerator/main.cpp                | 26 ++++----
 tests/arthur/lance/interactivewidget.cpp           | 26 ++++----
 tests/arthur/lance/interactivewidget.h             | 26 ++++----
 tests/arthur/lance/main.cpp                        | 26 ++++----
 tests/arthur/lance/widgets.h                       | 26 ++++----
 tests/arthur/performancediff/main.cpp              | 26 ++++----
 tests/arthur/performancediff/performancediff.cpp   | 26 ++++----
 tests/arthur/performancediff/performancediff.h     | 26 ++++----
 tests/arthur/shower/main.cpp                       | 26 ++++----
 tests/arthur/shower/shower.cpp                     | 26 ++++----
 tests/arthur/shower/shower.h                       | 26 ++++----
 tests/auto/atwrapper/atWrapper.cpp                 | 26 ++++----
 tests/auto/atwrapper/atWrapper.h                   | 26 ++++----
 tests/auto/atwrapper/atWrapperAutotest.cpp         | 26 ++++----
 tests/auto/bic/gen.sh                              | 26 ++++----
 tests/auto/bic/qbic.cpp                            | 26 ++++----
 tests/auto/bic/qbic.h                              | 26 ++++----
 tests/auto/bic/tst_bic.cpp                         | 26 ++++----
 tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp     | 26 ++++----
 tests/auto/collections/tst_collections.cpp         | 26 ++++----
 tests/auto/compiler/baseclass.cpp                  | 26 ++++----
 tests/auto/compiler/baseclass.h                    | 26 ++++----
 tests/auto/compiler/derivedclass.cpp               | 26 ++++----
 tests/auto/compiler/derivedclass.h                 | 26 ++++----
 tests/auto/compiler/tst_compiler.cpp               | 26 ++++----
 tests/auto/compilerwarnings/test_cpp.txt           | 26 ++++----
 .../auto/compilerwarnings/tst_compilerwarnings.cpp | 26 ++++----
 tests/auto/declarative/examples/tst_examples.cpp   | 26 ++++----
 .../auto/declarative/moduleqt47/tst_moduleqt47.cpp | 26 ++++----
 .../declarative/parserstress/tst_parserstress.cpp  | 26 ++++----
 .../tst_qdeclarativeanchors.cpp                    | 26 ++++----
 .../tst_qdeclarativeanimatedimage.cpp              | 26 ++++----
 .../tst_qdeclarativeanimations.cpp                 | 26 ++++----
 .../tst_qdeclarativebehaviors.cpp                  | 26 ++++----
 .../tst_qdeclarativebinding.cpp                    | 26 ++++----
 .../tst_qdeclarativeborderimage.cpp                | 26 ++++----
 .../tst_qdeclarativecomponent.cpp                  | 26 ++++----
 .../tst_qdeclarativeconnection.cpp                 | 26 ++++----
 .../tst_qdeclarativecontext.cpp                    | 26 ++++----
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    | 26 ++++----
 .../tst_qdeclarativedebugclient.cpp                | 26 ++++----
 .../private_headers/qdeclarativedebughelper_p.h    | 26 ++++----
 .../tst_qdeclarativedebughelper.cpp                | 26 ++++----
 .../private_headers/qdeclarativedebugservice_p.h   | 26 ++++----
 .../tst_qdeclarativedebugservice.cpp               | 26 ++++----
 .../qdeclarativedom/tst_qdeclarativedom.cpp        | 26 ++++----
 .../qdeclarativeecmascript/testtypes.cpp           | 26 ++++----
 .../declarative/qdeclarativeecmascript/testtypes.h | 26 ++++----
 .../tst_qdeclarativeecmascript.cpp                 | 26 ++++----
 .../qdeclarativeengine/tst_qdeclarativeengine.cpp  | 26 ++++----
 .../qdeclarativeerror/tst_qdeclarativeerror.cpp    | 26 ++++----
 .../tst_qdeclarativeflickable.cpp                  | 26 ++++----
 .../tst_qdeclarativeflipable.cpp                   | 26 ++++----
 .../tst_qdeclarativefocusscope.cpp                 | 26 ++++----
 .../tst_qdeclarativefolderlistmodel.cpp            | 26 ++++----
 .../tst_qdeclarativefontloader.cpp                 | 26 ++++----
 .../tst_qdeclarativegridview.cpp                   | 26 ++++----
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    | 26 ++++----
 .../tst_qdeclarativeimageprovider.cpp              | 26 ++++----
 .../qdeclarativeinfo/tst_qdeclarativeinfo.cpp      | 26 ++++----
 .../tst_qdeclarativeinstruction.cpp                | 26 ++++----
 .../qdeclarativeitem/tst_qdeclarativeitem.cpp      | 26 ++++----
 .../declarative/qdeclarativelanguage/testtypes.cpp | 26 ++++----
 .../declarative/qdeclarativelanguage/testtypes.h   | 26 ++++----
 .../tst_qdeclarativelanguage.cpp                   | 26 ++++----
 .../tst_qdeclarativelayoutitem.cpp                 | 26 ++++----
 .../tst_qdeclarativelistmodel.cpp                  | 26 ++++----
 .../tst_qdeclarativelistreference.cpp              | 26 ++++----
 .../tst_qdeclarativelistview.cpp                   | 26 ++++----
 .../qdeclarativeloader/tst_qdeclarativeloader.cpp  | 26 ++++----
 .../tst_qdeclarativemetatype.cpp                   | 26 ++++----
 .../qdeclarativemoduleplugin/plugin/plugin.cpp     | 26 ++++----
 .../tst_qdeclarativemoduleplugin.cpp               | 26 ++++----
 .../tst_qdeclarativemousearea.cpp                  | 26 ++++----
 .../tst_qdeclarativeparticles.cpp                  | 26 ++++----
 .../tst_qdeclarativepathview.cpp                   | 26 ++++----
 .../tst_qdeclarativepixmapcache.cpp                | 26 ++++----
 .../tst_qdeclarativepositioners.cpp                | 26 ++++----
 .../tst_qdeclarativeproperty.cpp                   | 26 ++++----
 .../tst_qdeclarativepropertymap.cpp                | 26 ++++----
 .../qdeclarativeqt/tst_qdeclarativeqt.cpp          | 26 ++++----
 .../tst_qdeclarativerepeater.cpp                   | 26 ++++----
 .../tst_qdeclarativescriptdebugging.cpp            | 26 ++++----
 .../tst_qdeclarativesmoothedanimation.cpp          | 26 ++++----
 .../tst_qdeclarativespringanimation.cpp            | 26 ++++----
 .../tst_qdeclarativesqldatabase.cpp                | 26 ++++----
 .../qdeclarativestates/tst_qdeclarativestates.cpp  | 26 ++++----
 .../tst_qdeclarativestyledtext.cpp                 | 26 ++++----
 .../tst_qdeclarativesystempalette.cpp              | 26 ++++----
 .../qdeclarativetext/tst_qdeclarativetext.cpp      | 26 ++++----
 .../tst_qdeclarativetextedit.cpp                   | 26 ++++----
 .../tst_qdeclarativetextinput.cpp                  | 26 ++++----
 .../qdeclarativetimer/tst_qdeclarativetimer.cpp    | 26 ++++----
 .../qdeclarativevaluetypes/testtypes.cpp           | 26 ++++----
 .../declarative/qdeclarativevaluetypes/testtypes.h | 26 ++++----
 .../tst_qdeclarativevaluetypes.cpp                 | 26 ++++----
 .../qdeclarativeview/tst_qdeclarativeview.cpp      | 26 ++++----
 .../qdeclarativeviewer/tst_qdeclarativeviewer.cpp  | 26 ++++----
 .../tst_qdeclarativevisualdatamodel.cpp            | 26 ++++----
 .../tst_qdeclarativewebview.cpp                    | 26 ++++----
 .../tst_qdeclarativeworkerscript.cpp               | 26 ++++----
 .../tst_qdeclarativexmlhttprequest.cpp             | 26 ++++----
 .../tst_qdeclarativexmllistmodel.cpp               | 26 ++++----
 .../qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp  | 26 ++++----
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp | 26 ++++----
 .../qpacketprotocol/tst_qpacketprotocol.cpp        | 26 ++++----
 tests/auto/declarative/runall.sh                   | 26 ++++----
 tests/auto/declarative/shared/debugutil.cpp        | 26 ++++----
 tests/auto/declarative/shared/debugutil_p.h        | 26 ++++----
 tests/auto/declarative/shared/testhttpserver.cpp   | 26 ++++----
 tests/auto/declarative/shared/testhttpserver.h     | 26 ++++----
 tests/auto/exceptionsafety/tst_exceptionsafety.cpp | 26 ++++----
 tests/auto/exceptionsafety_objects/oomsimulator.h  | 26 ++++----
 .../tst_exceptionsafety_objects.cpp                | 26 ++++----
 tests/auto/gestures/tst_gestures.cpp               | 26 ++++----
 tests/auto/guiapplauncher/tst_guiapplauncher.cpp   | 26 ++++----
 tests/auto/guiapplauncher/windowmanager.cpp        | 26 ++++----
 tests/auto/guiapplauncher/windowmanager.h          | 26 ++++----
 tests/auto/headers/headersclean.cpp                | 26 ++++----
 tests/auto/headers/tst_headers.cpp                 | 26 ++++----
 tests/auto/languagechange/tst_languagechange.cpp   | 26 ++++----
 tests/auto/linguist/lconvert/data/makeplurals.pl   | 26 ++++----
 tests/auto/linguist/lconvert/tst_lconvert.cpp      | 26 ++++----
 tests/auto/linguist/lrelease/tst_lrelease.cpp      | 26 ++++----
 .../lupdate/testdata/good/backslashes/src/main.cpp | 26 ++++----
 .../lupdate/testdata/good/cmdline_order/a.h        | 26 ++++----
 .../lupdate/testdata/good/cmdline_order/b.h        | 26 ++++----
 .../lupdate/testdata/good/codecforsrc/main.cpp     | 26 ++++----
 .../lupdate/testdata/good/codecfortr/main.cpp      | 26 ++++----
 .../lupdate/testdata/good/codecfortr1/main.cpp     | 26 ++++----
 .../lupdate/testdata/good/codecfortr2/main.cpp     | 26 ++++----
 .../lupdate/testdata/good/codecfortr3/main.cpp     | 26 ++++----
 .../lupdate/testdata/good/codecfortr4/main.cpp     | 26 ++++----
 .../lupdate/testdata/good/from_subdir/src/main.cpp | 26 ++++----
 .../lupdate/testdata/good/from_subdir/src/main.h   | 26 ++++----
 .../lupdate/testdata/good/heuristics/main.cpp      | 26 ++++----
 .../lupdate/testdata/good/lacksqobject/main.cpp    | 26 ++++----
 .../lupdate/testdata/good/merge_ordering/foo.cpp   | 26 ++++----
 .../testdata/good/merge_versions/project.ui        | 26 ++++----
 .../testdata/good/merge_whitespace/main.cpp        | 26 ++++----
 .../lupdate/testdata/good/mergecpp/finddialog.cpp  | 26 ++++----
 .../good/mergecpp_noobsolete/finddialog.cpp        | 26 ++++----
 .../testdata/good/mergecpp_obsolete/finddialog.cpp | 26 ++++----
 .../lupdate/testdata/good/mergeui/project.ui       | 26 ++++----
 .../good/multiple_locations/finddialog.cpp         | 26 ++++----
 .../testdata/good/multiple_locations/main.cpp      | 26 ++++----
 .../lupdate/testdata/good/namespaces/main.cpp      | 26 ++++----
 .../testdata/good/parse_special_chars/main.cpp     | 26 ++++----
 .../lupdate/testdata/good/parsecontexts/main.cpp   | 26 ++++----
 .../lupdate/testdata/good/parsecpp/finddialog.cpp  | 26 ++++----
 .../lupdate/testdata/good/parsecpp/main.cpp        | 26 ++++----
 .../lupdate/testdata/good/parsecpp2/main.cpp       | 26 ++++----
 .../lupdate/testdata/good/parsecpp2/main.h         | 26 ++++----
 .../lupdate/testdata/good/parsecpp2/main2.cpp      | 26 ++++----
 .../lupdate/testdata/good/parsecpp2/main3.cpp      | 26 ++++----
 .../lupdate/testdata/good/parsejava/main.java      | 26 ++++----
 .../lupdate/testdata/good/parseui/project.ui       | 26 ++++----
 .../linguist/lupdate/testdata/good/prefix/main.cpp | 26 ++++----
 .../lupdate/testdata/good/preprocess/main.cpp      | 26 ++++----
 .../lupdate/testdata/good/proparsing/main.cpp      | 26 ++++----
 .../lupdate/testdata/good/proparsing/main_mac.cpp  | 26 ++++----
 .../lupdate/testdata/good/proparsing/main_unix.cpp | 26 ++++----
 .../lupdate/testdata/good/proparsing/main_win.cpp  | 26 ++++----
 .../vpaths/dependpath/main_dependpath.cpp          | 26 ++++----
 .../testdata/good/proparsing/wildcard/main1.cpp    | 26 ++++----
 .../testdata/good/proparsing/wildcard/mainfile.cpp | 26 ++++----
 .../lupdate/testdata/good/proparsing/wildcard1.cpp | 26 ++++----
 .../testdata/good/proparsing/wildcard99.cpp        | 26 ++++----
 .../linguist/lupdate/testdata/good/proparsing2/a   | 26 ++++----
 .../lupdate/testdata/good/proparsing2/a.cpp        | 26 ++++----
 .../linguist/lupdate/testdata/good/proparsing2/b   | 26 ++++----
 .../lupdate/testdata/good/proparsing2/b.cpp        | 26 ++++----
 .../linguist/lupdate/testdata/good/proparsing2/e   | 26 ++++----
 .../lupdate/testdata/good/proparsing2/f/g.cpp      | 26 ++++----
 .../lupdate/testdata/good/proparsing2/spaces/z     | 26 ++++----
 .../testdata/good/proparsing2/variable_with_spaces | 26 ++++----
 .../lupdate/testdata/good/proparsing2/with         | 26 ++++----
 .../linguist/lupdate/testdata/good/proparsing2/x/d | 26 ++++----
 .../lupdate/testdata/good/proparsing2/x/variable   | 26 ++++----
 .../testdata/good/proparsingpaths/file1.cpp        | 26 ++++----
 .../testdata/good/proparsingpaths/filter.cpp       | 26 ++++----
 .../testdata/good/proparsingpaths/sub/subfile1.cpp | 26 ++++----
 .../good/proparsingpaths/sub/subfilter.cpp         | 26 ++++----
 .../testdata/good/proparsingpri/common/main.cpp    | 26 ++++----
 .../testdata/good/proparsingpri/mac/main_mac.cpp   | 26 ++++----
 .../good/proparsingpri/relativity/relativity.cpp   | 26 ++++----
 .../testdata/good/proparsingpri/unix/main_unix.cpp | 26 ++++----
 .../testdata/good/proparsingpri/win/main_win.cpp   | 26 ++++----
 .../testdata/good/proparsingsubdirs/sub1/main.cpp  | 26 ++++----
 .../testdata/good/proparsingsubs/common/main.cpp   | 26 ++++----
 .../testdata/good/proparsingsubs/mac/main_mac.cpp  | 26 ++++----
 .../good/proparsingsubs/unix/main_unix.cpp         | 26 ++++----
 .../testdata/good/proparsingsubs/win/main_win.cpp  | 26 ++++----
 .../lupdate/testdata/good/reloutput/main.cpp       | 26 ++++----
 .../lupdate/testdata/good/respfile/source1.cpp     | 26 ++++----
 .../lupdate/testdata/good/respfile/source2.cpp     | 26 ++++----
 .../lupdate/testdata/recursivescan/main.cpp        | 26 ++++----
 .../lupdate/testdata/recursivescan/project.ui      | 26 ++++----
 .../testdata/recursivescan/sub/filetypes/main.c++  | 26 ++++----
 .../testdata/recursivescan/sub/filetypes/main.cpp  | 26 ++++----
 .../testdata/recursivescan/sub/filetypes/main.cxx  | 26 ++++----
 .../testdata/recursivescan/sub/finddialog.cpp      | 26 ++++----
 .../lupdate/testdata/subdirs_full/subdir1/main.cpp | 26 ++++----
 .../testdata/subdirs_full/subdir2/subsub1/main.cpp | 26 ++++----
 .../testdata/subdirs_full/subdir2/subsub2/main.cpp | 26 ++++----
 .../lupdate/testdata/subdirs_part/subdir1/main.cpp | 26 ++++----
 .../testdata/subdirs_part/subdir2/subsub1/main.cpp | 26 ++++----
 .../testdata/subdirs_part/subdir2/subsub2/main.cpp | 26 ++++----
 tests/auto/linguist/lupdate/tst_lupdate.cpp        | 26 ++++----
 tests/auto/macgui/guitest.cpp                      | 26 ++++----
 tests/auto/macgui/guitest.h                        | 26 ++++----
 tests/auto/macgui/tst_macgui.cpp                   | 26 ++++----
 tests/auto/macnativeevents/expectedeventlist.cpp   | 26 ++++----
 tests/auto/macnativeevents/expectedeventlist.h     | 26 ++++----
 tests/auto/macnativeevents/nativeeventlist.cpp     | 26 ++++----
 tests/auto/macnativeevents/nativeeventlist.h       | 26 ++++----
 tests/auto/macnativeevents/qnativeevents.cpp       | 26 ++++----
 tests/auto/macnativeevents/qnativeevents.h         | 26 ++++----
 tests/auto/macnativeevents/qnativeevents_mac.cpp   | 26 ++++----
 tests/auto/macnativeevents/tst_macnativeevents.cpp | 26 ++++----
 tests/auto/macplist/app/main.cpp                   | 26 ++++----
 tests/auto/macplist/tst_macplist.cpp               | 26 ++++----
 tests/auto/maketestselftest/checktest/main.cpp     | 26 ++++----
 .../auto/maketestselftest/tst_maketestselftest.cpp | 26 ++++----
 tests/auto/mediaobject/dummy/audiooutput.cpp       | 26 ++++----
 tests/auto/mediaobject/dummy/audiooutput.h         | 26 ++++----
 tests/auto/mediaobject/dummy/backend.cpp           | 26 ++++----
 tests/auto/mediaobject/dummy/backend.h             | 26 ++++----
 tests/auto/mediaobject/dummy/mediaobject.cpp       | 26 ++++----
 tests/auto/mediaobject/dummy/mediaobject.h         | 26 ++++----
 tests/auto/mediaobject/dummy/videowidget.cpp       | 26 ++++----
 tests/auto/mediaobject/dummy/videowidget.h         | 26 ++++----
 tests/auto/mediaobject/qtesthelper.h               | 26 ++++----
 tests/auto/mediaobject/tst_mediaobject.cpp         | 26 ++++----
 tests/auto/mediaobject_wince_ds9/dummy.cpp         | 26 ++++----
 .../moc/Test.framework/Headers/testinterface.h     | 26 ++++----
 tests/auto/moc/assign-namespace.h                  | 26 ++++----
 tests/auto/moc/backslash-newlines.h                | 26 ++++----
 tests/auto/moc/c-comments.h                        | 26 ++++----
 tests/auto/moc/cstyle-enums.h                      | 26 ++++----
 tests/auto/moc/dir-in-include-path.h               | 26 ++++----
 tests/auto/moc/error-on-wrong-notify.h             | 26 ++++----
 tests/auto/moc/escapes-in-string-literals.h        | 26 ++++----
 tests/auto/moc/extraqualification.h                | 26 ++++----
 tests/auto/moc/forgotten-qinterface.h              | 26 ++++----
 tests/auto/moc/gadgetwithnoenums.h                 | 26 ++++----
 tests/auto/moc/interface-from-framework.h          | 26 ++++----
 tests/auto/moc/macro-on-cmdline.h                  | 26 ++++----
 tests/auto/moc/namespaced-flags.h                  | 26 ++++----
 tests/auto/moc/no-keywords.h                       | 26 ++++----
 tests/auto/moc/oldstyle-casts.h                    | 26 ++++----
 tests/auto/moc/parse-boost.h                       | 26 ++++----
 tests/auto/moc/pure-virtual-signals.h              | 26 ++++----
 tests/auto/moc/qinvokable.h                        | 26 ++++----
 tests/auto/moc/qprivateslots.h                     | 26 ++++----
 tests/auto/moc/single_function_keyword.h           | 26 ++++----
 tests/auto/moc/slots-with-void-template.h          | 26 ++++----
 tests/auto/moc/task189996.h                        | 26 ++++----
 tests/auto/moc/task192552.h                        | 26 ++++----
 tests/auto/moc/task234909.h                        | 26 ++++----
 tests/auto/moc/task240368.h                        | 26 ++++----
 tests/auto/moc/task87883.h                         | 26 ++++----
 tests/auto/moc/template-gtgt.h                     | 26 ++++----
 tests/auto/moc/testproject/Plugin/Plugin.h         | 26 ++++----
 tests/auto/moc/trigraphs.h                         | 26 ++++----
 tests/auto/moc/tst_moc.cpp                         | 26 ++++----
 tests/auto/moc/using-namespaces.h                  | 26 ++++----
 .../auto/moc/warn-on-multiple-qobject-subclasses.h | 26 ++++----
 tests/auto/moc/warn-on-property-without-read.h     | 26 ++++----
 tests/auto/moc/win-newlines.h                      | 58 ++++++++--------
 tests/auto/modeltest/dynamictreemodel.cpp          | 26 ++++----
 tests/auto/modeltest/dynamictreemodel.h            | 26 ++++----
 tests/auto/modeltest/modeltest.cpp                 | 26 ++++----
 tests/auto/modeltest/modeltest.h                   | 26 ++++----
 tests/auto/modeltest/tst_modeltest.cpp             | 26 ++++----
 tests/auto/network-settings.h                      | 26 ++++----
 tests/auto/networkselftest/tst_networkselftest.cpp | 26 ++++----
 .../tst_patternistexamplefiletree.cpp              | 26 ++++----
 .../patternistexamples/tst_patternistexamples.cpp  | 26 ++++----
 .../patternistheaders/tst_patternistheaders.cpp    | 26 ++++----
 tests/auto/q3accel/tst_q3accel.cpp                 | 26 ++++----
 tests/auto/q3action/tst_q3action.cpp               | 26 ++++----
 tests/auto/q3actiongroup/tst_q3actiongroup.cpp     | 26 ++++----
 tests/auto/q3buttongroup/clickLock/main.cpp        | 26 ++++----
 tests/auto/q3buttongroup/tst_q3buttongroup.cpp     | 26 ++++----
 tests/auto/q3canvas/tst_q3canvas.cpp               | 26 ++++----
 tests/auto/q3checklistitem/tst_q3checklistitem.cpp | 26 ++++----
 tests/auto/q3combobox/tst_q3combobox.cpp           | 26 ++++----
 tests/auto/q3cstring/tst_q3cstring.cpp             | 26 ++++----
 tests/auto/q3databrowser/tst_q3databrowser.cpp     | 26 ++++----
 tests/auto/q3dateedit/tst_q3dateedit.cpp           | 26 ++++----
 tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp   | 26 ++++----
 tests/auto/q3deepcopy/tst_q3deepcopy.cpp           | 26 ++++----
 tests/auto/q3dict/tst_q3dict.cpp                   | 26 ++++----
 tests/auto/q3dns/tst_q3dns.cpp                     | 26 ++++----
 tests/auto/q3dockwindow/tst_q3dockwindow.cpp       | 26 ++++----
 tests/auto/q3filedialog/tst_q3filedialog.cpp       | 26 ++++----
 tests/auto/q3frame/tst_q3frame.cpp                 | 26 ++++----
 tests/auto/q3groupbox/tst_q3groupbox.cpp           | 26 ++++----
 tests/auto/q3hbox/tst_q3hbox.cpp                   | 26 ++++----
 tests/auto/q3header/tst_q3header.cpp               | 26 ++++----
 tests/auto/q3iconview/tst_q3iconview.cpp           | 26 ++++----
 tests/auto/q3listbox/tst_qlistbox.cpp              | 26 ++++----
 tests/auto/q3listview/tst_q3listview.cpp           | 26 ++++----
 .../tst_q3listviewitemiterator.cpp                 | 26 ++++----
 tests/auto/q3mainwindow/tst_q3mainwindow.cpp       | 26 ++++----
 tests/auto/q3popupmenu/tst_q3popupmenu.cpp         | 26 ++++----
 tests/auto/q3process/cat/main.cpp                  | 26 ++++----
 tests/auto/q3process/echo/main.cpp                 | 26 ++++----
 tests/auto/q3process/tst_q3process.cpp             | 26 ++++----
 tests/auto/q3progressbar/tst_q3progressbar.cpp     | 26 ++++----
 .../auto/q3progressdialog/tst_q3progressdialog.cpp | 26 ++++----
 tests/auto/q3ptrlist/tst_q3ptrlist.cpp             | 26 ++++----
 tests/auto/q3richtext/tst_q3richtext.cpp           | 26 ++++----
 tests/auto/q3scrollview/tst_qscrollview.cpp        | 26 ++++----
 tests/auto/q3semaphore/tst_q3semaphore.cpp         | 26 ++++----
 tests/auto/q3serversocket/tst_q3serversocket.cpp   | 26 ++++----
 tests/auto/q3socket/tst_qsocket.cpp                | 26 ++++----
 tests/auto/q3socketdevice/tst_q3socketdevice.cpp   | 26 ++++----
 tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp         | 26 ++++----
 .../q3sqlselectcursor/tst_q3sqlselectcursor.cpp    | 26 ++++----
 tests/auto/q3stylesheet/tst_q3stylesheet.cpp       | 26 ++++----
 tests/auto/q3tabdialog/tst_q3tabdialog.cpp         | 26 ++++----
 tests/auto/q3table/tst_q3table.cpp                 | 26 ++++----
 tests/auto/q3textbrowser/tst_q3textbrowser.cpp     | 26 ++++----
 tests/auto/q3textedit/tst_q3textedit.cpp           | 26 ++++----
 tests/auto/q3textstream/tst_q3textstream.cpp       | 26 ++++----
 tests/auto/q3timeedit/tst_q3timeedit.cpp           | 26 ++++----
 tests/auto/q3toolbar/tst_q3toolbar.cpp             | 26 ++++----
 tests/auto/q3uridrag/tst_q3uridrag.cpp             | 26 ++++----
 tests/auto/q3urloperator/tst_q3urloperator.cpp     | 26 ++++----
 tests/auto/q3valuelist/tst_q3valuelist.cpp         | 26 ++++----
 tests/auto/q3valuevector/tst_q3valuevector.cpp     | 26 ++++----
 tests/auto/q3widgetstack/tst_q3widgetstack.cpp     | 26 ++++----
 tests/auto/q_func_info/tst_q_func_info.cpp         | 26 ++++----
 tests/auto/qabstractbutton/tst_qabstractbutton.cpp | 26 ++++----
 .../qabstractitemmodel/tst_qabstractitemmodel.cpp  | 26 ++++----
 .../qabstractitemview/tst_qabstractitemview.cpp    | 26 ++++----
 .../tst_qabstractmessagehandler.cpp                | 26 ++++----
 .../tst_qabstractnetworkcache.cpp                  | 26 ++++----
 .../tst_qabstractprintdialog.cpp                   | 26 ++++----
 .../tst_qabstractproxymodel.cpp                    | 26 ++++----
 .../tst_qabstractscrollarea.cpp                    | 26 ++++----
 tests/auto/qabstractslider/tst_qabstractslider.cpp | 26 ++++----
 tests/auto/qabstractsocket/tst_qabstractsocket.cpp | 26 ++++----
 .../auto/qabstractspinbox/tst_qabstractspinbox.cpp | 26 ++++----
 .../tst_qabstracttextdocumentlayout.cpp            | 26 ++++----
 tests/auto/qabstracturiresolver/TestURIResolver.h  | 26 ++++----
 .../tst_qabstracturiresolver.cpp                   | 26 ++++----
 .../tst_qabstractvideobuffer.cpp                   | 26 ++++----
 .../tst_qabstractvideosurface.cpp                  | 26 ++++----
 .../tst_qabstractxmlforwarditerator.cpp            | 26 ++++----
 tests/auto/qabstractxmlnodemodel/LoadingModel.cpp  | 26 ++++----
 tests/auto/qabstractxmlnodemodel/LoadingModel.h    | 26 ++++----
 tests/auto/qabstractxmlnodemodel/TestNodeModel.h   | 26 ++++----
 .../tst_qabstractxmlnodemodel.cpp                  | 26 ++++----
 .../qabstractxmlreceiver/TestAbstractXmlReceiver.h | 26 ++++----
 .../tst_qabstractxmlreceiver.cpp                   | 26 ++++----
 tests/auto/qaccessibility/tst_qaccessibility.cpp   | 26 ++++----
 .../qaccessibility_mac/tst_qaccessibility_mac.cpp  | 26 ++++----
 tests/auto/qaction/tst_qaction.cpp                 | 26 ++++----
 tests/auto/qactiongroup/tst_qactiongroup.cpp       | 26 ++++----
 tests/auto/qalgorithms/tst_qalgorithms.cpp         | 26 ++++----
 tests/auto/qanimationgroup/tst_qanimationgroup.cpp | 26 ++++----
 .../qapplication/desktopsettingsaware/main.cpp     | 26 ++++----
 tests/auto/qapplication/modal/base.cpp             | 26 ++++----
 tests/auto/qapplication/modal/base.h               | 26 ++++----
 tests/auto/qapplication/modal/main.cpp             | 26 ++++----
 tests/auto/qapplication/tst_qapplication.cpp       | 26 ++++----
 tests/auto/qapplication/wincmdline/main.cpp        | 26 ++++----
 .../tst_qapplicationargumentparser.cpp             | 26 ++++----
 tests/auto/qatomicint/tst_qatomicint.cpp           | 26 ++++----
 tests/auto/qatomicpointer/tst_qatomicpointer.cpp   | 26 ++++----
 .../auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp | 26 ++++----
 tests/auto/qaudioformat/tst_qaudioformat.cpp       | 26 ++++----
 tests/auto/qaudioinput/tst_qaudioinput.cpp         | 26 ++++----
 tests/auto/qaudiooutput/tst_qaudiooutput.cpp       | 26 ++++----
 tests/auto/qauthenticator/tst_qauthenticator.cpp   | 26 ++++----
 tests/auto/qautoptr/tst_qautoptr.cpp               | 26 ++++----
 tests/auto/qbearertestcommon.h                     | 26 ++++----
 tests/auto/qbitarray/tst_qbitarray.cpp             | 26 ++++----
 tests/auto/qboxlayout/tst_qboxlayout.cpp           | 26 ++++----
 tests/auto/qbrush/tst_qbrush.cpp                   | 26 ++++----
 tests/auto/qbuffer/tst_qbuffer.cpp                 | 26 ++++----
 tests/auto/qbuttongroup/tst_qbuttongroup.cpp       | 26 ++++----
 tests/auto/qbytearray/tst_qbytearray.cpp           | 26 ++++----
 .../qbytearraymatcher/tst_qbytearraymatcher.cpp    | 26 ++++----
 tests/auto/qcache/tst_qcache.cpp                   | 26 ++++----
 tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp | 26 ++++----
 tests/auto/qchar/tst_qchar.cpp                     | 26 ++++----
 tests/auto/qcheckbox/tst_qcheckbox.cpp             | 26 ++++----
 tests/auto/qclipboard/copier/main.cpp              | 26 ++++----
 tests/auto/qclipboard/paster/main.cpp              | 26 ++++----
 tests/auto/qclipboard/tst_qclipboard.cpp           | 26 ++++----
 tests/auto/qcolor/tst_qcolor.cpp                   | 26 ++++----
 tests/auto/qcolordialog/tst_qcolordialog.cpp       | 26 ++++----
 tests/auto/qcolumnview/tst_qcolumnview.cpp         | 26 ++++----
 tests/auto/qcombobox/tst_qcombobox.cpp             | 26 ++++----
 .../qcommandlinkbutton/tst_qcommandlinkbutton.cpp  | 26 ++++----
 tests/auto/qcompleter/tst_qcompleter.cpp           | 26 ++++----
 tests/auto/qcomplextext/bidireorderstring.h        | 26 ++++----
 tests/auto/qcomplextext/tst_qcomplextext.cpp       | 26 ++++----
 .../auto/qcontiguouscache/tst_qcontiguouscache.cpp | 26 ++++----
 tests/auto/qcopchannel/testSend/main.cpp           | 26 ++++----
 tests/auto/qcopchannel/tst_qcopchannel.cpp         | 26 ++++----
 .../auto/qcoreapplication/tst_qcoreapplication.cpp | 26 ++++----
 .../qcryptographichash/tst_qcryptographichash.cpp  | 26 ++++----
 tests/auto/qcssparser/tst_qcssparser.cpp           | 26 ++++----
 tests/auto/qdatastream/tst_qdatastream.cpp         | 26 ++++----
 .../qdatawidgetmapper/tst_qdatawidgetmapper.cpp    | 26 ++++----
 tests/auto/qdate/tst_qdate.cpp                     | 26 ++++----
 tests/auto/qdatetime/tst_qdatetime.cpp             | 26 ++++----
 tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp     | 26 ++++----
 .../tst_qdbusabstractadaptor.cpp                   | 26 ++++----
 tests/auto/qdbusabstractinterface/interface.cpp    | 26 ++++----
 tests/auto/qdbusabstractinterface/interface.h      | 26 ++++----
 tests/auto/qdbusabstractinterface/pinger.cpp       | 26 ++++----
 tests/auto/qdbusabstractinterface/pinger.h         | 26 ++++----
 .../tst_qdbusabstractinterface.cpp                 | 26 ++++----
 tests/auto/qdbusconnection/tst_qdbusconnection.cpp | 26 ++++----
 tests/auto/qdbuscontext/tst_qdbuscontext.cpp       | 26 ++++----
 tests/auto/qdbusinterface/tst_qdbusinterface.cpp   | 26 ++++----
 tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp | 26 ++++----
 tests/auto/qdbusmarshall/common.h                  | 26 ++++----
 tests/auto/qdbusmarshall/dummy.cpp                 | 26 ++++----
 tests/auto/qdbusmarshall/qpong/qpong.cpp           | 26 ++++----
 tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp     | 26 ++++----
 tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp | 26 ++++----
 tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp     | 26 ++++----
 .../auto/qdbuspendingcall/tst_qdbuspendingcall.cpp | 26 ++++----
 .../qdbuspendingreply/tst_qdbuspendingreply.cpp    | 26 ++++----
 tests/auto/qdbusperformance/server/server.cpp      | 26 ++++----
 tests/auto/qdbusperformance/serverobject.h         | 26 ++++----
 .../auto/qdbusperformance/tst_qdbusperformance.cpp | 26 ++++----
 tests/auto/qdbusreply/tst_qdbusreply.cpp           | 26 ++++----
 .../tst_qdbusservicewatcher.cpp                    | 26 ++++----
 tests/auto/qdbusthreading/tst_qdbusthreading.cpp   | 26 ++++----
 tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp   | 26 ++++----
 tests/auto/qdebug/tst_qdebug.cpp                   | 26 ++++----
 .../auto/qdesktopservices/tst_qdesktopservices.cpp | 26 ++++----
 tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp   | 26 ++++----
 tests/auto/qdial/tst_qdial.cpp                     | 26 ++++----
 tests/auto/qdialog/tst_qdialog.cpp                 | 26 ++++----
 .../auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 26 ++++----
 tests/auto/qdir/testdir/dir/qrc_qdir.cpp           | 26 ++++----
 tests/auto/qdir/testdir/dir/tst_qdir.cpp           | 26 ++++----
 tests/auto/qdir/tst_qdir.cpp                       | 26 ++++----
 .../auto/qdirectpainter/runDirectPainter/main.cpp  | 26 ++++----
 tests/auto/qdirectpainter/tst_qdirectpainter.cpp   | 26 ++++----
 tests/auto/qdiriterator/tst_qdiriterator.cpp       | 26 ++++----
 tests/auto/qdirmodel/tst_qdirmodel.cpp             | 26 ++++----
 tests/auto/qdockwidget/tst_qdockwidget.cpp         | 26 ++++----
 tests/auto/qdom/tst_qdom.cpp                       | 26 ++++----
 tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp   | 26 ++++----
 .../auto/qdoublevalidator/tst_qdoublevalidator.cpp | 26 ++++----
 tests/auto/qdrag/tst_qdrag.cpp                     | 26 ++++----
 tests/auto/qeasingcurve/tst_qeasingcurve.cpp       | 26 ++++----
 tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp     | 26 ++++----
 tests/auto/qerrormessage/tst_qerrormessage.cpp     | 26 ++++----
 tests/auto/qevent/tst_qevent.cpp                   | 26 ++++----
 tests/auto/qeventloop/tst_qeventloop.cpp           | 26 ++++----
 .../tst_qexplicitlyshareddatapointer.cpp           | 26 ++++----
 tests/auto/qfile/largefile/tst_largefile.cpp       | 26 ++++----
 tests/auto/qfile/stdinprocess/main.cpp             | 26 ++++----
 tests/auto/qfile/tst_qfile.cpp                     | 26 ++++----
 tests/auto/qfiledialog/tst_qfiledialog.cpp         | 26 ++++----
 tests/auto/qfiledialog2/tst_qfiledialog2.cpp       | 26 ++++----
 .../qfileiconprovider/tst_qfileiconprovider.cpp    | 26 ++++----
 tests/auto/qfileinfo/tst_qfileinfo.cpp             | 26 ++++----
 .../auto/qfilesystemmodel/tst_qfilesystemmodel.cpp | 26 ++++----
 .../qfilesystemwatcher/tst_qfilesystemwatcher.cpp  | 26 ++++----
 tests/auto/qflags/tst_qflags.cpp                   | 26 ++++----
 tests/auto/qfocusevent/tst_qfocusevent.cpp         | 26 ++++----
 tests/auto/qfocusframe/tst_qfocusframe.cpp         | 26 ++++----
 tests/auto/qfont/tst_qfont.cpp                     | 26 ++++----
 tests/auto/qfontcombobox/tst_qfontcombobox.cpp     | 26 ++++----
 tests/auto/qfontdatabase/tst_qfontdatabase.cpp     | 26 ++++----
 tests/auto/qfontdialog/tst_qfontdialog.cpp         | 26 ++++----
 .../qfontdialog/tst_qfontdialog_mac_helpers.mm     | 26 ++++----
 tests/auto/qfontmetrics/tst_qfontmetrics.cpp       | 26 ++++----
 tests/auto/qformlayout/tst_qformlayout.cpp         | 26 ++++----
 tests/auto/qftp/tst_qftp.cpp                       | 26 ++++----
 tests/auto/qfuture/tst_qfuture.cpp                 | 26 ++++----
 tests/auto/qfuture/versioncheck.h                  | 26 ++++----
 tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp   | 26 ++++----
 tests/auto/qgetputenv/tst_qgetputenv.cpp           | 26 ++++----
 tests/auto/qgl/tst_qgl.cpp                         | 26 ++++----
 tests/auto/qglbuffer/tst_qglbuffer.cpp             | 26 ++++----
 tests/auto/qglobal/tst_qglobal.cpp                 | 26 ++++----
 tests/auto/qglthreads/tst_qglthreads.cpp           | 26 ++++----
 tests/auto/qglthreads/tst_qglthreads.h             | 26 ++++----
 .../tst_qgraphicsanchorlayout.cpp                  | 26 ++++----
 .../tst_qgraphicsanchorlayout1.cpp                 | 26 ++++----
 tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp | 26 ++++----
 .../tst_qgraphicseffectsource.cpp                  | 26 ++++----
 .../tst_qgraphicsgridlayout.cpp                    | 26 ++++----
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp     | 26 ++++----
 .../tst_qgraphicsitemanimation.cpp                 | 26 ++++----
 tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp | 26 ++++----
 .../tst_qgraphicslayoutitem.cpp                    | 26 ++++----
 .../tst_qgraphicslinearlayout.cpp                  | 26 ++++----
 tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp | 26 ++++----
 .../tst_qgraphicspixmapitem.cpp                    | 26 ++++----
 .../tst_qgraphicspolygonitem.cpp                   | 26 ++++----
 .../tst_qgraphicsproxywidget.cpp                   | 26 ++++----
 tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp   | 26 ++++----
 .../tst_qgraphicssceneindex.cpp                    | 26 ++++----
 .../qgraphicstransform/tst_qgraphicstransform.cpp  | 26 ++++----
 tests/auto/qgraphicsview/tst_qgraphicsview.cpp     | 26 ++++----
 tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp   | 26 ++++----
 tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 26 ++++----
 tests/auto/qgridlayout/tst_qgridlayout.cpp         | 26 ++++----
 tests/auto/qgroupbox/tst_qgroupbox.cpp             | 26 ++++----
 tests/auto/qguivariant/tst_qguivariant.cpp         | 26 ++++----
 tests/auto/qhash/tst_qhash.cpp                     | 26 ++++----
 tests/auto/qheaderview/tst_qheaderview.cpp         | 26 ++++----
 .../qhelpcontentmodel/tst_qhelpcontentmodel.cpp    | 26 ++++----
 tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp | 26 ++++----
 tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp   | 26 ++++----
 tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp | 26 ++++----
 .../auto/qhelpprojectdata/tst_qhelpprojectdata.cpp | 26 ++++----
 tests/auto/qhostaddress/tst_qhostaddress.cpp       | 26 ++++----
 tests/auto/qhostinfo/tst_qhostinfo.cpp             | 26 ++++----
 tests/auto/qhttp/dummyserver.h                     | 26 ++++----
 tests/auto/qhttp/tst_qhttp.cpp                     | 26 ++++----
 .../tst_qhttpnetworkconnection.cpp                 | 26 ++++----
 .../qhttpnetworkreply/tst_qhttpnetworkreply.cpp    | 26 ++++----
 .../qhttpsocketengine/tst_qhttpsocketengine.cpp    | 26 ++++----
 tests/auto/qicoimageformat/tst_qicoimageformat.cpp | 26 ++++----
 tests/auto/qicon/tst_qicon.cpp                     | 26 ++++----
 tests/auto/qimage/tst_qimage.cpp                   | 26 ++++----
 tests/auto/qimageiohandler/tst_qimageiohandler.cpp | 26 ++++----
 tests/auto/qimagereader/tst_qimagereader.cpp       | 26 ++++----
 tests/auto/qimagewriter/tst_qimagewriter.cpp       | 26 ++++----
 tests/auto/qinputcontext/tst_qinputcontext.cpp     | 26 ++++----
 tests/auto/qinputdialog/tst_qinputdialog.cpp       | 26 ++++----
 tests/auto/qintvalidator/tst_qintvalidator.cpp     | 26 ++++----
 tests/auto/qiodevice/tst_qiodevice.cpp             | 26 ++++----
 tests/auto/qitemdelegate/tst_qitemdelegate.cpp     | 26 ++++----
 .../qitemeditorfactory/tst_qitemeditorfactory.cpp  | 26 ++++----
 tests/auto/qitemmodel/modelstotest.cpp             | 26 ++++----
 tests/auto/qitemmodel/tst_qitemmodel.cpp           | 26 ++++----
 .../tst_qitemselectionmodel.cpp                    | 26 ++++----
 tests/auto/qitemview/tst_qitemview.cpp             | 26 ++++----
 tests/auto/qitemview/viewstotest.cpp               | 26 ++++----
 tests/auto/qkeysequence/tst_qkeysequence.cpp       | 26 ++++----
 tests/auto/qlabel/tst_qlabel.cpp                   | 26 ++++----
 tests/auto/qlayout/tst_qlayout.cpp                 | 26 ++++----
 tests/auto/qlcdnumber/tst_qlcdnumber.cpp           | 26 ++++----
 tests/auto/qlibrary/lib/mylib.c                    | 26 ++++----
 tests/auto/qlibrary/lib2/mylib.c                   | 26 ++++----
 tests/auto/qlibrary/tst_qlibrary.cpp               | 26 ++++----
 tests/auto/qline/tst_qline.cpp                     | 26 ++++----
 tests/auto/qlineedit/tst_qlineedit.cpp             | 26 ++++----
 tests/auto/qlist/tst_qlist.cpp                     | 26 ++++----
 tests/auto/qlistview/tst_qlistview.cpp             | 26 ++++----
 tests/auto/qlistwidget/tst_qlistwidget.cpp         | 26 ++++----
 tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp   | 26 ++++----
 tests/auto/qlocale/tst_qlocale.cpp                 | 26 ++++----
 tests/auto/qlocalsocket/example/client/main.cpp    | 26 ++++----
 tests/auto/qlocalsocket/example/server/main.cpp    | 26 ++++----
 tests/auto/qlocalsocket/lackey/main.cpp            | 26 ++++----
 tests/auto/qlocalsocket/tst_qlocalsocket.cpp       | 26 ++++----
 tests/auto/qmacstyle/tst_qmacstyle.cpp             | 26 ++++----
 tests/auto/qmainwindow/tst_qmainwindow.cpp         | 26 ++++----
 tests/auto/qmake/testcompiler.cpp                  | 26 ++++----
 tests/auto/qmake/testcompiler.h                    | 26 ++++----
 tests/auto/qmake/testdata/findDeps/main.cpp        | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object1.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object2.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object3.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object4.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object5.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object6.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object7.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object8.h       | 26 ++++----
 tests/auto/qmake/testdata/findDeps/object9.h       | 26 ++++----
 tests/auto/qmake/testdata/findMocs/main.cpp        | 26 ++++----
 tests/auto/qmake/testdata/findMocs/object1.h       | 26 ++++----
 tests/auto/qmake/testdata/findMocs/object2.h       | 26 ++++----
 tests/auto/qmake/testdata/findMocs/object3.h       | 26 ++++----
 tests/auto/qmake/testdata/findMocs/object4.h       | 26 ++++----
 tests/auto/qmake/testdata/findMocs/object5.h       | 26 ++++----
 tests/auto/qmake/testdata/findMocs/object6.h       | 26 ++++----
 tests/auto/qmake/testdata/findMocs/object7.h       | 26 ++++----
 tests/auto/qmake/testdata/functions/1.cpp          | 26 ++++----
 tests/auto/qmake/testdata/functions/2.cpp          | 26 ++++----
 tests/auto/qmake/testdata/functions/one/1.cpp      | 26 ++++----
 tests/auto/qmake/testdata/functions/one/2.cpp      | 26 ++++----
 .../qmake/testdata/functions/three/wildcard21.cpp  | 26 ++++----
 .../qmake/testdata/functions/three/wildcard22.cpp  | 26 ++++----
 tests/auto/qmake/testdata/functions/two/1.cpp      | 26 ++++----
 tests/auto/qmake/testdata/functions/two/2.cpp      | 26 ++++----
 tests/auto/qmake/testdata/functions/wildcard21.cpp | 26 ++++----
 tests/auto/qmake/testdata/functions/wildcard22.cpp | 26 ++++----
 tests/auto/qmake/testdata/include_dir/main.cpp     | 26 ++++----
 .../auto/qmake/testdata/include_dir/test_file.cpp  | 26 ++++----
 tests/auto/qmake/testdata/include_dir/test_file.h  | 26 ++++----
 .../auto/qmake/testdata/include_function/main.cpp  | 26 ++++----
 tests/auto/qmake/testdata/install_depends/main.cpp | 26 ++++----
 .../qmake/testdata/install_depends/test_file.cpp   | 26 ++++----
 .../qmake/testdata/install_depends/test_file.h     | 26 ++++----
 tests/auto/qmake/testdata/one_space/main.cpp       | 26 ++++----
 tests/auto/qmake/testdata/quotedfilenames/main.cpp | 26 ++++----
 tests/auto/qmake/testdata/shadow_files/main.cpp    | 26 ++++----
 .../auto/qmake/testdata/shadow_files/test_file.cpp | 26 ++++----
 tests/auto/qmake/testdata/shadow_files/test_file.h | 26 ++++----
 tests/auto/qmake/testdata/simple_app/main.cpp      | 26 ++++----
 tests/auto/qmake/testdata/simple_app/test_file.cpp | 26 ++++----
 tests/auto/qmake/testdata/simple_app/test_file.h   | 26 ++++----
 tests/auto/qmake/testdata/simple_dll/simple.cpp    | 26 ++++----
 tests/auto/qmake/testdata/simple_dll/simple.h      | 26 ++++----
 tests/auto/qmake/testdata/simple_lib/simple.cpp    | 26 ++++----
 tests/auto/qmake/testdata/simple_lib/simple.h      | 26 ++++----
 .../qmake/testdata/subdirs/simple_app/main.cpp     | 26 ++++----
 .../testdata/subdirs/simple_app/test_file.cpp      | 26 ++++----
 .../qmake/testdata/subdirs/simple_app/test_file.h  | 26 ++++----
 .../qmake/testdata/subdirs/simple_dll/simple.cpp   | 26 ++++----
 .../qmake/testdata/subdirs/simple_dll/simple.h     | 26 ++++----
 tests/auto/qmake/tst_qmake.cpp                     | 26 ++++----
 tests/auto/qmap/tst_qmap.cpp                       | 26 ++++----
 tests/auto/qmargins/tst_qmargins.cpp               | 26 ++++----
 tests/auto/qmath/tst_qmath.cpp                     | 26 ++++----
 tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp           | 26 ++++----
 tests/auto/qmdiarea/tst_qmdiarea.cpp               | 26 ++++----
 tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp     | 26 ++++----
 tests/auto/qmenu/tst_qmenu.cpp                     | 26 ++++----
 tests/auto/qmenubar/tst_qmenubar.cpp               | 26 ++++----
 tests/auto/qmessagebox/tst_qmessagebox.cpp         | 26 ++++----
 tests/auto/qmetaobject/tst_qmetaobject.cpp         | 26 ++++----
 tests/auto/qmetatype/tst_qmetatype.cpp             | 26 ++++----
 tests/auto/qmimedata/tst_qmimedata.cpp             | 26 ++++----
 tests/auto/qmouseevent/tst_qmouseevent.cpp         | 26 ++++----
 .../qmouseevent_modal/tst_qmouseevent_modal.cpp    | 26 ++++----
 tests/auto/qmovie/tst_qmovie.cpp                   | 26 ++++----
 tests/auto/qmultiscreen/tst_qmultiscreen.cpp       | 26 ++++----
 tests/auto/qmutex/tst_qmutex.cpp                   | 26 ++++----
 tests/auto/qmutexlocker/tst_qmutexlocker.cpp       | 26 ++++----
 .../tst_qnativesocketengine.cpp                    | 26 ++++----
 .../tst_qnetworkaccessmanager.cpp                  | 26 ++++----
 ...t_qnetworkaccessmanager_and_qprogressdialog.cpp | 26 ++++----
 .../tst_qnetworkaddressentry.cpp                   | 26 ++++----
 .../tst_qnetworkcachemetadata.cpp                  | 26 ++++----
 .../tst_qnetworkconfiguration.cpp                  | 26 ++++----
 .../tst_qnetworkconfigurationmanager.cpp           | 26 ++++----
 tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp   | 26 ++++----
 .../qnetworkcookiejar/tst_qnetworkcookiejar.cpp    | 26 ++++----
 .../qnetworkdiskcache/tst_qnetworkdiskcache.cpp    | 26 ++++----
 .../qnetworkinterface/tst_qnetworkinterface.cpp    | 26 ++++----
 tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp     | 26 ++++----
 tests/auto/qnetworkreply/echo/main.cpp             | 26 ++++----
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp     | 26 ++++----
 tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp | 26 ++++----
 tests/auto/qnetworksession/lackey/main.cpp         | 26 ++++----
 .../qnetworksession/test/tst_qnetworksession.cpp   | 26 ++++----
 tests/auto/qnumeric/tst_qnumeric.cpp               | 26 ++++----
 tests/auto/qobject/moc_oldnormalizeobject.cpp      | 26 ++++----
 tests/auto/qobject/oldnormalizeobject.h            | 26 ++++----
 tests/auto/qobject/signalbug.cpp                   | 26 ++++----
 tests/auto/qobject/signalbug.h                     | 26 ++++----
 tests/auto/qobject/tst_qobject.cpp                 | 26 ++++----
 .../qobjectperformance/tst_qobjectperformance.cpp  | 26 ++++----
 tests/auto/qobjectrace/tst_qobjectrace.cpp         | 26 ++++----
 tests/auto/qpaintengine/tst_qpaintengine.cpp       | 26 ++++----
 tests/auto/qpainter/tst_qpainter.cpp               | 26 ++++----
 tests/auto/qpainter/utils/createImages/main.cpp    | 26 ++++----
 tests/auto/qpainterpath/tst_qpainterpath.cpp       | 26 ++++----
 .../tst_qpainterpathstroker.cpp                    | 26 ++++----
 tests/auto/qpalette/tst_qpalette.cpp               | 26 ++++----
 .../tst_qparallelanimationgroup.cpp                | 26 ++++----
 tests/auto/qpathclipper/pathcompare.h              | 26 ++++----
 tests/auto/qpathclipper/paths.cpp                  | 26 ++++----
 tests/auto/qpathclipper/paths.h                    | 26 ++++----
 tests/auto/qpathclipper/tst_qpathclipper.cpp       | 26 ++++----
 tests/auto/qpauseanimation/tst_qpauseanimation.cpp | 26 ++++----
 tests/auto/qpen/tst_qpen.cpp                       | 26 ++++----
 tests/auto/qpicture/tst_qpicture.cpp               | 26 ++++----
 tests/auto/qpixmap/tst_qpixmap.cpp                 | 26 ++++----
 tests/auto/qpixmapcache/tst_qpixmapcache.cpp       | 26 ++++----
 tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp     | 26 ++++----
 tests/auto/qplaintextedit/tst_qplaintextedit.cpp   | 26 ++++----
 tests/auto/qplugin/debugplugin/main.cpp            | 26 ++++----
 tests/auto/qplugin/releaseplugin/main.cpp          | 26 ++++----
 tests/auto/qplugin/tst_qplugin.cpp                 | 26 ++++----
 .../qpluginloader/almostplugin/almostplugin.cpp    | 26 ++++----
 .../auto/qpluginloader/almostplugin/almostplugin.h | 26 ++++----
 tests/auto/qpluginloader/lib/mylib.c               | 26 ++++----
 .../auto/qpluginloader/theplugin/plugininterface.h | 26 ++++----
 tests/auto/qpluginloader/theplugin/theplugin.cpp   | 26 ++++----
 tests/auto/qpluginloader/theplugin/theplugin.h     | 26 ++++----
 tests/auto/qpluginloader/tst_qpluginloader.cpp     | 26 ++++----
 tests/auto/qpoint/tst_qpoint.cpp                   | 26 ++++----
 tests/auto/qpointer/tst_qpointer.cpp               | 26 ++++----
 tests/auto/qpolygon/tst_qpolygon.cpp               | 26 ++++----
 tests/auto/qprinter/tst_qprinter.cpp               | 26 ++++----
 tests/auto/qprinterinfo/tst_qprinterinfo.cpp       | 26 ++++----
 tests/auto/qprocess/fileWriterProcess/main.cpp     | 26 ++++----
 tests/auto/qprocess/testDetached/main.cpp          | 26 ++++----
 tests/auto/qprocess/testExitCodes/main.cpp         | 26 ++++----
 tests/auto/qprocess/testGuiProcess/main.cpp        | 26 ++++----
 tests/auto/qprocess/testProcessCrash/main.cpp      | 26 ++++----
 .../qprocess/testProcessDeadWhileReading/main.cpp  | 26 ++++----
 tests/auto/qprocess/testProcessEOF/main.cpp        | 26 ++++----
 tests/auto/qprocess/testProcessEcho/main.cpp       | 26 ++++----
 tests/auto/qprocess/testProcessEcho2/main.cpp      | 26 ++++----
 tests/auto/qprocess/testProcessEcho3/main.cpp      | 26 ++++----
 .../auto/qprocess/testProcessEchoGui/main_win.cpp  | 26 ++++----
 .../auto/qprocess/testProcessEnvironment/main.cpp  | 26 ++++----
 tests/auto/qprocess/testProcessLoopback/main.cpp   | 26 ++++----
 tests/auto/qprocess/testProcessNormal/main.cpp     | 26 ++++----
 tests/auto/qprocess/testProcessOutput/main.cpp     | 26 ++++----
 tests/auto/qprocess/testProcessSpacesArgs/main.cpp | 26 ++++----
 .../auto/qprocess/testSetWorkingDirectory/main.cpp | 26 ++++----
 tests/auto/qprocess/testSoftExit/main_unix.cpp     | 26 ++++----
 tests/auto/qprocess/testSoftExit/main_win.cpp      | 26 ++++----
 tests/auto/qprocess/testSpaceInName/main.cpp       | 26 ++++----
 tests/auto/qprocess/tst_qprocess.cpp               | 26 ++++----
 .../tst_qprocessenvironment.cpp                    | 26 ++++----
 tests/auto/qprogressbar/tst_qprogressbar.cpp       | 26 ++++----
 tests/auto/qprogressdialog/tst_qprogressdialog.cpp | 26 ++++----
 .../qpropertyanimation/tst_qpropertyanimation.cpp  | 26 ++++----
 tests/auto/qpushbutton/tst_qpushbutton.cpp         | 26 ++++----
 tests/auto/qquaternion/tst_qquaternion.cpp         | 26 ++++----
 tests/auto/qqueue/tst_qqueue.cpp                   | 26 ++++----
 tests/auto/qradiobutton/tst_qradiobutton.cpp       | 26 ++++----
 tests/auto/qrand/tst_qrand.cpp                     | 26 ++++----
 tests/auto/qreadlocker/tst_qreadlocker.cpp         | 26 ++++----
 tests/auto/qreadwritelock/tst_qreadwritelock.cpp   | 26 ++++----
 tests/auto/qrect/tst_qrect.cpp                     | 26 ++++----
 tests/auto/qregexp/tst_qregexp.cpp                 | 26 ++++----
 .../auto/qregexpvalidator/tst_qregexpvalidator.cpp | 26 ++++----
 tests/auto/qregion/tst_qregion.cpp                 | 26 ++++----
 tests/auto/qresourceengine/tst_qresourceengine.cpp | 26 ++++----
 tests/auto/qringbuffer/tst_qringbuffer.cpp         | 26 ++++----
 .../tst_qs60mainapplication.cpp                    | 26 ++++----
 tests/auto/qscopedpointer/tst_qscopedpointer.cpp   | 26 ++++----
 tests/auto/qscriptable/tst_qscriptable.cpp         | 26 ++++----
 tests/auto/qscriptclass/tst_qscriptclass.cpp       | 26 ++++----
 tests/auto/qscriptcontext/tst_qscriptcontext.cpp   | 26 ++++----
 .../qscriptcontextinfo/tst_qscriptcontextinfo.cpp  | 26 ++++----
 tests/auto/qscriptengine/tst_qscriptengine.cpp     | 26 ++++----
 .../qscriptengineagent/tst_qscriptengineagent.cpp  | 26 ++++----
 .../tst_qscriptenginedebugger.cpp                  | 26 ++++----
 .../qscriptextqobject/tst_qscriptextqobject.cpp    | 26 ++++----
 .../qscriptjstestsuite/tst_qscriptjstestsuite.cpp  | 26 ++++----
 tests/auto/qscriptstring/tst_qscriptstring.cpp     | 26 ++++----
 .../qscriptv8testsuite/tst_qscriptv8testsuite.cpp  | 26 ++++----
 tests/auto/qscriptvalue/testgen/gen.py             | 52 +++++++--------
 tests/auto/qscriptvalue/testgen/main.cpp           | 26 ++++----
 tests/auto/qscriptvalue/testgen/testgenerator.cpp  | 52 +++++++--------
 tests/auto/qscriptvalue/testgen/testgenerator.h    | 26 ++++----
 tests/auto/qscriptvalue/tst_qscriptvalue.cpp       | 26 ++++----
 tests/auto/qscriptvalue/tst_qscriptvalue.h         | 26 ++++----
 .../tst_qscriptvalue_generated_cast.cpp            | 26 ++++----
 .../tst_qscriptvalue_generated_comparison.cpp      | 26 ++++----
 .../tst_qscriptvalue_generated_init.cpp            | 26 ++++----
 .../tst_qscriptvalue_generated_isXXX.cpp           | 26 ++++----
 .../tst_qscriptvalue_generated_toXXX.cpp           | 26 ++++----
 .../tst_qscriptvalueiterator.cpp                   | 26 ++++----
 tests/auto/qscrollarea/tst_qscrollarea.cpp         | 26 ++++----
 tests/auto/qscrollbar/tst_qscrollbar.cpp           | 26 ++++----
 tests/auto/qsemaphore/tst_qsemaphore.cpp           | 26 ++++----
 .../tst_qsequentialanimationgroup.cpp              | 26 ++++----
 tests/auto/qset/tst_qset.cpp                       | 26 ++++----
 tests/auto/qsettings/tst_qsettings.cpp             | 26 ++++----
 tests/auto/qsharedpointer/externaltests.cpp        | 26 ++++----
 tests/auto/qsharedpointer/externaltests.h          | 26 ++++----
 tests/auto/qsharedpointer/forwarddeclaration.cpp   | 26 ++++----
 tests/auto/qsharedpointer/forwarddeclared.cpp      | 26 ++++----
 tests/auto/qsharedpointer/forwarddeclared.h        | 26 ++++----
 tests/auto/qsharedpointer/tst_qsharedpointer.cpp   | 26 ++++----
 tests/auto/qsharedpointer/wrapper.cpp              | 26 ++++----
 tests/auto/qsharedpointer/wrapper.h                | 26 ++++----
 .../tst_qsharedpointer_and_qwidget.cpp             | 26 ++++----
 tests/auto/qshortcut/tst_qshortcut.cpp             | 26 ++++----
 tests/auto/qsidebar/tst_qsidebar.cpp               | 26 ++++----
 tests/auto/qsignalmapper/tst_qsignalmapper.cpp     | 26 ++++----
 tests/auto/qsignalspy/tst_qsignalspy.cpp           | 26 ++++----
 .../auto/qsimplexmlnodemodel/TestSimpleNodeModel.h | 26 ++++----
 .../tst_qsimplexmlnodemodel.cpp                    | 26 ++++----
 tests/auto/qsize/tst_qsize.cpp                     | 26 ++++----
 tests/auto/qsizef/tst_qsizef.cpp                   | 26 ++++----
 tests/auto/qsizegrip/tst_qsizegrip.cpp             | 26 ++++----
 tests/auto/qslider/tst_qslider.cpp                 | 26 ++++----
 tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp | 26 ++++----
 .../tst_qsocks5socketengine.cpp                    | 26 ++++----
 tests/auto/qsoftkeymanager/tst_qsoftkeymanager.cpp | 26 ++++----
 .../tst_qsortfilterproxymodel.cpp                  | 26 ++++----
 tests/auto/qsound/tst_qsound.cpp                   | 26 ++++----
 tests/auto/qsourcelocation/tst_qsourcelocation.cpp | 26 ++++----
 tests/auto/qspinbox/tst_qspinbox.cpp               | 26 ++++----
 tests/auto/qsplitter/tst_qsplitter.cpp             | 26 ++++----
 tests/auto/qsql/tst_qsql.cpp                       | 26 ++++----
 tests/auto/qsqldatabase/tst_databases.h            | 26 ++++----
 tests/auto/qsqldatabase/tst_qsqldatabase.cpp       | 26 ++++----
 tests/auto/qsqldriver/tst_qsqldriver.cpp           | 26 ++++----
 tests/auto/qsqlerror/tst_qsqlerror.cpp             | 26 ++++----
 tests/auto/qsqlfield/tst_qsqlfield.cpp             | 26 ++++----
 tests/auto/qsqlquery/tst_qsqlquery.cpp             | 26 ++++----
 tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp   | 26 ++++----
 tests/auto/qsqlrecord/tst_qsqlrecord.cpp           | 26 ++++----
 .../tst_qsqlrelationaltablemodel.cpp               | 26 ++++----
 tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp   | 26 ++++----
 tests/auto/qsqlthread/tst_qsqlthread.cpp           | 26 ++++----
 .../certificates/gencertificates.sh                | 26 ++++----
 tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 26 ++++----
 tests/auto/qsslcipher/tst_qsslcipher.cpp           | 26 ++++----
 tests/auto/qsslerror/tst_qsslerror.cpp             | 26 ++++----
 tests/auto/qsslkey/keys/genkeys.sh                 | 26 ++++----
 tests/auto/qsslkey/tst_qsslkey.cpp                 | 26 ++++----
 tests/auto/qsslsocket/tst_qsslsocket.cpp           | 26 ++++----
 tests/auto/qstackedlayout/tst_qstackedlayout.cpp   | 26 ++++----
 tests/auto/qstackedwidget/tst_qstackedwidget.cpp   | 26 ++++----
 tests/auto/qstandarditem/tst_qstandarditem.cpp     | 26 ++++----
 .../qstandarditemmodel/tst_qstandarditemmodel.cpp  | 26 ++++----
 tests/auto/qstate/tst_qstate.cpp                   | 26 ++++----
 tests/auto/qstatemachine/tst_qstatemachine.cpp     | 26 ++++----
 tests/auto/qstatictext/tst_qstatictext.cpp         | 26 ++++----
 tests/auto/qstatusbar/tst_qstatusbar.cpp           | 26 ++++----
 tests/auto/qstl/tst_qstl.cpp                       | 26 ++++----
 tests/auto/qstring/double_data.h                   | 26 ++++----
 tests/auto/qstring/tst_qstring.cpp                 | 26 ++++----
 tests/auto/qstringbuilder1/stringbuilder.cpp       | 26 ++++----
 tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp | 26 ++++----
 tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp | 26 ++++----
 tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp | 26 ++++----
 tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp | 26 ++++----
 tests/auto/qstringlist/tst_qstringlist.cpp         | 26 ++++----
 tests/auto/qstringlistmodel/qmodellistener.h       | 26 ++++----
 .../auto/qstringlistmodel/tst_qstringlistmodel.cpp | 26 ++++----
 tests/auto/qstringmatcher/tst_qstringmatcher.cpp   | 26 ++++----
 tests/auto/qstyle/tst_qstyle.cpp                   | 26 ++++----
 tests/auto/qstyleoption/tst_qstyleoption.cpp       | 26 ++++----
 .../auto/qstylesheetstyle/tst_qstylesheetstyle.cpp | 26 ++++----
 tests/auto/qsvgdevice/tst_qsvgdevice.cpp           | 26 ++++----
 tests/auto/qsvggenerator/tst_qsvggenerator.cpp     | 26 ++++----
 tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp       | 26 ++++----
 .../qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp  | 26 ++++----
 tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp | 26 ++++----
 tests/auto/qtabbar/tst_qtabbar.cpp                 | 26 ++++----
 tests/auto/qtableview/tst_qtableview.cpp           | 26 ++++----
 tests/auto/qtablewidget/tst_qtablewidget.cpp       | 26 ++++----
 tests/auto/qtabwidget/tst_qtabwidget.cpp           | 26 ++++----
 .../qtconcurrentfilter/tst_qtconcurrentfilter.cpp  | 26 ++++----
 .../tst_qtconcurrentiteratekernel.cpp              | 26 ++++----
 tests/auto/qtconcurrentmap/functions.h             | 26 ++++----
 tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp | 26 ++++----
 tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp | 26 ++++----
 .../tst_qtconcurrentthreadengine.cpp               | 26 ++++----
 tests/auto/qtcpserver/crashingServer/main.cpp      | 26 ++++----
 tests/auto/qtcpserver/tst_qtcpserver.cpp           | 26 ++++----
 tests/auto/qtcpsocket/stressTest/Test.cpp          | 26 ++++----
 tests/auto/qtcpsocket/stressTest/Test.h            | 26 ++++----
 tests/auto/qtcpsocket/stressTest/main.cpp          | 26 ++++----
 tests/auto/qtcpsocket/tst_qtcpsocket.cpp           | 26 ++++----
 tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp   | 26 ++++----
 tests/auto/qtessellator/XrenderFake.h              | 26 ++++----
 tests/auto/qtessellator/arc.cpp                    | 26 ++++----
 tests/auto/qtessellator/arc.h                      | 26 ++++----
 tests/auto/qtessellator/dataparser.cpp             | 26 ++++----
 tests/auto/qtessellator/dataparser.h               | 26 ++++----
 tests/auto/qtessellator/oldtessellator.cpp         | 26 ++++----
 tests/auto/qtessellator/oldtessellator.h           | 26 ++++----
 tests/auto/qtessellator/qnum.h                     | 26 ++++----
 tests/auto/qtessellator/sample_data.h              | 26 ++++----
 tests/auto/qtessellator/simple.cpp                 | 26 ++++----
 tests/auto/qtessellator/simple.h                   | 26 ++++----
 tests/auto/qtessellator/testtessellator.cpp        | 26 ++++----
 tests/auto/qtessellator/testtessellator.h          | 26 ++++----
 tests/auto/qtessellator/tst_tessellator.cpp        | 26 ++++----
 tests/auto/qtessellator/utils.cpp                  | 26 ++++----
 tests/auto/qtessellator/utils.h                    | 26 ++++----
 tests/auto/qtextblock/tst_qtextblock.cpp           | 26 ++++----
 .../tst_qtextboundaryfinder.cpp                    | 26 ++++----
 tests/auto/qtextbrowser/tst_qtextbrowser.cpp       | 26 ++++----
 tests/auto/qtextcodec/echo/main.cpp                | 26 ++++----
 tests/auto/qtextcodec/tst_qtextcodec.cpp           | 26 ++++----
 tests/auto/qtextcursor/tst_qtextcursor.cpp         | 26 ++++----
 tests/auto/qtextdocument/common.h                  | 26 ++++----
 tests/auto/qtextdocument/tst_qtextdocument.cpp     | 26 ++++----
 .../tst_qtextdocumentfragment.cpp                  | 26 ++++----
 .../tst_qtextdocumentlayout.cpp                    | 26 ++++----
 tests/auto/qtextedit/tst_qtextedit.cpp             | 26 ++++----
 tests/auto/qtextformat/tst_qtextformat.cpp         | 26 ++++----
 tests/auto/qtextlayout/tst_qtextlayout.cpp         | 26 ++++----
 tests/auto/qtextlist/tst_qtextlist.cpp             | 26 ++++----
 tests/auto/qtextobject/tst_qtextobject.cpp         | 26 ++++----
 tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp   | 26 ++++----
 tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp | 26 ++++----
 tests/auto/qtextscriptengine/generate/main.cpp     | 26 ++++----
 .../qtextscriptengine/tst_qtextscriptengine.cpp    | 26 ++++----
 .../auto/qtextstream/readAllStdinProcess/main.cpp  | 26 ++++----
 .../auto/qtextstream/readLineStdinProcess/main.cpp | 26 ++++----
 tests/auto/qtextstream/stdinProcess/main.cpp       | 26 ++++----
 tests/auto/qtextstream/tst_qtextstream.cpp         | 26 ++++----
 tests/auto/qtexttable/tst_qtexttable.cpp           | 26 ++++----
 tests/auto/qthread/tst_qthread.cpp                 | 26 ++++----
 tests/auto/qthreadonce/qthreadonce.cpp             | 26 ++++----
 tests/auto/qthreadonce/qthreadonce.h               | 26 ++++----
 tests/auto/qthreadonce/tst_qthreadonce.cpp         | 26 ++++----
 tests/auto/qthreadpool/tst_qthreadpool.cpp         | 26 ++++----
 tests/auto/qthreadstorage/tst_qthreadstorage.cpp   | 26 ++++----
 tests/auto/qtime/tst_qtime.cpp                     | 26 ++++----
 tests/auto/qtimeline/tst_qtimeline.cpp             | 26 ++++----
 tests/auto/qtimer/tst_qtimer.cpp                   | 26 ++++----
 tests/auto/qtipc/lackey/main.cpp                   | 26 ++++----
 .../qsharedmemory/qsystemlock/tst_qsystemlock.cpp  | 26 ++++----
 tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp | 26 ++++----
 tests/auto/qtipc/qsharedmemory/src/qsystemlock.h   | 26 ++++----
 tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h | 26 ++++----
 .../qtipc/qsharedmemory/src/qsystemlock_unix.cpp   | 26 ++++----
 .../qtipc/qsharedmemory/src/qsystemlock_win.cpp    | 26 ++++----
 .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp | 26 ++++----
 .../qsystemsemaphore/tst_qsystemsemaphore.cpp      | 26 ++++----
 tests/auto/qtmd5/tst_qtmd5.cpp                     | 26 ++++----
 tests/auto/qtokenautomaton/generateTokenizers.sh   | 26 ++++----
 .../qtokenautomaton/tokenizers/basic/basic.cpp     | 26 ++++----
 .../auto/qtokenautomaton/tokenizers/basic/basic.h  | 26 ++++----
 .../tokenizers/basicNamespace/basicNamespace.cpp   | 26 ++++----
 .../tokenizers/basicNamespace/basicNamespace.h     | 26 ++++----
 .../tokenizers/boilerplate/boilerplate.cpp         | 26 ++++----
 .../tokenizers/boilerplate/boilerplate.h           | 26 ++++----
 .../tokenizers/boilerplate/boilerplate.xml         | 26 ++++----
 .../tokenizers/noNamespace/noNamespace.cpp         | 26 ++++----
 .../tokenizers/noNamespace/noNamespace.h           | 26 ++++----
 .../tokenizers/noToString/noToString.cpp           | 26 ++++----
 .../tokenizers/noToString/noToString.h             | 26 ++++----
 .../tokenizers/withNamespace/withNamespace.cpp     | 26 ++++----
 .../tokenizers/withNamespace/withNamespace.h       | 26 ++++----
 tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp | 26 ++++----
 tests/auto/qtoolbar/tst_qtoolbar.cpp               | 26 ++++----
 tests/auto/qtoolbox/tst_qtoolbox.cpp               | 26 ++++----
 tests/auto/qtoolbutton/tst_qtoolbutton.cpp         | 26 ++++----
 tests/auto/qtooltip/tst_qtooltip.cpp               | 26 ++++----
 tests/auto/qtouchevent/tst_qtouchevent.cpp         | 26 ++++----
 tests/auto/qtransform/tst_qtransform.cpp           | 26 ++++----
 .../qtransformedscreen/tst_qtransformedscreen.cpp  | 26 ++++----
 tests/auto/qtranslator/tst_qtranslator.cpp         | 26 ++++----
 tests/auto/qtreeview/tst_qtreeview.cpp             | 26 ++++----
 tests/auto/qtreewidget/tst_qtreewidget.cpp         | 26 ++++----
 .../tst_qtreewidgetitemiterator.cpp                | 26 ++++----
 tests/auto/qtwidgets/mainwindow.cpp                | 26 ++++----
 tests/auto/qtwidgets/mainwindow.h                  | 26 ++++----
 tests/auto/qtwidgets/tst_qtwidgets.cpp             | 26 ++++----
 tests/auto/qudpsocket/clientserver/main.cpp        | 26 ++++----
 tests/auto/qudpsocket/tst_qudpsocket.cpp           | 26 ++++----
 tests/auto/qudpsocket/udpServer/main.cpp           | 26 ++++----
 tests/auto/qundogroup/tst_qundogroup.cpp           | 26 ++++----
 tests/auto/qundostack/tst_qundostack.cpp           | 26 ++++----
 tests/auto/qurl/idna-test.c                        | 26 ++++----
 tests/auto/qurl/tst_qurl.cpp                       | 26 ++++----
 tests/auto/quuid/testProcessUniqueness/main.cpp    | 26 ++++----
 tests/auto/quuid/tst_quuid.cpp                     | 26 ++++----
 tests/auto/qvariant/tst_qvariant.cpp               | 26 ++++----
 tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp | 26 ++++----
 tests/auto/qvector/tst_qvector.cpp                 | 26 ++++----
 tests/auto/qvectornd/tst_qvectornd.cpp             | 26 ++++----
 tests/auto/qvideoframe/tst_qvideoframe.cpp         | 26 ++++----
 .../tst_qvideosurfaceformat.cpp                    | 26 ++++----
 tests/auto/qwaitcondition/tst_qwaitcondition.cpp   | 26 ++++----
 tests/auto/qwebelement/dummy.cpp                   | 26 ++++----
 tests/auto/qwebframe/dummy.cpp                     | 26 ++++----
 tests/auto/qwebhistory/dummy.cpp                   | 26 ++++----
 tests/auto/qwebhistoryinterface/dummy.cpp          | 26 ++++----
 tests/auto/qwebpage/dummy.cpp                      | 26 ++++----
 tests/auto/qwidget/tst_qwidget.cpp                 | 26 ++++----
 tests/auto/qwidget/tst_qwidget_mac_helpers.h       | 26 ++++----
 tests/auto/qwidget/tst_qwidget_mac_helpers.mm      | 26 ++++----
 tests/auto/qwidget_window/tst_qwidget_window.cpp   | 26 ++++----
 tests/auto/qwidgetaction/tst_qwidgetaction.cpp     | 26 ++++----
 tests/auto/qwindowsurface/tst_qwindowsurface.cpp   | 26 ++++----
 .../qwineventnotifier/tst_qwineventnotifier.cpp    | 26 ++++----
 tests/auto/qwizard/tst_qwizard.cpp                 | 26 ++++----
 tests/auto/qwmatrix/tst_qwmatrix.cpp               | 26 ++++----
 tests/auto/qworkspace/tst_qworkspace.cpp           | 26 ++++----
 tests/auto/qwritelocker/tst_qwritelocker.cpp       | 26 ++++----
 tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp   | 26 ++++----
 tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp   | 26 ++++----
 tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp | 26 ++++----
 tests/auto/qx11info/tst_qx11info.cpp               | 26 ++++----
 tests/auto/qxml/tst_qxml.cpp                       | 26 ++++----
 tests/auto/qxmlformatter/tst_qxmlformatter.cpp     | 26 ++++----
 tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp | 26 ++++----
 tests/auto/qxmlitem/tst_qxmlitem.cpp               | 26 ++++----
 tests/auto/qxmlname/tst_qxmlname.cpp               | 26 ++++----
 tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp       | 26 ++++----
 .../qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp  | 26 ++++----
 tests/auto/qxmlquery/MessageSilencer.h             | 26 ++++----
 tests/auto/qxmlquery/MessageValidator.cpp          | 26 ++++----
 tests/auto/qxmlquery/MessageValidator.h            | 26 ++++----
 tests/auto/qxmlquery/NetworkOverrider.h            | 26 ++++----
 tests/auto/qxmlquery/PushBaseliner.h               | 26 ++++----
 tests/auto/qxmlquery/TestFundament.cpp             | 26 ++++----
 tests/auto/qxmlquery/TestFundament.h               | 26 ++++----
 tests/auto/qxmlquery/tst_qxmlquery.cpp             | 26 ++++----
 tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp | 26 ++++----
 tests/auto/qxmlschema/tst_qxmlschema.cpp           | 26 ++++----
 .../tst_qxmlschemavalidator.cpp                    | 26 ++++----
 tests/auto/qxmlserializer/tst_qxmlserializer.cpp   | 26 ++++----
 tests/auto/qxmlsimplereader/generate_ref_files.sh  | 26 ++++----
 tests/auto/qxmlsimplereader/parser/main.cpp        | 26 ++++----
 tests/auto/qxmlsimplereader/parser/parser.cpp      | 26 ++++----
 tests/auto/qxmlsimplereader/parser/parser.h        | 26 ++++----
 .../auto/qxmlsimplereader/tst_qxmlsimplereader.cpp | 26 ++++----
 tests/auto/qxmlstream/qc14n.h                      | 26 ++++----
 tests/auto/qxmlstream/setupSuite.sh                | 26 ++++----
 tests/auto/qxmlstream/tst_qxmlstream.cpp           | 26 ++++----
 tests/auto/qzip/tst_qzip.cpp                       | 26 ++++----
 tests/auto/rcc/tst_rcc.cpp                         | 26 ++++----
 tests/auto/selftests/alive/qtestalive.cpp          | 26 ++++----
 tests/auto/selftests/alive/tst_alive.cpp           | 26 ++++----
 tests/auto/selftests/assert/tst_assert.cpp         | 26 ++++----
 tests/auto/selftests/badxml/tst_badxml.cpp         | 26 ++++----
 .../benchlibcallgrind/tst_benchlibcallgrind.cpp    | 26 ++++----
 .../tst_benchlibeventcounter.cpp                   | 26 ++++----
 .../benchliboptions/tst_benchliboptions.cpp        | 26 ++++----
 .../tst_benchlibtickcounter.cpp                    | 26 ++++----
 .../benchlibwalltime/tst_benchlibwalltime.cpp      | 26 ++++----
 tests/auto/selftests/cmptest/tst_cmptest.cpp       | 26 ++++----
 .../commandlinedata/tst_commandlinedata.cpp        | 26 ++++----
 tests/auto/selftests/crashes/tst_crashes.cpp       | 26 ++++----
 tests/auto/selftests/datatable/tst_datatable.cpp   | 26 ++++----
 tests/auto/selftests/datetime/tst_datetime.cpp     | 26 ++++----
 .../selftests/differentexec/tst_differentexec.cpp  | 26 ++++----
 .../exceptionthrow/tst_exceptionthrow.cpp          | 26 ++++----
 tests/auto/selftests/expectfail/tst_expectfail.cpp | 26 ++++----
 tests/auto/selftests/failinit/tst_failinit.cpp     | 26 ++++----
 .../selftests/failinitdata/tst_failinitdata.cpp    | 26 ++++----
 tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp | 26 ++++----
 tests/auto/selftests/globaldata/tst_globaldata.cpp | 26 ++++----
 tests/auto/selftests/longstring/tst_longstring.cpp | 26 ++++----
 tests/auto/selftests/maxwarnings/maxwarnings.cpp   | 26 ++++----
 tests/auto/selftests/multiexec/tst_multiexec.cpp   | 26 ++++----
 .../qexecstringlist/tst_qexecstringlist.cpp        | 26 ++++----
 tests/auto/selftests/singleskip/tst_singleskip.cpp | 26 ++++----
 tests/auto/selftests/skip/tst_skip.cpp             | 26 ++++----
 tests/auto/selftests/skipglobal/tst_skipglobal.cpp | 26 ++++----
 tests/auto/selftests/skipinit/tst_skipinit.cpp     | 26 ++++----
 .../selftests/skipinitdata/tst_skipinitdata.cpp    | 26 ++++----
 tests/auto/selftests/sleep/tst_sleep.cpp           | 26 ++++----
 tests/auto/selftests/strcmp/tst_strcmp.cpp         | 26 ++++----
 tests/auto/selftests/subtest/tst_subtest.cpp       | 26 ++++----
 tests/auto/selftests/tst_selftests.cpp             | 26 ++++----
 .../waitwithoutgui/tst_waitwithoutgui.cpp          | 26 ++++----
 tests/auto/selftests/warnings/tst_warnings.cpp     | 26 ++++----
 tests/auto/selftests/xunit/tst_xunit.cpp           | 26 ++++----
 .../orientationchange/tst_orientationchange.cpp    | 26 ++++----
 .../qmainexceptions/tst_qmainexceptions.cpp        | 26 ++++----
 tests/auto/symbols/tst_symbols.cpp                 | 26 ++++----
 tests/auto/test.pl                                 | 26 ++++----
 tests/auto/uic/baseline/batchtranslation.ui        | 26 ++++----
 tests/auto/uic/baseline/batchtranslation.ui.h      | 26 ++++----
 tests/auto/uic/baseline/config.ui                  | 26 ++++----
 tests/auto/uic/baseline/config.ui.h                | 26 ++++----
 tests/auto/uic/baseline/config_fromuic3.ui         | 26 ++++----
 tests/auto/uic/baseline/config_fromuic3.ui.h       | 26 ++++----
 tests/auto/uic/baseline/finddialog.ui              | 26 ++++----
 tests/auto/uic/baseline/finddialog.ui.h            | 26 ++++----
 tests/auto/uic/baseline/formwindowsettings.ui      | 26 ++++----
 tests/auto/uic/baseline/formwindowsettings.ui.h    | 26 ++++----
 tests/auto/uic/baseline/helpdialog.ui              | 26 ++++----
 tests/auto/uic/baseline/helpdialog.ui.h            | 26 ++++----
 tests/auto/uic/baseline/listwidgeteditor.ui        | 26 ++++----
 tests/auto/uic/baseline/listwidgeteditor.ui.h      | 26 ++++----
 tests/auto/uic/baseline/mainwindowbase.ui          | 26 ++++----
 tests/auto/uic/baseline/mainwindowbase.ui.h        | 26 ++++----
 tests/auto/uic/baseline/newactiondialog.ui         | 26 ++++----
 tests/auto/uic/baseline/newactiondialog.ui.h       | 26 ++++----
 tests/auto/uic/baseline/newform.ui                 | 26 ++++----
 tests/auto/uic/baseline/newform.ui.h               | 26 ++++----
 tests/auto/uic/baseline/orderdialog.ui             | 26 ++++----
 tests/auto/uic/baseline/orderdialog.ui.h           | 26 ++++----
 tests/auto/uic/baseline/paletteeditor.ui           | 26 ++++----
 tests/auto/uic/baseline/paletteeditor.ui.h         | 26 ++++----
 .../auto/uic/baseline/paletteeditoradvancedbase.ui | 26 ++++----
 .../uic/baseline/paletteeditoradvancedbase.ui.h    | 26 ++++----
 tests/auto/uic/baseline/phrasebookbox.ui           | 26 ++++----
 tests/auto/uic/baseline/phrasebookbox.ui.h         | 26 ++++----
 tests/auto/uic/baseline/plugindialog.ui            | 26 ++++----
 tests/auto/uic/baseline/plugindialog.ui.h          | 26 ++++----
 tests/auto/uic/baseline/previewwidget.ui           | 26 ++++----
 tests/auto/uic/baseline/previewwidget.ui.h         | 26 ++++----
 tests/auto/uic/baseline/previewwidgetbase.ui       | 26 ++++----
 tests/auto/uic/baseline/previewwidgetbase.ui.h     | 26 ++++----
 tests/auto/uic/baseline/qfiledialog.ui             | 26 ++++----
 tests/auto/uic/baseline/qfiledialog.ui.h           | 26 ++++----
 tests/auto/uic/baseline/qtgradientdialog.ui        | 26 ++++----
 tests/auto/uic/baseline/qtgradientdialog.ui.h      | 26 ++++----
 tests/auto/uic/baseline/qtgradienteditor.ui        | 26 ++++----
 tests/auto/uic/baseline/qtgradienteditor.ui.h      | 26 ++++----
 tests/auto/uic/baseline/qtgradientviewdialog.ui    | 26 ++++----
 tests/auto/uic/baseline/qtgradientviewdialog.ui.h  | 26 ++++----
 tests/auto/uic/baseline/saveformastemplate.ui      | 26 ++++----
 tests/auto/uic/baseline/saveformastemplate.ui.h    | 26 ++++----
 tests/auto/uic/baseline/statistics.ui              | 26 ++++----
 tests/auto/uic/baseline/statistics.ui.h            | 26 ++++----
 tests/auto/uic/baseline/stringlisteditor.ui        | 26 ++++----
 tests/auto/uic/baseline/stringlisteditor.ui.h      | 26 ++++----
 tests/auto/uic/baseline/tabbedbrowser.ui           | 26 ++++----
 tests/auto/uic/baseline/tabbedbrowser.ui.h         | 26 ++++----
 tests/auto/uic/baseline/tablewidgeteditor.ui       | 26 ++++----
 tests/auto/uic/baseline/tablewidgeteditor.ui.h     | 26 ++++----
 tests/auto/uic/baseline/translatedialog.ui         | 26 ++++----
 tests/auto/uic/baseline/translatedialog.ui.h       | 26 ++++----
 tests/auto/uic/baseline/treewidgeteditor.ui        | 26 ++++----
 tests/auto/uic/baseline/treewidgeteditor.ui.h      | 26 ++++----
 tests/auto/uic/baseline/trpreviewtool.ui           | 26 ++++----
 tests/auto/uic/baseline/trpreviewtool.ui.h         | 26 ++++----
 tests/auto/uic/tst_uic.cpp                         | 26 ++++----
 tests/auto/uic3/baseline/about.ui                  | 26 ++++----
 tests/auto/uic3/baseline/about.ui.4                | 26 ++++----
 tests/auto/uic3/baseline/actioneditor.ui           | 26 ++++----
 tests/auto/uic3/baseline/actioneditor.ui.4         | 26 ++++----
 tests/auto/uic3/baseline/config.ui                 | 26 ++++----
 tests/auto/uic3/baseline/config.ui.4               | 26 ++++----
 tests/auto/uic3/baseline/configtoolboxdialog.ui    | 26 ++++----
 tests/auto/uic3/baseline/configtoolboxdialog.ui.4  | 26 ++++----
 tests/auto/uic3/baseline/connectiondialog.ui       | 26 ++++----
 tests/auto/uic3/baseline/connectiondialog.ui.4     | 26 ++++----
 tests/auto/uic3/baseline/createtemplate.ui         | 26 ++++----
 tests/auto/uic3/baseline/createtemplate.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/customwidgeteditor.ui     | 26 ++++----
 tests/auto/uic3/baseline/customwidgeteditor.ui.4   | 26 ++++----
 tests/auto/uic3/baseline/dbconnection.ui           | 26 ++++----
 tests/auto/uic3/baseline/dbconnection.ui.4         | 26 ++++----
 tests/auto/uic3/baseline/dbconnectioneditor.ui     | 26 ++++----
 tests/auto/uic3/baseline/dbconnectioneditor.ui.4   | 26 ++++----
 tests/auto/uic3/baseline/dbconnections.ui          | 26 ++++----
 tests/auto/uic3/baseline/dbconnections.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/editfunctions.ui          | 26 ++++----
 tests/auto/uic3/baseline/editfunctions.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/finddialog.ui             | 26 ++++----
 tests/auto/uic3/baseline/finddialog.ui.4           | 26 ++++----
 tests/auto/uic3/baseline/formsettings.ui           | 26 ++++----
 tests/auto/uic3/baseline/formsettings.ui.4         | 26 ++++----
 tests/auto/uic3/baseline/gotolinedialog.ui         | 26 ++++----
 tests/auto/uic3/baseline/gotolinedialog.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/helpdialog.ui             | 26 ++++----
 tests/auto/uic3/baseline/helpdialog.ui.4           | 26 ++++----
 tests/auto/uic3/baseline/iconvieweditor.ui         | 26 ++++----
 tests/auto/uic3/baseline/iconvieweditor.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/listboxeditor.ui          | 26 ++++----
 tests/auto/uic3/baseline/listboxeditor.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/listeditor.ui             | 26 ++++----
 tests/auto/uic3/baseline/listeditor.ui.4           | 26 ++++----
 tests/auto/uic3/baseline/listvieweditor.ui         | 26 ++++----
 tests/auto/uic3/baseline/listvieweditor.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/mainfilesettings.ui       | 26 ++++----
 tests/auto/uic3/baseline/mainfilesettings.ui.4     | 26 ++++----
 tests/auto/uic3/baseline/mainwindowbase.ui         | 26 ++++----
 tests/auto/uic3/baseline/mainwindowbase.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/mainwindowwizard.ui       | 26 ++++----
 tests/auto/uic3/baseline/mainwindowwizard.ui.4     | 26 ++++----
 tests/auto/uic3/baseline/multilineeditor.ui        | 26 ++++----
 tests/auto/uic3/baseline/multilineeditor.ui.4      | 26 ++++----
 tests/auto/uic3/baseline/newform.ui                | 26 ++++----
 tests/auto/uic3/baseline/newform.ui.4              | 26 ++++----
 tests/auto/uic3/baseline/paletteeditor.ui          | 26 ++++----
 tests/auto/uic3/baseline/paletteeditor.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/paletteeditoradvanced.ui  | 26 ++++----
 .../auto/uic3/baseline/paletteeditoradvanced.ui.4  | 26 ++++----
 .../uic3/baseline/paletteeditoradvancedbase.ui     | 26 ++++----
 .../uic3/baseline/paletteeditoradvancedbase.ui.4   | 26 ++++----
 tests/auto/uic3/baseline/pixmapcollectioneditor.ui | 26 ++++----
 .../auto/uic3/baseline/pixmapcollectioneditor.ui.4 | 26 ++++----
 tests/auto/uic3/baseline/pixmapfunction.ui         | 26 ++++----
 tests/auto/uic3/baseline/pixmapfunction.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/preferences.ui            | 26 ++++----
 tests/auto/uic3/baseline/preferences.ui.4          | 26 ++++----
 tests/auto/uic3/baseline/previewwidget.ui          | 26 ++++----
 tests/auto/uic3/baseline/previewwidget.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/previewwidgetbase.ui      | 26 ++++----
 tests/auto/uic3/baseline/previewwidgetbase.ui.4    | 26 ++++----
 tests/auto/uic3/baseline/projectsettings.ui        | 26 ++++----
 tests/auto/uic3/baseline/projectsettings.ui.4      | 26 ++++----
 tests/auto/uic3/baseline/qactivexselect.ui         | 26 ++++----
 tests/auto/uic3/baseline/qactivexselect.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/replacedialog.ui          | 26 ++++----
 tests/auto/uic3/baseline/replacedialog.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/richtextfontdialog.ui     | 26 ++++----
 tests/auto/uic3/baseline/richtextfontdialog.ui.4   | 26 ++++----
 tests/auto/uic3/baseline/settingsdialog.ui         | 26 ++++----
 tests/auto/uic3/baseline/settingsdialog.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/sqlformwizard.ui          | 26 ++++----
 tests/auto/uic3/baseline/sqlformwizard.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/startdialog.ui            | 26 ++++----
 tests/auto/uic3/baseline/startdialog.ui.4          | 26 ++++----
 tests/auto/uic3/baseline/statistics.ui             | 26 ++++----
 tests/auto/uic3/baseline/statistics.ui.4           | 26 ++++----
 tests/auto/uic3/baseline/tabbedbrowser.ui          | 26 ++++----
 tests/auto/uic3/baseline/tabbedbrowser.ui.4        | 26 ++++----
 tests/auto/uic3/baseline/tableeditor.ui            | 26 ++++----
 tests/auto/uic3/baseline/tableeditor.ui.4          | 26 ++++----
 tests/auto/uic3/baseline/topicchooser.ui           | 26 ++++----
 tests/auto/uic3/baseline/topicchooser.ui.4         | 26 ++++----
 tests/auto/uic3/baseline/variabledialog.ui         | 26 ++++----
 tests/auto/uic3/baseline/variabledialog.ui.4       | 26 ++++----
 tests/auto/uic3/baseline/wizardeditor.ui           | 26 ++++----
 tests/auto/uic3/baseline/wizardeditor.ui.4         | 26 ++++----
 tests/auto/uic3/tst_uic3.cpp                       | 26 ++++----
 tests/auto/uiloader/baseline/batchtranslation.ui   | 26 ++++----
 tests/auto/uiloader/baseline/config.ui             | 26 ++++----
 tests/auto/uiloader/baseline/finddialog.ui         | 26 ++++----
 tests/auto/uiloader/baseline/formwindowsettings.ui | 26 ++++----
 tests/auto/uiloader/baseline/helpdialog.ui         | 26 ++++----
 tests/auto/uiloader/baseline/listwidgeteditor.ui   | 26 ++++----
 tests/auto/uiloader/baseline/mainwindowbase.ui     | 26 ++++----
 tests/auto/uiloader/baseline/newactiondialog.ui    | 26 ++++----
 tests/auto/uiloader/baseline/newform.ui            | 26 ++++----
 tests/auto/uiloader/baseline/orderdialog.ui        | 26 ++++----
 tests/auto/uiloader/baseline/paletteeditor.ui      | 26 ++++----
 .../uiloader/baseline/paletteeditoradvancedbase.ui | 26 ++++----
 tests/auto/uiloader/baseline/phrasebookbox.ui      | 26 ++++----
 tests/auto/uiloader/baseline/plugindialog.ui       | 26 ++++----
 tests/auto/uiloader/baseline/previewwidget.ui      | 26 ++++----
 tests/auto/uiloader/baseline/previewwidgetbase.ui  | 26 ++++----
 tests/auto/uiloader/baseline/qfiledialog.ui        | 26 ++++----
 tests/auto/uiloader/baseline/qtgradientdialog.ui   | 26 ++++----
 tests/auto/uiloader/baseline/qtgradienteditor.ui   | 26 ++++----
 .../auto/uiloader/baseline/qtgradientviewdialog.ui | 26 ++++----
 tests/auto/uiloader/baseline/saveformastemplate.ui | 26 ++++----
 tests/auto/uiloader/baseline/statistics.ui         | 26 ++++----
 tests/auto/uiloader/baseline/stringlisteditor.ui   | 26 ++++----
 tests/auto/uiloader/baseline/tabbedbrowser.ui      | 26 ++++----
 tests/auto/uiloader/baseline/tablewidgeteditor.ui  | 26 ++++----
 tests/auto/uiloader/baseline/translatedialog.ui    | 26 ++++----
 tests/auto/uiloader/baseline/treewidgeteditor.ui   | 26 ++++----
 tests/auto/uiloader/baseline/trpreviewtool.ui      | 26 ++++----
 tests/auto/uiloader/tst_screenshot/main.cpp        | 26 ++++----
 tests/auto/uiloader/uiloader/tst_uiloader.cpp      | 26 ++++----
 tests/auto/uiloader/uiloader/uiloader.cpp          | 26 ++++----
 tests/auto/uiloader/uiloader/uiloader.h            | 26 ++++----
 tests/auto/utf8/tst_utf8.cpp                       | 26 ++++----
 tests/auto/windowsmobile/test/ddhelper.cpp         | 26 ++++----
 tests/auto/windowsmobile/test/ddhelper.h           | 26 ++++----
 .../auto/windowsmobile/test/tst_windowsmobile.cpp  | 26 ++++----
 tests/auto/windowsmobile/testQMenuBar/main.cpp     | 26 ++++----
 tests/auto/xmlpatterns/tst_xmlpatterns.cpp         | 26 ++++----
 .../xmlpatternsdiagnosticsts/TestSuite/validate.sh | 26 ++++----
 .../tst_xmlpatternsdiagnosticsts.cpp               | 26 ++++----
 .../xmlpatternsschema/tst_xmlpatternsschema.cpp    | 26 ++++----
 .../xmlpatternsschemats/TESTSUITE/updateSuite.sh   | 26 ++++----
 .../tst_xmlpatternsschemats.cpp                    | 26 ++++----
 tests/auto/xmlpatternssdk/ASTItem.cpp              | 26 ++++----
 tests/auto/xmlpatternssdk/ASTItem.h                | 26 ++++----
 .../auto/xmlpatternssdk/DebugExpressionFactory.cpp | 26 ++++----
 tests/auto/xmlpatternssdk/DebugExpressionFactory.h | 26 ++++----
 tests/auto/xmlpatternssdk/ErrorHandler.cpp         | 26 ++++----
 tests/auto/xmlpatternssdk/ErrorHandler.h           | 26 ++++----
 tests/auto/xmlpatternssdk/ErrorItem.cpp            | 26 ++++----
 tests/auto/xmlpatternssdk/ErrorItem.h              | 26 ++++----
 tests/auto/xmlpatternssdk/ExitCode.h               | 26 ++++----
 tests/auto/xmlpatternssdk/ExpressionInfo.cpp       | 26 ++++----
 tests/auto/xmlpatternssdk/ExpressionInfo.h         | 26 ++++----
 tests/auto/xmlpatternssdk/ExpressionNamer.cpp      | 26 ++++----
 tests/auto/xmlpatternssdk/ExpressionNamer.h        | 26 ++++----
 tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp | 26 ++++----
 tests/auto/xmlpatternssdk/ExternalSourceLoader.h   | 26 ++++----
 tests/auto/xmlpatternssdk/Global.cpp               | 26 ++++----
 tests/auto/xmlpatternssdk/Global.h                 | 26 ++++----
 tests/auto/xmlpatternssdk/ResultThreader.cpp       | 26 ++++----
 tests/auto/xmlpatternssdk/ResultThreader.h         | 26 ++++----
 tests/auto/xmlpatternssdk/TestBaseLine.cpp         | 26 ++++----
 tests/auto/xmlpatternssdk/TestBaseLine.h           | 26 ++++----
 tests/auto/xmlpatternssdk/TestCase.cpp             | 26 ++++----
 tests/auto/xmlpatternssdk/TestCase.h               | 26 ++++----
 tests/auto/xmlpatternssdk/TestContainer.cpp        | 26 ++++----
 tests/auto/xmlpatternssdk/TestContainer.h          | 26 ++++----
 tests/auto/xmlpatternssdk/TestGroup.cpp            | 26 ++++----
 tests/auto/xmlpatternssdk/TestGroup.h              | 26 ++++----
 tests/auto/xmlpatternssdk/TestItem.h               | 26 ++++----
 tests/auto/xmlpatternssdk/TestResult.cpp           | 26 ++++----
 tests/auto/xmlpatternssdk/TestResult.h             | 26 ++++----
 tests/auto/xmlpatternssdk/TestResultHandler.cpp    | 26 ++++----
 tests/auto/xmlpatternssdk/TestResultHandler.h      | 26 ++++----
 tests/auto/xmlpatternssdk/TestSuite.cpp            | 26 ++++----
 tests/auto/xmlpatternssdk/TestSuite.h              | 26 ++++----
 tests/auto/xmlpatternssdk/TestSuiteHandler.cpp     | 26 ++++----
 tests/auto/xmlpatternssdk/TestSuiteHandler.h       | 26 ++++----
 tests/auto/xmlpatternssdk/TestSuiteResult.cpp      | 26 ++++----
 tests/auto/xmlpatternssdk/TestSuiteResult.h        | 26 ++++----
 tests/auto/xmlpatternssdk/TreeItem.cpp             | 26 ++++----
 tests/auto/xmlpatternssdk/TreeItem.h               | 26 ++++----
 tests/auto/xmlpatternssdk/TreeModel.cpp            | 26 ++++----
 tests/auto/xmlpatternssdk/TreeModel.h              | 26 ++++----
 tests/auto/xmlpatternssdk/Worker.cpp               | 26 ++++----
 tests/auto/xmlpatternssdk/Worker.h                 | 26 ++++----
 tests/auto/xmlpatternssdk/XMLWriter.cpp            | 26 ++++----
 tests/auto/xmlpatternssdk/XMLWriter.h              | 26 ++++----
 tests/auto/xmlpatternssdk/XQTSTestCase.cpp         | 26 ++++----
 tests/auto/xmlpatternssdk/XQTSTestCase.h           | 26 ++++----
 tests/auto/xmlpatternssdk/XSDTSTestCase.cpp        | 26 ++++----
 tests/auto/xmlpatternssdk/XSDTSTestCase.h          | 26 ++++----
 tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp  | 26 ++++----
 tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h    | 26 ++++----
 tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp | 26 ++++----
 tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h   | 26 ++++----
 .../xmlpatternssdk/docs/XMLIndenterExample.cpp     | 26 ++++----
 .../auto/xmlpatternssdk/docs/XMLWriterExample.cpp  | 26 ++++----
 tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp  | 26 ++++----
 tests/auto/xmlpatternssdk/tests/XMLWriterTest.h    | 26 ++++----
 .../tst_xmlpatternsvalidator.cpp                   | 26 ++++----
 tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp | 26 ++++----
 .../view/FunctionSignaturesView.cpp                | 26 ++++----
 .../xmlpatternsview/view/FunctionSignaturesView.h  | 26 ++++----
 tests/auto/xmlpatternsview/view/MainWindow.cpp     | 26 ++++----
 tests/auto/xmlpatternsview/view/MainWindow.h       | 26 ++++----
 tests/auto/xmlpatternsview/view/TestCaseView.cpp   | 26 ++++----
 tests/auto/xmlpatternsview/view/TestCaseView.h     | 26 ++++----
 tests/auto/xmlpatternsview/view/TestResultView.cpp | 26 ++++----
 tests/auto/xmlpatternsview/view/TestResultView.h   | 26 ++++----
 tests/auto/xmlpatternsview/view/TreeSortFilter.cpp | 26 ++++----
 tests/auto/xmlpatternsview/view/TreeSortFilter.h   | 26 ++++----
 tests/auto/xmlpatternsview/view/UserTestCase.cpp   | 26 ++++----
 tests/auto/xmlpatternsview/view/UserTestCase.h     | 26 ++++----
 tests/auto/xmlpatternsview/view/XDTItemItem.cpp    | 26 ++++----
 tests/auto/xmlpatternsview/view/XDTItemItem.h      | 26 ++++----
 tests/auto/xmlpatternsview/view/main.cpp           | 26 ++++----
 tests/auto/xmlpatternsxqts/summarizeBaseline.sh    | 26 ++++----
 tests/auto/xmlpatternsxqts/tst_suitetest.cpp       | 26 ++++----
 tests/auto/xmlpatternsxqts/tst_suitetest.h         | 26 ++++----
 tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp | 26 ++++----
 tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh   | 26 ++++----
 .../auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp | 26 ++++----
 .../benchmarks/corelib/codecs/qtextcodec/main.cpp  | 26 ++++----
 .../corelib/io/qdir/10000/bench_qdir_10000.cpp     | 26 ++++----
 .../corelib/io/qdir/tree/bench_qdir_tree.cpp       | 26 ++++----
 tests/benchmarks/corelib/io/qdiriterator/main.cpp  | 26 ++++----
 .../io/qdiriterator/qfilesystemiterator.cpp        | 26 ++++----
 .../corelib/io/qdiriterator/qfilesystemiterator.h  | 26 ++++----
 tests/benchmarks/corelib/io/qfile/main.cpp         | 26 ++++----
 tests/benchmarks/corelib/io/qfileinfo/main.cpp     | 26 ++++----
 tests/benchmarks/corelib/io/qiodevice/main.cpp     | 26 ++++----
 .../benchmarks/corelib/io/qtemporaryfile/main.cpp  | 26 ++++----
 tests/benchmarks/corelib/io/qurl/main.cpp          | 26 ++++----
 tests/benchmarks/corelib/kernel/events/main.cpp    | 26 ++++----
 .../benchmarks/corelib/kernel/qmetaobject/main.cpp | 26 ++++----
 .../corelib/kernel/qmetatype/tst_qmetatype.cpp     | 26 ++++----
 tests/benchmarks/corelib/kernel/qobject/main.cpp   | 26 ++++----
 tests/benchmarks/corelib/kernel/qobject/object.cpp | 26 ++++----
 tests/benchmarks/corelib/kernel/qobject/object.h   | 26 ++++----
 .../tst_qtimer_vs_qmetaobject.cpp                  | 26 ++++----
 .../corelib/kernel/qvariant/tst_qvariant.cpp       | 26 ++++----
 .../thread/qthreadstorage/tst_qthreadstorage.cpp   | 26 ++++----
 .../corelib/tools/containers-associative/main.cpp  | 26 ++++----
 .../corelib/tools/containers-sequential/main.cpp   | 26 ++++----
 tests/benchmarks/corelib/tools/qbytearray/main.cpp | 26 ++++----
 tests/benchmarks/corelib/tools/qrect/main.cpp      | 26 ++++----
 tests/benchmarks/corelib/tools/qregexp/main.cpp    | 26 ++++----
 tests/benchmarks/corelib/tools/qstring/data.h      | 26 ++++----
 .../corelib/tools/qstring/generatelist.pl          | 26 ++++----
 tests/benchmarks/corelib/tools/qstring/main.cpp    | 26 ++++----
 .../corelib/tools/qstringbuilder/main.cpp          | 26 ++++----
 .../benchmarks/corelib/tools/qstringlist/main.cpp  | 26 ++++----
 tests/benchmarks/corelib/tools/qvector/main.cpp    | 26 ++++----
 .../benchmarks/corelib/tools/qvector/outofline.cpp | 26 ++++----
 .../benchmarks/corelib/tools/qvector/qrawvector.h  | 26 ++++----
 tests/benchmarks/declarative/binding/testtypes.cpp | 26 ++++----
 tests/benchmarks/declarative/binding/testtypes.h   | 26 ++++----
 .../benchmarks/declarative/binding/tst_binding.cpp | 26 ++++----
 .../declarative/compilation/data/BoomBlock.qml     | 26 ++++----
 .../declarative/compilation/tst_compilation.cpp    | 26 ++++----
 .../benchmarks/declarative/creation/data/item.qml  | 26 ++++----
 .../declarative/creation/data/qobject.qml          | 26 ++++----
 .../declarative/creation/tst_creation.cpp          | 26 ++++----
 .../declarative/painting/paintbenchmark.cpp        | 26 ++++----
 .../declarative/pointers/tst_pointers.cpp          | 26 ++++----
 .../qdeclarativecomponent/data/myqmlobject.qml     | 26 ++++----
 .../data/myqmlobject_binding.qml                   | 26 ++++----
 .../qdeclarativecomponent/data/object.qml          | 26 ++++----
 .../qdeclarativecomponent/data/object_id.qml       | 26 ++++----
 .../data/samegame/BoomBlock.qml                    | 26 ++++----
 .../data/synthesized_properties.2.qml              | 26 ++++----
 .../data/synthesized_properties.qml                | 26 ++++----
 .../qdeclarativecomponent/testtypes.cpp            | 26 ++++----
 .../declarative/qdeclarativecomponent/testtypes.h  | 26 ++++----
 .../tst_qdeclarativecomponent.cpp                  | 26 ++++----
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    | 26 ++++----
 .../qdeclarativemetaproperty/data/object.qml       | 26 ++++----
 .../data/synthesized_object.qml                    | 26 ++++----
 .../tst_qdeclarativemetaproperty.cpp               | 26 ++++----
 tests/benchmarks/declarative/qmltime/example.qml   | 26 ++++----
 tests/benchmarks/declarative/qmltime/qmltime.cpp   | 26 ++++----
 .../declarative/qmltime/tests/anchors/empty.qml    | 26 ++++----
 .../declarative/qmltime/tests/anchors/fill.qml     | 26 ++++----
 .../declarative/qmltime/tests/anchors/null.qml     | 26 ++++----
 .../declarative/qmltime/tests/animation/large.qml  | 26 ++++----
 .../qmltime/tests/animation/largeNoProps.qml       | 26 ++++----
 .../qmltime/tests/item_creation/children.qml       | 26 ++++----
 .../qmltime/tests/item_creation/data.qml           | 26 ++++----
 .../qmltime/tests/item_creation/no_creation.qml    | 26 ++++----
 .../qmltime/tests/item_creation/resources.qml      | 26 ++++----
 .../declarative/qmltime/tests/loader/Loaded.qml    | 26 ++++----
 .../qmltime/tests/loader/component_loader.qml      | 26 ++++----
 .../qmltime/tests/loader/empty_loader.qml          | 26 ++++----
 .../declarative/qmltime/tests/loader/no_loader.qml | 26 ++++----
 .../qmltime/tests/loader/source_loader.qml         | 26 ++++----
 .../tests/positioner_creation/no_positioner.qml    | 26 ++++----
 .../tests/positioner_creation/null_positioner.qml  | 26 ++++----
 .../tests/positioner_creation/positioner.qml       | 26 ++++----
 .../qmltime/tests/vmemetaobject/null.qml           | 26 ++++----
 .../qmltime/tests/vmemetaobject/property.qml       | 26 ++++----
 .../declarative/script/data/CustomObject.qml       | 26 ++++----
 tests/benchmarks/declarative/script/data/block.qml | 26 ++++----
 tests/benchmarks/declarative/script/data/global.js | 26 ++++----
 .../declarative/script/data/global_prop.qml        | 26 ++++----
 .../declarative/script/data/signal_args.qml        | 26 ++++----
 .../declarative/script/data/signal_qml.qml         | 26 ++++----
 .../declarative/script/data/signal_unconnected.qml | 26 ++++----
 .../declarative/script/data/signal_unusedArgs.qml  | 26 ++++----
 .../declarative/script/data/slot_complex.qml       | 26 ++++----
 .../declarative/script/data/slot_complex_js.qml    | 26 ++++----
 .../declarative/script/data/slot_simple.qml        | 26 ++++----
 .../declarative/script/data/slot_simple_js.qml     | 26 ++++----
 tests/benchmarks/declarative/script/tst_script.cpp | 26 ++++----
 .../declarative/typeimports/data/QmlTestType1.qml  | 26 ++++----
 .../declarative/typeimports/data/QmlTestType2.qml  | 26 ++++----
 .../declarative/typeimports/data/QmlTestType3.qml  | 26 ++++----
 .../declarative/typeimports/data/QmlTestType4.qml  | 26 ++++----
 .../declarative/typeimports/data/cpp.qml           | 26 ++++----
 .../declarative/typeimports/data/qml.qml           | 26 ++++----
 .../declarative/typeimports/tst_typeimports.cpp    | 26 ++++----
 .../gui/animation/qanimation/dummyanimation.cpp    | 26 ++++----
 .../gui/animation/qanimation/dummyanimation.h      | 26 ++++----
 .../gui/animation/qanimation/dummyobject.cpp       | 26 ++++----
 .../gui/animation/qanimation/dummyobject.h         | 26 ++++----
 tests/benchmarks/gui/animation/qanimation/main.cpp | 26 ++++----
 .../gui/animation/qanimation/rectanimation.cpp     | 26 ++++----
 .../gui/animation/qanimation/rectanimation.h       | 26 ++++----
 .../functional/GraphicsViewBenchmark/main.cpp      | 26 ++++----
 .../widgets/abstractitemcontainer.cpp              | 26 ++++----
 .../widgets/abstractitemcontainer.h                | 26 ++++----
 .../widgets/abstractitemview.cpp                   | 26 ++++----
 .../widgets/abstractitemview.h                     | 26 ++++----
 .../widgets/abstractscrollarea.cpp                 | 26 ++++----
 .../widgets/abstractscrollarea.h                   | 26 ++++----
 .../widgets/abstractviewitem.cpp                   | 26 ++++----
 .../widgets/abstractviewitem.h                     | 26 ++++----
 .../widgets/backgrounditem.cpp                     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/backgrounditem.h | 26 ++++----
 .../GraphicsViewBenchmark/widgets/button.cpp       | 26 ++++----
 .../GraphicsViewBenchmark/widgets/button.h         | 26 ++++----
 .../GraphicsViewBenchmark/widgets/commandline.cpp  | 26 ++++----
 .../GraphicsViewBenchmark/widgets/commandline.h    | 26 ++++----
 .../GraphicsViewBenchmark/widgets/dummydatagen.cpp | 26 ++++----
 .../GraphicsViewBenchmark/widgets/dummydatagen.h   | 26 ++++----
 .../GraphicsViewBenchmark/widgets/gvbwidget.cpp    | 26 ++++----
 .../GraphicsViewBenchmark/widgets/gvbwidget.h      | 26 ++++----
 .../GraphicsViewBenchmark/widgets/iconitem.cpp     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/iconitem.h       | 26 ++++----
 .../widgets/itemrecyclinglist.cpp                  | 26 ++++----
 .../widgets/itemrecyclinglist.h                    | 26 ++++----
 .../widgets/itemrecyclinglistview.cpp              | 26 ++++----
 .../widgets/itemrecyclinglistview.h                | 26 ++++----
 .../GraphicsViewBenchmark/widgets/label.cpp        | 26 ++++----
 .../GraphicsViewBenchmark/widgets/label.h          | 26 ++++----
 .../GraphicsViewBenchmark/widgets/listitem.cpp     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/listitem.h       | 26 ++++----
 .../widgets/listitemcache.cpp                      | 26 ++++----
 .../GraphicsViewBenchmark/widgets/listitemcache.h  | 26 ++++----
 .../widgets/listitemcontainer.cpp                  | 26 ++++----
 .../widgets/listitemcontainer.h                    | 26 ++++----
 .../GraphicsViewBenchmark/widgets/listmodel.cpp    | 26 ++++----
 .../GraphicsViewBenchmark/widgets/listmodel.h      | 26 ++++----
 .../GraphicsViewBenchmark/widgets/listwidget.cpp   | 26 ++++----
 .../GraphicsViewBenchmark/widgets/listwidget.h     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/mainview.cpp     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/mainview.h       | 26 ++++----
 .../GraphicsViewBenchmark/widgets/menu.cpp         | 26 ++++----
 .../GraphicsViewBenchmark/widgets/menu.h           | 26 ++++----
 .../widgets/recycledlistitem.cpp                   | 26 ++++----
 .../widgets/recycledlistitem.h                     | 26 ++++----
 .../widgets/resourcemoninterface.h                 | 26 ++++----
 .../GraphicsViewBenchmark/widgets/scrollbar.cpp    | 26 ++++----
 .../GraphicsViewBenchmark/widgets/scrollbar.h      | 26 ++++----
 .../GraphicsViewBenchmark/widgets/scroller.cpp     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/scroller.h       | 26 ++++----
 .../GraphicsViewBenchmark/widgets/scroller_p.h     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/settings.cpp     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/settings.h       | 26 ++++----
 .../GraphicsViewBenchmark/widgets/simplelist.cpp   | 26 ++++----
 .../GraphicsViewBenchmark/widgets/simplelist.h     | 26 ++++----
 .../widgets/simplelistview.cpp                     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/simplelistview.h | 26 ++++----
 .../GraphicsViewBenchmark/widgets/theme.cpp        | 26 ++++----
 .../GraphicsViewBenchmark/widgets/theme.h          | 26 ++++----
 .../GraphicsViewBenchmark/widgets/themeevent.cpp   | 26 ++++----
 .../GraphicsViewBenchmark/widgets/themeevent.h     | 26 ++++----
 .../GraphicsViewBenchmark/widgets/topbar.cpp       | 26 ++++----
 .../GraphicsViewBenchmark/widgets/topbar.h         | 26 ++++----
 .../GraphicsViewBenchmark/widgets/webview.cpp      | 26 ++++----
 .../GraphicsViewBenchmark/widgets/webview.h        | 26 ++++----
 .../GraphicsViewBenchmark/widgets/webview_p.h      | 26 ++++----
 .../tst_qgraphicsanchorlayout.cpp                  | 26 ++++----
 .../qgraphicsitem/tst_qgraphicsitem.cpp            | 26 ++++----
 .../qgraphicsscene/tst_qgraphicsscene.cpp          | 26 ++++----
 .../qgraphicsview/benchapps/chipTest/chip.cpp      | 26 ++++----
 .../qgraphicsview/benchapps/chipTest/chip.h        | 26 ++++----
 .../qgraphicsview/benchapps/chipTest/main.cpp      | 26 ++++----
 .../benchapps/chipTest/mainwindow.cpp              | 26 ++++----
 .../qgraphicsview/benchapps/chipTest/mainwindow.h  | 26 ++++----
 .../qgraphicsview/benchapps/chipTest/view.cpp      | 26 ++++----
 .../qgraphicsview/benchapps/chipTest/view.h        | 26 ++++----
 .../qgraphicsview/benchapps/moveItems/main.cpp     | 26 ++++----
 .../qgraphicsview/benchapps/scrolltest/main.cpp    | 26 ++++----
 .../graphicsview/qgraphicsview/chiptester/chip.cpp | 26 ++++----
 .../graphicsview/qgraphicsview/chiptester/chip.h   | 26 ++++----
 .../qgraphicsview/chiptester/chiptester.cpp        | 26 ++++----
 .../qgraphicsview/chiptester/chiptester.h          | 26 ++++----
 .../qgraphicsview/tst_qgraphicsview.cpp            | 26 ++++----
 .../qgraphicswidget/tst_qgraphicswidget.cpp        | 26 ++++----
 tests/benchmarks/gui/image/blendbench/main.cpp     | 26 ++++----
 .../qimageconversion/tst_qimageconversion.cpp      | 26 ++++----
 .../gui/image/qimagereader/tst_qimagereader.cpp    | 26 ++++----
 tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp | 26 ++++----
 .../gui/image/qpixmapcache/tst_qpixmapcache.cpp    | 26 ++++----
 .../gui/itemviews/qtableview/tst_qtableview.cpp    | 26 ++++----
 tests/benchmarks/gui/kernel/qapplication/main.cpp  | 26 ++++----
 .../benchmarks/gui/kernel/qwidget/tst_qwidget.cpp  | 26 ++++----
 .../gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp       | 26 ++++----
 .../gui/math3d/qquaternion/tst_qquaternion.cpp     | 26 ++++----
 .../gui/painting/qpainter/tst_qpainter.cpp         | 26 ++++----
 tests/benchmarks/gui/painting/qregion/main.cpp     | 26 ++++----
 .../gui/painting/qtbench/benchmarktests.h          | 26 ++++----
 .../gui/painting/qtbench/tst_qtbench.cpp           | 26 ++++----
 .../gui/painting/qtracebench/tst_qtracebench.cpp   | 26 ++++----
 .../gui/painting/qtransform/tst_qtransform.cpp     | 26 ++++----
 .../gui/styles/qstylesheetstyle/main.cpp           | 26 ++++----
 tests/benchmarks/gui/text/qfontmetrics/main.cpp    | 26 ++++----
 tests/benchmarks/gui/text/qtext/main.cpp           | 26 ++++----
 .../access/qfile_vs_qnetworkaccessmanager/main.cpp | 26 ++++----
 .../access/qnetworkreply/tst_qnetworkreply.cpp     | 26 ++++----
 tests/benchmarks/network/kernel/qhostinfo/main.cpp | 26 ++++----
 .../network/socket/qtcpserver/tst_qtcpserver.cpp   | 26 ++++----
 tests/benchmarks/opengl/main.cpp                   | 26 ++++----
 .../benchmarks/plugins/imageformats/jpeg/jpeg.cpp  | 26 ++++----
 .../script/qscriptclass/tst_qscriptclass.cpp       | 26 ++++----
 .../script/qscriptengine/tst_qscriptengine.cpp     | 26 ++++----
 .../script/qscriptvalue/tst_qscriptvalue.cpp       | 26 ++++----
 .../tst_qscriptvalueiterator.cpp                   | 26 ++++----
 .../svg/qsvgrenderer/tst_qsvgrenderer.cpp          | 26 ++++----
 tests/manual/bearerex/bearerex.cpp                 | 26 ++++----
 tests/manual/bearerex/bearerex.h                   | 26 ++++----
 tests/manual/bearerex/datatransferer.cpp           | 26 ++++----
 tests/manual/bearerex/datatransferer.h             | 26 ++++----
 tests/manual/bearerex/main.cpp                     | 26 ++++----
 tests/manual/bearerex/xqlistwidget.cpp             | 26 ++++----
 tests/manual/bearerex/xqlistwidget.h               | 26 ++++----
 tests/manual/gestures/graphicsview/gestures.cpp    | 26 ++++----
 tests/manual/gestures/graphicsview/gestures.h      | 26 ++++----
 tests/manual/gestures/graphicsview/imageitem.cpp   | 26 ++++----
 tests/manual/gestures/graphicsview/imageitem.h     | 26 ++++----
 tests/manual/gestures/graphicsview/main.cpp        | 26 ++++----
 .../graphicsview/mousepangesturerecognizer.cpp     | 26 ++++----
 .../graphicsview/mousepangesturerecognizer.h       | 26 ++++----
 tests/manual/gestures/scrollarea/main.cpp          | 26 ++++----
 .../scrollarea/mousepangesturerecognizer.cpp       | 26 ++++----
 .../scrollarea/mousepangesturerecognizer.h         | 26 ++++----
 tests/manual/inputmethodhints/inputmethodhints.cpp | 26 ++++----
 tests/manual/inputmethodhints/inputmethodhints.h   | 26 ++++----
 tests/manual/inputmethodhints/main.cpp             | 26 ++++----
 tests/manual/keypadnavigation/main.cpp             | 26 ++++----
 .../tst_network_remote_stresstest.cpp              | 26 ++++----
 tests/manual/network_stresstest/minihttpserver.cpp | 26 ++++----
 tests/manual/network_stresstest/minihttpserver.h   | 26 ++++----
 .../network_stresstest/tst_network_stresstest.cpp  | 26 ++++----
 tests/manual/qcursor/allcursors/main.cpp           | 26 ++++----
 tests/manual/qcursor/allcursors/mainwindow.cpp     | 26 ++++----
 tests/manual/qcursor/allcursors/mainwindow.h       | 26 ++++----
 tests/manual/qcursor/grab_override/main.cpp        | 26 ++++----
 tests/manual/qcursor/grab_override/mainwindow.cpp  | 26 ++++----
 tests/manual/qcursor/grab_override/mainwindow.h    | 26 ++++----
 tests/manual/qdesktopwidget/main.cpp               | 26 ++++----
 tests/manual/qgraphicsitemgroup/customitem.cpp     | 26 ++++----
 tests/manual/qgraphicsitemgroup/customitem.h       | 26 ++++----
 tests/manual/qgraphicsitemgroup/main.cpp           | 26 ++++----
 tests/manual/qgraphicsitemgroup/widget.cpp         | 26 ++++----
 tests/manual/qgraphicsitemgroup/widget.h           | 26 ++++----
 tests/manual/qhttpnetworkconnection/main.cpp       | 26 ++++----
 tests/manual/qimagereader/main.cpp                 | 26 ++++----
 tests/manual/qnetworkreply/main.cpp                | 26 ++++----
 .../qtabletevent/device_information/main.cpp       | 26 ++++----
 .../device_information/tabletwidget.cpp            | 26 ++++----
 .../qtabletevent/device_information/tabletwidget.h | 26 ++++----
 .../manual/qtabletevent/event_compression/main.cpp | 26 ++++----
 .../event_compression/mousestatwidget.cpp          | 26 ++++----
 .../event_compression/mousestatwidget.h            | 26 ++++----
 tests/manual/qtabletevent/regular_widgets/main.cpp | 26 ++++----
 tests/manual/qtbug-8933/main.cpp                   | 26 ++++----
 tests/manual/qtbug-8933/widget.cpp                 | 26 ++++----
 tests/manual/qtbug-8933/widget.h                   | 26 ++++----
 tests/manual/qtouchevent/main.cpp                  | 26 ++++----
 tests/manual/qtouchevent/touchwidget.cpp           | 26 ++++----
 tests/manual/qtouchevent/touchwidget.h             | 26 ++++----
 tests/manual/qwidget_zorder/main.cpp               | 26 ++++----
 tests/manual/repaint/mainwindow/main.cpp           | 26 ++++----
 tests/manual/repaint/scrollarea/main.cpp           | 26 ++++----
 tests/manual/repaint/shared/shared.h               | 26 ++++----
 tests/manual/repaint/splitter/main.cpp             | 26 ++++----
 tests/manual/repaint/tableview/main.cpp            | 26 ++++----
 tests/manual/repaint/task141091/main.cpp           | 26 ++++----
 tests/manual/repaint/toplevel/main.cpp             | 26 ++++----
 tests/manual/repaint/widget/main.cpp               | 26 ++++----
 tests/manual/textrendering/glyphshaping/main.cpp   | 26 ++++----
 .../manual/textrendering/textperformance/main.cpp  | 26 ++++----
 tests/manual/windowflags/controllerwindow.cpp      | 26 ++++----
 tests/manual/windowflags/controllerwindow.h        | 26 ++++----
 tests/manual/windowflags/main.cpp                  | 26 ++++----
 tests/manual/windowflags/previewwindow.cpp         | 26 ++++----
 tests/manual/windowflags/previewwindow.h           | 26 ++++----
 tests/shared/filesystem.h                          | 26 ++++----
 tests/shared/util.h                                | 26 ++++----
 tools/activeqt/dumpcpp/main.cpp                    | 26 ++++----
 tools/activeqt/dumpdoc/main.cpp                    | 26 ++++----
 tools/activeqt/testcon/ambientproperties.cpp       | 26 ++++----
 tools/activeqt/testcon/ambientproperties.h         | 26 ++++----
 tools/activeqt/testcon/ambientproperties.ui        | 26 ++++----
 tools/activeqt/testcon/changeproperties.cpp        | 26 ++++----
 tools/activeqt/testcon/changeproperties.h          | 26 ++++----
 tools/activeqt/testcon/changeproperties.ui         | 26 ++++----
 tools/activeqt/testcon/controlinfo.cpp             | 26 ++++----
 tools/activeqt/testcon/controlinfo.h               | 26 ++++----
 tools/activeqt/testcon/controlinfo.ui              | 26 ++++----
 tools/activeqt/testcon/docuwindow.cpp              | 26 ++++----
 tools/activeqt/testcon/docuwindow.h                | 26 ++++----
 tools/activeqt/testcon/invokemethod.cpp            | 26 ++++----
 tools/activeqt/testcon/invokemethod.h              | 26 ++++----
 tools/activeqt/testcon/invokemethod.ui             | 26 ++++----
 tools/activeqt/testcon/main.cpp                    | 26 ++++----
 tools/activeqt/testcon/mainwindow.cpp              | 26 ++++----
 tools/activeqt/testcon/mainwindow.h                | 26 ++++----
 tools/activeqt/testcon/mainwindow.ui               | 26 ++++----
 tools/activeqt/testcon/scripts/perlscript.pl       | 26 ++++----
 tools/activeqt/testcon/scripts/pythonscript.py     | 26 ++++----
 tools/assistant/lib/qclucenefieldnames.cpp         | 26 ++++----
 tools/assistant/lib/qclucenefieldnames_p.h         | 26 ++++----
 tools/assistant/lib/qhelp_global.cpp               | 26 ++++----
 tools/assistant/lib/qhelp_global.h                 | 26 ++++----
 tools/assistant/lib/qhelpcollectionhandler.cpp     | 26 ++++----
 tools/assistant/lib/qhelpcollectionhandler_p.h     | 26 ++++----
 tools/assistant/lib/qhelpcontentwidget.cpp         | 26 ++++----
 tools/assistant/lib/qhelpcontentwidget.h           | 26 ++++----
 tools/assistant/lib/qhelpdatainterface.cpp         | 26 ++++----
 tools/assistant/lib/qhelpdatainterface_p.h         | 26 ++++----
 tools/assistant/lib/qhelpdbreader.cpp              | 26 ++++----
 tools/assistant/lib/qhelpdbreader_p.h              | 26 ++++----
 tools/assistant/lib/qhelpengine.cpp                | 26 ++++----
 tools/assistant/lib/qhelpengine.h                  | 26 ++++----
 tools/assistant/lib/qhelpengine_p.h                | 26 ++++----
 tools/assistant/lib/qhelpenginecore.cpp            | 26 ++++----
 tools/assistant/lib/qhelpenginecore.h              | 26 ++++----
 tools/assistant/lib/qhelpgenerator.cpp             | 26 ++++----
 tools/assistant/lib/qhelpgenerator_p.h             | 26 ++++----
 tools/assistant/lib/qhelpindexwidget.cpp           | 26 ++++----
 tools/assistant/lib/qhelpindexwidget.h             | 26 ++++----
 tools/assistant/lib/qhelpprojectdata.cpp           | 26 ++++----
 tools/assistant/lib/qhelpprojectdata_p.h           | 26 ++++----
 tools/assistant/lib/qhelpsearchengine.cpp          | 26 ++++----
 tools/assistant/lib/qhelpsearchengine.h            | 26 ++++----
 tools/assistant/lib/qhelpsearchindex_default.cpp   | 26 ++++----
 tools/assistant/lib/qhelpsearchindex_default_p.h   | 26 ++++----
 tools/assistant/lib/qhelpsearchindexreader.cpp     | 26 ++++----
 .../lib/qhelpsearchindexreader_clucene.cpp         | 26 ++++----
 .../lib/qhelpsearchindexreader_clucene_p.h         | 26 ++++----
 .../lib/qhelpsearchindexreader_default.cpp         | 26 ++++----
 .../lib/qhelpsearchindexreader_default_p.h         | 26 ++++----
 tools/assistant/lib/qhelpsearchindexreader_p.h     | 26 ++++----
 .../lib/qhelpsearchindexwriter_clucene.cpp         | 26 ++++----
 .../lib/qhelpsearchindexwriter_clucene_p.h         | 26 ++++----
 .../lib/qhelpsearchindexwriter_default.cpp         | 26 ++++----
 .../lib/qhelpsearchindexwriter_default_p.h         | 26 ++++----
 tools/assistant/lib/qhelpsearchquerywidget.cpp     | 26 ++++----
 tools/assistant/lib/qhelpsearchquerywidget.h       | 26 ++++----
 tools/assistant/lib/qhelpsearchresultwidget.cpp    | 26 ++++----
 tools/assistant/lib/qhelpsearchresultwidget.h      | 26 ++++----
 tools/assistant/tools/assistant/aboutdialog.cpp    | 26 ++++----
 tools/assistant/tools/assistant/aboutdialog.h      | 26 ++++----
 tools/assistant/tools/assistant/bookmarkdialog.cpp | 26 ++++----
 tools/assistant/tools/assistant/bookmarkdialog.h   | 26 ++++----
 .../tools/assistant/bookmarkfiltermodel.cpp        | 26 ++++----
 .../tools/assistant/bookmarkfiltermodel.h          | 26 ++++----
 tools/assistant/tools/assistant/bookmarkitem.cpp   | 26 ++++----
 tools/assistant/tools/assistant/bookmarkitem.h     | 26 ++++----
 .../assistant/tools/assistant/bookmarkmanager.cpp  | 26 ++++----
 tools/assistant/tools/assistant/bookmarkmanager.h  | 26 ++++----
 .../tools/assistant/bookmarkmanagerwidget.cpp      | 26 ++++----
 .../tools/assistant/bookmarkmanagerwidget.h        | 26 ++++----
 tools/assistant/tools/assistant/bookmarkmodel.cpp  | 26 ++++----
 tools/assistant/tools/assistant/bookmarkmodel.h    | 26 ++++----
 tools/assistant/tools/assistant/centralwidget.cpp  | 26 ++++----
 tools/assistant/tools/assistant/centralwidget.h    | 26 ++++----
 tools/assistant/tools/assistant/cmdlineparser.cpp  | 26 ++++----
 tools/assistant/tools/assistant/cmdlineparser.h    | 26 ++++----
 tools/assistant/tools/assistant/contentwindow.cpp  | 26 ++++----
 tools/assistant/tools/assistant/contentwindow.h    | 26 ++++----
 .../assistant/tools/assistant/filternamedialog.cpp | 26 ++++----
 tools/assistant/tools/assistant/filternamedialog.h | 26 ++++----
 tools/assistant/tools/assistant/findwidget.cpp     | 26 ++++----
 tools/assistant/tools/assistant/findwidget.h       | 26 ++++----
 .../tools/assistant/helpenginewrapper.cpp          | 26 ++++----
 .../assistant/tools/assistant/helpenginewrapper.h  | 26 ++++----
 tools/assistant/tools/assistant/helpviewer.cpp     | 26 ++++----
 tools/assistant/tools/assistant/helpviewer.h       | 26 ++++----
 tools/assistant/tools/assistant/helpviewer_qtb.cpp | 26 ++++----
 tools/assistant/tools/assistant/helpviewer_qtb.h   | 26 ++++----
 tools/assistant/tools/assistant/helpviewer_qwv.cpp | 26 ++++----
 tools/assistant/tools/assistant/helpviewer_qwv.h   | 26 ++++----
 tools/assistant/tools/assistant/indexwindow.cpp    | 26 ++++----
 tools/assistant/tools/assistant/indexwindow.h      | 26 ++++----
 tools/assistant/tools/assistant/installdialog.cpp  | 26 ++++----
 tools/assistant/tools/assistant/installdialog.h    | 26 ++++----
 tools/assistant/tools/assistant/main.cpp           | 26 ++++----
 tools/assistant/tools/assistant/mainwindow.cpp     | 26 ++++----
 tools/assistant/tools/assistant/mainwindow.h       | 26 ++++----
 .../tools/assistant/preferencesdialog.cpp          | 26 ++++----
 .../assistant/tools/assistant/preferencesdialog.h  | 26 ++++----
 tools/assistant/tools/assistant/qtdocinstaller.cpp | 26 ++++----
 tools/assistant/tools/assistant/qtdocinstaller.h   | 26 ++++----
 tools/assistant/tools/assistant/remotecontrol.cpp  | 26 ++++----
 tools/assistant/tools/assistant/remotecontrol.h    | 26 ++++----
 .../assistant/tools/assistant/remotecontrol_win.h  | 26 ++++----
 tools/assistant/tools/assistant/searchwidget.cpp   | 26 ++++----
 tools/assistant/tools/assistant/searchwidget.h     | 26 ++++----
 tools/assistant/tools/assistant/topicchooser.cpp   | 26 ++++----
 tools/assistant/tools/assistant/topicchooser.h     | 26 ++++----
 tools/assistant/tools/assistant/tracer.h           | 26 ++++----
 tools/assistant/tools/assistant/xbelsupport.cpp    | 26 ++++----
 tools/assistant/tools/assistant/xbelsupport.h      | 26 ++++----
 .../assistant/tools/qcollectiongenerator/main.cpp  | 26 ++++----
 tools/assistant/tools/qhelpconverter/adpreader.cpp | 26 ++++----
 tools/assistant/tools/qhelpconverter/adpreader.h   | 26 ++++----
 .../tools/qhelpconverter/conversionwizard.cpp      | 26 ++++----
 .../tools/qhelpconverter/conversionwizard.h        | 26 ++++----
 tools/assistant/tools/qhelpconverter/filespage.cpp | 26 ++++----
 tools/assistant/tools/qhelpconverter/filespage.h   | 26 ++++----
 .../assistant/tools/qhelpconverter/filterpage.cpp  | 26 ++++----
 tools/assistant/tools/qhelpconverter/filterpage.h  | 26 ++++----
 .../assistant/tools/qhelpconverter/finishpage.cpp  | 26 ++++----
 tools/assistant/tools/qhelpconverter/finishpage.h  | 26 ++++----
 .../assistant/tools/qhelpconverter/generalpage.cpp | 26 ++++----
 tools/assistant/tools/qhelpconverter/generalpage.h | 26 ++++----
 .../assistant/tools/qhelpconverter/helpwindow.cpp  | 26 ++++----
 tools/assistant/tools/qhelpconverter/helpwindow.h  | 26 ++++----
 .../tools/qhelpconverter/identifierpage.cpp        | 26 ++++----
 .../tools/qhelpconverter/identifierpage.h          | 26 ++++----
 tools/assistant/tools/qhelpconverter/inputpage.cpp | 26 ++++----
 tools/assistant/tools/qhelpconverter/inputpage.h   | 26 ++++----
 tools/assistant/tools/qhelpconverter/main.cpp      | 26 ++++----
 .../assistant/tools/qhelpconverter/outputpage.cpp  | 26 ++++----
 tools/assistant/tools/qhelpconverter/outputpage.h  | 26 ++++----
 tools/assistant/tools/qhelpconverter/pathpage.cpp  | 26 ++++----
 tools/assistant/tools/qhelpconverter/pathpage.h    | 26 ++++----
 .../assistant/tools/qhelpconverter/qhcpwriter.cpp  | 26 ++++----
 tools/assistant/tools/qhelpconverter/qhcpwriter.h  | 26 ++++----
 tools/assistant/tools/qhelpconverter/qhpwriter.cpp | 26 ++++----
 tools/assistant/tools/qhelpconverter/qhpwriter.h   | 26 ++++----
 tools/assistant/tools/qhelpgenerator/main.cpp      | 26 ++++----
 .../tools/shared/collectionconfiguration.cpp       | 26 ++++----
 .../tools/shared/collectionconfiguration.h         | 26 ++++----
 tools/assistant/tools/shared/helpgenerator.cpp     | 26 ++++----
 tools/assistant/tools/shared/helpgenerator.h       | 26 ++++----
 tools/checksdk/cesdkhandler.cpp                    | 26 ++++----
 tools/checksdk/cesdkhandler.h                      | 26 ++++----
 tools/checksdk/main.cpp                            | 26 ++++----
 tools/configure/configure_pch.h                    | 26 ++++----
 tools/configure/configureapp.cpp                   | 26 ++++----
 tools/configure/configureapp.h                     | 26 ++++----
 tools/configure/environment.cpp                    | 26 ++++----
 tools/configure/environment.h                      | 26 ++++----
 tools/configure/main.cpp                           | 26 ++++----
 tools/configure/tools.cpp                          | 26 ++++----
 tools/configure/tools.h                            | 26 ++++----
 tools/designer/data/generate_header.xsl            | 26 ++++----
 tools/designer/data/generate_impl.xsl              | 26 ++++----
 .../src/components/buddyeditor/buddyeditor.cpp     | 26 ++++----
 .../src/components/buddyeditor/buddyeditor.h       | 26 ++++----
 .../components/buddyeditor/buddyeditor_global.h    | 26 ++++----
 .../buddyeditor/buddyeditor_instance.cpp           | 26 ++++----
 .../components/buddyeditor/buddyeditor_plugin.cpp  | 26 ++++----
 .../components/buddyeditor/buddyeditor_plugin.h    | 26 ++++----
 .../components/buddyeditor/buddyeditor_tool.cpp    | 26 ++++----
 .../src/components/buddyeditor/buddyeditor_tool.h  | 26 ++++----
 .../components/formeditor/brushmanagerproxy.cpp    | 26 ++++----
 .../src/components/formeditor/brushmanagerproxy.h  | 26 ++++----
 .../formeditor/default_actionprovider.cpp          | 26 ++++----
 .../components/formeditor/default_actionprovider.h | 26 ++++----
 .../components/formeditor/default_container.cpp    | 26 ++++----
 .../src/components/formeditor/default_container.h  | 26 ++++----
 .../formeditor/default_layoutdecoration.cpp        | 26 ++++----
 .../formeditor/default_layoutdecoration.h          | 26 ++++----
 .../components/formeditor/deviceprofiledialog.cpp  | 26 ++++----
 .../components/formeditor/deviceprofiledialog.h    | 26 ++++----
 .../src/components/formeditor/dpi_chooser.cpp      | 26 ++++----
 .../src/components/formeditor/dpi_chooser.h        | 26 ++++----
 .../components/formeditor/embeddedoptionspage.cpp  | 26 ++++----
 .../components/formeditor/embeddedoptionspage.h    | 26 ++++----
 .../src/components/formeditor/formeditor.cpp       | 26 ++++----
 .../src/components/formeditor/formeditor.h         | 26 ++++----
 .../src/components/formeditor/formeditor_global.h  | 26 ++++----
 .../formeditor/formeditor_optionspage.cpp          | 26 ++++----
 .../components/formeditor/formeditor_optionspage.h | 26 ++++----
 .../src/components/formeditor/formwindow.cpp       | 26 ++++----
 .../src/components/formeditor/formwindow.h         | 26 ++++----
 .../components/formeditor/formwindow_dnditem.cpp   | 26 ++++----
 .../src/components/formeditor/formwindow_dnditem.h | 26 ++++----
 .../formeditor/formwindow_widgetstack.cpp          | 26 ++++----
 .../components/formeditor/formwindow_widgetstack.h | 26 ++++----
 .../src/components/formeditor/formwindowcursor.cpp | 26 ++++----
 .../src/components/formeditor/formwindowcursor.h   | 26 ++++----
 .../components/formeditor/formwindowmanager.cpp    | 26 ++++----
 .../src/components/formeditor/formwindowmanager.h  | 26 ++++----
 .../components/formeditor/formwindowsettings.cpp   | 26 ++++----
 .../src/components/formeditor/formwindowsettings.h | 26 ++++----
 .../components/formeditor/formwindowsettings.ui    | 26 ++++----
 .../src/components/formeditor/iconcache.cpp        | 26 ++++----
 .../designer/src/components/formeditor/iconcache.h | 26 ++++----
 .../formeditor/itemview_propertysheet.cpp          | 26 ++++----
 .../components/formeditor/itemview_propertysheet.h | 26 ++++----
 .../components/formeditor/layout_propertysheet.cpp | 26 ++++----
 .../components/formeditor/layout_propertysheet.h   | 26 ++++----
 .../components/formeditor/line_propertysheet.cpp   | 26 ++++----
 .../src/components/formeditor/line_propertysheet.h | 26 ++++----
 .../components/formeditor/previewactiongroup.cpp   | 26 ++++----
 .../src/components/formeditor/previewactiongroup.h | 26 ++++----
 .../components/formeditor/qdesigner_resource.cpp   | 26 ++++----
 .../src/components/formeditor/qdesigner_resource.h | 26 ++++----
 .../components/formeditor/qdesignerundostack.cpp   | 26 ++++----
 .../src/components/formeditor/qdesignerundostack.h | 26 ++++----
 .../formeditor/qlayoutwidget_propertysheet.cpp     | 26 ++++----
 .../formeditor/qlayoutwidget_propertysheet.h       | 26 ++++----
 .../formeditor/qmainwindow_container.cpp           | 26 ++++----
 .../components/formeditor/qmainwindow_container.h  | 26 ++++----
 .../components/formeditor/qmdiarea_container.cpp   | 26 ++++----
 .../src/components/formeditor/qmdiarea_container.h | 26 ++++----
 .../src/components/formeditor/qtbrushmanager.cpp   | 26 ++++----
 .../src/components/formeditor/qtbrushmanager.h     | 26 ++++----
 .../components/formeditor/qwizard_container.cpp    | 26 ++++----
 .../src/components/formeditor/qwizard_container.h  | 26 ++++----
 .../components/formeditor/qworkspace_container.cpp | 26 ++++----
 .../components/formeditor/qworkspace_container.h   | 26 ++++----
 .../components/formeditor/spacer_propertysheet.cpp | 26 ++++----
 .../components/formeditor/spacer_propertysheet.h   | 26 ++++----
 .../components/formeditor/templateoptionspage.cpp  | 26 ++++----
 .../components/formeditor/templateoptionspage.h    | 26 ++++----
 .../components/formeditor/tool_widgeteditor.cpp    | 26 ++++----
 .../src/components/formeditor/tool_widgeteditor.h  | 26 ++++----
 .../src/components/formeditor/widgetselection.cpp  | 26 ++++----
 .../src/components/formeditor/widgetselection.h    | 26 ++++----
 tools/designer/src/components/lib/lib_pch.h        | 26 ++++----
 .../src/components/lib/qdesigner_components.cpp    | 26 ++++----
 .../components/objectinspector/objectinspector.cpp | 26 ++++----
 .../components/objectinspector/objectinspector.h   | 26 ++++----
 .../objectinspector/objectinspector_global.h       | 26 ++++----
 .../objectinspector/objectinspectormodel.cpp       | 26 ++++----
 .../objectinspector/objectinspectormodel_p.h       | 26 ++++----
 .../propertyeditor/brushpropertymanager.cpp        | 26 ++++----
 .../propertyeditor/brushpropertymanager.h          | 26 ++++----
 .../propertyeditor/designerpropertymanager.cpp     | 26 ++++----
 .../propertyeditor/designerpropertymanager.h       | 26 ++++----
 .../src/components/propertyeditor/fontmapping.xml  | 26 ++++----
 .../propertyeditor/fontpropertymanager.cpp         | 26 ++++----
 .../propertyeditor/fontpropertymanager.h           | 26 ++++----
 .../propertyeditor/newdynamicpropertydialog.cpp    | 26 ++++----
 .../propertyeditor/newdynamicpropertydialog.h      | 26 ++++----
 .../components/propertyeditor/paletteeditor.cpp    | 26 ++++----
 .../src/components/propertyeditor/paletteeditor.h  | 26 ++++----
 .../src/components/propertyeditor/paletteeditor.ui | 26 ++++----
 .../propertyeditor/paletteeditorbutton.cpp         | 26 ++++----
 .../propertyeditor/paletteeditorbutton.h           | 26 ++++----
 .../src/components/propertyeditor/previewframe.cpp | 26 ++++----
 .../src/components/propertyeditor/previewframe.h   | 26 ++++----
 .../components/propertyeditor/previewwidget.cpp    | 26 ++++----
 .../src/components/propertyeditor/previewwidget.h  | 26 ++++----
 .../src/components/propertyeditor/previewwidget.ui | 26 ++++----
 .../components/propertyeditor/propertyeditor.cpp   | 26 ++++----
 .../src/components/propertyeditor/propertyeditor.h | 26 ++++----
 .../propertyeditor/propertyeditor_global.h         | 26 ++++----
 .../propertyeditor/qlonglongvalidator.cpp          | 26 ++++----
 .../components/propertyeditor/qlonglongvalidator.h | 26 ++++----
 .../components/propertyeditor/stringlisteditor.cpp | 26 ++++----
 .../components/propertyeditor/stringlisteditor.h   | 26 ++++----
 .../components/propertyeditor/stringlisteditor.ui  | 26 ++++----
 .../propertyeditor/stringlisteditorbutton.cpp      | 26 ++++----
 .../propertyeditor/stringlisteditorbutton.h        | 26 ++++----
 .../components/signalsloteditor/connectdialog.cpp  | 26 ++++----
 .../components/signalsloteditor/connectdialog_p.h  | 26 ++++----
 .../signalsloteditor/signalslot_utils.cpp          | 26 ++++----
 .../signalsloteditor/signalslot_utils_p.h          | 26 ++++----
 .../signalsloteditor/signalsloteditor.cpp          | 26 ++++----
 .../components/signalsloteditor/signalsloteditor.h | 26 ++++----
 .../signalsloteditor/signalsloteditor_global.h     | 26 ++++----
 .../signalsloteditor/signalsloteditor_instance.cpp | 26 ++++----
 .../signalsloteditor/signalsloteditor_p.h          | 26 ++++----
 .../signalsloteditor/signalsloteditor_plugin.cpp   | 26 ++++----
 .../signalsloteditor/signalsloteditor_plugin.h     | 26 ++++----
 .../signalsloteditor/signalsloteditor_tool.cpp     | 26 ++++----
 .../signalsloteditor/signalsloteditor_tool.h       | 26 ++++----
 .../signalsloteditor/signalsloteditorwindow.cpp    | 26 ++++----
 .../signalsloteditor/signalsloteditorwindow.h      | 26 ++++----
 .../components/tabordereditor/tabordereditor.cpp   | 26 ++++----
 .../src/components/tabordereditor/tabordereditor.h | 26 ++++----
 .../tabordereditor/tabordereditor_global.h         | 26 ++++----
 .../tabordereditor/tabordereditor_instance.cpp     | 26 ++++----
 .../tabordereditor/tabordereditor_plugin.cpp       | 26 ++++----
 .../tabordereditor/tabordereditor_plugin.h         | 26 ++++----
 .../tabordereditor/tabordereditor_tool.cpp         | 26 ++++----
 .../tabordereditor/tabordereditor_tool.h           | 26 ++++----
 .../src/components/taskmenu/button_taskmenu.cpp    | 26 ++++----
 .../src/components/taskmenu/button_taskmenu.h      | 26 ++++----
 .../src/components/taskmenu/combobox_taskmenu.cpp  | 26 ++++----
 .../src/components/taskmenu/combobox_taskmenu.h    | 26 ++++----
 .../taskmenu/containerwidget_taskmenu.cpp          | 26 ++++----
 .../components/taskmenu/containerwidget_taskmenu.h | 26 ++++----
 .../src/components/taskmenu/groupbox_taskmenu.cpp  | 26 ++++----
 .../src/components/taskmenu/groupbox_taskmenu.h    | 26 ++++----
 .../src/components/taskmenu/inplace_editor.cpp     | 26 ++++----
 .../src/components/taskmenu/inplace_editor.h       | 26 ++++----
 .../components/taskmenu/inplace_widget_helper.cpp  | 26 ++++----
 .../components/taskmenu/inplace_widget_helper.h    | 26 ++++----
 .../src/components/taskmenu/itemlisteditor.cpp     | 26 ++++----
 .../src/components/taskmenu/itemlisteditor.h       | 26 ++++----
 .../src/components/taskmenu/itemlisteditor.ui      | 26 ++++----
 .../src/components/taskmenu/label_taskmenu.cpp     | 26 ++++----
 .../src/components/taskmenu/label_taskmenu.h       | 26 ++++----
 .../src/components/taskmenu/layouttaskmenu.cpp     | 26 ++++----
 .../src/components/taskmenu/layouttaskmenu.h       | 26 ++++----
 .../src/components/taskmenu/lineedit_taskmenu.cpp  | 26 ++++----
 .../src/components/taskmenu/lineedit_taskmenu.h    | 26 ++++----
 .../components/taskmenu/listwidget_taskmenu.cpp    | 26 ++++----
 .../src/components/taskmenu/listwidget_taskmenu.h  | 26 ++++----
 .../src/components/taskmenu/listwidgeteditor.cpp   | 26 ++++----
 .../src/components/taskmenu/listwidgeteditor.h     | 26 ++++----
 .../src/components/taskmenu/menutaskmenu.cpp       | 26 ++++----
 .../src/components/taskmenu/menutaskmenu.h         | 26 ++++----
 .../components/taskmenu/tablewidget_taskmenu.cpp   | 26 ++++----
 .../src/components/taskmenu/tablewidget_taskmenu.h | 26 ++++----
 .../src/components/taskmenu/tablewidgeteditor.cpp  | 26 ++++----
 .../src/components/taskmenu/tablewidgeteditor.h    | 26 ++++----
 .../src/components/taskmenu/tablewidgeteditor.ui   | 26 ++++----
 .../src/components/taskmenu/taskmenu_component.cpp | 26 ++++----
 .../src/components/taskmenu/taskmenu_component.h   | 26 ++++----
 .../src/components/taskmenu/taskmenu_global.h      | 26 ++++----
 .../src/components/taskmenu/textedit_taskmenu.cpp  | 26 ++++----
 .../src/components/taskmenu/textedit_taskmenu.h    | 26 ++++----
 .../src/components/taskmenu/toolbar_taskmenu.cpp   | 26 ++++----
 .../src/components/taskmenu/toolbar_taskmenu.h     | 26 ++++----
 .../components/taskmenu/treewidget_taskmenu.cpp    | 26 ++++----
 .../src/components/taskmenu/treewidget_taskmenu.h  | 26 ++++----
 .../src/components/taskmenu/treewidgeteditor.cpp   | 26 ++++----
 .../src/components/taskmenu/treewidgeteditor.h     | 26 ++++----
 .../src/components/taskmenu/treewidgeteditor.ui    | 26 ++++----
 .../src/components/widgetbox/widgetbox.cpp         | 26 ++++----
 .../designer/src/components/widgetbox/widgetbox.h  | 26 ++++----
 .../src/components/widgetbox/widgetbox.xml         | 26 ++++----
 .../src/components/widgetbox/widgetbox_dnditem.cpp | 26 ++++----
 .../src/components/widgetbox/widgetbox_dnditem.h   | 26 ++++----
 .../src/components/widgetbox/widgetbox_global.h    | 26 ++++----
 .../widgetbox/widgetboxcategorylistview.cpp        | 26 ++++----
 .../widgetbox/widgetboxcategorylistview.h          | 26 ++++----
 .../components/widgetbox/widgetboxtreewidget.cpp   | 26 ++++----
 .../src/components/widgetbox/widgetboxtreewidget.h | 26 ++++----
 tools/designer/src/designer/appfontdialog.cpp      | 26 ++++----
 tools/designer/src/designer/appfontdialog.h        | 26 ++++----
 tools/designer/src/designer/assistantclient.cpp    | 26 ++++----
 tools/designer/src/designer/assistantclient.h      | 26 ++++----
 tools/designer/src/designer/designer_enums.h       | 26 ++++----
 tools/designer/src/designer/main.cpp               | 26 ++++----
 tools/designer/src/designer/mainwindow.cpp         | 26 ++++----
 tools/designer/src/designer/mainwindow.h           | 26 ++++----
 tools/designer/src/designer/newform.cpp            | 26 ++++----
 tools/designer/src/designer/newform.h              | 26 ++++----
 tools/designer/src/designer/preferencesdialog.cpp  | 26 ++++----
 tools/designer/src/designer/preferencesdialog.h    | 26 ++++----
 tools/designer/src/designer/qdesigner.cpp          | 26 ++++----
 tools/designer/src/designer/qdesigner.h            | 26 ++++----
 tools/designer/src/designer/qdesigner_actions.cpp  | 26 ++++----
 tools/designer/src/designer/qdesigner_actions.h    | 26 ++++----
 .../src/designer/qdesigner_appearanceoptions.cpp   | 26 ++++----
 .../src/designer/qdesigner_appearanceoptions.h     | 26 ++++----
 .../designer/src/designer/qdesigner_formwindow.cpp | 26 ++++----
 tools/designer/src/designer/qdesigner_formwindow.h | 26 ++++----
 tools/designer/src/designer/qdesigner_pch.h        | 26 ++++----
 tools/designer/src/designer/qdesigner_server.cpp   | 26 ++++----
 tools/designer/src/designer/qdesigner_server.h     | 26 ++++----
 tools/designer/src/designer/qdesigner_settings.cpp | 26 ++++----
 tools/designer/src/designer/qdesigner_settings.h   | 26 ++++----
 .../designer/src/designer/qdesigner_toolwindow.cpp | 26 ++++----
 tools/designer/src/designer/qdesigner_toolwindow.h | 26 ++++----
 .../designer/src/designer/qdesigner_workbench.cpp  | 26 ++++----
 tools/designer/src/designer/qdesigner_workbench.h  | 26 ++++----
 tools/designer/src/designer/saveformastemplate.cpp | 26 ++++----
 tools/designer/src/designer/saveformastemplate.h   | 26 ++++----
 tools/designer/src/designer/saveformastemplate.ui  | 26 ++++----
 tools/designer/src/designer/versiondialog.cpp      | 26 ++++----
 tools/designer/src/designer/versiondialog.h        | 26 ++++----
 .../src/lib/components/qdesigner_components.h      | 26 ++++----
 .../lib/components/qdesigner_components_global.h   | 26 ++++----
 .../src/lib/extension/default_extensionfactory.cpp | 26 ++++----
 .../src/lib/extension/default_extensionfactory.h   | 26 ++++----
 tools/designer/src/lib/extension/extension.cpp     | 26 ++++----
 tools/designer/src/lib/extension/extension.h       | 26 ++++----
 .../designer/src/lib/extension/extension_global.h  | 26 ++++----
 .../src/lib/extension/qextensionmanager.cpp        | 26 ++++----
 .../designer/src/lib/extension/qextensionmanager.h | 26 ++++----
 tools/designer/src/lib/lib_pch.h                   | 26 ++++----
 .../designer/src/lib/sdk/abstractactioneditor.cpp  | 26 ++++----
 tools/designer/src/lib/sdk/abstractactioneditor.h  | 26 ++++----
 tools/designer/src/lib/sdk/abstractbrushmanager.h  | 26 ++++----
 tools/designer/src/lib/sdk/abstractdialoggui.cpp   | 26 ++++----
 tools/designer/src/lib/sdk/abstractdialoggui_p.h   | 26 ++++----
 tools/designer/src/lib/sdk/abstractdnditem.h       | 26 ++++----
 tools/designer/src/lib/sdk/abstractformeditor.cpp  | 26 ++++----
 tools/designer/src/lib/sdk/abstractformeditor.h    | 26 ++++----
 .../src/lib/sdk/abstractformeditorplugin.cpp       | 26 ++++----
 .../src/lib/sdk/abstractformeditorplugin.h         | 26 ++++----
 tools/designer/src/lib/sdk/abstractformwindow.cpp  | 26 ++++----
 tools/designer/src/lib/sdk/abstractformwindow.h    | 26 ++++----
 .../src/lib/sdk/abstractformwindowcursor.cpp       | 26 ++++----
 .../src/lib/sdk/abstractformwindowcursor.h         | 26 ++++----
 .../src/lib/sdk/abstractformwindowmanager.cpp      | 26 ++++----
 .../src/lib/sdk/abstractformwindowmanager.h        | 26 ++++----
 .../src/lib/sdk/abstractformwindowtool.cpp         | 26 ++++----
 .../designer/src/lib/sdk/abstractformwindowtool.h  | 26 ++++----
 tools/designer/src/lib/sdk/abstracticoncache.h     | 26 ++++----
 tools/designer/src/lib/sdk/abstractintegration.cpp | 26 ++++----
 tools/designer/src/lib/sdk/abstractintegration.h   | 26 ++++----
 .../designer/src/lib/sdk/abstractintrospection.cpp | 26 ++++----
 .../designer/src/lib/sdk/abstractintrospection_p.h | 26 ++++----
 tools/designer/src/lib/sdk/abstractlanguage.h      | 26 ++++----
 .../designer/src/lib/sdk/abstractmetadatabase.cpp  | 26 ++++----
 tools/designer/src/lib/sdk/abstractmetadatabase.h  | 26 ++++----
 .../designer/src/lib/sdk/abstractnewformwidget.cpp | 26 ++++----
 .../designer/src/lib/sdk/abstractnewformwidget_p.h | 26 ++++----
 .../src/lib/sdk/abstractobjectinspector.cpp        | 26 ++++----
 .../designer/src/lib/sdk/abstractobjectinspector.h | 26 ++++----
 tools/designer/src/lib/sdk/abstractoptionspage_p.h | 26 ++++----
 .../src/lib/sdk/abstractpromotioninterface.cpp     | 26 ++++----
 .../src/lib/sdk/abstractpromotioninterface.h       | 26 ++++----
 .../src/lib/sdk/abstractpropertyeditor.cpp         | 26 ++++----
 .../designer/src/lib/sdk/abstractpropertyeditor.h  | 26 ++++----
 .../src/lib/sdk/abstractresourcebrowser.cpp        | 26 ++++----
 .../designer/src/lib/sdk/abstractresourcebrowser.h | 26 ++++----
 tools/designer/src/lib/sdk/abstractsettings_p.h    | 26 ++++----
 tools/designer/src/lib/sdk/abstractwidgetbox.cpp   | 26 ++++----
 tools/designer/src/lib/sdk/abstractwidgetbox.h     | 26 ++++----
 .../src/lib/sdk/abstractwidgetdatabase.cpp         | 26 ++++----
 .../designer/src/lib/sdk/abstractwidgetdatabase.h  | 26 ++++----
 .../designer/src/lib/sdk/abstractwidgetfactory.cpp | 26 ++++----
 tools/designer/src/lib/sdk/abstractwidgetfactory.h | 26 ++++----
 tools/designer/src/lib/sdk/dynamicpropertysheet.h  | 26 ++++----
 tools/designer/src/lib/sdk/extrainfo.cpp           | 26 ++++----
 tools/designer/src/lib/sdk/extrainfo.h             | 26 ++++----
 tools/designer/src/lib/sdk/layoutdecoration.h      | 26 ++++----
 tools/designer/src/lib/sdk/membersheet.h           | 26 ++++----
 tools/designer/src/lib/sdk/propertysheet.h         | 26 ++++----
 tools/designer/src/lib/sdk/script.cpp              | 26 ++++----
 tools/designer/src/lib/sdk/script_p.h              | 26 ++++----
 tools/designer/src/lib/sdk/sdk_global.h            | 26 ++++----
 tools/designer/src/lib/sdk/taskmenu.h              | 26 ++++----
 tools/designer/src/lib/shared/actioneditor.cpp     | 26 ++++----
 tools/designer/src/lib/shared/actioneditor_p.h     | 26 ++++----
 tools/designer/src/lib/shared/actionprovider_p.h   | 26 ++++----
 tools/designer/src/lib/shared/actionrepository.cpp | 26 ++++----
 tools/designer/src/lib/shared/actionrepository_p.h | 26 ++++----
 tools/designer/src/lib/shared/codedialog.cpp       | 26 ++++----
 tools/designer/src/lib/shared/codedialog_p.h       | 26 ++++----
 tools/designer/src/lib/shared/connectionedit.cpp   | 26 ++++----
 tools/designer/src/lib/shared/connectionedit_p.h   | 26 ++++----
 tools/designer/src/lib/shared/csshighlighter.cpp   | 26 ++++----
 tools/designer/src/lib/shared/csshighlighter_p.h   | 26 ++++----
 tools/designer/src/lib/shared/deviceprofile.cpp    | 26 ++++----
 tools/designer/src/lib/shared/deviceprofile_p.h    | 26 ++++----
 tools/designer/src/lib/shared/dialoggui.cpp        | 26 ++++----
 tools/designer/src/lib/shared/dialoggui_p.h        | 26 ++++----
 tools/designer/src/lib/shared/extensionfactory_p.h | 26 ++++----
 tools/designer/src/lib/shared/filterwidget.cpp     | 26 ++++----
 tools/designer/src/lib/shared/filterwidget_p.h     | 26 ++++----
 tools/designer/src/lib/shared/formlayoutmenu.cpp   | 26 ++++----
 tools/designer/src/lib/shared/formlayoutmenu_p.h   | 26 ++++----
 tools/designer/src/lib/shared/formwindowbase.cpp   | 26 ++++----
 tools/designer/src/lib/shared/formwindowbase_p.h   | 26 ++++----
 tools/designer/src/lib/shared/grid.cpp             | 26 ++++----
 tools/designer/src/lib/shared/grid_p.h             | 26 ++++----
 tools/designer/src/lib/shared/gridpanel.cpp        | 26 ++++----
 tools/designer/src/lib/shared/gridpanel_p.h        | 26 ++++----
 tools/designer/src/lib/shared/htmlhighlighter.cpp  | 26 ++++----
 tools/designer/src/lib/shared/htmlhighlighter_p.h  | 26 ++++----
 tools/designer/src/lib/shared/iconloader.cpp       | 26 ++++----
 tools/designer/src/lib/shared/iconloader_p.h       | 26 ++++----
 tools/designer/src/lib/shared/iconselector.cpp     | 26 ++++----
 tools/designer/src/lib/shared/iconselector_p.h     | 26 ++++----
 tools/designer/src/lib/shared/invisible_widget.cpp | 26 ++++----
 tools/designer/src/lib/shared/invisible_widget_p.h | 26 ++++----
 tools/designer/src/lib/shared/layout.cpp           | 26 ++++----
 tools/designer/src/lib/shared/layout_p.h           | 26 ++++----
 tools/designer/src/lib/shared/layoutinfo.cpp       | 26 ++++----
 tools/designer/src/lib/shared/layoutinfo_p.h       | 26 ++++----
 tools/designer/src/lib/shared/metadatabase.cpp     | 26 ++++----
 tools/designer/src/lib/shared/metadatabase_p.h     | 26 ++++----
 tools/designer/src/lib/shared/morphmenu.cpp        | 26 ++++----
 tools/designer/src/lib/shared/morphmenu_p.h        | 26 ++++----
 tools/designer/src/lib/shared/newactiondialog.cpp  | 26 ++++----
 tools/designer/src/lib/shared/newactiondialog.ui   | 26 ++++----
 tools/designer/src/lib/shared/newactiondialog_p.h  | 26 ++++----
 tools/designer/src/lib/shared/newformwidget.cpp    | 26 ++++----
 tools/designer/src/lib/shared/newformwidget.ui     | 26 ++++----
 tools/designer/src/lib/shared/newformwidget_p.h    | 26 ++++----
 tools/designer/src/lib/shared/orderdialog.cpp      | 26 ++++----
 tools/designer/src/lib/shared/orderdialog.ui       | 26 ++++----
 tools/designer/src/lib/shared/orderdialog_p.h      | 26 ++++----
 tools/designer/src/lib/shared/plaintexteditor.cpp  | 26 ++++----
 tools/designer/src/lib/shared/plaintexteditor_p.h  | 26 ++++----
 tools/designer/src/lib/shared/plugindialog.cpp     | 26 ++++----
 tools/designer/src/lib/shared/plugindialog.ui      | 26 ++++----
 tools/designer/src/lib/shared/plugindialog_p.h     | 26 ++++----
 tools/designer/src/lib/shared/pluginmanager.cpp    | 26 ++++----
 tools/designer/src/lib/shared/pluginmanager_p.h    | 26 ++++----
 .../src/lib/shared/previewconfigurationwidget.cpp  | 26 ++++----
 .../src/lib/shared/previewconfigurationwidget_p.h  | 26 ++++----
 tools/designer/src/lib/shared/previewmanager.cpp   | 26 ++++----
 tools/designer/src/lib/shared/previewmanager_p.h   | 26 ++++----
 tools/designer/src/lib/shared/promotionmodel.cpp   | 26 ++++----
 tools/designer/src/lib/shared/promotionmodel_p.h   | 26 ++++----
 .../designer/src/lib/shared/promotiontaskmenu.cpp  | 26 ++++----
 .../designer/src/lib/shared/promotiontaskmenu_p.h  | 26 ++++----
 tools/designer/src/lib/shared/propertylineedit.cpp | 26 ++++----
 tools/designer/src/lib/shared/propertylineedit_p.h | 26 ++++----
 .../designer/src/lib/shared/qdesigner_command.cpp  | 26 ++++----
 .../designer/src/lib/shared/qdesigner_command2.cpp | 26 ++++----
 .../designer/src/lib/shared/qdesigner_command2_p.h | 26 ++++----
 .../designer/src/lib/shared/qdesigner_command_p.h  | 26 ++++----
 .../designer/src/lib/shared/qdesigner_dnditem.cpp  | 26 ++++----
 .../designer/src/lib/shared/qdesigner_dnditem_p.h  | 26 ++++----
 .../src/lib/shared/qdesigner_dockwidget.cpp        | 26 ++++----
 .../src/lib/shared/qdesigner_dockwidget_p.h        | 26 ++++----
 .../src/lib/shared/qdesigner_formbuilder.cpp       | 26 ++++----
 .../src/lib/shared/qdesigner_formbuilder_p.h       | 26 ++++----
 .../src/lib/shared/qdesigner_formeditorcommand.cpp | 26 ++++----
 .../src/lib/shared/qdesigner_formeditorcommand_p.h | 26 ++++----
 .../src/lib/shared/qdesigner_formwindowcommand.cpp | 26 ++++----
 .../src/lib/shared/qdesigner_formwindowcommand_p.h | 26 ++++----
 .../src/lib/shared/qdesigner_formwindowmanager.cpp | 26 ++++----
 .../src/lib/shared/qdesigner_formwindowmanager_p.h | 26 ++++----
 .../src/lib/shared/qdesigner_integration.cpp       | 26 ++++----
 .../src/lib/shared/qdesigner_integration_p.h       | 26 ++++----
 .../src/lib/shared/qdesigner_introspection.cpp     | 26 ++++----
 .../src/lib/shared/qdesigner_introspection_p.h     | 26 ++++----
 .../src/lib/shared/qdesigner_membersheet.cpp       | 26 ++++----
 .../src/lib/shared/qdesigner_membersheet_p.h       | 26 ++++----
 tools/designer/src/lib/shared/qdesigner_menu.cpp   | 26 ++++----
 tools/designer/src/lib/shared/qdesigner_menu_p.h   | 26 ++++----
 .../designer/src/lib/shared/qdesigner_menubar.cpp  | 26 ++++----
 .../designer/src/lib/shared/qdesigner_menubar_p.h  | 26 ++++----
 .../src/lib/shared/qdesigner_objectinspector.cpp   | 26 ++++----
 .../src/lib/shared/qdesigner_objectinspector_p.h   | 26 ++++----
 .../src/lib/shared/qdesigner_promotion.cpp         | 26 ++++----
 .../src/lib/shared/qdesigner_promotion_p.h         | 26 ++++----
 .../src/lib/shared/qdesigner_promotiondialog.cpp   | 26 ++++----
 .../src/lib/shared/qdesigner_promotiondialog_p.h   | 26 ++++----
 .../src/lib/shared/qdesigner_propertycommand.cpp   | 26 ++++----
 .../src/lib/shared/qdesigner_propertycommand_p.h   | 26 ++++----
 .../src/lib/shared/qdesigner_propertyeditor.cpp    | 26 ++++----
 .../src/lib/shared/qdesigner_propertyeditor_p.h    | 26 ++++----
 .../src/lib/shared/qdesigner_propertysheet.cpp     | 26 ++++----
 .../src/lib/shared/qdesigner_propertysheet_p.h     | 26 ++++----
 .../src/lib/shared/qdesigner_qsettings.cpp         | 26 ++++----
 .../src/lib/shared/qdesigner_qsettings_p.h         | 26 ++++----
 .../src/lib/shared/qdesigner_stackedbox.cpp        | 26 ++++----
 .../src/lib/shared/qdesigner_stackedbox_p.h        | 26 ++++----
 .../src/lib/shared/qdesigner_tabwidget.cpp         | 26 ++++----
 .../src/lib/shared/qdesigner_tabwidget_p.h         | 26 ++++----
 .../designer/src/lib/shared/qdesigner_taskmenu.cpp | 26 ++++----
 .../designer/src/lib/shared/qdesigner_taskmenu_p.h | 26 ++++----
 .../designer/src/lib/shared/qdesigner_toolbar.cpp  | 26 ++++----
 .../designer/src/lib/shared/qdesigner_toolbar_p.h  | 26 ++++----
 .../designer/src/lib/shared/qdesigner_toolbox.cpp  | 26 ++++----
 .../designer/src/lib/shared/qdesigner_toolbox_p.h  | 26 ++++----
 tools/designer/src/lib/shared/qdesigner_utils.cpp  | 26 ++++----
 tools/designer/src/lib/shared/qdesigner_utils_p.h  | 26 ++++----
 tools/designer/src/lib/shared/qdesigner_widget.cpp | 26 ++++----
 tools/designer/src/lib/shared/qdesigner_widget_p.h | 26 ++++----
 .../src/lib/shared/qdesigner_widgetbox.cpp         | 26 ++++----
 .../src/lib/shared/qdesigner_widgetbox_p.h         | 26 ++++----
 .../src/lib/shared/qdesigner_widgetitem.cpp        | 26 ++++----
 .../src/lib/shared/qdesigner_widgetitem_p.h        | 26 ++++----
 tools/designer/src/lib/shared/qlayout_widget.cpp   | 26 ++++----
 tools/designer/src/lib/shared/qlayout_widget_p.h   | 26 ++++----
 .../designer/src/lib/shared/qscripthighlighter.cpp | 26 ++++----
 .../designer/src/lib/shared/qscripthighlighter_p.h | 26 ++++----
 tools/designer/src/lib/shared/qsimpleresource.cpp  | 26 ++++----
 tools/designer/src/lib/shared/qsimpleresource_p.h  | 26 ++++----
 .../src/lib/shared/qtresourceeditordialog.cpp      | 26 ++++----
 .../src/lib/shared/qtresourceeditordialog_p.h      | 26 ++++----
 tools/designer/src/lib/shared/qtresourcemodel.cpp  | 26 ++++----
 tools/designer/src/lib/shared/qtresourcemodel_p.h  | 26 ++++----
 tools/designer/src/lib/shared/qtresourceview.cpp   | 26 ++++----
 tools/designer/src/lib/shared/qtresourceview_p.h   | 26 ++++----
 tools/designer/src/lib/shared/richtexteditor.cpp   | 26 ++++----
 tools/designer/src/lib/shared/richtexteditor_p.h   | 26 ++++----
 tools/designer/src/lib/shared/scriptcommand.cpp    | 26 ++++----
 tools/designer/src/lib/shared/scriptcommand_p.h    | 26 ++++----
 tools/designer/src/lib/shared/scriptdialog.cpp     | 26 ++++----
 tools/designer/src/lib/shared/scriptdialog_p.h     | 26 ++++----
 .../designer/src/lib/shared/scripterrordialog.cpp  | 26 ++++----
 .../designer/src/lib/shared/scripterrordialog_p.h  | 26 ++++----
 tools/designer/src/lib/shared/shared_enums_p.h     | 26 ++++----
 tools/designer/src/lib/shared/shared_global_p.h    | 26 ++++----
 tools/designer/src/lib/shared/shared_settings.cpp  | 26 ++++----
 tools/designer/src/lib/shared/shared_settings_p.h  | 26 ++++----
 tools/designer/src/lib/shared/sheet_delegate.cpp   | 26 ++++----
 tools/designer/src/lib/shared/sheet_delegate_p.h   | 26 ++++----
 tools/designer/src/lib/shared/signalslotdialog.cpp | 26 ++++----
 tools/designer/src/lib/shared/signalslotdialog_p.h | 26 ++++----
 tools/designer/src/lib/shared/spacer_widget.cpp    | 26 ++++----
 tools/designer/src/lib/shared/spacer_widget_p.h    | 26 ++++----
 tools/designer/src/lib/shared/stylesheeteditor.cpp | 26 ++++----
 tools/designer/src/lib/shared/stylesheeteditor_p.h | 26 ++++----
 .../designer/src/lib/shared/textpropertyeditor.cpp | 26 ++++----
 .../designer/src/lib/shared/textpropertyeditor_p.h | 26 ++++----
 tools/designer/src/lib/shared/widgetdatabase.cpp   | 26 ++++----
 tools/designer/src/lib/shared/widgetdatabase_p.h   | 26 ++++----
 tools/designer/src/lib/shared/widgetfactory.cpp    | 26 ++++----
 tools/designer/src/lib/shared/widgetfactory_p.h    | 26 ++++----
 tools/designer/src/lib/shared/zoomwidget.cpp       | 26 ++++----
 tools/designer/src/lib/shared/zoomwidget_p.h       | 26 ++++----
 .../designer/src/lib/uilib/abstractformbuilder.cpp | 26 ++++----
 tools/designer/src/lib/uilib/abstractformbuilder.h | 26 ++++----
 tools/designer/src/lib/uilib/container.h           | 26 ++++----
 tools/designer/src/lib/uilib/customwidget.h        | 26 ++++----
 tools/designer/src/lib/uilib/formbuilder.cpp       | 26 ++++----
 tools/designer/src/lib/uilib/formbuilder.h         | 26 ++++----
 tools/designer/src/lib/uilib/formbuilderextra.cpp  | 26 ++++----
 tools/designer/src/lib/uilib/formbuilderextra_p.h  | 26 ++++----
 tools/designer/src/lib/uilib/formscriptrunner.cpp  | 26 ++++----
 tools/designer/src/lib/uilib/formscriptrunner_p.h  | 26 ++++----
 tools/designer/src/lib/uilib/properties.cpp        | 26 ++++----
 tools/designer/src/lib/uilib/properties_p.h        | 26 ++++----
 .../designer/src/lib/uilib/qdesignerexportwidget.h | 26 ++++----
 tools/designer/src/lib/uilib/resourcebuilder.cpp   | 26 ++++----
 tools/designer/src/lib/uilib/resourcebuilder_p.h   | 26 ++++----
 tools/designer/src/lib/uilib/textbuilder.cpp       | 26 ++++----
 tools/designer/src/lib/uilib/textbuilder_p.h       | 26 ++++----
 tools/designer/src/lib/uilib/ui4.cpp               | 26 ++++----
 tools/designer/src/lib/uilib/ui4_p.h               | 26 ++++----
 tools/designer/src/lib/uilib/uilib_global.h        | 26 ++++----
 .../src/plugins/activeqt/qaxwidgetextrainfo.cpp    | 26 ++++----
 .../src/plugins/activeqt/qaxwidgetextrainfo.h      | 26 ++++----
 .../src/plugins/activeqt/qaxwidgetplugin.cpp       | 26 ++++----
 .../src/plugins/activeqt/qaxwidgetplugin.h         | 26 ++++----
 .../plugins/activeqt/qaxwidgetpropertysheet.cpp    | 26 ++++----
 .../src/plugins/activeqt/qaxwidgetpropertysheet.h  | 26 ++++----
 .../src/plugins/activeqt/qaxwidgettaskmenu.cpp     | 26 ++++----
 .../src/plugins/activeqt/qaxwidgettaskmenu.h       | 26 ++++----
 .../src/plugins/activeqt/qdesigneraxwidget.cpp     | 26 ++++----
 .../src/plugins/activeqt/qdesigneraxwidget.h       | 26 ++++----
 .../src/plugins/phononwidgets/phononcollection.cpp | 26 ++++----
 .../src/plugins/phononwidgets/seeksliderplugin.cpp | 26 ++++----
 .../src/plugins/phononwidgets/seeksliderplugin.h   | 26 ++++----
 .../plugins/phononwidgets/videoplayerplugin.cpp    | 26 ++++----
 .../src/plugins/phononwidgets/videoplayerplugin.h  | 26 ++++----
 .../plugins/phononwidgets/videoplayertaskmenu.cpp  | 26 ++++----
 .../plugins/phononwidgets/videoplayertaskmenu.h    | 26 ++++----
 .../plugins/phononwidgets/volumesliderplugin.cpp   | 26 ++++----
 .../src/plugins/phononwidgets/volumesliderplugin.h | 26 ++++----
 .../qdeclarativeview/qdeclarativeview_plugin.cpp   | 26 ++++----
 .../qdeclarativeview/qdeclarativeview_plugin.h     | 26 ++++----
 .../src/plugins/qwebview/qwebview_plugin.cpp       | 26 ++++----
 .../src/plugins/qwebview/qwebview_plugin.h         | 26 ++++----
 tools/designer/src/plugins/tools/view3d/view3d.cpp | 26 ++++----
 tools/designer/src/plugins/tools/view3d/view3d.h   | 26 ++++----
 .../src/plugins/tools/view3d/view3d_global.h       | 26 ++++----
 .../src/plugins/tools/view3d/view3d_plugin.cpp     | 26 ++++----
 .../src/plugins/tools/view3d/view3d_plugin.h       | 26 ++++----
 .../src/plugins/tools/view3d/view3d_tool.cpp       | 26 ++++----
 .../src/plugins/tools/view3d/view3d_tool.h         | 26 ++++----
 .../widgets/q3iconview/q3iconview_extrainfo.cpp    | 26 ++++----
 .../widgets/q3iconview/q3iconview_extrainfo.h      | 26 ++++----
 .../widgets/q3iconview/q3iconview_plugin.cpp       | 26 ++++----
 .../plugins/widgets/q3iconview/q3iconview_plugin.h | 26 ++++----
 .../widgets/q3listbox/q3listbox_extrainfo.cpp      | 26 ++++----
 .../widgets/q3listbox/q3listbox_extrainfo.h        | 26 ++++----
 .../plugins/widgets/q3listbox/q3listbox_plugin.cpp | 26 ++++----
 .../plugins/widgets/q3listbox/q3listbox_plugin.h   | 26 ++++----
 .../widgets/q3listview/q3listview_extrainfo.cpp    | 26 ++++----
 .../widgets/q3listview/q3listview_extrainfo.h      | 26 ++++----
 .../widgets/q3listview/q3listview_plugin.cpp       | 26 ++++----
 .../plugins/widgets/q3listview/q3listview_plugin.h | 26 ++++----
 .../q3mainwindow/q3mainwindow_container.cpp        | 26 ++++----
 .../widgets/q3mainwindow/q3mainwindow_container.h  | 26 ++++----
 .../widgets/q3mainwindow/q3mainwindow_plugin.cpp   | 26 ++++----
 .../widgets/q3mainwindow/q3mainwindow_plugin.h     | 26 ++++----
 .../plugins/widgets/q3table/q3table_extrainfo.cpp  | 26 ++++----
 .../plugins/widgets/q3table/q3table_extrainfo.h    | 26 ++++----
 .../src/plugins/widgets/q3table/q3table_plugin.cpp | 26 ++++----
 .../src/plugins/widgets/q3table/q3table_plugin.h   | 26 ++++----
 .../widgets/q3textedit/q3textedit_extrainfo.cpp    | 26 ++++----
 .../widgets/q3textedit/q3textedit_extrainfo.h      | 26 ++++----
 .../widgets/q3textedit/q3textedit_plugin.cpp       | 26 ++++----
 .../plugins/widgets/q3textedit/q3textedit_plugin.h | 26 ++++----
 .../widgets/q3toolbar/q3toolbar_extrainfo.cpp      | 26 ++++----
 .../widgets/q3toolbar/q3toolbar_extrainfo.h        | 26 ++++----
 .../plugins/widgets/q3toolbar/q3toolbar_plugin.cpp | 26 ++++----
 .../plugins/widgets/q3toolbar/q3toolbar_plugin.h   | 26 ++++----
 .../plugins/widgets/q3widgets/q3widget_plugins.cpp | 26 ++++----
 .../plugins/widgets/q3widgets/q3widget_plugins.h   | 26 ++++----
 .../q3widgetstack/q3widgetstack_container.cpp      | 26 ++++----
 .../q3widgetstack/q3widgetstack_container.h        | 26 ++++----
 .../widgets/q3widgetstack/q3widgetstack_plugin.cpp | 26 ++++----
 .../widgets/q3widgetstack/q3widgetstack_plugin.h   | 26 ++++----
 .../q3widgetstack/qdesigner_q3widgetstack.cpp      | 26 ++++----
 .../q3widgetstack/qdesigner_q3widgetstack_p.h      | 26 ++++----
 .../widgets/q3wizard/q3wizard_container.cpp        | 26 ++++----
 .../plugins/widgets/q3wizard/q3wizard_container.h  | 26 ++++----
 .../plugins/widgets/q3wizard/q3wizard_plugin.cpp   | 26 ++++----
 .../src/plugins/widgets/q3wizard/q3wizard_plugin.h | 26 ++++----
 .../src/plugins/widgets/qt3supportwidgets.cpp      | 26 ++++----
 tools/designer/src/uitools/quiloader.cpp           | 26 ++++----
 tools/designer/src/uitools/quiloader.h             | 26 ++++----
 tools/designer/src/uitools/quiloader_p.h           | 26 ++++----
 tools/kmap2qmap/main.cpp                           | 26 ++++----
 tools/linguist/lconvert/main.cpp                   | 26 ++++----
 tools/linguist/linguist/batchtranslation.ui        | 26 ++++----
 tools/linguist/linguist/batchtranslationdialog.cpp | 26 ++++----
 tools/linguist/linguist/batchtranslationdialog.h   | 26 ++++----
 tools/linguist/linguist/errorsview.cpp             | 26 ++++----
 tools/linguist/linguist/errorsview.h               | 26 ++++----
 tools/linguist/linguist/finddialog.cpp             | 26 ++++----
 tools/linguist/linguist/finddialog.h               | 26 ++++----
 tools/linguist/linguist/finddialog.ui              | 26 ++++----
 tools/linguist/linguist/formpreviewview.cpp        | 26 ++++----
 tools/linguist/linguist/formpreviewview.h          | 26 ++++----
 tools/linguist/linguist/globals.cpp                | 26 ++++----
 tools/linguist/linguist/globals.h                  | 26 ++++----
 tools/linguist/linguist/main.cpp                   | 26 ++++----
 tools/linguist/linguist/mainwindow.cpp             | 26 ++++----
 tools/linguist/linguist/mainwindow.h               | 26 ++++----
 tools/linguist/linguist/mainwindow.ui              | 26 ++++----
 tools/linguist/linguist/messageeditor.cpp          | 26 ++++----
 tools/linguist/linguist/messageeditor.h            | 26 ++++----
 tools/linguist/linguist/messageeditorwidgets.cpp   | 26 ++++----
 tools/linguist/linguist/messageeditorwidgets.h     | 26 ++++----
 tools/linguist/linguist/messagehighlighter.cpp     | 26 ++++----
 tools/linguist/linguist/messagehighlighter.h       | 26 ++++----
 tools/linguist/linguist/messagemodel.cpp           | 26 ++++----
 tools/linguist/linguist/messagemodel.h             | 26 ++++----
 tools/linguist/linguist/phrase.cpp                 | 26 ++++----
 tools/linguist/linguist/phrase.h                   | 26 ++++----
 tools/linguist/linguist/phrasebookbox.cpp          | 26 ++++----
 tools/linguist/linguist/phrasebookbox.h            | 26 ++++----
 tools/linguist/linguist/phrasebookbox.ui           | 26 ++++----
 tools/linguist/linguist/phrasemodel.cpp            | 26 ++++----
 tools/linguist/linguist/phrasemodel.h              | 26 ++++----
 tools/linguist/linguist/phraseview.cpp             | 26 ++++----
 tools/linguist/linguist/phraseview.h               | 26 ++++----
 tools/linguist/linguist/printout.cpp               | 26 ++++----
 tools/linguist/linguist/printout.h                 | 26 ++++----
 tools/linguist/linguist/recentfiles.cpp            | 26 ++++----
 tools/linguist/linguist/recentfiles.h              | 26 ++++----
 tools/linguist/linguist/sourcecodeview.cpp         | 26 ++++----
 tools/linguist/linguist/sourcecodeview.h           | 26 ++++----
 tools/linguist/linguist/statistics.cpp             | 26 ++++----
 tools/linguist/linguist/statistics.h               | 26 ++++----
 tools/linguist/linguist/statistics.ui              | 26 ++++----
 tools/linguist/linguist/translatedialog.cpp        | 26 ++++----
 tools/linguist/linguist/translatedialog.h          | 26 ++++----
 tools/linguist/linguist/translatedialog.ui         | 26 ++++----
 .../linguist/translationsettingsdialog.cpp         | 26 ++++----
 .../linguist/linguist/translationsettingsdialog.h  | 26 ++++----
 tools/linguist/lrelease/lrelease.1                 | 26 ++++----
 tools/linguist/lrelease/main.cpp                   | 26 ++++----
 tools/linguist/lupdate/cpp.cpp                     | 26 ++++----
 tools/linguist/lupdate/java.cpp                    | 26 ++++----
 tools/linguist/lupdate/lupdate.1                   | 26 ++++----
 tools/linguist/lupdate/lupdate.h                   | 26 ++++----
 tools/linguist/lupdate/main.cpp                    | 26 ++++----
 tools/linguist/lupdate/merge.cpp                   | 26 ++++----
 tools/linguist/lupdate/qdeclarative.cpp            | 26 ++++----
 tools/linguist/lupdate/qscript.cpp                 | 26 ++++----
 tools/linguist/lupdate/qscript.g                   | 26 ++++----
 tools/linguist/lupdate/ui.cpp                      | 26 ++++----
 tools/linguist/shared/abstractproitemvisitor.h     | 26 ++++----
 tools/linguist/shared/numerus.cpp                  | 26 ++++----
 tools/linguist/shared/po.cpp                       | 26 ++++----
 tools/linguist/shared/profileevaluator.cpp         | 26 ++++----
 tools/linguist/shared/profileevaluator.h           | 26 ++++----
 tools/linguist/shared/proitems.cpp                 | 26 ++++----
 tools/linguist/shared/proitems.h                   | 26 ++++----
 tools/linguist/shared/proparserutils.h             | 26 ++++----
 tools/linguist/shared/qm.cpp                       | 26 ++++----
 tools/linguist/shared/qph.cpp                      | 26 ++++----
 tools/linguist/shared/simtexth.cpp                 | 26 ++++----
 tools/linguist/shared/simtexth.h                   | 26 ++++----
 tools/linguist/shared/translator.cpp               | 26 ++++----
 tools/linguist/shared/translator.h                 | 26 ++++----
 tools/linguist/shared/translatormessage.cpp        | 26 ++++----
 tools/linguist/shared/translatormessage.h          | 26 ++++----
 tools/linguist/shared/ts.cpp                       | 26 ++++----
 tools/linguist/shared/xliff.cpp                    | 26 ++++----
 tools/linguist/tests/data/main.cpp                 | 26 ++++----
 tools/linguist/tests/tst_linguist.cpp              | 26 ++++----
 tools/linguist/tests/tst_linguist.h                | 26 ++++----
 tools/linguist/tests/tst_lupdate.cpp               | 26 ++++----
 tools/linguist/tests/tst_simtexth.cpp              | 26 ++++----
 tools/macdeployqt/macchangeqt/main.cpp             | 26 ++++----
 tools/macdeployqt/macdeployqt/main.cpp             | 26 ++++----
 tools/macdeployqt/shared/shared.cpp                | 26 ++++----
 tools/macdeployqt/shared/shared.h                  | 26 ++++----
 tools/macdeployqt/tests/tst_deployment_mac.cpp     | 26 ++++----
 tools/makeqpf/main.cpp                             | 26 ++++----
 tools/makeqpf/mainwindow.cpp                       | 26 ++++----
 tools/makeqpf/mainwindow.h                         | 26 ++++----
 tools/makeqpf/qpf2.cpp                             | 26 ++++----
 tools/makeqpf/qpf2.h                               | 26 ++++----
 tools/pixeltool/main.cpp                           | 26 ++++----
 tools/pixeltool/qpixeltool.cpp                     | 26 ++++----
 tools/pixeltool/qpixeltool.h                       | 26 ++++----
 tools/porting/src/ast.cpp                          | 26 ++++----
 tools/porting/src/ast.h                            | 26 ++++----
 tools/porting/src/codemodel.cpp                    | 26 ++++----
 tools/porting/src/codemodel.h                      | 26 ++++----
 tools/porting/src/codemodelattributes.cpp          | 26 ++++----
 tools/porting/src/codemodelattributes.h            | 26 ++++----
 tools/porting/src/codemodelwalker.cpp              | 26 ++++----
 tools/porting/src/codemodelwalker.h                | 26 ++++----
 tools/porting/src/cpplexer.cpp                     | 26 ++++----
 tools/porting/src/cpplexer.h                       | 26 ++++----
 tools/porting/src/errors.cpp                       | 26 ++++----
 tools/porting/src/errors.h                         | 26 ++++----
 tools/porting/src/fileporter.cpp                   | 26 ++++----
 tools/porting/src/fileporter.h                     | 26 ++++----
 tools/porting/src/filewriter.cpp                   | 26 ++++----
 tools/porting/src/filewriter.h                     | 26 ++++----
 tools/porting/src/list.h                           | 26 ++++----
 tools/porting/src/logger.cpp                       | 26 ++++----
 tools/porting/src/logger.h                         | 26 ++++----
 tools/porting/src/parser.cpp                       | 26 ++++----
 tools/porting/src/parser.h                         | 26 ++++----
 tools/porting/src/port.cpp                         | 26 ++++----
 tools/porting/src/portingrules.cpp                 | 26 ++++----
 tools/porting/src/portingrules.h                   | 26 ++++----
 tools/porting/src/preprocessorcontrol.cpp          | 26 ++++----
 tools/porting/src/preprocessorcontrol.h            | 26 ++++----
 tools/porting/src/projectporter.cpp                | 26 ++++----
 tools/porting/src/projectporter.h                  | 26 ++++----
 tools/porting/src/proparser.cpp                    | 26 ++++----
 tools/porting/src/proparser.h                      | 26 ++++----
 tools/porting/src/q3porting.xml                    | 26 ++++----
 tools/porting/src/qtsimplexml.cpp                  | 26 ++++----
 tools/porting/src/qtsimplexml.h                    | 26 ++++----
 tools/porting/src/replacetoken.cpp                 | 26 ++++----
 tools/porting/src/replacetoken.h                   | 26 ++++----
 tools/porting/src/rpp.cpp                          | 26 ++++----
 tools/porting/src/rpp.h                            | 26 ++++----
 tools/porting/src/rppexpressionbuilder.cpp         | 26 ++++----
 tools/porting/src/rppexpressionbuilder.h           | 26 ++++----
 tools/porting/src/rpplexer.cpp                     | 26 ++++----
 tools/porting/src/rpplexer.h                       | 26 ++++----
 tools/porting/src/rpptreeevaluator.cpp             | 26 ++++----
 tools/porting/src/rpptreeevaluator.h               | 26 ++++----
 tools/porting/src/rpptreewalker.cpp                | 26 ++++----
 tools/porting/src/rpptreewalker.h                  | 26 ++++----
 tools/porting/src/semantic.cpp                     | 26 ++++----
 tools/porting/src/semantic.h                       | 26 ++++----
 tools/porting/src/smallobject.cpp                  | 26 ++++----
 tools/porting/src/smallobject.h                    | 26 ++++----
 tools/porting/src/textreplacement.cpp              | 26 ++++----
 tools/porting/src/textreplacement.h                | 26 ++++----
 tools/porting/src/tokenengine.cpp                  | 26 ++++----
 tools/porting/src/tokenengine.h                    | 26 ++++----
 tools/porting/src/tokenizer.cpp                    | 26 ++++----
 tools/porting/src/tokenizer.h                      | 26 ++++----
 tools/porting/src/tokenreplacements.cpp            | 26 ++++----
 tools/porting/src/tokenreplacements.h              | 26 ++++----
 tools/porting/src/tokens.h                         | 26 ++++----
 tools/porting/src/tokenstreamadapter.h             | 26 ++++----
 tools/porting/src/translationunit.cpp              | 26 ++++----
 tools/porting/src/translationunit.h                | 26 ++++----
 tools/porting/src/treewalker.cpp                   | 26 ++++----
 tools/porting/src/treewalker.h                     | 26 ++++----
 tools/qconfig/feature.cpp                          | 26 ++++----
 tools/qconfig/feature.h                            | 26 ++++----
 tools/qconfig/featuretreemodel.cpp                 | 26 ++++----
 tools/qconfig/featuretreemodel.h                   | 26 ++++----
 tools/qconfig/graphics.h                           | 26 ++++----
 tools/qconfig/main.cpp                             | 26 ++++----
 tools/qdbus/qdbus/qdbus.cpp                        | 26 ++++----
 tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp          | 26 ++++----
 tools/qdbus/qdbusviewer/main.cpp                   | 26 ++++----
 tools/qdbus/qdbusviewer/propertydialog.cpp         | 26 ++++----
 tools/qdbus/qdbusviewer/propertydialog.h           | 26 ++++----
 tools/qdbus/qdbusviewer/qdbusmodel.cpp             | 26 ++++----
 tools/qdbus/qdbusviewer/qdbusmodel.h               | 26 ++++----
 tools/qdbus/qdbusviewer/qdbusviewer.cpp            | 26 ++++----
 tools/qdbus/qdbusviewer/qdbusviewer.h              | 26 ++++----
 tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp          | 26 ++++----
 tools/qdoc3/apigenerator.cpp                       | 26 ++++----
 tools/qdoc3/apigenerator.h                         | 26 ++++----
 tools/qdoc3/archiveextractor.cpp                   | 26 ++++----
 tools/qdoc3/archiveextractor.h                     | 26 ++++----
 tools/qdoc3/atom.cpp                               | 26 ++++----
 tools/qdoc3/atom.h                                 | 26 ++++----
 tools/qdoc3/bookgenerator.cpp                      | 26 ++++----
 tools/qdoc3/bookgenerator.h                        | 26 ++++----
 tools/qdoc3/ccodeparser.cpp                        | 26 ++++----
 tools/qdoc3/ccodeparser.h                          | 26 ++++----
 tools/qdoc3/codechunk.cpp                          | 26 ++++----
 tools/qdoc3/codechunk.h                            | 26 ++++----
 tools/qdoc3/codemarker.cpp                         | 26 ++++----
 tools/qdoc3/codemarker.h                           | 26 ++++----
 tools/qdoc3/codeparser.cpp                         | 26 ++++----
 tools/qdoc3/codeparser.h                           | 26 ++++----
 tools/qdoc3/command.cpp                            | 26 ++++----
 tools/qdoc3/command.h                              | 26 ++++----
 tools/qdoc3/config.cpp                             | 26 ++++----
 tools/qdoc3/config.h                               | 26 ++++----
 tools/qdoc3/cppcodemarker.cpp                      | 26 ++++----
 tools/qdoc3/cppcodemarker.h                        | 26 ++++----
 tools/qdoc3/cppcodeparser.cpp                      | 26 ++++----
 tools/qdoc3/cppcodeparser.h                        | 26 ++++----
 tools/qdoc3/cpptoqsconverter.cpp                   | 26 ++++----
 tools/qdoc3/cpptoqsconverter.h                     | 26 ++++----
 tools/qdoc3/dcfsection.cpp                         | 26 ++++----
 tools/qdoc3/dcfsection.h                           | 26 ++++----
 tools/qdoc3/ditaxmlgenerator.cpp                   | 26 ++++----
 tools/qdoc3/ditaxmlgenerator.h                     | 26 ++++----
 tools/qdoc3/doc.cpp                                | 26 ++++----
 tools/qdoc3/doc.h                                  | 26 ++++----
 tools/qdoc3/doc/examples/main.cpp                  | 26 ++++----
 tools/qdoc3/editdistance.cpp                       | 26 ++++----
 tools/qdoc3/editdistance.h                         | 26 ++++----
 tools/qdoc3/generator.cpp                          | 26 ++++----
 tools/qdoc3/generator.h                            | 26 ++++----
 tools/qdoc3/helpprojectwriter.cpp                  | 26 ++++----
 tools/qdoc3/helpprojectwriter.h                    | 26 ++++----
 tools/qdoc3/htmlgenerator.cpp                      | 26 ++++----
 tools/qdoc3/htmlgenerator.h                        | 26 ++++----
 tools/qdoc3/jambiapiparser.cpp                     | 26 ++++----
 tools/qdoc3/jambiapiparser.h                       | 26 ++++----
 tools/qdoc3/javacodemarker.cpp                     | 26 ++++----
 tools/qdoc3/javacodemarker.h                       | 26 ++++----
 tools/qdoc3/javadocgenerator.cpp                   | 26 ++++----
 tools/qdoc3/javadocgenerator.h                     | 26 ++++----
 tools/qdoc3/linguistgenerator.cpp                  | 26 ++++----
 tools/qdoc3/linguistgenerator.h                    | 26 ++++----
 tools/qdoc3/location.cpp                           | 26 ++++----
 tools/qdoc3/location.h                             | 26 ++++----
 tools/qdoc3/loutgenerator.cpp                      | 26 ++++----
 tools/qdoc3/loutgenerator.h                        | 26 ++++----
 tools/qdoc3/main.cpp                               | 26 ++++----
 tools/qdoc3/mangenerator.cpp                       | 26 ++++----
 tools/qdoc3/mangenerator.h                         | 26 ++++----
 tools/qdoc3/node.cpp                               | 26 ++++----
 tools/qdoc3/node.h                                 | 26 ++++----
 tools/qdoc3/openedlist.cpp                         | 26 ++++----
 tools/qdoc3/openedlist.h                           | 26 ++++----
 tools/qdoc3/pagegenerator.cpp                      | 26 ++++----
 tools/qdoc3/pagegenerator.h                        | 26 ++++----
 tools/qdoc3/plaincodemarker.cpp                    | 26 ++++----
 tools/qdoc3/plaincodemarker.h                      | 26 ++++----
 tools/qdoc3/polyarchiveextractor.cpp               | 26 ++++----
 tools/qdoc3/polyarchiveextractor.h                 | 26 ++++----
 tools/qdoc3/polyuncompressor.cpp                   | 26 ++++----
 tools/qdoc3/polyuncompressor.h                     | 26 ++++----
 tools/qdoc3/qsakernelparser.cpp                    | 26 ++++----
 tools/qdoc3/qsakernelparser.h                      | 26 ++++----
 tools/qdoc3/qscodemarker.cpp                       | 26 ++++----
 tools/qdoc3/qscodemarker.h                         | 26 ++++----
 tools/qdoc3/qscodeparser.cpp                       | 26 ++++----
 tools/qdoc3/qscodeparser.h                         | 26 ++++----
 tools/qdoc3/quoter.cpp                             | 26 ++++----
 tools/qdoc3/quoter.h                               | 26 ++++----
 tools/qdoc3/separator.cpp                          | 26 ++++----
 tools/qdoc3/separator.h                            | 26 ++++----
 tools/qdoc3/sgmlgenerator.cpp                      | 26 ++++----
 tools/qdoc3/sgmlgenerator.h                        | 26 ++++----
 tools/qdoc3/text.cpp                               | 26 ++++----
 tools/qdoc3/text.h                                 | 26 ++++----
 tools/qdoc3/tokenizer.cpp                          | 26 ++++----
 tools/qdoc3/tokenizer.h                            | 26 ++++----
 tools/qdoc3/tr.h                                   | 26 ++++----
 tools/qdoc3/tree.cpp                               | 26 ++++----
 tools/qdoc3/tree.h                                 | 26 ++++----
 tools/qdoc3/uncompressor.cpp                       | 26 ++++----
 tools/qdoc3/uncompressor.h                         | 26 ++++----
 tools/qdoc3/webxmlgenerator.cpp                    | 26 ++++----
 tools/qdoc3/webxmlgenerator.h                      | 26 ++++----
 tools/qdoc3/yyindent.cpp                           | 26 ++++----
 tools/qev/qev.cpp                                  | 26 ++++----
 .../qmeegographicssystemhelper.cpp                 | 26 ++++----
 .../qmeegographicssystemhelper.h                   | 26 ++++----
 .../qmeegographicssystemhelper/qmeegoliveimage.cpp | 26 ++++----
 tools/qmeegographicssystemhelper/qmeegoliveimage.h | 26 ++++----
 .../qmeegographicssystemhelper/qmeegoliveimage_p.h | 26 ++++----
 .../qmeegolivepixmap.cpp                           | 26 ++++----
 .../qmeegographicssystemhelper/qmeegolivepixmap.h  | 26 ++++----
 .../qmeegolivepixmap_p.h                           | 26 ++++----
 .../qmeegooverlaywidget.cpp                        | 26 ++++----
 .../qmeegooverlaywidget.h                          | 26 ++++----
 tools/qmeegographicssystemhelper/qmeegoruntime.cpp | 26 ++++----
 tools/qmeegographicssystemhelper/qmeegoruntime.h   | 26 ++++----
 tools/qml/browser/Browser.qml                      | 26 ++++----
 tools/qml/deviceorientation.cpp                    | 26 ++++----
 tools/qml/deviceorientation.h                      | 26 ++++----
 tools/qml/deviceorientation_harmattan.cpp          | 26 ++++----
 tools/qml/deviceorientation_maemo5.cpp             | 26 ++++----
 tools/qml/deviceorientation_symbian.cpp            | 26 ++++----
 tools/qml/loggerwidget.cpp                         | 26 ++++----
 tools/qml/loggerwidget.h                           | 26 ++++----
 tools/qml/main.cpp                                 | 26 ++++----
 tools/qml/proxysettings.cpp                        | 26 ++++----
 tools/qml/proxysettings.h                          | 26 ++++----
 tools/qml/qdeclarativetester.cpp                   | 26 ++++----
 tools/qml/qdeclarativetester.h                     | 26 ++++----
 tools/qml/qmlruntime.cpp                           | 26 ++++----
 tools/qml/qmlruntime.h                             | 26 ++++----
 tools/qml/startup/Logo.qml                         | 26 ++++----
 tools/qml/startup/startup.qml                      | 26 ++++----
 tools/qml/texteditautoresizer_maemo5.h             | 26 ++++----
 tools/qtconcurrent/codegenerator/example/main.cpp  | 26 ++++----
 .../codegenerator/src/codegenerator.cpp            | 26 ++++----
 .../qtconcurrent/codegenerator/src/codegenerator.h | 26 ++++----
 tools/qtconcurrent/generaterun/main.cpp            | 26 ++++----
 tools/qtconfig/colorbutton.cpp                     | 26 ++++----
 tools/qtconfig/colorbutton.h                       | 26 ++++----
 tools/qtconfig/main.cpp                            | 26 ++++----
 tools/qtconfig/mainwindow.cpp                      | 26 ++++----
 tools/qtconfig/mainwindow.h                        | 26 ++++----
 tools/qtconfig/mainwindowbase.cpp                  | 26 ++++----
 tools/qtconfig/mainwindowbase.h                    | 26 ++++----
 tools/qtconfig/mainwindowbase.ui                   | 26 ++++----
 tools/qtconfig/paletteeditoradvanced.cpp           | 26 ++++----
 tools/qtconfig/paletteeditoradvanced.h             | 26 ++++----
 tools/qtconfig/paletteeditoradvancedbase.cpp       | 26 ++++----
 tools/qtconfig/paletteeditoradvancedbase.h         | 26 ++++----
 tools/qtconfig/paletteeditoradvancedbase.ui        | 26 ++++----
 tools/qtconfig/previewframe.cpp                    | 26 ++++----
 tools/qtconfig/previewframe.h                      | 26 ++++----
 tools/qtconfig/previewwidget.cpp                   | 26 ++++----
 tools/qtconfig/previewwidget.h                     | 26 ++++----
 tools/qtconfig/previewwidgetbase.cpp               | 26 ++++----
 tools/qtconfig/previewwidgetbase.h                 | 26 ++++----
 tools/qtconfig/previewwidgetbase.ui                | 26 ++++----
 tools/qtestlib/updater/main.cpp                    | 26 ++++----
 tools/qtestlib/wince/cetcpsync/main.cpp            | 26 ++++----
 .../wince/cetcpsync/qtcesterconnection.cpp         | 26 ++++----
 .../qtestlib/wince/cetcpsync/qtcesterconnection.h  | 26 ++++----
 .../qtestlib/wince/cetcpsync/remoteconnection.cpp  | 26 ++++----
 tools/qtestlib/wince/cetcpsync/remoteconnection.h  | 26 ++++----
 tools/qtestlib/wince/cetcpsyncserver/commands.cpp  | 26 ++++----
 tools/qtestlib/wince/cetcpsyncserver/commands.h    | 26 ++++----
 .../wince/cetcpsyncserver/connectionmanager.cpp    | 26 ++++----
 .../wince/cetcpsyncserver/connectionmanager.h      | 26 ++++----
 tools/qtestlib/wince/cetcpsyncserver/main.cpp      | 26 ++++----
 .../wince/cetcpsyncserver/transfer_global.h        | 26 ++++----
 .../qtestlib/wince/cetest/activesyncconnection.cpp | 26 ++++----
 tools/qtestlib/wince/cetest/activesyncconnection.h | 26 ++++----
 .../qtestlib/wince/cetest/cetcpsyncconnection.cpp  | 26 ++++----
 tools/qtestlib/wince/cetest/cetcpsyncconnection.h  | 26 ++++----
 tools/qtestlib/wince/cetest/deployment.cpp         | 26 ++++----
 tools/qtestlib/wince/cetest/deployment.h           | 26 ++++----
 tools/qtestlib/wince/cetest/main.cpp               | 26 ++++----
 tools/qtestlib/wince/cetest/remoteconnection.cpp   | 26 ++++----
 tools/qtestlib/wince/cetest/remoteconnection.h     | 26 ++++----
 tools/qtestlib/wince/remotelib/commands.cpp        | 26 ++++----
 tools/qtestlib/wince/remotelib/commands.h          | 26 ++++----
 tools/qttracereplay/main.cpp                       | 26 ++++----
 tools/qvfb/config.ui                               | 26 ++++----
 tools/qvfb/gammaview.h                             | 26 ++++----
 tools/qvfb/main.cpp                                | 26 ++++----
 tools/qvfb/qanimationwriter.cpp                    | 26 ++++----
 tools/qvfb/qanimationwriter.h                      | 26 ++++----
 tools/qvfb/qtopiakeysym.h                          | 26 ++++----
 tools/qvfb/qvfb.cpp                                | 26 ++++----
 tools/qvfb/qvfb.h                                  | 26 ++++----
 tools/qvfb/qvfbmmap.cpp                            | 26 ++++----
 tools/qvfb/qvfbmmap.h                              | 26 ++++----
 tools/qvfb/qvfbprotocol.cpp                        | 26 ++++----
 tools/qvfb/qvfbprotocol.h                          | 26 ++++----
 tools/qvfb/qvfbratedlg.cpp                         | 26 ++++----
 tools/qvfb/qvfbratedlg.h                           | 26 ++++----
 tools/qvfb/qvfbshmem.cpp                           | 26 ++++----
 tools/qvfb/qvfbshmem.h                             | 26 ++++----
 tools/qvfb/qvfbview.cpp                            | 26 ++++----
 tools/qvfb/qvfbview.h                              | 26 ++++----
 tools/qvfb/qvfbx11view.cpp                         | 26 ++++----
 tools/qvfb/qvfbx11view.h                           | 26 ++++----
 tools/qvfb/x11keyfaker.cpp                         | 26 ++++----
 tools/qvfb/x11keyfaker.h                           | 26 ++++----
 tools/runonphone/main.cpp                          | 26 ++++----
 tools/runonphone/ossignalconverter.cpp             | 26 ++++----
 tools/runonphone/ossignalconverter.h               | 26 ++++----
 tools/runonphone/ossignalconverter_p.h             | 26 ++++----
 tools/runonphone/serenum.h                         | 26 ++++----
 tools/runonphone/serenum_stub.cpp                  | 26 ++++----
 tools/runonphone/serenum_unix.cpp                  | 26 ++++----
 tools/runonphone/serenum_win.cpp                   | 26 ++++----
 .../runonphone/symbianutils/bluetoothlistener.cpp  | 26 ++++----
 tools/runonphone/symbianutils/bluetoothlistener.h  | 26 ++++----
 .../symbianutils/bluetoothlistener_gui.cpp         | 26 ++++----
 .../symbianutils/bluetoothlistener_gui.h           | 26 ++++----
 tools/runonphone/symbianutils/callback.h           | 26 ++++----
 .../symbianutils/communicationstarter.cpp          | 26 ++++----
 .../runonphone/symbianutils/communicationstarter.h | 26 ++++----
 tools/runonphone/symbianutils/json.cpp             | 26 ++++----
 tools/runonphone/symbianutils/json.h               | 26 ++++----
 tools/runonphone/symbianutils/launcher.cpp         | 26 ++++----
 tools/runonphone/symbianutils/launcher.h           | 26 ++++----
 .../symbianutils/symbiandevicemanager.cpp          | 26 ++++----
 .../runonphone/symbianutils/symbiandevicemanager.h | 26 ++++----
 .../runonphone/symbianutils/symbianutils_global.h  | 26 ++++----
 tools/runonphone/symbianutils/tcftrkdevice.cpp     | 26 ++++----
 tools/runonphone/symbianutils/tcftrkdevice.h       | 26 ++++----
 tools/runonphone/symbianutils/tcftrkmessage.cpp    | 26 ++++----
 tools/runonphone/symbianutils/tcftrkmessage.h      | 26 ++++----
 tools/runonphone/symbianutils/trkdevice.cpp        | 26 ++++----
 tools/runonphone/symbianutils/trkdevice.h          | 26 ++++----
 tools/runonphone/symbianutils/trkutils.cpp         | 26 ++++----
 tools/runonphone/symbianutils/trkutils.h           | 26 ++++----
 tools/runonphone/symbianutils/trkutils_p.h         | 26 ++++----
 tools/runonphone/trksignalhandler.cpp              | 26 ++++----
 tools/runonphone/trksignalhandler.h                | 26 ++++----
 tools/shared/deviceskin/deviceskin.cpp             | 26 ++++----
 tools/shared/deviceskin/deviceskin.h               | 26 ++++----
 tools/shared/findwidget/abstractfindwidget.cpp     | 26 ++++----
 tools/shared/findwidget/abstractfindwidget.h       | 26 ++++----
 tools/shared/findwidget/itemviewfindwidget.cpp     | 26 ++++----
 tools/shared/findwidget/itemviewfindwidget.h       | 26 ++++----
 tools/shared/findwidget/texteditfindwidget.cpp     | 26 ++++----
 tools/shared/findwidget/texteditfindwidget.h       | 26 ++++----
 tools/shared/fontpanel/fontpanel.cpp               | 26 ++++----
 tools/shared/fontpanel/fontpanel.h                 | 26 ++++----
 tools/shared/qtgradienteditor/qtcolorbutton.cpp    | 26 ++++----
 tools/shared/qtgradienteditor/qtcolorbutton.h      | 26 ++++----
 tools/shared/qtgradienteditor/qtcolorline.cpp      | 26 ++++----
 tools/shared/qtgradienteditor/qtcolorline.h        | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientdialog.cpp | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientdialog.h   | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientdialog.ui  | 26 ++++----
 tools/shared/qtgradienteditor/qtgradienteditor.cpp | 26 ++++----
 tools/shared/qtgradienteditor/qtgradienteditor.h   | 26 ++++----
 tools/shared/qtgradienteditor/qtgradienteditor.ui  | 26 ++++----
 .../shared/qtgradienteditor/qtgradientmanager.cpp  | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientmanager.h  | 26 ++++----
 .../qtgradienteditor/qtgradientstopscontroller.cpp | 26 ++++----
 .../qtgradienteditor/qtgradientstopscontroller.h   | 26 ++++----
 .../qtgradienteditor/qtgradientstopsmodel.cpp      | 26 ++++----
 .../shared/qtgradienteditor/qtgradientstopsmodel.h | 26 ++++----
 .../qtgradienteditor/qtgradientstopswidget.cpp     | 26 ++++----
 .../qtgradienteditor/qtgradientstopswidget.h       | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientutils.cpp  | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientutils.h    | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientview.cpp   | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientview.h     | 26 ++++----
 .../qtgradienteditor/qtgradientviewdialog.cpp      | 26 ++++----
 .../shared/qtgradienteditor/qtgradientviewdialog.h | 26 ++++----
 .../qtgradienteditor/qtgradientviewdialog.ui       | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientwidget.cpp | 26 ++++----
 tools/shared/qtgradienteditor/qtgradientwidget.h   | 26 ++++----
 .../qtpropertybrowser/qtbuttonpropertybrowser.cpp  | 26 ++++----
 .../qtpropertybrowser/qtbuttonpropertybrowser.h    | 26 ++++----
 tools/shared/qtpropertybrowser/qteditorfactory.cpp | 26 ++++----
 tools/shared/qtpropertybrowser/qteditorfactory.h   | 26 ++++----
 .../qtgroupboxpropertybrowser.cpp                  | 26 ++++----
 .../qtpropertybrowser/qtgroupboxpropertybrowser.h  | 26 ++++----
 .../shared/qtpropertybrowser/qtpropertybrowser.cpp | 26 ++++----
 tools/shared/qtpropertybrowser/qtpropertybrowser.h | 26 ++++----
 .../qtpropertybrowser/qtpropertybrowserutils.cpp   | 26 ++++----
 .../qtpropertybrowser/qtpropertybrowserutils_p.h   | 26 ++++----
 .../shared/qtpropertybrowser/qtpropertymanager.cpp | 26 ++++----
 tools/shared/qtpropertybrowser/qtpropertymanager.h | 26 ++++----
 .../qtpropertybrowser/qttreepropertybrowser.cpp    | 26 ++++----
 .../qtpropertybrowser/qttreepropertybrowser.h      | 26 ++++----
 .../shared/qtpropertybrowser/qtvariantproperty.cpp | 26 ++++----
 tools/shared/qtpropertybrowser/qtvariantproperty.h | 26 ++++----
 tools/shared/qttoolbardialog/qttoolbardialog.cpp   | 26 ++++----
 tools/shared/qttoolbardialog/qttoolbardialog.h     | 26 ++++----
 tools/shared/symbian/epocroot.cpp                  | 26 ++++----
 tools/shared/symbian/epocroot.h                    | 26 ++++----
 tools/shared/windows/registry.cpp                  | 26 ++++----
 tools/shared/windows/registry.h                    | 26 ++++----
 tools/xmlpatterns/main.cpp                         | 26 ++++----
 tools/xmlpatterns/main.h                           | 26 ++++----
 tools/xmlpatterns/qapplicationargument.cpp         | 26 ++++----
 tools/xmlpatterns/qapplicationargument_p.h         | 26 ++++----
 tools/xmlpatterns/qapplicationargumentparser.cpp   | 26 ++++----
 tools/xmlpatterns/qapplicationargumentparser_p.h   | 26 ++++----
 tools/xmlpatternsvalidator/main.cpp                | 26 ++++----
 tools/xmlpatternsvalidator/main.h                  | 26 ++++----
 translations/check-ts.pl                           | 26 ++++----
 util/fixnonlatin1/main.cpp                         | 26 ++++----
 util/gencmap/gencmap.cpp                           | 26 ++++----
 util/lexgen/configfile.cpp                         | 26 ++++----
 util/lexgen/configfile.h                           | 26 ++++----
 util/lexgen/generator.cpp                          | 26 ++++----
 util/lexgen/generator.h                            | 26 ++++----
 util/lexgen/global.h                               | 26 ++++----
 util/lexgen/main.cpp                               | 26 ++++----
 util/lexgen/nfa.cpp                                | 26 ++++----
 util/lexgen/nfa.h                                  | 26 ++++----
 util/lexgen/re2nfa.cpp                             | 26 ++++----
 util/lexgen/re2nfa.h                               | 26 ++++----
 util/lexgen/tests/tst_lexgen.cpp                   | 26 ++++----
 util/lexgen/tokenizer.cpp                          | 26 ++++----
 util/local_database/cldr2qlocalexml.py             | 26 ++++----
 util/local_database/dateconverter.py               | 26 ++++----
 util/local_database/enumdata.py                    | 26 ++++----
 util/local_database/qlocalexml2cpp.py              | 26 ++++----
 util/local_database/testlocales/localemodel.cpp    | 26 ++++----
 util/local_database/testlocales/localemodel.h      | 26 ++++----
 util/local_database/testlocales/localewidget.cpp   | 26 ++++----
 util/local_database/testlocales/localewidget.h     | 26 ++++----
 util/local_database/testlocales/main.cpp           | 26 ++++----
 util/local_database/xpathlite.py                   | 26 ++++----
 util/normalize/main.cpp                            | 26 ++++----
 util/plugintest/main.cpp                           | 26 ++++----
 util/qlalr/compress.cpp                            | 26 ++++----
 util/qlalr/compress.h                              | 26 ++++----
 util/qlalr/cppgenerator.cpp                        | 52 +++++++--------
 util/qlalr/cppgenerator.h                          | 26 ++++----
 util/qlalr/dotgraph.cpp                            | 26 ++++----
 util/qlalr/dotgraph.h                              | 26 ++++----
 util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp  | 26 ++++----
 util/qlalr/examples/dummy-xml/xml.g                | 26 ++++----
 util/qlalr/examples/glsl/build.sh                  | 26 ++++----
 util/qlalr/examples/glsl/glsl-lex.l                | 26 ++++----
 util/qlalr/examples/glsl/glsl.g                    | 26 ++++----
 util/qlalr/examples/lambda/lambda.g                | 26 ++++----
 util/qlalr/examples/lambda/main.cpp                | 26 ++++----
 util/qlalr/examples/qparser/calc.g                 | 26 ++++----
 util/qlalr/examples/qparser/calc.l                 | 26 ++++----
 util/qlalr/examples/qparser/qparser.cpp            | 26 ++++----
 util/qlalr/examples/qparser/qparser.h              | 26 ++++----
 util/qlalr/grammar.cpp                             | 26 ++++----
 util/qlalr/grammar_p.h                             | 26 ++++----
 util/qlalr/lalr.cpp                                | 26 ++++----
 util/qlalr/lalr.g                                  | 78 +++++++++++-----------
 util/qlalr/lalr.h                                  | 26 ++++----
 util/qlalr/main.cpp                                | 26 ++++----
 util/qlalr/parsetable.cpp                          | 26 ++++----
 util/qlalr/parsetable.h                            | 26 ++++----
 util/qlalr/recognizer.cpp                          | 26 ++++----
 util/qlalr/recognizer.h                            | 26 ++++----
 util/s60pixelmetrics/bld.inf                       | 26 ++++----
 util/s60pixelmetrics/pixel_metrics.cpp             | 26 ++++----
 util/s60pixelmetrics/pixel_metrics.h               | 26 ++++----
 util/s60pixelmetrics/pm_mapper.hrh                 | 26 ++++----
 util/s60pixelmetrics/pm_mapper.mmp                 | 26 ++++----
 util/s60pixelmetrics/pm_mapper.rss                 | 26 ++++----
 util/s60pixelmetrics/pm_mapper_reg.rss             | 26 ++++----
 util/s60pixelmetrics/pm_mapperapp.cpp              | 26 ++++----
 util/s60pixelmetrics/pm_mapperapp.h                | 26 ++++----
 util/s60pixelmetrics/pm_mapperview.cpp             | 26 ++++----
 util/s60pixelmetrics/pm_mapperview.h               | 26 ++++----
 util/s60theme/main.cpp                             | 26 ++++----
 util/s60theme/s60themeconvert.cpp                  | 26 ++++----
 util/s60theme/s60themeconvert.h                    | 26 ++++----
 util/scripts/make_qfeatures_dot_h                  | 52 +++++++--------
 util/unicode/codecs/big5/main.cpp                  | 26 ++++----
 util/unicode/main.cpp                              | 52 +++++++--------
 util/unicode/writingSystems.sh                     | 26 ++++----
 util/xkbdatagen/main.cpp                           | 52 +++++++--------
 7263 files changed, 94604 insertions(+), 94604 deletions(-)

diff --git a/bin/createpackage.bat b/bin/createpackage.bat
index 3960d13..bd54916 100755
--- a/bin/createpackage.bat
+++ b/bin/createpackage.bat
@@ -7,11 +7,11 @@
 :: This file is part of the test suite of the Qt Toolkit.
 ::
 :: $QT_BEGIN_LICENSE:LGPL$
-:: No Commercial Usage
-:: This file contains pre-release code and may not be distributed.
-:: You may use this file in accordance with the terms and conditions
-:: contained in the Technology Preview License Agreement accompanying
-:: this package.
+:: Commercial Usage
+:: Licensees holding valid Qt Commercial licenses may use this file in
+:: accordance with the Qt Commercial License Agreement provided with the
+:: Software or, alternatively, in accordance with the terms contained in
+:: a written agreement between you and Nokia.
 ::
 :: GNU Lesser General Public License Usage
 :: Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 :: rights.  These rights are described in the Nokia 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.
+::
 :: If you have questions regarding the use of this file, please contact
 :: Nokia at qt-info@nokia.com.
-::
-::
-::
-::
-::
-::
-::
-::
 :: $QT_END_LICENSE$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 72c61f6..2babee6 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -8,11 +8,11 @@
 ## This file is part of the S60 port of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index a85f073..76ba24b 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -8,11 +8,11 @@
 ## This file is part of the S60 port of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat
index bbabfee..a17aa25 100755
--- a/bin/setcepaths.bat
+++ b/bin/setcepaths.bat
@@ -7,11 +7,11 @@
 :: This file is part of the tools applications of the Qt Toolkit.
 ::
 :: $QT_BEGIN_LICENSE:LGPL$
-:: No Commercial Usage
-:: This file contains pre-release code and may not be distributed.
-:: You may use this file in accordance with the terms and conditions
-:: contained in the Technology Preview License Agreement accompanying
-:: this package.
+:: Commercial Usage
+:: Licensees holding valid Qt Commercial licenses may use this file in
+:: accordance with the Qt Commercial License Agreement provided with the
+:: Software or, alternatively, in accordance with the terms contained in
+:: a written agreement between you and Nokia.
 ::
 :: GNU Lesser General Public License Usage
 :: Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 :: rights.  These rights are described in the Nokia 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.
+::
 :: If you have questions regarding the use of this file, please contact
 :: Nokia at qt-info@nokia.com.
-::
-::
-::
-::
-::
-::
-::
-::
 :: $QT_END_LICENSE$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/bin/syncqt.bat b/bin/syncqt.bat
index bd89c2c..4648d8f 100755
--- a/bin/syncqt.bat
+++ b/bin/syncqt.bat
@@ -7,11 +7,11 @@
 :: This file is part of the tools applications of the Qt Toolkit.
 ::
 :: $QT_BEGIN_LICENSE:LGPL$
-:: No Commercial Usage
-:: This file contains pre-release code and may not be distributed.
-:: You may use this file in accordance with the terms and conditions
-:: contained in the Technology Preview License Agreement accompanying
-:: this package.
+:: Commercial Usage
+:: Licensees holding valid Qt Commercial licenses may use this file in
+:: accordance with the Qt Commercial License Agreement provided with the
+:: Software or, alternatively, in accordance with the terms contained in
+:: a written agreement between you and Nokia.
 ::
 :: GNU Lesser General Public License Usage
 :: Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 :: rights.  These rights are described in the Nokia 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.
+::
 :: If you have questions regarding the use of this file, please contact
 :: Nokia at qt-info@nokia.com.
-::
-::
-::
-::
-::
-::
-::
-::
 :: $QT_END_LICENSE$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/config.tests/mac/corewlan/corewlantest.mm b/config.tests/mac/corewlan/corewlantest.mm
index ee6f661..ac91937 100644
--- a/config.tests/mac/corewlan/corewlantest.mm
+++ b/config.tests/mac/corewlan/corewlantest.mm
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/mac/crc/main.cpp b/config.tests/mac/crc/main.cpp
index 69270f0..1eb11de 100644
--- a/config.tests/mac/crc/main.cpp
+++ b/config.tests/mac/crc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/mac/xcodeversion.cpp b/config.tests/mac/xcodeversion.cpp
index f41acce..8f0f270 100644
--- a/config.tests/mac/xcodeversion.cpp
+++ b/config.tests/mac/xcodeversion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/qws/ahi/ahi.cpp b/config.tests/qws/ahi/ahi.cpp
index f368722..8092207 100644
--- a/config.tests/qws/ahi/ahi.cpp
+++ b/config.tests/qws/ahi/ahi.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/qws/directfb/directfb.cpp b/config.tests/qws/directfb/directfb.cpp
index afdf563..24f0268 100644
--- a/config.tests/qws/directfb/directfb.cpp
+++ b/config.tests/qws/directfb/directfb.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/qws/sound/sound.cpp b/config.tests/qws/sound/sound.cpp
index d4c132f..1b4a5b7 100644
--- a/config.tests/qws/sound/sound.cpp
+++ b/config.tests/qws/sound/sound.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/qws/svgalib/svgalib.cpp b/config.tests/qws/svgalib/svgalib.cpp
index f678a69..29835b3 100644
--- a/config.tests/qws/svgalib/svgalib.cpp
+++ b/config.tests/qws/svgalib/svgalib.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/symbian/audio/audio.cpp b/config.tests/symbian/audio/audio.cpp
index 4ffc728..f48cf88 100644
--- a/config.tests/symbian/audio/audio.cpp
+++ b/config.tests/symbian/audio/audio.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/symbian/simple/main.cpp b/config.tests/symbian/simple/main.cpp
index 9227c42..cdb6bfe 100644
--- a/config.tests/symbian/simple/main.cpp
+++ b/config.tests/symbian/simple/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/3dnow/3dnow.cpp b/config.tests/unix/3dnow/3dnow.cpp
index 0516fbc..eeaf9e6 100644
--- a/config.tests/unix/3dnow/3dnow.cpp
+++ b/config.tests/unix/3dnow/3dnow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
index 566b625..2dd5268 100644
--- a/config.tests/unix/alsa/alsatest.cpp
+++ b/config.tests/unix/alsa/alsatest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/avx/avx.cpp b/config.tests/unix/avx/avx.cpp
index 65a0eb8..e532389 100644
--- a/config.tests/unix/avx/avx.cpp
+++ b/config.tests/unix/avx/avx.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/clock-gettime/clock-gettime.cpp b/config.tests/unix/clock-gettime/clock-gettime.cpp
index 096f41c..8eb5a3e 100644
--- a/config.tests/unix/clock-gettime/clock-gettime.cpp
+++ b/config.tests/unix/clock-gettime/clock-gettime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.cpp b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
index 03244d1..29e04dd 100644
--- a/config.tests/unix/clock-monotonic/clock-monotonic.cpp
+++ b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/cups/cups.cpp b/config.tests/unix/cups/cups.cpp
index 2f17c1c..805f84e 100644
--- a/config.tests/unix/cups/cups.cpp
+++ b/config.tests/unix/cups/cups.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/db2/db2.cpp b/config.tests/unix/db2/db2.cpp
index c7cf551..1c7d927 100644
--- a/config.tests/unix/db2/db2.cpp
+++ b/config.tests/unix/db2/db2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp
index aca2b20..206d7ce 100644
--- a/config.tests/unix/dbus/dbus.cpp
+++ b/config.tests/unix/dbus/dbus.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/doubleformat/doubleformattest.cpp b/config.tests/unix/doubleformat/doubleformattest.cpp
index 8e83251..c286c7e 100644
--- a/config.tests/unix/doubleformat/doubleformattest.cpp
+++ b/config.tests/unix/doubleformat/doubleformattest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/egl/egl.cpp b/config.tests/unix/egl/egl.cpp
index b03c173..39e81d4 100644
--- a/config.tests/unix/egl/egl.cpp
+++ b/config.tests/unix/egl/egl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/egl4gles1/egl4gles1.cpp b/config.tests/unix/egl4gles1/egl4gles1.cpp
index 0024fb5..7f6d980 100644
--- a/config.tests/unix/egl4gles1/egl4gles1.cpp
+++ b/config.tests/unix/egl4gles1/egl4gles1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/endian/endiantest.cpp b/config.tests/unix/endian/endiantest.cpp
index 907056e..f83c6b5 100644
--- a/config.tests/unix/endian/endiantest.cpp
+++ b/config.tests/unix/endian/endiantest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/floatmath/floatmath.cpp b/config.tests/unix/floatmath/floatmath.cpp
index 3d57636..16673bd 100644
--- a/config.tests/unix/floatmath/floatmath.cpp
+++ b/config.tests/unix/floatmath/floatmath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp
index e0963b2..de27559 100644
--- a/config.tests/unix/freetype/freetype.cpp
+++ b/config.tests/unix/freetype/freetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
index df6ae10..cb562fe 100644
--- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
+++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/getifaddrs/getifaddrs.cpp b/config.tests/unix/getifaddrs/getifaddrs.cpp
index e545e90..bf7e682 100644
--- a/config.tests/unix/getifaddrs/getifaddrs.cpp
+++ b/config.tests/unix/getifaddrs/getifaddrs.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/glib/glib.cpp b/config.tests/unix/glib/glib.cpp
index 084e5b2..b9502af 100644
--- a/config.tests/unix/glib/glib.cpp
+++ b/config.tests/unix/glib/glib.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
index 5569651..ca7929d 100644
--- a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
+++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/gstreamer/gstreamer.cpp b/config.tests/unix/gstreamer/gstreamer.cpp
index 55e4bd6..94c4d9f 100644
--- a/config.tests/unix/gstreamer/gstreamer.cpp
+++ b/config.tests/unix/gstreamer/gstreamer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/ibase/ibase.cpp b/config.tests/unix/ibase/ibase.cpp
index b83428e..544e2ed 100644
--- a/config.tests/unix/ibase/ibase.cpp
+++ b/config.tests/unix/ibase/ibase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/icd/icd.cpp b/config.tests/unix/icd/icd.cpp
index 19c171b..7e75b74 100644
--- a/config.tests/unix/icd/icd.cpp
+++ b/config.tests/unix/icd/icd.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/iconv/iconv.cpp b/config.tests/unix/iconv/iconv.cpp
index e6d79a5..c031089 100644
--- a/config.tests/unix/iconv/iconv.cpp
+++ b/config.tests/unix/iconv/iconv.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/inotify/inotifytest.cpp b/config.tests/unix/inotify/inotifytest.cpp
index 92523fc..3324850 100644
--- a/config.tests/unix/inotify/inotifytest.cpp
+++ b/config.tests/unix/inotify/inotifytest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/iodbc/iodbc.cpp b/config.tests/unix/iodbc/iodbc.cpp
index c50efa6..80bede5 100644
--- a/config.tests/unix/iodbc/iodbc.cpp
+++ b/config.tests/unix/iodbc/iodbc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp
index 4243f2d..5783a85 100644
--- a/config.tests/unix/ipv6/ipv6test.cpp
+++ b/config.tests/unix/ipv6/ipv6test.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.cpp b/config.tests/unix/ipv6ifname/ipv6ifname.cpp
index 4f592b3..65e7b53 100644
--- a/config.tests/unix/ipv6ifname/ipv6ifname.cpp
+++ b/config.tests/unix/ipv6ifname/ipv6ifname.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/iwmmxt/iwmmxt.cpp b/config.tests/unix/iwmmxt/iwmmxt.cpp
index 0066490..8b3e8a8 100644
--- a/config.tests/unix/iwmmxt/iwmmxt.cpp
+++ b/config.tests/unix/iwmmxt/iwmmxt.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/javascriptcore-jit/hwcap_test.cpp b/config.tests/unix/javascriptcore-jit/hwcap_test.cpp
index ca488a6..d44c503 100644
--- a/config.tests/unix/javascriptcore-jit/hwcap_test.cpp
+++ b/config.tests/unix/javascriptcore-jit/hwcap_test.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/libjpeg/libjpeg.cpp b/config.tests/unix/libjpeg/libjpeg.cpp
index b2b77e0..8ea356d 100644
--- a/config.tests/unix/libjpeg/libjpeg.cpp
+++ b/config.tests/unix/libjpeg/libjpeg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp
index e4b6dcd..a375c5f 100644
--- a/config.tests/unix/libmng/libmng.cpp
+++ b/config.tests/unix/libmng/libmng.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/libpng/libpng.cpp b/config.tests/unix/libpng/libpng.cpp
index 174293c..4376a6e 100644
--- a/config.tests/unix/libpng/libpng.cpp
+++ b/config.tests/unix/libpng/libpng.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/libtiff/libtiff.cpp b/config.tests/unix/libtiff/libtiff.cpp
index 115b332..c0b09b6 100644
--- a/config.tests/unix/libtiff/libtiff.cpp
+++ b/config.tests/unix/libtiff/libtiff.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/mmx/mmx.cpp b/config.tests/unix/mmx/mmx.cpp
index d91f184..806fd7e 100644
--- a/config.tests/unix/mmx/mmx.cpp
+++ b/config.tests/unix/mmx/mmx.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/mremap/mremap.cpp b/config.tests/unix/mremap/mremap.cpp
index 28b42f9..773d5ba 100644
--- a/config.tests/unix/mremap/mremap.cpp
+++ b/config.tests/unix/mremap/mremap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/mysql/mysql.cpp b/config.tests/unix/mysql/mysql.cpp
index 8073cdb..8abd1f8 100644
--- a/config.tests/unix/mysql/mysql.cpp
+++ b/config.tests/unix/mysql/mysql.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/neon/neon.cpp b/config.tests/unix/neon/neon.cpp
index 9e4dc20..cce9cb2 100644
--- a/config.tests/unix/neon/neon.cpp
+++ b/config.tests/unix/neon/neon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/nis/nis.cpp b/config.tests/unix/nis/nis.cpp
index fead9fd..792a6d3 100644
--- a/config.tests/unix/nis/nis.cpp
+++ b/config.tests/unix/nis/nis.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/oci/oci.cpp b/config.tests/unix/oci/oci.cpp
index 0e7eb2a..17c538a 100644
--- a/config.tests/unix/oci/oci.cpp
+++ b/config.tests/unix/oci/oci.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp
index 98f3571..2395ed8 100644
--- a/config.tests/unix/odbc/odbc.cpp
+++ b/config.tests/unix/odbc/odbc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/opengles1/opengles1.cpp b/config.tests/unix/opengles1/opengles1.cpp
index 85312a5..e3dcb61 100644
--- a/config.tests/unix/opengles1/opengles1.cpp
+++ b/config.tests/unix/opengles1/opengles1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp
index b75e333..750ee67 100644
--- a/config.tests/unix/opengles2/opengles2.cpp
+++ b/config.tests/unix/opengles2/opengles2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/openssl/openssl.cpp b/config.tests/unix/openssl/openssl.cpp
index 6cff58b..9f88575 100644
--- a/config.tests/unix/openssl/openssl.cpp
+++ b/config.tests/unix/openssl/openssl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/openvg/openvg.cpp b/config.tests/unix/openvg/openvg.cpp
index fe4de70..6be5d05 100644
--- a/config.tests/unix/openvg/openvg.cpp
+++ b/config.tests/unix/openvg/openvg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/psql/psql.cpp b/config.tests/unix/psql/psql.cpp
index 9d1b0d1..826eebf 100644
--- a/config.tests/unix/psql/psql.cpp
+++ b/config.tests/unix/psql/psql.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/ptrsize/ptrsizetest.cpp b/config.tests/unix/ptrsize/ptrsizetest.cpp
index bcd199f..5ac2f61 100644
--- a/config.tests/unix/ptrsize/ptrsizetest.cpp
+++ b/config.tests/unix/ptrsize/ptrsizetest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/pulseaudio/pulseaudio.cpp b/config.tests/unix/pulseaudio/pulseaudio.cpp
index ba5405b..0d64b1b 100644
--- a/config.tests/unix/pulseaudio/pulseaudio.cpp
+++ b/config.tests/unix/pulseaudio/pulseaudio.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/shivavg/shivavg.cpp b/config.tests/unix/shivavg/shivavg.cpp
index eae6608..3c10ca8 100644
--- a/config.tests/unix/shivavg/shivavg.cpp
+++ b/config.tests/unix/shivavg/shivavg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/sqlite/sqlite.cpp b/config.tests/unix/sqlite/sqlite.cpp
index 4890c5f..b6145fd 100644
--- a/config.tests/unix/sqlite/sqlite.cpp
+++ b/config.tests/unix/sqlite/sqlite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/sqlite2/sqlite2.cpp b/config.tests/unix/sqlite2/sqlite2.cpp
index 8fd0e1f..2ec3249 100644
--- a/config.tests/unix/sqlite2/sqlite2.cpp
+++ b/config.tests/unix/sqlite2/sqlite2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/sse/sse.cpp b/config.tests/unix/sse/sse.cpp
index d8683da..f57b755 100644
--- a/config.tests/unix/sse/sse.cpp
+++ b/config.tests/unix/sse/sse.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/sse2/sse2.cpp b/config.tests/unix/sse2/sse2.cpp
index a48e2ce..e465b14 100644
--- a/config.tests/unix/sse2/sse2.cpp
+++ b/config.tests/unix/sse2/sse2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/sse3/sse3.cpp b/config.tests/unix/sse3/sse3.cpp
index b159acf..076d4f9 100644
--- a/config.tests/unix/sse3/sse3.cpp
+++ b/config.tests/unix/sse3/sse3.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/sse4_1/sse4_1.cpp b/config.tests/unix/sse4_1/sse4_1.cpp
index e9bec9e..d7a20ca 100644
--- a/config.tests/unix/sse4_1/sse4_1.cpp
+++ b/config.tests/unix/sse4_1/sse4_1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/sse4_2/sse4_2.cpp b/config.tests/unix/sse4_2/sse4_2.cpp
index 005b2c5..fd374f1 100644
--- a/config.tests/unix/sse4_2/sse4_2.cpp
+++ b/config.tests/unix/sse4_2/sse4_2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/ssse3/ssse3.cpp b/config.tests/unix/ssse3/ssse3.cpp
index 37fd479..e3efa5a 100644
--- a/config.tests/unix/ssse3/ssse3.cpp
+++ b/config.tests/unix/ssse3/ssse3.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/stdint/main.cpp b/config.tests/unix/stdint/main.cpp
index 846e2d2..5e73297 100644
--- a/config.tests/unix/stdint/main.cpp
+++ b/config.tests/unix/stdint/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp
index 382f5cb..191ec76 100644
--- a/config.tests/unix/stl/stltest.cpp
+++ b/config.tests/unix/stl/stltest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/tds/tds.cpp b/config.tests/unix/tds/tds.cpp
index 50a3fb2..db8a41f 100644
--- a/config.tests/unix/tds/tds.cpp
+++ b/config.tests/unix/tds/tds.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/tslib/tslib.cpp b/config.tests/unix/tslib/tslib.cpp
index 4da32fe..a6814fe 100644
--- a/config.tests/unix/tslib/tslib.cpp
+++ b/config.tests/unix/tslib/tslib.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/unix/zlib/zlib.cpp b/config.tests/unix/zlib/zlib.cpp
index 86c2b6b..468b133 100644
--- a/config.tests/unix/zlib/zlib.cpp
+++ b/config.tests/unix/zlib/zlib.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/fontconfig/fontconfig.cpp b/config.tests/x11/fontconfig/fontconfig.cpp
index 85dbc73..24da271 100644
--- a/config.tests/x11/fontconfig/fontconfig.cpp
+++ b/config.tests/x11/fontconfig/fontconfig.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.cpp b/config.tests/x11/glxfbconfig/glxfbconfig.cpp
index 4a4b23a..d586678 100644
--- a/config.tests/x11/glxfbconfig/glxfbconfig.cpp
+++ b/config.tests/x11/glxfbconfig/glxfbconfig.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/mitshm/mitshm.cpp b/config.tests/x11/mitshm/mitshm.cpp
index d78cadd..7da6c9e 100644
--- a/config.tests/x11/mitshm/mitshm.cpp
+++ b/config.tests/x11/mitshm/mitshm.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/notype/notypetest.cpp b/config.tests/x11/notype/notypetest.cpp
index b1e0583..8e23edd 100644
--- a/config.tests/x11/notype/notypetest.cpp
+++ b/config.tests/x11/notype/notypetest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/opengl/opengl.cpp b/config.tests/x11/opengl/opengl.cpp
index 3802365..87cb263 100644
--- a/config.tests/x11/opengl/opengl.cpp
+++ b/config.tests/x11/opengl/opengl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/sm/sm.cpp b/config.tests/x11/sm/sm.cpp
index dec4020..8a6bb7b 100644
--- a/config.tests/x11/sm/sm.cpp
+++ b/config.tests/x11/sm/sm.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xcursor/xcursor.cpp b/config.tests/x11/xcursor/xcursor.cpp
index 9a810bf..8d93207 100644
--- a/config.tests/x11/xcursor/xcursor.cpp
+++ b/config.tests/x11/xcursor/xcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xfixes/xfixes.cpp b/config.tests/x11/xfixes/xfixes.cpp
index 930caa8..d97e9a5 100644
--- a/config.tests/x11/xfixes/xfixes.cpp
+++ b/config.tests/x11/xfixes/xfixes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xinerama/xinerama.cpp b/config.tests/x11/xinerama/xinerama.cpp
index cae7987..1be984c 100644
--- a/config.tests/x11/xinerama/xinerama.cpp
+++ b/config.tests/x11/xinerama/xinerama.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xinput/xinput.cpp b/config.tests/x11/xinput/xinput.cpp
index 9532472..07babb0 100644
--- a/config.tests/x11/xinput/xinput.cpp
+++ b/config.tests/x11/xinput/xinput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xkb/xkb.cpp b/config.tests/x11/xkb/xkb.cpp
index f9f98c4..9c8b066 100644
--- a/config.tests/x11/xkb/xkb.cpp
+++ b/config.tests/x11/xkb/xkb.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xlib/xlib.cpp b/config.tests/x11/xlib/xlib.cpp
index 07a931a..8ec70bb 100644
--- a/config.tests/x11/xlib/xlib.cpp
+++ b/config.tests/x11/xlib/xlib.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xrandr/xrandr.cpp b/config.tests/x11/xrandr/xrandr.cpp
index fa5f869..012a84b 100644
--- a/config.tests/x11/xrandr/xrandr.cpp
+++ b/config.tests/x11/xrandr/xrandr.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xrender/xrender.cpp b/config.tests/x11/xrender/xrender.cpp
index 3f532c1..b905137 100644
--- a/config.tests/x11/xrender/xrender.cpp
+++ b/config.tests/x11/xrender/xrender.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xshape/xshape.cpp b/config.tests/x11/xshape/xshape.cpp
index 08d74cb..5482409 100644
--- a/config.tests/x11/xshape/xshape.cpp
+++ b/config.tests/x11/xshape/xshape.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xsync/xsync.cpp b/config.tests/x11/xsync/xsync.cpp
index 9d3818b..c06ed22 100644
--- a/config.tests/x11/xsync/xsync.cpp
+++ b/config.tests/x11/xsync/xsync.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/config.tests/x11/xvideo/xvideo.cpp b/config.tests/x11/xvideo/xvideo.cpp
index 515dc00..9318566 100644
--- a/config.tests/x11/xvideo/xvideo.cpp
+++ b/config.tests/x11/xvideo/xvideo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the FOO module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/configure b/configure
index da6fb0a..0d9df16 100755
--- a/configure
+++ b/configure
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/demos/affine/main.cpp b/demos/affine/main.cpp
index 85da546..e77b7ce 100644
--- a/demos/affine/main.cpp
+++ b/demos/affine/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/affine/xform.cpp b/demos/affine/xform.cpp
index 0d9422c..9a4c2b7 100644
--- a/demos/affine/xform.cpp
+++ b/demos/affine/xform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/affine/xform.h b/demos/affine/xform.h
index 5966157..d4d02a1 100644
--- a/demos/affine/xform.h
+++ b/demos/affine/xform.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/arthurplugin/plugin.cpp b/demos/arthurplugin/plugin.cpp
index 2096895..f27cf32 100644
--- a/demos/arthurplugin/plugin.cpp
+++ b/demos/arthurplugin/plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/books/bookdelegate.cpp b/demos/books/bookdelegate.cpp
index f44fbe4..1161948 100644
--- a/demos/books/bookdelegate.cpp
+++ b/demos/books/bookdelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/books/bookdelegate.h b/demos/books/bookdelegate.h
index 4e9f462..31165e2 100644
--- a/demos/books/bookdelegate.h
+++ b/demos/books/bookdelegate.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/books/bookwindow.cpp b/demos/books/bookwindow.cpp
index c801283..c285d51 100644
--- a/demos/books/bookwindow.cpp
+++ b/demos/books/bookwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/books/bookwindow.h b/demos/books/bookwindow.h
index a6b3f5f..511eacb 100644
--- a/demos/books/bookwindow.h
+++ b/demos/books/bookwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/books/initdb.h b/demos/books/initdb.h
index aa64959..8304c77 100644
--- a/demos/books/initdb.h
+++ b/demos/books/initdb.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/books/main.cpp b/demos/books/main.cpp
index 7fd0bae..3fe32f4 100644
--- a/demos/books/main.cpp
+++ b/demos/books/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/basic.fsh b/demos/boxes/basic.fsh
index 0ba381d..a8a2d30 100644
--- a/demos/boxes/basic.fsh
+++ b/demos/boxes/basic.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/basic.vsh b/demos/boxes/basic.vsh
index 6ead8ce..746e116 100644
--- a/demos/boxes/basic.vsh
+++ b/demos/boxes/basic.vsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/dotted.fsh b/demos/boxes/dotted.fsh
index eb3497c..eca1ae3 100644
--- a/demos/boxes/dotted.fsh
+++ b/demos/boxes/dotted.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/fresnel.fsh b/demos/boxes/fresnel.fsh
index 38ce69a..70a6bb3 100644
--- a/demos/boxes/fresnel.fsh
+++ b/demos/boxes/fresnel.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/glass.fsh b/demos/boxes/glass.fsh
index 100a94d..b2e589d 100644
--- a/demos/boxes/glass.fsh
+++ b/demos/boxes/glass.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/glbuffers.cpp b/demos/boxes/glbuffers.cpp
index 694d05b..334e2b3 100644
--- a/demos/boxes/glbuffers.cpp
+++ b/demos/boxes/glbuffers.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h
index 67a4ea6..0f2a655 100644
--- a/demos/boxes/glbuffers.h
+++ b/demos/boxes/glbuffers.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/glextensions.cpp b/demos/boxes/glextensions.cpp
index f7feb5e..0b11d89 100644
--- a/demos/boxes/glextensions.cpp
+++ b/demos/boxes/glextensions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h
index afeb90d..de8472b 100644
--- a/demos/boxes/glextensions.h
+++ b/demos/boxes/glextensions.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/gltrianglemesh.h b/demos/boxes/gltrianglemesh.h
index 4c5beba..9ab08ec 100644
--- a/demos/boxes/gltrianglemesh.h
+++ b/demos/boxes/gltrianglemesh.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/granite.fsh b/demos/boxes/granite.fsh
index 5e808f2..9d79f11 100644
--- a/demos/boxes/granite.fsh
+++ b/demos/boxes/granite.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/main.cpp b/demos/boxes/main.cpp
index 6280dc0..af816ae 100644
--- a/demos/boxes/main.cpp
+++ b/demos/boxes/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/marble.fsh b/demos/boxes/marble.fsh
index e5b57e0..bd79201 100644
--- a/demos/boxes/marble.fsh
+++ b/demos/boxes/marble.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp
index 3aaf985..4f375cd 100644
--- a/demos/boxes/qtbox.cpp
+++ b/demos/boxes/qtbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/qtbox.h b/demos/boxes/qtbox.h
index 5bda7d1..83ceca5 100644
--- a/demos/boxes/qtbox.h
+++ b/demos/boxes/qtbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/reflection.fsh b/demos/boxes/reflection.fsh
index f9c1170..14f201d 100644
--- a/demos/boxes/reflection.fsh
+++ b/demos/boxes/reflection.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/refraction.fsh b/demos/boxes/refraction.fsh
index 74700e9..52a0d32 100644
--- a/demos/boxes/refraction.fsh
+++ b/demos/boxes/refraction.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/roundedbox.cpp b/demos/boxes/roundedbox.cpp
index 4a3fd96..23c92e2 100644
--- a/demos/boxes/roundedbox.cpp
+++ b/demos/boxes/roundedbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/roundedbox.h b/demos/boxes/roundedbox.h
index 508df75..63cc1ea 100644
--- a/demos/boxes/roundedbox.h
+++ b/demos/boxes/roundedbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
index 97953f2..c8c2c2f 100644
--- a/demos/boxes/scene.cpp
+++ b/demos/boxes/scene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h
index 79daea9..7046402 100644
--- a/demos/boxes/scene.h
+++ b/demos/boxes/scene.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/trackball.cpp b/demos/boxes/trackball.cpp
index 7bfbf6f..d207b07 100644
--- a/demos/boxes/trackball.cpp
+++ b/demos/boxes/trackball.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/trackball.h b/demos/boxes/trackball.h
index ba233e7..ec80d3a 100644
--- a/demos/boxes/trackball.h
+++ b/demos/boxes/trackball.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/boxes/wood.fsh b/demos/boxes/wood.fsh
index c7bd4fc..d5bf444 100644
--- a/demos/boxes/wood.fsh
+++ b/demos/boxes/wood.fsh
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/autosaver.cpp b/demos/browser/autosaver.cpp
index 380eef8..7391d51 100644
--- a/demos/browser/autosaver.cpp
+++ b/demos/browser/autosaver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/autosaver.h b/demos/browser/autosaver.h
index be7fefa..6d08e21 100644
--- a/demos/browser/autosaver.h
+++ b/demos/browser/autosaver.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/bookmarks.cpp b/demos/browser/bookmarks.cpp
index 48fb148..76f21f5 100644
--- a/demos/browser/bookmarks.cpp
+++ b/demos/browser/bookmarks.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/bookmarks.h b/demos/browser/bookmarks.h
index 167d405..c3ee37a 100644
--- a/demos/browser/bookmarks.h
+++ b/demos/browser/bookmarks.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp
index ed95d32..7fe8eee 100644
--- a/demos/browser/browserapplication.cpp
+++ b/demos/browser/browserapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/browserapplication.h b/demos/browser/browserapplication.h
index 88b4f2b..af9570d 100644
--- a/demos/browser/browserapplication.h
+++ b/demos/browser/browserapplication.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
index 50c2cf8..9c276c7 100644
--- a/demos/browser/browsermainwindow.cpp
+++ b/demos/browser/browsermainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/browsermainwindow.h b/demos/browser/browsermainwindow.h
index 848085f..6bdd649 100644
--- a/demos/browser/browsermainwindow.h
+++ b/demos/browser/browsermainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/chasewidget.cpp b/demos/browser/chasewidget.cpp
index 2e7bc71..cb397e8 100644
--- a/demos/browser/chasewidget.cpp
+++ b/demos/browser/chasewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/chasewidget.h b/demos/browser/chasewidget.h
index 336aacd..9de49ce 100644
--- a/demos/browser/chasewidget.h
+++ b/demos/browser/chasewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/cookiejar.cpp b/demos/browser/cookiejar.cpp
index 835b61b..f088dd2 100644
--- a/demos/browser/cookiejar.cpp
+++ b/demos/browser/cookiejar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/cookiejar.h b/demos/browser/cookiejar.h
index 6a45c9b..1e5a1ee 100644
--- a/demos/browser/cookiejar.h
+++ b/demos/browser/cookiejar.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/downloadmanager.cpp b/demos/browser/downloadmanager.cpp
index ab68209..223e775 100644
--- a/demos/browser/downloadmanager.cpp
+++ b/demos/browser/downloadmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/downloadmanager.h b/demos/browser/downloadmanager.h
index 415269f..aafcb16 100644
--- a/demos/browser/downloadmanager.h
+++ b/demos/browser/downloadmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/edittableview.cpp b/demos/browser/edittableview.cpp
index 675307b..8d408f9 100644
--- a/demos/browser/edittableview.cpp
+++ b/demos/browser/edittableview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/edittableview.h b/demos/browser/edittableview.h
index 18f1379..b925afd 100644
--- a/demos/browser/edittableview.h
+++ b/demos/browser/edittableview.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/edittreeview.cpp b/demos/browser/edittreeview.cpp
index 0ee5e5e..329306e 100644
--- a/demos/browser/edittreeview.cpp
+++ b/demos/browser/edittreeview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/edittreeview.h b/demos/browser/edittreeview.h
index a1a97e0..6865d80 100644
--- a/demos/browser/edittreeview.h
+++ b/demos/browser/edittreeview.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/history.cpp b/demos/browser/history.cpp
index 386d65c..0a8fb0e 100644
--- a/demos/browser/history.cpp
+++ b/demos/browser/history.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/history.h b/demos/browser/history.h
index 9771dda..3f3ce4d 100644
--- a/demos/browser/history.h
+++ b/demos/browser/history.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/main.cpp b/demos/browser/main.cpp
index 036a0cd..899dd15 100644
--- a/demos/browser/main.cpp
+++ b/demos/browser/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/modelmenu.cpp b/demos/browser/modelmenu.cpp
index fe5e750..0785580 100644
--- a/demos/browser/modelmenu.cpp
+++ b/demos/browser/modelmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/modelmenu.h b/demos/browser/modelmenu.h
index ff2dbce..39250e7 100644
--- a/demos/browser/modelmenu.h
+++ b/demos/browser/modelmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp
index 70a9305..4bcc6f5 100644
--- a/demos/browser/networkaccessmanager.cpp
+++ b/demos/browser/networkaccessmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/networkaccessmanager.h b/demos/browser/networkaccessmanager.h
index e213034..915c592 100644
--- a/demos/browser/networkaccessmanager.h
+++ b/demos/browser/networkaccessmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/searchlineedit.cpp b/demos/browser/searchlineedit.cpp
index 239c5e7..aebd922 100644
--- a/demos/browser/searchlineedit.cpp
+++ b/demos/browser/searchlineedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/searchlineedit.h b/demos/browser/searchlineedit.h
index 5eb423e..0146424 100644
--- a/demos/browser/searchlineedit.h
+++ b/demos/browser/searchlineedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp
index fba781b..ffebde6 100644
--- a/demos/browser/settings.cpp
+++ b/demos/browser/settings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/settings.h b/demos/browser/settings.h
index 136d3e2..a7cde25 100644
--- a/demos/browser/settings.h
+++ b/demos/browser/settings.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/squeezelabel.cpp b/demos/browser/squeezelabel.cpp
index abe97f1..f2f01e5 100644
--- a/demos/browser/squeezelabel.cpp
+++ b/demos/browser/squeezelabel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/squeezelabel.h b/demos/browser/squeezelabel.h
index 43c019e..72a4ee4 100644
--- a/demos/browser/squeezelabel.h
+++ b/demos/browser/squeezelabel.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp
index cf1cd56..0b93a3c 100644
--- a/demos/browser/tabwidget.cpp
+++ b/demos/browser/tabwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/tabwidget.h b/demos/browser/tabwidget.h
index ce823ce..7ba0b95 100644
--- a/demos/browser/tabwidget.h
+++ b/demos/browser/tabwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/toolbarsearch.cpp b/demos/browser/toolbarsearch.cpp
index f8540ad..e40da19 100644
--- a/demos/browser/toolbarsearch.cpp
+++ b/demos/browser/toolbarsearch.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/toolbarsearch.h b/demos/browser/toolbarsearch.h
index 00f52f9..4b409a3 100644
--- a/demos/browser/toolbarsearch.h
+++ b/demos/browser/toolbarsearch.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/urllineedit.cpp b/demos/browser/urllineedit.cpp
index 9f68a88..f01b729 100644
--- a/demos/browser/urllineedit.cpp
+++ b/demos/browser/urllineedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/urllineedit.h b/demos/browser/urllineedit.h
index 6cf5872..697bef9 100644
--- a/demos/browser/urllineedit.h
+++ b/demos/browser/urllineedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
index 2cbd2f1..56b3b2a 100644
--- a/demos/browser/webview.cpp
+++ b/demos/browser/webview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/webview.h b/demos/browser/webview.h
index f81d8af..ffaa678 100644
--- a/demos/browser/webview.h
+++ b/demos/browser/webview.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/xbel.cpp b/demos/browser/xbel.cpp
index 9e93cf7..4c53ab0 100644
--- a/demos/browser/xbel.cpp
+++ b/demos/browser/xbel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/browser/xbel.h b/demos/browser/xbel.h
index 607f35b..5088434 100644
--- a/demos/browser/xbel.h
+++ b/demos/browser/xbel.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/chip/chip.cpp b/demos/chip/chip.cpp
index 5478142..9e0b51f 100644
--- a/demos/chip/chip.cpp
+++ b/demos/chip/chip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/chip/chip.h b/demos/chip/chip.h
index a34efe8..66e9706 100644
--- a/demos/chip/chip.h
+++ b/demos/chip/chip.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/chip/main.cpp b/demos/chip/main.cpp
index 2307542..901efb6 100644
--- a/demos/chip/main.cpp
+++ b/demos/chip/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/chip/mainwindow.cpp b/demos/chip/mainwindow.cpp
index db56c59..9ca7e35 100644
--- a/demos/chip/mainwindow.cpp
+++ b/demos/chip/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/chip/mainwindow.h b/demos/chip/mainwindow.h
index 2983d59..f0fe43e 100644
--- a/demos/chip/mainwindow.h
+++ b/demos/chip/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp
index 7af3074..3e719e8 100644
--- a/demos/chip/view.cpp
+++ b/demos/chip/view.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/chip/view.h b/demos/chip/view.h
index 8047b8b..22df5e8 100644
--- a/demos/chip/view.h
+++ b/demos/chip/view.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
index deca5dc..ef81f10 100644
--- a/demos/composition/composition.cpp
+++ b/demos/composition/composition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/composition/composition.h b/demos/composition/composition.h
index f5a9fc3..bd56711 100644
--- a/demos/composition/composition.h
+++ b/demos/composition/composition.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/composition/main.cpp b/demos/composition/main.cpp
index aa8c139..48b0700 100644
--- a/demos/composition/main.cpp
+++ b/demos/composition/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/calculator/Core/Button.qml b/demos/declarative/calculator/Core/Button.qml
index f37de48..dacced9 100644
--- a/demos/declarative/calculator/Core/Button.qml
+++ b/demos/declarative/calculator/Core/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/calculator/Core/Display.qml b/demos/declarative/calculator/Core/Display.qml
index f928d3a..2b72529 100644
--- a/demos/declarative/calculator/Core/Display.qml
+++ b/demos/declarative/calculator/Core/Display.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 3e1c650..a5eb077 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/common/Progress.qml b/demos/declarative/flickr/common/Progress.qml
index b928554..dca52697 100644
--- a/demos/declarative/flickr/common/Progress.qml
+++ b/demos/declarative/flickr/common/Progress.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/common/RssModel.qml b/demos/declarative/flickr/common/RssModel.qml
index 0c1c834..6b2f54b 100644
--- a/demos/declarative/flickr/common/RssModel.qml
+++ b/demos/declarative/flickr/common/RssModel.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/common/ScrollBar.qml b/demos/declarative/flickr/common/ScrollBar.qml
index dfe3cbf..4d9289d 100644
--- a/demos/declarative/flickr/common/ScrollBar.qml
+++ b/demos/declarative/flickr/common/ScrollBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/common/Slider.qml b/demos/declarative/flickr/common/Slider.qml
index edccc7d..404a9d4 100644
--- a/demos/declarative/flickr/common/Slider.qml
+++ b/demos/declarative/flickr/common/Slider.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/flickr-90.qml b/demos/declarative/flickr/flickr-90.qml
index 31b1d91..fa4a6a3 100644
--- a/demos/declarative/flickr/flickr-90.qml
+++ b/demos/declarative/flickr/flickr-90.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 1533c04..cdee991 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index 74a7dbb..23e29a4 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 8f01292..f67d5a9 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 5dd3b4e..9973956 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/mobile/ListDelegate.qml b/demos/declarative/flickr/mobile/ListDelegate.qml
index 0773547..c19aa76 100644
--- a/demos/declarative/flickr/mobile/ListDelegate.qml
+++ b/demos/declarative/flickr/mobile/ListDelegate.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index f283307..d64257f 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/flickr/mobile/ToolBar.qml b/demos/declarative/flickr/mobile/ToolBar.qml
index 55f19d2..16b076d 100644
--- a/demos/declarative/flickr/mobile/ToolBar.qml
+++ b/demos/declarative/flickr/mobile/ToolBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/minehunt/MinehuntCore/Explosion.qml b/demos/declarative/minehunt/MinehuntCore/Explosion.qml
index f04d033..1dfbb46 100644
--- a/demos/declarative/minehunt/MinehuntCore/Explosion.qml
+++ b/demos/declarative/minehunt/MinehuntCore/Explosion.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/minehunt/MinehuntCore/Tile.qml b/demos/declarative/minehunt/MinehuntCore/Tile.qml
index 1853ed9..ed32120 100644
--- a/demos/declarative/minehunt/MinehuntCore/Tile.qml
+++ b/demos/declarative/minehunt/MinehuntCore/Tile.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 2b286ef..e411801 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 9c82f30..dac663d 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/minehunt/minehunt.h b/demos/declarative/minehunt/minehunt.h
index 962cf3d..88a2cf4 100644
--- a/demos/declarative/minehunt/minehunt.h
+++ b/demos/declarative/minehunt/minehunt.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index eb67b06..4ab49cc 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 9001033..2eb1930 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
index 7b28930..1c9df8e 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml b/demos/declarative/photoviewer/PhotoViewerCore/Button.qml
index 29f2bb7..9821919 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml b/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
index 06f8062..4d9f08f 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 5948b5d..e7572a4 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml b/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
index a0756ae..4b95315 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
index 15bb67f..414ef7a 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml b/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
index 9358975..816fbc5 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
index 0f59c64..e84dbf9 100644
--- a/demos/declarative/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/rssnews/content/BusyIndicator.qml b/demos/declarative/rssnews/content/BusyIndicator.qml
index e305cbe..6361231 100644
--- a/demos/declarative/rssnews/content/BusyIndicator.qml
+++ b/demos/declarative/rssnews/content/BusyIndicator.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/rssnews/content/CategoryDelegate.qml b/demos/declarative/rssnews/content/CategoryDelegate.qml
index c4fa8cc..294cc09 100644
--- a/demos/declarative/rssnews/content/CategoryDelegate.qml
+++ b/demos/declarative/rssnews/content/CategoryDelegate.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/rssnews/content/NewsDelegate.qml b/demos/declarative/rssnews/content/NewsDelegate.qml
index cf88f4e..e56751d 100644
--- a/demos/declarative/rssnews/content/NewsDelegate.qml
+++ b/demos/declarative/rssnews/content/NewsDelegate.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/rssnews/content/RssFeeds.qml b/demos/declarative/rssnews/content/RssFeeds.qml
index 37c4b69..376cf4f 100644
--- a/demos/declarative/rssnews/content/RssFeeds.qml
+++ b/demos/declarative/rssnews/content/RssFeeds.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/rssnews/content/ScrollBar.qml b/demos/declarative/rssnews/content/ScrollBar.qml
index f20f0aa..4604afa 100644
--- a/demos/declarative/rssnews/content/ScrollBar.qml
+++ b/demos/declarative/rssnews/content/ScrollBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/rssnews/rssnews.qml b/demos/declarative/rssnews/rssnews.qml
index f6fe188..ada31bd 100644
--- a/demos/declarative/rssnews/rssnews.qml
+++ b/demos/declarative/rssnews/rssnews.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
index afda29c..88024ef 100644
--- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml
+++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml
index 7fb7b65..466c903 100644
--- a/demos/declarative/samegame/SamegameCore/Button.qml
+++ b/demos/declarative/samegame/SamegameCore/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/SamegameCore/Dialog.qml
index e1f3900..dfaa8d3 100644
--- a/demos/declarative/samegame/SamegameCore/Dialog.qml
+++ b/demos/declarative/samegame/SamegameCore/Dialog.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index f66c40e..2e076df 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/snake/content/Button.qml b/demos/declarative/snake/content/Button.qml
index cf4519d..155db2a 100644
--- a/demos/declarative/snake/content/Button.qml
+++ b/demos/declarative/snake/content/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/snake/content/Cookie.qml b/demos/declarative/snake/content/Cookie.qml
index b4af9fe..417517c 100644
--- a/demos/declarative/snake/content/Cookie.qml
+++ b/demos/declarative/snake/content/Cookie.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/snake/content/HighScoreModel.qml b/demos/declarative/snake/content/HighScoreModel.qml
index e3a4704..40148cd 100644
--- a/demos/declarative/snake/content/HighScoreModel.qml
+++ b/demos/declarative/snake/content/HighScoreModel.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml
index 16b6e1e..a6e14ae 100644
--- a/demos/declarative/snake/content/Link.qml
+++ b/demos/declarative/snake/content/Link.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/snake/content/Skull.qml b/demos/declarative/snake/content/Skull.qml
index 1a3ff7e..f37d654 100644
--- a/demos/declarative/snake/content/Skull.qml
+++ b/demos/declarative/snake/content/Skull.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 5b69217..349af44 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/Button.qml b/demos/declarative/twitter/TwitterCore/Button.qml
index a1fc2a2..86db01a 100644
--- a/demos/declarative/twitter/TwitterCore/Button.qml
+++ b/demos/declarative/twitter/TwitterCore/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/FatDelegate.qml b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
index 896abbe..3135ed3 100644
--- a/demos/declarative/twitter/TwitterCore/FatDelegate.qml
+++ b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/Input.qml b/demos/declarative/twitter/TwitterCore/Input.qml
index b15f0d5..5873ed2 100644
--- a/demos/declarative/twitter/TwitterCore/Input.qml
+++ b/demos/declarative/twitter/TwitterCore/Input.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/Loading.qml b/demos/declarative/twitter/TwitterCore/Loading.qml
index afeafa0..04fb118 100644
--- a/demos/declarative/twitter/TwitterCore/Loading.qml
+++ b/demos/declarative/twitter/TwitterCore/Loading.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
index bc8e0de..cf6147f 100644
--- a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/RssModel.qml b/demos/declarative/twitter/TwitterCore/RssModel.qml
index 276df62..04ed34c 100644
--- a/demos/declarative/twitter/TwitterCore/RssModel.qml
+++ b/demos/declarative/twitter/TwitterCore/RssModel.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/SearchView.qml b/demos/declarative/twitter/TwitterCore/SearchView.qml
index effab30..1bf441a 100644
--- a/demos/declarative/twitter/TwitterCore/SearchView.qml
+++ b/demos/declarative/twitter/TwitterCore/SearchView.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/TitleBar.qml b/demos/declarative/twitter/TwitterCore/TitleBar.qml
index 19da491..d0c9146 100644
--- a/demos/declarative/twitter/TwitterCore/TitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/TitleBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/ToolBar.qml b/demos/declarative/twitter/TwitterCore/ToolBar.qml
index 4ef92ff..33a501a 100644
--- a/demos/declarative/twitter/TwitterCore/ToolBar.qml
+++ b/demos/declarative/twitter/TwitterCore/ToolBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/TwitterCore/UserModel.qml b/demos/declarative/twitter/TwitterCore/UserModel.qml
index 013b827..f503543 100644
--- a/demos/declarative/twitter/TwitterCore/UserModel.qml
+++ b/demos/declarative/twitter/TwitterCore/UserModel.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index 4495523..637d02b 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/webbrowser/content/Button.qml b/demos/declarative/webbrowser/content/Button.qml
index 2da1c11..7902ef5 100644
--- a/demos/declarative/webbrowser/content/Button.qml
+++ b/demos/declarative/webbrowser/content/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 6f4e09c..7e8873b 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/webbrowser/content/Header.qml b/demos/declarative/webbrowser/content/Header.qml
index 88e3000..32171b8 100644
--- a/demos/declarative/webbrowser/content/Header.qml
+++ b/demos/declarative/webbrowser/content/Header.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/webbrowser/content/ScrollBar.qml b/demos/declarative/webbrowser/content/ScrollBar.qml
index 19309fa..1bacfa8 100644
--- a/demos/declarative/webbrowser/content/ScrollBar.qml
+++ b/demos/declarative/webbrowser/content/ScrollBar.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/webbrowser/content/UrlInput.qml b/demos/declarative/webbrowser/content/UrlInput.qml
index 0468b64..750aabd 100644
--- a/demos/declarative/webbrowser/content/UrlInput.qml
+++ b/demos/declarative/webbrowser/content/UrlInput.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index a21fa0b..03a8471 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp
index bef075a..64be523 100644
--- a/demos/deform/main.cpp
+++ b/demos/deform/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp
index 636d103..a1a86e4 100644
--- a/demos/deform/pathdeform.cpp
+++ b/demos/deform/pathdeform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/deform/pathdeform.h b/demos/deform/pathdeform.h
index cc6ca1b..13d9a4e 100644
--- a/demos/deform/pathdeform.h
+++ b/demos/deform/pathdeform.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/AddressBar.cpp b/demos/embedded/anomaly/src/AddressBar.cpp
index f83876e..3ed4526 100644
--- a/demos/embedded/anomaly/src/AddressBar.cpp
+++ b/demos/embedded/anomaly/src/AddressBar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/AddressBar.h b/demos/embedded/anomaly/src/AddressBar.h
index 4999e96..1a82ad9 100644
--- a/demos/embedded/anomaly/src/AddressBar.h
+++ b/demos/embedded/anomaly/src/AddressBar.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/BookmarksView.cpp b/demos/embedded/anomaly/src/BookmarksView.cpp
index d6e6035..fe9cc87 100644
--- a/demos/embedded/anomaly/src/BookmarksView.cpp
+++ b/demos/embedded/anomaly/src/BookmarksView.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/BookmarksView.h b/demos/embedded/anomaly/src/BookmarksView.h
index 86cd214..49c327e 100644
--- a/demos/embedded/anomaly/src/BookmarksView.h
+++ b/demos/embedded/anomaly/src/BookmarksView.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/BrowserView.cpp b/demos/embedded/anomaly/src/BrowserView.cpp
index 73d0b70..ba0f5fa 100644
--- a/demos/embedded/anomaly/src/BrowserView.cpp
+++ b/demos/embedded/anomaly/src/BrowserView.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/BrowserView.h b/demos/embedded/anomaly/src/BrowserView.h
index 8981582..108c192 100644
--- a/demos/embedded/anomaly/src/BrowserView.h
+++ b/demos/embedded/anomaly/src/BrowserView.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/BrowserWindow.cpp b/demos/embedded/anomaly/src/BrowserWindow.cpp
index 9d90254..e02c0bb 100644
--- a/demos/embedded/anomaly/src/BrowserWindow.cpp
+++ b/demos/embedded/anomaly/src/BrowserWindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/BrowserWindow.h b/demos/embedded/anomaly/src/BrowserWindow.h
index d70ea7f..b374fd9 100644
--- a/demos/embedded/anomaly/src/BrowserWindow.h
+++ b/demos/embedded/anomaly/src/BrowserWindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/ControlStrip.cpp b/demos/embedded/anomaly/src/ControlStrip.cpp
index c9c81c0..dcf6176 100644
--- a/demos/embedded/anomaly/src/ControlStrip.cpp
+++ b/demos/embedded/anomaly/src/ControlStrip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/ControlStrip.h b/demos/embedded/anomaly/src/ControlStrip.h
index b6003a1..2fd35c3 100644
--- a/demos/embedded/anomaly/src/ControlStrip.h
+++ b/demos/embedded/anomaly/src/ControlStrip.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/HomeView.cpp b/demos/embedded/anomaly/src/HomeView.cpp
index 8052172..a128775 100644
--- a/demos/embedded/anomaly/src/HomeView.cpp
+++ b/demos/embedded/anomaly/src/HomeView.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/HomeView.h b/demos/embedded/anomaly/src/HomeView.h
index 4844dd7..d1b0536 100644
--- a/demos/embedded/anomaly/src/HomeView.h
+++ b/demos/embedded/anomaly/src/HomeView.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/Main.cpp b/demos/embedded/anomaly/src/Main.cpp
index 78bc9b1..547fcc2 100644
--- a/demos/embedded/anomaly/src/Main.cpp
+++ b/demos/embedded/anomaly/src/Main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/TitleBar.cpp b/demos/embedded/anomaly/src/TitleBar.cpp
index da68dcb..e511240 100644
--- a/demos/embedded/anomaly/src/TitleBar.cpp
+++ b/demos/embedded/anomaly/src/TitleBar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/TitleBar.h b/demos/embedded/anomaly/src/TitleBar.h
index b5ec288..bf8d074 100644
--- a/demos/embedded/anomaly/src/TitleBar.h
+++ b/demos/embedded/anomaly/src/TitleBar.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/ZoomStrip.cpp b/demos/embedded/anomaly/src/ZoomStrip.cpp
index 3bf8129..453714a 100644
--- a/demos/embedded/anomaly/src/ZoomStrip.cpp
+++ b/demos/embedded/anomaly/src/ZoomStrip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/ZoomStrip.h b/demos/embedded/anomaly/src/ZoomStrip.h
index baef922..0382a4b 100644
--- a/demos/embedded/anomaly/src/ZoomStrip.h
+++ b/demos/embedded/anomaly/src/ZoomStrip.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/flickcharm.cpp b/demos/embedded/anomaly/src/flickcharm.cpp
index 9ad7c40..dc84250 100644
--- a/demos/embedded/anomaly/src/flickcharm.cpp
+++ b/demos/embedded/anomaly/src/flickcharm.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/flickcharm.h b/demos/embedded/anomaly/src/flickcharm.h
index 1164028..157705b 100644
--- a/demos/embedded/anomaly/src/flickcharm.h
+++ b/demos/embedded/anomaly/src/flickcharm.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/webview.cpp b/demos/embedded/anomaly/src/webview.cpp
index 5cb913b..7cb12b4 100644
--- a/demos/embedded/anomaly/src/webview.cpp
+++ b/demos/embedded/anomaly/src/webview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/anomaly/src/webview.h b/demos/embedded/anomaly/src/webview.h
index ecd9f5a..6950721 100644
--- a/demos/embedded/anomaly/src/webview.h
+++ b/demos/embedded/anomaly/src/webview.h
@@ -7,11 +7,11 @@
 ** This file is part of the demos of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/desktopservices/contenttab.cpp b/demos/embedded/desktopservices/contenttab.cpp
index 8b344ce..350f8cd 100644
--- a/demos/embedded/desktopservices/contenttab.cpp
+++ b/demos/embedded/desktopservices/contenttab.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/desktopservices/contenttab.h b/demos/embedded/desktopservices/contenttab.h
index 72c7f4c..850873b 100644
--- a/demos/embedded/desktopservices/contenttab.h
+++ b/demos/embedded/desktopservices/contenttab.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/desktopservices/desktopwidget.cpp b/demos/embedded/desktopservices/desktopwidget.cpp
index ff3cb09..c9c84e1 100644
--- a/demos/embedded/desktopservices/desktopwidget.cpp
+++ b/demos/embedded/desktopservices/desktopwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/desktopservices/desktopwidget.h b/demos/embedded/desktopservices/desktopwidget.h
index 6781c05..27c647e 100644
--- a/demos/embedded/desktopservices/desktopwidget.h
+++ b/demos/embedded/desktopservices/desktopwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/desktopservices/linktab.cpp b/demos/embedded/desktopservices/linktab.cpp
index 62251bd..1ae5550 100644
--- a/demos/embedded/desktopservices/linktab.cpp
+++ b/demos/embedded/desktopservices/linktab.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/desktopservices/linktab.h b/demos/embedded/desktopservices/linktab.h
index 785432c..7db1946 100644
--- a/demos/embedded/desktopservices/linktab.h
+++ b/demos/embedded/desktopservices/linktab.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/desktopservices/main.cpp b/demos/embedded/desktopservices/main.cpp
index baa33ab..9729dbe 100644
--- a/demos/embedded/desktopservices/main.cpp
+++ b/demos/embedded/desktopservices/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/digiflip/digiflip.cpp b/demos/embedded/digiflip/digiflip.cpp
index 96c3d61..17a1cec 100644
--- a/demos/embedded/digiflip/digiflip.cpp
+++ b/demos/embedded/digiflip/digiflip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
index cebbc12..a885430 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
index e183048..ad47161 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/embeddedsvgviewer/main.cpp b/demos/embedded/embeddedsvgviewer/main.cpp
index e46b667..a39a878 100644
--- a/demos/embedded/embeddedsvgviewer/main.cpp
+++ b/demos/embedded/embeddedsvgviewer/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/flickable/flickable.cpp b/demos/embedded/flickable/flickable.cpp
index fbc6a06..03df4fe 100644
--- a/demos/embedded/flickable/flickable.cpp
+++ b/demos/embedded/flickable/flickable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/flickable/flickable.h b/demos/embedded/flickable/flickable.h
index 0e04620..7ab46ab 100644
--- a/demos/embedded/flickable/flickable.h
+++ b/demos/embedded/flickable/flickable.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/flickable/main.cpp b/demos/embedded/flickable/main.cpp
index d519f80..2f35988 100644
--- a/demos/embedded/flickable/main.cpp
+++ b/demos/embedded/flickable/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/flightinfo/flightinfo.cpp b/demos/embedded/flightinfo/flightinfo.cpp
index 425d6aa..a168452 100644
--- a/demos/embedded/flightinfo/flightinfo.cpp
+++ b/demos/embedded/flightinfo/flightinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/demoapplication.cpp b/demos/embedded/fluidlauncher/demoapplication.cpp
index f628855..b3a1052 100644
--- a/demos/embedded/fluidlauncher/demoapplication.cpp
+++ b/demos/embedded/fluidlauncher/demoapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/demoapplication.h b/demos/embedded/fluidlauncher/demoapplication.h
index 9c619a0..bd2a307 100644
--- a/demos/embedded/fluidlauncher/demoapplication.h
+++ b/demos/embedded/fluidlauncher/demoapplication.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.cpp b/demos/embedded/fluidlauncher/fluidlauncher.cpp
index 19eb8d2..c4883e5 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.cpp
+++ b/demos/embedded/fluidlauncher/fluidlauncher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.h b/demos/embedded/fluidlauncher/fluidlauncher.h
index 9346aa3..1c2858d 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.h
+++ b/demos/embedded/fluidlauncher/fluidlauncher.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/main.cpp b/demos/embedded/fluidlauncher/main.cpp
index 7ff3663..4bb105a 100644
--- a/demos/embedded/fluidlauncher/main.cpp
+++ b/demos/embedded/fluidlauncher/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/slideshow.cpp b/demos/embedded/fluidlauncher/slideshow.cpp
index 0ce5eb6..59f0e3c 100644
--- a/demos/embedded/fluidlauncher/slideshow.cpp
+++ b/demos/embedded/fluidlauncher/slideshow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/slideshow.h b/demos/embedded/fluidlauncher/slideshow.h
index 1393505..0d4f1fa 100644
--- a/demos/embedded/fluidlauncher/slideshow.h
+++ b/demos/embedded/fluidlauncher/slideshow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/lightmaps/lightmaps.cpp b/demos/embedded/lightmaps/lightmaps.cpp
index 2eb1733..1089021 100644
--- a/demos/embedded/lightmaps/lightmaps.cpp
+++ b/demos/embedded/lightmaps/lightmaps.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/qmlcalculator/qmlcalculator.cpp b/demos/embedded/qmlcalculator/qmlcalculator.cpp
index 6c41e61..193149a 100644
--- a/demos/embedded/qmlcalculator/qmlcalculator.cpp
+++ b/demos/embedded/qmlcalculator/qmlcalculator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/qmlclocks/qmlclocks.cpp b/demos/embedded/qmlclocks/qmlclocks.cpp
index a09801b..4d12830 100644
--- a/demos/embedded/qmlclocks/qmlclocks.cpp
+++ b/demos/embedded/qmlclocks/qmlclocks.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/qmldialcontrol/qmldialcontrol.cpp b/demos/embedded/qmldialcontrol/qmldialcontrol.cpp
index 56b21d7..ab007aa 100644
--- a/demos/embedded/qmldialcontrol/qmldialcontrol.cpp
+++ b/demos/embedded/qmldialcontrol/qmldialcontrol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/qmleasing/qmleasing.cpp b/demos/embedded/qmleasing/qmleasing.cpp
index 713fe67..21c4f06 100644
--- a/demos/embedded/qmleasing/qmleasing.cpp
+++ b/demos/embedded/qmleasing/qmleasing.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/qmlflickr/qmlflickr.cpp b/demos/embedded/qmlflickr/qmlflickr.cpp
index c05806c..daa5eac 100644
--- a/demos/embedded/qmlflickr/qmlflickr.cpp
+++ b/demos/embedded/qmlflickr/qmlflickr.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp
index d9cf67c..15cdb25 100644
--- a/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp
+++ b/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/qmltwitter/qmltwitter.cpp b/demos/embedded/qmltwitter/qmltwitter.cpp
index 30c4601..9d05205 100644
--- a/demos/embedded/qmltwitter/qmltwitter.cpp
+++ b/demos/embedded/qmltwitter/qmltwitter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/raycasting/raycasting.cpp b/demos/embedded/raycasting/raycasting.cpp
index 21aa2c3..a671364 100644
--- a/demos/embedded/raycasting/raycasting.cpp
+++ b/demos/embedded/raycasting/raycasting.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp
index e06ee7d..b3b9a54d 100644
--- a/demos/embedded/styledemo/main.cpp
+++ b/demos/embedded/styledemo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/styledemo/stylewidget.cpp b/demos/embedded/styledemo/stylewidget.cpp
index df8c5b0..3d369eb 100644
--- a/demos/embedded/styledemo/stylewidget.cpp
+++ b/demos/embedded/styledemo/stylewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/styledemo/stylewidget.h b/demos/embedded/styledemo/stylewidget.h
index 6415d2f..9a36d18 100644
--- a/demos/embedded/styledemo/stylewidget.h
+++ b/demos/embedded/styledemo/stylewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/weatherinfo/weatherinfo.cpp b/demos/embedded/weatherinfo/weatherinfo.cpp
index 3e0226a..439926e 100644
--- a/demos/embedded/weatherinfo/weatherinfo.cpp
+++ b/demos/embedded/weatherinfo/weatherinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp
index bd56f5a..bea93c4 100644
--- a/demos/embeddeddialogs/customproxy.cpp
+++ b/demos/embeddeddialogs/customproxy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embeddeddialogs/customproxy.h b/demos/embeddeddialogs/customproxy.h
index 3804a8a..70d60dc 100644
--- a/demos/embeddeddialogs/customproxy.h
+++ b/demos/embeddeddialogs/customproxy.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embeddeddialogs/embeddeddialog.cpp b/demos/embeddeddialogs/embeddeddialog.cpp
index be4a57f..331cceb 100644
--- a/demos/embeddeddialogs/embeddeddialog.cpp
+++ b/demos/embeddeddialogs/embeddeddialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embeddeddialogs/embeddeddialog.h b/demos/embeddeddialogs/embeddeddialog.h
index a9baa85..940d066 100644
--- a/demos/embeddeddialogs/embeddeddialog.h
+++ b/demos/embeddeddialogs/embeddeddialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp
index f827769..f3ef791 100644
--- a/demos/embeddeddialogs/main.cpp
+++ b/demos/embeddeddialogs/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/gradients/gradients.cpp b/demos/gradients/gradients.cpp
index 6449ef5..2d0d993 100644
--- a/demos/gradients/gradients.cpp
+++ b/demos/gradients/gradients.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/gradients/gradients.h b/demos/gradients/gradients.h
index f8c4f8b..d335287 100644
--- a/demos/gradients/gradients.h
+++ b/demos/gradients/gradients.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/gradients/main.cpp b/demos/gradients/main.cpp
index 8291e85..67032b5 100644
--- a/demos/gradients/main.cpp
+++ b/demos/gradients/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/interview/main.cpp b/demos/interview/main.cpp
index cc6c952..e669dca 100644
--- a/demos/interview/main.cpp
+++ b/demos/interview/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/interview/model.cpp b/demos/interview/model.cpp
index 840bc60..ad9bdea 100644
--- a/demos/interview/model.cpp
+++ b/demos/interview/model.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/interview/model.h b/demos/interview/model.h
index c7c15f7..6bf4b87 100644
--- a/demos/interview/model.h
+++ b/demos/interview/model.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/macmainwindow/macmainwindow.h b/demos/macmainwindow/macmainwindow.h
index 2f9b5ac..1eef70e 100644
--- a/demos/macmainwindow/macmainwindow.h
+++ b/demos/macmainwindow/macmainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/macmainwindow/macmainwindow.mm b/demos/macmainwindow/macmainwindow.mm
index a429271..137b9b1 100644
--- a/demos/macmainwindow/macmainwindow.mm
+++ b/demos/macmainwindow/macmainwindow.mm
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/macmainwindow/main.cpp b/demos/macmainwindow/main.cpp
index ff1e9a8..1dd55d2 100644
--- a/demos/macmainwindow/main.cpp
+++ b/demos/macmainwindow/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/mainwindow/colorswatch.cpp b/demos/mainwindow/colorswatch.cpp
index aab4f03..b5cc720 100644
--- a/demos/mainwindow/colorswatch.cpp
+++ b/demos/mainwindow/colorswatch.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/mainwindow/colorswatch.h b/demos/mainwindow/colorswatch.h
index 90036a7..08033f2 100644
--- a/demos/mainwindow/colorswatch.h
+++ b/demos/mainwindow/colorswatch.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/mainwindow/main.cpp b/demos/mainwindow/main.cpp
index d5849b2..a63f02a 100644
--- a/demos/mainwindow/main.cpp
+++ b/demos/mainwindow/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/mainwindow/mainwindow.cpp b/demos/mainwindow/mainwindow.cpp
index 350cefa..44fdd67 100644
--- a/demos/mainwindow/mainwindow.cpp
+++ b/demos/mainwindow/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/mainwindow/mainwindow.h b/demos/mainwindow/mainwindow.h
index a900d95..c412474 100644
--- a/demos/mainwindow/mainwindow.h
+++ b/demos/mainwindow/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/mainwindow/toolbar.cpp b/demos/mainwindow/toolbar.cpp
index dd12419..c80b485 100644
--- a/demos/mainwindow/toolbar.cpp
+++ b/demos/mainwindow/toolbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/mainwindow/toolbar.h b/demos/mainwindow/toolbar.h
index b46c33c..e805430 100644
--- a/demos/mainwindow/toolbar.h
+++ b/demos/mainwindow/toolbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp
index 534b233..4718035 100644
--- a/demos/pathstroke/main.cpp
+++ b/demos/pathstroke/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/pathstroke/pathstroke.cpp b/demos/pathstroke/pathstroke.cpp
index 257d02a..1dee94d 100644
--- a/demos/pathstroke/pathstroke.cpp
+++ b/demos/pathstroke/pathstroke.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/pathstroke/pathstroke.h b/demos/pathstroke/pathstroke.h
index fd8b937..fa61118 100644
--- a/demos/pathstroke/pathstroke.h
+++ b/demos/pathstroke/pathstroke.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qmediaplayer/main.cpp b/demos/qmediaplayer/main.cpp
index 02c579b..dceb199 100644
--- a/demos/qmediaplayer/main.cpp
+++ b/demos/qmediaplayer/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ***************************************************************************/
diff --git a/demos/qmediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp
index 3cb0616..acee74c 100644
--- a/demos/qmediaplayer/mediaplayer.cpp
+++ b/demos/qmediaplayer/mediaplayer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ***************************************************************************/
diff --git a/demos/qmediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h
index d6ae58b..60219a3 100644
--- a/demos/qmediaplayer/mediaplayer.h
+++ b/demos/qmediaplayer/mediaplayer.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ***************************************************************************/
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
index 802d77d..122ff7b 100644
--- a/demos/qtdemo/colors.cpp
+++ b/demos/qtdemo/colors.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/colors.h b/demos/qtdemo/colors.h
index 1e0b795..0de3a61 100644
--- a/demos/qtdemo/colors.h
+++ b/demos/qtdemo/colors.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demoitem.cpp b/demos/qtdemo/demoitem.cpp
index 0a5f41b..6b4f4f1 100644
--- a/demos/qtdemo/demoitem.cpp
+++ b/demos/qtdemo/demoitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demoitem.h b/demos/qtdemo/demoitem.h
index d1a445a..b8e6f28 100644
--- a/demos/qtdemo/demoitem.h
+++ b/demos/qtdemo/demoitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demoitemanimation.cpp b/demos/qtdemo/demoitemanimation.cpp
index e5ebd5c..13586af 100644
--- a/demos/qtdemo/demoitemanimation.cpp
+++ b/demos/qtdemo/demoitemanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demoitemanimation.h b/demos/qtdemo/demoitemanimation.h
index 3493960..43383fe 100644
--- a/demos/qtdemo/demoitemanimation.h
+++ b/demos/qtdemo/demoitemanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demoscene.cpp b/demos/qtdemo/demoscene.cpp
index 0befbab..687e725 100644
--- a/demos/qtdemo/demoscene.cpp
+++ b/demos/qtdemo/demoscene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demoscene.h b/demos/qtdemo/demoscene.h
index 77f440b..0f0a4e3 100644
--- a/demos/qtdemo/demoscene.h
+++ b/demos/qtdemo/demoscene.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demotextitem.cpp b/demos/qtdemo/demotextitem.cpp
index 98bdbd0..2fc91f3 100644
--- a/demos/qtdemo/demotextitem.cpp
+++ b/demos/qtdemo/demotextitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/demotextitem.h b/demos/qtdemo/demotextitem.h
index f5c5d41..95e9f34 100644
--- a/demos/qtdemo/demotextitem.h
+++ b/demos/qtdemo/demotextitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/dockitem.cpp b/demos/qtdemo/dockitem.cpp
index 2e486e5..2d03439 100644
--- a/demos/qtdemo/dockitem.cpp
+++ b/demos/qtdemo/dockitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/dockitem.h b/demos/qtdemo/dockitem.h
index c05c675..1401add 100644
--- a/demos/qtdemo/dockitem.h
+++ b/demos/qtdemo/dockitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp
index 65c078d..14b9c6c 100644
--- a/demos/qtdemo/examplecontent.cpp
+++ b/demos/qtdemo/examplecontent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/examplecontent.h b/demos/qtdemo/examplecontent.h
index c98e9ec..a12e4d0 100644
--- a/demos/qtdemo/examplecontent.h
+++ b/demos/qtdemo/examplecontent.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/guide.cpp b/demos/qtdemo/guide.cpp
index 56f2afa..b6352c9 100644
--- a/demos/qtdemo/guide.cpp
+++ b/demos/qtdemo/guide.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/guide.h b/demos/qtdemo/guide.h
index 583be7f..2067aa6 100644
--- a/demos/qtdemo/guide.h
+++ b/demos/qtdemo/guide.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/guidecircle.cpp b/demos/qtdemo/guidecircle.cpp
index 575f475..7327636 100644
--- a/demos/qtdemo/guidecircle.cpp
+++ b/demos/qtdemo/guidecircle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/guidecircle.h b/demos/qtdemo/guidecircle.h
index a0bc194..7a954ad 100644
--- a/demos/qtdemo/guidecircle.h
+++ b/demos/qtdemo/guidecircle.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/guideline.cpp b/demos/qtdemo/guideline.cpp
index 830c62f..06fb0db 100644
--- a/demos/qtdemo/guideline.cpp
+++ b/demos/qtdemo/guideline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/guideline.h b/demos/qtdemo/guideline.h
index ae17475..32ef019 100644
--- a/demos/qtdemo/guideline.h
+++ b/demos/qtdemo/guideline.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/headingitem.cpp b/demos/qtdemo/headingitem.cpp
index 1b9f8c2..c54f524 100644
--- a/demos/qtdemo/headingitem.cpp
+++ b/demos/qtdemo/headingitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/headingitem.h b/demos/qtdemo/headingitem.h
index 4e11562..aa96de1 100644
--- a/demos/qtdemo/headingitem.h
+++ b/demos/qtdemo/headingitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/imageitem.cpp b/demos/qtdemo/imageitem.cpp
index 8d09ffc..336db6e 100644
--- a/demos/qtdemo/imageitem.cpp
+++ b/demos/qtdemo/imageitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/imageitem.h b/demos/qtdemo/imageitem.h
index fc100f8..f5bf1e0 100644
--- a/demos/qtdemo/imageitem.h
+++ b/demos/qtdemo/imageitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/itemcircleanimation.cpp b/demos/qtdemo/itemcircleanimation.cpp
index 50962cf..c5d2b1f 100644
--- a/demos/qtdemo/itemcircleanimation.cpp
+++ b/demos/qtdemo/itemcircleanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/itemcircleanimation.h b/demos/qtdemo/itemcircleanimation.h
index 425d2f5..549ae85 100644
--- a/demos/qtdemo/itemcircleanimation.h
+++ b/demos/qtdemo/itemcircleanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/letteritem.cpp b/demos/qtdemo/letteritem.cpp
index 401593b..aa5656f 100644
--- a/demos/qtdemo/letteritem.cpp
+++ b/demos/qtdemo/letteritem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/letteritem.h b/demos/qtdemo/letteritem.h
index 78db744..e8cc593 100644
--- a/demos/qtdemo/letteritem.h
+++ b/demos/qtdemo/letteritem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/main.cpp b/demos/qtdemo/main.cpp
index a967d84..5c0c98f 100644
--- a/demos/qtdemo/main.cpp
+++ b/demos/qtdemo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 16c5bf3..c146950 100644
--- a/demos/qtdemo/mainwindow.cpp
+++ b/demos/qtdemo/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/mainwindow.h b/demos/qtdemo/mainwindow.h
index b8cfda6..f3e0b66 100644
--- a/demos/qtdemo/mainwindow.h
+++ b/demos/qtdemo/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/menucontent.cpp b/demos/qtdemo/menucontent.cpp
index 13295c2..93e8dc5 100644
--- a/demos/qtdemo/menucontent.cpp
+++ b/demos/qtdemo/menucontent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/menucontent.h b/demos/qtdemo/menucontent.h
index e9ddba1..73c6182 100644
--- a/demos/qtdemo/menucontent.h
+++ b/demos/qtdemo/menucontent.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index ea9146e..ca27f57 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/menumanager.h b/demos/qtdemo/menumanager.h
index 93fb998..40edeb2 100644
--- a/demos/qtdemo/menumanager.h
+++ b/demos/qtdemo/menumanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/qmlShell.qml b/demos/qtdemo/qmlShell.qml
index 2764865..b4e0212 100644
--- a/demos/qtdemo/qmlShell.qml
+++ b/demos/qtdemo/qmlShell.qml
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/scanitem.cpp b/demos/qtdemo/scanitem.cpp
index ef10dc1..2b1bc01 100644
--- a/demos/qtdemo/scanitem.cpp
+++ b/demos/qtdemo/scanitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/scanitem.h b/demos/qtdemo/scanitem.h
index 0bc213b..3ce0f05 100644
--- a/demos/qtdemo/scanitem.h
+++ b/demos/qtdemo/scanitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/score.cpp b/demos/qtdemo/score.cpp
index cd2f3d3..28d54c9 100644
--- a/demos/qtdemo/score.cpp
+++ b/demos/qtdemo/score.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/score.h b/demos/qtdemo/score.h
index 78d4017..470b801 100644
--- a/demos/qtdemo/score.h
+++ b/demos/qtdemo/score.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/textbutton.cpp b/demos/qtdemo/textbutton.cpp
index cf0b225..1680c4f 100644
--- a/demos/qtdemo/textbutton.cpp
+++ b/demos/qtdemo/textbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/qtdemo/textbutton.h b/demos/qtdemo/textbutton.h
index 55b4edc..792622c 100644
--- a/demos/qtdemo/textbutton.h
+++ b/demos/qtdemo/textbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/shared/arthurstyle.cpp b/demos/shared/arthurstyle.cpp
index 4be9079..4b3cc84 100644
--- a/demos/shared/arthurstyle.cpp
+++ b/demos/shared/arthurstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/shared/arthurstyle.h b/demos/shared/arthurstyle.h
index 9f16a0f..1e32e33 100644
--- a/demos/shared/arthurstyle.h
+++ b/demos/shared/arthurstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/shared/arthurwidgets.cpp b/demos/shared/arthurwidgets.cpp
index 4182ff1..b747f5e 100644
--- a/demos/shared/arthurwidgets.cpp
+++ b/demos/shared/arthurwidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/shared/arthurwidgets.h b/demos/shared/arthurwidgets.h
index 034c04c..5432cc0 100644
--- a/demos/shared/arthurwidgets.h
+++ b/demos/shared/arthurwidgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/shared/hoverpoints.cpp b/demos/shared/hoverpoints.cpp
index ae745a2..d951a9a 100644
--- a/demos/shared/hoverpoints.cpp
+++ b/demos/shared/hoverpoints.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/shared/hoverpoints.h b/demos/shared/hoverpoints.h
index f78fd9a..8e5fe5e 100644
--- a/demos/shared/hoverpoints.h
+++ b/demos/shared/hoverpoints.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/main.cpp b/demos/spreadsheet/main.cpp
index a85bbed..7aee124 100644
--- a/demos/spreadsheet/main.cpp
+++ b/demos/spreadsheet/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/printview.cpp b/demos/spreadsheet/printview.cpp
index b8504055..dfb64eb 100644
--- a/demos/spreadsheet/printview.cpp
+++ b/demos/spreadsheet/printview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/printview.h b/demos/spreadsheet/printview.h
index f5f8369..947b5a7 100644
--- a/demos/spreadsheet/printview.h
+++ b/demos/spreadsheet/printview.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp
index f2a1738..443bac4 100644
--- a/demos/spreadsheet/spreadsheet.cpp
+++ b/demos/spreadsheet/spreadsheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/spreadsheet.h b/demos/spreadsheet/spreadsheet.h
index 081ffa0..45aa613 100644
--- a/demos/spreadsheet/spreadsheet.h
+++ b/demos/spreadsheet/spreadsheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/spreadsheetdelegate.cpp b/demos/spreadsheet/spreadsheetdelegate.cpp
index 9b61599..0fcd7dc 100644
--- a/demos/spreadsheet/spreadsheetdelegate.cpp
+++ b/demos/spreadsheet/spreadsheetdelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/spreadsheetdelegate.h b/demos/spreadsheet/spreadsheetdelegate.h
index 1a74c52..d53eb7f 100644
--- a/demos/spreadsheet/spreadsheetdelegate.h
+++ b/demos/spreadsheet/spreadsheetdelegate.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/spreadsheetitem.cpp b/demos/spreadsheet/spreadsheetitem.cpp
index e1f0143..ee85c67 100644
--- a/demos/spreadsheet/spreadsheetitem.cpp
+++ b/demos/spreadsheet/spreadsheetitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/spreadsheet/spreadsheetitem.h b/demos/spreadsheet/spreadsheetitem.h
index b1742bf..15d3140 100644
--- a/demos/spreadsheet/spreadsheetitem.h
+++ b/demos/spreadsheet/spreadsheetitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sqlbrowser/browser.cpp b/demos/sqlbrowser/browser.cpp
index fe699c7..11ddfed 100644
--- a/demos/sqlbrowser/browser.cpp
+++ b/demos/sqlbrowser/browser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sqlbrowser/browser.h b/demos/sqlbrowser/browser.h
index 81aa7f3..0203edc 100644
--- a/demos/sqlbrowser/browser.h
+++ b/demos/sqlbrowser/browser.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sqlbrowser/connectionwidget.cpp b/demos/sqlbrowser/connectionwidget.cpp
index 02d4f92..9a956be 100644
--- a/demos/sqlbrowser/connectionwidget.cpp
+++ b/demos/sqlbrowser/connectionwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sqlbrowser/connectionwidget.h b/demos/sqlbrowser/connectionwidget.h
index a727106..f26e442 100644
--- a/demos/sqlbrowser/connectionwidget.h
+++ b/demos/sqlbrowser/connectionwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sqlbrowser/main.cpp b/demos/sqlbrowser/main.cpp
index c35a397..5041cad 100644
--- a/demos/sqlbrowser/main.cpp
+++ b/demos/sqlbrowser/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.cpp b/demos/sqlbrowser/qsqlconnectiondialog.cpp
index 54dfa02..128b7e7 100644
--- a/demos/sqlbrowser/qsqlconnectiondialog.cpp
+++ b/demos/sqlbrowser/qsqlconnectiondialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.h b/demos/sqlbrowser/qsqlconnectiondialog.h
index 6cec4e5..4298066 100644
--- a/demos/sqlbrowser/qsqlconnectiondialog.h
+++ b/demos/sqlbrowser/qsqlconnectiondialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/animationmanager.cpp b/demos/sub-attaq/animationmanager.cpp
index 3e8094a..1f31ddb 100644
--- a/demos/sub-attaq/animationmanager.cpp
+++ b/demos/sub-attaq/animationmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/animationmanager.h b/demos/sub-attaq/animationmanager.h
index 984ee1f..4f70fd6 100644
--- a/demos/sub-attaq/animationmanager.h
+++ b/demos/sub-attaq/animationmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/boat.cpp b/demos/sub-attaq/boat.cpp
index 1c5c8cd..28ee414 100644
--- a/demos/sub-attaq/boat.cpp
+++ b/demos/sub-attaq/boat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/boat.h b/demos/sub-attaq/boat.h
index 843b985..98162bf 100644
--- a/demos/sub-attaq/boat.h
+++ b/demos/sub-attaq/boat.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/boat_p.h b/demos/sub-attaq/boat_p.h
index 89591e1..2923acb 100644
--- a/demos/sub-attaq/boat_p.h
+++ b/demos/sub-attaq/boat_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/bomb.cpp b/demos/sub-attaq/bomb.cpp
index 936aef3..9a21147 100644
--- a/demos/sub-attaq/bomb.cpp
+++ b/demos/sub-attaq/bomb.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/bomb.h b/demos/sub-attaq/bomb.h
index 117d81b..2e6fd90 100644
--- a/demos/sub-attaq/bomb.h
+++ b/demos/sub-attaq/bomb.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/graphicsscene.cpp b/demos/sub-attaq/graphicsscene.cpp
index dd55c1d..244e829 100644
--- a/demos/sub-attaq/graphicsscene.cpp
+++ b/demos/sub-attaq/graphicsscene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/graphicsscene.h b/demos/sub-attaq/graphicsscene.h
index 8330f7e..1b7c81f 100644
--- a/demos/sub-attaq/graphicsscene.h
+++ b/demos/sub-attaq/graphicsscene.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/main.cpp b/demos/sub-attaq/main.cpp
index 2db8538..56392a7 100644
--- a/demos/sub-attaq/main.cpp
+++ b/demos/sub-attaq/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/mainwindow.cpp b/demos/sub-attaq/mainwindow.cpp
index 25e1f61..18c053b 100644
--- a/demos/sub-attaq/mainwindow.cpp
+++ b/demos/sub-attaq/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/mainwindow.h b/demos/sub-attaq/mainwindow.h
index 630f41a..f41aadc 100644
--- a/demos/sub-attaq/mainwindow.h
+++ b/demos/sub-attaq/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/pixmapitem.cpp b/demos/sub-attaq/pixmapitem.cpp
index 4b7a383..31384f3 100644
--- a/demos/sub-attaq/pixmapitem.cpp
+++ b/demos/sub-attaq/pixmapitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/pixmapitem.h b/demos/sub-attaq/pixmapitem.h
index 2a89ffb..153b86f 100644
--- a/demos/sub-attaq/pixmapitem.h
+++ b/demos/sub-attaq/pixmapitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/progressitem.cpp b/demos/sub-attaq/progressitem.cpp
index c07c41b..554a13c 100644
--- a/demos/sub-attaq/progressitem.cpp
+++ b/demos/sub-attaq/progressitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/progressitem.h b/demos/sub-attaq/progressitem.h
index c7a915b..fce03b0 100644
--- a/demos/sub-attaq/progressitem.h
+++ b/demos/sub-attaq/progressitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/qanimationstate.cpp b/demos/sub-attaq/qanimationstate.cpp
index 047b0ad..2cde432 100644
--- a/demos/sub-attaq/qanimationstate.cpp
+++ b/demos/sub-attaq/qanimationstate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/qanimationstate.h b/demos/sub-attaq/qanimationstate.h
index 104ae7e..499a732 100644
--- a/demos/sub-attaq/qanimationstate.h
+++ b/demos/sub-attaq/qanimationstate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/states.cpp b/demos/sub-attaq/states.cpp
index f9321eb..202a19c 100644
--- a/demos/sub-attaq/states.cpp
+++ b/demos/sub-attaq/states.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/states.h b/demos/sub-attaq/states.h
index 2c6fa90..57c9e68 100644
--- a/demos/sub-attaq/states.h
+++ b/demos/sub-attaq/states.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/submarine.cpp b/demos/sub-attaq/submarine.cpp
index f450550..1fc368d 100644
--- a/demos/sub-attaq/submarine.cpp
+++ b/demos/sub-attaq/submarine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/submarine.h b/demos/sub-attaq/submarine.h
index 3e8dccd..49175e0 100644
--- a/demos/sub-attaq/submarine.h
+++ b/demos/sub-attaq/submarine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/submarine_p.h b/demos/sub-attaq/submarine_p.h
index 03fa16c..6cc9e6d 100644
--- a/demos/sub-attaq/submarine_p.h
+++ b/demos/sub-attaq/submarine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/textinformationitem.cpp b/demos/sub-attaq/textinformationitem.cpp
index d8d9668..ef496e5 100644
--- a/demos/sub-attaq/textinformationitem.cpp
+++ b/demos/sub-attaq/textinformationitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/textinformationitem.h b/demos/sub-attaq/textinformationitem.h
index b179483..8109eb1 100644
--- a/demos/sub-attaq/textinformationitem.h
+++ b/demos/sub-attaq/textinformationitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/torpedo.cpp b/demos/sub-attaq/torpedo.cpp
index ff25a11..6a824b7 100644
--- a/demos/sub-attaq/torpedo.cpp
+++ b/demos/sub-attaq/torpedo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/sub-attaq/torpedo.h b/demos/sub-attaq/torpedo.h
index 06d3ad1..a7bf139 100644
--- a/demos/sub-attaq/torpedo.h
+++ b/demos/sub-attaq/torpedo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/textedit/main.cpp b/demos/textedit/main.cpp
index 74ff1f8..816d44c 100644
--- a/demos/textedit/main.cpp
+++ b/demos/textedit/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
index e1f24a1..a3f825e 100644
--- a/demos/textedit/textedit.cpp
+++ b/demos/textedit/textedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/textedit/textedit.h b/demos/textedit/textedit.h
index 1e85424..23ebc01 100644
--- a/demos/textedit/textedit.h
+++ b/demos/textedit/textedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/undo/commands.cpp b/demos/undo/commands.cpp
index 259f950..e3b037a 100644
--- a/demos/undo/commands.cpp
+++ b/demos/undo/commands.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/undo/commands.h b/demos/undo/commands.h
index c26ecb9..8374596 100644
--- a/demos/undo/commands.h
+++ b/demos/undo/commands.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/undo/document.cpp b/demos/undo/document.cpp
index d914bf9..88b54ae 100644
--- a/demos/undo/document.cpp
+++ b/demos/undo/document.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/undo/document.h b/demos/undo/document.h
index 8fae92e..c2142b3 100644
--- a/demos/undo/document.h
+++ b/demos/undo/document.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/undo/main.cpp b/demos/undo/main.cpp
index f0d0f3c..53b0f04 100644
--- a/demos/undo/main.cpp
+++ b/demos/undo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/undo/mainwindow.cpp b/demos/undo/mainwindow.cpp
index cae4291..a4c4d00 100644
--- a/demos/undo/mainwindow.cpp
+++ b/demos/undo/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/undo/mainwindow.h b/demos/undo/mainwindow.h
index 0752eee..36e4577 100644
--- a/demos/undo/mainwindow.h
+++ b/demos/undo/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the demonstration applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/classes/qpatternistdummy.cpp b/doc/src/classes/qpatternistdummy.cpp
index cc287d9..d3643d5 100644
--- a/doc/src/classes/qpatternistdummy.cpp
+++ b/doc/src/classes/qpatternistdummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/diagrams/contentspropagation/customwidget.py b/doc/src/diagrams/contentspropagation/customwidget.py
index 52a484f..9431672 100755
--- a/doc/src/diagrams/contentspropagation/customwidget.py
+++ b/doc/src/diagrams/contentspropagation/customwidget.py
@@ -8,11 +8,11 @@
 ## This file is part of the documentation of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/doc/src/diagrams/contentspropagation/standardwidgets.py b/doc/src/diagrams/contentspropagation/standardwidgets.py
index 3ceabf5..102309e 100755
--- a/doc/src/diagrams/contentspropagation/standardwidgets.py
+++ b/doc/src/diagrams/contentspropagation/standardwidgets.py
@@ -8,11 +8,11 @@
 ## This file is part of the documentation of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/doc/src/diagrams/programs/easingcurve/main.cpp b/doc/src/diagrams/programs/easingcurve/main.cpp
index 533860f..7884abb 100644
--- a/doc/src/diagrams/programs/easingcurve/main.cpp
+++ b/doc/src/diagrams/programs/easingcurve/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/diagrams/programs/mdiarea.py b/doc/src/diagrams/programs/mdiarea.py
index bc8864e..7067843 100644
--- a/doc/src/diagrams/programs/mdiarea.py
+++ b/doc/src/diagrams/programs/mdiarea.py
@@ -8,11 +8,11 @@
 ## This file is part of the documentation of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/doc/src/diagrams/programs/qpen-dashpattern.py b/doc/src/diagrams/programs/qpen-dashpattern.py
index 1b38d23..7b97fe2 100644
--- a/doc/src/diagrams/programs/qpen-dashpattern.py
+++ b/doc/src/diagrams/programs/qpen-dashpattern.py
@@ -8,11 +8,11 @@
 ## This file is part of the documentation of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/doc/src/diagrams/programs/standard_views.py b/doc/src/diagrams/programs/standard_views.py
index 6236a3f..19c7e1c 100644
--- a/doc/src/diagrams/programs/standard_views.py
+++ b/doc/src/diagrams/programs/standard_views.py
@@ -8,11 +8,11 @@
 ## This file is part of the documentation of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/doc/src/ja_JP/snippets/code/doc_src_examples_hellotr.qdoc b/doc/src/ja_JP/snippets/code/doc_src_examples_hellotr.qdoc
index e05cd12..d36f322 100644
--- a/doc/src/ja_JP/snippets/code/doc_src_examples_hellotr.qdoc
+++ b/doc/src/ja_JP/snippets/code/doc_src_examples_hellotr.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/declarative/loader/KeyReader.qml b/doc/src/snippets/declarative/loader/KeyReader.qml
index e53700c..7dbec0c 100644
--- a/doc/src/snippets/declarative/loader/KeyReader.qml
+++ b/doc/src/snippets/declarative/loader/KeyReader.qml
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/declarative/loader/MyItem.qml b/doc/src/snippets/declarative/loader/MyItem.qml
index 199c64a..3c08a68 100644
--- a/doc/src/snippets/declarative/loader/MyItem.qml
+++ b/doc/src/snippets/declarative/loader/MyItem.qml
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/declarative/loader/connections.qml b/doc/src/snippets/declarative/loader/connections.qml
index 18f4259..857db03 100644
--- a/doc/src/snippets/declarative/loader/connections.qml
+++ b/doc/src/snippets/declarative/loader/connections.qml
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/declarative/loader/focus.qml b/doc/src/snippets/declarative/loader/focus.qml
index 4b3042a..0482736 100644
--- a/doc/src/snippets/declarative/loader/focus.qml
+++ b/doc/src/snippets/declarative/loader/focus.qml
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/declarative/loader/simple.qml b/doc/src/snippets/declarative/loader/simple.qml
index 556ce60..e4963e1 100644
--- a/doc/src/snippets/declarative/loader/simple.qml
+++ b/doc/src/snippets/declarative/loader/simple.qml
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
index 47d3932..08d255c 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/screenorientation/Core/Bubble.qml b/examples/declarative/screenorientation/Core/Bubble.qml
index dea1e19..69f4fa5 100644
--- a/examples/declarative/screenorientation/Core/Bubble.qml
+++ b/examples/declarative/screenorientation/Core/Bubble.qml
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/screenorientation/Core/Button.qml b/examples/declarative/screenorientation/Core/Button.qml
index bc73118..8b4ea1d 100644
--- a/examples/declarative/screenorientation/Core/Button.qml
+++ b/examples/declarative/screenorientation/Core/Button.qml
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/screenorientation/Core/screenorientation.js b/examples/declarative/screenorientation/Core/screenorientation.js
index 68aedd4..be950c9 100644
--- a/examples/declarative/screenorientation/Core/screenorientation.js
+++ b/examples/declarative/screenorientation/Core/screenorientation.js
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/screenorientation/screenorientation.qml b/examples/declarative/screenorientation/screenorientation.qml
index 6c3f929..ca4f184 100644
--- a/examples/declarative/screenorientation/screenorientation.qml
+++ b/examples/declarative/screenorientation/screenorientation.qml
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/text/textselection/textselection.qml b/examples/declarative/text/textselection/textselection.qml
index f343be5..dd93024 100644
--- a/examples/declarative/text/textselection/textselection.qml
+++ b/examples/declarative/text/textselection/textselection.qml
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/ja_JP/linguist/hellotr/main.cpp b/examples/ja_JP/linguist/hellotr/main.cpp
index ad122e9..cec0ce3 100644
--- a/examples/ja_JP/linguist/hellotr/main.cpp
+++ b/examples/ja_JP/linguist/hellotr/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/header.LGPL b/header.LGPL
index 4fbd874..5a53bc9 100644
--- a/header.LGPL
+++ b/header.LGPL
@@ -7,11 +7,11 @@
 ** This file is part of the FOO module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/aix-g++-64/qplatformdefs.h b/mkspecs/aix-g++-64/qplatformdefs.h
index d32f994..dec1a72 100644
--- a/mkspecs/aix-g++-64/qplatformdefs.h
+++ b/mkspecs/aix-g++-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/aix-g++/qplatformdefs.h b/mkspecs/aix-g++/qplatformdefs.h
index d32f994..dec1a72 100644
--- a/mkspecs/aix-g++/qplatformdefs.h
+++ b/mkspecs/aix-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/aix-xlc-64/qplatformdefs.h b/mkspecs/aix-xlc-64/qplatformdefs.h
index d32f994..dec1a72 100644
--- a/mkspecs/aix-xlc-64/qplatformdefs.h
+++ b/mkspecs/aix-xlc-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h
index d32f994..dec1a72 100644
--- a/mkspecs/aix-xlc/qplatformdefs.h
+++ b/mkspecs/aix-xlc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/common/aix/qplatformdefs.h b/mkspecs/common/aix/qplatformdefs.h
index b3abf68..bb4c198 100644
--- a/mkspecs/common/aix/qplatformdefs.h
+++ b/mkspecs/common/aix/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/common/c89/qplatformdefs.h b/mkspecs/common/c89/qplatformdefs.h
index c6a8e14..3cd6df6 100644
--- a/mkspecs/common/c89/qplatformdefs.h
+++ b/mkspecs/common/c89/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h
index 6310257..6258061 100644
--- a/mkspecs/common/posix/qplatformdefs.h
+++ b/mkspecs/common/posix/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/common/symbian/qplatformdefs.h b/mkspecs/common/symbian/qplatformdefs.h
index 2b075ba..898991c 100644
--- a/mkspecs/common/symbian/qplatformdefs.h
+++ b/mkspecs/common/symbian/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/common/wince/qplatformdefs.h b/mkspecs/common/wince/qplatformdefs.h
index ec1d94a..f492520 100644
--- a/mkspecs/common/wince/qplatformdefs.h
+++ b/mkspecs/common/wince/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h
index a6f57d2..161dea0 100644
--- a/mkspecs/cygwin-g++/qplatformdefs.h
+++ b/mkspecs/cygwin-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h
index 7a67339..e237809 100644
--- a/mkspecs/darwin-g++/qplatformdefs.h
+++ b/mkspecs/darwin-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h
index 5afb965..82de238 100644
--- a/mkspecs/freebsd-g++/qplatformdefs.h
+++ b/mkspecs/freebsd-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/freebsd-g++34/qplatformdefs.h b/mkspecs/freebsd-g++34/qplatformdefs.h
index 07f6c15..337aff6 100644
--- a/mkspecs/freebsd-g++34/qplatformdefs.h
+++ b/mkspecs/freebsd-g++34/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/freebsd-g++40/qplatformdefs.h b/mkspecs/freebsd-g++40/qplatformdefs.h
index 07f6c15..337aff6 100644
--- a/mkspecs/freebsd-g++40/qplatformdefs.h
+++ b/mkspecs/freebsd-g++40/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/freebsd-icc/qplatformdefs.h b/mkspecs/freebsd-icc/qplatformdefs.h
index 07f6c15..337aff6 100644
--- a/mkspecs/freebsd-icc/qplatformdefs.h
+++ b/mkspecs/freebsd-icc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h
index c1a9ab8..eeebce9 100644
--- a/mkspecs/hpux-acc-64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h
index c622d80..a6cfb94 100644
--- a/mkspecs/hpux-acc-o64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-o64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h
index c18ad49..c82204a 100644
--- a/mkspecs/hpux-acc/qplatformdefs.h
+++ b/mkspecs/hpux-acc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h
index e9a9e75..da17fa6 100644
--- a/mkspecs/hpux-g++-64/qplatformdefs.h
+++ b/mkspecs/hpux-g++-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h
index 9296ac2..ca7a6e0 100644
--- a/mkspecs/hpux-g++/qplatformdefs.h
+++ b/mkspecs/hpux-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h
index 6aafed2..e806df6 100644
--- a/mkspecs/hpuxi-acc-32/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h
index 6aafed2..e806df6 100644
--- a/mkspecs/hpuxi-acc-64/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hpuxi-g++-64/qplatformdefs.h b/mkspecs/hpuxi-g++-64/qplatformdefs.h
index f6789ee..0d8c154 100644
--- a/mkspecs/hpuxi-g++-64/qplatformdefs.h
+++ b/mkspecs/hpuxi-g++-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/hurd-g++/qplatformdefs.h b/mkspecs/hurd-g++/qplatformdefs.h
index b734a68..f3d4fd2 100644
--- a/mkspecs/hurd-g++/qplatformdefs.h
+++ b/mkspecs/hurd-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h
index c95c2e5..49277b4 100644
--- a/mkspecs/irix-cc-64/qplatformdefs.h
+++ b/mkspecs/irix-cc-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h
index c95c2e5..49277b4 100644
--- a/mkspecs/irix-cc/qplatformdefs.h
+++ b/mkspecs/irix-cc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/irix-g++-64/qplatformdefs.h b/mkspecs/irix-g++-64/qplatformdefs.h
index 2188560..2f60db6 100644
--- a/mkspecs/irix-g++-64/qplatformdefs.h
+++ b/mkspecs/irix-g++-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h
index be7fb69..6da7aea 100644
--- a/mkspecs/irix-g++/qplatformdefs.h
+++ b/mkspecs/irix-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h
index 578e63a..4545b0c 100644
--- a/mkspecs/linux-cxx/qplatformdefs.h
+++ b/mkspecs/linux-cxx/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h
index 578e63a..4545b0c 100644
--- a/mkspecs/linux-ecc-64/qplatformdefs.h
+++ b/mkspecs/linux-ecc-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-g++-32/qplatformdefs.h b/mkspecs/linux-g++-32/qplatformdefs.h
index 7e8d1d4..83ec996 100644
--- a/mkspecs/linux-g++-32/qplatformdefs.h
+++ b/mkspecs/linux-g++-32/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h
index 7e8d1d4..83ec996 100644
--- a/mkspecs/linux-g++-64/qplatformdefs.h
+++ b/mkspecs/linux-g++-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-g++-maemo/qplatformdefs.h b/mkspecs/linux-g++-maemo/qplatformdefs.h
index d7feb9e..73aa0af 100644
--- a/mkspecs/linux-g++-maemo/qplatformdefs.h
+++ b/mkspecs/linux-g++-maemo/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
index 23816b1..fdef6e2 100644
--- a/mkspecs/linux-g++/qplatformdefs.h
+++ b/mkspecs/linux-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-icc-32/qplatformdefs.h b/mkspecs/linux-icc-32/qplatformdefs.h
index 7e8d1d4..83ec996 100644
--- a/mkspecs/linux-icc-32/qplatformdefs.h
+++ b/mkspecs/linux-icc-32/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-icc-64/qplatformdefs.h b/mkspecs/linux-icc-64/qplatformdefs.h
index 7e8d1d4..83ec996 100644
--- a/mkspecs/linux-icc-64/qplatformdefs.h
+++ b/mkspecs/linux-icc-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-icc/qplatformdefs.h b/mkspecs/linux-icc/qplatformdefs.h
index 7e8d1d4..83ec996 100644
--- a/mkspecs/linux-icc/qplatformdefs.h
+++ b/mkspecs/linux-icc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h
index 3a37ab9..ac15d0c 100644
--- a/mkspecs/linux-kcc/qplatformdefs.h
+++ b/mkspecs/linux-kcc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-llvm/qplatformdefs.h b/mkspecs/linux-llvm/qplatformdefs.h
index a38c86c..6aa896b 100644
--- a/mkspecs/linux-llvm/qplatformdefs.h
+++ b/mkspecs/linux-llvm/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-lsb-g++/qplatformdefs.h b/mkspecs/linux-lsb-g++/qplatformdefs.h
index e2a138a..6c61280 100644
--- a/mkspecs/linux-lsb-g++/qplatformdefs.h
+++ b/mkspecs/linux-lsb-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h
index 578e63a..4545b0c 100644
--- a/mkspecs/linux-pgcc/qplatformdefs.h
+++ b/mkspecs/linux-pgcc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h
index cac71d1..6c20e04 100644
--- a/mkspecs/lynxos-g++/qplatformdefs.h
+++ b/mkspecs/lynxos-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-g++/qplatformdefs.h b/mkspecs/macx-g++/qplatformdefs.h
index 99d64ef..4eed212 100644
--- a/mkspecs/macx-g++/qplatformdefs.h
+++ b/mkspecs/macx-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-g++40/qplatformdefs.h b/mkspecs/macx-g++40/qplatformdefs.h
index 99d64ef..4eed212 100644
--- a/mkspecs/macx-g++40/qplatformdefs.h
+++ b/mkspecs/macx-g++40/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-g++42/qplatformdefs.h b/mkspecs/macx-g++42/qplatformdefs.h
index 99d64ef..4eed212 100644
--- a/mkspecs/macx-g++42/qplatformdefs.h
+++ b/mkspecs/macx-g++42/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-icc/qplatformdefs.h b/mkspecs/macx-icc/qplatformdefs.h
index d46381c..155ed49 100644
--- a/mkspecs/macx-icc/qplatformdefs.h
+++ b/mkspecs/macx-icc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-llvm/qplatformdefs.h b/mkspecs/macx-llvm/qplatformdefs.h
index 99d64ef..4eed212 100644
--- a/mkspecs/macx-llvm/qplatformdefs.h
+++ b/mkspecs/macx-llvm/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h
index 66afad2..0d39496 100644
--- a/mkspecs/macx-pbuilder/qplatformdefs.h
+++ b/mkspecs/macx-pbuilder/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-xcode/qplatformdefs.h b/mkspecs/macx-xcode/qplatformdefs.h
index 99d64ef..4eed212 100644
--- a/mkspecs/macx-xcode/qplatformdefs.h
+++ b/mkspecs/macx-xcode/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/macx-xlc/qplatformdefs.h b/mkspecs/macx-xlc/qplatformdefs.h
index b830041..475ef1e 100644
--- a/mkspecs/macx-xlc/qplatformdefs.h
+++ b/mkspecs/macx-xlc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h
index 2ce5b4a..56b22f2 100644
--- a/mkspecs/netbsd-g++/qplatformdefs.h
+++ b/mkspecs/netbsd-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/openbsd-g++/qplatformdefs.h b/mkspecs/openbsd-g++/qplatformdefs.h
index b3a9ad5..8da34f6 100644
--- a/mkspecs/openbsd-g++/qplatformdefs.h
+++ b/mkspecs/openbsd-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
index fbab892..7e57368 100644
--- a/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
+++ b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-arm-g++/qplatformdefs.h b/mkspecs/qws/linux-arm-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-arm-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-arm-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h b/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-armv6-g++/qplatformdefs.h b/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-avr32-g++/qplatformdefs.h b/mkspecs/qws/linux-avr32-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-avr32-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-avr32-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-cellon-g++/qplatformdefs.h b/mkspecs/qws/linux-cellon-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-cellon-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-cellon-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h b/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-dm800-g++/qplatformdefs.h b/mkspecs/qws/linux-dm800-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-dm800-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-dm800-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h b/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
+++ b/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-generic-g++/qplatformdefs.h b/mkspecs/qws/linux-generic-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-generic-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-generic-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h b/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-lsb-g++/qplatformdefs.h b/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-mips-g++/qplatformdefs.h b/mkspecs/qws/linux-mips-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-mips-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-mips-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h b/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-sh-g++/qplatformdefs.h b/mkspecs/qws/linux-sh-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-sh-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-sh-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h b/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-sharp-g++/qplatformdefs.h b/mkspecs/qws/linux-sharp-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-sharp-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-sharp-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-x86-g++/qplatformdefs.h b/mkspecs/qws/linux-x86-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-x86-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-x86-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h b/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h b/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/macx-generic-g++/qplatformdefs.h b/mkspecs/qws/macx-generic-g++/qplatformdefs.h
index 32d842d..971cbf7 100644
--- a/mkspecs/qws/macx-generic-g++/qplatformdefs.h
+++ b/mkspecs/qws/macx-generic-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
index cca07cb..a794a24 100644
--- a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
+++ b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h
index 078cb45..b8ac691 100644
--- a/mkspecs/sco-cc/qplatformdefs.h
+++ b/mkspecs/sco-cc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h
index a09f77d..df1b03c 100644
--- a/mkspecs/sco-g++/qplatformdefs.h
+++ b/mkspecs/sco-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/solaris-cc-64-stlport/qplatformdefs.h b/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
index c3ebd5a..0076c60 100644
--- a/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
+++ b/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h
index d01c48c..eccff30 100644
--- a/mkspecs/solaris-cc-64/qplatformdefs.h
+++ b/mkspecs/solaris-cc-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/solaris-cc-stlport/qplatformdefs.h b/mkspecs/solaris-cc-stlport/qplatformdefs.h
index a1b2a08..a08d3a4 100644
--- a/mkspecs/solaris-cc-stlport/qplatformdefs.h
+++ b/mkspecs/solaris-cc-stlport/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h
index 678d076..a425b6b 100644
--- a/mkspecs/solaris-cc/qplatformdefs.h
+++ b/mkspecs/solaris-cc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h
index bce0d5b..4600d92 100644
--- a/mkspecs/solaris-g++-64/qplatformdefs.h
+++ b/mkspecs/solaris-g++-64/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h
index 5732388..bd2cf61 100644
--- a/mkspecs/solaris-g++/qplatformdefs.h
+++ b/mkspecs/solaris-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/symbian-abld/qplatformdefs.h b/mkspecs/symbian-abld/qplatformdefs.h
index 4cd0d73..2f369bb 100644
--- a/mkspecs/symbian-abld/qplatformdefs.h
+++ b/mkspecs/symbian-abld/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/symbian-sbsv2/qplatformdefs.h b/mkspecs/symbian-sbsv2/qplatformdefs.h
index 4cd0d73..2f369bb 100644
--- a/mkspecs/symbian-sbsv2/qplatformdefs.h
+++ b/mkspecs/symbian-sbsv2/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/symbian/linux-armcc/qplatformdefs.h b/mkspecs/symbian/linux-armcc/qplatformdefs.h
index 3b7d023..08d8d73 100644
--- a/mkspecs/symbian/linux-armcc/qplatformdefs.h
+++ b/mkspecs/symbian/linux-armcc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the mkspecs of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/symbian/linux-gcce/qplatformdefs.h b/mkspecs/symbian/linux-gcce/qplatformdefs.h
index fcbd9ea..b211fbb 100644
--- a/mkspecs/symbian/linux-gcce/qplatformdefs.h
+++ b/mkspecs/symbian/linux-gcce/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the mkspecs of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h
index ed07d5b..d6eebcb 100644
--- a/mkspecs/tru64-cxx/qplatformdefs.h
+++ b/mkspecs/tru64-cxx/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h
index ed07d5b..d6eebcb 100644
--- a/mkspecs/tru64-g++/qplatformdefs.h
+++ b/mkspecs/tru64-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unixware-cc/qplatformdefs.h b/mkspecs/unixware-cc/qplatformdefs.h
index 3a26042..9acbb10 100644
--- a/mkspecs/unixware-cc/qplatformdefs.h
+++ b/mkspecs/unixware-cc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unixware-g++/qplatformdefs.h b/mkspecs/unixware-g++/qplatformdefs.h
index 3a26042..9acbb10 100644
--- a/mkspecs/unixware-g++/qplatformdefs.h
+++ b/mkspecs/unixware-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/linux-host-g++/qplatformdefs.h b/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h b/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
index b0551e5..12650bb 100644
--- a/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/qnx-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-g++/qplatformdefs.h
index b5bcee8..bb324bd 100644
--- a/mkspecs/unsupported/qnx-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/qnx-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
index 5912a51..51b1475 100644
--- a/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
index 5912a51..51b1475 100644
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
index 5912a51..51b1475 100644
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
index 5912a51..51b1475 100644
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h b/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
index 0cdba67..bc3a9e7 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h b/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
index 0cdba67..bc3a9e7 100644
--- a/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h b/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
index 0cdba67..bc3a9e7 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h b/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
index b183684..2276a97 100644
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h b/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
index 309e24a..2233e58 100644
--- a/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
+++ b/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/win32-borland/qplatformdefs.h b/mkspecs/win32-borland/qplatformdefs.h
index d8fa4c2..34937b2 100644
--- a/mkspecs/win32-borland/qplatformdefs.h
+++ b/mkspecs/win32-borland/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h
index 36333b6..73573ad 100644
--- a/mkspecs/win32-g++/qplatformdefs.h
+++ b/mkspecs/win32-g++/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h
index 833846f..a7dd3af 100644
--- a/mkspecs/win32-icc/qplatformdefs.h
+++ b/mkspecs/win32-icc/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/win32-msvc2003/qplatformdefs.h b/mkspecs/win32-msvc2003/qplatformdefs.h
index 05584c9..14888dc 100644
--- a/mkspecs/win32-msvc2003/qplatformdefs.h
+++ b/mkspecs/win32-msvc2003/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/win32-msvc2005/qplatformdefs.h b/mkspecs/win32-msvc2005/qplatformdefs.h
index 33360b7..1f7ca7b 100644
--- a/mkspecs/win32-msvc2005/qplatformdefs.h
+++ b/mkspecs/win32-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/win32-msvc2008/qplatformdefs.h b/mkspecs/win32-msvc2008/qplatformdefs.h
index 68f9ee0..db687ad 100644
--- a/mkspecs/win32-msvc2008/qplatformdefs.h
+++ b/mkspecs/win32-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/win32-msvc2010/qplatformdefs.h b/mkspecs/win32-msvc2010/qplatformdefs.h
index 68f9ee0..db687ad 100644
--- a/mkspecs/win32-msvc2010/qplatformdefs.h
+++ b/mkspecs/win32-msvc2010/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h
+++ b/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h
+++ b/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h
+++ b/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h
+++ b/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
+++ b/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h b/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h b/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h b/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
+++ b/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h b/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h
+++ b/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h b/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h
+++ b/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h b/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h
+++ b/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h b/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h
+++ b/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h b/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h
+++ b/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h b/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
+++ b/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h b/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
+++ b/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h b/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h
+++ b/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h b/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
index ef9f2cb..8c4c9d6 100644
--- a/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
+++ b/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h
index 63bd224..f67b6bc 100644
--- a/qmake/cachekeys.h
+++ b/qmake/cachekeys.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index aa55f51..18298b0 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h
index 4d3a7d2..3eb1138 100644
--- a/qmake/generators/mac/pbuilder_pbx.h
+++ b/qmake/generators/mac/pbuilder_pbx.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 3cb1942..3543296 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 4c3be3d..ac377f2 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp
index 21e1273..1746c90 100644
--- a/qmake/generators/makefiledeps.cpp
+++ b/qmake/generators/makefiledeps.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h
index 15a96a2..12beb40 100644
--- a/qmake/generators/makefiledeps.h
+++ b/qmake/generators/makefiledeps.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index e98831d..44d8be2 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/metamakefile.h b/qmake/generators/metamakefile.h
index e559c8e..2f8af95 100644
--- a/qmake/generators/metamakefile.h
+++ b/qmake/generators/metamakefile.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index d225635..b448a57 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/projectgenerator.h b/qmake/generators/projectgenerator.h
index cb9bc5a..ad20497 100644
--- a/qmake/generators/projectgenerator.h
+++ b/qmake/generators/projectgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 776a646..2bd80ae 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.h b/qmake/generators/symbian/initprojectdeploy_symbian.h
index 2653d2a..dbd093e 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.h
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symbian_makefile.h b/qmake/generators/symbian/symbian_makefile.h
index 94f0145..e730a00 100644
--- a/qmake/generators/symbian/symbian_makefile.h
+++ b/qmake/generators/symbian/symbian_makefile.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 9af3fe4..f00ab6b 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symbiancommon.h b/qmake/generators/symbian/symbiancommon.h
index dae1e4a..2f561b8 100644
--- a/qmake/generators/symbian/symbiancommon.h
+++ b/qmake/generators/symbian/symbiancommon.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 0b0033a..a87377d 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index a1a8e88..b28f1fc 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 85dcab4..c4914e7 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symmake_abld.h b/qmake/generators/symbian/symmake_abld.h
index 214e0c5..fbb2ab9 100644
--- a/qmake/generators/symbian/symmake_abld.h
+++ b/qmake/generators/symbian/symmake_abld.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 32c31ee..9bb5d59 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/symbian/symmake_sbsv2.h b/qmake/generators/symbian/symmake_sbsv2.h
index 557e3dd..af38bbd 100644
--- a/qmake/generators/symbian/symmake_sbsv2.h
+++ b/qmake/generators/symbian/symmake_sbsv2.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index db5b957..e6b3492 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 0ea3350..a694eab 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index d16cd6b..6d59981 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index b5c33c4..622728c 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h
index f306e17..1de87c7 100644
--- a/qmake/generators/win32/borland_bmake.h
+++ b/qmake/generators/win32/borland_bmake.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 4717542..ffc6085 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index 9f30333..b5a15f1 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 2505056..2339e37 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msbuild_objectmodel.h b/qmake/generators/win32/msbuild_objectmodel.h
index 567985d..9b2a7b3 100644
--- a/qmake/generators/win32/msbuild_objectmodel.h
+++ b/qmake/generators/win32/msbuild_objectmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 92e8aeb..f53fa47 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h
index a751e45..c7dceac 100644
--- a/qmake/generators/win32/msvc_nmake.h
+++ b/qmake/generators/win32/msvc_nmake.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 980e686..b0dd476 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 97f8570..2789632 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 8686ae8..180d7ed 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 8f028a1..98723b9 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp
index 271d9ae..2019a1b 100644
--- a/qmake/generators/win32/msvc_vcxproj.cpp
+++ b/qmake/generators/win32/msvc_vcxproj.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/msvc_vcxproj.h b/qmake/generators/win32/msvc_vcxproj.h
index 8a183e9..3837e2c 100644
--- a/qmake/generators/win32/msvc_vcxproj.h
+++ b/qmake/generators/win32/msvc_vcxproj.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index ecb20c7..cfe5859 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
index 3a2e3a1..7019790 100644
--- a/qmake/generators/win32/winmakefile.h
+++ b/qmake/generators/win32/winmakefile.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/xmloutput.cpp b/qmake/generators/xmloutput.cpp
index 718bdd6..fcde1f1 100644
--- a/qmake/generators/xmloutput.cpp
+++ b/qmake/generators/xmloutput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/generators/xmloutput.h b/qmake/generators/xmloutput.h
index 7c0667c..f88f390 100644
--- a/qmake/generators/xmloutput.h
+++ b/qmake/generators/xmloutput.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 42679a2..90bcab5 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
index 5b36682..eb6c3dd 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/meta.h b/qmake/meta.h
index 313ff9e..48e02de 100644
--- a/qmake/meta.h
+++ b/qmake/meta.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 8db3797..43f4863 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/option.h b/qmake/option.h
index b09ead2..e9d53b0 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/project.cpp b/qmake/project.cpp
index cb02923..13c1746 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/project.h b/qmake/project.h
index 1d9ec04..e46cbf4 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/property.cpp b/qmake/property.cpp
index fde7c65..8bfc353 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/property.h b/qmake/property.h
index 545ea58..69628bd 100644
--- a/qmake/property.h
+++ b/qmake/property.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h
index e5a3aee..67bb900 100644
--- a/qmake/qmake_pch.h
+++ b/qmake/qmake_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/3rdparty/s60/eiksoftkeyimage.h b/src/3rdparty/s60/eiksoftkeyimage.h
index a658421..5a4de74 100644
--- a/src/3rdparty/s60/eiksoftkeyimage.h
+++ b/src/3rdparty/s60/eiksoftkeyimage.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/3rdparty/sha1/sha1.cpp b/src/3rdparty/sha1/sha1.cpp
index 17bfb30..c65cfbb 100644
--- a/src/3rdparty/sha1/sha1.cpp
+++ b/src/3rdparty/sha1/sha1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 641b42b..104ad18 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h
index d3c0d0d..fe40ff1 100644
--- a/src/corelib/animation/qabstractanimation.h
+++ b/src/corelib/animation/qabstractanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h
index d3d4098..73432db 100644
--- a/src/corelib/animation/qabstractanimation_p.h
+++ b/src/corelib/animation/qabstractanimation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp
index 2decda3..1e8cbec 100644
--- a/src/corelib/animation/qanimationgroup.cpp
+++ b/src/corelib/animation/qanimationgroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h
index 70e5616..7e78d95 100644
--- a/src/corelib/animation/qanimationgroup.h
+++ b/src/corelib/animation/qanimationgroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qanimationgroup_p.h b/src/corelib/animation/qanimationgroup_p.h
index 45603b3..9fec363 100644
--- a/src/corelib/animation/qanimationgroup_p.h
+++ b/src/corelib/animation/qanimationgroup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qparallelanimationgroup.cpp b/src/corelib/animation/qparallelanimationgroup.cpp
index 280afed..125dd98 100644
--- a/src/corelib/animation/qparallelanimationgroup.cpp
+++ b/src/corelib/animation/qparallelanimationgroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h
index 4a2e7e8..921ecd5 100644
--- a/src/corelib/animation/qparallelanimationgroup.h
+++ b/src/corelib/animation/qparallelanimationgroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qparallelanimationgroup_p.h b/src/corelib/animation/qparallelanimationgroup_p.h
index cab4fa9..dbf6b88 100644
--- a/src/corelib/animation/qparallelanimationgroup_p.h
+++ b/src/corelib/animation/qparallelanimationgroup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qpauseanimation.cpp b/src/corelib/animation/qpauseanimation.cpp
index d3a3062..02d42f7 100644
--- a/src/corelib/animation/qpauseanimation.cpp
+++ b/src/corelib/animation/qpauseanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h
index 841ec64..696e198 100644
--- a/src/corelib/animation/qpauseanimation.h
+++ b/src/corelib/animation/qpauseanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 37b79ba..1fb1535 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h
index b7ace39..b141b8a 100644
--- a/src/corelib/animation/qpropertyanimation.h
+++ b/src/corelib/animation/qpropertyanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h
index d263354..2609191 100644
--- a/src/corelib/animation/qpropertyanimation_p.h
+++ b/src/corelib/animation/qpropertyanimation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp
index 5ca30e6..12fe5227 100644
--- a/src/corelib/animation/qsequentialanimationgroup.cpp
+++ b/src/corelib/animation/qsequentialanimationgroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h
index 99ddd96..f4c6128 100644
--- a/src/corelib/animation/qsequentialanimationgroup.h
+++ b/src/corelib/animation/qsequentialanimationgroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h
index de69916..d73af61 100644
--- a/src/corelib/animation/qsequentialanimationgroup_p.h
+++ b/src/corelib/animation/qsequentialanimationgroup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 173802d..c07c84e 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h
index cf11aa1..e96319f 100644
--- a/src/corelib/animation/qvariantanimation.h
+++ b/src/corelib/animation/qvariantanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h
index a4567e0..8451381 100644
--- a/src/corelib/animation/qvariantanimation_p.h
+++ b/src/corelib/animation/qvariantanimation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/alpha/qatomic_alpha.s b/src/corelib/arch/alpha/qatomic_alpha.s
index 1e24720..d7ccc30 100644
--- a/src/corelib/arch/alpha/qatomic_alpha.s
+++ b/src/corelib/arch/alpha/qatomic_alpha.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************/
diff --git a/src/corelib/arch/arm/qatomic_arm.cpp b/src/corelib/arch/arm/qatomic_arm.cpp
index 5d09509..7ffcf5a 100644
--- a/src/corelib/arch/arm/qatomic_arm.cpp
+++ b/src/corelib/arch/arm/qatomic_arm.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/armv6/qatomic_generic_armv6.cpp b/src/corelib/arch/armv6/qatomic_generic_armv6.cpp
index 39d966a..4d68cf9 100644
--- a/src/corelib/arch/armv6/qatomic_generic_armv6.cpp
+++ b/src/corelib/arch/armv6/qatomic_generic_armv6.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ** This file implements the generic atomics interface using ARMv6 assembly
diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp
index 56e40ae..99b32b7 100644
--- a/src/corelib/arch/generic/qatomic_generic_unix.cpp
+++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/generic/qatomic_generic_windows.cpp b/src/corelib/arch/generic/qatomic_generic_windows.cpp
index 74d32dc..690581e 100644
--- a/src/corelib/arch/generic/qatomic_generic_windows.cpp
+++ b/src/corelib/arch/generic/qatomic_generic_windows.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/ia64/qatomic_ia64.s b/src/corelib/arch/ia64/qatomic_ia64.s
index c82f5a6..f23221b 100644
--- a/src/corelib/arch/ia64/qatomic_ia64.s
+++ b/src/corelib/arch/ia64/qatomic_ia64.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************/
diff --git a/src/corelib/arch/macosx/qatomic32_ppc.s b/src/corelib/arch/macosx/qatomic32_ppc.s
index 2cfa9bf..651914a 100644
--- a/src/corelib/arch/macosx/qatomic32_ppc.s
+++ b/src/corelib/arch/macosx/qatomic32_ppc.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************/
diff --git a/src/corelib/arch/mips/qatomic_mips32.s b/src/corelib/arch/mips/qatomic_mips32.s
index 4d92baf..31b3cf3 100644
--- a/src/corelib/arch/mips/qatomic_mips32.s
+++ b/src/corelib/arch/mips/qatomic_mips32.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************/
diff --git a/src/corelib/arch/mips/qatomic_mips64.s b/src/corelib/arch/mips/qatomic_mips64.s
index 5a34599..7ac82b8 100644
--- a/src/corelib/arch/mips/qatomic_mips64.s
+++ b/src/corelib/arch/mips/qatomic_mips64.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************/
diff --git a/src/corelib/arch/parisc/q_ldcw.s b/src/corelib/arch/parisc/q_ldcw.s
index 3943044..d2f9c88 100644
--- a/src/corelib/arch/parisc/q_ldcw.s
+++ b/src/corelib/arch/parisc/q_ldcw.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************/
diff --git a/src/corelib/arch/parisc/qatomic_parisc.cpp b/src/corelib/arch/parisc/qatomic_parisc.cpp
index 77fa00d..b74cf46 100644
--- a/src/corelib/arch/parisc/qatomic_parisc.cpp
+++ b/src/corelib/arch/parisc/qatomic_parisc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/powerpc/qatomic32.s b/src/corelib/arch/powerpc/qatomic32.s
index 7ae4484..085fa76 100644
--- a/src/corelib/arch/powerpc/qatomic32.s
+++ b/src/corelib/arch/powerpc/qatomic32.s
@@ -7,11 +7,11 @@
 ## This file is part of the QtGui module of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 ############################################################################
diff --git a/src/corelib/arch/powerpc/qatomic64.s b/src/corelib/arch/powerpc/qatomic64.s
index 24796b5..0b9f248 100644
--- a/src/corelib/arch/powerpc/qatomic64.s
+++ b/src/corelib/arch/powerpc/qatomic64.s
@@ -7,11 +7,11 @@
 ## This file is part of the QtGui module of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 ############################################################################
diff --git a/src/corelib/arch/qatomic_alpha.h b/src/corelib/arch/qatomic_alpha.h
index 6989c25..075f833 100644
--- a/src/corelib/arch/qatomic_alpha.h
+++ b/src/corelib/arch/qatomic_alpha.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h
index 00b288b..344b053 100644
--- a/src/corelib/arch/qatomic_arch.h
+++ b/src/corelib/arch/qatomic_arch.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h
index 9df02a2..a3e5be4 100644
--- a/src/corelib/arch/qatomic_arm.h
+++ b/src/corelib/arch/qatomic_arm.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h
index 38b7069..063aa56 100644
--- a/src/corelib/arch/qatomic_armv6.h
+++ b/src/corelib/arch/qatomic_armv6.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_avr32.h b/src/corelib/arch/qatomic_avr32.h
index 6477c9d..c5951f4 100644
--- a/src/corelib/arch/qatomic_avr32.h
+++ b/src/corelib/arch/qatomic_avr32.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_bfin.h b/src/corelib/arch/qatomic_bfin.h
index 2236bb0..2c0456a 100644
--- a/src/corelib/arch/qatomic_bfin.h
+++ b/src/corelib/arch/qatomic_bfin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/arch/qatomic_bootstrap.h
index 9353f89..4e3fc82 100644
--- a/src/corelib/arch/qatomic_bootstrap.h
+++ b/src/corelib/arch/qatomic_bootstrap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_generic.h b/src/corelib/arch/qatomic_generic.h
index c85b2d7..336d446 100644
--- a/src/corelib/arch/qatomic_generic.h
+++ b/src/corelib/arch/qatomic_generic.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_i386.h b/src/corelib/arch/qatomic_i386.h
index 39831c1..473b178 100644
--- a/src/corelib/arch/qatomic_i386.h
+++ b/src/corelib/arch/qatomic_i386.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h
index 8c824f3..fd71657 100644
--- a/src/corelib/arch/qatomic_ia64.h
+++ b/src/corelib/arch/qatomic_ia64.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_macosx.h b/src/corelib/arch/qatomic_macosx.h
index 6371c49..a9cfe80 100644
--- a/src/corelib/arch/qatomic_macosx.h
+++ b/src/corelib/arch/qatomic_macosx.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h
index 213045b..f934c0d 100644
--- a/src/corelib/arch/qatomic_mips.h
+++ b/src/corelib/arch/qatomic_mips.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_parisc.h b/src/corelib/arch/qatomic_parisc.h
index 803c948..fd1e07e 100644
--- a/src/corelib/arch/qatomic_parisc.h
+++ b/src/corelib/arch/qatomic_parisc.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_powerpc.h b/src/corelib/arch/qatomic_powerpc.h
index 4f4b366..d9e03e9 100644
--- a/src/corelib/arch/qatomic_powerpc.h
+++ b/src/corelib/arch/qatomic_powerpc.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_s390.h b/src/corelib/arch/qatomic_s390.h
index 273c17b..94795f6 100644
--- a/src/corelib/arch/qatomic_s390.h
+++ b/src/corelib/arch/qatomic_s390.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_sh.h b/src/corelib/arch/qatomic_sh.h
index d3c7d70..89c08f3 100644
--- a/src/corelib/arch/qatomic_sh.h
+++ b/src/corelib/arch/qatomic_sh.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_sh4a.h b/src/corelib/arch/qatomic_sh4a.h
index 51f856b..d8a95bc 100644
--- a/src/corelib/arch/qatomic_sh4a.h
+++ b/src/corelib/arch/qatomic_sh4a.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_sparc.h b/src/corelib/arch/qatomic_sparc.h
index c093d6e..e9024bb 100644
--- a/src/corelib/arch/qatomic_sparc.h
+++ b/src/corelib/arch/qatomic_sparc.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_symbian.h b/src/corelib/arch/qatomic_symbian.h
index 893bb300..d22d1e9 100644
--- a/src/corelib/arch/qatomic_symbian.h
+++ b/src/corelib/arch/qatomic_symbian.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h
index e2d4692..05f8009 100644
--- a/src/corelib/arch/qatomic_vxworks.h
+++ b/src/corelib/arch/qatomic_vxworks.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_windows.h b/src/corelib/arch/qatomic_windows.h
index 0f7917a..c56fb40 100644
--- a/src/corelib/arch/qatomic_windows.h
+++ b/src/corelib/arch/qatomic_windows.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_windowsce.h b/src/corelib/arch/qatomic_windowsce.h
index 9181d71..98344b0 100644
--- a/src/corelib/arch/qatomic_windowsce.h
+++ b/src/corelib/arch/qatomic_windowsce.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h
index 986ceea..54ebef7 100644
--- a/src/corelib/arch/qatomic_x86_64.h
+++ b/src/corelib/arch/qatomic_x86_64.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/sh/qatomic_sh.cpp b/src/corelib/arch/sh/qatomic_sh.cpp
index 3da65f1..0ba3741 100644
--- a/src/corelib/arch/sh/qatomic_sh.cpp
+++ b/src/corelib/arch/sh/qatomic_sh.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/sparc/qatomic32.s b/src/corelib/arch/sparc/qatomic32.s
index ef3b1b5..bb36fee 100644
--- a/src/corelib/arch/sparc/qatomic32.s
+++ b/src/corelib/arch/sparc/qatomic32.s
@@ -7,11 +7,11 @@
 !! This file is part of the QtGui module of the Qt Toolkit.
 !!
 !! $QT_BEGIN_LICENSE:LGPL$
-!! No Commercial Usage
-!! This file contains pre-release code and may not be distributed.
-!! You may use this file in accordance with the terms and conditions
-!! contained in the Technology Preview License Agreement accompanying
-!! this package.
+!! Commercial Usage
+!! Licensees holding valid Qt Commercial licenses may use this file in
+!! accordance with the Qt Commercial License Agreement provided with the
+!! Software or, alternatively, in accordance with the terms contained in
+!! a written agreement between you and Nokia.
 !!
 !! GNU Lesser General Public License Usage
 !! Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 !! rights.  These rights are described in the Nokia 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.
+!!
 !! If you have questions regarding the use of this file, please contact
 !! Nokia at qt-info@nokia.com.
-!!
-!!
-!!
-!!
-!!
-!!
-!!
-!!
 !! $QT_END_LICENSE$
 !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/src/corelib/arch/sparc/qatomic64.s b/src/corelib/arch/sparc/qatomic64.s
index 7c883e4..d347d88 100644
--- a/src/corelib/arch/sparc/qatomic64.s
+++ b/src/corelib/arch/sparc/qatomic64.s
@@ -7,11 +7,11 @@
 !! This file is part of the QtGui module of the Qt Toolkit.
 !!
 !! $QT_BEGIN_LICENSE:LGPL$
-!! No Commercial Usage
-!! This file contains pre-release code and may not be distributed.
-!! You may use this file in accordance with the terms and conditions
-!! contained in the Technology Preview License Agreement accompanying
-!! this package.
+!! Commercial Usage
+!! Licensees holding valid Qt Commercial licenses may use this file in
+!! accordance with the Qt Commercial License Agreement provided with the
+!! Software or, alternatively, in accordance with the terms contained in
+!! a written agreement between you and Nokia.
 !!
 !! GNU Lesser General Public License Usage
 !! Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 !! rights.  These rights are described in the Nokia 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.
+!!
 !! If you have questions regarding the use of this file, please contact
 !! Nokia at qt-info@nokia.com.
-!!
-!!
-!!
-!!
-!!
-!!
-!!
-!!
 !! $QT_END_LICENSE$
 !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/src/corelib/arch/sparc/qatomic_sparc.cpp b/src/corelib/arch/sparc/qatomic_sparc.cpp
index a54861e..6f9ad7a 100644
--- a/src/corelib/arch/sparc/qatomic_sparc.cpp
+++ b/src/corelib/arch/sparc/qatomic_sparc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/arch/symbian/qatomic_symbian.cpp b/src/corelib/arch/symbian/qatomic_symbian.cpp
index 568fb7a..e45f5e3 100644
--- a/src/corelib/arch/symbian/qatomic_symbian.cpp
+++ b/src/corelib/arch/symbian/qatomic_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qfontlaocodec.cpp b/src/corelib/codecs/qfontlaocodec.cpp
index 60170bf..2a47113 100644
--- a/src/corelib/codecs/qfontlaocodec.cpp
+++ b/src/corelib/codecs/qfontlaocodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qfontlaocodec_p.h b/src/corelib/codecs/qfontlaocodec_p.h
index 7a792e1..a829d86 100644
--- a/src/corelib/codecs/qfontlaocodec_p.h
+++ b/src/corelib/codecs/qfontlaocodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
index 44a0a01..39742b0 100644
--- a/src/corelib/codecs/qiconvcodec.cpp
+++ b/src/corelib/codecs/qiconvcodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qiconvcodec_p.h b/src/corelib/codecs/qiconvcodec_p.h
index fd7f292..9cb1c1e 100644
--- a/src/corelib/codecs/qiconvcodec_p.h
+++ b/src/corelib/codecs/qiconvcodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qisciicodec.cpp b/src/corelib/codecs/qisciicodec.cpp
index 4e0d56f..1f5576c 100644
--- a/src/corelib/codecs/qisciicodec.cpp
+++ b/src/corelib/codecs/qisciicodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qisciicodec_p.h b/src/corelib/codecs/qisciicodec_p.h
index 4ddaee4..dd03080 100644
--- a/src/corelib/codecs/qisciicodec_p.h
+++ b/src/corelib/codecs/qisciicodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qlatincodec.cpp b/src/corelib/codecs/qlatincodec.cpp
index a7cc180..9246530 100644
--- a/src/corelib/codecs/qlatincodec.cpp
+++ b/src/corelib/codecs/qlatincodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qlatincodec_p.h b/src/corelib/codecs/qlatincodec_p.h
index d298a41..e25edaf 100644
--- a/src/corelib/codecs/qlatincodec_p.h
+++ b/src/corelib/codecs/qlatincodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qsimplecodec.cpp b/src/corelib/codecs/qsimplecodec.cpp
index a6f5c9e..04a01fd 100644
--- a/src/corelib/codecs/qsimplecodec.cpp
+++ b/src/corelib/codecs/qsimplecodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qsimplecodec_p.h b/src/corelib/codecs/qsimplecodec_p.h
index 57503b2..9be073c 100644
--- a/src/corelib/codecs/qsimplecodec_p.h
+++ b/src/corelib/codecs/qsimplecodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index c9fbec8..62c3ffd 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h
index 4ba8b85..7198ff3 100644
--- a/src/corelib/codecs/qtextcodec.h
+++ b/src/corelib/codecs/qtextcodec.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h
index e4662af..52a0d40 100644
--- a/src/corelib/codecs/qtextcodec_p.h
+++ b/src/corelib/codecs/qtextcodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtextcodec_symbian.cpp b/src/corelib/codecs/qtextcodec_symbian.cpp
index 9d7e856..77aa2e8 100644
--- a/src/corelib/codecs/qtextcodec_symbian.cpp
+++ b/src/corelib/codecs/qtextcodec_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp
index 90b64f4..8fe8dd4 100644
--- a/src/corelib/codecs/qtextcodecplugin.cpp
+++ b/src/corelib/codecs/qtextcodecplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h
index d169bde..984efb3 100644
--- a/src/corelib/codecs/qtextcodecplugin.h
+++ b/src/corelib/codecs/qtextcodecplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp
index 247846e..106c3cc 100644
--- a/src/corelib/codecs/qtsciicodec.cpp
+++ b/src/corelib/codecs/qtsciicodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h
index b8edb05..fd1003b 100644
--- a/src/corelib/codecs/qtsciicodec_p.h
+++ b/src/corelib/codecs/qtsciicodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
index f747bf7..91329b6 100644
--- a/src/corelib/codecs/qutfcodec.cpp
+++ b/src/corelib/codecs/qutfcodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h
index 4876625..c4d1ffc 100644
--- a/src/corelib/codecs/qutfcodec_p.h
+++ b/src/corelib/codecs/qutfcodec_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfuture.cpp b/src/corelib/concurrent/qfuture.cpp
index 9f2b1f2..502a0f1 100644
--- a/src/corelib/concurrent/qfuture.cpp
+++ b/src/corelib/concurrent/qfuture.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfuture.h b/src/corelib/concurrent/qfuture.h
index 02ae40a..68ccabd 100644
--- a/src/corelib/concurrent/qfuture.h
+++ b/src/corelib/concurrent/qfuture.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfutureinterface.cpp b/src/corelib/concurrent/qfutureinterface.cpp
index 0458771..a19d940 100644
--- a/src/corelib/concurrent/qfutureinterface.cpp
+++ b/src/corelib/concurrent/qfutureinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfutureinterface.h b/src/corelib/concurrent/qfutureinterface.h
index 8737a57..35c3cc1 100644
--- a/src/corelib/concurrent/qfutureinterface.h
+++ b/src/corelib/concurrent/qfutureinterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfutureinterface_p.h b/src/corelib/concurrent/qfutureinterface_p.h
index 7d74946..858bcc1 100644
--- a/src/corelib/concurrent/qfutureinterface_p.h
+++ b/src/corelib/concurrent/qfutureinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfuturesynchronizer.cpp b/src/corelib/concurrent/qfuturesynchronizer.cpp
index f903373..66c04ea 100644
--- a/src/corelib/concurrent/qfuturesynchronizer.cpp
+++ b/src/corelib/concurrent/qfuturesynchronizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfuturesynchronizer.h b/src/corelib/concurrent/qfuturesynchronizer.h
index a1e26e5..56c29f6 100644
--- a/src/corelib/concurrent/qfuturesynchronizer.h
+++ b/src/corelib/concurrent/qfuturesynchronizer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp
index d4573c6..91744b0 100644
--- a/src/corelib/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/concurrent/qfuturewatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfuturewatcher.h b/src/corelib/concurrent/qfuturewatcher.h
index af8dca4..96b86d6 100644
--- a/src/corelib/concurrent/qfuturewatcher.h
+++ b/src/corelib/concurrent/qfuturewatcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qfuturewatcher_p.h b/src/corelib/concurrent/qfuturewatcher_p.h
index 8f5f7de..6cf8367 100644
--- a/src/corelib/concurrent/qfuturewatcher_p.h
+++ b/src/corelib/concurrent/qfuturewatcher_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qrunnable.cpp b/src/corelib/concurrent/qrunnable.cpp
index a178d31..7711064 100644
--- a/src/corelib/concurrent/qrunnable.cpp
+++ b/src/corelib/concurrent/qrunnable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qrunnable.h b/src/corelib/concurrent/qrunnable.h
index 6f26627..38af11e 100644
--- a/src/corelib/concurrent/qrunnable.h
+++ b/src/corelib/concurrent/qrunnable.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentcompilertest.h b/src/corelib/concurrent/qtconcurrentcompilertest.h
index 982a50c..ba0d9d3 100644
--- a/src/corelib/concurrent/qtconcurrentcompilertest.h
+++ b/src/corelib/concurrent/qtconcurrentcompilertest.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentexception.cpp b/src/corelib/concurrent/qtconcurrentexception.cpp
index fad04a6..ccd9aab 100644
--- a/src/corelib/concurrent/qtconcurrentexception.cpp
+++ b/src/corelib/concurrent/qtconcurrentexception.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentexception.h b/src/corelib/concurrent/qtconcurrentexception.h
index 7018fbb..1c17943 100644
--- a/src/corelib/concurrent/qtconcurrentexception.h
+++ b/src/corelib/concurrent/qtconcurrentexception.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentfilter.cpp b/src/corelib/concurrent/qtconcurrentfilter.cpp
index 29c3edb..ad39315 100644
--- a/src/corelib/concurrent/qtconcurrentfilter.cpp
+++ b/src/corelib/concurrent/qtconcurrentfilter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h
index 13f730d..f84f3d8 100644
--- a/src/corelib/concurrent/qtconcurrentfilter.h
+++ b/src/corelib/concurrent/qtconcurrentfilter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentfilterkernel.h b/src/corelib/concurrent/qtconcurrentfilterkernel.h
index e9bc551..1c1c4f5 100644
--- a/src/corelib/concurrent/qtconcurrentfilterkernel.h
+++ b/src/corelib/concurrent/qtconcurrentfilterkernel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
index 1f87bf9..a73eae9 100644
--- a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
+++ b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
index dd51ee8..941d6e9 100644
--- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.h b/src/corelib/concurrent/qtconcurrentiteratekernel.h
index 23aaae8..7219f9e 100644
--- a/src/corelib/concurrent/qtconcurrentiteratekernel.h
+++ b/src/corelib/concurrent/qtconcurrentiteratekernel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp
index 4303ff6..31c8de3 100644
--- a/src/corelib/concurrent/qtconcurrentmap.cpp
+++ b/src/corelib/concurrent/qtconcurrentmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentmap.h b/src/corelib/concurrent/qtconcurrentmap.h
index c1937f7..41953f6 100644
--- a/src/corelib/concurrent/qtconcurrentmap.h
+++ b/src/corelib/concurrent/qtconcurrentmap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentmapkernel.h b/src/corelib/concurrent/qtconcurrentmapkernel.h
index 6ae5b78..f11327d 100644
--- a/src/corelib/concurrent/qtconcurrentmapkernel.h
+++ b/src/corelib/concurrent/qtconcurrentmapkernel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentmedian.h b/src/corelib/concurrent/qtconcurrentmedian.h
index 74dab05..54a87fa 100644
--- a/src/corelib/concurrent/qtconcurrentmedian.h
+++ b/src/corelib/concurrent/qtconcurrentmedian.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentreducekernel.h b/src/corelib/concurrent/qtconcurrentreducekernel.h
index 889e5d5..f82b495 100644
--- a/src/corelib/concurrent/qtconcurrentreducekernel.h
+++ b/src/corelib/concurrent/qtconcurrentreducekernel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentresultstore.cpp b/src/corelib/concurrent/qtconcurrentresultstore.cpp
index 65f3afa..f38e80b 100644
--- a/src/corelib/concurrent/qtconcurrentresultstore.cpp
+++ b/src/corelib/concurrent/qtconcurrentresultstore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentresultstore.h b/src/corelib/concurrent/qtconcurrentresultstore.h
index c96b72d..a9363eb 100644
--- a/src/corelib/concurrent/qtconcurrentresultstore.h
+++ b/src/corelib/concurrent/qtconcurrentresultstore.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentrun.cpp b/src/corelib/concurrent/qtconcurrentrun.cpp
index e80a204..d04dd93 100644
--- a/src/corelib/concurrent/qtconcurrentrun.cpp
+++ b/src/corelib/concurrent/qtconcurrentrun.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentrun.h b/src/corelib/concurrent/qtconcurrentrun.h
index 0788706..48cba773 100644
--- a/src/corelib/concurrent/qtconcurrentrun.h
+++ b/src/corelib/concurrent/qtconcurrentrun.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentrunbase.h b/src/corelib/concurrent/qtconcurrentrunbase.h
index a6bbe3e..0b7429c 100644
--- a/src/corelib/concurrent/qtconcurrentrunbase.h
+++ b/src/corelib/concurrent/qtconcurrentrunbase.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h b/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h
index 47b82c3..182f1ff 100644
--- a/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h
+++ b/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentthreadengine.cpp b/src/corelib/concurrent/qtconcurrentthreadengine.cpp
index 1ac9454..f59e790 100644
--- a/src/corelib/concurrent/qtconcurrentthreadengine.cpp
+++ b/src/corelib/concurrent/qtconcurrentthreadengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qtconcurrentthreadengine.h b/src/corelib/concurrent/qtconcurrentthreadengine.h
index 20c785a..e4d2e67 100644
--- a/src/corelib/concurrent/qtconcurrentthreadengine.h
+++ b/src/corelib/concurrent/qtconcurrentthreadengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qthreadpool.cpp b/src/corelib/concurrent/qthreadpool.cpp
index 9e4189e..33746b8 100644
--- a/src/corelib/concurrent/qthreadpool.cpp
+++ b/src/corelib/concurrent/qthreadpool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qthreadpool.h b/src/corelib/concurrent/qthreadpool.h
index cc1e059..874fe1a 100644
--- a/src/corelib/concurrent/qthreadpool.h
+++ b/src/corelib/concurrent/qthreadpool.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/concurrent/qthreadpool_p.h b/src/corelib/concurrent/qthreadpool_p.h
index 8a2cf98..99fb3ae 100644
--- a/src/corelib/concurrent/qthreadpool_p.h
+++ b/src/corelib/concurrent/qthreadpool_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qconfig-dist.h b/src/corelib/global/qconfig-dist.h
index 9f7d05d..730ef89 100644
--- a/src/corelib/global/qconfig-dist.h
+++ b/src/corelib/global/qconfig-dist.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h
index b22a4d2..355d4d0 100644
--- a/src/corelib/global/qconfig-large.h
+++ b/src/corelib/global/qconfig-large.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
index 6cb6c2c..9c0faf0 100644
--- a/src/corelib/global/qconfig-medium.h
+++ b/src/corelib/global/qconfig-medium.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index c285e99..358eb8d 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index dd74dcf..2755103 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
index d53504a..281b82a 100644
--- a/src/corelib/global/qendian.h
+++ b/src/corelib/global/qendian.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index b606843..f279d52 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 3291fe7..e6df16e 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 3a35aa3..5600c97 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 957abbf..2c88f06 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index 4a7ba06..1d96fa3 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp
index 090998c..73a391a 100644
--- a/src/corelib/global/qmalloc.cpp
+++ b/src/corelib/global/qmalloc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 3952836..0ebd6b3 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp
index 7ddb9e2..a86ccd0 100644
--- a/src/corelib/global/qnumeric.cpp
+++ b/src/corelib/global/qnumeric.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h
index af5d722..380b9d6 100644
--- a/src/corelib/global/qnumeric.h
+++ b/src/corelib/global/qnumeric.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
index 7691a8d..72a8895 100644
--- a/src/corelib/global/qnumeric_p.h
+++ b/src/corelib/global/qnumeric_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
index 59dfc28..fd99b7d 100644
--- a/src/corelib/global/qt_pch.h
+++ b/src/corelib/global/qt_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
index 13952f0..e7acc70 100644
--- a/src/corelib/global/qt_windows.h
+++ b/src/corelib/global/qt_windows.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index d6b6f11..fcc358d 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qabstractfileengine.h b/src/corelib/io/qabstractfileengine.h
index 8ca831a..3d41151 100644
--- a/src/corelib/io/qabstractfileengine.h
+++ b/src/corelib/io/qabstractfileengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h
index e1eba30..c32a2a0 100644
--- a/src/corelib/io/qabstractfileengine_p.h
+++ b/src/corelib/io/qabstractfileengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp
index 73c71ea..ad9aac3 100644
--- a/src/corelib/io/qbuffer.cpp
+++ b/src/corelib/io/qbuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h
index ecbd934..a0dcef5 100644
--- a/src/corelib/io/qbuffer.h
+++ b/src/corelib/io/qbuffer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 58f0190..fa2e499 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 222ba8f..ddbfb45 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdatastream_p.h b/src/corelib/io/qdatastream_p.h
index 73f73ee..0cb424b 100644
--- a/src/corelib/io/qdatastream_p.h
+++ b/src/corelib/io/qdatastream_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdataurl.cpp b/src/corelib/io/qdataurl.cpp
index 4e2dec2..03a6913 100644
--- a/src/corelib/io/qdataurl.cpp
+++ b/src/corelib/io/qdataurl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdataurl_p.h b/src/corelib/io/qdataurl_p.h
index 57cfd75..69cb15f 100644
--- a/src/corelib/io/qdataurl_p.h
+++ b/src/corelib/io/qdataurl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 9c54416..abfbefd 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 093312f..5e9a0da 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index efcc8f9..5c48969 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index 7e5fbac..92497a5 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index fd4b9c1..7fd13d0 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qdiriterator.h b/src/corelib/io/qdiriterator.h
index 6c4e4aa..011b125 100644
--- a/src/corelib/io/qdiriterator.h
+++ b/src/corelib/io/qdiriterator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 50e9a8f..747b6cd 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h
index 212576c..c8a67d1 100644
--- a/src/corelib/io/qfile.h
+++ b/src/corelib/io/qfile.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h
index cf76c09..210d83e 100644
--- a/src/corelib/io/qfile_p.h
+++ b/src/corelib/io/qfile_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 7eca212..98c7de3 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index f0128b1..e6592bf 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfileinfo_p.h b/src/corelib/io/qfileinfo_p.h
index b9b1092..a16af9c 100644
--- a/src/corelib/io/qfileinfo_p.h
+++ b/src/corelib/io/qfileinfo_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index 18c3c9f..2e09607 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h
index f957d2a..b7ef1cd 100644
--- a/src/corelib/io/qfilesystemwatcher.h
+++ b/src/corelib/io/qfilesystemwatcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_dnotify.cpp b/src/corelib/io/qfilesystemwatcher_dnotify.cpp
index 82470c8..8b809ac 100644
--- a/src/corelib/io/qfilesystemwatcher_dnotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_dnotify.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_dnotify_p.h b/src/corelib/io/qfilesystemwatcher_dnotify_p.h
index ec6bc3f..08feef0 100644
--- a/src/corelib/io/qfilesystemwatcher_dnotify_p.h
+++ b/src/corelib/io/qfilesystemwatcher_dnotify_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.cpp b/src/corelib/io/qfilesystemwatcher_fsevents.cpp
index d3276bd..9c35838 100644
--- a/src/corelib/io/qfilesystemwatcher_fsevents.cpp
+++ b/src/corelib/io/qfilesystemwatcher_fsevents.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents_p.h b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
index b0462b6..28ac649 100644
--- a/src/corelib/io/qfilesystemwatcher_fsevents_p.h
+++ b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index 4740a89..40f6a9e 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_inotify_p.h b/src/corelib/io/qfilesystemwatcher_inotify_p.h
index 4c52afa..a328661 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify_p.h
+++ b/src/corelib/io/qfilesystemwatcher_inotify_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
index 378ad20..efaa785 100644
--- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp
+++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_kqueue_p.h b/src/corelib/io/qfilesystemwatcher_kqueue_p.h
index eda646b..544e098 100644
--- a/src/corelib/io/qfilesystemwatcher_kqueue_p.h
+++ b/src/corelib/io/qfilesystemwatcher_kqueue_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_p.h b/src/corelib/io/qfilesystemwatcher_p.h
index e7775a4..e39963a 100644
--- a/src/corelib/io/qfilesystemwatcher_p.h
+++ b/src/corelib/io/qfilesystemwatcher_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 6136742..c475d95 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian.cpp
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h
index e687a4a..e7ba1d6 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian_p.h
+++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index 249ce0f..ebf436d 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfilesystemwatcher_win_p.h b/src/corelib/io/qfilesystemwatcher_win_p.h
index 7d8ab2a..813ead0 100644
--- a/src/corelib/io/qfilesystemwatcher_win_p.h
+++ b/src/corelib/io/qfilesystemwatcher_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index a1ffb81..40c5916 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h
index 6b077ed..a0b1159 100644
--- a/src/corelib/io/qfsfileengine.h
+++ b/src/corelib/io/qfsfileengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine_iterator.cpp b/src/corelib/io/qfsfileengine_iterator.cpp
index 7e7d70a..e476542 100644
--- a/src/corelib/io/qfsfileengine_iterator.cpp
+++ b/src/corelib/io/qfsfileengine_iterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h
index be670e0..a42e62c 100644
--- a/src/corelib/io/qfsfileengine_iterator_p.h
+++ b/src/corelib/io/qfsfileengine_iterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine_iterator_unix.cpp b/src/corelib/io/qfsfileengine_iterator_unix.cpp
index bfdb03e..03455ab 100644
--- a/src/corelib/io/qfsfileengine_iterator_unix.cpp
+++ b/src/corelib/io/qfsfileengine_iterator_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine_iterator_win.cpp b/src/corelib/io/qfsfileengine_iterator_win.cpp
index 7181025..21b50d7 100644
--- a/src/corelib/io/qfsfileengine_iterator_win.cpp
+++ b/src/corelib/io/qfsfileengine_iterator_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h
index e9e55f3..79458ba 100644
--- a/src/corelib/io/qfsfileengine_p.h
+++ b/src/corelib/io/qfsfileengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index d83f7ee..a0f6488 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index d5c53bb..8db4499 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 26e587d..9755bf7 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h
index 2f40e66..d213dd7 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qiodevice_p.h b/src/corelib/io/qiodevice_p.h
index 1dd51ea..4602f20 100644
--- a/src/corelib/io/qiodevice_p.h
+++ b/src/corelib/io/qiodevice_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index 553312c..580f519 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h
index ebd6e24..a56057f 100644
--- a/src/corelib/io/qnoncontiguousbytedevice_p.h
+++ b/src/corelib/io/qnoncontiguousbytedevice_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 739ac4d..8c5ced4 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index b07d742..278901c 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
index 8b7e3ff..aef897d 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
index 003e781..95e6e47 100644
--- a/src/corelib/io/qprocess_symbian.cpp
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index 216c382..adc04ae 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index 702349f..8d5186d 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index ce9c57e..5f66c47 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h
index cae1989..8ffeb18 100644
--- a/src/corelib/io/qresource.h
+++ b/src/corelib/io/qresource.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qresource_iterator.cpp b/src/corelib/io/qresource_iterator.cpp
index d5fe828..03639c9 100644
--- a/src/corelib/io/qresource_iterator.cpp
+++ b/src/corelib/io/qresource_iterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qresource_iterator_p.h b/src/corelib/io/qresource_iterator_p.h
index 67f7ed5..ce0d41c 100644
--- a/src/corelib/io/qresource_iterator_p.h
+++ b/src/corelib/io/qresource_iterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h
index 9c49cc6..6da6983 100644
--- a/src/corelib/io/qresource_p.h
+++ b/src/corelib/io/qresource_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index edd6d2b..8894c59 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index 38010bf..de73940 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp
index 38ab585..22addf5 100644
--- a/src/corelib/io/qsettings_mac.cpp
+++ b/src/corelib/io/qsettings_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h
index ec345be..cfd94b8 100644
--- a/src/corelib/io/qsettings_p.h
+++ b/src/corelib/io/qsettings_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp
index b3fe734..0529fda 100644
--- a/src/corelib/io/qsettings_win.cpp
+++ b/src/corelib/io/qsettings_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index c34c4a4..1587776 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h
index 2270a1f..ac652a5 100644
--- a/src/corelib/io/qtemporaryfile.h
+++ b/src/corelib/io/qtemporaryfile.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index eab0662..e239cb0 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h
index d82da59..80263c7 100644
--- a/src/corelib/io/qtextstream.h
+++ b/src/corelib/io/qtextstream.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index d1fab2d..27d95b3 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 6f8331a..62917dd 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp
index 2fe4424..461201b 100644
--- a/src/corelib/io/qwindowspipewriter.cpp
+++ b/src/corelib/io/qwindowspipewriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/io/qwindowspipewriter_p.h b/src/corelib/io/qwindowspipewriter_p.h
index 893a165..9265671 100644
--- a/src/corelib/io/qwindowspipewriter_p.h
+++ b/src/corelib/io/qwindowspipewriter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index bcf4477..f17e9b6 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h
index 6de6581..c0bec2b 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.h
+++ b/src/corelib/kernel/qabstracteventdispatcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qabstracteventdispatcher_p.h b/src/corelib/kernel/qabstracteventdispatcher_p.h
index f6fb07a..57aa07b 100644
--- a/src/corelib/kernel/qabstracteventdispatcher_p.h
+++ b/src/corelib/kernel/qabstracteventdispatcher_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index 05cb271..3841029 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/kernel/qabstractitemmodel.h
index 63d9e6f..3ac41b3 100644
--- a/src/corelib/kernel/qabstractitemmodel.h
+++ b/src/corelib/kernel/qabstractitemmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qabstractitemmodel_p.h b/src/corelib/kernel/qabstractitemmodel_p.h
index 3113dff..ea2ce69 100644
--- a/src/corelib/kernel/qabstractitemmodel_p.h
+++ b/src/corelib/kernel/qabstractitemmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp
index d595ac1..d16f02c 100644
--- a/src/corelib/kernel/qbasictimer.cpp
+++ b/src/corelib/kernel/qbasictimer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h
index 4543e8c..f1cd329 100644
--- a/src/corelib/kernel/qbasictimer.h
+++ b/src/corelib/kernel/qbasictimer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcore_mac.cpp b/src/corelib/kernel/qcore_mac.cpp
index e7d0a99..c5a3f62 100644
--- a/src/corelib/kernel/qcore_mac.cpp
+++ b/src/corelib/kernel/qcore_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index 9591f08..11f63e3 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp
index 66296b0..dea0e13 100644
--- a/src/corelib/kernel/qcore_symbian_p.cpp
+++ b/src/corelib/kernel/qcore_symbian_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h
index 4a515ce..cc88808 100644
--- a/src/corelib/kernel/qcore_symbian_p.h
+++ b/src/corelib/kernel/qcore_symbian_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp
index e0d92c0..bf5b234 100644
--- a/src/corelib/kernel/qcore_unix.cpp
+++ b/src/corelib/kernel/qcore_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index 439ca5a..96a572a 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index d3f399b..2a074f3 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index d87103e..e1adece 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreapplication_mac.cpp b/src/corelib/kernel/qcoreapplication_mac.cpp
index 3c6730b..705e24d 100644
--- a/src/corelib/kernel/qcoreapplication_mac.cpp
+++ b/src/corelib/kernel/qcoreapplication_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index e066137..8be1f38 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 320f801..4531fcc 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h
index f24126e..d088cb5 100644
--- a/src/corelib/kernel/qcorecmdlineargs_p.h
+++ b/src/corelib/kernel/qcorecmdlineargs_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index d23ea4c..1e3370b 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 9d3513a..b933bfb 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreglobaldata.cpp b/src/corelib/kernel/qcoreglobaldata.cpp
index 0155fcc..7433ff4 100644
--- a/src/corelib/kernel/qcoreglobaldata.cpp
+++ b/src/corelib/kernel/qcoreglobaldata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcoreglobaldata_p.h b/src/corelib/kernel/qcoreglobaldata_p.h
index 2776c10..c3b9eed 100644
--- a/src/corelib/kernel/qcoreglobaldata_p.h
+++ b/src/corelib/kernel/qcoreglobaldata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcrashhandler.cpp b/src/corelib/kernel/qcrashhandler.cpp
index 9d4092e..e2c9d31 100644
--- a/src/corelib/kernel/qcrashhandler.cpp
+++ b/src/corelib/kernel/qcrashhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qcrashhandler_p.h b/src/corelib/kernel/qcrashhandler_p.h
index d031cad..f0048b8 100644
--- a/src/corelib/kernel/qcrashhandler_p.h
+++ b/src/corelib/kernel/qcrashhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 8390275..72d7440 100644
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index 871be94..8905a1b 100644
--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 5cc6ae3..52ef292 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h
index bc42753..e07382f 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian_p.h
+++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index f50994c..1acaf2f 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index 060a163..bbd1dc7 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 153ccdf..35cfd1a 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index b219841..4667bb6 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp
index c19f718..462c295 100644
--- a/src/corelib/kernel/qeventloop.cpp
+++ b/src/corelib/kernel/qeventloop.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h
index ad4ea44..f8e83be 100644
--- a/src/corelib/kernel/qeventloop.h
+++ b/src/corelib/kernel/qeventloop.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h
index 53a9325..127277a 100644
--- a/src/corelib/kernel/qfunctions_p.h
+++ b/src/corelib/kernel/qfunctions_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qfunctions_vxworks.cpp b/src/corelib/kernel/qfunctions_vxworks.cpp
index 74fdaf2..931f9ca 100644
--- a/src/corelib/kernel/qfunctions_vxworks.cpp
+++ b/src/corelib/kernel/qfunctions_vxworks.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h
index 45cdc40..9f8ead8 100644
--- a/src/corelib/kernel/qfunctions_vxworks.h
+++ b/src/corelib/kernel/qfunctions_vxworks.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qfunctions_wince.cpp b/src/corelib/kernel/qfunctions_wince.cpp
index e58feb3..6e25f56 100644
--- a/src/corelib/kernel/qfunctions_wince.cpp
+++ b/src/corelib/kernel/qfunctions_wince.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h
index 35cda04..9d703ce 100644
--- a/src/corelib/kernel/qfunctions_wince.h
+++ b/src/corelib/kernel/qfunctions_wince.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmath.cpp b/src/corelib/kernel/qmath.cpp
index a3586a4..6b5001f 100644
--- a/src/corelib/kernel/qmath.cpp
+++ b/src/corelib/kernel/qmath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h
index ff16968..742dc0a 100644
--- a/src/corelib/kernel/qmath.h
+++ b/src/corelib/kernel/qmath.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 9854e68..f75f4ad 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index b700351..ff404ca 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index 4a03874..9ee8eb0 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index fef02cf..a3ee527 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index e16ffe8..ffb0e43 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index bf4001a..6a95fe0 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h
index 2f1a580..cd5c437 100644
--- a/src/corelib/kernel/qmimedata.h
+++ b/src/corelib/kernel/qmimedata.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 8330e47..2e2a0f4 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index d98d1f0..fdc5e6a 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 4800e6a..2574b74 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qobjectcleanuphandler.cpp b/src/corelib/kernel/qobjectcleanuphandler.cpp
index 5c428fc..eddeaab 100644
--- a/src/corelib/kernel/qobjectcleanuphandler.cpp
+++ b/src/corelib/kernel/qobjectcleanuphandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qobjectcleanuphandler.h b/src/corelib/kernel/qobjectcleanuphandler.h
index 0b1c056..31a3eb0 100644
--- a/src/corelib/kernel/qobjectcleanuphandler.h
+++ b/src/corelib/kernel/qobjectcleanuphandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 555a1f5..9f23529 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index fbfb961..2dd850e 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h
index 8151370..65270ab 100644
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index fe93ebc..e4b8e09 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h
index fba939c..7430154 100644
--- a/src/corelib/kernel/qsharedmemory.h
+++ b/src/corelib/kernel/qsharedmemory.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index a52f8b3..1c6fd23 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsharedmemory_symbian.cpp b/src/corelib/kernel/qsharedmemory_symbian.cpp
index 9b84eb56..7b6c379 100644
--- a/src/corelib/kernel/qsharedmemory_symbian.cpp
+++ b/src/corelib/kernel/qsharedmemory_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index a5f79c2..6a6727a 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp
index 0f5fdc7..d32f172 100644
--- a/src/corelib/kernel/qsharedmemory_win.cpp
+++ b/src/corelib/kernel/qsharedmemory_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp
index 012840f..23f9ebb 100644
--- a/src/corelib/kernel/qsignalmapper.cpp
+++ b/src/corelib/kernel/qsignalmapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h
index 735ebcb..a601689 100644
--- a/src/corelib/kernel/qsignalmapper.h
+++ b/src/corelib/kernel/qsignalmapper.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp
index d14bf79..6607014 100644
--- a/src/corelib/kernel/qsocketnotifier.cpp
+++ b/src/corelib/kernel/qsocketnotifier.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h
index 03950ef..640f7f5 100644
--- a/src/corelib/kernel/qsocketnotifier.h
+++ b/src/corelib/kernel/qsocketnotifier.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsystemsemaphore.cpp b/src/corelib/kernel/qsystemsemaphore.cpp
index ffdd9c0..104f24b 100644
--- a/src/corelib/kernel/qsystemsemaphore.cpp
+++ b/src/corelib/kernel/qsystemsemaphore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsystemsemaphore.h b/src/corelib/kernel/qsystemsemaphore.h
index 9dc4aec..3daa813 100644
--- a/src/corelib/kernel/qsystemsemaphore.h
+++ b/src/corelib/kernel/qsystemsemaphore.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h
index a69c5a0..a80d174 100644
--- a/src/corelib/kernel/qsystemsemaphore_p.h
+++ b/src/corelib/kernel/qsystemsemaphore_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsystemsemaphore_symbian.cpp b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
index 8cef611..7b22df1 100644
--- a/src/corelib/kernel/qsystemsemaphore_symbian.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp
index 07e3618..6e1ff62 100644
--- a/src/corelib/kernel/qsystemsemaphore_unix.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp
index 96a47f5..8bfb874 100644
--- a/src/corelib/kernel/qsystemsemaphore_win.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp
index 78556c3..be33cee 100644
--- a/src/corelib/kernel/qtcore_eval.cpp
+++ b/src/corelib/kernel/qtcore_eval.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 7650f6a..c5a736e 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h
index 4b4f3f3..0759db5 100644
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 1321b14..c8b5a26 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h
index 4aae7e4..c1f6449 100644
--- a/src/corelib/kernel/qtranslator.h
+++ b/src/corelib/kernel/qtranslator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qtranslator_p.h b/src/corelib/kernel/qtranslator_p.h
index ae04b1a..ee0a118 100644
--- a/src/corelib/kernel/qtranslator_p.h
+++ b/src/corelib/kernel/qtranslator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index f5d7c0d..4661e46 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index cb2825c..42ca404 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index 88eb93f..1028a18 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qwineventnotifier_p.cpp b/src/corelib/kernel/qwineventnotifier_p.cpp
index fe69716..482fff7 100644
--- a/src/corelib/kernel/qwineventnotifier_p.cpp
+++ b/src/corelib/kernel/qwineventnotifier_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qwineventnotifier_p.h b/src/corelib/kernel/qwineventnotifier_p.h
index e973798..459cd67 100644
--- a/src/corelib/kernel/qwineventnotifier_p.h
+++ b/src/corelib/kernel/qwineventnotifier_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qfactoryinterface.h b/src/corelib/plugin/qfactoryinterface.h
index 6be68b0..b788e8e 100644
--- a/src/corelib/plugin/qfactoryinterface.h
+++ b/src/corelib/plugin/qfactoryinterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index a26dcd8..de892fb 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h
index 068c6c7..1857889 100644
--- a/src/corelib/plugin/qfactoryloader_p.h
+++ b/src/corelib/plugin/qfactoryloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 1874a9e..5bb1e6a 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h
index 1028cbc..1dcce92 100644
--- a/src/corelib/plugin/qlibrary.h
+++ b/src/corelib/plugin/qlibrary.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h
index 02dc523..f613165 100644
--- a/src/corelib/plugin/qlibrary_p.h
+++ b/src/corelib/plugin/qlibrary_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
index e8f0eae..55ebb91 100644
--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
index 7131ccb..8491e06 100644
--- a/src/corelib/plugin/qlibrary_win.cpp
+++ b/src/corelib/plugin/qlibrary_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h
index 7f541f1..49f9672 100644
--- a/src/corelib/plugin/qplugin.h
+++ b/src/corelib/plugin/qplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index b1d1ecc..be682dc 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h
index c520d66..8ce3c7a 100644
--- a/src/corelib/plugin/qpluginloader.h
+++ b/src/corelib/plugin/qpluginloader.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp
index 1b8d8fe..cf8bab9 100644
--- a/src/corelib/plugin/qsystemlibrary.cpp
+++ b/src/corelib/plugin/qsystemlibrary.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/qsystemlibrary_p.h b/src/corelib/plugin/qsystemlibrary_p.h
index 8000a61..c99e113 100644
--- a/src/corelib/plugin/qsystemlibrary_p.h
+++ b/src/corelib/plugin/qsystemlibrary_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 6c1b6e7..6d780e6 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h
index 7fa17a0..67c226d 100644
--- a/src/corelib/plugin/quuid.h
+++ b/src/corelib/plugin/quuid.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp
index 2040d22..9872db5 100644
--- a/src/corelib/statemachine/qabstractstate.cpp
+++ b/src/corelib/statemachine/qabstractstate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h
index cff8e9f..e32cf5a 100644
--- a/src/corelib/statemachine/qabstractstate.h
+++ b/src/corelib/statemachine/qabstractstate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qabstractstate_p.h b/src/corelib/statemachine/qabstractstate_p.h
index 6489d23..605dacf 100644
--- a/src/corelib/statemachine/qabstractstate_p.h
+++ b/src/corelib/statemachine/qabstractstate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 18a4e71..aa017e3 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index 1d5af72..e3ba940 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h
index 35f50c6..f05ed79 100644
--- a/src/corelib/statemachine/qabstracttransition_p.h
+++ b/src/corelib/statemachine/qabstracttransition_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qeventtransition.cpp b/src/corelib/statemachine/qeventtransition.cpp
index 445e0df..f343488 100644
--- a/src/corelib/statemachine/qeventtransition.cpp
+++ b/src/corelib/statemachine/qeventtransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h
index f27f48b..badad2a 100644
--- a/src/corelib/statemachine/qeventtransition.h
+++ b/src/corelib/statemachine/qeventtransition.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qeventtransition_p.h b/src/corelib/statemachine/qeventtransition_p.h
index 25c12c6..115734a 100644
--- a/src/corelib/statemachine/qeventtransition_p.h
+++ b/src/corelib/statemachine/qeventtransition_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qfinalstate.cpp b/src/corelib/statemachine/qfinalstate.cpp
index 6ffa0d3..3b69242 100644
--- a/src/corelib/statemachine/qfinalstate.cpp
+++ b/src/corelib/statemachine/qfinalstate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h
index 38e7aec..d8447b2 100644
--- a/src/corelib/statemachine/qfinalstate.h
+++ b/src/corelib/statemachine/qfinalstate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qhistorystate.cpp b/src/corelib/statemachine/qhistorystate.cpp
index 09031b6..d1f1463 100644
--- a/src/corelib/statemachine/qhistorystate.cpp
+++ b/src/corelib/statemachine/qhistorystate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h
index 4e9622d..c776a56 100644
--- a/src/corelib/statemachine/qhistorystate.h
+++ b/src/corelib/statemachine/qhistorystate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qhistorystate_p.h b/src/corelib/statemachine/qhistorystate_p.h
index fe6b4a1..ffbf532 100644
--- a/src/corelib/statemachine/qhistorystate_p.h
+++ b/src/corelib/statemachine/qhistorystate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h
index 625696b..af4d252 100644
--- a/src/corelib/statemachine/qsignaleventgenerator_p.h
+++ b/src/corelib/statemachine/qsignaleventgenerator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index 3505737..165509f 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h
index ad0d5ae..e7593d9 100644
--- a/src/corelib/statemachine/qsignaltransition.h
+++ b/src/corelib/statemachine/qsignaltransition.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h
index aeddb2b..ec8a83e 100644
--- a/src/corelib/statemachine/qsignaltransition_p.h
+++ b/src/corelib/statemachine/qsignaltransition_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index 69cca06..e17e5f9 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 620104f..4a15aad 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h
index a658e76..d77a2dd 100644
--- a/src/corelib/statemachine/qstate_p.h
+++ b/src/corelib/statemachine/qstate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 4b371f7..f85c9ed 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index 0cd568b..0b36998 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 5e1015f..569cbbe 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index 697da38..7c0f9b9 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h
index 0418a14..e9e4703 100644
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 8887fcf..b92f8e8 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index 43df13a..d2d8034 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h
index 509f300..461dcc1 100644
--- a/src/corelib/thread/qmutex.h
+++ b/src/corelib/thread/qmutex.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h
index dce162a..c74e068 100644
--- a/src/corelib/thread/qmutex_p.h
+++ b/src/corelib/thread/qmutex_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp
index a58368c..b04fd67 100644
--- a/src/corelib/thread/qmutex_unix.cpp
+++ b/src/corelib/thread/qmutex_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qmutex_win.cpp b/src/corelib/thread/qmutex_win.cpp
index 9d58953..ae4eba2 100644
--- a/src/corelib/thread/qmutex_win.cpp
+++ b/src/corelib/thread/qmutex_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp
index 59211fb..a187aed 100644
--- a/src/corelib/thread/qmutexpool.cpp
+++ b/src/corelib/thread/qmutexpool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/thread/qmutexpool_p.h
index ed3497d..8117a93 100644
--- a/src/corelib/thread/qmutexpool_p.h
+++ b/src/corelib/thread/qmutexpool_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h
index 702125c..3128439 100644
--- a/src/corelib/thread/qorderedmutexlocker_p.h
+++ b/src/corelib/thread/qorderedmutexlocker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index 1a9eb0b..91dd724 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h
index 9521ac3..36e68e8 100644
--- a/src/corelib/thread/qreadwritelock.h
+++ b/src/corelib/thread/qreadwritelock.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qreadwritelock_p.h b/src/corelib/thread/qreadwritelock_p.h
index 69ce4fd..f7daccc 100644
--- a/src/corelib/thread/qreadwritelock_p.h
+++ b/src/corelib/thread/qreadwritelock_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index 8e8a88a..f38df95 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h
index 09cbb8b..01caa96 100644
--- a/src/corelib/thread/qsemaphore.h
+++ b/src/corelib/thread/qsemaphore.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 2c63dfc..6f22ca8 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 97ffb44..5266061 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index d816aef..b5e5d29 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 2824e15..6e28816 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 37d5b87..629ad78 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 88d73cc..82b7dfa 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h
index 3a786ba..0e5453c 100644
--- a/src/corelib/thread/qthreadstorage.h
+++ b/src/corelib/thread/qthreadstorage.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qwaitcondition.h b/src/corelib/thread/qwaitcondition.h
index f0481f3..584a436 100644
--- a/src/corelib/thread/qwaitcondition.h
+++ b/src/corelib/thread/qwaitcondition.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp
index b371b0e..28952d5 100644
--- a/src/corelib/thread/qwaitcondition_unix.cpp
+++ b/src/corelib/thread/qwaitcondition_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/thread/qwaitcondition_win.cpp b/src/corelib/thread/qwaitcondition_win.cpp
index 48a779d..06a08e1 100644
--- a/src/corelib/thread/qwaitcondition_win.cpp
+++ b/src/corelib/thread/qwaitcondition_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h
index 86b497a..4207315 100644
--- a/src/corelib/tools/qalgorithms.h
+++ b/src/corelib/tools/qalgorithms.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index 04018ba..8c54bbf 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h
index 60cdc9c..25ac433 100644
--- a/src/corelib/tools/qbitarray.h
+++ b/src/corelib/tools/qbitarray.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 033da90..596049f 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index a3fe3f5..0d385be 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp
index f8504f0..65952e7 100644
--- a/src/corelib/tools/qbytearraymatcher.cpp
+++ b/src/corelib/tools/qbytearraymatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index d3db4e9..67d83a8 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/tools/qbytedata_p.h
index 08249e0..f59d8eb 100644
--- a/src/corelib/tools/qbytedata_p.h
+++ b/src/corelib/tools/qbytedata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index 44477d7..14a955a 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index ed0af4e..de0be6d 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index b9e7e01..6e132f0 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h
index 50dec68..da0bdc4 100644
--- a/src/corelib/tools/qcontainerfwd.h
+++ b/src/corelib/tools/qcontainerfwd.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp
index 3ba5186..1c685c1 100644
--- a/src/corelib/tools/qcontiguouscache.cpp
+++ b/src/corelib/tools/qcontiguouscache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h
index f767962..116aaeb 100644
--- a/src/corelib/tools/qcontiguouscache.h
+++ b/src/corelib/tools/qcontiguouscache.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index 043d6a3..eb05cfe 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h
index b3aaaf3..6fe4191 100644
--- a/src/corelib/tools/qcryptographichash.h
+++ b/src/corelib/tools/qcryptographichash.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index ab7530d..1ae1ad1 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index 2466aeb..80f7968 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h
index f10785e..c8461d8 100644
--- a/src/corelib/tools/qdatetime_p.h
+++ b/src/corelib/tools/qdatetime_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 7fe9170..713412a 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h
index 173fba4..12ffdc7 100644
--- a/src/corelib/tools/qeasingcurve.h
+++ b/src/corelib/tools/qeasingcurve.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp
index cb5e701..5a98cdd 100644
--- a/src/corelib/tools/qelapsedtimer.cpp
+++ b/src/corelib/tools/qelapsedtimer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qelapsedtimer.h b/src/corelib/tools/qelapsedtimer.h
index 0d6f0be..e04f2d9 100644
--- a/src/corelib/tools/qelapsedtimer.h
+++ b/src/corelib/tools/qelapsedtimer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qelapsedtimer_generic.cpp b/src/corelib/tools/qelapsedtimer_generic.cpp
index 85986e6..b0cd723 100644
--- a/src/corelib/tools/qelapsedtimer_generic.cpp
+++ b/src/corelib/tools/qelapsedtimer_generic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qelapsedtimer_mac.cpp b/src/corelib/tools/qelapsedtimer_mac.cpp
index 8fceb49..7efb518 100644
--- a/src/corelib/tools/qelapsedtimer_mac.cpp
+++ b/src/corelib/tools/qelapsedtimer_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qelapsedtimer_symbian.cpp b/src/corelib/tools/qelapsedtimer_symbian.cpp
index 038b102..1f04601 100644
--- a/src/corelib/tools/qelapsedtimer_symbian.cpp
+++ b/src/corelib/tools/qelapsedtimer_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp
index 633fa00..397855f 100644
--- a/src/corelib/tools/qelapsedtimer_unix.cpp
+++ b/src/corelib/tools/qelapsedtimer_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/tools/qelapsedtimer_win.cpp
index 135196a..f4b2592 100644
--- a/src/corelib/tools/qelapsedtimer_win.cpp
+++ b/src/corelib/tools/qelapsedtimer_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qharfbuzz.cpp b/src/corelib/tools/qharfbuzz.cpp
index 9166a14..a42c723 100644
--- a/src/corelib/tools/qharfbuzz.cpp
+++ b/src/corelib/tools/qharfbuzz.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h
index 3786c07..7087b7a 100644
--- a/src/corelib/tools/qharfbuzz_p.h
+++ b/src/corelib/tools/qharfbuzz_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 2971c06..26d5395 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index c7e4bc1..c324768 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h
index abdc68c..bfd2559 100644
--- a/src/corelib/tools/qiterator.h
+++ b/src/corelib/tools/qiterator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index babc1d8..721cd0f 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h
index b3fc3f5..d4c34f9 100644
--- a/src/corelib/tools/qline.h
+++ b/src/corelib/tools/qline.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index 909d940..582ee7d 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h
index 9b3efa3..349572e 100644
--- a/src/corelib/tools/qlinkedlist.h
+++ b/src/corelib/tools/qlinkedlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 6cc6fc1..6a2b40c 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index d843cbe..2003d91 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 6b1de5e..6fb3215 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index 8b424bb..b054975 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h
index 5f4a9c2..2fe2905 100644
--- a/src/corelib/tools/qlocale_data_p.h
+++ b/src/corelib/tools/qlocale_data_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h
index 6205745..d6961eb 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/tools/qlocale_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index 458bb2a..7995049 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 3143ee4..546a215 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index 1c2aad3..be64018 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
index bb604a9..2e16cea 100644
--- a/src/corelib/tools/qmargins.cpp
+++ b/src/corelib/tools/qmargins.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h
index 92f9fe3..af1e6da 100644
--- a/src/corelib/tools/qmargins.h
+++ b/src/corelib/tools/qmargins.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h
index a7c8e6f..a62a686 100644
--- a/src/corelib/tools/qpair.h
+++ b/src/corelib/tools/qpair.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qpodlist_p.h b/src/corelib/tools/qpodlist_p.h
index ad2c324..719c4c9 100644
--- a/src/corelib/tools/qpodlist_p.h
+++ b/src/corelib/tools/qpodlist_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp
index 66f06e9..8e48d09 100644
--- a/src/corelib/tools/qpoint.cpp
+++ b/src/corelib/tools/qpoint.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
index 79a7dd8..0b32547 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qqueue.cpp b/src/corelib/tools/qqueue.cpp
index 849bb0b..a6e2ba0 100644
--- a/src/corelib/tools/qqueue.cpp
+++ b/src/corelib/tools/qqueue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h
index c29134b..85c32e8 100644
--- a/src/corelib/tools/qqueue.h
+++ b/src/corelib/tools/qqueue.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index 308a561..f746167 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h
index 6984747..5dec1fb 100644
--- a/src/corelib/tools/qrect.h
+++ b/src/corelib/tools/qrect.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 36827d0..441fa57 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h
index e19c130..33420d1 100644
--- a/src/corelib/tools/qregexp.h
+++ b/src/corelib/tools/qregexp.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index 808ad5e..be1b38d 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index b06112d..e0e940d 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h
index bc76a3b..f526334 100644
--- a/src/corelib/tools/qscopedpointer.h
+++ b/src/corelib/tools/qscopedpointer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qscopedpointer_p.h b/src/corelib/tools/qscopedpointer_p.h
index f9091b9..04bebac 100644
--- a/src/corelib/tools/qscopedpointer_p.h
+++ b/src/corelib/tools/qscopedpointer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h
index fe50d4d..bc75d3e 100644
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index 338a183..4b5b4cb 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
index 6483c90..fac3fb1 100644
--- a/src/corelib/tools/qshareddata.h
+++ b/src/corelib/tools/qshareddata.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 5fac960..1204780 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h
index c51ade6..9d2312a 100644
--- a/src/corelib/tools/qsharedpointer.h
+++ b/src/corelib/tools/qsharedpointer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 4cce339..9a3a9e0 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index 7babf3a..e727bfc 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 664543b..d3f505e 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp
index 20ac344..6189922 100644
--- a/src/corelib/tools/qsize.cpp
+++ b/src/corelib/tools/qsize.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h
index 1f3dee5..a17f53d 100644
--- a/src/corelib/tools/qsize.h
+++ b/src/corelib/tools/qsize.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstack.cpp b/src/corelib/tools/qstack.cpp
index fa14900..ff83ee6 100644
--- a/src/corelib/tools/qstack.cpp
+++ b/src/corelib/tools/qstack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h
index 526c705..5a18b3d 100644
--- a/src/corelib/tools/qstack.h
+++ b/src/corelib/tools/qstack.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 3521b31..fb388d0 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 06e4d47..f41234f 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index 08efcfe..69f348a 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 0c3ba06..c1f5f91 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index 82a46d4..45825f7 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h
index d1d0f9e..14a11a5 100644
--- a/src/corelib/tools/qstringlist.h
+++ b/src/corelib/tools/qstringlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/tools/qstringmatcher.cpp
index 80a8457..ee9e15b 100644
--- a/src/corelib/tools/qstringmatcher.cpp
+++ b/src/corelib/tools/qstringmatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h
index 451aeb6..3e31ce2 100644
--- a/src/corelib/tools/qstringmatcher.h
+++ b/src/corelib/tools/qstringmatcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp
index 0428782..561a1e8 100644
--- a/src/corelib/tools/qtextboundaryfinder.cpp
+++ b/src/corelib/tools/qtextboundaryfinder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/tools/qtextboundaryfinder.h
index 40f754f..7a880f6 100644
--- a/src/corelib/tools/qtextboundaryfinder.h
+++ b/src/corelib/tools/qtextboundaryfinder.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp
index f413223..dbc4e6a 100644
--- a/src/corelib/tools/qtimeline.cpp
+++ b/src/corelib/tools/qtimeline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index 926eea1..6a11113 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qtools_p.h b/src/corelib/tools/qtools_p.h
index 8e5ea2a..857d8b7 100644
--- a/src/corelib/tools/qtools_p.h
+++ b/src/corelib/tools/qtools_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp
index 9df31e5..f01b39b 100644
--- a/src/corelib/tools/qunicodetables.cpp
+++ b/src/corelib/tools/qunicodetables.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h
index 5c7cc08..9a4c2e0 100644
--- a/src/corelib/tools/qunicodetables_p.h
+++ b/src/corelib/tools/qunicodetables_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
index 4a6bb4b..cca654b 100644
--- a/src/corelib/tools/qvarlengtharray.h
+++ b/src/corelib/tools/qvarlengtharray.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp
index 3a13540..b3b80b6 100644
--- a/src/corelib/tools/qvector.cpp
+++ b/src/corelib/tools/qvector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 2b8d054..3300022 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/tools/qvsnprintf.cpp b/src/corelib/tools/qvsnprintf.cpp
index deecd3a..86e552c 100644
--- a/src/corelib/tools/qvsnprintf.cpp
+++ b/src/corelib/tools/qvsnprintf.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/xml/make-parser.sh b/src/corelib/xml/make-parser.sh
index 89af678..ef4b281 100755
--- a/src/corelib/xml/make-parser.sh
+++ b/src/corelib/xml/make-parser.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 91c3a19..ec51891 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index e91408f..0cf004d 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -7,11 +7,11 @@
 -- This file is part of the QtCore module of the Qt Toolkit.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the Technology Preview License Agreement accompanying
--- this package.
+-- Commercial Usage
+-- Licensees holding valid Qt Commercial licenses may use this file in
+-- accordance with the Qt Commercial License Agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Nokia.
 --
 -- GNU Lesser General Public License Usage
 -- Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 -- rights.  These rights are described in the Nokia 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.
+--
 -- If you have questions regarding the use of this file, please contact
 -- Nokia at qt-info@nokia.com.
---
---
---
---
---
---
---
---
 -- $QT_END_LICENSE$
 --
 ----------------------------------------------------------------------------
diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index 402afa3..ed30769 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h
index f6ab3a1..36a62d3 100644
--- a/src/corelib/xml/qxmlstream_p.h
+++ b/src/corelib/xml/qxmlstream_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/xml/qxmlutils.cpp b/src/corelib/xml/qxmlutils.cpp
index 616e6a0..63fcde7 100644
--- a/src/corelib/xml/qxmlutils.cpp
+++ b/src/corelib/xml/qxmlutils.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/xml/qxmlutils_p.h b/src/corelib/xml/qxmlutils_p.h
index 590f033..6954ffa 100644
--- a/src/corelib/xml/qxmlutils_p.h
+++ b/src/corelib/xml/qxmlutils_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index 97b6cb6..2923821 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index 5b6b5fb..bfa03bd 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index 98670d1..784d304 100644
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h
index af5a3ce..ac7d1bf 100644
--- a/src/dbus/qdbusabstractadaptor.h
+++ b/src/dbus/qdbusabstractadaptor.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h
index 312197f..1b69d91 100644
--- a/src/dbus/qdbusabstractadaptor_p.h
+++ b/src/dbus/qdbusabstractadaptor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 4e9c1ad..ac8c8ec 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h
index 177af67..c1409d5 100644
--- a/src/dbus/qdbusabstractinterface.h
+++ b/src/dbus/qdbusabstractinterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h
index 7e59ec7..ec2110b 100644
--- a/src/dbus/qdbusabstractinterface_p.h
+++ b/src/dbus/qdbusabstractinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index 0bde085..97aa2dc 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h
index 30f2cda..371fb03 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h
index c401e9b..22ed5bd 100644
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index bf771a8..dea2832 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index eedda16..0735d9c 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 81af2c7..b914acc 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp
index c507ce7..7a5db02 100644
--- a/src/dbus/qdbusconnectioninterface.cpp
+++ b/src/dbus/qdbusconnectioninterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h
index 4650e12..a587507 100644
--- a/src/dbus/qdbusconnectioninterface.h
+++ b/src/dbus/qdbusconnectioninterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuscontext.cpp b/src/dbus/qdbuscontext.cpp
index b9a660a..251fc4a 100644
--- a/src/dbus/qdbuscontext.cpp
+++ b/src/dbus/qdbuscontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h
index cb9310c..920f500 100644
--- a/src/dbus/qdbuscontext.h
+++ b/src/dbus/qdbuscontext.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuscontext_p.h b/src/dbus/qdbuscontext_p.h
index 94fe071..c28d7b8 100644
--- a/src/dbus/qdbuscontext_p.h
+++ b/src/dbus/qdbuscontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp
index 6e19218..bbd5564 100644
--- a/src/dbus/qdbusdemarshaller.cpp
+++ b/src/dbus/qdbusdemarshaller.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp
index f4b1523..6352aae 100644
--- a/src/dbus/qdbuserror.cpp
+++ b/src/dbus/qdbuserror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index 72736d0..46ab4ff 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp
index 0141c6c..ed83789 100644
--- a/src/dbus/qdbusextratypes.cpp
+++ b/src/dbus/qdbusextratypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h
index 544e63f..6faa2c5 100644
--- a/src/dbus/qdbusextratypes.h
+++ b/src/dbus/qdbusextratypes.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 3833874..e0d08a7 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h
index 02e60bc..d9c6021 100644
--- a/src/dbus/qdbusintegrator_p.h
+++ b/src/dbus/qdbusintegrator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp
index 248bf65..ac242f1 100644
--- a/src/dbus/qdbusinterface.cpp
+++ b/src/dbus/qdbusinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h
index 141fbe5..86917ef 100644
--- a/src/dbus/qdbusinterface.h
+++ b/src/dbus/qdbusinterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusinterface_p.h b/src/dbus/qdbusinterface_p.h
index 53de522..dd529cc 100644
--- a/src/dbus/qdbusinterface_p.h
+++ b/src/dbus/qdbusinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index 78abf94..8b700d9 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusintrospection.cpp b/src/dbus/qdbusintrospection.cpp
index 74845d0..adb92e7 100644
--- a/src/dbus/qdbusintrospection.cpp
+++ b/src/dbus/qdbusintrospection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h
index 3a69321..ec4a576 100644
--- a/src/dbus/qdbusintrospection_p.h
+++ b/src/dbus/qdbusintrospection_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h
index d8bfda5..4a15527 100644
--- a/src/dbus/qdbusmacros.h
+++ b/src/dbus/qdbusmacros.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp
index 8b174a1..449aaf9 100644
--- a/src/dbus/qdbusmarshaller.cpp
+++ b/src/dbus/qdbusmarshaller.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index d838e37..dcc63df 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h
index fa1f2c9..5e4302c 100644
--- a/src/dbus/qdbusmessage.h
+++ b/src/dbus/qdbusmessage.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h
index 867a660..130aca5 100644
--- a/src/dbus/qdbusmessage_p.h
+++ b/src/dbus/qdbusmessage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index bde8997..48ede8d 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h
index 07f1cc0..bf463c9 100644
--- a/src/dbus/qdbusmetaobject_p.h
+++ b/src/dbus/qdbusmetaobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index cb377cb..e7f86e6 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h
index 9ae1944..389aea1 100644
--- a/src/dbus/qdbusmetatype.h
+++ b/src/dbus/qdbusmetatype.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmetatype_p.h b/src/dbus/qdbusmetatype_p.h
index 7519b2b..07bf4ff 100644
--- a/src/dbus/qdbusmetatype_p.h
+++ b/src/dbus/qdbusmetatype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp
index dff4dad..b7cd875 100644
--- a/src/dbus/qdbusmisc.cpp
+++ b/src/dbus/qdbusmisc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
index c2e94b3..3132f5c 100644
--- a/src/dbus/qdbuspendingcall.cpp
+++ b/src/dbus/qdbuspendingcall.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h
index 492eb3c..930979a 100644
--- a/src/dbus/qdbuspendingcall.h
+++ b/src/dbus/qdbuspendingcall.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h
index 8683552..9eb3adb 100644
--- a/src/dbus/qdbuspendingcall_p.h
+++ b/src/dbus/qdbuspendingcall_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp
index 891b348..712b8af 100644
--- a/src/dbus/qdbuspendingreply.cpp
+++ b/src/dbus/qdbuspendingreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index 61e561e..31a483d 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp
index 81b5d0a..71e84f6 100644
--- a/src/dbus/qdbusreply.cpp
+++ b/src/dbus/qdbusreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h
index ba25308..2a2eb29 100644
--- a/src/dbus/qdbusreply.h
+++ b/src/dbus/qdbusreply.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index 6a4553c..c23bddc 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h
index 8e824a8..0365518 100644
--- a/src/dbus/qdbusserver.h
+++ b/src/dbus/qdbusserver.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp
index 426c3b0..4a9af53 100644
--- a/src/dbus/qdbusservicewatcher.cpp
+++ b/src/dbus/qdbusservicewatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h
index d9a0d92..f381706 100644
--- a/src/dbus/qdbusservicewatcher.h
+++ b/src/dbus/qdbusservicewatcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h
index 87cb4d6..dc9c871 100644
--- a/src/dbus/qdbusthreaddebug_p.h
+++ b/src/dbus/qdbusthreaddebug_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp
index 2fcdc73..ea95012 100644
--- a/src/dbus/qdbusutil.cpp
+++ b/src/dbus/qdbusutil.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h
index 2b53c6b..8976532 100644
--- a/src/dbus/qdbusutil_p.h
+++ b/src/dbus/qdbusutil_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp
index 1222ac7..ba43090 100644
--- a/src/dbus/qdbusxmlgenerator.cpp
+++ b/src/dbus/qdbusxmlgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusxmlparser.cpp b/src/dbus/qdbusxmlparser.cpp
index 05e2b11d..578df6a 100644
--- a/src/dbus/qdbusxmlparser.cpp
+++ b/src/dbus/qdbusxmlparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/dbus/qdbusxmlparser_p.h b/src/dbus/qdbusxmlparser_p.h
index 9d58e2a..55f3b76 100644
--- a/src/dbus/qdbusxmlparser_p.h
+++ b/src/dbus/qdbusxmlparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp
index 7a5e5f6..614e6d8 100644
--- a/src/declarative/debugger/qdeclarativedebug.cpp
+++ b/src/declarative/debugger/qdeclarativedebug.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h
index 3d83e8a..0a02841 100644
--- a/src/declarative/debugger/qdeclarativedebug_p.h
+++ b/src/declarative/debugger/qdeclarativedebug_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index 977e58e..af311af 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h
index 8d1706d..1eef667 100644
--- a/src/declarative/debugger/qdeclarativedebugclient_p.h
+++ b/src/declarative/debugger/qdeclarativedebugclient_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
index 476cca2..aa5a233 100644
--- a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
+++ b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h
index a3ba40a..50f525d 100644
--- a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h
+++ b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp
index 207ad2b..24cad35 100644
--- a/src/declarative/debugger/qdeclarativedebughelper.cpp
+++ b/src/declarative/debugger/qdeclarativedebughelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h
index c9cb839..bbee228 100644
--- a/src/declarative/debugger/qdeclarativedebughelper_p.h
+++ b/src/declarative/debugger/qdeclarativedebughelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index d2ef00d..bdbc8bf 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h
index 0cadbe5..3b3d866 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index 03e2d56..ca9ea1a 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h
index 704c49a..1b59dc8 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp
index c2f7709..12d4784 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h
index cfdce4e..a554b07 100644
--- a/src/declarative/debugger/qpacketprotocol_p.h
+++ b/src/declarative/debugger/qpacketprotocol_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
index 26fb97f..bf055d0 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
index c929797..bc67582 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
index 1bbea36..f9f1a35 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index 12a820f..7c08b88 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
index ec361ea..e77c728 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
index a02893d..1de3b3d 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index c58a08d..26f94f4 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
index 9944cbe..d690fb3 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
index 65583d6..92161d7 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
index dbfb3fb..5211120 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
index 0e0329e..346908b 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 29879fe..3e1c1b4 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
index 44f2bcf..9466612 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index beee741..9d4bf14 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 4ecf87b..30a75bb 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable_p.h b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
index 78eaf53..2e6d3a9 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
index f345a14..82968c7 100644
--- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h b/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h
index 99bd540..94072f7 100644
--- a/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
index da97a46..e5db430 100644
--- a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope_p.h b/src/declarative/graphicsitems/qdeclarativefocusscope_p.h
index 363167e..e6c0b28 100644
--- a/src/declarative/graphicsitems/qdeclarativefocusscope_p.h
+++ b/src/declarative/graphicsitems/qdeclarativefocusscope_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp b/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp
index d45fe83..644a486 100644
--- a/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h
index 987303e..66cb3e8 100644
--- a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 8d08c99..6ff4760 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index ee632b1..ecba769 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 9cd9ad6..9862c23 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h
index c8bb30b..7067848 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
index dd12a00..01ca797c 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
index 02b4807..c191980 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
index 68eb8d0..1fafa56 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
index aee8b28..fda5358 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 830f8e3..c1bb313 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
index afb1f2e..d21b783 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h
index f85fa27..4322a09 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h b/src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h
index 4da3bf7..c2d35d3 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 52703c2..557cd45 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
index 5c49040..7ec9423 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
index d71b2c5..109c44a 100644
--- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h
index b35f2f5..5733be7 100644
--- a/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index c1e6aaa..ea3a706 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
index 735b248..ab17d9a 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 1066c2b..3d2e226 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h
index d63eaf7..7898a24 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
index 0d4c4d0..583deec 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index a0208ef..4da9ae4 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
index 0da7515..d61b53c 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
index 48a56d9..d1be603 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index a6db1fa..fb73498 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem_p.h b/src/declarative/graphicsitems/qdeclarativepainteditem_p.h
index 8142986..4d3805e 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
index 6b23086..289f1d6 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index f93357d..16f0284 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p.h b/src/declarative/graphicsitems/qdeclarativepath_p.h
index 21e1b24..700704d 100644
--- a/src/declarative/graphicsitems/qdeclarativepath_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepath_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p_p.h b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
index 994090e..9ac0ead 100644
--- a/src/declarative/graphicsitems/qdeclarativepath_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 3ae8788..f3739a3 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index 7775b1c..2e9104a 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
index b217216..acf29ce 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index e2a373f..f8e4911 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
index 15b91e5..8177110 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
index 35946e9..26614a0 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 9831d5f..7bfafb5 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h
index ecc3fbf..208856b 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
index 001b018..6ed6832 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index 00f2848..eb2e38a 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
index ff58fa0..5b10459 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
index 5b75e50..65f6c0d 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
index a053aa0..0c3c024 100644
--- a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
index 42813dd..82d09e7 100644
--- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 1f4c1c7..9689c1a 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h
index 2cc4d52..4bd576a 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
index 48552a7..fa76f0c 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 6f5608a..93fef78 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
index 68fde3d..ae33ada 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
index 4092e65..ed80af8 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 4817999..ee9b8ac 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
index 06f77e5..f03224b 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index 5ad6a3b..ad83a83 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetranslate.cpp b/src/declarative/graphicsitems/qdeclarativetranslate.cpp
index 2e0af2a..fa4cf70 100644
--- a/src/declarative/graphicsitems/qdeclarativetranslate.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetranslate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativetranslate_p.h b/src/declarative/graphicsitems/qdeclarativetranslate_p.h
index b871518..ca52e1b 100644
--- a/src/declarative/graphicsitems/qdeclarativetranslate_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetranslate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index bbd6e11..67f683d 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
index e159786..eac45b3 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
index 1b66ba0..e443dec 100644
--- a/src/declarative/qml/parser/qdeclarativejs.g
+++ b/src/declarative/qml/parser/qdeclarativejs.g
@@ -90,11 +90,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -108,16 +108,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -143,11 +143,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -161,16 +161,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsast.cpp b/src/declarative/qml/parser/qdeclarativejsast.cpp
index 000ef86..98c4312 100644
--- a/src/declarative/qml/parser/qdeclarativejsast.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsast.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsast_p.h b/src/declarative/qml/parser/qdeclarativejsast_p.h
index 0623a2a..dff9b87 100644
--- a/src/declarative/qml/parser/qdeclarativejsast_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsast_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsastfwd_p.h b/src/declarative/qml/parser/qdeclarativejsastfwd_p.h
index d04aba5..e54c1de 100644
--- a/src/declarative/qml/parser/qdeclarativejsastfwd_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsastfwd_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp b/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp
index d9a7be3..1d7d225 100644
--- a/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h b/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h
index e1f45b4..8e5024c 100644
--- a/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
index 0527b3c..ca4dcbd 100644
--- a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.h b/src/declarative/qml/parser/qdeclarativejsengine_p.h
index 1389244..29fb032 100644
--- a/src/declarative/qml/parser/qdeclarativejsengine_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsglobal_p.h b/src/declarative/qml/parser/qdeclarativejsglobal_p.h
index 7c901ae..903ebfe 100644
--- a/src/declarative/qml/parser/qdeclarativejsglobal_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsglobal_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
index b87d8f4..11a19bf 100644
--- a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
index 064c67a..858dc90 100644
--- a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp
index 1eb42e4..4ef59c7 100644
--- a/src/declarative/qml/parser/qdeclarativejslexer.cpp
+++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h
index f2a2fa5..7ce0178 100644
--- a/src/declarative/qml/parser/qdeclarativejslexer_p.h
+++ b/src/declarative/qml/parser/qdeclarativejslexer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h
index 51e6e54..02391a7 100644
--- a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsnodepool_p.h b/src/declarative/qml/parser/qdeclarativejsnodepool_p.h
index ffa9ee5..c79e1cc 100644
--- a/src/declarative/qml/parser/qdeclarativejsnodepool_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsnodepool_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp
index 8afb93d..6b2f949 100644
--- a/src/declarative/qml/parser/qdeclarativejsparser.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h
index 005bd3f..32a7e0e 100644
--- a/src/declarative/qml/parser/qdeclarativejsparser_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qbitfield_p.h b/src/declarative/qml/qbitfield_p.h
index 28afa40..0b0a41f 100644
--- a/src/declarative/qml/qbitfield_p.h
+++ b/src/declarative/qml/qbitfield_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index 985ab72..6170b4b 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index cb6ad8c..153621d 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 941a1b3..344089e 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h
index 6926158..95c98b9 100644
--- a/src/declarative/qml/qdeclarativebinding_p_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
index 8769122..5ba606c 100644
--- a/src/declarative/qml/qdeclarativeboundsignal.cpp
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeboundsignal_p.h b/src/declarative/qml/qdeclarativeboundsignal_p.h
index 06900d7..e6f87bc 100644
--- a/src/declarative/qml/qdeclarativeboundsignal_p.h
+++ b/src/declarative/qml/qdeclarativeboundsignal_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeclassfactory.cpp b/src/declarative/qml/qdeclarativeclassfactory.cpp
index 798eacd..8adb8ef 100644
--- a/src/declarative/qml/qdeclarativeclassfactory.cpp
+++ b/src/declarative/qml/qdeclarativeclassfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeclassfactory_p.h b/src/declarative/qml/qdeclarativeclassfactory_p.h
index 9f4a3de..12a5602 100644
--- a/src/declarative/qml/qdeclarativeclassfactory_p.h
+++ b/src/declarative/qml/qdeclarativeclassfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecleanup.cpp b/src/declarative/qml/qdeclarativecleanup.cpp
index 4f48ba1..0eb4f68 100644
--- a/src/declarative/qml/qdeclarativecleanup.cpp
+++ b/src/declarative/qml/qdeclarativecleanup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecleanup_p.h b/src/declarative/qml/qdeclarativecleanup_p.h
index e9b6b45..c5298cf 100644
--- a/src/declarative/qml/qdeclarativecleanup_p.h
+++ b/src/declarative/qml/qdeclarativecleanup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 5f0fd56..572b5c4 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h
index a9772cc..79df0b2 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings_p.h
+++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp
index 5d73d89..8b36d8c 100644
--- a/src/declarative/qml/qdeclarativecompileddata.cpp
+++ b/src/declarative/qml/qdeclarativecompileddata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 90d38b3..e0f0ef7 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 89eef09..e5c6f83 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index b532b0c..e907a04 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index fd9cb2b..5980c92 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index a551cc8..d6242df 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index 59d5cfa..f1b39bc 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h
index d87123a..d69c3e9 100644
--- a/src/declarative/qml/qdeclarativecontext.h
+++ b/src/declarative/qml/qdeclarativecontext.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index 6c14feb..e7aceff 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass.cpp b/src/declarative/qml/qdeclarativecontextscriptclass.cpp
index 1ebedbb..a452dac 100644
--- a/src/declarative/qml/qdeclarativecontextscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativecontextscriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass_p.h b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
index 1215b00..6f5381b 100644
--- a/src/declarative/qml/qdeclarativecontextscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index 97a6a00..e37e945 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index c3f9dd2..e9360cc 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h
index a7e213c..0f0be52 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativedata_p.h b/src/declarative/qml/qdeclarativedata_p.h
index e916273..bfb5ab0 100644
--- a/src/declarative/qml/qdeclarativedata_p.h
+++ b/src/declarative/qml/qdeclarativedata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp
index 3e05853..ed7e73d 100644
--- a/src/declarative/qml/qdeclarativedirparser.cpp
+++ b/src/declarative/qml/qdeclarativedirparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativedirparser_p.h b/src/declarative/qml/qdeclarativedirparser_p.h
index e4f4ce6..952eba8 100644
--- a/src/declarative/qml/qdeclarativedirparser_p.h
+++ b/src/declarative/qml/qdeclarativedirparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp
index fa79425..4abb1fa 100644
--- a/src/declarative/qml/qdeclarativedom.cpp
+++ b/src/declarative/qml/qdeclarativedom.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativedom_p.h b/src/declarative/qml/qdeclarativedom_p.h
index 6043ead..27890e6 100644
--- a/src/declarative/qml/qdeclarativedom_p.h
+++ b/src/declarative/qml/qdeclarativedom_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativedom_p_p.h b/src/declarative/qml/qdeclarativedom_p_p.h
index 7ce99ec..4315760 100644
--- a/src/declarative/qml/qdeclarativedom_p_p.h
+++ b/src/declarative/qml/qdeclarativedom_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index bfed22c..b87ba52 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h
index d971d80..4c1d2d4 100644
--- a/src/declarative/qml/qdeclarativeengine.h
+++ b/src/declarative/qml/qdeclarativeengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index dc7315d..cac8f20 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index ed28185..a8d20fc 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeenginedebug_p.h b/src/declarative/qml/qdeclarativeenginedebug_p.h
index 613f1fe..d5b24ce 100644
--- a/src/declarative/qml/qdeclarativeenginedebug_p.h
+++ b/src/declarative/qml/qdeclarativeenginedebug_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeerror.cpp b/src/declarative/qml/qdeclarativeerror.cpp
index 0ab5cd9..d621169 100644
--- a/src/declarative/qml/qdeclarativeerror.cpp
+++ b/src/declarative/qml/qdeclarativeerror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h
index 04d5ff2..b5ed134 100644
--- a/src/declarative/qml/qdeclarativeerror.h
+++ b/src/declarative/qml/qdeclarativeerror.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 77a1ba4..cab33d5 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
index a8c86da..59aeaef 100644
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h
index 1700335..42d9172 100644
--- a/src/declarative/qml/qdeclarativeexpression_p.h
+++ b/src/declarative/qml/qdeclarativeexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h
index 0fabd6d..e988565 100644
--- a/src/declarative/qml/qdeclarativeextensioninterface.h
+++ b/src/declarative/qml/qdeclarativeextensioninterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.cpp b/src/declarative/qml/qdeclarativeextensionplugin.cpp
index 9b5eb61..3e8ece8 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.cpp
+++ b/src/declarative/qml/qdeclarativeextensionplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h
index 8a9378a..9508fb6 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.h
+++ b/src/declarative/qml/qdeclarativeextensionplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp
index eb69b6a..f058dd1 100644
--- a/src/declarative/qml/qdeclarativefastproperties.cpp
+++ b/src/declarative/qml/qdeclarativefastproperties.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativefastproperties_p.h b/src/declarative/qml/qdeclarativefastproperties_p.h
index 60df947..fc22780 100644
--- a/src/declarative/qml/qdeclarativefastproperties_p.h
+++ b/src/declarative/qml/qdeclarativefastproperties_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h
index 1041992..3cc903e 100644
--- a/src/declarative/qml/qdeclarativeglobal_p.h
+++ b/src/declarative/qml/qdeclarativeglobal_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
index d43443d..357d10e 100644
--- a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
index b42b7bd..27a34c5 100644
--- a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h
index 02fed0b..78558ec 100644
--- a/src/declarative/qml/qdeclarativeguard_p.h
+++ b/src/declarative/qml/qdeclarativeguard_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp
index ef31be7..b23a524 100644
--- a/src/declarative/qml/qdeclarativeimageprovider.cpp
+++ b/src/declarative/qml/qdeclarativeimageprovider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h
index 5a72943..a04b36a 100644
--- a/src/declarative/qml/qdeclarativeimageprovider.h
+++ b/src/declarative/qml/qdeclarativeimageprovider.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index fe4ed48..be70f83 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h
index 84802de..55c1f2b 100644
--- a/src/declarative/qml/qdeclarativeimport_p.h
+++ b/src/declarative/qml/qdeclarativeimport_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp
index 1e240d7..ec32217 100644
--- a/src/declarative/qml/qdeclarativeinclude.cpp
+++ b/src/declarative/qml/qdeclarativeinclude.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeinclude_p.h b/src/declarative/qml/qdeclarativeinclude_p.h
index 3124374..a35041a 100644
--- a/src/declarative/qml/qdeclarativeinclude_p.h
+++ b/src/declarative/qml/qdeclarativeinclude_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index c6560dd..6f41afd 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
index b41abd8..6111151 100644
--- a/src/declarative/qml/qdeclarativeinfo.h
+++ b/src/declarative/qml/qdeclarativeinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp
index 1767d2f..77eef30 100644
--- a/src/declarative/qml/qdeclarativeinstruction.cpp
+++ b/src/declarative/qml/qdeclarativeinstruction.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
index f0b032c..517bed4 100644
--- a/src/declarative/qml/qdeclarativeinstruction_p.h
+++ b/src/declarative/qml/qdeclarativeinstruction_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp
index d1e17a0..10a4be9 100644
--- a/src/declarative/qml/qdeclarativeintegercache.cpp
+++ b/src/declarative/qml/qdeclarativeintegercache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h
index b3a3796..f670a61 100644
--- a/src/declarative/qml/qdeclarativeintegercache_p.h
+++ b/src/declarative/qml/qdeclarativeintegercache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp
index 9598d98..706263c 100644
--- a/src/declarative/qml/qdeclarativelist.cpp
+++ b/src/declarative/qml/qdeclarativelist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index c10bc11..a673e19 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativelist_p.h b/src/declarative/qml/qdeclarativelist_p.h
index b17f84a..fdd5b29 100644
--- a/src/declarative/qml/qdeclarativelist_p.h
+++ b/src/declarative/qml/qdeclarativelist_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativelistscriptclass.cpp b/src/declarative/qml/qdeclarativelistscriptclass.cpp
index d27427e..fd3f279 100644
--- a/src/declarative/qml/qdeclarativelistscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativelistscriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativelistscriptclass_p.h b/src/declarative/qml/qdeclarativelistscriptclass_p.h
index 89984a1..b4cf386 100644
--- a/src/declarative/qml/qdeclarativelistscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativelistscriptclass_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 7a78a1f..b43f131 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index 382abd2..0f39549 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
index d22798d..bd4feaa 100644
--- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
+++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
index 8c76013..c74f859 100644
--- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
+++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativenotifier.cpp b/src/declarative/qml/qdeclarativenotifier.cpp
index 8c946f8..93701a4 100644
--- a/src/declarative/qml/qdeclarativenotifier.cpp
+++ b/src/declarative/qml/qdeclarativenotifier.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h
index 0781caf..692db4c 100644
--- a/src/declarative/qml/qdeclarativenotifier_p.h
+++ b/src/declarative/qml/qdeclarativenotifier_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index ab6ff74..afc691a 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h
index 75e384c..154bb8b 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp
index 8d00ef8..75ac723 100644
--- a/src/declarative/qml/qdeclarativeparser.cpp
+++ b/src/declarative/qml/qdeclarativeparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h
index c58aebc..8ae99c7 100644
--- a/src/declarative/qml/qdeclarativeparser_p.h
+++ b/src/declarative/qml/qdeclarativeparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeparserstatus.cpp b/src/declarative/qml/qdeclarativeparserstatus.cpp
index 4c4e429..459e62c 100644
--- a/src/declarative/qml/qdeclarativeparserstatus.cpp
+++ b/src/declarative/qml/qdeclarativeparserstatus.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h
index 60d423e..035b9b1 100644
--- a/src/declarative/qml/qdeclarativeparserstatus.h
+++ b/src/declarative/qml/qdeclarativeparserstatus.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index d45ddbc..66de1f7 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index bc20bff..58319c5 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h
index 8f6ea48..822b595 100644
--- a/src/declarative/qml/qdeclarativeproperty.h
+++ b/src/declarative/qml/qdeclarativeproperty.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
index 8522561..5dbf73a 100644
--- a/src/declarative/qml/qdeclarativeproperty_p.h
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
index 08503c2..ff5577d 100644
--- a/src/declarative/qml/qdeclarativepropertycache.cpp
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index 72cfeba..adae265 100644
--- a/src/declarative/qml/qdeclarativepropertycache_p.h
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
index 3f6d805..a2a8ef3 100644
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
index 3de5abc..be669ea 100644
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
index 039998f..7912f73 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h
index 70d2c03..7ca7315 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.h
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp
index c2dce0a..815e083 100644
--- a/src/declarative/qml/qdeclarativeproxymetaobject.cpp
+++ b/src/declarative/qml/qdeclarativeproxymetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeproxymetaobject_p.h b/src/declarative/qml/qdeclarativeproxymetaobject_p.h
index 3daa22f..6a0a469 100644
--- a/src/declarative/qml/qdeclarativeproxymetaobject_p.h
+++ b/src/declarative/qml/qdeclarativeproxymetaobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativerefcount.cpp b/src/declarative/qml/qdeclarativerefcount.cpp
index 351fcf3..3813c8b 100644
--- a/src/declarative/qml/qdeclarativerefcount.cpp
+++ b/src/declarative/qml/qdeclarativerefcount.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/qdeclarativerefcount_p.h
index 1170b86..68349fe 100644
--- a/src/declarative/qml/qdeclarativerefcount_p.h
+++ b/src/declarative/qml/qdeclarativerefcount_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativerewrite.cpp b/src/declarative/qml/qdeclarativerewrite.cpp
index bc9a114..df40901 100644
--- a/src/declarative/qml/qdeclarativerewrite.cpp
+++ b/src/declarative/qml/qdeclarativerewrite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativerewrite_p.h b/src/declarative/qml/qdeclarativerewrite_p.h
index 6f3c46e..b02b884 100644
--- a/src/declarative/qml/qdeclarativerewrite_p.h
+++ b/src/declarative/qml/qdeclarativerewrite_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index 57cc9ab..950c9f6 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativescriptparser_p.h b/src/declarative/qml/qdeclarativescriptparser_p.h
index 6319e11..ca2eeec 100644
--- a/src/declarative/qml/qdeclarativescriptparser_p.h
+++ b/src/declarative/qml/qdeclarativescriptparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativescriptstring.cpp b/src/declarative/qml/qdeclarativescriptstring.cpp
index 8f717d1..f6ae49f 100644
--- a/src/declarative/qml/qdeclarativescriptstring.cpp
+++ b/src/declarative/qml/qdeclarativescriptstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h
index fc92a9b..e3bc00e 100644
--- a/src/declarative/qml/qdeclarativescriptstring.h
+++ b/src/declarative/qml/qdeclarativescriptstring.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
index 45f277e..b5545d3 100644
--- a/src/declarative/qml/qdeclarativesqldatabase.cpp
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativesqldatabase_p.h b/src/declarative/qml/qdeclarativesqldatabase_p.h
index d0b6c0b..f837b6e 100644
--- a/src/declarative/qml/qdeclarativesqldatabase_p.h
+++ b/src/declarative/qml/qdeclarativesqldatabase_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp
index 7534a2c..ef7b1da 100644
--- a/src/declarative/qml/qdeclarativestringconverters.cpp
+++ b/src/declarative/qml/qdeclarativestringconverters.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h
index e6b0abe..0194e1c 100644
--- a/src/declarative/qml/qdeclarativestringconverters_p.h
+++ b/src/declarative/qml/qdeclarativestringconverters_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 061f309..41712c6 100644
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h
index 7381f28..4d6759e 100644
--- a/src/declarative/qml/qdeclarativetypeloader_p.h
+++ b/src/declarative/qml/qdeclarativetypeloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypenamecache.cpp b/src/declarative/qml/qdeclarativetypenamecache.cpp
index ea32aa0..e61acfd 100644
--- a/src/declarative/qml/qdeclarativetypenamecache.cpp
+++ b/src/declarative/qml/qdeclarativetypenamecache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypenamecache_p.h b/src/declarative/qml/qdeclarativetypenamecache_p.h
index afd2fd9..83d5d12 100644
--- a/src/declarative/qml/qdeclarativetypenamecache_p.h
+++ b/src/declarative/qml/qdeclarativetypenamecache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
index cba7b4a..d987986 100644
--- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h
index 310e14e..505e1e5 100644
--- a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypenotavailable.cpp b/src/declarative/qml/qdeclarativetypenotavailable.cpp
index 7a84732..45ef29b 100644
--- a/src/declarative/qml/qdeclarativetypenotavailable.cpp
+++ b/src/declarative/qml/qdeclarativetypenotavailable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativetypenotavailable_p.h b/src/declarative/qml/qdeclarativetypenotavailable_p.h
index 9c1c256..52c4679 100644
--- a/src/declarative/qml/qdeclarativetypenotavailable_p.h
+++ b/src/declarative/qml/qdeclarativetypenotavailable_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index b9e9cec..d459841 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 4b1bbd6..d95341e 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
index 60f2cb3..63e3e00 100644
--- a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h b/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h
index 9dafa99..2eaf051 100644
--- a/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h
+++ b/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 4e41c22..f8a1f77 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h
index 87a1aab..e24bbb3 100644
--- a/src/declarative/qml/qdeclarativevme_p.h
+++ b/src/declarative/qml/qdeclarativevme_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index 3e32006..85ff222 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h
index 20ca80b..afbf1b6 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject_p.h
+++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp
index da1419f..f9e8b8e 100644
--- a/src/declarative/qml/qdeclarativewatcher.cpp
+++ b/src/declarative/qml/qdeclarativewatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativewatcher_p.h b/src/declarative/qml/qdeclarativewatcher_p.h
index 4e3352f..81e80fb 100644
--- a/src/declarative/qml/qdeclarativewatcher_p.h
+++ b/src/declarative/qml/qdeclarativewatcher_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index 789116e..170cdb7 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h
index 2b1f9f9..7b306a7 100644
--- a/src/declarative/qml/qdeclarativeworkerscript_p.h
+++ b/src/declarative/qml/qdeclarativeworkerscript_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 332acc4..a65dc40 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest_p.h b/src/declarative/qml/qdeclarativexmlhttprequest_p.h
index f340c1c..73addb6 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest_p.h
+++ b/src/declarative/qml/qdeclarativexmlhttprequest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index 58f8811..762264c 100644
--- a/src/declarative/qml/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qmetaobjectbuilder_p.h b/src/declarative/qml/qmetaobjectbuilder_p.h
index dbaf9e6..782614c 100644
--- a/src/declarative/qml/qmetaobjectbuilder_p.h
+++ b/src/declarative/qml/qmetaobjectbuilder_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/qpodvector_p.h b/src/declarative/qml/qpodvector_p.h
index caf564a..00327c0 100644
--- a/src/declarative/qml/qpodvector_p.h
+++ b/src/declarative/qml/qpodvector_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp
index 6d2ccfb..158dd52 100644
--- a/src/declarative/qml/rewriter/rewriter.cpp
+++ b/src/declarative/qml/rewriter/rewriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/rewriter/rewriter_p.h b/src/declarative/qml/rewriter/rewriter_p.h
index 4799469..f6bff86 100644
--- a/src/declarative/qml/rewriter/rewriter_p.h
+++ b/src/declarative/qml/rewriter/rewriter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp
index 619f5c9..ec4ddf0 100644
--- a/src/declarative/qml/rewriter/textwriter.cpp
+++ b/src/declarative/qml/rewriter/textwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/qml/rewriter/textwriter_p.h b/src/declarative/qml/rewriter/textwriter_p.h
index c712626..258f47d 100644
--- a/src/declarative/qml/rewriter/textwriter_p.h
+++ b/src/declarative/qml/rewriter/textwriter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index ea3da25..1fbabea 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 8cb17e4..156af32 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index e38580c..868052f 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index f1b6f9a..af4ae08 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
index 9801fb2..a661faf 100644
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 88b45ae..a0acfd8 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativebind_p.h b/src/declarative/util/qdeclarativebind_p.h
index 3dc7dba..62bfb4f 100644
--- a/src/declarative/util/qdeclarativebind_p.h
+++ b/src/declarative/util/qdeclarativebind_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 15e5ac5..b7c4cf0 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/declarative/util/qdeclarativeconnections_p.h
index e8105b4..c4d9557 100644
--- a/src/declarative/util/qdeclarativeconnections_p.h
+++ b/src/declarative/util/qdeclarativeconnections_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 3e4a81a..1886a52 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/declarative/util/qdeclarativefontloader_p.h
index bebd5a0..5cb3e15 100644
--- a/src/declarative/util/qdeclarativefontloader_p.h
+++ b/src/declarative/util/qdeclarativefontloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp
index 4ac587f..5375395 100644
--- a/src/declarative/util/qdeclarativelistaccessor.cpp
+++ b/src/declarative/util/qdeclarativelistaccessor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativelistaccessor_p.h b/src/declarative/util/qdeclarativelistaccessor_p.h
index 41aacb9..4ae5f27 100644
--- a/src/declarative/util/qdeclarativelistaccessor_p.h
+++ b/src/declarative/util/qdeclarativelistaccessor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 3263238..1d9b9c9 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index fe42ef6..db638b0 100644
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index d2d40ee..11b0a88 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
index 6804d4a..035f8c9 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index 10c3bca..da1d37c 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativenullablevalue_p_p.h b/src/declarative/util/qdeclarativenullablevalue_p_p.h
index fc3f8af..c554a69 100644
--- a/src/declarative/util/qdeclarativenullablevalue_p_p.h
+++ b/src/declarative/util/qdeclarativenullablevalue_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp
index 40485bd..e6f6d91 100644
--- a/src/declarative/util/qdeclarativeopenmetaobject.cpp
+++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeopenmetaobject_p.h b/src/declarative/util/qdeclarativeopenmetaobject_p.h
index c18fa3d..f3be3fc 100644
--- a/src/declarative/util/qdeclarativeopenmetaobject_p.h
+++ b/src/declarative/util/qdeclarativeopenmetaobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp
index a5ec9b3..80b5f3a 100644
--- a/src/declarative/util/qdeclarativepackage.cpp
+++ b/src/declarative/util/qdeclarativepackage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepackage_p.h b/src/declarative/util/qdeclarativepackage_p.h
index 6b12ef7..aea0369 100644
--- a/src/declarative/util/qdeclarativepackage_p.h
+++ b/src/declarative/util/qdeclarativepackage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 4fc52f5..0784760 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h
index 2e83cc4..c84cf0d 100644
--- a/src/declarative/util/qdeclarativepixmapcache_p.h
+++ b/src/declarative/util/qdeclarativepixmapcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 8d01b80..82aebe4 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h
index 199928f..89ea7a3 100644
--- a/src/declarative/util/qdeclarativepropertychanges_p.h
+++ b/src/declarative/util/qdeclarativepropertychanges_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp
index 6b43040..3abc35d 100644
--- a/src/declarative/util/qdeclarativepropertymap.cpp
+++ b/src/declarative/util/qdeclarativepropertymap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h
index 1b6594b..d87913b 100644
--- a/src/declarative/util/qdeclarativepropertymap.h
+++ b/src/declarative/util/qdeclarativepropertymap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index ca83c52..5e0dcab 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h
index 8b51209..b3840a8 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
index cb0f4c2..541e148 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp
index e0fc45d..3736df9 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativespringanimation_p.h b/src/declarative/util/qdeclarativespringanimation_p.h
index ee276ec..97f59ca 100644
--- a/src/declarative/util/qdeclarativespringanimation_p.h
+++ b/src/declarative/util/qdeclarativespringanimation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 0f5413e..219fdbb 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index a0ab11b..832843e 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 4fd8f21..68fc922 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 6d9563e..ae0c6c1 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h
index cac23f4..cf9e9dd 100644
--- a/src/declarative/util/qdeclarativestategroup_p.h
+++ b/src/declarative/util/qdeclarativestategroup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 8cb813c..77f6c93 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
index 4f905b6..fc7abcc 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp
index 91566bc..50da665 100644
--- a/src/declarative/util/qdeclarativestyledtext.cpp
+++ b/src/declarative/util/qdeclarativestyledtext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativestyledtext_p.h b/src/declarative/util/qdeclarativestyledtext_p.h
index d80ff9d..3d7e714 100644
--- a/src/declarative/util/qdeclarativestyledtext_p.h
+++ b/src/declarative/util/qdeclarativestyledtext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp
index 7b80736..90e3a21 100644
--- a/src/declarative/util/qdeclarativesystempalette.cpp
+++ b/src/declarative/util/qdeclarativesystempalette.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativesystempalette_p.h b/src/declarative/util/qdeclarativesystempalette_p.h
index 4dfbeff..168c81b 100644
--- a/src/declarative/util/qdeclarativesystempalette_p.h
+++ b/src/declarative/util/qdeclarativesystempalette_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp
index 378c539..e82441e 100644
--- a/src/declarative/util/qdeclarativetimeline.cpp
+++ b/src/declarative/util/qdeclarativetimeline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetimeline_p_p.h b/src/declarative/util/qdeclarativetimeline_p_p.h
index 61f6bcd..3391e62 100644
--- a/src/declarative/util/qdeclarativetimeline_p_p.h
+++ b/src/declarative/util/qdeclarativetimeline_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index c240f22..248bde0 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h
index 08c3d4e..41f61b6 100644
--- a/src/declarative/util/qdeclarativetimer_p.h
+++ b/src/declarative/util/qdeclarativetimer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index 478c7f4..34ecc45 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h
index fc7a577..93fe626 100644
--- a/src/declarative/util/qdeclarativetransition_p.h
+++ b/src/declarative/util/qdeclarativetransition_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 89b0044..2a63dc8 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
index 75d11a9..0af0747 100644
--- a/src/declarative/util/qdeclarativetransitionmanager_p_p.h
+++ b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 0544f22..40fd6bc 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeutilmodule_p.h b/src/declarative/util/qdeclarativeutilmodule_p.h
index 602c8c5..7f58857 100644
--- a/src/declarative/util/qdeclarativeutilmodule_p.h
+++ b/src/declarative/util/qdeclarativeutilmodule_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 8f06858..fe85e47a 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index d3e4948..5755862 100644
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 24edc89..bb06198 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qdeclarativexmllistmodel_p.h b/src/declarative/util/qdeclarativexmllistmodel_p.h
index 832847e..7156b8d 100644
--- a/src/declarative/util/qdeclarativexmllistmodel_p.h
+++ b/src/declarative/util/qdeclarativexmllistmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qlistmodelinterface.cpp b/src/declarative/util/qlistmodelinterface.cpp
index acf4dd6..eaa51e1 100644
--- a/src/declarative/util/qlistmodelinterface.cpp
+++ b/src/declarative/util/qlistmodelinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclaractive module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/util/qlistmodelinterface_p.h
index 07592ad..187b7fa 100644
--- a/src/declarative/util/qlistmodelinterface_p.h
+++ b/src/declarative/util/qlistmodelinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 0921bdb..3dcff84 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 6721e0e..c3f8c7a 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp
index 1754019..00eede7 100644
--- a/src/gui/accessible/qaccessible2.cpp
+++ b/src/gui/accessible/qaccessible2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
index d176ac4..297aea4 100644
--- a/src/gui/accessible/qaccessible2.h
+++ b/src/gui/accessible/qaccessible2.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible_mac.mm b/src/gui/accessible/qaccessible_mac.mm
index 57ea41b..41cd801 100644
--- a/src/gui/accessible/qaccessible_mac.mm
+++ b/src/gui/accessible/qaccessible_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible_mac_carbon.cpp b/src/gui/accessible/qaccessible_mac_carbon.cpp
index ffa7b65..04a696c 100644
--- a/src/gui/accessible/qaccessible_mac_carbon.cpp
+++ b/src/gui/accessible/qaccessible_mac_carbon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible_mac_cocoa.mm b/src/gui/accessible/qaccessible_mac_cocoa.mm
index ada927e..65b81dc 100644
--- a/src/gui/accessible/qaccessible_mac_cocoa.mm
+++ b/src/gui/accessible/qaccessible_mac_cocoa.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible_mac_p.h b/src/gui/accessible/qaccessible_mac_p.h
index 4ee3a2d..069be38 100644
--- a/src/gui/accessible/qaccessible_mac_p.h
+++ b/src/gui/accessible/qaccessible_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible_unix.cpp b/src/gui/accessible/qaccessible_unix.cpp
index 568a219..e0867e1 100644
--- a/src/gui/accessible/qaccessible_unix.cpp
+++ b/src/gui/accessible/qaccessible_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp
index 31e7245..2c2d37a 100644
--- a/src/gui/accessible/qaccessible_win.cpp
+++ b/src/gui/accessible/qaccessible_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp
index 4eeca7c..46ea495 100644
--- a/src/gui/accessible/qaccessiblebridge.cpp
+++ b/src/gui/accessible/qaccessiblebridge.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h
index 54eaa36..171e9d5 100644
--- a/src/gui/accessible/qaccessiblebridge.h
+++ b/src/gui/accessible/qaccessiblebridge.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index 7b2e7ce..ae4e2d6 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h
index b847c5e..fcc716f 100644
--- a/src/gui/accessible/qaccessibleobject.h
+++ b/src/gui/accessible/qaccessibleobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp
index 9c323cc..0c41e7f 100644
--- a/src/gui/accessible/qaccessibleplugin.cpp
+++ b/src/gui/accessible/qaccessibleplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h
index e4b6d33..556757f 100644
--- a/src/gui/accessible/qaccessibleplugin.h
+++ b/src/gui/accessible/qaccessibleplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/gui/accessible/qaccessiblewidget.cpp
index 7c13367..eec67fe 100644
--- a/src/gui/accessible/qaccessiblewidget.cpp
+++ b/src/gui/accessible/qaccessiblewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/accessible/qaccessiblewidget.h b/src/gui/accessible/qaccessiblewidget.h
index 1ee5370..abf96a6 100644
--- a/src/gui/accessible/qaccessiblewidget.h
+++ b/src/gui/accessible/qaccessiblewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
index 28cde3e..fce745f 100644
--- a/src/gui/animation/qguivariantanimation.cpp
+++ b/src/gui/animation/qguivariantanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qabstractpagesetupdialog.cpp b/src/gui/dialogs/qabstractpagesetupdialog.cpp
index 2f44b41..eb80cc3 100644
--- a/src/gui/dialogs/qabstractpagesetupdialog.cpp
+++ b/src/gui/dialogs/qabstractpagesetupdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qabstractpagesetupdialog.h b/src/gui/dialogs/qabstractpagesetupdialog.h
index 406a32c..c37d33e 100644
--- a/src/gui/dialogs/qabstractpagesetupdialog.h
+++ b/src/gui/dialogs/qabstractpagesetupdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qabstractpagesetupdialog_p.h b/src/gui/dialogs/qabstractpagesetupdialog_p.h
index e6e0121..18588e8 100644
--- a/src/gui/dialogs/qabstractpagesetupdialog_p.h
+++ b/src/gui/dialogs/qabstractpagesetupdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qabstractprintdialog.cpp b/src/gui/dialogs/qabstractprintdialog.cpp
index 25d9ebb..c59f682 100644
--- a/src/gui/dialogs/qabstractprintdialog.cpp
+++ b/src/gui/dialogs/qabstractprintdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qabstractprintdialog.h b/src/gui/dialogs/qabstractprintdialog.h
index 82e3df8..c4231be 100644
--- a/src/gui/dialogs/qabstractprintdialog.h
+++ b/src/gui/dialogs/qabstractprintdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qabstractprintdialog_p.h b/src/gui/dialogs/qabstractprintdialog_p.h
index 5ed35df..c2007a5 100644
--- a/src/gui/dialogs/qabstractprintdialog_p.h
+++ b/src/gui/dialogs/qabstractprintdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index e9b5720..1b942a2 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qcolordialog.h b/src/gui/dialogs/qcolordialog.h
index 0803506..b54cf97 100644
--- a/src/gui/dialogs/qcolordialog.h
+++ b/src/gui/dialogs/qcolordialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm
index 82cfa24..9df6395 100644
--- a/src/gui/dialogs/qcolordialog_mac.mm
+++ b/src/gui/dialogs/qcolordialog_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qcolordialog_p.h b/src/gui/dialogs/qcolordialog_p.h
index 4bae898..c799611 100644
--- a/src/gui/dialogs/qcolordialog_p.h
+++ b/src/gui/dialogs/qcolordialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index 9e0437c..e70c569 100644
--- a/src/gui/dialogs/qdialog.cpp
+++ b/src/gui/dialogs/qdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qdialog.h b/src/gui/dialogs/qdialog.h
index b2ba93c..62466f8 100644
--- a/src/gui/dialogs/qdialog.h
+++ b/src/gui/dialogs/qdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qdialog_p.h b/src/gui/dialogs/qdialog_p.h
index 8088c85..15862a6 100644
--- a/src/gui/dialogs/qdialog_p.h
+++ b/src/gui/dialogs/qdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qdialogsbinarycompat_win.cpp b/src/gui/dialogs/qdialogsbinarycompat_win.cpp
index 56e31c2..8df0219 100644
--- a/src/gui/dialogs/qdialogsbinarycompat_win.cpp
+++ b/src/gui/dialogs/qdialogsbinarycompat_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qerrormessage.cpp b/src/gui/dialogs/qerrormessage.cpp
index 7be7481..39a168b 100644
--- a/src/gui/dialogs/qerrormessage.cpp
+++ b/src/gui/dialogs/qerrormessage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qerrormessage.h b/src/gui/dialogs/qerrormessage.h
index 535bad7..47a71c3 100644
--- a/src/gui/dialogs/qerrormessage.h
+++ b/src/gui/dialogs/qerrormessage.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index cb74a3c..2cf9eea 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfiledialog.h b/src/gui/dialogs/qfiledialog.h
index 16cb317..a670cad 100644
--- a/src/gui/dialogs/qfiledialog.h
+++ b/src/gui/dialogs/qfiledialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfiledialog.ui b/src/gui/dialogs/qfiledialog.ui
index 1f35abb..972f0d0 100644
--- a/src/gui/dialogs/qfiledialog.ui
+++ b/src/gui/dialogs/qfiledialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/src/gui/dialogs/qfiledialog_embedded.ui b/src/gui/dialogs/qfiledialog_embedded.ui
index 10c9463..14bd72c 100644
--- a/src/gui/dialogs/qfiledialog_embedded.ui
+++ b/src/gui/dialogs/qfiledialog_embedded.ui
@@ -8,11 +8,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
index 87850a7..e7a7c93 100644
--- a/src/gui/dialogs/qfiledialog_mac.mm
+++ b/src/gui/dialogs/qfiledialog_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h
index 661bf1f..741fc02 100644
--- a/src/gui/dialogs/qfiledialog_p.h
+++ b/src/gui/dialogs/qfiledialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp
index 5b192b4..7bf2833 100644
--- a/src/gui/dialogs/qfiledialog_win.cpp
+++ b/src/gui/dialogs/qfiledialog_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfiledialog_win_p.h b/src/gui/dialogs/qfiledialog_win_p.h
index 7079925..a79e1b8 100644
--- a/src/gui/dialogs/qfiledialog_win_p.h
+++ b/src/gui/dialogs/qfiledialog_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index af0506f..2dc82fe 100644
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h
index 8681eb5..e5a0f3b 100644
--- a/src/gui/dialogs/qfileinfogatherer_p.h
+++ b/src/gui/dialogs/qfileinfogatherer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 8a6190f..35c9024 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfilesystemmodel.h b/src/gui/dialogs/qfilesystemmodel.h
index d8178c7..1942246 100644
--- a/src/gui/dialogs/qfilesystemmodel.h
+++ b/src/gui/dialogs/qfilesystemmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h
index 03e0bfb..022e102 100644
--- a/src/gui/dialogs/qfilesystemmodel_p.h
+++ b/src/gui/dialogs/qfilesystemmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp
index b159fa7..5b3b9ab 100644
--- a/src/gui/dialogs/qfontdialog.cpp
+++ b/src/gui/dialogs/qfontdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfontdialog.h b/src/gui/dialogs/qfontdialog.h
index 6035a3a..3001521 100644
--- a/src/gui/dialogs/qfontdialog.h
+++ b/src/gui/dialogs/qfontdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm
index 9c63dfa..d8d6093 100644
--- a/src/gui/dialogs/qfontdialog_mac.mm
+++ b/src/gui/dialogs/qfontdialog_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfontdialog_p.h b/src/gui/dialogs/qfontdialog_p.h
index 8676be3..78fd7fa 100644
--- a/src/gui/dialogs/qfontdialog_p.h
+++ b/src/gui/dialogs/qfontdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qfscompleter_p.h b/src/gui/dialogs/qfscompleter_p.h
index 917e176..a266bb2 100644
--- a/src/gui/dialogs/qfscompleter_p.h
+++ b/src/gui/dialogs/qfscompleter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index e996ee9..ad7e570 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qinputdialog.h b/src/gui/dialogs/qinputdialog.h
index 02868c1..e4eeaa7 100644
--- a/src/gui/dialogs/qinputdialog.h
+++ b/src/gui/dialogs/qinputdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index fe25b0f..57a39d0 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qmessagebox.h b/src/gui/dialogs/qmessagebox.h
index f1ff6cc..25788e3 100644
--- a/src/gui/dialogs/qmessagebox.h
+++ b/src/gui/dialogs/qmessagebox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qnspanelproxy_mac.mm b/src/gui/dialogs/qnspanelproxy_mac.mm
index 0bd5c63..79d4043 100644
--- a/src/gui/dialogs/qnspanelproxy_mac.mm
+++ b/src/gui/dialogs/qnspanelproxy_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qpagesetupdialog.cpp b/src/gui/dialogs/qpagesetupdialog.cpp
index 5d77de1..97ba0b2 100644
--- a/src/gui/dialogs/qpagesetupdialog.cpp
+++ b/src/gui/dialogs/qpagesetupdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qpagesetupdialog.h b/src/gui/dialogs/qpagesetupdialog.h
index b84758c..9db7e13 100644
--- a/src/gui/dialogs/qpagesetupdialog.h
+++ b/src/gui/dialogs/qpagesetupdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qpagesetupdialog_mac.mm b/src/gui/dialogs/qpagesetupdialog_mac.mm
index 0302be4..1993fe6 100644
--- a/src/gui/dialogs/qpagesetupdialog_mac.mm
+++ b/src/gui/dialogs/qpagesetupdialog_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qpagesetupdialog_unix.cpp b/src/gui/dialogs/qpagesetupdialog_unix.cpp
index e24cabe..1c10b96 100644
--- a/src/gui/dialogs/qpagesetupdialog_unix.cpp
+++ b/src/gui/dialogs/qpagesetupdialog_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qpagesetupdialog_unix_p.h b/src/gui/dialogs/qpagesetupdialog_unix_p.h
index 1ffab99..4ea9561 100644
--- a/src/gui/dialogs/qpagesetupdialog_unix_p.h
+++ b/src/gui/dialogs/qpagesetupdialog_unix_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qpagesetupdialog_win.cpp b/src/gui/dialogs/qpagesetupdialog_win.cpp
index fed4bc8..b52abc7 100644
--- a/src/gui/dialogs/qpagesetupdialog_win.cpp
+++ b/src/gui/dialogs/qpagesetupdialog_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprintdialog.h b/src/gui/dialogs/qprintdialog.h
index 94177ea..235dd49 100644
--- a/src/gui/dialogs/qprintdialog.h
+++ b/src/gui/dialogs/qprintdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprintdialog_mac.mm b/src/gui/dialogs/qprintdialog_mac.mm
index 84a72db..2298f50 100644
--- a/src/gui/dialogs/qprintdialog_mac.mm
+++ b/src/gui/dialogs/qprintdialog_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprintdialog_qws.cpp b/src/gui/dialogs/qprintdialog_qws.cpp
index b071427..ef59ebe 100644
--- a/src/gui/dialogs/qprintdialog_qws.cpp
+++ b/src/gui/dialogs/qprintdialog_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp
index 5d0bcac..a7c77cf 100644
--- a/src/gui/dialogs/qprintdialog_unix.cpp
+++ b/src/gui/dialogs/qprintdialog_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprintdialog_win.cpp b/src/gui/dialogs/qprintdialog_win.cpp
index 38c8759..a723b82 100644
--- a/src/gui/dialogs/qprintdialog_win.cpp
+++ b/src/gui/dialogs/qprintdialog_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp
index f21343e..ac999cd 100644
--- a/src/gui/dialogs/qprintpreviewdialog.cpp
+++ b/src/gui/dialogs/qprintpreviewdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprintpreviewdialog.h b/src/gui/dialogs/qprintpreviewdialog.h
index a9d5052..7619c99 100644
--- a/src/gui/dialogs/qprintpreviewdialog.h
+++ b/src/gui/dialogs/qprintpreviewdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/gui/dialogs/qprogressdialog.cpp
index d64c847..aa5df43 100644
--- a/src/gui/dialogs/qprogressdialog.cpp
+++ b/src/gui/dialogs/qprogressdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qprogressdialog.h b/src/gui/dialogs/qprogressdialog.h
index 16afea8..ded5114 100644
--- a/src/gui/dialogs/qprogressdialog.h
+++ b/src/gui/dialogs/qprogressdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp
index 8262ddf..d403d14 100644
--- a/src/gui/dialogs/qsidebar.cpp
+++ b/src/gui/dialogs/qsidebar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qsidebar_p.h b/src/gui/dialogs/qsidebar_p.h
index 126b61a..357e665 100644
--- a/src/gui/dialogs/qsidebar_p.h
+++ b/src/gui/dialogs/qsidebar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp
index 8607529..75e0fba 100644
--- a/src/gui/dialogs/qwizard.cpp
+++ b/src/gui/dialogs/qwizard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qwizard.h b/src/gui/dialogs/qwizard.h
index b146147..1952a63 100644
--- a/src/gui/dialogs/qwizard.h
+++ b/src/gui/dialogs/qwizard.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp
index 5fca8f2..2af878f 100644
--- a/src/gui/dialogs/qwizard_win.cpp
+++ b/src/gui/dialogs/qwizard_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/dialogs/qwizard_win_p.h b/src/gui/dialogs/qwizard_win_p.h
index caf018d..49e26d7 100644
--- a/src/gui/dialogs/qwizard_win_p.h
+++ b/src/gui/dialogs/qwizard_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp
index 0029017..82475b3 100644
--- a/src/gui/effects/qgraphicseffect.cpp
+++ b/src/gui/effects/qgraphicseffect.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h
index 90eb61c..b52fe97 100644
--- a/src/gui/effects/qgraphicseffect.h
+++ b/src/gui/effects/qgraphicseffect.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/effects/qgraphicseffect_p.h b/src/gui/effects/qgraphicseffect_p.h
index e34dbf9..c7b7aec 100644
--- a/src/gui/effects/qgraphicseffect_p.h
+++ b/src/gui/effects/qgraphicseffect_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index af3b79a..bb2dc5a 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index aa08934..90ba09b 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qegl_qws.cpp b/src/gui/egl/qegl_qws.cpp
index 50db397..ee13cc2 100644
--- a/src/gui/egl/qegl_qws.cpp
+++ b/src/gui/egl/qegl_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qegl_stub.cpp b/src/gui/egl/qegl_stub.cpp
index 1adb56c..72409a1 100644
--- a/src/gui/egl/qegl_stub.cpp
+++ b/src/gui/egl/qegl_stub.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qegl_symbian.cpp b/src/gui/egl/qegl_symbian.cpp
index 9744ed0..87cf943 100644
--- a/src/gui/egl/qegl_symbian.cpp
+++ b/src/gui/egl/qegl_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qegl_wince.cpp b/src/gui/egl/qegl_wince.cpp
index 2d08805..cbf91f4 100644
--- a/src/gui/egl/qegl_wince.cpp
+++ b/src/gui/egl/qegl_wince.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index 15cc109..5fe96c4 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qeglcontext_p.h b/src/gui/egl/qeglcontext_p.h
index 5bc8f09..1ac1961 100644
--- a/src/gui/egl/qeglcontext_p.h
+++ b/src/gui/egl/qeglcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp
index 4b8ca9a..da326d0 100644
--- a/src/gui/egl/qeglproperties.cpp
+++ b/src/gui/egl/qeglproperties.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h
index b1f9642..db2d661 100644
--- a/src/gui/egl/qeglproperties_p.h
+++ b/src/gui/egl/qeglproperties_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/egl/qeglproperties_stub.cpp b/src/gui/egl/qeglproperties_stub.cpp
index 2012ebd..f63f0f9 100644
--- a/src/gui/egl/qeglproperties_stub.cpp
+++ b/src/gui/egl/qeglproperties_stub.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qcopchannel_qws.cpp b/src/gui/embedded/qcopchannel_qws.cpp
index 5786866..3ee593a 100644
--- a/src/gui/embedded/qcopchannel_qws.cpp
+++ b/src/gui/embedded/qcopchannel_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qcopchannel_qws.h b/src/gui/embedded/qcopchannel_qws.h
index 09a9821..9b2e092 100644
--- a/src/gui/embedded/qcopchannel_qws.h
+++ b/src/gui/embedded/qcopchannel_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecoration_qws.cpp b/src/gui/embedded/qdecoration_qws.cpp
index 1b068df..06e0e8e 100644
--- a/src/gui/embedded/qdecoration_qws.cpp
+++ b/src/gui/embedded/qdecoration_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecoration_qws.h b/src/gui/embedded/qdecoration_qws.h
index 5d71e48..75911ec 100644
--- a/src/gui/embedded/qdecoration_qws.h
+++ b/src/gui/embedded/qdecoration_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationdefault_qws.cpp b/src/gui/embedded/qdecorationdefault_qws.cpp
index e016c27..4ae1a5b 100644
--- a/src/gui/embedded/qdecorationdefault_qws.cpp
+++ b/src/gui/embedded/qdecorationdefault_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationdefault_qws.h b/src/gui/embedded/qdecorationdefault_qws.h
index 6cd959b..17a4fae 100644
--- a/src/gui/embedded/qdecorationdefault_qws.h
+++ b/src/gui/embedded/qdecorationdefault_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationfactory_qws.cpp b/src/gui/embedded/qdecorationfactory_qws.cpp
index 5d5035d..27b1c2c 100644
--- a/src/gui/embedded/qdecorationfactory_qws.cpp
+++ b/src/gui/embedded/qdecorationfactory_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationfactory_qws.h b/src/gui/embedded/qdecorationfactory_qws.h
index 0e8423a..e372cf4 100644
--- a/src/gui/embedded/qdecorationfactory_qws.h
+++ b/src/gui/embedded/qdecorationfactory_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationplugin_qws.cpp b/src/gui/embedded/qdecorationplugin_qws.cpp
index 4b4305c..24b2065 100644
--- a/src/gui/embedded/qdecorationplugin_qws.cpp
+++ b/src/gui/embedded/qdecorationplugin_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationplugin_qws.h b/src/gui/embedded/qdecorationplugin_qws.h
index 3ff4a37..fafd94c 100644
--- a/src/gui/embedded/qdecorationplugin_qws.h
+++ b/src/gui/embedded/qdecorationplugin_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationstyled_qws.cpp b/src/gui/embedded/qdecorationstyled_qws.cpp
index a3c329d..324a22d 100644
--- a/src/gui/embedded/qdecorationstyled_qws.cpp
+++ b/src/gui/embedded/qdecorationstyled_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationstyled_qws.h b/src/gui/embedded/qdecorationstyled_qws.h
index c24cb45..fdcf61f 100644
--- a/src/gui/embedded/qdecorationstyled_qws.h
+++ b/src/gui/embedded/qdecorationstyled_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationwindows_qws.cpp b/src/gui/embedded/qdecorationwindows_qws.cpp
index 32d4ea4..ca98e39 100644
--- a/src/gui/embedded/qdecorationwindows_qws.cpp
+++ b/src/gui/embedded/qdecorationwindows_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdecorationwindows_qws.h b/src/gui/embedded/qdecorationwindows_qws.h
index cad4bae..a8fbea7 100644
--- a/src/gui/embedded/qdecorationwindows_qws.h
+++ b/src/gui/embedded/qdecorationwindows_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdirectpainter_qws.cpp b/src/gui/embedded/qdirectpainter_qws.cpp
index 449fd6e..dc7b1ea 100644
--- a/src/gui/embedded/qdirectpainter_qws.cpp
+++ b/src/gui/embedded/qdirectpainter_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qdirectpainter_qws.h b/src/gui/embedded/qdirectpainter_qws.h
index 05f1bd0..040e581 100644
--- a/src/gui/embedded/qdirectpainter_qws.h
+++ b/src/gui/embedded/qdirectpainter_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbd_defaultmap_qws_p.h b/src/gui/embedded/qkbd_defaultmap_qws_p.h
index 16c3459..e2ed5b1 100644
--- a/src/gui/embedded/qkbd_defaultmap_qws_p.h
+++ b/src/gui/embedded/qkbd_defaultmap_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbd_qws.cpp b/src/gui/embedded/qkbd_qws.cpp
index b28e293..653fae4 100644
--- a/src/gui/embedded/qkbd_qws.cpp
+++ b/src/gui/embedded/qkbd_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbd_qws.h b/src/gui/embedded/qkbd_qws.h
index 129a7ff..09cb571 100644
--- a/src/gui/embedded/qkbd_qws.h
+++ b/src/gui/embedded/qkbd_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbd_qws_p.h b/src/gui/embedded/qkbd_qws_p.h
index 6ab7a83..f0ee552 100644
--- a/src/gui/embedded/qkbd_qws_p.h
+++ b/src/gui/embedded/qkbd_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbddriverfactory_qws.cpp b/src/gui/embedded/qkbddriverfactory_qws.cpp
index d0e24e4..e96d53d 100644
--- a/src/gui/embedded/qkbddriverfactory_qws.cpp
+++ b/src/gui/embedded/qkbddriverfactory_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbddriverfactory_qws.h b/src/gui/embedded/qkbddriverfactory_qws.h
index ac883af..1189092 100644
--- a/src/gui/embedded/qkbddriverfactory_qws.h
+++ b/src/gui/embedded/qkbddriverfactory_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbddriverplugin_qws.cpp b/src/gui/embedded/qkbddriverplugin_qws.cpp
index 2fcc3e1..23bfd4d 100644
--- a/src/gui/embedded/qkbddriverplugin_qws.cpp
+++ b/src/gui/embedded/qkbddriverplugin_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbddriverplugin_qws.h b/src/gui/embedded/qkbddriverplugin_qws.h
index 7bb72ca..aca8756 100644
--- a/src/gui/embedded/qkbddriverplugin_qws.h
+++ b/src/gui/embedded/qkbddriverplugin_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdlinuxinput_qws.cpp b/src/gui/embedded/qkbdlinuxinput_qws.cpp
index f53c444..85bf91a 100644
--- a/src/gui/embedded/qkbdlinuxinput_qws.cpp
+++ b/src/gui/embedded/qkbdlinuxinput_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdlinuxinput_qws.h b/src/gui/embedded/qkbdlinuxinput_qws.h
index fde2773..eefe71e 100644
--- a/src/gui/embedded/qkbdlinuxinput_qws.h
+++ b/src/gui/embedded/qkbdlinuxinput_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdqnx_qws.cpp b/src/gui/embedded/qkbdqnx_qws.cpp
index 72d1cb5..42cfc3b 100644
--- a/src/gui/embedded/qkbdqnx_qws.cpp
+++ b/src/gui/embedded/qkbdqnx_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdqnx_qws.h b/src/gui/embedded/qkbdqnx_qws.h
index 3dcf20a..797741f 100644
--- a/src/gui/embedded/qkbdqnx_qws.h
+++ b/src/gui/embedded/qkbdqnx_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
index 2e05d2a..4a77081 100644
--- a/src/gui/embedded/qkbdtty_qws.cpp
+++ b/src/gui/embedded/qkbdtty_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdtty_qws.h b/src/gui/embedded/qkbdtty_qws.h
index f82b70b..6a296f9 100644
--- a/src/gui/embedded/qkbdtty_qws.h
+++ b/src/gui/embedded/qkbdtty_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdum_qws.cpp b/src/gui/embedded/qkbdum_qws.cpp
index e52a3bf..f780366 100644
--- a/src/gui/embedded/qkbdum_qws.cpp
+++ b/src/gui/embedded/qkbdum_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdum_qws.h b/src/gui/embedded/qkbdum_qws.h
index 523a38b..0a535d0 100644
--- a/src/gui/embedded/qkbdum_qws.h
+++ b/src/gui/embedded/qkbdum_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdvfb_qws.cpp b/src/gui/embedded/qkbdvfb_qws.cpp
index 874ee2a..10f6718 100644
--- a/src/gui/embedded/qkbdvfb_qws.cpp
+++ b/src/gui/embedded/qkbdvfb_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qkbdvfb_qws.h b/src/gui/embedded/qkbdvfb_qws.h
index 44079a2..3133f72 100644
--- a/src/gui/embedded/qkbdvfb_qws.h
+++ b/src/gui/embedded/qkbdvfb_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qlock.cpp b/src/gui/embedded/qlock.cpp
index ce8c0ad..b0fb8a0 100644
--- a/src/gui/embedded/qlock.cpp
+++ b/src/gui/embedded/qlock.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qlock_p.h b/src/gui/embedded/qlock_p.h
index e8f65d4..bcd0708 100644
--- a/src/gui/embedded/qlock_p.h
+++ b/src/gui/embedded/qlock_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouse_qws.cpp b/src/gui/embedded/qmouse_qws.cpp
index e0b0458..1a9ba95 100644
--- a/src/gui/embedded/qmouse_qws.cpp
+++ b/src/gui/embedded/qmouse_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouse_qws.h b/src/gui/embedded/qmouse_qws.h
index 2cec5fe..5878b6d 100644
--- a/src/gui/embedded/qmouse_qws.h
+++ b/src/gui/embedded/qmouse_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousedriverfactory_qws.cpp b/src/gui/embedded/qmousedriverfactory_qws.cpp
index c3bc37a..0d9627c 100644
--- a/src/gui/embedded/qmousedriverfactory_qws.cpp
+++ b/src/gui/embedded/qmousedriverfactory_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousedriverfactory_qws.h b/src/gui/embedded/qmousedriverfactory_qws.h
index afce67a..de52830 100644
--- a/src/gui/embedded/qmousedriverfactory_qws.h
+++ b/src/gui/embedded/qmousedriverfactory_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousedriverplugin_qws.cpp b/src/gui/embedded/qmousedriverplugin_qws.cpp
index 3576e27..191d34b 100644
--- a/src/gui/embedded/qmousedriverplugin_qws.cpp
+++ b/src/gui/embedded/qmousedriverplugin_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousedriverplugin_qws.h b/src/gui/embedded/qmousedriverplugin_qws.h
index bfc327d..c3794bf 100644
--- a/src/gui/embedded/qmousedriverplugin_qws.h
+++ b/src/gui/embedded/qmousedriverplugin_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouselinuxinput_qws.cpp b/src/gui/embedded/qmouselinuxinput_qws.cpp
index 9d9df97..b808de2 100644
--- a/src/gui/embedded/qmouselinuxinput_qws.cpp
+++ b/src/gui/embedded/qmouselinuxinput_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouselinuxinput_qws.h b/src/gui/embedded/qmouselinuxinput_qws.h
index 9cf4268..c469262 100644
--- a/src/gui/embedded/qmouselinuxinput_qws.h
+++ b/src/gui/embedded/qmouselinuxinput_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouselinuxtp_qws.cpp b/src/gui/embedded/qmouselinuxtp_qws.cpp
index 79fb626..e2e36f8 100644
--- a/src/gui/embedded/qmouselinuxtp_qws.cpp
+++ b/src/gui/embedded/qmouselinuxtp_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouselinuxtp_qws.h b/src/gui/embedded/qmouselinuxtp_qws.h
index 3676a00..54ebbcb 100644
--- a/src/gui/embedded/qmouselinuxtp_qws.h
+++ b/src/gui/embedded/qmouselinuxtp_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousepc_qws.cpp b/src/gui/embedded/qmousepc_qws.cpp
index 4d8858b..4665ff0 100644
--- a/src/gui/embedded/qmousepc_qws.cpp
+++ b/src/gui/embedded/qmousepc_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousepc_qws.h b/src/gui/embedded/qmousepc_qws.h
index 813ad11..08d2948 100644
--- a/src/gui/embedded/qmousepc_qws.h
+++ b/src/gui/embedded/qmousepc_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouseqnx_qws.cpp b/src/gui/embedded/qmouseqnx_qws.cpp
index ae6db07..b53c19e 100644
--- a/src/gui/embedded/qmouseqnx_qws.cpp
+++ b/src/gui/embedded/qmouseqnx_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmouseqnx_qws.h b/src/gui/embedded/qmouseqnx_qws.h
index 092c3d6..bb1c949 100644
--- a/src/gui/embedded/qmouseqnx_qws.h
+++ b/src/gui/embedded/qmouseqnx_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousetslib_qws.cpp b/src/gui/embedded/qmousetslib_qws.cpp
index 3c8af8a..223be3a 100644
--- a/src/gui/embedded/qmousetslib_qws.cpp
+++ b/src/gui/embedded/qmousetslib_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousetslib_qws.h b/src/gui/embedded/qmousetslib_qws.h
index c2450bd..8dbcc6d 100644
--- a/src/gui/embedded/qmousetslib_qws.h
+++ b/src/gui/embedded/qmousetslib_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousevfb_qws.cpp b/src/gui/embedded/qmousevfb_qws.cpp
index 5c357dc..8c629c5 100644
--- a/src/gui/embedded/qmousevfb_qws.cpp
+++ b/src/gui/embedded/qmousevfb_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qmousevfb_qws.h b/src/gui/embedded/qmousevfb_qws.h
index 27414cf..deb8691 100644
--- a/src/gui/embedded/qmousevfb_qws.h
+++ b/src/gui/embedded/qmousevfb_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
index a3fe1ab..85af060 100644
--- a/src/gui/embedded/qscreen_qws.cpp
+++ b/src/gui/embedded/qscreen_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreen_qws.h b/src/gui/embedded/qscreen_qws.h
index d263c6a..a64adf6 100644
--- a/src/gui/embedded/qscreen_qws.h
+++ b/src/gui/embedded/qscreen_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qscreendriverfactory_qws.cpp
index 705949f..396b2cf 100644
--- a/src/gui/embedded/qscreendriverfactory_qws.cpp
+++ b/src/gui/embedded/qscreendriverfactory_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreendriverfactory_qws.h b/src/gui/embedded/qscreendriverfactory_qws.h
index efdb01d..e287b9c 100644
--- a/src/gui/embedded/qscreendriverfactory_qws.h
+++ b/src/gui/embedded/qscreendriverfactory_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreendriverplugin_qws.cpp b/src/gui/embedded/qscreendriverplugin_qws.cpp
index 1c48fd0..0020869 100644
--- a/src/gui/embedded/qscreendriverplugin_qws.cpp
+++ b/src/gui/embedded/qscreendriverplugin_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreendriverplugin_qws.h b/src/gui/embedded/qscreendriverplugin_qws.h
index a3d9c01..cb55e13 100644
--- a/src/gui/embedded/qscreendriverplugin_qws.h
+++ b/src/gui/embedded/qscreendriverplugin_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
index 1effcfa..0d9ca05 100644
--- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
+++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenlinuxfb_qws.h b/src/gui/embedded/qscreenlinuxfb_qws.h
index 6abadbf..59a058b 100644
--- a/src/gui/embedded/qscreenlinuxfb_qws.h
+++ b/src/gui/embedded/qscreenlinuxfb_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenmulti_qws.cpp b/src/gui/embedded/qscreenmulti_qws.cpp
index 887fd5f..1bb4889 100644
--- a/src/gui/embedded/qscreenmulti_qws.cpp
+++ b/src/gui/embedded/qscreenmulti_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenmulti_qws_p.h b/src/gui/embedded/qscreenmulti_qws_p.h
index efd810c..1f817e6 100644
--- a/src/gui/embedded/qscreenmulti_qws_p.h
+++ b/src/gui/embedded/qscreenmulti_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenproxy_qws.cpp b/src/gui/embedded/qscreenproxy_qws.cpp
index 3327a9e..408c558 100644
--- a/src/gui/embedded/qscreenproxy_qws.cpp
+++ b/src/gui/embedded/qscreenproxy_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenproxy_qws.h b/src/gui/embedded/qscreenproxy_qws.h
index 92fc28c..5946c42 100644
--- a/src/gui/embedded/qscreenproxy_qws.h
+++ b/src/gui/embedded/qscreenproxy_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenqnx_qws.cpp b/src/gui/embedded/qscreenqnx_qws.cpp
index a0a697f..61f02f1 100644
--- a/src/gui/embedded/qscreenqnx_qws.cpp
+++ b/src/gui/embedded/qscreenqnx_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenqnx_qws.h b/src/gui/embedded/qscreenqnx_qws.h
index 69247ad..b906ab2 100644
--- a/src/gui/embedded/qscreenqnx_qws.h
+++ b/src/gui/embedded/qscreenqnx_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreentransformed_qws.cpp b/src/gui/embedded/qscreentransformed_qws.cpp
index c07854a..533272c 100644
--- a/src/gui/embedded/qscreentransformed_qws.cpp
+++ b/src/gui/embedded/qscreentransformed_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreentransformed_qws.h b/src/gui/embedded/qscreentransformed_qws.h
index 937810e..45dcf62 100644
--- a/src/gui/embedded/qscreentransformed_qws.h
+++ b/src/gui/embedded/qscreentransformed_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenvfb_qws.cpp b/src/gui/embedded/qscreenvfb_qws.cpp
index 46f9e24..593a7ed 100644
--- a/src/gui/embedded/qscreenvfb_qws.cpp
+++ b/src/gui/embedded/qscreenvfb_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qscreenvfb_qws.h b/src/gui/embedded/qscreenvfb_qws.h
index 7f16d0f..09db7e0 100644
--- a/src/gui/embedded/qscreenvfb_qws.h
+++ b/src/gui/embedded/qscreenvfb_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qsoundqss_qws.cpp b/src/gui/embedded/qsoundqss_qws.cpp
index c77c35c..0177630 100644
--- a/src/gui/embedded/qsoundqss_qws.cpp
+++ b/src/gui/embedded/qsoundqss_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qsoundqss_qws.h b/src/gui/embedded/qsoundqss_qws.h
index 060121f..e15abed 100644
--- a/src/gui/embedded/qsoundqss_qws.h
+++ b/src/gui/embedded/qsoundqss_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qtransportauth_qws.cpp b/src/gui/embedded/qtransportauth_qws.cpp
index 9a50702..ac5a47e 100644
--- a/src/gui/embedded/qtransportauth_qws.cpp
+++ b/src/gui/embedded/qtransportauth_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qtransportauth_qws.h b/src/gui/embedded/qtransportauth_qws.h
index 0c4dd91..1920699 100644
--- a/src/gui/embedded/qtransportauth_qws.h
+++ b/src/gui/embedded/qtransportauth_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qtransportauth_qws_p.h b/src/gui/embedded/qtransportauth_qws_p.h
index dab0ac8..08b2bf8 100644
--- a/src/gui/embedded/qtransportauth_qws_p.h
+++ b/src/gui/embedded/qtransportauth_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qtransportauthdefs_qws.h b/src/gui/embedded/qtransportauthdefs_qws.h
index 712e4ba..7717b67 100644
--- a/src/gui/embedded/qtransportauthdefs_qws.h
+++ b/src/gui/embedded/qtransportauthdefs_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qunixsocket.cpp b/src/gui/embedded/qunixsocket.cpp
index ad8d55e..d30ad25 100644
--- a/src/gui/embedded/qunixsocket.cpp
+++ b/src/gui/embedded/qunixsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qunixsocket_p.h b/src/gui/embedded/qunixsocket_p.h
index 600e887..e1274b1 100644
--- a/src/gui/embedded/qunixsocket_p.h
+++ b/src/gui/embedded/qunixsocket_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qunixsocketserver.cpp b/src/gui/embedded/qunixsocketserver.cpp
index 87c29bf..bc2db60 100644
--- a/src/gui/embedded/qunixsocketserver.cpp
+++ b/src/gui/embedded/qunixsocketserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qunixsocketserver_p.h b/src/gui/embedded/qunixsocketserver_p.h
index 4dc8703..7138180 100644
--- a/src/gui/embedded/qunixsocketserver_p.h
+++ b/src/gui/embedded/qunixsocketserver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qvfbhdr.h b/src/gui/embedded/qvfbhdr.h
index b77c1e9..e93123d 100644
--- a/src/gui/embedded/qvfbhdr.h
+++ b/src/gui/embedded/qvfbhdr.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwindowsystem_p.h b/src/gui/embedded/qwindowsystem_p.h
index 2c49c52..9fa6632 100644
--- a/src/gui/embedded/qwindowsystem_p.h
+++ b/src/gui/embedded/qwindowsystem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsystem_qws.cpp
index fb87152..d4fb2ca 100644
--- a/src/gui/embedded/qwindowsystem_qws.cpp
+++ b/src/gui/embedded/qwindowsystem_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwindowsystem_qws.h b/src/gui/embedded/qwindowsystem_qws.h
index 00b6670..a81153d 100644
--- a/src/gui/embedded/qwindowsystem_qws.h
+++ b/src/gui/embedded/qwindowsystem_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwscommand_qws.cpp b/src/gui/embedded/qwscommand_qws.cpp
index 81741a5..f899d24 100644
--- a/src/gui/embedded/qwscommand_qws.cpp
+++ b/src/gui/embedded/qwscommand_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwscommand_qws_p.h b/src/gui/embedded/qwscommand_qws_p.h
index e1b464e..ddca659 100644
--- a/src/gui/embedded/qwscommand_qws_p.h
+++ b/src/gui/embedded/qwscommand_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwscursor_qws.cpp b/src/gui/embedded/qwscursor_qws.cpp
index d0d7b11..a9cd8aa 100644
--- a/src/gui/embedded/qwscursor_qws.cpp
+++ b/src/gui/embedded/qwscursor_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwscursor_qws.h b/src/gui/embedded/qwscursor_qws.h
index 8fa2efe..76bca1e 100644
--- a/src/gui/embedded/qwscursor_qws.h
+++ b/src/gui/embedded/qwscursor_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsdisplay_qws.h b/src/gui/embedded/qwsdisplay_qws.h
index 41cd26f..ca64766 100644
--- a/src/gui/embedded/qwsdisplay_qws.h
+++ b/src/gui/embedded/qwsdisplay_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsdisplay_qws_p.h b/src/gui/embedded/qwsdisplay_qws_p.h
index e277c49..40f4eb8 100644
--- a/src/gui/embedded/qwsdisplay_qws_p.h
+++ b/src/gui/embedded/qwsdisplay_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsembedwidget.cpp b/src/gui/embedded/qwsembedwidget.cpp
index 46e9ec5..57d9e4c 100644
--- a/src/gui/embedded/qwsembedwidget.cpp
+++ b/src/gui/embedded/qwsembedwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsembedwidget.h b/src/gui/embedded/qwsembedwidget.h
index ee347b8..2f52004 100644
--- a/src/gui/embedded/qwsembedwidget.h
+++ b/src/gui/embedded/qwsembedwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsevent_qws.cpp b/src/gui/embedded/qwsevent_qws.cpp
index 9f53f63..2e980cb 100644
--- a/src/gui/embedded/qwsevent_qws.cpp
+++ b/src/gui/embedded/qwsevent_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsevent_qws.h b/src/gui/embedded/qwsevent_qws.h
index 2fb34f2..5e7185f 100644
--- a/src/gui/embedded/qwsevent_qws.h
+++ b/src/gui/embedded/qwsevent_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwslock.cpp b/src/gui/embedded/qwslock.cpp
index f39b4d5..ceaf2b8 100644
--- a/src/gui/embedded/qwslock.cpp
+++ b/src/gui/embedded/qwslock.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwslock_p.h b/src/gui/embedded/qwslock_p.h
index 54eab6d..3660887 100644
--- a/src/gui/embedded/qwslock_p.h
+++ b/src/gui/embedded/qwslock_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsmanager_p.h b/src/gui/embedded/qwsmanager_p.h
index d9dd7c6..5daabd2 100644
--- a/src/gui/embedded/qwsmanager_p.h
+++ b/src/gui/embedded/qwsmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsmanager_qws.cpp b/src/gui/embedded/qwsmanager_qws.cpp
index b0259b9..de0719a 100644
--- a/src/gui/embedded/qwsmanager_qws.cpp
+++ b/src/gui/embedded/qwsmanager_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsmanager_qws.h b/src/gui/embedded/qwsmanager_qws.h
index 03e0d42..9c4fe25 100644
--- a/src/gui/embedded/qwsmanager_qws.h
+++ b/src/gui/embedded/qwsmanager_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsproperty_qws.cpp b/src/gui/embedded/qwsproperty_qws.cpp
index 81ed8d1..8471874 100644
--- a/src/gui/embedded/qwsproperty_qws.cpp
+++ b/src/gui/embedded/qwsproperty_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsproperty_qws.h b/src/gui/embedded/qwsproperty_qws.h
index 6d4591a..c11077f 100644
--- a/src/gui/embedded/qwsproperty_qws.h
+++ b/src/gui/embedded/qwsproperty_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsprotocolitem_qws.h b/src/gui/embedded/qwsprotocolitem_qws.h
index 1daae8d..f3b8eda 100644
--- a/src/gui/embedded/qwsprotocolitem_qws.h
+++ b/src/gui/embedded/qwsprotocolitem_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwssharedmemory.cpp b/src/gui/embedded/qwssharedmemory.cpp
index 1da717d..c0234ad 100644
--- a/src/gui/embedded/qwssharedmemory.cpp
+++ b/src/gui/embedded/qwssharedmemory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwssharedmemory_p.h b/src/gui/embedded/qwssharedmemory_p.h
index 90b0f89..ac8ecc6 100644
--- a/src/gui/embedded/qwssharedmemory_p.h
+++ b/src/gui/embedded/qwssharedmemory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwssignalhandler.cpp b/src/gui/embedded/qwssignalhandler.cpp
index 900609f..a783c2e 100644
--- a/src/gui/embedded/qwssignalhandler.cpp
+++ b/src/gui/embedded/qwssignalhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwssignalhandler_p.h b/src/gui/embedded/qwssignalhandler_p.h
index ca3980a..c683dc3 100644
--- a/src/gui/embedded/qwssignalhandler_p.h
+++ b/src/gui/embedded/qwssignalhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwssocket_qws.cpp b/src/gui/embedded/qwssocket_qws.cpp
index e70d35d..0c49cf8 100644
--- a/src/gui/embedded/qwssocket_qws.cpp
+++ b/src/gui/embedded/qwssocket_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwssocket_qws.h b/src/gui/embedded/qwssocket_qws.h
index 858a0e3..1676f01 100644
--- a/src/gui/embedded/qwssocket_qws.h
+++ b/src/gui/embedded/qwssocket_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/embedded/qwsutils_qws.h b/src/gui/embedded/qwsutils_qws.h
index 7832e8d..02be510 100644
--- a/src/gui/embedded/qwsutils_qws.h
+++ b/src/gui/embedded/qwsutils_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraph_p.h b/src/gui/graphicsview/qgraph_p.h
index 717165a..3159d7a 100644
--- a/src/gui/graphicsview/qgraph_p.h
+++ b/src/gui/graphicsview/qgraph_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
index 539826b..ae5b57c 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.h b/src/gui/graphicsview/qgraphicsanchorlayout.h
index 1f0e35c..2ababc5 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 11a4902..df47e67 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 4d67368..f6aef8c 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/gui/graphicsview/qgraphicsgridlayout.cpp
index 3fc7f10..e9f2491 100644
--- a/src/gui/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.h b/src/gui/graphicsview/qgraphicsgridlayout.h
index 6580a02..2e599be 100644
--- a/src/gui/graphicsview/qgraphicsgridlayout.h
+++ b/src/gui/graphicsview/qgraphicsgridlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 3b18c31..cb03fc7 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index 3c193cd..a799a62 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index c8a7699..9d7eef1 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsitemanimation.cpp b/src/gui/graphicsview/qgraphicsitemanimation.cpp
index 9cb9a8d..dfee578 100644
--- a/src/gui/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/gui/graphicsview/qgraphicsitemanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsitemanimation.h b/src/gui/graphicsview/qgraphicsitemanimation.h
index 73f6d5c..6eede9e 100644
--- a/src/gui/graphicsview/qgraphicsitemanimation.h
+++ b/src/gui/graphicsview/qgraphicsitemanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp
index 86b4589..45f07d8 100644
--- a/src/gui/graphicsview/qgraphicslayout.cpp
+++ b/src/gui/graphicsview/qgraphicslayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslayout.h b/src/gui/graphicsview/qgraphicslayout.h
index b9433a2..f85a2d9 100644
--- a/src/gui/graphicsview/qgraphicslayout.h
+++ b/src/gui/graphicsview/qgraphicslayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslayout_p.cpp b/src/gui/graphicsview/qgraphicslayout_p.cpp
index 88652ec..730d109 100644
--- a/src/gui/graphicsview/qgraphicslayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicslayout_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslayout_p.h b/src/gui/graphicsview/qgraphicslayout_p.h
index 3083555..518477f 100644
--- a/src/gui/graphicsview/qgraphicslayout_p.h
+++ b/src/gui/graphicsview/qgraphicslayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index ad4b2b5..4056daa 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/gui/graphicsview/qgraphicslayoutitem.h
index f707c62..5150d7d 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.h
+++ b/src/gui/graphicsview/qgraphicslayoutitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h
index 15cc7a5..ffaa09f 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem_p.h
+++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp
index 7e8d19f..f9122a8 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.h b/src/gui/graphicsview/qgraphicslinearlayout.h
index c500df7..b6b08e3 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.h
+++ b/src/gui/graphicsview/qgraphicslinearlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp
index 320395e..0f3cf25 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.h b/src/gui/graphicsview/qgraphicsproxywidget.h
index 7f43ce4..176996a 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.h
+++ b/src/gui/graphicsview/qgraphicsproxywidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsproxywidget_p.h b/src/gui/graphicsview/qgraphicsproxywidget_p.h
index 0e29a7e..72406d6 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget_p.h
+++ b/src/gui/graphicsview/qgraphicsproxywidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 83fe56a..6fd3a44 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h
index f8615f4..c43f6c9 100644
--- a/src/gui/graphicsview/qgraphicsscene.h
+++ b/src/gui/graphicsview/qgraphicsscene.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp.cpp b/src/gui/graphicsview/qgraphicsscene_bsp.cpp
index 060835d..a81dcbb 100644
--- a/src/gui/graphicsview/qgraphicsscene_bsp.cpp
+++ b/src/gui/graphicsview/qgraphicsscene_bsp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp_p.h b/src/gui/graphicsview/qgraphicsscene_bsp_p.h
index 3633fff..1f33a38 100644
--- a/src/gui/graphicsview/qgraphicsscene_bsp_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_bsp_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
index f28dfe9..c617cde 100644
--- a/src/gui/graphicsview/qgraphicsscene_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
index 2a91348..8bf72f4 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
index f671fd9..c840a47 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp
index a0ecd4c..77e066f 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.cpp
+++ b/src/gui/graphicsview/qgraphicssceneevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h
index c8a0028..c07fbf4 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.h
+++ b/src/gui/graphicsview/qgraphicssceneevent.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/gui/graphicsview/qgraphicssceneindex.cpp
index 707c71f..3fe3a49 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.cpp
+++ b/src/gui/graphicsview/qgraphicssceneindex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h
index 597a229..34e7b6b 100644
--- a/src/gui/graphicsview/qgraphicssceneindex_p.h
+++ b/src/gui/graphicsview/qgraphicssceneindex_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp
index 08f51be..a3133c7 100644
--- a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h
index bf9b928..4053702 100644
--- a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h
+++ b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index 1f155c6..e17dede 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicstransform.h b/src/gui/graphicsview/qgraphicstransform.h
index d8c9654..be7ec67 100644
--- a/src/gui/graphicsview/qgraphicstransform.h
+++ b/src/gui/graphicsview/qgraphicstransform.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicstransform_p.h b/src/gui/graphicsview/qgraphicstransform_p.h
index 43b44b2..79fc689 100644
--- a/src/gui/graphicsview/qgraphicstransform_p.h
+++ b/src/gui/graphicsview/qgraphicstransform_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index c8aca80..b0c2486 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsview.h b/src/gui/graphicsview/qgraphicsview.h
index 5bd4fdd..881315c 100644
--- a/src/gui/graphicsview/qgraphicsview.h
+++ b/src/gui/graphicsview/qgraphicsview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h
index 7bd9ecb..ed51bff 100644
--- a/src/gui/graphicsview/qgraphicsview_p.h
+++ b/src/gui/graphicsview/qgraphicsview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 1bfe266..67c838a 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h
index a22b642..1cc2ac9 100644
--- a/src/gui/graphicsview/qgraphicswidget.h
+++ b/src/gui/graphicsview/qgraphicswidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp
index 3466733..953acc7 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.cpp
+++ b/src/gui/graphicsview/qgraphicswidget_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h
index e9e6fc2..894c51e 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.h
+++ b/src/gui/graphicsview/qgraphicswidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index ae5bf90..c1a25d8 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h
index 9ac9a8e..9f78c95 100644
--- a/src/gui/graphicsview/qgridlayoutengine_p.h
+++ b/src/gui/graphicsview/qgridlayoutengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qsimplex_p.cpp b/src/gui/graphicsview/qsimplex_p.cpp
index c50ef9a..05a6204 100644
--- a/src/gui/graphicsview/qsimplex_p.cpp
+++ b/src/gui/graphicsview/qsimplex_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/graphicsview/qsimplex_p.h b/src/gui/graphicsview/qsimplex_p.h
index aae32a1..0279412 100644
--- a/src/gui/graphicsview/qsimplex_p.h
+++ b/src/gui/graphicsview/qsimplex_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 91622f3..0f394b5 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index 1bbe1cf..39ae209 100644
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index 074b8f0..d1e6b85 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qbmphandler_p.h b/src/gui/image/qbmphandler_p.h
index 958f911..cd49984 100644
--- a/src/gui/image/qbmphandler_p.h
+++ b/src/gui/image/qbmphandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
index 124d27b..87f6b9c 100644
--- a/src/gui/image/qgifhandler.cpp
+++ b/src/gui/image/qgifhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ** WARNING:
diff --git a/src/gui/image/qgifhandler_p.h b/src/gui/image/qgifhandler_p.h
index b2a9725..68b5cf1 100644
--- a/src/gui/image/qgifhandler_p.h
+++ b/src/gui/image/qgifhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ** WARNING:
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index a2f429a..548b2a7 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index faef07b..6e5d3e3 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h
index 57a8085..49303a7 100644
--- a/src/gui/image/qicon_p.h
+++ b/src/gui/image/qicon_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qiconengine.cpp b/src/gui/image/qiconengine.cpp
index 050d48d..34df4dd 100644
--- a/src/gui/image/qiconengine.cpp
+++ b/src/gui/image/qiconengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h
index 6d8b6ad..735c534 100644
--- a/src/gui/image/qiconengine.h
+++ b/src/gui/image/qiconengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qiconengineplugin.cpp b/src/gui/image/qiconengineplugin.cpp
index 02166f0..3f9b287 100644
--- a/src/gui/image/qiconengineplugin.cpp
+++ b/src/gui/image/qiconengineplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/image/qiconengineplugin.h
index aaac1a5..bf93032 100644
--- a/src/gui/image/qiconengineplugin.h
+++ b/src/gui/image/qiconengineplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 0ae54fc..944b3ca 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index a6b5f5b..7f811f6 100644
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 1157b93..e99617e 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 896061f..5a4ec9a 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimage_neon.cpp b/src/gui/image/qimage_neon.cpp
index 15bf472..84555a7 100644
--- a/src/gui/image/qimage_neon.cpp
+++ b/src/gui/image/qimage_neon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index c687448..ade29c9 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimage_sse2.cpp b/src/gui/image/qimage_sse2.cpp
index 82d49a6..e4d40f7 100644
--- a/src/gui/image/qimage_sse2.cpp
+++ b/src/gui/image/qimage_sse2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimage_ssse3.cpp b/src/gui/image/qimage_ssse3.cpp
index 9aed011..61bf917 100644
--- a/src/gui/image/qimage_ssse3.cpp
+++ b/src/gui/image/qimage_ssse3.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index 6a1903f..e5274b8 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index 21661f6..4c5fb1f 100644
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimagepixmapcleanuphooks.cpp b/src/gui/image/qimagepixmapcleanuphooks.cpp
index 521e348..ec2a631 100644
--- a/src/gui/image/qimagepixmapcleanuphooks.cpp
+++ b/src/gui/image/qimagepixmapcleanuphooks.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimagepixmapcleanuphooks_p.h b/src/gui/image/qimagepixmapcleanuphooks_p.h
index eae11f4..1435ab9 100644
--- a/src/gui/image/qimagepixmapcleanuphooks_p.h
+++ b/src/gui/image/qimagepixmapcleanuphooks_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index ec56af2..671af29 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h
index ae58d32..c32c89b 100644
--- a/src/gui/image/qimagereader.h
+++ b/src/gui/image/qimagereader.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index b995914..d73c166 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h
index b6efcb8..e469be7 100644
--- a/src/gui/image/qimagewriter.h
+++ b/src/gui/image/qimagewriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index b9eda05..a4e2366 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qjpeghandler_p.h b/src/gui/image/qjpeghandler_p.h
index 5320a5e..6444334 100644
--- a/src/gui/image/qjpeghandler_p.h
+++ b/src/gui/image/qjpeghandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qmnghandler.cpp b/src/gui/image/qmnghandler.cpp
index cf53af0..f8c494d 100644
--- a/src/gui/image/qmnghandler.cpp
+++ b/src/gui/image/qmnghandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qmnghandler_p.h b/src/gui/image/qmnghandler_p.h
index c39d0a6..54daaab 100644
--- a/src/gui/image/qmnghandler_p.h
+++ b/src/gui/image/qmnghandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 911a2b5..44b7253 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index 63ba69e..e6a4297 100644
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 8446387..549b27a 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
index b642fee..3e04b46 100644
--- a/src/gui/image/qnativeimage_p.h
+++ b/src/gui/image/qnativeimage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpaintengine_pic.cpp b/src/gui/image/qpaintengine_pic.cpp
index fd1ee6a..e09120b 100644
--- a/src/gui/image/qpaintengine_pic.cpp
+++ b/src/gui/image/qpaintengine_pic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h
index da0adae..8a9b320 100644
--- a/src/gui/image/qpaintengine_pic_p.h
+++ b/src/gui/image/qpaintengine_pic_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 48d2de3..46f03a0 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index 63ef42e..9369794 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h
index 43b971c..cdbaa36 100644
--- a/src/gui/image/qpicture_p.h
+++ b/src/gui/image/qpicture_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpictureformatplugin.cpp b/src/gui/image/qpictureformatplugin.cpp
index 01362d0..279c74f 100644
--- a/src/gui/image/qpictureformatplugin.cpp
+++ b/src/gui/image/qpictureformatplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h
index d29d4f4..250c01e 100644
--- a/src/gui/image/qpictureformatplugin.h
+++ b/src/gui/image/qpictureformatplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 66a861d..4dee86e 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 64ca8a3..0e3c461 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp
index 31aa192..d8d3920 100644
--- a/src/gui/image/qpixmap_mac.cpp
+++ b/src/gui/image/qpixmap_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/image/qpixmap_mac_p.h
index b84bafa..7057e15 100644
--- a/src/gui/image/qpixmap_mac_p.h
+++ b/src/gui/image/qpixmap_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_qws.cpp b/src/gui/image/qpixmap_qws.cpp
index ac53136..9d38f65 100644
--- a/src/gui/image/qpixmap_qws.cpp
+++ b/src/gui/image/qpixmap_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index 53f3559..b55d10f 100644
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h
index 36a9b2f..37fc8fb 100644
--- a/src/gui/image/qpixmap_raster_p.h
+++ b/src/gui/image/qpixmap_raster_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 47249d9..c598281 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h
index 42cc830..9d1febd 100644
--- a/src/gui/image/qpixmap_s60_p.h
+++ b/src/gui/image/qpixmap_s60_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 4aac2ef..035bcc2 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index 3d9c363..650e30c 100644
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/image/qpixmap_x11_p.h
index 821fb69..9c6523e 100644
--- a/src/gui/image/qpixmap_x11_p.h
+++ b/src/gui/image/qpixmap_x11_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index ca21a0c..7cd7ce3 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index e9c8c15..c4d50f0 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index 6db3b20..d4dc64e 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapdata.cpp b/src/gui/image/qpixmapdata.cpp
index ef1f6c4..7b96123 100644
--- a/src/gui/image/qpixmapdata.cpp
+++ b/src/gui/image/qpixmapdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h
index ec62b0b..6aa4402 100644
--- a/src/gui/image/qpixmapdata_p.h
+++ b/src/gui/image/qpixmapdata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapdatafactory.cpp b/src/gui/image/qpixmapdatafactory.cpp
index 7498a7c..58e94a3 100644
--- a/src/gui/image/qpixmapdatafactory.cpp
+++ b/src/gui/image/qpixmapdatafactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapdatafactory_p.h b/src/gui/image/qpixmapdatafactory_p.h
index 3809316..853659e 100644
--- a/src/gui/image/qpixmapdatafactory_p.h
+++ b/src/gui/image/qpixmapdatafactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index 70770c4..bd28ad5 100644
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpixmapfilter_p.h b/src/gui/image/qpixmapfilter_p.h
index 7718ef7..e19161f 100644
--- a/src/gui/image/qpixmapfilter_p.h
+++ b/src/gui/image/qpixmapfilter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index dc54313..a217f12 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qpnghandler_p.h b/src/gui/image/qpnghandler_p.h
index 1b91cfe..d5c25c5 100644
--- a/src/gui/image/qpnghandler_p.h
+++ b/src/gui/image/qpnghandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp
index a9e796c..8182bf0 100644
--- a/src/gui/image/qppmhandler.cpp
+++ b/src/gui/image/qppmhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qppmhandler_p.h b/src/gui/image/qppmhandler_p.h
index 83cdeed..76598bc 100644
--- a/src/gui/image/qppmhandler_p.h
+++ b/src/gui/image/qppmhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qtiffhandler.cpp b/src/gui/image/qtiffhandler.cpp
index de4f680..afdb99a 100644
--- a/src/gui/image/qtiffhandler.cpp
+++ b/src/gui/image/qtiffhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qtiffhandler_p.h b/src/gui/image/qtiffhandler_p.h
index da7d7ed..9dc4d1c 100644
--- a/src/gui/image/qtiffhandler_p.h
+++ b/src/gui/image/qtiffhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index 0dd4e99..2d4cffb 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qxbmhandler_p.h b/src/gui/image/qxbmhandler_p.h
index b11c056..8bb2805 100644
--- a/src/gui/image/qxbmhandler_p.h
+++ b/src/gui/image/qxbmhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index b97afd3..78261a2 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/image/qxpmhandler_p.h b/src/gui/image/qxpmhandler_p.h
index 106843a..063bfa7 100644
--- a/src/gui/image/qxpmhandler_p.h
+++ b/src/gui/image/qxpmhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index ac40bba..cdf39f2 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 4a1b9b9..3f330c0 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index f13a861..ff51153 100644
--- a/src/gui/inputmethod/qinputcontext.cpp
+++ b/src/gui/inputmethod/qinputcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h
index 3e767c3..510be1f 100644
--- a/src/gui/inputmethod/qinputcontext.h
+++ b/src/gui/inputmethod/qinputcontext.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qinputcontext_p.h b/src/gui/inputmethod/qinputcontext_p.h
index 23fbdfb..fcb1bc3 100644
--- a/src/gui/inputmethod/qinputcontext_p.h
+++ b/src/gui/inputmethod/qinputcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qinputcontextfactory.cpp b/src/gui/inputmethod/qinputcontextfactory.cpp
index 865c1b2..3d7bc43 100644
--- a/src/gui/inputmethod/qinputcontextfactory.cpp
+++ b/src/gui/inputmethod/qinputcontextfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qinputcontextfactory.h b/src/gui/inputmethod/qinputcontextfactory.h
index 16c17e4..cabfe08 100644
--- a/src/gui/inputmethod/qinputcontextfactory.h
+++ b/src/gui/inputmethod/qinputcontextfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qinputcontextplugin.cpp b/src/gui/inputmethod/qinputcontextplugin.cpp
index d7a7189..6bdfdef 100644
--- a/src/gui/inputmethod/qinputcontextplugin.cpp
+++ b/src/gui/inputmethod/qinputcontextplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qinputcontextplugin.h b/src/gui/inputmethod/qinputcontextplugin.h
index 6e71f8c..3c18ac0 100644
--- a/src/gui/inputmethod/qinputcontextplugin.h
+++ b/src/gui/inputmethod/qinputcontextplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qmacinputcontext_mac.cpp b/src/gui/inputmethod/qmacinputcontext_mac.cpp
index 3bbea49..2bdbb1b 100644
--- a/src/gui/inputmethod/qmacinputcontext_mac.cpp
+++ b/src/gui/inputmethod/qmacinputcontext_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qmacinputcontext_p.h b/src/gui/inputmethod/qmacinputcontext_p.h
index 693f342..3f89ab1 100644
--- a/src/gui/inputmethod/qmacinputcontext_p.h
+++ b/src/gui/inputmethod/qmacinputcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qwininputcontext_p.h b/src/gui/inputmethod/qwininputcontext_p.h
index d5bedf4..6694a36 100644
--- a/src/gui/inputmethod/qwininputcontext_p.h
+++ b/src/gui/inputmethod/qwininputcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qwininputcontext_win.cpp b/src/gui/inputmethod/qwininputcontext_win.cpp
index ef3e6f6..0417de8 100644
--- a/src/gui/inputmethod/qwininputcontext_win.cpp
+++ b/src/gui/inputmethod/qwininputcontext_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qwsinputcontext_p.h b/src/gui/inputmethod/qwsinputcontext_p.h
index 5546385..05fac8c 100644
--- a/src/gui/inputmethod/qwsinputcontext_p.h
+++ b/src/gui/inputmethod/qwsinputcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qwsinputcontext_qws.cpp b/src/gui/inputmethod/qwsinputcontext_qws.cpp
index 8a19924..8c2c5bd 100644
--- a/src/gui/inputmethod/qwsinputcontext_qws.cpp
+++ b/src/gui/inputmethod/qwsinputcontext_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qximinputcontext_p.h b/src/gui/inputmethod/qximinputcontext_p.h
index e2bfde6..c7682b4 100644
--- a/src/gui/inputmethod/qximinputcontext_p.h
+++ b/src/gui/inputmethod/qximinputcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/inputmethod/qximinputcontext_x11.cpp b/src/gui/inputmethod/qximinputcontext_x11.cpp
index ed5aa23..2f10ee0 100644
--- a/src/gui/inputmethod/qximinputcontext_x11.cpp
+++ b/src/gui/inputmethod/qximinputcontext_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractitemdelegate.cpp b/src/gui/itemviews/qabstractitemdelegate.cpp
index 0ea6d67..928fc25 100644
--- a/src/gui/itemviews/qabstractitemdelegate.cpp
+++ b/src/gui/itemviews/qabstractitemdelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractitemdelegate.h b/src/gui/itemviews/qabstractitemdelegate.h
index d24ca4b..ed17575 100644
--- a/src/gui/itemviews/qabstractitemdelegate.h
+++ b/src/gui/itemviews/qabstractitemdelegate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 4ffd284..bf736b0 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractitemview.h b/src/gui/itemviews/qabstractitemview.h
index 0f86f62..00677d9 100644
--- a/src/gui/itemviews/qabstractitemview.h
+++ b/src/gui/itemviews/qabstractitemview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index fce74f3..253248e 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractproxymodel.cpp b/src/gui/itemviews/qabstractproxymodel.cpp
index 1c600e2..a548ad5 100644
--- a/src/gui/itemviews/qabstractproxymodel.cpp
+++ b/src/gui/itemviews/qabstractproxymodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractproxymodel.h b/src/gui/itemviews/qabstractproxymodel.h
index c6bb985..ef1c29a 100644
--- a/src/gui/itemviews/qabstractproxymodel.h
+++ b/src/gui/itemviews/qabstractproxymodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractproxymodel_p.h b/src/gui/itemviews/qabstractproxymodel_p.h
index 180eda3..2f089c9 100644
--- a/src/gui/itemviews/qabstractproxymodel_p.h
+++ b/src/gui/itemviews/qabstractproxymodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qbsptree.cpp b/src/gui/itemviews/qbsptree.cpp
index 01ea763..8e8d231 100644
--- a/src/gui/itemviews/qbsptree.cpp
+++ b/src/gui/itemviews/qbsptree.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qbsptree_p.h b/src/gui/itemviews/qbsptree_p.h
index 20cad84..7a558fb 100644
--- a/src/gui/itemviews/qbsptree_p.h
+++ b/src/gui/itemviews/qbsptree_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qcolumnview.cpp b/src/gui/itemviews/qcolumnview.cpp
index 0eb890c..0537ef1 100644
--- a/src/gui/itemviews/qcolumnview.cpp
+++ b/src/gui/itemviews/qcolumnview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qcolumnview.h b/src/gui/itemviews/qcolumnview.h
index a27ae79..767c166 100644
--- a/src/gui/itemviews/qcolumnview.h
+++ b/src/gui/itemviews/qcolumnview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qcolumnview_p.h b/src/gui/itemviews/qcolumnview_p.h
index cdf6d6a..448e4dc 100644
--- a/src/gui/itemviews/qcolumnview_p.h
+++ b/src/gui/itemviews/qcolumnview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qcolumnviewgrip.cpp b/src/gui/itemviews/qcolumnviewgrip.cpp
index 8fda074..953f7c7 100644
--- a/src/gui/itemviews/qcolumnviewgrip.cpp
+++ b/src/gui/itemviews/qcolumnviewgrip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qcolumnviewgrip_p.h b/src/gui/itemviews/qcolumnviewgrip_p.h
index 3dcdac8..cf5e6ea 100644
--- a/src/gui/itemviews/qcolumnviewgrip_p.h
+++ b/src/gui/itemviews/qcolumnviewgrip_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qdatawidgetmapper.cpp b/src/gui/itemviews/qdatawidgetmapper.cpp
index 930c49d..2935167 100644
--- a/src/gui/itemviews/qdatawidgetmapper.cpp
+++ b/src/gui/itemviews/qdatawidgetmapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qdatawidgetmapper.h b/src/gui/itemviews/qdatawidgetmapper.h
index d1409ee..c8245a6 100644
--- a/src/gui/itemviews/qdatawidgetmapper.h
+++ b/src/gui/itemviews/qdatawidgetmapper.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp
index 48599bc..a0ce434 100644
--- a/src/gui/itemviews/qdirmodel.cpp
+++ b/src/gui/itemviews/qdirmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qdirmodel.h b/src/gui/itemviews/qdirmodel.h
index 9e8e546..fdd79e0 100644
--- a/src/gui/itemviews/qdirmodel.h
+++ b/src/gui/itemviews/qdirmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp
index 4748f89..a02080f 100644
--- a/src/gui/itemviews/qfileiconprovider.cpp
+++ b/src/gui/itemviews/qfileiconprovider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qfileiconprovider.h b/src/gui/itemviews/qfileiconprovider.h
index 78418e3..302914b 100644
--- a/src/gui/itemviews/qfileiconprovider.h
+++ b/src/gui/itemviews/qfileiconprovider.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp
index 67854a3..69fb4bf 100644
--- a/src/gui/itemviews/qheaderview.cpp
+++ b/src/gui/itemviews/qheaderview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qheaderview.h b/src/gui/itemviews/qheaderview.h
index 0fc92af..eabab66 100644
--- a/src/gui/itemviews/qheaderview.h
+++ b/src/gui/itemviews/qheaderview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qheaderview_p.h b/src/gui/itemviews/qheaderview_p.h
index b30eb4f..db4285c 100644
--- a/src/gui/itemviews/qheaderview_p.h
+++ b/src/gui/itemviews/qheaderview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 9bbfc23..47fea84 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemdelegate.h b/src/gui/itemviews/qitemdelegate.h
index 88a493f..635b99f 100644
--- a/src/gui/itemviews/qitemdelegate.h
+++ b/src/gui/itemviews/qitemdelegate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemeditorfactory.cpp b/src/gui/itemviews/qitemeditorfactory.cpp
index 761259d..1127beb 100644
--- a/src/gui/itemviews/qitemeditorfactory.cpp
+++ b/src/gui/itemviews/qitemeditorfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemeditorfactory.h b/src/gui/itemviews/qitemeditorfactory.h
index 6b5dc55..fdb304c 100644
--- a/src/gui/itemviews/qitemeditorfactory.h
+++ b/src/gui/itemviews/qitemeditorfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemeditorfactory_p.h b/src/gui/itemviews/qitemeditorfactory_p.h
index 5ae75e4..172d32e 100644
--- a/src/gui/itemviews/qitemeditorfactory_p.h
+++ b/src/gui/itemviews/qitemeditorfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp
index f848321..71b4f16 100644
--- a/src/gui/itemviews/qitemselectionmodel.cpp
+++ b/src/gui/itemviews/qitemselectionmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemselectionmodel.h b/src/gui/itemviews/qitemselectionmodel.h
index 436514f..f6a86c4 100644
--- a/src/gui/itemviews/qitemselectionmodel.h
+++ b/src/gui/itemviews/qitemselectionmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qitemselectionmodel_p.h b/src/gui/itemviews/qitemselectionmodel_p.h
index 5afa90d..3957c22 100644
--- a/src/gui/itemviews/qitemselectionmodel_p.h
+++ b/src/gui/itemviews/qitemselectionmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index 76d7642..f64c67e 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qlistview.h b/src/gui/itemviews/qlistview.h
index cadd66c..bf3f4f1 100644
--- a/src/gui/itemviews/qlistview.h
+++ b/src/gui/itemviews/qlistview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qlistview_p.h b/src/gui/itemviews/qlistview_p.h
index bf7657b..8d95cde 100644
--- a/src/gui/itemviews/qlistview_p.h
+++ b/src/gui/itemviews/qlistview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index da1d5db..b8a96f0 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qlistwidget.h b/src/gui/itemviews/qlistwidget.h
index 8d74ca2..1fc7b67 100644
--- a/src/gui/itemviews/qlistwidget.h
+++ b/src/gui/itemviews/qlistwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qlistwidget_p.h b/src/gui/itemviews/qlistwidget_p.h
index f5b97ef..6731ea3 100644
--- a/src/gui/itemviews/qlistwidget_p.h
+++ b/src/gui/itemviews/qlistwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qproxymodel.cpp b/src/gui/itemviews/qproxymodel.cpp
index 45e02ca..9fca315 100644
--- a/src/gui/itemviews/qproxymodel.cpp
+++ b/src/gui/itemviews/qproxymodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qproxymodel.h b/src/gui/itemviews/qproxymodel.h
index f179a7a..4cb7d8e 100644
--- a/src/gui/itemviews/qproxymodel.h
+++ b/src/gui/itemviews/qproxymodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qproxymodel_p.h b/src/gui/itemviews/qproxymodel_p.h
index ff7e978..4788d98 100644
--- a/src/gui/itemviews/qproxymodel_p.h
+++ b/src/gui/itemviews/qproxymodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
index dc8d938..6043d86 100644
--- a/src/gui/itemviews/qsortfilterproxymodel.cpp
+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qsortfilterproxymodel.h b/src/gui/itemviews/qsortfilterproxymodel.h
index af980f1..4fc649d 100644
--- a/src/gui/itemviews/qsortfilterproxymodel.h
+++ b/src/gui/itemviews/qsortfilterproxymodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp
index 767b5a9..d01176f 100644
--- a/src/gui/itemviews/qstandarditemmodel.cpp
+++ b/src/gui/itemviews/qstandarditemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qstandarditemmodel.h b/src/gui/itemviews/qstandarditemmodel.h
index 8f966a3..3ac0714 100644
--- a/src/gui/itemviews/qstandarditemmodel.h
+++ b/src/gui/itemviews/qstandarditemmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qstandarditemmodel_p.h b/src/gui/itemviews/qstandarditemmodel_p.h
index 06f3e15..2c4ae09 100644
--- a/src/gui/itemviews/qstandarditemmodel_p.h
+++ b/src/gui/itemviews/qstandarditemmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qstringlistmodel.cpp b/src/gui/itemviews/qstringlistmodel.cpp
index 8d69ee4..10b0cff 100644
--- a/src/gui/itemviews/qstringlistmodel.cpp
+++ b/src/gui/itemviews/qstringlistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qstringlistmodel.h b/src/gui/itemviews/qstringlistmodel.h
index 875b145..00a5ab2 100644
--- a/src/gui/itemviews/qstringlistmodel.h
+++ b/src/gui/itemviews/qstringlistmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp
index 880f8ab..d6c3587 100644
--- a/src/gui/itemviews/qstyleditemdelegate.cpp
+++ b/src/gui/itemviews/qstyleditemdelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qstyleditemdelegate.h b/src/gui/itemviews/qstyleditemdelegate.h
index dc57ad8..8c0acd4 100644
--- a/src/gui/itemviews/qstyleditemdelegate.h
+++ b/src/gui/itemviews/qstyleditemdelegate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp
index 4492e53..0e9622a 100644
--- a/src/gui/itemviews/qtableview.cpp
+++ b/src/gui/itemviews/qtableview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtableview.h b/src/gui/itemviews/qtableview.h
index 8d4eaab..f3d292f 100644
--- a/src/gui/itemviews/qtableview.h
+++ b/src/gui/itemviews/qtableview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtableview_p.h b/src/gui/itemviews/qtableview_p.h
index 783e744..e842c43 100644
--- a/src/gui/itemviews/qtableview_p.h
+++ b/src/gui/itemviews/qtableview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp
index 5bb242e..25580d4 100644
--- a/src/gui/itemviews/qtablewidget.cpp
+++ b/src/gui/itemviews/qtablewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtablewidget.h b/src/gui/itemviews/qtablewidget.h
index 0a2f631..feb6313 100644
--- a/src/gui/itemviews/qtablewidget.h
+++ b/src/gui/itemviews/qtablewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtablewidget_p.h b/src/gui/itemviews/qtablewidget_p.h
index 92166b3..61b86d5 100644
--- a/src/gui/itemviews/qtablewidget_p.h
+++ b/src/gui/itemviews/qtablewidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index 40b51fe..a34b1db 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreeview.h b/src/gui/itemviews/qtreeview.h
index 1d04893..83760ee 100644
--- a/src/gui/itemviews/qtreeview.h
+++ b/src/gui/itemviews/qtreeview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreeview_p.h b/src/gui/itemviews/qtreeview_p.h
index cbbfd0e..2b4e0c9 100644
--- a/src/gui/itemviews/qtreeview_p.h
+++ b/src/gui/itemviews/qtreeview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index 8f55734..9be1c54 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreewidget.h b/src/gui/itemviews/qtreewidget.h
index b56a4a7..65c2ca0 100644
--- a/src/gui/itemviews/qtreewidget.h
+++ b/src/gui/itemviews/qtreewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreewidget_p.h b/src/gui/itemviews/qtreewidget_p.h
index 27f2908..dece482 100644
--- a/src/gui/itemviews/qtreewidget_p.h
+++ b/src/gui/itemviews/qtreewidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreewidgetitemiterator.cpp b/src/gui/itemviews/qtreewidgetitemiterator.cpp
index d569296..a97d68e 100644
--- a/src/gui/itemviews/qtreewidgetitemiterator.cpp
+++ b/src/gui/itemviews/qtreewidgetitemiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreewidgetitemiterator.h b/src/gui/itemviews/qtreewidgetitemiterator.h
index 2bd4e09..91ff37c 100644
--- a/src/gui/itemviews/qtreewidgetitemiterator.h
+++ b/src/gui/itemviews/qtreewidgetitemiterator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qtreewidgetitemiterator_p.h b/src/gui/itemviews/qtreewidgetitemiterator_p.h
index a1d6703..3136229 100644
--- a/src/gui/itemviews/qtreewidgetitemiterator_p.h
+++ b/src/gui/itemviews/qtreewidgetitemiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qwidgetitemdata_p.h b/src/gui/itemviews/qwidgetitemdata_p.h
index 0e9aa5d..038151f 100644
--- a/src/gui/itemviews/qwidgetitemdata_p.h
+++ b/src/gui/itemviews/qwidgetitemdata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index f7e0751..ba846d7 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h
index 538b04f..b5dd050 100644
--- a/src/gui/kernel/qaction.h
+++ b/src/gui/kernel/qaction.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h
index 5764318..86a4b6d 100644
--- a/src/gui/kernel/qaction_p.h
+++ b/src/gui/kernel/qaction_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qactiongroup.cpp b/src/gui/kernel/qactiongroup.cpp
index 38a7278..250f187 100644
--- a/src/gui/kernel/qactiongroup.cpp
+++ b/src/gui/kernel/qactiongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qactiongroup.h b/src/gui/kernel/qactiongroup.h
index 447897b..fa6370a 100644
--- a/src/gui/kernel/qactiongroup.h
+++ b/src/gui/kernel/qactiongroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 185af9a..745cd2e 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 0242582..af7e1b8 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index dd819e5..363f93c 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index aa3a6d5..e0ef8b3 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
index 92eb304..230b95f 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 988823b..03a4a21 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 78028eb..c18cef9 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index e7b7ed8..f025bba 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qboxlayout.cpp b/src/gui/kernel/qboxlayout.cpp
index 37ec88d..e4544b5 100644
--- a/src/gui/kernel/qboxlayout.cpp
+++ b/src/gui/kernel/qboxlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qboxlayout.h b/src/gui/kernel/qboxlayout.h
index d3fbd31..06ace10 100644
--- a/src/gui/kernel/qboxlayout.h
+++ b/src/gui/kernel/qboxlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index f7c0b6e..d71ec24 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h
index edaa260..ceed32a 100644
--- a/src/gui/kernel/qclipboard.h
+++ b/src/gui/kernel/qclipboard.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard_mac.cpp b/src/gui/kernel/qclipboard_mac.cpp
index 49a6cc8..3648f4b 100644
--- a/src/gui/kernel/qclipboard_mac.cpp
+++ b/src/gui/kernel/qclipboard_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard_p.h b/src/gui/kernel/qclipboard_p.h
index 361d40b..d0303e0 100644
--- a/src/gui/kernel/qclipboard_p.h
+++ b/src/gui/kernel/qclipboard_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard_qws.cpp b/src/gui/kernel/qclipboard_qws.cpp
index 4ba5bde..bc5eafe 100644
--- a/src/gui/kernel/qclipboard_qws.cpp
+++ b/src/gui/kernel/qclipboard_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index f07e066..43af0d6 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard_win.cpp b/src/gui/kernel/qclipboard_win.cpp
index 63ca9e5..73cc77f 100644
--- a/src/gui/kernel/qclipboard_win.cpp
+++ b/src/gui/kernel/qclipboard_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp
index 4b75f0a..a2ecb84 100644
--- a/src/gui/kernel/qclipboard_x11.cpp
+++ b/src/gui/kernel/qclipboard_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm
index 4962863..28541be 100644
--- a/src/gui/kernel/qcocoaapplication_mac.mm
+++ b/src/gui/kernel/qcocoaapplication_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoaapplication_mac_p.h b/src/gui/kernel/qcocoaapplication_mac_p.h
index 5569feb..b9f27df 100644
--- a/src/gui/kernel/qcocoaapplication_mac_p.h
+++ b/src/gui/kernel/qcocoaapplication_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 7a9dc70..062a39b 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h b/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h
index fd144e7..de9e295 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 8d38f45..8c264f9 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoamenuloader_mac_p.h b/src/gui/kernel/qcocoamenuloader_mac_p.h
index edacfa5..5e95b6b 100644
--- a/src/gui/kernel/qcocoamenuloader_mac_p.h
+++ b/src/gui/kernel/qcocoamenuloader_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/kernel/qcocoapanel_mac.mm
index 0b48efd..8bfb847 100644
--- a/src/gui/kernel/qcocoapanel_mac.mm
+++ b/src/gui/kernel/qcocoapanel_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoapanel_mac_p.h b/src/gui/kernel/qcocoapanel_mac_p.h
index 3678f81..f145dc1 100644
--- a/src/gui/kernel/qcocoapanel_mac_p.h
+++ b/src/gui/kernel/qcocoapanel_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index ddf1a27..44227af 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index a552ce7..5136988 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoaview_mac_p.h b/src/gui/kernel/qcocoaview_mac_p.h
index b6b63ca..a9ed3fa 100644
--- a/src/gui/kernel/qcocoaview_mac_p.h
+++ b/src/gui/kernel/qcocoaview_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm
index f1b642b..3f30c5d 100644
--- a/src/gui/kernel/qcocoawindow_mac.mm
+++ b/src/gui/kernel/qcocoawindow_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoawindow_mac_p.h b/src/gui/kernel/qcocoawindow_mac_p.h
index 21f82df..c9c9a1c 100644
--- a/src/gui/kernel/qcocoawindow_mac_p.h
+++ b/src/gui/kernel/qcocoawindow_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm b/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
index 41a38e1..9dc8283 100644
--- a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
+++ b/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h b/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h
index c560e29..4e37ea7 100644
--- a/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h
+++ b/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index ffba6c2..329ca0e 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac_p.h b/src/gui/kernel/qcocoawindowdelegate_mac_p.h
index 2ca9b13..bc80b49 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac_p.h
+++ b/src/gui/kernel/qcocoawindowdelegate_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index 5b58984..d59f476 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index 2490d20..ac13893 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor_mac.mm b/src/gui/kernel/qcursor_mac.mm
index c3d6c54..37de44d 100644
--- a/src/gui/kernel/qcursor_mac.mm
+++ b/src/gui/kernel/qcursor_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h
index 23798b4..7f6de76 100644
--- a/src/gui/kernel/qcursor_p.h
+++ b/src/gui/kernel/qcursor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor_qws.cpp b/src/gui/kernel/qcursor_qws.cpp
index 4a41381..7843181 100644
--- a/src/gui/kernel/qcursor_qws.cpp
+++ b/src/gui/kernel/qcursor_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor_s60.cpp b/src/gui/kernel/qcursor_s60.cpp
index 68e079e..baaa6f6 100644
--- a/src/gui/kernel/qcursor_s60.cpp
+++ b/src/gui/kernel/qcursor_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp
index ae1c004..32f4b7f 100644
--- a/src/gui/kernel/qcursor_win.cpp
+++ b/src/gui/kernel/qcursor_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/kernel/qcursor_x11.cpp
index 8e48628..eca6b9d 100644
--- a/src/gui/kernel/qcursor_x11.cpp
+++ b/src/gui/kernel/qcursor_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget.cpp b/src/gui/kernel/qdesktopwidget.cpp
index 24b4e57..e16ef77 100644
--- a/src/gui/kernel/qdesktopwidget.cpp
+++ b/src/gui/kernel/qdesktopwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h
index f78b8c6..e8673ab 100644
--- a/src/gui/kernel/qdesktopwidget.h
+++ b/src/gui/kernel/qdesktopwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget_mac.mm b/src/gui/kernel/qdesktopwidget_mac.mm
index 9637682..f0ac861 100644
--- a/src/gui/kernel/qdesktopwidget_mac.mm
+++ b/src/gui/kernel/qdesktopwidget_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget_mac_p.h b/src/gui/kernel/qdesktopwidget_mac_p.h
index a0fdf50..9000690 100644
--- a/src/gui/kernel/qdesktopwidget_mac_p.h
+++ b/src/gui/kernel/qdesktopwidget_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget_qws.cpp b/src/gui/kernel/qdesktopwidget_qws.cpp
index cd5650b..062d7ea 100644
--- a/src/gui/kernel/qdesktopwidget_qws.cpp
+++ b/src/gui/kernel/qdesktopwidget_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/kernel/qdesktopwidget_s60.cpp
index a07f4a7..748f216 100644
--- a/src/gui/kernel/qdesktopwidget_s60.cpp
+++ b/src/gui/kernel/qdesktopwidget_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/kernel/qdesktopwidget_win.cpp
index 1b2dfe7..637afc3 100644
--- a/src/gui/kernel/qdesktopwidget_win.cpp
+++ b/src/gui/kernel/qdesktopwidget_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdesktopwidget_x11.cpp b/src/gui/kernel/qdesktopwidget_x11.cpp
index f67f435..73a0c45 100644
--- a/src/gui/kernel/qdesktopwidget_x11.cpp
+++ b/src/gui/kernel/qdesktopwidget_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp
index 2b3a3d0..adc348b 100644
--- a/src/gui/kernel/qdnd.cpp
+++ b/src/gui/kernel/qdnd.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdnd_mac.mm b/src/gui/kernel/qdnd_mac.mm
index 844f5e3..35fc168 100644
--- a/src/gui/kernel/qdnd_mac.mm
+++ b/src/gui/kernel/qdnd_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h
index 033e6a6..fe45fd6 100644
--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdnd_qws.cpp b/src/gui/kernel/qdnd_qws.cpp
index 7e5afc7..970ef3b 100644
--- a/src/gui/kernel/qdnd_qws.cpp
+++ b/src/gui/kernel/qdnd_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/kernel/qdnd_s60.cpp
index 1aa30af..613e8a2 100644
--- a/src/gui/kernel/qdnd_s60.cpp
+++ b/src/gui/kernel/qdnd_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/kernel/qdnd_win.cpp
index 7083886..0669a68 100644
--- a/src/gui/kernel/qdnd_win.cpp
+++ b/src/gui/kernel/qdnd_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index 92dd0a1..3e816ca 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index 77f8fc0..8dde0f5 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h
index 8da83f4..333b259 100644
--- a/src/gui/kernel/qdrag.h
+++ b/src/gui/kernel/qdrag.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index eade02e..98a7b42 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 9c70c02..b5acbd9 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h
index e323aa9..86f1a06 100644
--- a/src/gui/kernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_glib_qws.cpp b/src/gui/kernel/qeventdispatcher_glib_qws.cpp
index 2747729..13f7ebf 100644
--- a/src/gui/kernel/qeventdispatcher_glib_qws.cpp
+++ b/src/gui/kernel/qeventdispatcher_glib_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_glib_qws_p.h b/src/gui/kernel/qeventdispatcher_glib_qws_p.h
index 5c548de..8e5ff7e 100644
--- a/src/gui/kernel/qeventdispatcher_glib_qws_p.h
+++ b/src/gui/kernel/qeventdispatcher_glib_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index 515c6d3..5094cf5 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_mac_p.h b/src/gui/kernel/qeventdispatcher_mac_p.h
index a0afb84..5c82c55 100644
--- a/src/gui/kernel/qeventdispatcher_mac_p.h
+++ b/src/gui/kernel/qeventdispatcher_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdispatcher_qws.cpp
index dfbe0bf..c0e86c5 100644
--- a/src/gui/kernel/qeventdispatcher_qws.cpp
+++ b/src/gui/kernel/qeventdispatcher_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdispatcher_qws_p.h
index 8d8d61c..5690d42 100644
--- a/src/gui/kernel/qeventdispatcher_qws_p.h
+++ b/src/gui/kernel/qeventdispatcher_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/kernel/qeventdispatcher_s60.cpp
index bc787b8..0d7c4ef 100644
--- a/src/gui/kernel/qeventdispatcher_s60.cpp
+++ b/src/gui/kernel/qeventdispatcher_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_s60_p.h b/src/gui/kernel/qeventdispatcher_s60_p.h
index d2f327c..3bbea17 100644
--- a/src/gui/kernel/qeventdispatcher_s60_p.h
+++ b/src/gui/kernel/qeventdispatcher_s60_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_x11.cpp b/src/gui/kernel/qeventdispatcher_x11.cpp
index 83a156b..8660f7f 100644
--- a/src/gui/kernel/qeventdispatcher_x11.cpp
+++ b/src/gui/kernel/qeventdispatcher_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qeventdispatcher_x11_p.h b/src/gui/kernel/qeventdispatcher_x11_p.h
index 79a43ac..0d5be4a 100644
--- a/src/gui/kernel/qeventdispatcher_x11_p.h
+++ b/src/gui/kernel/qeventdispatcher_x11_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qformlayout.cpp b/src/gui/kernel/qformlayout.cpp
index aebc3a5..feb5ae6 100644
--- a/src/gui/kernel/qformlayout.cpp
+++ b/src/gui/kernel/qformlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qformlayout.h b/src/gui/kernel/qformlayout.h
index dfafa32..9ef1943 100644
--- a/src/gui/kernel/qformlayout.h
+++ b/src/gui/kernel/qformlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index 5725a22..e7af753 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index 8416708..d894897 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgesture_p.h b/src/gui/kernel/qgesture_p.h
index 6a856ac..edb4d6a 100644
--- a/src/gui/kernel/qgesture_p.h
+++ b/src/gui/kernel/qgesture_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 6dd8127..d16e876 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
index 0d84b67..ad33c69 100644
--- a/src/gui/kernel/qgesturemanager_p.h
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgesturerecognizer.cpp b/src/gui/kernel/qgesturerecognizer.cpp
index e0e7784..a1504cf 100644
--- a/src/gui/kernel/qgesturerecognizer.cpp
+++ b/src/gui/kernel/qgesturerecognizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgesturerecognizer.h b/src/gui/kernel/qgesturerecognizer.h
index 5afb43f..1a230fb 100644
--- a/src/gui/kernel/qgesturerecognizer.h
+++ b/src/gui/kernel/qgesturerecognizer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp
index 81a4d04..16c0331 100644
--- a/src/gui/kernel/qgridlayout.cpp
+++ b/src/gui/kernel/qgridlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qgridlayout.h b/src/gui/kernel/qgridlayout.h
index f0dc6b748..e906a97 100644
--- a/src/gui/kernel/qgridlayout.h
+++ b/src/gui/kernel/qgridlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qguieventdispatcher_glib.cpp b/src/gui/kernel/qguieventdispatcher_glib.cpp
index ac2b5f7..ee0500e 100644
--- a/src/gui/kernel/qguieventdispatcher_glib.cpp
+++ b/src/gui/kernel/qguieventdispatcher_glib.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qguieventdispatcher_glib_p.h b/src/gui/kernel/qguieventdispatcher_glib_p.h
index 758650b..6b58e01 100644
--- a/src/gui/kernel/qguieventdispatcher_glib_p.h
+++ b/src/gui/kernel/qguieventdispatcher_glib_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/kernel/qguifunctions_wince.cpp
index 377dfe3..701685a 100644
--- a/src/gui/kernel/qguifunctions_wince.cpp
+++ b/src/gui/kernel/qguifunctions_wince.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qguifunctions_wince.h b/src/gui/kernel/qguifunctions_wince.h
index 932ee90..97881f8 100644
--- a/src/gui/kernel/qguifunctions_wince.h
+++ b/src/gui/kernel/qguifunctions_wince.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/gui/kernel/qguiplatformplugin.cpp
index 2dd251b..37e87fd 100644
--- a/src/gui/kernel/qguiplatformplugin.cpp
+++ b/src/gui/kernel/qguiplatformplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qguiplatformplugin_p.h b/src/gui/kernel/qguiplatformplugin_p.h
index 7f03432..8a030b7 100644
--- a/src/gui/kernel/qguiplatformplugin_p.h
+++ b/src/gui/kernel/qguiplatformplugin_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index 6340d49..9b37994 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkde.cpp b/src/gui/kernel/qkde.cpp
index 99b1de6..f0a612b 100644
--- a/src/gui/kernel/qkde.cpp
+++ b/src/gui/kernel/qkde.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkde_p.h b/src/gui/kernel/qkde_p.h
index f0489c5..f061bed 100644
--- a/src/gui/kernel/qkde_p.h
+++ b/src/gui/kernel/qkde_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index d824b74..621d4b7 100644
--- a/src/gui/kernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/kernel/qkeymapper_mac.cpp
index 3dc6afc..33f92f3 100644
--- a/src/gui/kernel/qkeymapper_mac.cpp
+++ b/src/gui/kernel/qkeymapper_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 38f141e..9cb1921 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper_qws.cpp b/src/gui/kernel/qkeymapper_qws.cpp
index 63bb46b..88906d0 100644
--- a/src/gui/kernel/qkeymapper_qws.cpp
+++ b/src/gui/kernel/qkeymapper_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/kernel/qkeymapper_s60.cpp
index d019c0f..088ae30 100644
--- a/src/gui/kernel/qkeymapper_s60.cpp
+++ b/src/gui/kernel/qkeymapper_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp
index f84b902..20692f7 100644
--- a/src/gui/kernel/qkeymapper_win.cpp
+++ b/src/gui/kernel/qkeymapper_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 825edbc..a30454c 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeymapper_x11_p.cpp b/src/gui/kernel/qkeymapper_x11_p.cpp
index 6308973..01cdcc7 100644
--- a/src/gui/kernel/qkeymapper_x11_p.cpp
+++ b/src/gui/kernel/qkeymapper_x11_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 50b2354..af18887 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index 5a973e3..18463e1 100644
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h
index 73d524d..5842fd4 100644
--- a/src/gui/kernel/qkeysequence_p.h
+++ b/src/gui/kernel/qkeysequence_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qlayout.cpp b/src/gui/kernel/qlayout.cpp
index 5b526d4..90169d0 100644
--- a/src/gui/kernel/qlayout.cpp
+++ b/src/gui/kernel/qlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qlayout.h b/src/gui/kernel/qlayout.h
index 81b5fa1..5077d77 100644
--- a/src/gui/kernel/qlayout.h
+++ b/src/gui/kernel/qlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qlayout_p.h b/src/gui/kernel/qlayout_p.h
index 020b6d0..fbdeea0 100644
--- a/src/gui/kernel/qlayout_p.h
+++ b/src/gui/kernel/qlayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qlayoutengine.cpp b/src/gui/kernel/qlayoutengine.cpp
index 836c946..103e6ec 100644
--- a/src/gui/kernel/qlayoutengine.cpp
+++ b/src/gui/kernel/qlayoutengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qlayoutengine_p.h b/src/gui/kernel/qlayoutengine_p.h
index 7febe0f..be30a2c 100644
--- a/src/gui/kernel/qlayoutengine_p.h
+++ b/src/gui/kernel/qlayoutengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qlayoutitem.cpp b/src/gui/kernel/qlayoutitem.cpp
index 6a91d95..f321ad3 100644
--- a/src/gui/kernel/qlayoutitem.cpp
+++ b/src/gui/kernel/qlayoutitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qlayoutitem.h b/src/gui/kernel/qlayoutitem.h
index 685b3f0..f934223 100644
--- a/src/gui/kernel/qlayoutitem.h
+++ b/src/gui/kernel/qlayoutitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmacdefines_mac.h b/src/gui/kernel/qmacdefines_mac.h
index d767470..ecd6872 100644
--- a/src/gui/kernel/qmacdefines_mac.h
+++ b/src/gui/kernel/qmacdefines_mac.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac.mm b/src/gui/kernel/qmacgesturerecognizer_mac.mm
index 0ccbb52..dfdcac9 100644
--- a/src/gui/kernel/qmacgesturerecognizer_mac.mm
+++ b/src/gui/kernel/qmacgesturerecognizer_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac_p.h b/src/gui/kernel/qmacgesturerecognizer_mac_p.h
index f48c160..070a3cd 100644
--- a/src/gui/kernel/qmacgesturerecognizer_mac_p.h
+++ b/src/gui/kernel/qmacgesturerecognizer_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmime.cpp b/src/gui/kernel/qmime.cpp
index 9c4a702..b96f571 100644
--- a/src/gui/kernel/qmime.cpp
+++ b/src/gui/kernel/qmime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmime.h b/src/gui/kernel/qmime.h
index 8ed87c6..c79b2dd 100644
--- a/src/gui/kernel/qmime.h
+++ b/src/gui/kernel/qmime.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmime_mac.cpp b/src/gui/kernel/qmime_mac.cpp
index c6fd184..a63f5e8 100644
--- a/src/gui/kernel/qmime_mac.cpp
+++ b/src/gui/kernel/qmime_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/kernel/qmime_win.cpp
index 2840843..d82ed47 100644
--- a/src/gui/kernel/qmime_win.cpp
+++ b/src/gui/kernel/qmime_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp
index 0a7b350..ea8a8bc 100644
--- a/src/gui/kernel/qmotifdnd_x11.cpp
+++ b/src/gui/kernel/qmotifdnd_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmultitouch_mac.mm b/src/gui/kernel/qmultitouch_mac.mm
index 0fb99e9..4cb8537 100644
--- a/src/gui/kernel/qmultitouch_mac.mm
+++ b/src/gui/kernel/qmultitouch_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qmultitouch_mac_p.h b/src/gui/kernel/qmultitouch_mac_p.h
index 925a8f4..d305c49 100644
--- a/src/gui/kernel/qmultitouch_mac_p.h
+++ b/src/gui/kernel/qmultitouch_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qnsframeview_mac_p.h b/src/gui/kernel/qnsframeview_mac_p.h
index dce0432..3acbd7e 100644
--- a/src/gui/kernel/qnsframeview_mac_p.h
+++ b/src/gui/kernel/qnsframeview_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qnsthemeframe_mac_p.h b/src/gui/kernel/qnsthemeframe_mac_p.h
index d061b1b..d1b59c6 100644
--- a/src/gui/kernel/qnsthemeframe_mac_p.h
+++ b/src/gui/kernel/qnsthemeframe_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qnstitledframe_mac_p.h b/src/gui/kernel/qnstitledframe_mac_p.h
index a96e261..c2cd53d 100644
--- a/src/gui/kernel/qnstitledframe_mac_p.h
+++ b/src/gui/kernel/qnstitledframe_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qole_win.cpp b/src/gui/kernel/qole_win.cpp
index 18ab887..e53f3b1 100644
--- a/src/gui/kernel/qole_win.cpp
+++ b/src/gui/kernel/qole_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 55d5727..c028ccd 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index f797f86..94f8f47 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h
index a8bd871..7e45c29 100644
--- a/src/gui/kernel/qsessionmanager.h
+++ b/src/gui/kernel/qsessionmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsessionmanager_qws.cpp b/src/gui/kernel/qsessionmanager_qws.cpp
index fd26b57..351170e 100644
--- a/src/gui/kernel/qsessionmanager_qws.cpp
+++ b/src/gui/kernel/qsessionmanager_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp
index f7bd71f..f09d633 100644
--- a/src/gui/kernel/qshortcut.cpp
+++ b/src/gui/kernel/qshortcut.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qshortcut.h b/src/gui/kernel/qshortcut.h
index a37c1db..3119e78 100644
--- a/src/gui/kernel/qshortcut.h
+++ b/src/gui/kernel/qshortcut.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index 3d344c9..3d4fb0e 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
index 46c6e79..d04f8b9 100644
--- a/src/gui/kernel/qshortcutmap_p.h
+++ b/src/gui/kernel/qshortcutmap_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsizepolicy.h b/src/gui/kernel/qsizepolicy.h
index ff7b9ee..76a8e75 100644
--- a/src/gui/kernel/qsizepolicy.h
+++ b/src/gui/kernel/qsizepolicy.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 54e6317..ead447a 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/gui/kernel/qsoftkeymanager_common_p.h
index 1b364d4..4154804 100644
--- a/src/gui/kernel/qsoftkeymanager_common_p.h
+++ b/src/gui/kernel/qsoftkeymanager_common_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h
index 6eedfa8..e7c0a91 100644
--- a/src/gui/kernel/qsoftkeymanager_p.h
+++ b/src/gui/kernel/qsoftkeymanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp
index fee1580..1de7f19 100644
--- a/src/gui/kernel/qsoftkeymanager_s60.cpp
+++ b/src/gui/kernel/qsoftkeymanager_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsoftkeymanager_s60_p.h b/src/gui/kernel/qsoftkeymanager_s60_p.h
index d14993c..d37d335 100644
--- a/src/gui/kernel/qsoftkeymanager_s60_p.h
+++ b/src/gui/kernel/qsoftkeymanager_s60_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound.cpp b/src/gui/kernel/qsound.cpp
index 9d8ffa5..6c7a154 100644
--- a/src/gui/kernel/qsound.cpp
+++ b/src/gui/kernel/qsound.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound.h b/src/gui/kernel/qsound.h
index 77850e0..5df6de5 100644
--- a/src/gui/kernel/qsound.h
+++ b/src/gui/kernel/qsound.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound_mac.mm b/src/gui/kernel/qsound_mac.mm
index 2aff44d..9ee4691 100644
--- a/src/gui/kernel/qsound_mac.mm
+++ b/src/gui/kernel/qsound_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound_p.h b/src/gui/kernel/qsound_p.h
index b1107a7..3ffd61d 100644
--- a/src/gui/kernel/qsound_p.h
+++ b/src/gui/kernel/qsound_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound_qws.cpp b/src/gui/kernel/qsound_qws.cpp
index 7b71bdf..05d1590 100644
--- a/src/gui/kernel/qsound_qws.cpp
+++ b/src/gui/kernel/qsound_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound_s60.cpp b/src/gui/kernel/qsound_s60.cpp
index df2830b..e5d3d26 100644
--- a/src/gui/kernel/qsound_s60.cpp
+++ b/src/gui/kernel/qsound_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound_win.cpp b/src/gui/kernel/qsound_win.cpp
index cee4576..77dca90 100644
--- a/src/gui/kernel/qsound_win.cpp
+++ b/src/gui/kernel/qsound_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qsound_x11.cpp b/src/gui/kernel/qsound_x11.cpp
index 251d98d..9cc403d 100644
--- a/src/gui/kernel/qsound_x11.cpp
+++ b/src/gui/kernel/qsound_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qstackedlayout.cpp b/src/gui/kernel/qstackedlayout.cpp
index 7559066..441522e 100644
--- a/src/gui/kernel/qstackedlayout.cpp
+++ b/src/gui/kernel/qstackedlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qstackedlayout.h b/src/gui/kernel/qstackedlayout.h
index c069149..a59d550 100644
--- a/src/gui/kernel/qstackedlayout.h
+++ b/src/gui/kernel/qstackedlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index 893ba2b..52590d4 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qstandardgestures_p.h b/src/gui/kernel/qstandardgestures_p.h
index da73b85..284d638 100644
--- a/src/gui/kernel/qstandardgestures_p.h
+++ b/src/gui/kernel/qstandardgestures_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 7d23abf..5f845f3 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index c6c2db2..4bae713 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h
index ca7e84c..cb73522 100644
--- a/src/gui/kernel/qt_gui_pch.h
+++ b/src/gui/kernel/qt_gui_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp
index eccf816..ab988af 100644
--- a/src/gui/kernel/qt_mac.cpp
+++ b/src/gui/kernel/qt_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/kernel/qt_mac_p.h
index ca9541a..b1bd90b 100644
--- a/src/gui/kernel/qt_mac_p.h
+++ b/src/gui/kernel/qt_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 7fd2baa..8e625da 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h
index 7383382..5a27539 100644
--- a/src/gui/kernel/qt_x11_p.h
+++ b/src/gui/kernel/qt_x11_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qtooltip.cpp b/src/gui/kernel/qtooltip.cpp
index c8fcf45..7eddc24 100644
--- a/src/gui/kernel/qtooltip.cpp
+++ b/src/gui/kernel/qtooltip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qtooltip.h b/src/gui/kernel/qtooltip.h
index d5c2f7a..6bcd943 100644
--- a/src/gui/kernel/qtooltip.h
+++ b/src/gui/kernel/qtooltip.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp
index ff4641e..3d4731c 100644
--- a/src/gui/kernel/qwhatsthis.cpp
+++ b/src/gui/kernel/qwhatsthis.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwhatsthis.h b/src/gui/kernel/qwhatsthis.h
index 366b7ea..041862f 100644
--- a/src/gui/kernel/qwhatsthis.h
+++ b/src/gui/kernel/qwhatsthis.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index dc0dbf4..4a3e680 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 941bd68..3eafbdd 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 1e2aa9f..bf900c4 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 4a79dc7..9662a9e 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget_qws.cpp b/src/gui/kernel/qwidget_qws.cpp
index 3145136..8ab25a3 100644
--- a/src/gui/kernel/qwidget_qws.cpp
+++ b/src/gui/kernel/qwidget_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 4109ed8..5ca5bfb 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 3d206fd..497efa2 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp
index 76532ed..8331818 100644
--- a/src/gui/kernel/qwidget_wince.cpp
+++ b/src/gui/kernel/qwidget_wince.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 8d80e10..09abb7b 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidgetaction.cpp b/src/gui/kernel/qwidgetaction.cpp
index 021bbb3..75a11e5 100644
--- a/src/gui/kernel/qwidgetaction.cpp
+++ b/src/gui/kernel/qwidgetaction.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidgetaction.h b/src/gui/kernel/qwidgetaction.h
index 4e35391..9d876f6 100644
--- a/src/gui/kernel/qwidgetaction.h
+++ b/src/gui/kernel/qwidgetaction.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidgetaction_p.h b/src/gui/kernel/qwidgetaction_p.h
index 05f2cda..1710842 100644
--- a/src/gui/kernel/qwidgetaction_p.h
+++ b/src/gui/kernel/qwidgetaction_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwidgetcreate_x11.cpp b/src/gui/kernel/qwidgetcreate_x11.cpp
index 171294d..58fb5ad 100644
--- a/src/gui/kernel/qwidgetcreate_x11.cpp
+++ b/src/gui/kernel/qwidgetcreate_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index a721c7d..1b0542d 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h
index edcb1db..3e3ef16 100644
--- a/src/gui/kernel/qwindowdefs_win.h
+++ b/src/gui/kernel/qwindowdefs_win.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwinnativepangesturerecognizer_win.cpp b/src/gui/kernel/qwinnativepangesturerecognizer_win.cpp
index 780de5d..369f8cb 100644
--- a/src/gui/kernel/qwinnativepangesturerecognizer_win.cpp
+++ b/src/gui/kernel/qwinnativepangesturerecognizer_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h b/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
index 9d0e6f7..1fc37f4 100644
--- a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
+++ b/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp
index 9f1b1f8..1905fdb 100644
--- a/src/gui/kernel/qx11embed_x11.cpp
+++ b/src/gui/kernel/qx11embed_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qx11embed_x11.h b/src/gui/kernel/qx11embed_x11.h
index c9665b9..f9f4400 100644
--- a/src/gui/kernel/qx11embed_x11.h
+++ b/src/gui/kernel/qx11embed_x11.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qx11info_x11.cpp b/src/gui/kernel/qx11info_x11.cpp
index e870689..9ad4810 100644
--- a/src/gui/kernel/qx11info_x11.cpp
+++ b/src/gui/kernel/qx11info_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/kernel/qx11info_x11.h b/src/gui/kernel/qx11info_x11.h
index 5eb5b94..8761a12 100644
--- a/src/gui/kernel/qx11info_x11.h
+++ b/src/gui/kernel/qx11info_x11.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp
index be30cb6..e7a5367 100644
--- a/src/gui/math3d/qgenericmatrix.cpp
+++ b/src/gui/math3d/qgenericmatrix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h
index 3224ae2..00e74db 100644
--- a/src/gui/math3d/qgenericmatrix.h
+++ b/src/gui/math3d/qgenericmatrix.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 16c7f97..f9dcbf4 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 0671fa8..9c0995f 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index 2fd66eb..e5bf3c4 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index 16aa5d0..fc63362 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp
index 6a5cfc8..b9e4c20 100644
--- a/src/gui/math3d/qvector2d.cpp
+++ b/src/gui/math3d/qvector2d.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h
index c92c5e0..55dc4d8 100644
--- a/src/gui/math3d/qvector2d.h
+++ b/src/gui/math3d/qvector2d.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp
index dfcce0e..64dfce8 100644
--- a/src/gui/math3d/qvector3d.cpp
+++ b/src/gui/math3d/qvector3d.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h
index 2fdd1d3..7ec8d1d 100644
--- a/src/gui/math3d/qvector3d.h
+++ b/src/gui/math3d/qvector3d.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp
index abff1ba..31833ac 100644
--- a/src/gui/math3d/qvector4d.cpp
+++ b/src/gui/math3d/qvector4d.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h
index a383fbb..ec8519e 100644
--- a/src/gui/math3d/qvector4d.h
+++ b/src/gui/math3d/qvector4d.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/makepsheader.pl b/src/gui/painting/makepsheader.pl
index c2c388a..06f404c 100755
--- a/src/gui/painting/makepsheader.pl
+++ b/src/gui/painting/makepsheader.pl
@@ -8,11 +8,11 @@
 ## This file is part of the QtGui module of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index ac9b994..55e4957 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qbackingstore_p.h b/src/gui/painting/qbackingstore_p.h
index 6510b57..404c0c3 100644
--- a/src/gui/painting/qbackingstore_p.h
+++ b/src/gui/painting/qbackingstore_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index 2a9b31a..7e913ef 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qbezier_p.h b/src/gui/painting/qbezier_p.h
index 18ec116..a76d94b 100644
--- a/src/gui/painting/qbezier_p.h
+++ b/src/gui/painting/qbezier_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp
index 0edf256..073a0fc 100644
--- a/src/gui/painting/qblendfunctions.cpp
+++ b/src/gui/painting/qblendfunctions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qblendfunctions_armv6_rvct.s b/src/gui/painting/qblendfunctions_armv6_rvct.s
index 1e3faa9..b6676f7 100644
--- a/src/gui/painting/qblendfunctions_armv6_rvct.s
+++ b/src/gui/painting/qblendfunctions_armv6_rvct.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************
diff --git a/src/gui/painting/qblendfunctions_p.h b/src/gui/painting/qblendfunctions_p.h
index ad754b0..292b8f5 100644
--- a/src/gui/painting/qblendfunctions_p.h
+++ b/src/gui/painting/qblendfunctions_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index d0788c7..8b12540 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index b657301..6ffb70a 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 37d7fa3..4750543 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index 0ac828d..67df36a 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolor_p.cpp b/src/gui/painting/qcolor_p.cpp
index b1adf9f..c4e0ebb 100644
--- a/src/gui/painting/qcolor_p.cpp
+++ b/src/gui/painting/qcolor_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolor_p.h b/src/gui/painting/qcolor_p.h
index ed02656..53b5128 100644
--- a/src/gui/painting/qcolor_p.h
+++ b/src/gui/painting/qcolor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolormap.h b/src/gui/painting/qcolormap.h
index 4835307..7dceb11 100644
--- a/src/gui/painting/qcolormap.h
+++ b/src/gui/painting/qcolormap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolormap_mac.cpp b/src/gui/painting/qcolormap_mac.cpp
index 1d7fb22..254c79b 100644
--- a/src/gui/painting/qcolormap_mac.cpp
+++ b/src/gui/painting/qcolormap_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolormap_qws.cpp b/src/gui/painting/qcolormap_qws.cpp
index 24d43f1..09f52c5 100644
--- a/src/gui/painting/qcolormap_qws.cpp
+++ b/src/gui/painting/qcolormap_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolormap_s60.cpp b/src/gui/painting/qcolormap_s60.cpp
index 1b7a35e..03e40ec 100644
--- a/src/gui/painting/qcolormap_s60.cpp
+++ b/src/gui/painting/qcolormap_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolormap_win.cpp b/src/gui/painting/qcolormap_win.cpp
index 1471e01..d934aa0 100644
--- a/src/gui/painting/qcolormap_win.cpp
+++ b/src/gui/painting/qcolormap_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcolormap_x11.cpp b/src/gui/painting/qcolormap_x11.cpp
index be3afb9..d9a65a2 100644
--- a/src/gui/painting/qcolormap_x11.cpp
+++ b/src/gui/painting/qcolormap_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcssutil.cpp b/src/gui/painting/qcssutil.cpp
index ad83980..4602f6f 100644
--- a/src/gui/painting/qcssutil.cpp
+++ b/src/gui/painting/qcssutil.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcssutil_p.h b/src/gui/painting/qcssutil_p.h
index 6c6155e..7f1d07d 100644
--- a/src/gui/painting/qcssutil_p.h
+++ b/src/gui/painting/qcssutil_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp
index 1ea1670..a39e3db 100644
--- a/src/gui/painting/qcups.cpp
+++ b/src/gui/painting/qcups.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qcups_p.h b/src/gui/painting/qcups_p.h
index 9259679..6e1270d 100644
--- a/src/gui/painting/qcups_p.h
+++ b/src/gui/painting/qcups_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h
index 8f8544f..7624e81 100644
--- a/src/gui/painting/qdatabuffer_p.h
+++ b/src/gui/painting/qdatabuffer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 5f190ba..e330306 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_armv6_p.h b/src/gui/painting/qdrawhelper_armv6_p.h
index e58f8bb..6c04d62 100644
--- a/src/gui/painting/qdrawhelper_armv6_p.h
+++ b/src/gui/painting/qdrawhelper_armv6_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.inc b/src/gui/painting/qdrawhelper_armv6_rvct.inc
index 8c6d803..ea2f2f2 100644
--- a/src/gui/painting/qdrawhelper_armv6_rvct.inc
+++ b/src/gui/painting/qdrawhelper_armv6_rvct.inc
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.s b/src/gui/painting/qdrawhelper_armv6_rvct.s
index 180980a..f612580 100644
--- a/src/gui/painting/qdrawhelper_armv6_rvct.s
+++ b/src/gui/painting/qdrawhelper_armv6_rvct.s
@@ -7,11 +7,11 @@
 ;** This file is part of the QtGui module of the Qt Toolkit.
 ;**
 ;** $QT_BEGIN_LICENSE:LGPL$
-;** No Commercial Usage
-;** This file contains pre-release code and may not be distributed.
-;** You may use this file in accordance with the terms and conditions
-;** contained in the Technology Preview License Agreement accompanying
-;** this package.
+;** Commercial Usage
+;** Licensees holding valid Qt Commercial licenses may use this file in
+;** accordance with the Qt Commercial License Agreement provided with the
+;** Software or, alternatively, in accordance with the terms contained in
+;** a written agreement between you and Nokia.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ;** rights.  These rights are described in the Nokia 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.
+;**
 ;** If you have questions regarding the use of this file, please contact
 ;** Nokia at qt-info@nokia.com.
-;**
-;**
-;**
-;**
-;**
-;**
-;**
-;**
 ;** $QT_END_LICENSE$
 ;**
 ;****************************************************************************
diff --git a/src/gui/painting/qdrawhelper_iwmmxt.cpp b/src/gui/painting/qdrawhelper_iwmmxt.cpp
index d99045d..d02a66d 100644
--- a/src/gui/painting/qdrawhelper_iwmmxt.cpp
+++ b/src/gui/painting/qdrawhelper_iwmmxt.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_mmx.cpp b/src/gui/painting/qdrawhelper_mmx.cpp
index ba92554..9164417 100644
--- a/src/gui/painting/qdrawhelper_mmx.cpp
+++ b/src/gui/painting/qdrawhelper_mmx.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_mmx3dnow.cpp b/src/gui/painting/qdrawhelper_mmx3dnow.cpp
index b1e81fc..2336033 100644
--- a/src/gui/painting/qdrawhelper_mmx3dnow.cpp
+++ b/src/gui/painting/qdrawhelper_mmx3dnow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_mmx_p.h b/src/gui/painting/qdrawhelper_mmx_p.h
index 59b3804..ce33316 100644
--- a/src/gui/painting/qdrawhelper_mmx_p.h
+++ b/src/gui/painting/qdrawhelper_mmx_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp
index 0afd077..b971883 100644
--- a/src/gui/painting/qdrawhelper_neon.cpp
+++ b/src/gui/painting/qdrawhelper_neon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_neon_asm.S b/src/gui/painting/qdrawhelper_neon_asm.S
index d9cdc36..9deaee1 100644
--- a/src/gui/painting/qdrawhelper_neon_asm.S
+++ b/src/gui/painting/qdrawhelper_neon_asm.S
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_neon_p.h b/src/gui/painting/qdrawhelper_neon_p.h
index d25b7ec..b725832 100644
--- a/src/gui/painting/qdrawhelper_neon_p.h
+++ b/src/gui/painting/qdrawhelper_neon_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index 0cc2e40..4ec0cbb 100644
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_sse.cpp b/src/gui/painting/qdrawhelper_sse.cpp
index 8b17c29..abd15de 100644
--- a/src/gui/painting/qdrawhelper_sse.cpp
+++ b/src/gui/painting/qdrawhelper_sse.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp
index f97d865..01b7ecf 100644
--- a/src/gui/painting/qdrawhelper_sse2.cpp
+++ b/src/gui/painting/qdrawhelper_sse2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_sse3dnow.cpp b/src/gui/painting/qdrawhelper_sse3dnow.cpp
index 9ae0e07..a97b5ec 100644
--- a/src/gui/painting/qdrawhelper_sse3dnow.cpp
+++ b/src/gui/painting/qdrawhelper_sse3dnow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_sse_p.h b/src/gui/painting/qdrawhelper_sse_p.h
index 0fdf4c8..7608d28 100644
--- a/src/gui/painting/qdrawhelper_sse_p.h
+++ b/src/gui/painting/qdrawhelper_sse_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp
index fb5602e..efc659a 100644
--- a/src/gui/painting/qdrawhelper_ssse3.cpp
+++ b/src/gui/painting/qdrawhelper_ssse3.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawhelper_x86_p.h b/src/gui/painting/qdrawhelper_x86_p.h
index 09ccd77..eb3fcf2 100644
--- a/src/gui/painting/qdrawhelper_x86_p.h
+++ b/src/gui/painting/qdrawhelper_x86_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h
index d8f6bf5..a442377 100644
--- a/src/gui/painting/qdrawingprimitive_sse2_p.h
+++ b/src/gui/painting/qdrawingprimitive_sse2_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index 11ea6d5..c3d3189 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h
index 31e352f..c69b0e2 100644
--- a/src/gui/painting/qdrawutil.h
+++ b/src/gui/painting/qdrawutil.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qemulationpaintengine.cpp b/src/gui/painting/qemulationpaintengine.cpp
index 0510b10..f74aff7 100644
--- a/src/gui/painting/qemulationpaintengine.cpp
+++ b/src/gui/painting/qemulationpaintengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h
index 5835f10..65aa986 100644
--- a/src/gui/painting/qemulationpaintengine_p.h
+++ b/src/gui/painting/qemulationpaintengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qfixed_p.h b/src/gui/painting/qfixed_p.h
index f62725a..aa912be 100644
--- a/src/gui/painting/qfixed_p.h
+++ b/src/gui/painting/qfixed_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp
index f06e309..82ab6bf 100644
--- a/src/gui/painting/qgraphicssystem.cpp
+++ b/src/gui/painting/qgraphicssystem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_mac.cpp b/src/gui/painting/qgraphicssystem_mac.cpp
index 93cc8e9..2eb7b5b 100644
--- a/src/gui/painting/qgraphicssystem_mac.cpp
+++ b/src/gui/painting/qgraphicssystem_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_mac_p.h b/src/gui/painting/qgraphicssystem_mac_p.h
index d65c2c9..f2d7005 100644
--- a/src/gui/painting/qgraphicssystem_mac_p.h
+++ b/src/gui/painting/qgraphicssystem_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_p.h b/src/gui/painting/qgraphicssystem_p.h
index 1211505..64ab0c4 100644
--- a/src/gui/painting/qgraphicssystem_p.h
+++ b/src/gui/painting/qgraphicssystem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_qws.cpp b/src/gui/painting/qgraphicssystem_qws.cpp
index f5dab4b..74483c3 100644
--- a/src/gui/painting/qgraphicssystem_qws.cpp
+++ b/src/gui/painting/qgraphicssystem_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_qws_p.h b/src/gui/painting/qgraphicssystem_qws_p.h
index d078f54..1845836 100644
--- a/src/gui/painting/qgraphicssystem_qws_p.h
+++ b/src/gui/painting/qgraphicssystem_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_raster.cpp b/src/gui/painting/qgraphicssystem_raster.cpp
index 909508e..90b6a2c 100644
--- a/src/gui/painting/qgraphicssystem_raster.cpp
+++ b/src/gui/painting/qgraphicssystem_raster.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_raster_p.h b/src/gui/painting/qgraphicssystem_raster_p.h
index a8b7abc..badcfb4 100644
--- a/src/gui/painting/qgraphicssystem_raster_p.h
+++ b/src/gui/painting/qgraphicssystem_raster_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index a9fbbee..198b30d 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h
index 421fbeb..c90bcae 100644
--- a/src/gui/painting/qgraphicssystem_runtime_p.h
+++ b/src/gui/painting/qgraphicssystem_runtime_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index ee6fbd8..0cdc086 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystemfactory_p.h b/src/gui/painting/qgraphicssystemfactory_p.h
index b2a7620..29b44ec 100644
--- a/src/gui/painting/qgraphicssystemfactory_p.h
+++ b/src/gui/painting/qgraphicssystemfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystemplugin.cpp b/src/gui/painting/qgraphicssystemplugin.cpp
index 11c02e1..0e4e9fb 100644
--- a/src/gui/painting/qgraphicssystemplugin.cpp
+++ b/src/gui/painting/qgraphicssystemplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgraphicssystemplugin_p.h b/src/gui/painting/qgraphicssystemplugin_p.h
index ba46fe9..e189855 100644
--- a/src/gui/painting/qgraphicssystemplugin_p.h
+++ b/src/gui/painting/qgraphicssystemplugin_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c
index 94039fb..997fb2c 100644
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.c
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qgrayraster_p.h b/src/gui/painting/qgrayraster_p.h
index ad595b8..70e6724 100644
--- a/src/gui/painting/qgrayraster_p.h
+++ b/src/gui/painting/qgrayraster_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qimagescale.cpp b/src/gui/painting/qimagescale.cpp
index 8580775..5581289 100644
--- a/src/gui/painting/qimagescale.cpp
+++ b/src/gui/painting/qimagescale.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qimagescale_p.h b/src/gui/painting/qimagescale_p.h
index d94a8fb..90ab85e 100644
--- a/src/gui/painting/qimagescale_p.h
+++ b/src/gui/painting/qimagescale_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qmath_p.h b/src/gui/painting/qmath_p.h
index 8a5f5ab..5dc4cb8 100644
--- a/src/gui/painting/qmath_p.h
+++ b/src/gui/painting/qmath_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 7746316..1da884f 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 14133c9..63a6aa2 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp
index 6888bb0..a90235e 100644
--- a/src/gui/painting/qmemrotate.cpp
+++ b/src/gui/painting/qmemrotate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h
index 2911860..6026934 100644
--- a/src/gui/painting/qmemrotate_p.h
+++ b/src/gui/painting/qmemrotate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp
index bf03545..671aa42 100644
--- a/src/gui/painting/qoutlinemapper.cpp
+++ b/src/gui/painting/qoutlinemapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h
index d534f76..55ecb7e 100644
--- a/src/gui/painting/qoutlinemapper_p.h
+++ b/src/gui/painting/qoutlinemapper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp
index 3a4c94c..375897b 100644
--- a/src/gui/painting/qpaintbuffer.cpp
+++ b/src/gui/painting/qpaintbuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintbuffer_p.h b/src/gui/painting/qpaintbuffer_p.h
index e4fe4bf..39934f6 100644
--- a/src/gui/painting/qpaintbuffer_p.h
+++ b/src/gui/painting/qpaintbuffer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index 4169df0..8450413 100644
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 3b82225..ce0ceba 100644
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintdevice_mac.cpp b/src/gui/painting/qpaintdevice_mac.cpp
index 1fd1019..0becfd7 100644
--- a/src/gui/painting/qpaintdevice_mac.cpp
+++ b/src/gui/painting/qpaintdevice_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintdevice_qws.cpp b/src/gui/painting/qpaintdevice_qws.cpp
index f833dd1..0655424 100644
--- a/src/gui/painting/qpaintdevice_qws.cpp
+++ b/src/gui/painting/qpaintdevice_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintdevice_win.cpp b/src/gui/painting/qpaintdevice_win.cpp
index c7f1156..9d8f267 100644
--- a/src/gui/painting/qpaintdevice_win.cpp
+++ b/src/gui/painting/qpaintdevice_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintdevice_x11.cpp b/src/gui/painting/qpaintdevice_x11.cpp
index 2635421..ae9b73d 100644
--- a/src/gui/painting/qpaintdevice_x11.cpp
+++ b/src/gui/painting/qpaintdevice_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index a2d0337..67b3ff7 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index b860012..1089cce 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_alpha.cpp b/src/gui/painting/qpaintengine_alpha.cpp
index 4b1c58d..eb2b149 100644
--- a/src/gui/painting/qpaintengine_alpha.cpp
+++ b/src/gui/painting/qpaintengine_alpha.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_alpha_p.h b/src/gui/painting/qpaintengine_alpha_p.h
index 1a30a82..b572aff 100644
--- a/src/gui/painting/qpaintengine_alpha_p.h
+++ b/src/gui/painting/qpaintengine_alpha_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp
index e5323d8..fb69273 100644
--- a/src/gui/painting/qpaintengine_mac.cpp
+++ b/src/gui/painting/qpaintengine_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/painting/qpaintengine_mac_p.h
index 940b2bc..35feeb0 100644
--- a/src/gui/painting/qpaintengine_mac_p.h
+++ b/src/gui/painting/qpaintengine_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
index 3b467c7..f7f41b0 100644
--- a/src/gui/painting/qpaintengine_p.h
+++ b/src/gui/painting/qpaintengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_preview.cpp b/src/gui/painting/qpaintengine_preview.cpp
index 52daf6b..e586228 100644
--- a/src/gui/painting/qpaintengine_preview.cpp
+++ b/src/gui/painting/qpaintengine_preview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_preview_p.h b/src/gui/painting/qpaintengine_preview_p.h
index 2e04db5..d82127a 100644
--- a/src/gui/painting/qpaintengine_preview_p.h
+++ b/src/gui/painting/qpaintengine_preview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 09a87aa..e1491ca 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 1016f8d..62659cc 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_s60.cpp b/src/gui/painting/qpaintengine_s60.cpp
index 068ca0c..ac6ea3b 100644
--- a/src/gui/painting/qpaintengine_s60.cpp
+++ b/src/gui/painting/qpaintengine_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_s60_p.h b/src/gui/painting/qpaintengine_s60_p.h
index 0026083..335d754 100644
--- a/src/gui/painting/qpaintengine_s60_p.h
+++ b/src/gui/painting/qpaintengine_s60_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index fecf25f..4069f41 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine_x11_p.h b/src/gui/painting/qpaintengine_x11_p.h
index eb9b45a..c71000a 100644
--- a/src/gui/painting/qpaintengine_x11_p.h
+++ b/src/gui/painting/qpaintengine_x11_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index c1e3d66..c7dbe58 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index 6c654bd..7892e3e 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 12be93e..5f39c85 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index edfb67e..2ae29e6 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index 9362dbe..470328f 100644
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index ffd0d5c..023bd23 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index 15d83b8..3904573 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index 43f548f..0ad612e 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index a17b7c1..abbf71c 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h
index bdad4e1..3a6a795 100644
--- a/src/gui/painting/qpathclipper_p.h
+++ b/src/gui/painting/qpathclipper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 6e02435..bc75c84 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index 9c4d05d..52195c3 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index 2e43984..fd9c644 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h
index aff7071..639d136 100644
--- a/src/gui/painting/qpen.h
+++ b/src/gui/painting/qpen.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpen_p.h b/src/gui/painting/qpen_p.h
index c808eac..74390b2 100644
--- a/src/gui/painting/qpen_p.h
+++ b/src/gui/painting/qpen_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp
index 2fb52b5..9b3928d 100644
--- a/src/gui/painting/qpolygon.cpp
+++ b/src/gui/painting/qpolygon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h
index 7a49e29..c42007a 100644
--- a/src/gui/painting/qpolygon.h
+++ b/src/gui/painting/qpolygon.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpolygonclipper_p.h b/src/gui/painting/qpolygonclipper_p.h
index cdaac1c..f69c801 100644
--- a/src/gui/painting/qpolygonclipper_p.h
+++ b/src/gui/painting/qpolygonclipper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine.h b/src/gui/painting/qprintengine.h
index 71ff954..43cc743 100644
--- a/src/gui/painting/qprintengine.h
+++ b/src/gui/painting/qprintengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_mac.mm b/src/gui/painting/qprintengine_mac.mm
index a548225..ca571c8 100644
--- a/src/gui/painting/qprintengine_mac.mm
+++ b/src/gui/painting/qprintengine_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_mac_p.h b/src/gui/painting/qprintengine_mac_p.h
index d737d53..4a4ad7f 100644
--- a/src/gui/painting/qprintengine_mac_p.h
+++ b/src/gui/painting/qprintengine_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
index 2955e39..f8ab8ad 100644
--- a/src/gui/painting/qprintengine_pdf.cpp
+++ b/src/gui/painting/qprintengine_pdf.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/painting/qprintengine_pdf_p.h
index e0ca56f..00db821 100644
--- a/src/gui/painting/qprintengine_pdf_p.h
+++ b/src/gui/painting/qprintengine_pdf_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp
index 28e9a7a..65a9a4f 100644
--- a/src/gui/painting/qprintengine_ps.cpp
+++ b/src/gui/painting/qprintengine_ps.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_ps_p.h b/src/gui/painting/qprintengine_ps_p.h
index e2758a5..737efb5 100644
--- a/src/gui/painting/qprintengine_ps_p.h
+++ b/src/gui/painting/qprintengine_ps_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_qws.cpp b/src/gui/painting/qprintengine_qws.cpp
index 396d712..ee3b4cf 100644
--- a/src/gui/painting/qprintengine_qws.cpp
+++ b/src/gui/painting/qprintengine_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_qws_p.h b/src/gui/painting/qprintengine_qws_p.h
index e08fbcd..3bdebfa 100644
--- a/src/gui/painting/qprintengine_qws_p.h
+++ b/src/gui/painting/qprintengine_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp
index dd4de99..8cc86ad 100644
--- a/src/gui/painting/qprintengine_win.cpp
+++ b/src/gui/painting/qprintengine_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprintengine_win_p.h b/src/gui/painting/qprintengine_win_p.h
index d435831..2841dfb 100644
--- a/src/gui/painting/qprintengine_win_p.h
+++ b/src/gui/painting/qprintengine_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp
index ae21416..f295148 100644
--- a/src/gui/painting/qprinter.cpp
+++ b/src/gui/painting/qprinter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinter.h b/src/gui/painting/qprinter.h
index 996a954..c9797e5 100644
--- a/src/gui/painting/qprinter.h
+++ b/src/gui/painting/qprinter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinter_p.h b/src/gui/painting/qprinter_p.h
index 4fa505f..31f91db 100644
--- a/src/gui/painting/qprinter_p.h
+++ b/src/gui/painting/qprinter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinterinfo.h b/src/gui/painting/qprinterinfo.h
index 063c6b9..456767c 100644
--- a/src/gui/painting/qprinterinfo.h
+++ b/src/gui/painting/qprinterinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinterinfo_mac.cpp b/src/gui/painting/qprinterinfo_mac.cpp
index 9b199f4..9c9d22d 100644
--- a/src/gui/painting/qprinterinfo_mac.cpp
+++ b/src/gui/painting/qprinterinfo_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp
index 2129aa5..6d35b05 100644
--- a/src/gui/painting/qprinterinfo_unix.cpp
+++ b/src/gui/painting/qprinterinfo_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinterinfo_unix_p.h b/src/gui/painting/qprinterinfo_unix_p.h
index b37b99a..bee0155 100644
--- a/src/gui/painting/qprinterinfo_unix_p.h
+++ b/src/gui/painting/qprinterinfo_unix_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qprinterinfo_win.cpp b/src/gui/painting/qprinterinfo_win.cpp
index caada1f..23b9a2c 100644
--- a/src/gui/painting/qprinterinfo_win.cpp
+++ b/src/gui/painting/qprinterinfo_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qrasterdefs_p.h b/src/gui/painting/qrasterdefs_p.h
index 19a0b16..59bc012 100644
--- a/src/gui/painting/qrasterdefs_p.h
+++ b/src/gui/painting/qrasterdefs_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp
index 4fded1f..2c1ccef 100644
--- a/src/gui/painting/qrasterizer.cpp
+++ b/src/gui/painting/qrasterizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qrasterizer_p.h b/src/gui/painting/qrasterizer_p.h
index 42097a1..b02c06c 100644
--- a/src/gui/painting/qrasterizer_p.h
+++ b/src/gui/painting/qrasterizer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 3412f9b..a1944ac 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index bc4da28..c8629af 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qregion_mac.cpp b/src/gui/painting/qregion_mac.cpp
index feb32ec..d3dfdbc 100644
--- a/src/gui/painting/qregion_mac.cpp
+++ b/src/gui/painting/qregion_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qregion_qws.cpp b/src/gui/painting/qregion_qws.cpp
index 4299c46..84eb72e 100644
--- a/src/gui/painting/qregion_qws.cpp
+++ b/src/gui/painting/qregion_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qregion_s60.cpp b/src/gui/painting/qregion_s60.cpp
index 4cd0b7e..6b063bb 100644
--- a/src/gui/painting/qregion_s60.cpp
+++ b/src/gui/painting/qregion_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qregion_win.cpp b/src/gui/painting/qregion_win.cpp
index 487f5f8..f475e76 100644
--- a/src/gui/painting/qregion_win.cpp
+++ b/src/gui/painting/qregion_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qregion_x11.cpp b/src/gui/painting/qregion_x11.cpp
index 48dd128..a61321c 100644
--- a/src/gui/painting/qregion_x11.cpp
+++ b/src/gui/painting/qregion_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qrgb.h b/src/gui/painting/qrgb.h
index ea5f353..906009a 100644
--- a/src/gui/painting/qrgb.h
+++ b/src/gui/painting/qrgb.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index 9decf41..6c2ad66 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qstroker_p.h b/src/gui/painting/qstroker_p.h
index 5607a8e..8525330 100644
--- a/src/gui/painting/qstroker_p.h
+++ b/src/gui/painting/qstroker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qstylepainter.cpp b/src/gui/painting/qstylepainter.cpp
index 76f37ba..d5f86a4 100644
--- a/src/gui/painting/qstylepainter.cpp
+++ b/src/gui/painting/qstylepainter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qstylepainter.h b/src/gui/painting/qstylepainter.h
index 520652c..5eb4c3c 100644
--- a/src/gui/painting/qstylepainter.h
+++ b/src/gui/painting/qstylepainter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qtessellator.cpp b/src/gui/painting/qtessellator.cpp
index 5e694a1..690b5f8 100644
--- a/src/gui/painting/qtessellator.cpp
+++ b/src/gui/painting/qtessellator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qtessellator_p.h b/src/gui/painting/qtessellator_p.h
index f894a67..8a10ae0 100644
--- a/src/gui/painting/qtessellator_p.h
+++ b/src/gui/painting/qtessellator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index b609f7b..fb90892 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index e6d2b22..d449980 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 47b7758..3a80fb8 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index 11f2673..5f297e2 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index 1048d46..bec3035 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp
index 02a8b80..f8c3c31 100644
--- a/src/gui/painting/qwindowsurface.cpp
+++ b/src/gui/painting/qwindowsurface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_mac.cpp b/src/gui/painting/qwindowsurface_mac.cpp
index 1c97ebb..d9823fa 100644
--- a/src/gui/painting/qwindowsurface_mac.cpp
+++ b/src/gui/painting/qwindowsurface_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_mac_p.h b/src/gui/painting/qwindowsurface_mac_p.h
index c9726e8..9e725e1 100644
--- a/src/gui/painting/qwindowsurface_mac_p.h
+++ b/src/gui/painting/qwindowsurface_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_p.h b/src/gui/painting/qwindowsurface_p.h
index 6171ae8..3298e6e 100644
--- a/src/gui/painting/qwindowsurface_p.h
+++ b/src/gui/painting/qwindowsurface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_qws.cpp b/src/gui/painting/qwindowsurface_qws.cpp
index 170668b..9d127b7 100644
--- a/src/gui/painting/qwindowsurface_qws.cpp
+++ b/src/gui/painting/qwindowsurface_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_qws_p.h b/src/gui/painting/qwindowsurface_qws_p.h
index 30900dc..d4094b5 100644
--- a/src/gui/painting/qwindowsurface_qws_p.h
+++ b/src/gui/painting/qwindowsurface_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index eee6bef..ad5ed58 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index 2b932a9..337a77d 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 8bac1f5..e1f8ec1 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_s60_p.h b/src/gui/painting/qwindowsurface_s60_p.h
index f0a834a..1ce822c 100644
--- a/src/gui/painting/qwindowsurface_s60_p.h
+++ b/src/gui/painting/qwindowsurface_s60_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_x11.cpp b/src/gui/painting/qwindowsurface_x11.cpp
index cadf264..b77d862 100644
--- a/src/gui/painting/qwindowsurface_x11.cpp
+++ b/src/gui/painting/qwindowsurface_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwindowsurface_x11_p.h b/src/gui/painting/qwindowsurface_x11_p.h
index 240d165..3d3ce69 100644
--- a/src/gui/painting/qwindowsurface_x11_p.h
+++ b/src/gui/painting/qwindowsurface_x11_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qwmatrix.h b/src/gui/painting/qwmatrix.h
index 96ce678..f561a9a 100644
--- a/src/gui/painting/qwmatrix.h
+++ b/src/gui/painting/qwmatrix.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp
index 5d4c54e..4d8420a 100644
--- a/src/gui/s60framework/qs60mainapplication.cpp
+++ b/src/gui/s60framework/qs60mainapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/qs60mainapplication.h b/src/gui/s60framework/qs60mainapplication.h
index cb22e68..9586108 100644
--- a/src/gui/s60framework/qs60mainapplication.h
+++ b/src/gui/s60framework/qs60mainapplication.h
@@ -7,11 +7,11 @@
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/qs60mainapplication_p.h b/src/gui/s60framework/qs60mainapplication_p.h
index 8d6b243..eba9784 100644
--- a/src/gui/s60framework/qs60mainapplication_p.h
+++ b/src/gui/s60framework/qs60mainapplication_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp
index ea9dbb3..7ddde7f 100644
--- a/src/gui/s60framework/qs60mainappui.cpp
+++ b/src/gui/s60framework/qs60mainappui.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/qs60mainappui.h b/src/gui/s60framework/qs60mainappui.h
index 796059f..3872dc2 100644
--- a/src/gui/s60framework/qs60mainappui.h
+++ b/src/gui/s60framework/qs60mainappui.h
@@ -7,11 +7,11 @@
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/qs60maindocument.cpp b/src/gui/s60framework/qs60maindocument.cpp
index 26e2d00..83fb3a4 100644
--- a/src/gui/s60framework/qs60maindocument.cpp
+++ b/src/gui/s60framework/qs60maindocument.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/qs60maindocument.h b/src/gui/s60framework/qs60maindocument.h
index fc32d8b..bf37522 100644
--- a/src/gui/s60framework/qs60maindocument.h
+++ b/src/gui/s60framework/qs60maindocument.h
@@ -7,11 +7,11 @@
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/s60framework/s60main.rss b/src/gui/s60framework/s60main.rss
index 35d666e..f71088f 100644
--- a/src/gui/s60framework/s60main.rss
+++ b/src/gui/s60framework/s60main.rss
@@ -7,11 +7,11 @@
 ** This file is part of the Symbian application wrapper of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/gui/statemachine/qbasickeyeventtransition.cpp
index 61f6046..29a4fe3 100644
--- a/src/gui/statemachine/qbasickeyeventtransition.cpp
+++ b/src/gui/statemachine/qbasickeyeventtransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qbasickeyeventtransition_p.h b/src/gui/statemachine/qbasickeyeventtransition_p.h
index a9cf948..eff5a49 100644
--- a/src/gui/statemachine/qbasickeyeventtransition_p.h
+++ b/src/gui/statemachine/qbasickeyeventtransition_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qbasicmouseeventtransition.cpp b/src/gui/statemachine/qbasicmouseeventtransition.cpp
index f73c630..79d3d28 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition.cpp
+++ b/src/gui/statemachine/qbasicmouseeventtransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qbasicmouseeventtransition_p.h b/src/gui/statemachine/qbasicmouseeventtransition_p.h
index 37c41d0..0c5804d 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition_p.h
+++ b/src/gui/statemachine/qbasicmouseeventtransition_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp
index 2b4c9c2..a3a3bf6 100644
--- a/src/gui/statemachine/qguistatemachine.cpp
+++ b/src/gui/statemachine/qguistatemachine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/gui/statemachine/qkeyeventtransition.cpp
index 212a5b1..223f039 100644
--- a/src/gui/statemachine/qkeyeventtransition.cpp
+++ b/src/gui/statemachine/qkeyeventtransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/gui/statemachine/qkeyeventtransition.h
index 85905a0..8305ff9 100644
--- a/src/gui/statemachine/qkeyeventtransition.h
+++ b/src/gui/statemachine/qkeyeventtransition.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qmouseeventtransition.cpp b/src/gui/statemachine/qmouseeventtransition.cpp
index e15e9db..34a5e75 100644
--- a/src/gui/statemachine/qmouseeventtransition.cpp
+++ b/src/gui/statemachine/qmouseeventtransition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/gui/statemachine/qmouseeventtransition.h
index e5bc08f..1c264ad 100644
--- a/src/gui/statemachine/qmouseeventtransition.h
+++ b/src/gui/statemachine/qmouseeventtransition.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcdestyle.cpp b/src/gui/styles/qcdestyle.cpp
index 6a1201f..f2cef4ef 100644
--- a/src/gui/styles/qcdestyle.cpp
+++ b/src/gui/styles/qcdestyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcdestyle.h b/src/gui/styles/qcdestyle.h
index 2762506..feb1391 100644
--- a/src/gui/styles/qcdestyle.h
+++ b/src/gui/styles/qcdestyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
index 306219d..3fd9a78 100644
--- a/src/gui/styles/qcleanlooksstyle.cpp
+++ b/src/gui/styles/qcleanlooksstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcleanlooksstyle.h b/src/gui/styles/qcleanlooksstyle.h
index 0a0eafc..86d8eeb 100644
--- a/src/gui/styles/qcleanlooksstyle.h
+++ b/src/gui/styles/qcleanlooksstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcleanlooksstyle_p.h b/src/gui/styles/qcleanlooksstyle_p.h
index c6c64f7..8c3d71e 100644
--- a/src/gui/styles/qcleanlooksstyle_p.h
+++ b/src/gui/styles/qcleanlooksstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 039a6da..c1789d2 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcommonstyle.h b/src/gui/styles/qcommonstyle.h
index 7f78778..a49abc5 100644
--- a/src/gui/styles/qcommonstyle.h
+++ b/src/gui/styles/qcommonstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcommonstyle_p.h b/src/gui/styles/qcommonstyle_p.h
index 7684602..e373b82 100644
--- a/src/gui/styles/qcommonstyle_p.h
+++ b/src/gui/styles/qcommonstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qcommonstylepixmaps_p.h b/src/gui/styles/qcommonstylepixmaps_p.h
index 4ca9736..aaf0d25 100644
--- a/src/gui/styles/qcommonstylepixmaps_p.h
+++ b/src/gui/styles/qcommonstylepixmaps_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp
index 0217a39..407ed2d 100644
--- a/src/gui/styles/qgtkpainter.cpp
+++ b/src/gui/styles/qgtkpainter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qgtkpainter_p.h b/src/gui/styles/qgtkpainter_p.h
index bf18e8e..314289e 100644
--- a/src/gui/styles/qgtkpainter_p.h
+++ b/src/gui/styles/qgtkpainter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index c5429dd..78ae68d 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qgtkstyle.h b/src/gui/styles/qgtkstyle.h
index ee5de0c..d9b270b 100644
--- a/src/gui/styles/qgtkstyle.h
+++ b/src/gui/styles/qgtkstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp
index 4ed0fab..dd64053 100644
--- a/src/gui/styles/qgtkstyle_p.cpp
+++ b/src/gui/styles/qgtkstyle_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qgtkstyle_p.h b/src/gui/styles/qgtkstyle_p.h
index 68a04e9..43b4df1 100644
--- a/src/gui/styles/qgtkstyle_p.h
+++ b/src/gui/styles/qgtkstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qmacstyle_mac.h b/src/gui/styles/qmacstyle_mac.h
index d5fcdae..2599255 100644
--- a/src/gui/styles/qmacstyle_mac.h
+++ b/src/gui/styles/qmacstyle_mac.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 671a888..128d6bf 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qmacstyle_mac_p.h b/src/gui/styles/qmacstyle_mac_p.h
index f9b9d30..ae3ac18 100644
--- a/src/gui/styles/qmacstyle_mac_p.h
+++ b/src/gui/styles/qmacstyle_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qmacstylepixmaps_mac_p.h b/src/gui/styles/qmacstylepixmaps_mac_p.h
index 58038c3..f9704a1 100644
--- a/src/gui/styles/qmacstylepixmaps_mac_p.h
+++ b/src/gui/styles/qmacstylepixmaps_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qmotifstyle.cpp b/src/gui/styles/qmotifstyle.cpp
index 9d67c28..967321b 100644
--- a/src/gui/styles/qmotifstyle.cpp
+++ b/src/gui/styles/qmotifstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qmotifstyle.h b/src/gui/styles/qmotifstyle.h
index 1fbf22f..7d2b070 100644
--- a/src/gui/styles/qmotifstyle.h
+++ b/src/gui/styles/qmotifstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qmotifstyle_p.h b/src/gui/styles/qmotifstyle_p.h
index 28a4054..e894292 100644
--- a/src/gui/styles/qmotifstyle_p.h
+++ b/src/gui/styles/qmotifstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp
index 20d9bd9..139504a 100644
--- a/src/gui/styles/qplastiquestyle.cpp
+++ b/src/gui/styles/qplastiquestyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qplastiquestyle.h b/src/gui/styles/qplastiquestyle.h
index 5ee65fa..25e1dc7 100644
--- a/src/gui/styles/qplastiquestyle.h
+++ b/src/gui/styles/qplastiquestyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qproxystyle.cpp b/src/gui/styles/qproxystyle.cpp
index 511c025..061a87d 100644
--- a/src/gui/styles/qproxystyle.cpp
+++ b/src/gui/styles/qproxystyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qproxystyle.h b/src/gui/styles/qproxystyle.h
index 5b43a69..d44da9f 100644
--- a/src/gui/styles/qproxystyle.h
+++ b/src/gui/styles/qproxystyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qproxystyle_p.h b/src/gui/styles/qproxystyle_p.h
index b5039cc..9f79f09 100644
--- a/src/gui/styles/qproxystyle_p.h
+++ b/src/gui/styles/qproxystyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 866e922..561a4dc 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
index f588d9f..c84f1ca 100644
--- a/src/gui/styles/qs60style.h
+++ b/src/gui/styles/qs60style.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index b3f4160..2661b6d 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 5dda42e..510d463 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index 3f09ebc..39f4321 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qs60style_stub.cpp b/src/gui/styles/qs60style_stub.cpp
index a3a5b9d..b1c590a 100644
--- a/src/gui/styles/qs60style_stub.cpp
+++ b/src/gui/styles/qs60style_stub.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 0a75492..8c66ff8 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h
index 439901a..d885a09 100644
--- a/src/gui/styles/qstyle.h
+++ b/src/gui/styles/qstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstyle_p.h b/src/gui/styles/qstyle_p.h
index 745092f..1b8eca6 100644
--- a/src/gui/styles/qstyle_p.h
+++ b/src/gui/styles/qstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstylefactory.cpp b/src/gui/styles/qstylefactory.cpp
index 9009878..a643236 100644
--- a/src/gui/styles/qstylefactory.cpp
+++ b/src/gui/styles/qstylefactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstylefactory.h b/src/gui/styles/qstylefactory.h
index e5d2301..42348cb 100644
--- a/src/gui/styles/qstylefactory.h
+++ b/src/gui/styles/qstylefactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index ccdbf8c..ce93973 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h
index 71fce55..16df58a 100644
--- a/src/gui/styles/qstylehelper_p.h
+++ b/src/gui/styles/qstylehelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index 4780edf..15179a1 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstyleoption.h b/src/gui/styles/qstyleoption.h
index e79d9a4..8dfa21f 100644
--- a/src/gui/styles/qstyleoption.h
+++ b/src/gui/styles/qstyleoption.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstyleplugin.cpp b/src/gui/styles/qstyleplugin.cpp
index c961292..09ca2d4 100644
--- a/src/gui/styles/qstyleplugin.cpp
+++ b/src/gui/styles/qstyleplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstyleplugin.h b/src/gui/styles/qstyleplugin.h
index 7200351..f03e2c8 100644
--- a/src/gui/styles/qstyleplugin.h
+++ b/src/gui/styles/qstyleplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 92e2c81..f48acbb 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstylesheetstyle_default.cpp b/src/gui/styles/qstylesheetstyle_default.cpp
index 270b68d..dc0280e 100644
--- a/src/gui/styles/qstylesheetstyle_default.cpp
+++ b/src/gui/styles/qstylesheetstyle_default.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qstylesheetstyle_p.h b/src/gui/styles/qstylesheetstyle_p.h
index fd81437..e76fb15 100644
--- a/src/gui/styles/qstylesheetstyle_p.h
+++ b/src/gui/styles/qstylesheetstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowscestyle.cpp b/src/gui/styles/qwindowscestyle.cpp
index b027005..6c74ab8 100644
--- a/src/gui/styles/qwindowscestyle.cpp
+++ b/src/gui/styles/qwindowscestyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowscestyle.h b/src/gui/styles/qwindowscestyle.h
index 2b1fab8..3da76ec 100644
--- a/src/gui/styles/qwindowscestyle.h
+++ b/src/gui/styles/qwindowscestyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowscestyle_p.h b/src/gui/styles/qwindowscestyle_p.h
index 0b11049..c3f7695 100644
--- a/src/gui/styles/qwindowscestyle_p.h
+++ b/src/gui/styles/qwindowscestyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/gui/styles/qwindowsmobilestyle.cpp
index 4e7b92c..def42e3 100644
--- a/src/gui/styles/qwindowsmobilestyle.cpp
+++ b/src/gui/styles/qwindowsmobilestyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsmobilestyle.h b/src/gui/styles/qwindowsmobilestyle.h
index e9967e5..e574291 100644
--- a/src/gui/styles/qwindowsmobilestyle.h
+++ b/src/gui/styles/qwindowsmobilestyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsmobilestyle_p.h b/src/gui/styles/qwindowsmobilestyle_p.h
index 8724000..d6621fb 100644
--- a/src/gui/styles/qwindowsmobilestyle_p.h
+++ b/src/gui/styles/qwindowsmobilestyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index 720dd6d..df94ed9 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsstyle.h b/src/gui/styles/qwindowsstyle.h
index 34a5d25..1c73aa5 100644
--- a/src/gui/styles/qwindowsstyle.h
+++ b/src/gui/styles/qwindowsstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsstyle_p.h b/src/gui/styles/qwindowsstyle_p.h
index 2a89b84..7bced16 100644
--- a/src/gui/styles/qwindowsstyle_p.h
+++ b/src/gui/styles/qwindowsstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp
index 58542e5..db8b9f6 100644
--- a/src/gui/styles/qwindowsvistastyle.cpp
+++ b/src/gui/styles/qwindowsvistastyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsvistastyle.h b/src/gui/styles/qwindowsvistastyle.h
index 5faf774..1b05476 100644
--- a/src/gui/styles/qwindowsvistastyle.h
+++ b/src/gui/styles/qwindowsvistastyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsvistastyle_p.h b/src/gui/styles/qwindowsvistastyle_p.h
index ab941a1..79e3cb9 100644
--- a/src/gui/styles/qwindowsvistastyle_p.h
+++ b/src/gui/styles/qwindowsvistastyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsxpstyle.cpp b/src/gui/styles/qwindowsxpstyle.cpp
index d36011c..634fd7b 100644
--- a/src/gui/styles/qwindowsxpstyle.cpp
+++ b/src/gui/styles/qwindowsxpstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsxpstyle.h b/src/gui/styles/qwindowsxpstyle.h
index 6b77f6c..a35355c 100644
--- a/src/gui/styles/qwindowsxpstyle.h
+++ b/src/gui/styles/qwindowsxpstyle.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/styles/qwindowsxpstyle_p.h b/src/gui/styles/qwindowsxpstyle_p.h
index 0a13a52..03eebfc 100644
--- a/src/gui/styles/qwindowsxpstyle_p.h
+++ b/src/gui/styles/qwindowsxpstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/symbian/qsymbianevent.cpp b/src/gui/symbian/qsymbianevent.cpp
index c341413..ce8e893 100644
--- a/src/gui/symbian/qsymbianevent.cpp
+++ b/src/gui/symbian/qsymbianevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/symbian/qsymbianevent.h b/src/gui/symbian/qsymbianevent.h
index 5cad654..9357e49 100644
--- a/src/gui/symbian/qsymbianevent.h
+++ b/src/gui/symbian/qsymbianevent.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qabstractfontengine_p.h b/src/gui/text/qabstractfontengine_p.h
index f70815c..d072803 100644
--- a/src/gui/text/qabstractfontengine_p.h
+++ b/src/gui/text/qabstractfontengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qabstractfontengine_qws.cpp b/src/gui/text/qabstractfontengine_qws.cpp
index 65bdb77..56d0ec1 100644
--- a/src/gui/text/qabstractfontengine_qws.cpp
+++ b/src/gui/text/qabstractfontengine_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qabstractfontengine_qws.h b/src/gui/text/qabstractfontengine_qws.h
index b2eadd9..dffb39d 100644
--- a/src/gui/text/qabstractfontengine_qws.h
+++ b/src/gui/text/qabstractfontengine_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 0888d92..ebbe4bf 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h
index 1c35df7..080dcdf 100644
--- a/src/gui/text/qabstracttextdocumentlayout.h
+++ b/src/gui/text/qabstracttextdocumentlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qabstracttextdocumentlayout_p.h b/src/gui/text/qabstracttextdocumentlayout_p.h
index 713eaf6..d905d49 100644
--- a/src/gui/text/qabstracttextdocumentlayout_p.h
+++ b/src/gui/text/qabstracttextdocumentlayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index b3d2526..e3af35b 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 138d506..b744dfa 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qcssscanner.cpp b/src/gui/text/qcssscanner.cpp
index 62e06b3..0b178e1 100644
--- a/src/gui/text/qcssscanner.cpp
+++ b/src/gui/text/qcssscanner.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 3fe98e1..6557d78 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 2cc41e1..ac81711 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont_mac.cpp b/src/gui/text/qfont_mac.cpp
index 0bc8ca2..bdd8607 100644
--- a/src/gui/text/qfont_mac.cpp
+++ b/src/gui/text/qfont_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h
index 470c109..188f720 100644
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont_qws.cpp b/src/gui/text/qfont_qws.cpp
index 72f8c37..3420ae8 100644
--- a/src/gui/text/qfont_qws.cpp
+++ b/src/gui/text/qfont_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp
index d39f30a..5bee6be 100644
--- a/src/gui/text/qfont_s60.cpp
+++ b/src/gui/text/qfont_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont_win.cpp b/src/gui/text/qfont_win.cpp
index fa45ae1..1ae6da4 100644
--- a/src/gui/text/qfont_win.cpp
+++ b/src/gui/text/qfont_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfont_x11.cpp b/src/gui/text/qfont_x11.cpp
index 92e2326..50d6c66 100644
--- a/src/gui/text/qfont_x11.cpp
+++ b/src/gui/text/qfont_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index e6c36a4..1455af5 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 719242c..3bbbced 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp
index 5a9fc35..61dca23 100644
--- a/src/gui/text/qfontdatabase_mac.cpp
+++ b/src/gui/text/qfontdatabase_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp
index a3d8d65..e22fd60 100644
--- a/src/gui/text/qfontdatabase_qws.cpp
+++ b/src/gui/text/qfontdatabase_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index ec252cd..f7ce234 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontdatabase_win.cpp b/src/gui/text/qfontdatabase_win.cpp
index 8a03c5d..76f349a 100644
--- a/src/gui/text/qfontdatabase_win.cpp
+++ b/src/gui/text/qfontdatabase_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index a7aa2ce..f96d859 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 0dfd295..a91fda3 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index a9b25f5..4d0f5ed 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index 2f05a8b..5b9092a 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm
index bdf3848..f26e5ea 100644
--- a/src/gui/text/qfontengine_mac.mm
+++ b/src/gui/text/qfontengine_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 3b91cd8..1946bc4 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index 53b6910..7829145 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_qpf_p.h b/src/gui/text/qfontengine_qpf_p.h
index 14755b2..39deba3 100644
--- a/src/gui/text/qfontengine_qpf_p.h
+++ b/src/gui/text/qfontengine_qpf_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
index decc89c..ee5333e 100644
--- a/src/gui/text/qfontengine_qws.cpp
+++ b/src/gui/text/qfontengine_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index 5980f20..6e2076a 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h
index d05c23c..a034269 100644
--- a/src/gui/text/qfontengine_s60_p.h
+++ b/src/gui/text/qfontengine_s60_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp
index ef1b504..77ca5d0 100644
--- a/src/gui/text/qfontengine_win.cpp
+++ b/src/gui/text/qfontengine_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_win_p.h b/src/gui/text/qfontengine_win_p.h
index 68b53b5..63e872f 100644
--- a/src/gui/text/qfontengine_win_p.h
+++ b/src/gui/text/qfontengine_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp
index b7e4be2..346cd3a 100644
--- a/src/gui/text/qfontengine_x11.cpp
+++ b/src/gui/text/qfontengine_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengine_x11_p.h b/src/gui/text/qfontengine_x11_p.h
index 01da04b..b0c33ca 100644
--- a/src/gui/text/qfontengine_x11_p.h
+++ b/src/gui/text/qfontengine_x11_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h
index 7b82b46..ce04fd1 100644
--- a/src/gui/text/qfontengineglyphcache_p.h
+++ b/src/gui/text/qfontengineglyphcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h
index 0f2a7fe..6a45738 100644
--- a/src/gui/text/qfontinfo.h
+++ b/src/gui/text/qfontinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index d02e841..1d2d8bf 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 2518b54..663824a 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
index e49f5b4..71fbf22 100644
--- a/src/gui/text/qfontsubset.cpp
+++ b/src/gui/text/qfontsubset.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h
index ca2a83a..54e9c81 100644
--- a/src/gui/text/qfontsubset_p.h
+++ b/src/gui/text/qfontsubset_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfragmentmap.cpp b/src/gui/text/qfragmentmap.cpp
index 493e6fa..2611425 100644
--- a/src/gui/text/qfragmentmap.cpp
+++ b/src/gui/text/qfragmentmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qfragmentmap_p.h b/src/gui/text/qfragmentmap_p.h
index 4c01185..13c4c1d 100644
--- a/src/gui/text/qfragmentmap_p.h
+++ b/src/gui/text/qfragmentmap_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qpfutil.cpp b/src/gui/text/qpfutil.cpp
index 376f49c..29aad6f 100644
--- a/src/gui/text/qpfutil.cpp
+++ b/src/gui/text/qpfutil.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 7a5dec4..19eb08a 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index 4febde2..605e546 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index cb60626..902cce9 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index e594b7e..0f91700 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h
index de3c65d..1a8f695 100644
--- a/src/gui/text/qsyntaxhighlighter.h
+++ b/src/gui/text/qsyntaxhighlighter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 7f2c4e9..4cc6aa5 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h
index 8399d50..e4ebd1b 100644
--- a/src/gui/text/qtextcontrol_p.h
+++ b/src/gui/text/qtextcontrol_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextcontrol_p_p.h b/src/gui/text/qtextcontrol_p_p.h
index c103103..7385e09 100644
--- a/src/gui/text/qtextcontrol_p_p.h
+++ b/src/gui/text/qtextcontrol_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 769ab2f..5cba548 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h
index 251cb33..c5fea2e 100644
--- a/src/gui/text/qtextcursor.h
+++ b/src/gui/text/qtextcursor.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextcursor_p.h b/src/gui/text/qtextcursor_p.h
index 4b3262f..bf6625b 100644
--- a/src/gui/text/qtextcursor_p.h
+++ b/src/gui/text/qtextcursor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index c35069f..8a1ed9b 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 0140772..59577bd 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 213db7e..30056f8 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index b46d01c..71d00f0 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index 7c5f973..d415b61 100644
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocumentfragment.h b/src/gui/text/qtextdocumentfragment.h
index e07185e..6a51f3e 100644
--- a/src/gui/text/qtextdocumentfragment.h
+++ b/src/gui/text/qtextdocumentfragment.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h
index 905de0d..a8b7382 100644
--- a/src/gui/text/qtextdocumentfragment_p.h
+++ b/src/gui/text/qtextdocumentfragment_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index ff14490..bbe5fd7 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h
index a71eeee..73f8c47 100644
--- a/src/gui/text/qtextdocumentlayout_p.h
+++ b/src/gui/text/qtextdocumentlayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp
index b43c373..a8327fa 100644
--- a/src/gui/text/qtextdocumentwriter.cpp
+++ b/src/gui/text/qtextdocumentwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextdocumentwriter.h b/src/gui/text/qtextdocumentwriter.h
index 6219025..09cec6d 100644
--- a/src/gui/text/qtextdocumentwriter.h
+++ b/src/gui/text/qtextdocumentwriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 05de8f5..7f1e6e9 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/text/qtextengine_mac.cpp
index 342fb5e..9b0d4ad 100644
--- a/src/gui/text/qtextengine_mac.cpp
+++ b/src/gui/text/qtextengine_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 4cbe81f..73eed8f 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 46db253..77ba22b 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index ecf48a2..a86451c 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h
index b44d849..6d40b00 100644
--- a/src/gui/text/qtextformat_p.h
+++ b/src/gui/text/qtextformat_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index e190379..75fdc16 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index 94cfa74..f77a04d 100644
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp
index 6733793..fe45fc4 100644
--- a/src/gui/text/qtextimagehandler.cpp
+++ b/src/gui/text/qtextimagehandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextimagehandler_p.h b/src/gui/text/qtextimagehandler_p.h
index cf7343d..d7e9b79 100644
--- a/src/gui/text/qtextimagehandler_p.h
+++ b/src/gui/text/qtextimagehandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index f432b7e..af322e9 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 8c93ed6..1a7c24a 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index a0ff520..ad81f8d 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h
index 34bc71e..190d0e0 100644
--- a/src/gui/text/qtextlist.h
+++ b/src/gui/text/qtextlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index ea2ef2d..565e86a 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index a573a26..36205ba 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextobject_p.h b/src/gui/text/qtextobject_p.h
index 92420aa..4917191 100644
--- a/src/gui/text/qtextobject_p.h
+++ b/src/gui/text/qtextobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 7992de5..171731c 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextodfwriter_p.h b/src/gui/text/qtextodfwriter_p.h
index ac32945..b76dd75 100644
--- a/src/gui/text/qtextodfwriter_p.h
+++ b/src/gui/text/qtextodfwriter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index 9eeec0b..8448077 100644
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index a48efc1..550c386 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index c291f25..c93e10b 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h
index d9be659..277819b 100644
--- a/src/gui/text/qtexttable.h
+++ b/src/gui/text/qtexttable.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qtexttable_p.h b/src/gui/text/qtexttable_p.h
index 82a64e2..255b42a 100644
--- a/src/gui/text/qtexttable_p.h
+++ b/src/gui/text/qtexttable_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
index 6f099a9..c457a62 100644
--- a/src/gui/text/qzip.cpp
+++ b/src/gui/text/qzip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
index 6466a7b..0088915 100644
--- a/src/gui/text/qzipreader_p.h
+++ b/src/gui/text/qzipreader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/text/qzipwriter_p.h b/src/gui/text/qzipwriter_p.h
index a50c172..e18c188 100644
--- a/src/gui/text/qzipwriter_p.h
+++ b/src/gui/text/qzipwriter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index e718212..50a2873 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qcompleter.h b/src/gui/util/qcompleter.h
index 0cef9be..0c12879 100644
--- a/src/gui/util/qcompleter.h
+++ b/src/gui/util/qcompleter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qcompleter_p.h b/src/gui/util/qcompleter_p.h
index 8f00793..7371a0e 100644
--- a/src/gui/util/qcompleter_p.h
+++ b/src/gui/util/qcompleter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 8b36b32..f8f4cb8 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 003eee5..74d6a8d 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qdesktopservices_mac.cpp b/src/gui/util/qdesktopservices_mac.cpp
index 6c5ff18..24ec095 100644
--- a/src/gui/util/qdesktopservices_mac.cpp
+++ b/src/gui/util/qdesktopservices_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qdesktopservices_qws.cpp b/src/gui/util/qdesktopservices_qws.cpp
index 892bd93..272c1b3 100644
--- a/src/gui/util/qdesktopservices_qws.cpp
+++ b/src/gui/util/qdesktopservices_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index cd023cb..30e4b1a 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp
index 735de04..5d23898 100644
--- a/src/gui/util/qdesktopservices_win.cpp
+++ b/src/gui/util/qdesktopservices_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qdesktopservices_x11.cpp b/src/gui/util/qdesktopservices_x11.cpp
index 75e7209..60c5dff 100644
--- a/src/gui/util/qdesktopservices_x11.cpp
+++ b/src/gui/util/qdesktopservices_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon.cpp b/src/gui/util/qsystemtrayicon.cpp
index 941961b..04ad728 100644
--- a/src/gui/util/qsystemtrayicon.cpp
+++ b/src/gui/util/qsystemtrayicon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon.h b/src/gui/util/qsystemtrayicon.h
index 0a57e35..029a75a 100644
--- a/src/gui/util/qsystemtrayicon.h
+++ b/src/gui/util/qsystemtrayicon.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm
index 22134cb..21831f3 100644
--- a/src/gui/util/qsystemtrayicon_mac.mm
+++ b/src/gui/util/qsystemtrayicon_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon_p.h b/src/gui/util/qsystemtrayicon_p.h
index 4592e43..4a2ecd2 100644
--- a/src/gui/util/qsystemtrayicon_p.h
+++ b/src/gui/util/qsystemtrayicon_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon_qws.cpp b/src/gui/util/qsystemtrayicon_qws.cpp
index cda47aa..d01de75 100644
--- a/src/gui/util/qsystemtrayicon_qws.cpp
+++ b/src/gui/util/qsystemtrayicon_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index fc5de44..4b9d273 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon_wince.cpp b/src/gui/util/qsystemtrayicon_wince.cpp
index e5cf0fd..1240368 100644
--- a/src/gui/util/qsystemtrayicon_wince.cpp
+++ b/src/gui/util/qsystemtrayicon_wince.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qsystemtrayicon_x11.cpp b/src/gui/util/qsystemtrayicon_x11.cpp
index 59fdc07..b01eb75 100644
--- a/src/gui/util/qsystemtrayicon_x11.cpp
+++ b/src/gui/util/qsystemtrayicon_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qundogroup.cpp b/src/gui/util/qundogroup.cpp
index c14bc06..2b3d6ab 100644
--- a/src/gui/util/qundogroup.cpp
+++ b/src/gui/util/qundogroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qundogroup.h b/src/gui/util/qundogroup.h
index 072e645..3a670c9 100644
--- a/src/gui/util/qundogroup.h
+++ b/src/gui/util/qundogroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qundostack.cpp b/src/gui/util/qundostack.cpp
index 919ac3c..dbcf427 100644
--- a/src/gui/util/qundostack.cpp
+++ b/src/gui/util/qundostack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qundostack.h b/src/gui/util/qundostack.h
index 54980ce..81168e7 100644
--- a/src/gui/util/qundostack.h
+++ b/src/gui/util/qundostack.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qundostack_p.h b/src/gui/util/qundostack_p.h
index 2604bca..05c3bc4 100644
--- a/src/gui/util/qundostack_p.h
+++ b/src/gui/util/qundostack_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qundoview.cpp b/src/gui/util/qundoview.cpp
index 6c28b16..66bdbaa 100644
--- a/src/gui/util/qundoview.cpp
+++ b/src/gui/util/qundoview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/util/qundoview.h b/src/gui/util/qundoview.h
index 95d425e..8584b0a 100644
--- a/src/gui/util/qundoview.h
+++ b/src/gui/util/qundoview.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp
index 995d659..cc97e75 100644
--- a/src/gui/widgets/qabstractbutton.cpp
+++ b/src/gui/widgets/qabstractbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractbutton.h b/src/gui/widgets/qabstractbutton.h
index 9d9ce6b..b092cf7 100644
--- a/src/gui/widgets/qabstractbutton.h
+++ b/src/gui/widgets/qabstractbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractbutton_p.h b/src/gui/widgets/qabstractbutton_p.h
index ca0bc5a..223e5b3 100644
--- a/src/gui/widgets/qabstractbutton_p.h
+++ b/src/gui/widgets/qabstractbutton_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp
index 30ce23b..5487d91 100644
--- a/src/gui/widgets/qabstractscrollarea.cpp
+++ b/src/gui/widgets/qabstractscrollarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractscrollarea.h b/src/gui/widgets/qabstractscrollarea.h
index be2a8c0..526f6ef 100644
--- a/src/gui/widgets/qabstractscrollarea.h
+++ b/src/gui/widgets/qabstractscrollarea.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/gui/widgets/qabstractscrollarea_p.h
index 9a0d66f..3b5498c 100644
--- a/src/gui/widgets/qabstractscrollarea_p.h
+++ b/src/gui/widgets/qabstractscrollarea_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp
index f38bae7..a187dd7 100644
--- a/src/gui/widgets/qabstractslider.cpp
+++ b/src/gui/widgets/qabstractslider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractslider.h b/src/gui/widgets/qabstractslider.h
index f2daac8..c46c60e 100644
--- a/src/gui/widgets/qabstractslider.h
+++ b/src/gui/widgets/qabstractslider.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractslider_p.h b/src/gui/widgets/qabstractslider_p.h
index 19d1fca..12766d2 100644
--- a/src/gui/widgets/qabstractslider_p.h
+++ b/src/gui/widgets/qabstractslider_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp
index 7e2f20d..7266159 100644
--- a/src/gui/widgets/qabstractspinbox.cpp
+++ b/src/gui/widgets/qabstractspinbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractspinbox.h b/src/gui/widgets/qabstractspinbox.h
index 6c062c0..3b60f7f 100644
--- a/src/gui/widgets/qabstractspinbox.h
+++ b/src/gui/widgets/qabstractspinbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qabstractspinbox_p.h b/src/gui/widgets/qabstractspinbox_p.h
index 735ae3d..e386d25 100644
--- a/src/gui/widgets/qabstractspinbox_p.h
+++ b/src/gui/widgets/qabstractspinbox_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qbuttongroup.cpp b/src/gui/widgets/qbuttongroup.cpp
index 84c424e..bfb06ec 100644
--- a/src/gui/widgets/qbuttongroup.cpp
+++ b/src/gui/widgets/qbuttongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qbuttongroup.h b/src/gui/widgets/qbuttongroup.h
index 3c9bdd4..bf9cf2b 100644
--- a/src/gui/widgets/qbuttongroup.h
+++ b/src/gui/widgets/qbuttongroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcalendartextnavigator_p.h b/src/gui/widgets/qcalendartextnavigator_p.h
index adad37c..4bbb4dc 100644
--- a/src/gui/widgets/qcalendartextnavigator_p.h
+++ b/src/gui/widgets/qcalendartextnavigator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp
index 7dd5651..612fc1e 100644
--- a/src/gui/widgets/qcalendarwidget.cpp
+++ b/src/gui/widgets/qcalendarwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcalendarwidget.h b/src/gui/widgets/qcalendarwidget.h
index b87da4b..bc00977 100644
--- a/src/gui/widgets/qcalendarwidget.h
+++ b/src/gui/widgets/qcalendarwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcheckbox.cpp b/src/gui/widgets/qcheckbox.cpp
index bc0900e..8f530f3 100644
--- a/src/gui/widgets/qcheckbox.cpp
+++ b/src/gui/widgets/qcheckbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcheckbox.h b/src/gui/widgets/qcheckbox.h
index 7b6292d..696c759 100644
--- a/src/gui/widgets/qcheckbox.h
+++ b/src/gui/widgets/qcheckbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm
index 15fae23..a223866 100644
--- a/src/gui/widgets/qcocoamenu_mac.mm
+++ b/src/gui/widgets/qcocoamenu_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/gui/widgets/qcocoamenu_mac_p.h
index 1a42642..d9952b0 100644
--- a/src/gui/widgets/qcocoamenu_mac_p.h
+++ b/src/gui/widgets/qcocoamenu_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac.mm b/src/gui/widgets/qcocoatoolbardelegate_mac.mm
index e68ee7c..215d85b 100644
--- a/src/gui/widgets/qcocoatoolbardelegate_mac.mm
+++ b/src/gui/widgets/qcocoatoolbardelegate_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac_p.h b/src/gui/widgets/qcocoatoolbardelegate_mac_p.h
index b4af54f..e4d0924 100644
--- a/src/gui/widgets/qcocoatoolbardelegate_mac_p.h
+++ b/src/gui/widgets/qcocoatoolbardelegate_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 96d2acd..525a7e7 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h
index fb9af9f..bd38188 100644
--- a/src/gui/widgets/qcombobox.h
+++ b/src/gui/widgets/qcombobox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcombobox_p.h b/src/gui/widgets/qcombobox_p.h
index 29a628c..a5bdbc9 100644
--- a/src/gui/widgets/qcombobox_p.h
+++ b/src/gui/widgets/qcombobox_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/gui/widgets/qcommandlinkbutton.cpp
index a6f5f7d..ff06796 100644
--- a/src/gui/widgets/qcommandlinkbutton.cpp
+++ b/src/gui/widgets/qcommandlinkbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qcommandlinkbutton.h b/src/gui/widgets/qcommandlinkbutton.h
index ba11f68..2be5326 100644
--- a/src/gui/widgets/qcommandlinkbutton.h
+++ b/src/gui/widgets/qcommandlinkbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index bd6c577..396b237 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdatetimeedit.h b/src/gui/widgets/qdatetimeedit.h
index d2f315a..fdad58b 100644
--- a/src/gui/widgets/qdatetimeedit.h
+++ b/src/gui/widgets/qdatetimeedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdatetimeedit_p.h b/src/gui/widgets/qdatetimeedit_p.h
index 55c73d8..897df4e 100644
--- a/src/gui/widgets/qdatetimeedit_p.h
+++ b/src/gui/widgets/qdatetimeedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdial.cpp b/src/gui/widgets/qdial.cpp
index a8d739f..3cf6315 100644
--- a/src/gui/widgets/qdial.cpp
+++ b/src/gui/widgets/qdial.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdial.h b/src/gui/widgets/qdial.h
index 78f4b9c..5434f0b 100644
--- a/src/gui/widgets/qdial.h
+++ b/src/gui/widgets/qdial.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index 732dbc9..4fe9d7b 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdialogbuttonbox.h b/src/gui/widgets/qdialogbuttonbox.h
index 1db5dc5..8ebe1bc 100644
--- a/src/gui/widgets/qdialogbuttonbox.h
+++ b/src/gui/widgets/qdialogbuttonbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp
index b540e76..6b7e134 100644
--- a/src/gui/widgets/qdockarealayout.cpp
+++ b/src/gui/widgets/qdockarealayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdockarealayout_p.h b/src/gui/widgets/qdockarealayout_p.h
index 9cb77ba..1ee5693 100644
--- a/src/gui/widgets/qdockarealayout_p.h
+++ b/src/gui/widgets/qdockarealayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp
index df9b171..10decf3 100644
--- a/src/gui/widgets/qdockwidget.cpp
+++ b/src/gui/widgets/qdockwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdockwidget.h b/src/gui/widgets/qdockwidget.h
index 3d5ee79..9299e26 100644
--- a/src/gui/widgets/qdockwidget.h
+++ b/src/gui/widgets/qdockwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qdockwidget_p.h b/src/gui/widgets/qdockwidget_p.h
index d272b2c..6b61cb2 100644
--- a/src/gui/widgets/qdockwidget_p.h
+++ b/src/gui/widgets/qdockwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qeffects.cpp b/src/gui/widgets/qeffects.cpp
index a56d093..1aaf79d 100644
--- a/src/gui/widgets/qeffects.cpp
+++ b/src/gui/widgets/qeffects.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qeffects_p.h b/src/gui/widgets/qeffects_p.h
index 9cd7c08..5a105d8 100644
--- a/src/gui/widgets/qeffects_p.h
+++ b/src/gui/widgets/qeffects_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qfocusframe.cpp b/src/gui/widgets/qfocusframe.cpp
index 4f20bce0..a964847 100644
--- a/src/gui/widgets/qfocusframe.cpp
+++ b/src/gui/widgets/qfocusframe.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qfocusframe.h b/src/gui/widgets/qfocusframe.h
index f29270e..3b3f349 100644
--- a/src/gui/widgets/qfocusframe.h
+++ b/src/gui/widgets/qfocusframe.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp
index efe8605..dca92d4 100644
--- a/src/gui/widgets/qfontcombobox.cpp
+++ b/src/gui/widgets/qfontcombobox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qfontcombobox.h b/src/gui/widgets/qfontcombobox.h
index 1f8d0a2..123ddeb 100644
--- a/src/gui/widgets/qfontcombobox.h
+++ b/src/gui/widgets/qfontcombobox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qframe.cpp b/src/gui/widgets/qframe.cpp
index f51ddfd..b587f0c 100644
--- a/src/gui/widgets/qframe.cpp
+++ b/src/gui/widgets/qframe.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qframe.h b/src/gui/widgets/qframe.h
index 86f4528..30a709f 100644
--- a/src/gui/widgets/qframe.h
+++ b/src/gui/widgets/qframe.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qframe_p.h b/src/gui/widgets/qframe_p.h
index 8330419..780b9c9 100644
--- a/src/gui/widgets/qframe_p.h
+++ b/src/gui/widgets/qframe_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qgroupbox.cpp b/src/gui/widgets/qgroupbox.cpp
index d4e7fba..6b8c7fb 100644
--- a/src/gui/widgets/qgroupbox.cpp
+++ b/src/gui/widgets/qgroupbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qgroupbox.h b/src/gui/widgets/qgroupbox.h
index d6bd086..ed4a75b 100644
--- a/src/gui/widgets/qgroupbox.h
+++ b/src/gui/widgets/qgroupbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp
index 42be03b..43f48f0 100644
--- a/src/gui/widgets/qlabel.cpp
+++ b/src/gui/widgets/qlabel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlabel.h b/src/gui/widgets/qlabel.h
index 54babb1..400d036 100644
--- a/src/gui/widgets/qlabel.h
+++ b/src/gui/widgets/qlabel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlabel_p.h b/src/gui/widgets/qlabel_p.h
index 83624c7..8f12f6e 100644
--- a/src/gui/widgets/qlabel_p.h
+++ b/src/gui/widgets/qlabel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlcdnumber.cpp b/src/gui/widgets/qlcdnumber.cpp
index 310b930..6a261a9 100644
--- a/src/gui/widgets/qlcdnumber.cpp
+++ b/src/gui/widgets/qlcdnumber.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlcdnumber.h b/src/gui/widgets/qlcdnumber.h
index b027250..f7e733f 100644
--- a/src/gui/widgets/qlcdnumber.h
+++ b/src/gui/widgets/qlcdnumber.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index f338f40..199fa2d 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h
index 7068f62..915ec92 100644
--- a/src/gui/widgets/qlinecontrol_p.h
+++ b/src/gui/widgets/qlinecontrol_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index caaef68..63f32ba 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlineedit.h b/src/gui/widgets/qlineedit.h
index 94e0dbe..a03c6f7 100644
--- a/src/gui/widgets/qlineedit.h
+++ b/src/gui/widgets/qlineedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp
index 468c111..e2c8516 100644
--- a/src/gui/widgets/qlineedit_p.cpp
+++ b/src/gui/widgets/qlineedit_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h
index 7a24cb3..f120988 100644
--- a/src/gui/widgets/qlineedit_p.h
+++ b/src/gui/widgets/qlineedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.h b/src/gui/widgets/qmaccocoaviewcontainer_mac.h
index 058202b..ffc0887 100644
--- a/src/gui/widgets/qmaccocoaviewcontainer_mac.h
+++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm
index 6f3bb24..4ebe7d9 100644
--- a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmacnativewidget_mac.h b/src/gui/widgets/qmacnativewidget_mac.h
index 3414d96..4cf4340 100644
--- a/src/gui/widgets/qmacnativewidget_mac.h
+++ b/src/gui/widgets/qmacnativewidget_mac.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmacnativewidget_mac.mm b/src/gui/widgets/qmacnativewidget_mac.mm
index 2ba0a7f..b334b61 100644
--- a/src/gui/widgets/qmacnativewidget_mac.mm
+++ b/src/gui/widgets/qmacnativewidget_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 1183be6..706299a 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmainwindow.h b/src/gui/widgets/qmainwindow.h
index 089c697..dace451 100644
--- a/src/gui/widgets/qmainwindow.h
+++ b/src/gui/widgets/qmainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp
index 4dd5208..9d1e335 100644
--- a/src/gui/widgets/qmainwindowlayout.cpp
+++ b/src/gui/widgets/qmainwindowlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index 1bfc746..de398b3 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h
index e1b981c..766aff1 100644
--- a/src/gui/widgets/qmainwindowlayout_p.h
+++ b/src/gui/widgets/qmainwindowlayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmdiarea.cpp b/src/gui/widgets/qmdiarea.cpp
index 2b4d807..d2a3843 100644
--- a/src/gui/widgets/qmdiarea.cpp
+++ b/src/gui/widgets/qmdiarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmdiarea.h b/src/gui/widgets/qmdiarea.h
index 6d83680..894fa55 100644
--- a/src/gui/widgets/qmdiarea.h
+++ b/src/gui/widgets/qmdiarea.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmdiarea_p.h b/src/gui/widgets/qmdiarea_p.h
index d86fd10..44033d6 100644
--- a/src/gui/widgets/qmdiarea_p.h
+++ b/src/gui/widgets/qmdiarea_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmdisubwindow.cpp b/src/gui/widgets/qmdisubwindow.cpp
index 62d297e..28c92b5 100644
--- a/src/gui/widgets/qmdisubwindow.cpp
+++ b/src/gui/widgets/qmdisubwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmdisubwindow.h b/src/gui/widgets/qmdisubwindow.h
index 8c7a2f7..ea95692 100644
--- a/src/gui/widgets/qmdisubwindow.h
+++ b/src/gui/widgets/qmdisubwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmdisubwindow_p.h b/src/gui/widgets/qmdisubwindow_p.h
index dee31cb..418682f 100644
--- a/src/gui/widgets/qmdisubwindow_p.h
+++ b/src/gui/widgets/qmdisubwindow_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 4bea6de..740912a 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h
index 7708e05..d705c60 100644
--- a/src/gui/widgets/qmenu.h
+++ b/src/gui/widgets/qmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index aaa113b..0f306e8 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index 33283fd..8af6da3 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index 83ba15a..a6fc576 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the S60 port of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu_wince.cpp b/src/gui/widgets/qmenu_wince.cpp
index e088db6..31bc2b3 100644
--- a/src/gui/widgets/qmenu_wince.cpp
+++ b/src/gui/widgets/qmenu_wince.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu_wince_resource_p.h b/src/gui/widgets/qmenu_wince_resource_p.h
index 9a66551..61cc227 100644
--- a/src/gui/widgets/qmenu_wince_resource_p.h
+++ b/src/gui/widgets/qmenu_wince_resource_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index df16f7f..6ba686c 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenubar.h b/src/gui/widgets/qmenubar.h
index c63a4f5..24f580f 100644
--- a/src/gui/widgets/qmenubar.h
+++ b/src/gui/widgets/qmenubar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index fc6701c..730ea5c 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenudata.cpp b/src/gui/widgets/qmenudata.cpp
index a63b96c..de4bca2 100644
--- a/src/gui/widgets/qmenudata.cpp
+++ b/src/gui/widgets/qmenudata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenudata.h b/src/gui/widgets/qmenudata.h
index eec1ad1..6ca3db7 100644
--- a/src/gui/widgets/qmenudata.h
+++ b/src/gui/widgets/qmenudata.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index 21c2635..20fcbbc 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qplaintextedit.h b/src/gui/widgets/qplaintextedit.h
index 106ae6d..0535724 100644
--- a/src/gui/widgets/qplaintextedit.h
+++ b/src/gui/widgets/qplaintextedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qplaintextedit_p.h b/src/gui/widgets/qplaintextedit_p.h
index ac4dc11..3f68628 100644
--- a/src/gui/widgets/qplaintextedit_p.h
+++ b/src/gui/widgets/qplaintextedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp
index ea311d3..b31f4f1 100644
--- a/src/gui/widgets/qprintpreviewwidget.cpp
+++ b/src/gui/widgets/qprintpreviewwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qprintpreviewwidget.h b/src/gui/widgets/qprintpreviewwidget.h
index f279a51..f70ff50 100644
--- a/src/gui/widgets/qprintpreviewwidget.h
+++ b/src/gui/widgets/qprintpreviewwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp
index a401942..cb7a98a 100644
--- a/src/gui/widgets/qprogressbar.cpp
+++ b/src/gui/widgets/qprogressbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qprogressbar.h b/src/gui/widgets/qprogressbar.h
index 58bc8b2..309d0bb 100644
--- a/src/gui/widgets/qprogressbar.h
+++ b/src/gui/widgets/qprogressbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp
index 237c266..5765933 100644
--- a/src/gui/widgets/qpushbutton.cpp
+++ b/src/gui/widgets/qpushbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qpushbutton.h b/src/gui/widgets/qpushbutton.h
index cf28753..58af40b 100644
--- a/src/gui/widgets/qpushbutton.h
+++ b/src/gui/widgets/qpushbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qpushbutton_p.h b/src/gui/widgets/qpushbutton_p.h
index 6feb726..0eaf592 100644
--- a/src/gui/widgets/qpushbutton_p.h
+++ b/src/gui/widgets/qpushbutton_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qradiobutton.cpp b/src/gui/widgets/qradiobutton.cpp
index 20b6c720..6f21e68 100644
--- a/src/gui/widgets/qradiobutton.cpp
+++ b/src/gui/widgets/qradiobutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qradiobutton.h b/src/gui/widgets/qradiobutton.h
index 887b747..c2588a4 100644
--- a/src/gui/widgets/qradiobutton.h
+++ b/src/gui/widgets/qradiobutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qrubberband.cpp b/src/gui/widgets/qrubberband.cpp
index 0c77026..a4e3341 100644
--- a/src/gui/widgets/qrubberband.cpp
+++ b/src/gui/widgets/qrubberband.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qrubberband.h b/src/gui/widgets/qrubberband.h
index ff43b02..7d2da70 100644
--- a/src/gui/widgets/qrubberband.h
+++ b/src/gui/widgets/qrubberband.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qscrollarea.cpp b/src/gui/widgets/qscrollarea.cpp
index 38e799e..5bdee5e 100644
--- a/src/gui/widgets/qscrollarea.cpp
+++ b/src/gui/widgets/qscrollarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qscrollarea.h b/src/gui/widgets/qscrollarea.h
index 6505183..3dd124d 100644
--- a/src/gui/widgets/qscrollarea.h
+++ b/src/gui/widgets/qscrollarea.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qscrollarea_p.h b/src/gui/widgets/qscrollarea_p.h
index 19f125b..1463430 100644
--- a/src/gui/widgets/qscrollarea_p.h
+++ b/src/gui/widgets/qscrollarea_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qscrollbar.cpp b/src/gui/widgets/qscrollbar.cpp
index 4ee9f27..b798d9f 100644
--- a/src/gui/widgets/qscrollbar.cpp
+++ b/src/gui/widgets/qscrollbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qscrollbar.h b/src/gui/widgets/qscrollbar.h
index 4e0de2d..84c01b7 100644
--- a/src/gui/widgets/qscrollbar.h
+++ b/src/gui/widgets/qscrollbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qsizegrip.cpp b/src/gui/widgets/qsizegrip.cpp
index c9d613a..eb24eaf 100644
--- a/src/gui/widgets/qsizegrip.cpp
+++ b/src/gui/widgets/qsizegrip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qsizegrip.h b/src/gui/widgets/qsizegrip.h
index b4797d1..beadcd1 100644
--- a/src/gui/widgets/qsizegrip.h
+++ b/src/gui/widgets/qsizegrip.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qslider.cpp b/src/gui/widgets/qslider.cpp
index 5755202..954581d 100644
--- a/src/gui/widgets/qslider.cpp
+++ b/src/gui/widgets/qslider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qslider.h b/src/gui/widgets/qslider.h
index df0cccb..cfd1932 100644
--- a/src/gui/widgets/qslider.h
+++ b/src/gui/widgets/qslider.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qspinbox.cpp b/src/gui/widgets/qspinbox.cpp
index 2d871d0..8fbdab0 100644
--- a/src/gui/widgets/qspinbox.cpp
+++ b/src/gui/widgets/qspinbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qspinbox.h b/src/gui/widgets/qspinbox.h
index 827b1af..8789092 100644
--- a/src/gui/widgets/qspinbox.h
+++ b/src/gui/widgets/qspinbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/gui/widgets/qsplashscreen.cpp
index 8be0cf8..ea87944 100644
--- a/src/gui/widgets/qsplashscreen.cpp
+++ b/src/gui/widgets/qsplashscreen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qsplashscreen.h b/src/gui/widgets/qsplashscreen.h
index 060d126..77dbfdd 100644
--- a/src/gui/widgets/qsplashscreen.h
+++ b/src/gui/widgets/qsplashscreen.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qsplitter.cpp b/src/gui/widgets/qsplitter.cpp
index 88b7517..cad2bee 100644
--- a/src/gui/widgets/qsplitter.cpp
+++ b/src/gui/widgets/qsplitter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qsplitter.h b/src/gui/widgets/qsplitter.h
index c3b304d..82eb097 100644
--- a/src/gui/widgets/qsplitter.h
+++ b/src/gui/widgets/qsplitter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qsplitter_p.h b/src/gui/widgets/qsplitter_p.h
index a7d84a9..32c2063 100644
--- a/src/gui/widgets/qsplitter_p.h
+++ b/src/gui/widgets/qsplitter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qstackedwidget.cpp b/src/gui/widgets/qstackedwidget.cpp
index de8d3e6..66896df 100644
--- a/src/gui/widgets/qstackedwidget.cpp
+++ b/src/gui/widgets/qstackedwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qstackedwidget.h b/src/gui/widgets/qstackedwidget.h
index 4a1b02c..67ffc09 100644
--- a/src/gui/widgets/qstackedwidget.h
+++ b/src/gui/widgets/qstackedwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp
index c88d2a1..568eefe 100644
--- a/src/gui/widgets/qstatusbar.cpp
+++ b/src/gui/widgets/qstatusbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qstatusbar.h b/src/gui/widgets/qstatusbar.h
index e3544c7..df92fb4 100644
--- a/src/gui/widgets/qstatusbar.h
+++ b/src/gui/widgets/qstatusbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index bbc7e5d..954478d 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtabbar.h b/src/gui/widgets/qtabbar.h
index aabeb4f..cf7d0e6 100644
--- a/src/gui/widgets/qtabbar.h
+++ b/src/gui/widgets/qtabbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h
index 37741f7..46786d0 100644
--- a/src/gui/widgets/qtabbar_p.h
+++ b/src/gui/widgets/qtabbar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtabwidget.cpp b/src/gui/widgets/qtabwidget.cpp
index 4a61935..2fd884d 100644
--- a/src/gui/widgets/qtabwidget.cpp
+++ b/src/gui/widgets/qtabwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtabwidget.h b/src/gui/widgets/qtabwidget.h
index 68200c8..65ec583 100644
--- a/src/gui/widgets/qtabwidget.h
+++ b/src/gui/widgets/qtabwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtextbrowser.cpp b/src/gui/widgets/qtextbrowser.cpp
index 2e5db30..23dfa34 100644
--- a/src/gui/widgets/qtextbrowser.cpp
+++ b/src/gui/widgets/qtextbrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtextbrowser.h b/src/gui/widgets/qtextbrowser.h
index 780797c..cca436e 100644
--- a/src/gui/widgets/qtextbrowser.h
+++ b/src/gui/widgets/qtextbrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 4541730..86461df 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtextedit.h b/src/gui/widgets/qtextedit.h
index 29fd0e4..f7470ca 100644
--- a/src/gui/widgets/qtextedit.h
+++ b/src/gui/widgets/qtextedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtextedit_p.h b/src/gui/widgets/qtextedit_p.h
index ba1e561..864b7d0 100644
--- a/src/gui/widgets/qtextedit_p.h
+++ b/src/gui/widgets/qtextedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp
index 316bb44..213343e 100644
--- a/src/gui/widgets/qtoolbar.cpp
+++ b/src/gui/widgets/qtoolbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbar.h b/src/gui/widgets/qtoolbar.h
index b733477..dbba599 100644
--- a/src/gui/widgets/qtoolbar.h
+++ b/src/gui/widgets/qtoolbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbar_p.h b/src/gui/widgets/qtoolbar_p.h
index 9f9e16f..f7e0c0f 100644
--- a/src/gui/widgets/qtoolbar_p.h
+++ b/src/gui/widgets/qtoolbar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbararealayout.cpp b/src/gui/widgets/qtoolbararealayout.cpp
index b312751..55b3aae 100644
--- a/src/gui/widgets/qtoolbararealayout.cpp
+++ b/src/gui/widgets/qtoolbararealayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/gui/widgets/qtoolbararealayout_p.h
index 5ea46e3..21ac158 100644
--- a/src/gui/widgets/qtoolbararealayout_p.h
+++ b/src/gui/widgets/qtoolbararealayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbarextension.cpp b/src/gui/widgets/qtoolbarextension.cpp
index 574a775..7f26b40 100644
--- a/src/gui/widgets/qtoolbarextension.cpp
+++ b/src/gui/widgets/qtoolbarextension.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbarextension_p.h b/src/gui/widgets/qtoolbarextension_p.h
index 5c4f28d..47004b9 100644
--- a/src/gui/widgets/qtoolbarextension_p.h
+++ b/src/gui/widgets/qtoolbarextension_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp
index 59b027e..fabe204 100644
--- a/src/gui/widgets/qtoolbarlayout.cpp
+++ b/src/gui/widgets/qtoolbarlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbarlayout_p.h b/src/gui/widgets/qtoolbarlayout_p.h
index d25c5ab..ccc2dc6 100644
--- a/src/gui/widgets/qtoolbarlayout_p.h
+++ b/src/gui/widgets/qtoolbarlayout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbarseparator.cpp b/src/gui/widgets/qtoolbarseparator.cpp
index b4fd686..d6b20e5 100644
--- a/src/gui/widgets/qtoolbarseparator.cpp
+++ b/src/gui/widgets/qtoolbarseparator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbarseparator_p.h b/src/gui/widgets/qtoolbarseparator_p.h
index 866b0de..edb3d65 100644
--- a/src/gui/widgets/qtoolbarseparator_p.h
+++ b/src/gui/widgets/qtoolbarseparator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbox.cpp b/src/gui/widgets/qtoolbox.cpp
index d1d4524..7cfda90 100644
--- a/src/gui/widgets/qtoolbox.cpp
+++ b/src/gui/widgets/qtoolbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbox.h b/src/gui/widgets/qtoolbox.h
index ce98a61..bf1ba60 100644
--- a/src/gui/widgets/qtoolbox.h
+++ b/src/gui/widgets/qtoolbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp
index 1822db8..09bcc14 100644
--- a/src/gui/widgets/qtoolbutton.cpp
+++ b/src/gui/widgets/qtoolbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qtoolbutton.h b/src/gui/widgets/qtoolbutton.h
index e8d9e71..622fe9b 100644
--- a/src/gui/widgets/qtoolbutton.h
+++ b/src/gui/widgets/qtoolbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp
index b75db45..d146829 100644
--- a/src/gui/widgets/qvalidator.cpp
+++ b/src/gui/widgets/qvalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qvalidator.h b/src/gui/widgets/qvalidator.h
index 63734ca..2ab4652 100644
--- a/src/gui/widgets/qvalidator.h
+++ b/src/gui/widgets/qvalidator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qwidgetanimator.cpp b/src/gui/widgets/qwidgetanimator.cpp
index a376f81..44bce10 100644
--- a/src/gui/widgets/qwidgetanimator.cpp
+++ b/src/gui/widgets/qwidgetanimator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qwidgetanimator_p.h b/src/gui/widgets/qwidgetanimator_p.h
index 7399e10..317bd0f 100644
--- a/src/gui/widgets/qwidgetanimator_p.h
+++ b/src/gui/widgets/qwidgetanimator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qwidgetresizehandler.cpp b/src/gui/widgets/qwidgetresizehandler.cpp
index ca9d095..d98d3db 100644
--- a/src/gui/widgets/qwidgetresizehandler.cpp
+++ b/src/gui/widgets/qwidgetresizehandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qwidgetresizehandler_p.h b/src/gui/widgets/qwidgetresizehandler_p.h
index bb0795c..18fe007 100644
--- a/src/gui/widgets/qwidgetresizehandler_p.h
+++ b/src/gui/widgets/qwidgetresizehandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp
index 7180c4d..69b10b8 100644
--- a/src/gui/widgets/qworkspace.cpp
+++ b/src/gui/widgets/qworkspace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qworkspace.h b/src/gui/widgets/qworkspace.h
index 24c8b10..0acc77b 100644
--- a/src/gui/widgets/qworkspace.h
+++ b/src/gui/widgets/qworkspace.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
index abab33c..39576b2 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
index 24edecd..f0c2420 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp
index 8f85553..32556ae 100644
--- a/src/imports/gestures/plugin.cpp
+++ b/src/imports/gestures/plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp
index 500c6bf..681707a 100644
--- a/src/imports/gestures/qdeclarativegesturearea.cpp
+++ b/src/imports/gestures/qdeclarativegesturearea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h
index ff89166..b1e9009 100644
--- a/src/imports/gestures/qdeclarativegesturearea_p.h
+++ b/src/imports/gestures/qdeclarativegesturearea_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/particles/particles.cpp b/src/imports/particles/particles.cpp
index ca2b060..7ac2275 100644
--- a/src/imports/particles/particles.cpp
+++ b/src/imports/particles/particles.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index 3bd4b43..6a9a88b 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h
index 9035e3e..d638d7f 100644
--- a/src/imports/particles/qdeclarativeparticles_p.h
+++ b/src/imports/particles/qdeclarativeparticles_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp
index e0f24ce..aeb9e76 100644
--- a/src/multimedia/audio/qaudio.cpp
+++ b/src/multimedia/audio/qaudio.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index 9ca1dff..3d1dd1d 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/audio/qaudio_mac.cpp
index 4e17b52..daf495f 100644
--- a/src/multimedia/audio/qaudio_mac.cpp
+++ b/src/multimedia/audio/qaudio_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudio_mac_p.h b/src/multimedia/audio/qaudio_mac_p.h
index 4e7d688..bae08b1 100644
--- a/src/multimedia/audio/qaudio_mac_p.h
+++ b/src/multimedia/audio/qaudio_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudio_symbian_p.cpp b/src/multimedia/audio/qaudio_symbian_p.cpp
index 59fc05f..14f2b17 100644
--- a/src/multimedia/audio/qaudio_symbian_p.cpp
+++ b/src/multimedia/audio/qaudio_symbian_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudio_symbian_p.h b/src/multimedia/audio/qaudio_symbian_p.h
index 84a93d1..f142b13 100644
--- a/src/multimedia/audio/qaudio_symbian_p.h
+++ b/src/multimedia/audio/qaudio_symbian_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp
index 736630e..c07c564 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/audio/qaudiodevicefactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/audio/qaudiodevicefactory_p.h
index 8ee8b05..9aca560 100644
--- a/src/multimedia/audio/qaudiodevicefactory_p.h
+++ b/src/multimedia/audio/qaudiodevicefactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 201a03d..cf94313 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h
index 1cc0731..7329da0 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index 633b309..4c82c9c 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
index 8525980..ecf99e3 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
index ecd03e5..2249618 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h b/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
index e234384..b65552e 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp
index 4be116f..64fc612 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h b/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h
index 79b23cc..18c6a09 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 9e8b1bf..f705b75 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
index cb6dd91..1f32000 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioengine.cpp b/src/multimedia/audio/qaudioengine.cpp
index 7f1f5d3..6828923 100644
--- a/src/multimedia/audio/qaudioengine.cpp
+++ b/src/multimedia/audio/qaudioengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioengine.h b/src/multimedia/audio/qaudioengine.h
index df9d09d..d63e453 100644
--- a/src/multimedia/audio/qaudioengine.h
+++ b/src/multimedia/audio/qaudioengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioengineplugin.cpp b/src/multimedia/audio/qaudioengineplugin.cpp
index 82324b5..d53ba5e 100644
--- a/src/multimedia/audio/qaudioengineplugin.cpp
+++ b/src/multimedia/audio/qaudioengineplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioengineplugin.h b/src/multimedia/audio/qaudioengineplugin.h
index 2322d2a..37b0c73 100644
--- a/src/multimedia/audio/qaudioengineplugin.h
+++ b/src/multimedia/audio/qaudioengineplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index 86d72f6..9c895eb 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h
index 6c835b7..ba2f1f2 100644
--- a/src/multimedia/audio/qaudioformat.h
+++ b/src/multimedia/audio/qaudioformat.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index 3676f64..f7f797f 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h
index 5be9b5a..79aa080 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
index 58669b3..bcc4dfc 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.h b/src/multimedia/audio/qaudioinput_alsa_p.h
index 52975a6..eda8fe5 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.h
+++ b/src/multimedia/audio/qaudioinput_alsa_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp
index 5897e75..b1ecebc 100644
--- a/src/multimedia/audio/qaudioinput_mac_p.cpp
+++ b/src/multimedia/audio/qaudioinput_mac_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_mac_p.h b/src/multimedia/audio/qaudioinput_mac_p.h
index 7aa4168..365badc 100644
--- a/src/multimedia/audio/qaudioinput_mac_p.h
+++ b/src/multimedia/audio/qaudioinput_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_symbian_p.cpp b/src/multimedia/audio/qaudioinput_symbian_p.cpp
index 485c695..fdb27a0 100644
--- a/src/multimedia/audio/qaudioinput_symbian_p.cpp
+++ b/src/multimedia/audio/qaudioinput_symbian_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_symbian_p.h b/src/multimedia/audio/qaudioinput_symbian_p.h
index 7417655..726b743 100644
--- a/src/multimedia/audio/qaudioinput_symbian_p.h
+++ b/src/multimedia/audio/qaudioinput_symbian_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index ece1c26..f4bb075 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h
index 8a9b02b..f10ea31 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.h
+++ b/src/multimedia/audio/qaudioinput_win32_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index cf3b79c..0b4ea5f 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index 0f45b1b..a498c00 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 49b32c0..23f32f8 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/audio/qaudiooutput_alsa_p.h
index e6ac231..8709cdb 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_mac_p.cpp b/src/multimedia/audio/qaudiooutput_mac_p.cpp
index cc52d90..31a66eb 100644
--- a/src/multimedia/audio/qaudiooutput_mac_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_mac_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_mac_p.h b/src/multimedia/audio/qaudiooutput_mac_p.h
index 752905c..57a470e 100644
--- a/src/multimedia/audio/qaudiooutput_mac_p.h
+++ b/src/multimedia/audio/qaudiooutput_mac_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.cpp b/src/multimedia/audio/qaudiooutput_symbian_p.cpp
index ea14e19..1829aac 100644
--- a/src/multimedia/audio/qaudiooutput_symbian_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_symbian_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.h b/src/multimedia/audio/qaudiooutput_symbian_p.h
index c0acb07..efa91c7 100644
--- a/src/multimedia/audio/qaudiooutput_symbian_p.h
+++ b/src/multimedia/audio/qaudiooutput_symbian_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index 99bada2..df18bc3 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h
index 2d19225..863cb35 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/audio/qaudiooutput_win32_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp
index 978636a..fefb2c0 100644
--- a/src/multimedia/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/video/qabstractvideobuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h
index 98e12da..40ca844 100644
--- a/src/multimedia/video/qabstractvideobuffer.h
+++ b/src/multimedia/video/qabstractvideobuffer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h
index 3303b36..ac8d294 100644
--- a/src/multimedia/video/qabstractvideobuffer_p.h
+++ b/src/multimedia/video/qabstractvideobuffer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp
index 3dabb6b..1bfe062 100644
--- a/src/multimedia/video/qabstractvideosurface.cpp
+++ b/src/multimedia/video/qabstractvideosurface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h
index f2cae17..927df3f 100644
--- a/src/multimedia/video/qabstractvideosurface.h
+++ b/src/multimedia/video/qabstractvideosurface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qabstractvideosurface_p.h b/src/multimedia/video/qabstractvideosurface_p.h
index 42df112..d75318b 100644
--- a/src/multimedia/video/qabstractvideosurface_p.h
+++ b/src/multimedia/video/qabstractvideosurface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp
index e3e1585..4a6cde8 100644
--- a/src/multimedia/video/qimagevideobuffer.cpp
+++ b/src/multimedia/video/qimagevideobuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/video/qimagevideobuffer_p.h
index 82075d7..e688265 100644
--- a/src/multimedia/video/qimagevideobuffer_p.h
+++ b/src/multimedia/video/qimagevideobuffer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp
index 2e892b7..dbd9bdd 100644
--- a/src/multimedia/video/qmemoryvideobuffer.cpp
+++ b/src/multimedia/video/qmemoryvideobuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h
index c66cf93..61a6f12 100644
--- a/src/multimedia/video/qmemoryvideobuffer_p.h
+++ b/src/multimedia/video/qmemoryvideobuffer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index cd38f5e..1b8b86b 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index 668a738..249339b 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp
index 3afbdc9..1c3ccd7 100644
--- a/src/multimedia/video/qvideosurfaceformat.cpp
+++ b/src/multimedia/video/qvideosurfaceformat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h
index 9c73f5f..9d0988d 100644
--- a/src/multimedia/video/qvideosurfaceformat.h
+++ b/src/multimedia/video/qvideosurfaceformat.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp
index 0f0ef9c..60310a4 100644
--- a/src/network/access/qabstractnetworkcache.cpp
+++ b/src/network/access/qabstractnetworkcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index 30d5937..2960aba 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qabstractnetworkcache_p.h b/src/network/access/qabstractnetworkcache_p.h
index ed3cd17..6952cef 100644
--- a/src/network/access/qabstractnetworkcache_p.h
+++ b/src/network/access/qabstractnetworkcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qfilenetworkreply.cpp b/src/network/access/qfilenetworkreply.cpp
index 00bd29e..456cb92 100644
--- a/src/network/access/qfilenetworkreply.cpp
+++ b/src/network/access/qfilenetworkreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qfilenetworkreply_p.h b/src/network/access/qfilenetworkreply_p.h
index 710ec9f..6b3db35 100644
--- a/src/network/access/qfilenetworkreply_p.h
+++ b/src/network/access/qfilenetworkreply_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index 97219f4..042e505 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qftp.h b/src/network/access/qftp.h
index db2177c..976afea 100644
--- a/src/network/access/qftp.h
+++ b/src/network/access/qftp.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 13375f8..36c5282 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttp.h b/src/network/access/qhttp.h
index 6bcce65..ed72f36 100644
--- a/src/network/access/qhttp.h
+++ b/src/network/access/qhttp.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index ae4d257..00b6354 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 51666d6..2dc6095 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 6437f6f..fac343b 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 41a896d..4102670 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkheader.cpp b/src/network/access/qhttpnetworkheader.cpp
index 669f9cf..99e97a0 100644
--- a/src/network/access/qhttpnetworkheader.cpp
+++ b/src/network/access/qhttpnetworkheader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkheader_p.h b/src/network/access/qhttpnetworkheader_p.h
index 9068f85..78f3e66 100644
--- a/src/network/access/qhttpnetworkheader_p.h
+++ b/src/network/access/qhttpnetworkheader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 108ba8a..20a2fbc 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 4011c78..abf9e77 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp
index 639025e..30a0dda 100644
--- a/src/network/access/qhttpnetworkrequest.cpp
+++ b/src/network/access/qhttpnetworkrequest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h
index 15cab73..a2aa3e5 100644
--- a/src/network/access/qhttpnetworkrequest_p.h
+++ b/src/network/access/qhttpnetworkrequest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index 60f7dc6..a7d0ea4 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h
index 4fe6de6..dc8293a 100644
--- a/src/network/access/qnetworkaccessbackend_p.h
+++ b/src/network/access/qnetworkaccessbackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp
index 4f699a1..0867fd8 100644
--- a/src/network/access/qnetworkaccesscache.cpp
+++ b/src/network/access/qnetworkaccesscache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h
index 1564e11..7d05856 100644
--- a/src/network/access/qnetworkaccesscache_p.h
+++ b/src/network/access/qnetworkaccesscache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp
index 73491a9..ce4be90 100644
--- a/src/network/access/qnetworkaccesscachebackend.cpp
+++ b/src/network/access/qnetworkaccesscachebackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccesscachebackend_p.h b/src/network/access/qnetworkaccesscachebackend_p.h
index df001ab..09fbfa1 100644
--- a/src/network/access/qnetworkaccesscachebackend_p.h
+++ b/src/network/access/qnetworkaccesscachebackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessdatabackend.cpp b/src/network/access/qnetworkaccessdatabackend.cpp
index efb6e3e..ab89477 100644
--- a/src/network/access/qnetworkaccessdatabackend.cpp
+++ b/src/network/access/qnetworkaccessdatabackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessdatabackend_p.h b/src/network/access/qnetworkaccessdatabackend_p.h
index a7c63d5..7b3d402 100644
--- a/src/network/access/qnetworkaccessdatabackend_p.h
+++ b/src/network/access/qnetworkaccessdatabackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp
index cd077e7..9ee02b7 100644
--- a/src/network/access/qnetworkaccessdebugpipebackend.cpp
+++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessdebugpipebackend_p.h b/src/network/access/qnetworkaccessdebugpipebackend_p.h
index 58a4fd0..c33ab4b 100644
--- a/src/network/access/qnetworkaccessdebugpipebackend_p.h
+++ b/src/network/access/qnetworkaccessdebugpipebackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 4560153..9b90273 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessfilebackend_p.h b/src/network/access/qnetworkaccessfilebackend_p.h
index 6df8710..6d700c7 100644
--- a/src/network/access/qnetworkaccessfilebackend_p.h
+++ b/src/network/access/qnetworkaccessfilebackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 1a59011..e4c45eb 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h
index 737fa72..bf53b6f 100644
--- a/src/network/access/qnetworkaccessftpbackend_p.h
+++ b/src/network/access/qnetworkaccessftpbackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index f617244..39f5b52 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index c4c88ae..aed6874 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index a637474..70a244c 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 95e45f0..1d1fd89 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
index 695842c..ffc1243 100644
--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index d1bdd57..3a0990d 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 3cc4cee..b7620cb 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkcookie_p.h b/src/network/access/qnetworkcookie_p.h
index a65013c..3f53023 100644
--- a/src/network/access/qnetworkcookie_p.h
+++ b/src/network/access/qnetworkcookie_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index 0b3a918..5d68c47 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h
index 8086f38..de77a7d 100644
--- a/src/network/access/qnetworkcookiejar.h
+++ b/src/network/access/qnetworkcookiejar.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkcookiejar_p.h b/src/network/access/qnetworkcookiejar_p.h
index 5802115..1bf2a66 100644
--- a/src/network/access/qnetworkcookiejar_p.h
+++ b/src/network/access/qnetworkcookiejar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index cce6bd9..a404c88 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h
index 0b6cf1b..8a63ed1 100644
--- a/src/network/access/qnetworkdiskcache.h
+++ b/src/network/access/qnetworkdiskcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h
index b6df179..a10ca83 100644
--- a/src/network/access/qnetworkdiskcache_p.h
+++ b/src/network/access/qnetworkdiskcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 261ed20..42c5a09 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index acb7379..e5f3648 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkreply_p.h b/src/network/access/qnetworkreply_p.h
index d7b8ab0..ae173c2 100644
--- a/src/network/access/qnetworkreply_p.h
+++ b/src/network/access/qnetworkreply_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 5850494..6b65358 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index 38084bd..df1c98c 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index d3084cf..391c3f6 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index cdadf0f..3b5ec77 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/access/qnetworkrequest_p.h b/src/network/access/qnetworkrequest_p.h
index dcb3f97..d75e9a3 100644
--- a/src/network/access/qnetworkrequest_p.h
+++ b/src/network/access/qnetworkrequest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp
index b074924..f0726e0 100644
--- a/src/network/bearer/qbearerengine.cpp
+++ b/src/network/bearer/qbearerengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qbearerengine_p.h b/src/network/bearer/qbearerengine_p.h
index 70aa5fa..a25334c 100644
--- a/src/network/bearer/qbearerengine_p.h
+++ b/src/network/bearer/qbearerengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qbearerplugin.cpp b/src/network/bearer/qbearerplugin.cpp
index a5e8918..7c615e4 100644
--- a/src/network/bearer/qbearerplugin.cpp
+++ b/src/network/bearer/qbearerplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qbearerplugin_p.h b/src/network/bearer/qbearerplugin_p.h
index 9652f14..4481fe2 100644
--- a/src/network/bearer/qbearerplugin_p.h
+++ b/src/network/bearer/qbearerplugin_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 23d7800..9dd2977 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 3e44be1..4fe18e2 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index d388920..9293ccf 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 0649031..f2ee9b9 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 3190a30..f860e17 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 593dbbe..5f75698 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h
index 2b0bbf6..5ad5022 100644
--- a/src/network/bearer/qnetworkconfiguration_p.h
+++ b/src/network/bearer/qnetworkconfiguration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 65de539..a3277ba 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 0b40147..3df3d6c 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index c7b5718..394d9d4 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index f97d833..f130d65 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h
index 983b7c0..4ca267d 100644
--- a/src/network/kernel/qauthenticator.h
+++ b/src/network/kernel/qauthenticator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h
index 4e09360..93c35ab 100644
--- a/src/network/kernel/qauthenticator_p.h
+++ b/src/network/kernel/qauthenticator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 0bacf90..a3c341b 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index 57d78e5..09ddbd0 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostaddress_p.h b/src/network/kernel/qhostaddress_p.h
index 30d8092..8cc5f2b 100644
--- a/src/network/kernel/qhostaddress_p.h
+++ b/src/network/kernel/qhostaddress_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 41a9512..2873137 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h
index 9724017..d23befe 100644
--- a/src/network/kernel/qhostinfo.h
+++ b/src/network/kernel/qhostinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index 85d14c2..c757947 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index 9e3da61..ccc3ee4 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index 8241c84..128b13f 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp
index 1115c63..60e8062 100644
--- a/src/network/kernel/qnetworkinterface.cpp
+++ b/src/network/kernel/qnetworkinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index 0a57ce8..95580c1 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkinterface_p.h b/src/network/kernel/qnetworkinterface_p.h
index 749bd8e..f0ffd24 100644
--- a/src/network/kernel/qnetworkinterface_p.h
+++ b/src/network/kernel/qnetworkinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkinterface_symbian.cpp b/src/network/kernel/qnetworkinterface_symbian.cpp
index 7942461..86bf8b7 100644
--- a/src/network/kernel/qnetworkinterface_symbian.cpp
+++ b/src/network/kernel/qnetworkinterface_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index f9d24c3..25ce601 100644
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp
index a1d1df6..4613dbe 100644
--- a/src/network/kernel/qnetworkinterface_win.cpp
+++ b/src/network/kernel/qnetworkinterface_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkinterface_win_p.h b/src/network/kernel/qnetworkinterface_win_p.h
index 2352dfd..5c6fbfc 100644
--- a/src/network/kernel/qnetworkinterface_win_p.h
+++ b/src/network/kernel/qnetworkinterface_win_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index bc5a025..3390c4a 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 74ea63a..864e7ab 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkproxy_generic.cpp b/src/network/kernel/qnetworkproxy_generic.cpp
index ae855d1..6310b82 100644
--- a/src/network/kernel/qnetworkproxy_generic.cpp
+++ b/src/network/kernel/qnetworkproxy_generic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
index 4139a7e..20e3b2c 100644
--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkproxy_p.h b/src/network/kernel/qnetworkproxy_p.h
index 21d2cb0..cd628cc 100644
--- a/src/network/kernel/qnetworkproxy_p.h
+++ b/src/network/kernel/qnetworkproxy_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index a72ef38..fd20f94 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp
index 18d8d40..6415fbd 100644
--- a/src/network/kernel/qurlinfo.cpp
+++ b/src/network/kernel/qurlinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/kernel/qurlinfo.h b/src/network/kernel/qurlinfo.h
index cfa6275..8a17094 100644
--- a/src/network/kernel/qurlinfo.h
+++ b/src/network/kernel/qurlinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 505db71..3bfe46d 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 9e487d2..5d29e1f 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index b51c301..e9fc773 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qabstractsocketengine.cpp b/src/network/socket/qabstractsocketengine.cpp
index 79eed8c..1354055 100644
--- a/src/network/socket/qabstractsocketengine.cpp
+++ b/src/network/socket/qabstractsocketengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h
index 3669852..1e00e61 100644
--- a/src/network/socket/qabstractsocketengine_p.h
+++ b/src/network/socket/qabstractsocketengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index dfda257..8756fae 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h
index 5051def..7f4732b 100644
--- a/src/network/socket/qhttpsocketengine_p.h
+++ b/src/network/socket/qhttpsocketengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp
index ef7fc02..20c9c13 100644
--- a/src/network/socket/qlocalserver.cpp
+++ b/src/network/socket/qlocalserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h
index 38ba74c..d8f3117 100644
--- a/src/network/socket/qlocalserver.h
+++ b/src/network/socket/qlocalserver.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h
index 4f92b64..fdb3c14 100644
--- a/src/network/socket/qlocalserver_p.h
+++ b/src/network/socket/qlocalserver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp
index 4592141..5d5b571 100644
--- a/src/network/socket/qlocalserver_tcp.cpp
+++ b/src/network/socket/qlocalserver_tcp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 560f5f6..a2e0a25 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp
index 61220e4..f3d5393 100644
--- a/src/network/socket/qlocalserver_win.cpp
+++ b/src/network/socket/qlocalserver_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp
index 2eb1700..3fc0e9a 100644
--- a/src/network/socket/qlocalsocket.cpp
+++ b/src/network/socket/qlocalsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h
index 5bf2e94..b2085d8 100644
--- a/src/network/socket/qlocalsocket.h
+++ b/src/network/socket/qlocalsocket.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index 57ca3c2..5d4a54d 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp
index 5b5e84f..ca67329 100644
--- a/src/network/socket/qlocalsocket_tcp.cpp
+++ b/src/network/socket/qlocalsocket_tcp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index f14decc..4f45c9f 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index 1e0bced..1ec3ae3 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index a169ca0..717f483 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h
index eca16f6..8b2499c 100644
--- a/src/network/socket/qnativesocketengine_p.h
+++ b/src/network/socket/qnativesocketengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index f6bfbac..5c4c279 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index 477ef45..1605d67 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qnet_unix_p.h b/src/network/socket/qnet_unix_p.h
index 7895930..ee33bcc 100644
--- a/src/network/socket/qnet_unix_p.h
+++ b/src/network/socket/qnet_unix_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index f68edfe..35550a5 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h
index 3d35b57..7b1ab5a 100644
--- a/src/network/socket/qsocks5socketengine_p.h
+++ b/src/network/socket/qsocks5socketengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 0640c7c..75a3536 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h
index b206678..1097292 100644
--- a/src/network/socket/qtcpserver.h
+++ b/src/network/socket/qtcpserver.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp
index 70852a5..9312563 100644
--- a/src/network/socket/qtcpsocket.cpp
+++ b/src/network/socket/qtcpsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h
index c03d975..2747a37 100644
--- a/src/network/socket/qtcpsocket.h
+++ b/src/network/socket/qtcpsocket.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qtcpsocket_p.h b/src/network/socket/qtcpsocket_p.h
index 704c63c..12479a8 100644
--- a/src/network/socket/qtcpsocket_p.h
+++ b/src/network/socket/qtcpsocket_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp
index d5366d3..9282e70 100644
--- a/src/network/socket/qudpsocket.cpp
+++ b/src/network/socket/qudpsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h
index f477306..3c4bd27 100644
--- a/src/network/socket/qudpsocket.h
+++ b/src/network/socket/qudpsocket.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index e8f7780..9ac7512 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index c841ba8..5a85b4c 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index a3ea555..d755d06 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index d3594fc..c6b1bf2 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
index fe52a82..bf71eb6 100644
--- a/src/network/ssl/qsslcertificate_p.h
+++ b/src/network/ssl/qsslcertificate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp
index 31042a4..e3f13dc 100644
--- a/src/network/ssl/qsslcipher.cpp
+++ b/src/network/ssl/qsslcipher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h
index 22ff552..a056358 100644
--- a/src/network/ssl/qsslcipher.h
+++ b/src/network/ssl/qsslcipher.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslcipher_p.h b/src/network/ssl/qsslcipher_p.h
index 7166152..01183bc 100644
--- a/src/network/ssl/qsslcipher_p.h
+++ b/src/network/ssl/qsslcipher_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index f8f67bb..ec56b0e 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index d104d1c..8e3ae4b 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index 3c76d7c..267fffd 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index a2cb84f..cf8470f 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index 3987907..1cf18ba 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index da39662..5d5361c 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h
index 28b97f8..4050763 100644
--- a/src/network/ssl/qsslkey.h
+++ b/src/network/ssl/qsslkey.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h
index 3811f7e..b9e384c 100644
--- a/src/network/ssl/qsslkey_p.h
+++ b/src/network/ssl/qsslkey_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index f18c629..4e78255 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index 6671683..6673b3f 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 5033393..37a07c2 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index dec98ae..7716c95 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 6affa36..a7465be 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
index ef61dbf..6e7166b 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
index 72b3ef7..7d12c43 100644
--- a/src/network/ssl/qsslsocket_p.h
+++ b/src/network/ssl/qsslsocket_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
index 559a6fd..60de078 100644
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
+++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
index 46029b9..3905777 100644
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
+++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
index f30ad9c..a5788d6 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
index d2ebd87..08586c8 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index 40b3641..0de77e4 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index 06b96ae..bfaa19f 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
index a7ece0f..49a4c63 100644
--- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglgradientcache.cpp b/src/opengl/gl2paintengineex/qglgradientcache.cpp
index a1495dd..c083d27 100644
--- a/src/opengl/gl2paintengineex/qglgradientcache.cpp
+++ b/src/opengl/gl2paintengineex/qglgradientcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h
index 0a5f846..46f9117 100644
--- a/src/opengl/gl2paintengineex/qglgradientcache_p.h
+++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index aa217f6..b613aab 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index b255e75..695d93b 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index f353995..d7fe803 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
index eb3693c..e407c0b 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
index 9bc099d..2848a19 100644
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
index ab27ed6..a3d2623 100644
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp
index f14b0a4..548cb50 100644
--- a/src/opengl/gl2paintengineex/qtriangulator.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qtriangulator_p.h b/src/opengl/gl2paintengineex/qtriangulator_p.h
index e5eec39..c31434d 100644
--- a/src/opengl/gl2paintengineex/qtriangulator_p.h
+++ b/src/opengl/gl2paintengineex/qtriangulator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 3a4a244..7369791 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index f85cad5..b118d65 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index ebd1169..b1dcdcc 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_egl_p.h b/src/opengl/qgl_egl_p.h
index 85d7f32..3abc51c 100644
--- a/src/opengl/qgl_egl_p.h
+++ b/src/opengl/qgl_egl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm
index f023a97..cf411ee 100644
--- a/src/opengl/qgl_mac.mm
+++ b/src/opengl/qgl_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 387c8f7..907aa1f 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp
index 38c3774..c780dd8 100644
--- a/src/opengl/qgl_qws.cpp
+++ b/src/opengl/qgl_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp
index 73fe4c9..5324611 100644
--- a/src/opengl/qgl_symbian.cpp
+++ b/src/opengl/qgl_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp
index 8eb6177..31b4840 100644
--- a/src/opengl/qgl_win.cpp
+++ b/src/opengl/qgl_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_wince.cpp b/src/opengl/qgl_wince.cpp
index 054a8d1..26ba0ec 100644
--- a/src/opengl/qgl_wince.cpp
+++ b/src/opengl/qgl_wince.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index bfb232d..044b12e 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 9d28de0..69b8b31 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglbuffer.cpp b/src/opengl/qglbuffer.cpp
index 5f0aed4..4d7aa3f 100644
--- a/src/opengl/qglbuffer.cpp
+++ b/src/opengl/qglbuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h
index 9867f31..fd53c74 100644
--- a/src/opengl/qglbuffer.h
+++ b/src/opengl/qglbuffer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 332fb16..02a1aaa 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h
index e9535a9..83183ee 100644
--- a/src/opengl/qglcolormap.h
+++ b/src/opengl/qglcolormap.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp
index 6aec8ae..6a97eaa 100644
--- a/src/opengl/qglextensions.cpp
+++ b/src/opengl/qglextensions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h
index 6259cca..4e1036f 100644
--- a/src/opengl/qglextensions_p.h
+++ b/src/opengl/qglextensions_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 9b8a3d1..da15ee5 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h
index 6ff6645..331fc9e 100644
--- a/src/opengl/qglframebufferobject.h
+++ b/src/opengl/qglframebufferobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h
index d8ff012..c905a5e 100644
--- a/src/opengl/qglframebufferobject_p.h
+++ b/src/opengl/qglframebufferobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp
index e1dcbfd..a3f8852 100644
--- a/src/opengl/qglpaintdevice.cpp
+++ b/src/opengl/qglpaintdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h
index 04f9c3c..f0d072c 100644
--- a/src/opengl/qglpaintdevice_p.h
+++ b/src/opengl/qglpaintdevice_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index 9a8b243..5244084 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h
index d9c7e3e..f19557d 100644
--- a/src/opengl/qglpixelbuffer.h
+++ b/src/opengl/qglpixelbuffer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp
index 0b94f5a..5284456 100644
--- a/src/opengl/qglpixelbuffer_egl.cpp
+++ b/src/opengl/qglpixelbuffer_egl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixelbuffer_mac.mm b/src/opengl/qglpixelbuffer_mac.mm
index 6731dd8..09d00a8 100644
--- a/src/opengl/qglpixelbuffer_mac.mm
+++ b/src/opengl/qglpixelbuffer_mac.mm
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h
index 2a1f671..a09c552 100644
--- a/src/opengl/qglpixelbuffer_p.h
+++ b/src/opengl/qglpixelbuffer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixelbuffer_win.cpp b/src/opengl/qglpixelbuffer_win.cpp
index 8d0d105..391b746 100644
--- a/src/opengl/qglpixelbuffer_win.cpp
+++ b/src/opengl/qglpixelbuffer_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixelbuffer_x11.cpp b/src/opengl/qglpixelbuffer_x11.cpp
index 32a42a2..f06287e 100644
--- a/src/opengl/qglpixelbuffer_x11.cpp
+++ b/src/opengl/qglpixelbuffer_x11.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp
index bfa5ef1..6373201 100644
--- a/src/opengl/qglpixmapfilter.cpp
+++ b/src/opengl/qglpixmapfilter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglpixmapfilter_p.h b/src/opengl/qglpixmapfilter_p.h
index d465729..7ccd363 100644
--- a/src/opengl/qglpixmapfilter_p.h
+++ b/src/opengl/qglpixmapfilter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglscreen_qws.cpp b/src/opengl/qglscreen_qws.cpp
index e78d493..b4a6ad7 100644
--- a/src/opengl/qglscreen_qws.cpp
+++ b/src/opengl/qglscreen_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglscreen_qws.h b/src/opengl/qglscreen_qws.h
index b5e6b44..d902eb1 100644
--- a/src/opengl/qglscreen_qws.h
+++ b/src/opengl/qglscreen_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 74382b0..6929b46 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index d612b05..fe74bd2 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglwindowsurface_qws.cpp b/src/opengl/qglwindowsurface_qws.cpp
index 6f89b5e..f01cc74 100644
--- a/src/opengl/qglwindowsurface_qws.cpp
+++ b/src/opengl/qglwindowsurface_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qglwindowsurface_qws_p.h b/src/opengl/qglwindowsurface_qws_p.h
index 5c4d2fd..b3822bb 100644
--- a/src/opengl/qglwindowsurface_qws_p.h
+++ b/src/opengl/qglwindowsurface_qws_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp
index f53ef54..557e772 100644
--- a/src/opengl/qgraphicsshadereffect.cpp
+++ b/src/opengl/qgraphicsshadereffect.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h
index 75d1403..c9a4a8e 100644
--- a/src/opengl/qgraphicsshadereffect_p.h
+++ b/src/opengl/qgraphicsshadereffect_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgraphicssystem_gl.cpp b/src/opengl/qgraphicssystem_gl.cpp
index 58cc28a..53029e0 100644
--- a/src/opengl/qgraphicssystem_gl.cpp
+++ b/src/opengl/qgraphicssystem_gl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qgraphicssystem_gl_p.h b/src/opengl/qgraphicssystem_gl_p.h
index 9d2d506..0f0f661 100644
--- a/src/opengl/qgraphicssystem_gl_p.h
+++ b/src/opengl/qgraphicssystem_gl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 12c487d..0bea15e 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qpaintengine_opengl_p.h b/src/opengl/qpaintengine_opengl_p.h
index 55f7792..257257c 100644
--- a/src/opengl/qpaintengine_opengl_p.h
+++ b/src/opengl/qpaintengine_opengl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 89000bb..c542daa 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index f000993..2115044 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qpixmapdata_x11gl_egl.cpp b/src/opengl/qpixmapdata_x11gl_egl.cpp
index 2c11a0b..6453161 100644
--- a/src/opengl/qpixmapdata_x11gl_egl.cpp
+++ b/src/opengl/qpixmapdata_x11gl_egl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qpixmapdata_x11gl_p.h b/src/opengl/qpixmapdata_x11gl_p.h
index 2d1336b..1c3c859 100644
--- a/src/opengl/qpixmapdata_x11gl_p.h
+++ b/src/opengl/qpixmapdata_x11gl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index f98dcff..e04cd28 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h
index ffc2e86..befb590 100644
--- a/src/opengl/qwindowsurface_gl_p.h
+++ b/src/opengl/qwindowsurface_gl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qwindowsurface_x11gl.cpp b/src/opengl/qwindowsurface_x11gl.cpp
index 3de6cae..ac726fb 100644
--- a/src/opengl/qwindowsurface_x11gl.cpp
+++ b/src/opengl/qwindowsurface_x11gl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/qwindowsurface_x11gl_p.h b/src/opengl/qwindowsurface_x11gl_p.h
index 4d493d0..5ca140c 100644
--- a/src/opengl/qwindowsurface_x11gl_p.h
+++ b/src/opengl/qwindowsurface_x11gl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index 5e0dc6c..f221514 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/opengl/util/generator.cpp b/src/opengl/util/generator.cpp
index e0148b2..1de38fe 100644
--- a/src/opengl/util/generator.cpp
+++ b/src/opengl/util/generator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -294,11 +294,11 @@ void writeIncludeFile(const QSet<QString> &variables,
            "** This file is part of the QtOpenGL module of the Qt Toolkit.\n"
            "**\n"
            "** $QT_BEGIN_LICENSE:LGPL$\n"
-           "** No Commercial Usage\n"
-           "** This file contains pre-release code and may not be distributed.\n"
-           "** You may use this file in accordance with the terms and conditions\n"
-           "** contained in the Technology Preview License Agreement accompanying\n"
-           "** this package.\n"
+           "** Commercial Usage\n"
+           "** Licensees holding valid Qt Commercial licenses may use this file in\n"
+           "** accordance with the Qt Commercial License Agreement provided with the\n"
+           "** Software or, alternatively, in accordance with the terms contained in\n"
+           "** a written agreement between you and Nokia.\n"
            "**\n"
            "** GNU Lesser General Public License Usage\n"
            "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
@@ -312,16 +312,16 @@ void writeIncludeFile(const QSet<QString> &variables,
            "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
            "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
            "**\n"
+           "** GNU General Public License Usage\n"
+           "** Alternatively, this file may be used under the terms of the GNU\n"
+           "** General Public License version 3.0 as published by the Free Software\n"
+           "** Foundation and appearing in the file LICENSE.GPL included in the\n"
+           "** packaging of this file.  Please review the following information to\n"
+           "** ensure the GNU General Public License version 3.0 requirements will be\n"
+           "** met: http://www.gnu.org/copyleft/gpl.html.\n"
+           "**\n"
            "** If you have questions regarding the use of this file, please contact\n"
            "** Nokia at qt-info@nokia.com.\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
            "** $QT_END_LICENSE$\n"
            "**\n"
            "****************************************************************************/\n"
diff --git a/src/opengl/util/glsl_to_include.sh b/src/opengl/util/glsl_to_include.sh
index 1536bfd..f5242ba 100755
--- a/src/opengl/util/glsl_to_include.sh
+++ b/src/opengl/util/glsl_to_include.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index f6d2435..8b1ace1 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qpaintengine_vg_p.h b/src/openvg/qpaintengine_vg_p.h
index 75cf053..a731ede 100644
--- a/src/openvg/qpaintengine_vg_p.h
+++ b/src/openvg/qpaintengine_vg_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index e8ec333..abbdadd 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index 114d545..d13334d 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qpixmapfilter_vg.cpp b/src/openvg/qpixmapfilter_vg.cpp
index 1ea1f55..1d665e2 100644
--- a/src/openvg/qpixmapfilter_vg.cpp
+++ b/src/openvg/qpixmapfilter_vg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qpixmapfilter_vg_p.h b/src/openvg/qpixmapfilter_vg_p.h
index b6a1f61..5ea7ef1 100644
--- a/src/openvg/qpixmapfilter_vg_p.h
+++ b/src/openvg/qpixmapfilter_vg_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qvg.h b/src/openvg/qvg.h
index 962d789..d81e092 100644
--- a/src/openvg/qvg.h
+++ b/src/openvg/qvg.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qvg_p.h b/src/openvg/qvg_p.h
index 51abbee..cd078a4 100644
--- a/src/openvg/qvg_p.h
+++ b/src/openvg/qvg_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp
index ef0160c..d2c9416 100644
--- a/src/openvg/qvg_symbian.cpp
+++ b/src/openvg/qvg_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qvgcompositionhelper_p.h b/src/openvg/qvgcompositionhelper_p.h
index 366fe12..f0a6fab 100644
--- a/src/openvg/qvgcompositionhelper_p.h
+++ b/src/openvg/qvgcompositionhelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qvgfontglyphcache_p.h b/src/openvg/qvgfontglyphcache_p.h
index b32a873..ba273b7 100644
--- a/src/openvg/qvgfontglyphcache_p.h
+++ b/src/openvg/qvgfontglyphcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qvgimagepool.cpp b/src/openvg/qvgimagepool.cpp
index 0c236ea..c506081 100644
--- a/src/openvg/qvgimagepool.cpp
+++ b/src/openvg/qvgimagepool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qvgimagepool_p.h b/src/openvg/qvgimagepool_p.h
index d61476d..4ece272 100644
--- a/src/openvg/qvgimagepool_p.h
+++ b/src/openvg/qvgimagepool_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qwindowsurface_vg.cpp b/src/openvg/qwindowsurface_vg.cpp
index 55dcef3..b152667 100644
--- a/src/openvg/qwindowsurface_vg.cpp
+++ b/src/openvg/qwindowsurface_vg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qwindowsurface_vg_p.h b/src/openvg/qwindowsurface_vg_p.h
index 93fb5a7..24f6c81 100644
--- a/src/openvg/qwindowsurface_vg_p.h
+++ b/src/openvg/qwindowsurface_vg_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qwindowsurface_vgegl.cpp b/src/openvg/qwindowsurface_vgegl.cpp
index e3f52f4e..7b5942d 100644
--- a/src/openvg/qwindowsurface_vgegl.cpp
+++ b/src/openvg/qwindowsurface_vgegl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/openvg/qwindowsurface_vgegl_p.h b/src/openvg/qwindowsurface_vgegl_p.h
index fe62ed3..4c2496e 100644
--- a/src/openvg/qwindowsurface_vgegl_p.h
+++ b/src/openvg/qwindowsurface_vgegl_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenVG module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/compat/main.cpp b/src/plugins/accessible/compat/main.cpp
index dd7696c..0c0c7ee 100644
--- a/src/plugins/accessible/compat/main.cpp
+++ b/src/plugins/accessible/compat/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/compat/q3complexwidgets.cpp b/src/plugins/accessible/compat/q3complexwidgets.cpp
index 5c70c61..32f7c68 100644
--- a/src/plugins/accessible/compat/q3complexwidgets.cpp
+++ b/src/plugins/accessible/compat/q3complexwidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/compat/q3complexwidgets.h b/src/plugins/accessible/compat/q3complexwidgets.h
index cdf3f90..d0e5b9e 100644
--- a/src/plugins/accessible/compat/q3complexwidgets.h
+++ b/src/plugins/accessible/compat/q3complexwidgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/compat/q3simplewidgets.cpp b/src/plugins/accessible/compat/q3simplewidgets.cpp
index 700afeb..3e35de9 100644
--- a/src/plugins/accessible/compat/q3simplewidgets.cpp
+++ b/src/plugins/accessible/compat/q3simplewidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/compat/q3simplewidgets.h b/src/plugins/accessible/compat/q3simplewidgets.h
index 332b2b4..e82b347 100644
--- a/src/plugins/accessible/compat/q3simplewidgets.h
+++ b/src/plugins/accessible/compat/q3simplewidgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/compat/qaccessiblecompat.cpp b/src/plugins/accessible/compat/qaccessiblecompat.cpp
index 9e876da..b7d834d 100644
--- a/src/plugins/accessible/compat/qaccessiblecompat.cpp
+++ b/src/plugins/accessible/compat/qaccessiblecompat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/compat/qaccessiblecompat.h b/src/plugins/accessible/compat/qaccessiblecompat.h
index 653a875..0a165a3 100644
--- a/src/plugins/accessible/compat/qaccessiblecompat.h
+++ b/src/plugins/accessible/compat/qaccessiblecompat.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index 803786f..c8492fd 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h
index 09358948..0403717 100644
--- a/src/plugins/accessible/widgets/complexwidgets.h
+++ b/src/plugins/accessible/widgets/complexwidgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/main.cpp b/src/plugins/accessible/widgets/main.cpp
index 48b33ac..172527f 100644
--- a/src/plugins/accessible/widgets/main.cpp
+++ b/src/plugins/accessible/widgets/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index cad4339..070ea4a 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.h b/src/plugins/accessible/widgets/qaccessiblemenu.h
index 4a6aa9f..1492f64 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.h
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index 662663d..dd80f74 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h
index c635a39..b5afebe 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.h
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/rangecontrols.cpp b/src/plugins/accessible/widgets/rangecontrols.cpp
index 4cd171b..a50cd6d 100644
--- a/src/plugins/accessible/widgets/rangecontrols.cpp
+++ b/src/plugins/accessible/widgets/rangecontrols.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/rangecontrols.h b/src/plugins/accessible/widgets/rangecontrols.h
index 9f89c56..06d3ed9 100644
--- a/src/plugins/accessible/widgets/rangecontrols.h
+++ b/src/plugins/accessible/widgets/rangecontrols.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index f39d538..aef6b28 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 70503b8..6a36827 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/connman/main.cpp b/src/plugins/bearer/connman/main.cpp
index d483cf0..56f5b71 100644
--- a/src/plugins/bearer/connman/main.cpp
+++ b/src/plugins/bearer/connman/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index a8b8911..b45a8bc 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h
index 569bbc7..8e6bb95 100644
--- a/src/plugins/bearer/connman/qconnmanengine.h
+++ b/src/plugins/bearer/connman/qconnmanengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 549a07a..f30ff7e 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
index 6e6b702..b25b170 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h
+++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/connman/qofonoservice_linux.cpp b/src/plugins/bearer/connman/qofonoservice_linux.cpp
index 955f4b1..ae76c88 100644
--- a/src/plugins/bearer/connman/qofonoservice_linux.cpp
+++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/connman/qofonoservice_linux_p.h b/src/plugins/bearer/connman/qofonoservice_linux_p.h
index 0ac1e4a..5d895e9 100644
--- a/src/plugins/bearer/connman/qofonoservice_linux_p.h
+++ b/src/plugins/bearer/connman/qofonoservice_linux_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/corewlan/main.cpp b/src/plugins/bearer/corewlan/main.cpp
index 628ec61..1cf75c9 100644
--- a/src/plugins/bearer/corewlan/main.cpp
+++ b/src/plugins/bearer/corewlan/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h
index 56da66a..3173ecb 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.h
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 844e38b..c088ffd 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp
index ec1b689..edcc752 100644
--- a/src/plugins/bearer/generic/main.cpp
+++ b/src/plugins/bearer/generic/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index fad3ae8..f264776 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index 021b35b..6f42cd4 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/dbusdispatcher.cpp b/src/plugins/bearer/icd/dbusdispatcher.cpp
index 3d588dc..e997c5d 100644
--- a/src/plugins/bearer/icd/dbusdispatcher.cpp
+++ b/src/plugins/bearer/icd/dbusdispatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/dbusdispatcher.h b/src/plugins/bearer/icd/dbusdispatcher.h
index 6f2f347..de8d6e5 100644
--- a/src/plugins/bearer/icd/dbusdispatcher.h
+++ b/src/plugins/bearer/icd/dbusdispatcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/iapconf.cpp b/src/plugins/bearer/icd/iapconf.cpp
index ddd9fc2..726eb76 100644
--- a/src/plugins/bearer/icd/iapconf.cpp
+++ b/src/plugins/bearer/icd/iapconf.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/iapconf.h b/src/plugins/bearer/icd/iapconf.h
index 9c4ddcb..59295e4 100644
--- a/src/plugins/bearer/icd/iapconf.h
+++ b/src/plugins/bearer/icd/iapconf.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/iapmonitor.cpp b/src/plugins/bearer/icd/iapmonitor.cpp
index 6138e7b..9d688b2 100644
--- a/src/plugins/bearer/icd/iapmonitor.cpp
+++ b/src/plugins/bearer/icd/iapmonitor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/iapmonitor.h b/src/plugins/bearer/icd/iapmonitor.h
index 21ad3bc..10fb4b8 100644
--- a/src/plugins/bearer/icd/iapmonitor.h
+++ b/src/plugins/bearer/icd/iapmonitor.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/maemo_icd.cpp b/src/plugins/bearer/icd/maemo_icd.cpp
index eb093fe..69e15db 100644
--- a/src/plugins/bearer/icd/maemo_icd.cpp
+++ b/src/plugins/bearer/icd/maemo_icd.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/maemo_icd.h b/src/plugins/bearer/icd/maemo_icd.h
index 156316a..1ff0354 100644
--- a/src/plugins/bearer/icd/maemo_icd.h
+++ b/src/plugins/bearer/icd/maemo_icd.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/main.cpp b/src/plugins/bearer/icd/main.cpp
index 491112b..9a3561c 100644
--- a/src/plugins/bearer/icd/main.cpp
+++ b/src/plugins/bearer/icd/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/proxyconf.cpp b/src/plugins/bearer/icd/proxyconf.cpp
index e5c8f4e..a3db236 100644
--- a/src/plugins/bearer/icd/proxyconf.cpp
+++ b/src/plugins/bearer/icd/proxyconf.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/proxyconf.h b/src/plugins/bearer/icd/proxyconf.h
index 884cc5c..1de4db7 100644
--- a/src/plugins/bearer/icd/proxyconf.h
+++ b/src/plugins/bearer/icd/proxyconf.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp
index bdf4e2e..7270aac 100644
--- a/src/plugins/bearer/icd/qicdengine.cpp
+++ b/src/plugins/bearer/icd/qicdengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/qicdengine.h b/src/plugins/bearer/icd/qicdengine.h
index d528f15..2e62fbc 100644
--- a/src/plugins/bearer/icd/qicdengine.h
+++ b/src/plugins/bearer/icd/qicdengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index 2ed0b88..c17cd52 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.h b/src/plugins/bearer/icd/qnetworksession_impl.h
index 9ef9dc3..d4dc91f 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.h
+++ b/src/plugins/bearer/icd/qnetworksession_impl.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/icd/wlan-utils.h b/src/plugins/bearer/icd/wlan-utils.h
index 1d9e89d..b3786e7 100644
--- a/src/plugins/bearer/icd/wlan-utils.h
+++ b/src/plugins/bearer/icd/wlan-utils.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp
index 98789aa..feeb565 100644
--- a/src/plugins/bearer/nativewifi/main.cpp
+++ b/src/plugins/bearer/nativewifi/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/nativewifi/platformdefs.h b/src/plugins/bearer/nativewifi/platformdefs.h
index d67525a..c619426 100644
--- a/src/plugins/bearer/nativewifi/platformdefs.h
+++ b/src/plugins/bearer/nativewifi/platformdefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
index ba8297e..1c14437 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.h b/src/plugins/bearer/nativewifi/qnativewifiengine.h
index dccf2e2..583331d 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.h
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/networkmanager/main.cpp b/src/plugins/bearer/networkmanager/main.cpp
index 9ab2c39..2e71faa 100644
--- a/src/plugins/bearer/networkmanager/main.cpp
+++ b/src/plugins/bearer/networkmanager/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 554f9b7..16e8621 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
index 78ebb0a..e6c0693 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
index 499fe5a..c7fc74c 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
index f006a20..21d8a35 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/networkmanager/qnmdbushelper.cpp b/src/plugins/bearer/networkmanager/qnmdbushelper.cpp
index 68dde6e..de4d76a 100644
--- a/src/plugins/bearer/networkmanager/qnmdbushelper.cpp
+++ b/src/plugins/bearer/networkmanager/qnmdbushelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/networkmanager/qnmdbushelper.h b/src/plugins/bearer/networkmanager/qnmdbushelper.h
index 7a9563d..37be9fb 100644
--- a/src/plugins/bearer/networkmanager/qnmdbushelper.h
+++ b/src/plugins/bearer/networkmanager/qnmdbushelper.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/nla/main.cpp b/src/plugins/bearer/nla/main.cpp
index 479a933..f8843fc 100644
--- a/src/plugins/bearer/nla/main.cpp
+++ b/src/plugins/bearer/nla/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp
index fd50099..b34aa13 100644
--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/nla/qnlaengine.h b/src/plugins/bearer/nla/qnlaengine.h
index 69f54c9..773dd46 100644
--- a/src/plugins/bearer/nla/qnlaengine.h
+++ b/src/plugins/bearer/nla/qnlaengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/platformdefs_win.h b/src/plugins/bearer/platformdefs_win.h
index 1a10ba7..aa37eb9 100644
--- a/src/plugins/bearer/platformdefs_win.h
+++ b/src/plugins/bearer/platformdefs_win.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/qbearerengine_impl.h b/src/plugins/bearer/qbearerengine_impl.h
index 6c30d0f..903a53d 100644
--- a/src/plugins/bearer/qbearerengine_impl.h
+++ b/src/plugins/bearer/qbearerengine_impl.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp
index ef5f347..ce9efec 100644
--- a/src/plugins/bearer/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/qnetworksession_impl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h
index a4902eb..45d3d2d 100644
--- a/src/plugins/bearer/qnetworksession_impl.h
+++ b/src/plugins/bearer/qnetworksession_impl.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/symbian/main.cpp b/src/plugins/bearer/symbian/main.cpp
index c4f539b..c59a8b6 100644
--- a/src/plugins/bearer/symbian/main.cpp
+++ b/src/plugins/bearer/symbian/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 7f81397..c9c72e9 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 8e3e997..e03eedf 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index 2e2b671..c857a36 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h
index 7c1076e..134effd 100644
--- a/src/plugins/bearer/symbian/symbianengine.h
+++ b/src/plugins/bearer/symbian/symbianengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp
index 9a467f3d..9e97884 100644
--- a/src/plugins/codecs/cn/main.cpp
+++ b/src/plugins/codecs/cn/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp
index e10c8b1..9998eba 100644
--- a/src/plugins/codecs/cn/qgb18030codec.cpp
+++ b/src/plugins/codecs/cn/qgb18030codec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h
index 0a23ead..138e8e8 100644
--- a/src/plugins/codecs/cn/qgb18030codec.h
+++ b/src/plugins/codecs/cn/qgb18030codec.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp
index 2c04cb2..0a29be6 100644
--- a/src/plugins/codecs/jp/main.cpp
+++ b/src/plugins/codecs/jp/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp
index d1fb4cc..42d0c4a 100644
--- a/src/plugins/codecs/jp/qeucjpcodec.cpp
+++ b/src/plugins/codecs/jp/qeucjpcodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h
index 6c27dbb..3a2b9ee 100644
--- a/src/plugins/codecs/jp/qeucjpcodec.h
+++ b/src/plugins/codecs/jp/qeucjpcodec.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp
index 95c297d..981986a 100644
--- a/src/plugins/codecs/jp/qfontjpcodec.cpp
+++ b/src/plugins/codecs/jp/qfontjpcodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h
index 07ee263..83f7060 100644
--- a/src/plugins/codecs/jp/qfontjpcodec.h
+++ b/src/plugins/codecs/jp/qfontjpcodec.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp
index 11c4bb0..f380569 100644
--- a/src/plugins/codecs/jp/qjiscodec.cpp
+++ b/src/plugins/codecs/jp/qjiscodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h
index 99809e5..c8e9cb3 100644
--- a/src/plugins/codecs/jp/qjiscodec.h
+++ b/src/plugins/codecs/jp/qjiscodec.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp
index 796de3f..93d9820 100644
--- a/src/plugins/codecs/jp/qjpunicode.cpp
+++ b/src/plugins/codecs/jp/qjpunicode.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h
index 81d5194..c92c7dc 100644
--- a/src/plugins/codecs/jp/qjpunicode.h
+++ b/src/plugins/codecs/jp/qjpunicode.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp
index b806fb5..86d0dca 100644
--- a/src/plugins/codecs/jp/qsjiscodec.cpp
+++ b/src/plugins/codecs/jp/qsjiscodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h
index 5bf5149..4cf65ff 100644
--- a/src/plugins/codecs/jp/qsjiscodec.h
+++ b/src/plugins/codecs/jp/qsjiscodec.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h
index e11414f..5ccf3c1 100644
--- a/src/plugins/codecs/kr/cp949codetbl.h
+++ b/src/plugins/codecs/kr/cp949codetbl.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp
index 68f9482..8e990b7 100644
--- a/src/plugins/codecs/kr/main.cpp
+++ b/src/plugins/codecs/kr/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp
index 1246164..cd5142a 100644
--- a/src/plugins/codecs/kr/qeuckrcodec.cpp
+++ b/src/plugins/codecs/kr/qeuckrcodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h
index 6566535..d21976d 100644
--- a/src/plugins/codecs/kr/qeuckrcodec.h
+++ b/src/plugins/codecs/kr/qeuckrcodec.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp
index 1dc7731..9b1e96d 100644
--- a/src/plugins/codecs/tw/main.cpp
+++ b/src/plugins/codecs/tw/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp
index a145857..eafee0e 100644
--- a/src/plugins/codecs/tw/qbig5codec.cpp
+++ b/src/plugins/codecs/tw/qbig5codec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h
index 2401bad..3c628b6 100644
--- a/src/plugins/codecs/tw/qbig5codec.h
+++ b/src/plugins/codecs/tw/qbig5codec.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/decorations/default/main.cpp b/src/plugins/decorations/default/main.cpp
index 4acde59..c0c895d 100644
--- a/src/plugins/decorations/default/main.cpp
+++ b/src/plugins/decorations/default/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/decorations/styled/main.cpp b/src/plugins/decorations/styled/main.cpp
index 4d7a49f..5f4571e 100644
--- a/src/plugins/decorations/styled/main.cpp
+++ b/src/plugins/decorations/styled/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/decorations/windows/main.cpp b/src/plugins/decorations/windows/main.cpp
index 306ddf4..00d7b6e 100644
--- a/src/plugins/decorations/windows/main.cpp
+++ b/src/plugins/decorations/windows/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp
index 9afdc8e..133ff44 100644
--- a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp
+++ b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h
index 537ac3e..289d81c3 100644
--- a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h
+++ b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp b/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp
index c27419a..c71dc0f 100644
--- a/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp
+++ b/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
index 927a39b..8593000 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
index be42fbf..fb1d7d7 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
index 88f6b7c..b23923c 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
index d2a9fa9..701f37c 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
index 31108dc..75fb7b2 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
index e3acca5..c3a3224c 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index 4869eba..8d56d5f 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
index 19e8b84..b6273dd 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index c0d96d7..409a426 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
index 343b26e..a6a8dc0 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index bf6164d..5dad8bb 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
index c483020..3d0f494 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp
index 4396383..d513759 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index 51969fc..7fc5003 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
index 4370a8f..e595049 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/linuxfb/main.cpp b/src/plugins/gfxdrivers/linuxfb/main.cpp
index 921cee3..6a80f18 100644
--- a/src/plugins/gfxdrivers/linuxfb/main.cpp
+++ b/src/plugins/gfxdrivers/linuxfb/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c
index d05dd5d..396dfb5 100644
--- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c
+++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h
index f3a2bfb..dc924bf 100644
--- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h
+++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h
index 236261c..5b7ccd3 100644
--- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h
+++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
index 32a2e92..7754ac4 100644
--- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
+++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp
index 9de2a34..74110ef 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h
index 332cddf..4c65ece 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp
index c02348e..cd414bd 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp
index 9a707ac..794a76e 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h
index 7ff0b2f..4207a12 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/qvfb/main.cpp b/src/plugins/gfxdrivers/qvfb/main.cpp
index d6d9a0d..98cbd38 100644
--- a/src/plugins/gfxdrivers/qvfb/main.cpp
+++ b/src/plugins/gfxdrivers/qvfb/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/transformed/main.cpp b/src/plugins/gfxdrivers/transformed/main.cpp
index e621ca1..046ae9a 100644
--- a/src/plugins/gfxdrivers/transformed/main.cpp
+++ b/src/plugins/gfxdrivers/transformed/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/vnc/main.cpp b/src/plugins/gfxdrivers/vnc/main.cpp
index dce1bd2..57b8f77 100644
--- a/src/plugins/gfxdrivers/vnc/main.cpp
+++ b/src/plugins/gfxdrivers/vnc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h b/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h
index 3364ff0..bf24afe 100644
--- a/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h
+++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
index 3bafd97..53739b0 100644
--- a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
+++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h
index 312d590..d7ee34e 100644
--- a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h
+++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
index e7f6439..c99a4b2 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.h b/src/plugins/graphicssystems/meego/qmeegoextensions.h
index ee20bd8..26be8c1 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.h
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 2a64d49..27a0362 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.h b/src/plugins/graphicssystems/meego/qmeegographicssystem.h
index 905f0c3..8bc1d23 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.h
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.cpp
index 7c142eb..1d171ca 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.h b/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.h
index 336458f..7fda9e3 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.h
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystemplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
index 33611dc..b4bee56 100644
--- a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/meego/qmeegopixmapdata.h b/src/plugins/graphicssystems/meego/qmeegopixmapdata.h
index 8af33bd..33af49d 100644
--- a/src/plugins/graphicssystems/meego/qmeegopixmapdata.h
+++ b/src/plugins/graphicssystems/meego/qmeegopixmapdata.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/opengl/main.cpp b/src/plugins/graphicssystems/opengl/main.cpp
index 4c740ca..458fd67 100644
--- a/src/plugins/graphicssystems/opengl/main.cpp
+++ b/src/plugins/graphicssystems/opengl/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/openvg/main.cpp b/src/plugins/graphicssystems/openvg/main.cpp
index f9ab914..a05b2b1 100644
--- a/src/plugins/graphicssystems/openvg/main.cpp
+++ b/src/plugins/graphicssystems/openvg/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
index 2c7c0b7..b538549 100644
--- a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
+++ b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h
index 09b33cc..2b8b630 100644
--- a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h
+++ b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/shivavg/main.cpp b/src/plugins/graphicssystems/shivavg/main.cpp
index d954d3b..b1cf440 100644
--- a/src/plugins/graphicssystems/shivavg/main.cpp
+++ b/src/plugins/graphicssystems/shivavg/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp b/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp
index e2abb60..a0443d6 100644
--- a/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp
+++ b/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h b/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h
index 183b30f..6b235ad 100644
--- a/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h
+++ b/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp b/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp
index 8929760..be1fc4e 100644
--- a/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp
+++ b/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h b/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h
index d21af25..33d3f80 100644
--- a/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h
+++ b/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/trace/main.cpp b/src/plugins/graphicssystems/trace/main.cpp
index 5b01bc1..779bd21 100644
--- a/src/plugins/graphicssystems/trace/main.cpp
+++ b/src/plugins/graphicssystems/trace/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp b/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp
index 6bf9d6b..c298fca 100644
--- a/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp
+++ b/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h b/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h
index 34802e3..1407266 100644
--- a/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h
+++ b/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp
index b363c2c..dd1d0da 100644
--- a/src/plugins/iconengines/svgiconengine/main.cpp
+++ b/src/plugins/iconengines/svgiconengine/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index 5b59e41..57b7cc9 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
index 5e98f06..4c38aaa 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/gif/main.cpp b/src/plugins/imageformats/gif/main.cpp
index 99a9528..5c6c6fe 100644
--- a/src/plugins/imageformats/gif/main.cpp
+++ b/src/plugins/imageformats/gif/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/ico/main.cpp b/src/plugins/imageformats/ico/main.cpp
index 3c3a636..00d7ca6 100644
--- a/src/plugins/imageformats/ico/main.cpp
+++ b/src/plugins/imageformats/ico/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index 032ff85..c8fd050 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/ico/qicohandler.h b/src/plugins/imageformats/ico/qicohandler.h
index 4334ad9..78117ce 100644
--- a/src/plugins/imageformats/ico/qicohandler.h
+++ b/src/plugins/imageformats/ico/qicohandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/jpeg/main.cpp b/src/plugins/imageformats/jpeg/main.cpp
index 8eb3f03..150ea41 100644
--- a/src/plugins/imageformats/jpeg/main.cpp
+++ b/src/plugins/imageformats/jpeg/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/mng/main.cpp b/src/plugins/imageformats/mng/main.cpp
index dd62ba5..692de3a 100644
--- a/src/plugins/imageformats/mng/main.cpp
+++ b/src/plugins/imageformats/mng/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp
index 329e9d4..c4b2db4 100644
--- a/src/plugins/imageformats/svg/main.cpp
+++ b/src/plugins/imageformats/svg/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp
index 7b8463d..6a70d4a 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.cpp
+++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h
index 2506d11..b140124 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.h
+++ b/src/plugins/imageformats/svg/qsvgiohandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/imageformats/tiff/main.cpp b/src/plugins/imageformats/tiff/main.cpp
index c022abe..9be9978 100644
--- a/src/plugins/imageformats/tiff/main.cpp
+++ b/src/plugins/imageformats/tiff/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
index 9050458..d297b98 100644
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
index 2870255..dd7e93f 100644
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
index ecc890a..06122d5 100644
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h
index 31f07bf..f400163 100644
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/kbddrivers/linuxinput/main.cpp b/src/plugins/kbddrivers/linuxinput/main.cpp
index db5167e..e6ac2ee 100644
--- a/src/plugins/kbddrivers/linuxinput/main.cpp
+++ b/src/plugins/kbddrivers/linuxinput/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/mousedrivers/linuxtp/main.cpp b/src/plugins/mousedrivers/linuxtp/main.cpp
index 8cb93b4..a839a86 100644
--- a/src/plugins/mousedrivers/linuxtp/main.cpp
+++ b/src/plugins/mousedrivers/linuxtp/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/mousedrivers/pc/main.cpp b/src/plugins/mousedrivers/pc/main.cpp
index 0a8d7ca..65dc928 100644
--- a/src/plugins/mousedrivers/pc/main.cpp
+++ b/src/plugins/mousedrivers/pc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/mousedrivers/tslib/main.cpp b/src/plugins/mousedrivers/tslib/main.cpp
index 0a4a0a3..44879d9 100644
--- a/src/plugins/mousedrivers/tslib/main.cpp
+++ b/src/plugins/mousedrivers/tslib/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/s60/src/qcoreapplication_3_1.cpp b/src/plugins/s60/src/qcoreapplication_3_1.cpp
index 111a8dc..29f7dd5 100644
--- a/src/plugins/s60/src/qcoreapplication_3_1.cpp
+++ b/src/plugins/s60/src/qcoreapplication_3_1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/s60/src/qcoreapplication_3_2.cpp b/src/plugins/s60/src/qcoreapplication_3_2.cpp
index a78ca81..e13c14e 100644
--- a/src/plugins/s60/src/qcoreapplication_3_2.cpp
+++ b/src/plugins/s60/src/qcoreapplication_3_2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/s60/src/qdesktopservices_3_1.cpp b/src/plugins/s60/src/qdesktopservices_3_1.cpp
index b476466..80353ff 100644
--- a/src/plugins/s60/src/qdesktopservices_3_1.cpp
+++ b/src/plugins/s60/src/qdesktopservices_3_1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/s60/src/qdesktopservices_3_2.cpp b/src/plugins/s60/src/qdesktopservices_3_2.cpp
index b4ca9a3..d8d4d90 100644
--- a/src/plugins/s60/src/qdesktopservices_3_2.cpp
+++ b/src/plugins/s60/src/qdesktopservices_3_2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/s60/src/qlocale_3_1.cpp b/src/plugins/s60/src/qlocale_3_1.cpp
index cb4cb44..e962148 100644
--- a/src/plugins/s60/src/qlocale_3_1.cpp
+++ b/src/plugins/s60/src/qlocale_3_1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/s60/src/qlocale_3_2.cpp b/src/plugins/s60/src/qlocale_3_2.cpp
index bc3eda3..96abe93 100644
--- a/src/plugins/s60/src/qlocale_3_2.cpp
+++ b/src/plugins/s60/src/qlocale_3_2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/script/qtdbus/main.cpp b/src/plugins/script/qtdbus/main.cpp
index 452f0e9..08351ee 100644
--- a/src/plugins/script/qtdbus/main.cpp
+++ b/src/plugins/script/qtdbus/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/script/qtdbus/main.h b/src/plugins/script/qtdbus/main.h
index bc2d8a3..ba7f9e1 100644
--- a/src/plugins/script/qtdbus/main.h
+++ b/src/plugins/script/qtdbus/main.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/db2/main.cpp b/src/plugins/sqldrivers/db2/main.cpp
index 70eb43c..d76e514 100644
--- a/src/plugins/sqldrivers/db2/main.cpp
+++ b/src/plugins/sqldrivers/db2/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/ibase/main.cpp b/src/plugins/sqldrivers/ibase/main.cpp
index 5554405..204628e 100644
--- a/src/plugins/sqldrivers/ibase/main.cpp
+++ b/src/plugins/sqldrivers/ibase/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp
index f0138ae..00d715b 100644
--- a/src/plugins/sqldrivers/mysql/main.cpp
+++ b/src/plugins/sqldrivers/mysql/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/oci/main.cpp b/src/plugins/sqldrivers/oci/main.cpp
index 3391b33..346d4f1 100644
--- a/src/plugins/sqldrivers/oci/main.cpp
+++ b/src/plugins/sqldrivers/oci/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/odbc/main.cpp b/src/plugins/sqldrivers/odbc/main.cpp
index b825950..24a5117 100644
--- a/src/plugins/sqldrivers/odbc/main.cpp
+++ b/src/plugins/sqldrivers/odbc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp
index 507fc35..4cae6e3 100644
--- a/src/plugins/sqldrivers/psql/main.cpp
+++ b/src/plugins/sqldrivers/psql/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/sqlite/smain.cpp b/src/plugins/sqldrivers/sqlite/smain.cpp
index 36b5c1d..4b51cb5 100644
--- a/src/plugins/sqldrivers/sqlite/smain.cpp
+++ b/src/plugins/sqldrivers/sqlite/smain.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/sqlite2/smain.cpp b/src/plugins/sqldrivers/sqlite2/smain.cpp
index d6d16cc..2aca037 100644
--- a/src/plugins/sqldrivers/sqlite2/smain.cpp
+++ b/src/plugins/sqldrivers/sqlite2/smain.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp
index 522a526..eb654ef 100644
--- a/src/plugins/sqldrivers/tds/main.cpp
+++ b/src/plugins/sqldrivers/tds/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/canvas/q3canvas.cpp b/src/qt3support/canvas/q3canvas.cpp
index 959c435..eaed1e0 100644
--- a/src/qt3support/canvas/q3canvas.cpp
+++ b/src/qt3support/canvas/q3canvas.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/canvas/q3canvas.h b/src/qt3support/canvas/q3canvas.h
index 906ce81..be820e3 100644
--- a/src/qt3support/canvas/q3canvas.h
+++ b/src/qt3support/canvas/q3canvas.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp
index 35f7890..aa97224 100644
--- a/src/qt3support/dialogs/q3filedialog.cpp
+++ b/src/qt3support/dialogs/q3filedialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3filedialog.h b/src/qt3support/dialogs/q3filedialog.h
index ac3907c..6515ef9 100644
--- a/src/qt3support/dialogs/q3filedialog.h
+++ b/src/qt3support/dialogs/q3filedialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3filedialog_mac.cpp b/src/qt3support/dialogs/q3filedialog_mac.cpp
index 7c1b843..022b475 100644
--- a/src/qt3support/dialogs/q3filedialog_mac.cpp
+++ b/src/qt3support/dialogs/q3filedialog_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3filedialog_win.cpp b/src/qt3support/dialogs/q3filedialog_win.cpp
index b0fc1a7..c7c7324 100644
--- a/src/qt3support/dialogs/q3filedialog_win.cpp
+++ b/src/qt3support/dialogs/q3filedialog_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3progressdialog.cpp b/src/qt3support/dialogs/q3progressdialog.cpp
index 9fbcac2..b19dc4b 100644
--- a/src/qt3support/dialogs/q3progressdialog.cpp
+++ b/src/qt3support/dialogs/q3progressdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3progressdialog.h b/src/qt3support/dialogs/q3progressdialog.h
index 848e803..1e68b47 100644
--- a/src/qt3support/dialogs/q3progressdialog.h
+++ b/src/qt3support/dialogs/q3progressdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3tabdialog.cpp b/src/qt3support/dialogs/q3tabdialog.cpp
index cc373e7..5f508c4 100644
--- a/src/qt3support/dialogs/q3tabdialog.cpp
+++ b/src/qt3support/dialogs/q3tabdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3tabdialog.h b/src/qt3support/dialogs/q3tabdialog.h
index 2747f4f..ec3011c 100644
--- a/src/qt3support/dialogs/q3tabdialog.h
+++ b/src/qt3support/dialogs/q3tabdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3wizard.cpp b/src/qt3support/dialogs/q3wizard.cpp
index 5e569d8..f6a2bf9 100644
--- a/src/qt3support/dialogs/q3wizard.cpp
+++ b/src/qt3support/dialogs/q3wizard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/dialogs/q3wizard.h b/src/qt3support/dialogs/q3wizard.h
index 22506a3..134777c 100644
--- a/src/qt3support/dialogs/q3wizard.h
+++ b/src/qt3support/dialogs/q3wizard.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3iconview.cpp b/src/qt3support/itemviews/q3iconview.cpp
index 683e3d6..5f0af86 100644
--- a/src/qt3support/itemviews/q3iconview.cpp
+++ b/src/qt3support/itemviews/q3iconview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3iconview.h b/src/qt3support/itemviews/q3iconview.h
index c83f477..0239d96 100644
--- a/src/qt3support/itemviews/q3iconview.h
+++ b/src/qt3support/itemviews/q3iconview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3listbox.cpp b/src/qt3support/itemviews/q3listbox.cpp
index 21473c9..2528ef0 100644
--- a/src/qt3support/itemviews/q3listbox.cpp
+++ b/src/qt3support/itemviews/q3listbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3listbox.h b/src/qt3support/itemviews/q3listbox.h
index 9a36796..0378c21 100644
--- a/src/qt3support/itemviews/q3listbox.h
+++ b/src/qt3support/itemviews/q3listbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3listview.cpp b/src/qt3support/itemviews/q3listview.cpp
index 4900827..b183e4f 100644
--- a/src/qt3support/itemviews/q3listview.cpp
+++ b/src/qt3support/itemviews/q3listview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3listview.h b/src/qt3support/itemviews/q3listview.h
index faf2ced..3e1070e 100644
--- a/src/qt3support/itemviews/q3listview.h
+++ b/src/qt3support/itemviews/q3listview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3table.cpp b/src/qt3support/itemviews/q3table.cpp
index 7a1417c..43e8443 100644
--- a/src/qt3support/itemviews/q3table.cpp
+++ b/src/qt3support/itemviews/q3table.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/itemviews/q3table.h b/src/qt3support/itemviews/q3table.h
index 43b67ef..70520b7 100644
--- a/src/qt3support/itemviews/q3table.h
+++ b/src/qt3support/itemviews/q3table.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
index e0e9909..5d992b8 100644
--- a/src/qt3support/network/q3dns.cpp
+++ b/src/qt3support/network/q3dns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3dns.h b/src/qt3support/network/q3dns.h
index 46dabf8..c90cf0a 100644
--- a/src/qt3support/network/q3dns.h
+++ b/src/qt3support/network/q3dns.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3ftp.cpp b/src/qt3support/network/q3ftp.cpp
index 3fe3e9a..284e0ee 100644
--- a/src/qt3support/network/q3ftp.cpp
+++ b/src/qt3support/network/q3ftp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3ftp.h b/src/qt3support/network/q3ftp.h
index 4e7bfe7..a79ae10 100644
--- a/src/qt3support/network/q3ftp.h
+++ b/src/qt3support/network/q3ftp.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp
index 4987961..f9c8994 100644
--- a/src/qt3support/network/q3http.cpp
+++ b/src/qt3support/network/q3http.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3http.h b/src/qt3support/network/q3http.h
index b67617d..77e971e 100644
--- a/src/qt3support/network/q3http.h
+++ b/src/qt3support/network/q3http.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3localfs.cpp b/src/qt3support/network/q3localfs.cpp
index e76c4d3..6523bcc 100644
--- a/src/qt3support/network/q3localfs.cpp
+++ b/src/qt3support/network/q3localfs.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3localfs.h b/src/qt3support/network/q3localfs.h
index 2dc6f11..f9036a1 100644
--- a/src/qt3support/network/q3localfs.h
+++ b/src/qt3support/network/q3localfs.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3network.cpp b/src/qt3support/network/q3network.cpp
index 369b3d2..81fb7ad 100644
--- a/src/qt3support/network/q3network.cpp
+++ b/src/qt3support/network/q3network.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3network.h b/src/qt3support/network/q3network.h
index 22a37c8..052bf24 100644
--- a/src/qt3support/network/q3network.h
+++ b/src/qt3support/network/q3network.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3networkprotocol.cpp b/src/qt3support/network/q3networkprotocol.cpp
index b7728f5..8345b75 100644
--- a/src/qt3support/network/q3networkprotocol.cpp
+++ b/src/qt3support/network/q3networkprotocol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3networkprotocol.h b/src/qt3support/network/q3networkprotocol.h
index 48e00c0..c02f1e9 100644
--- a/src/qt3support/network/q3networkprotocol.h
+++ b/src/qt3support/network/q3networkprotocol.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3serversocket.cpp b/src/qt3support/network/q3serversocket.cpp
index c3ef841..90a4385 100644
--- a/src/qt3support/network/q3serversocket.cpp
+++ b/src/qt3support/network/q3serversocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3serversocket.h b/src/qt3support/network/q3serversocket.h
index 84baf1f..c65299c 100644
--- a/src/qt3support/network/q3serversocket.h
+++ b/src/qt3support/network/q3serversocket.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3socket.cpp b/src/qt3support/network/q3socket.cpp
index 2d64181..9ff21d6 100644
--- a/src/qt3support/network/q3socket.cpp
+++ b/src/qt3support/network/q3socket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3socket.h b/src/qt3support/network/q3socket.h
index e2ab96d..3354f34 100644
--- a/src/qt3support/network/q3socket.h
+++ b/src/qt3support/network/q3socket.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice.cpp b/src/qt3support/network/q3socketdevice.cpp
index 55b7025..7cf1ff2 100644
--- a/src/qt3support/network/q3socketdevice.cpp
+++ b/src/qt3support/network/q3socketdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice.h b/src/qt3support/network/q3socketdevice.h
index 2ee9351..9d0a9c0 100644
--- a/src/qt3support/network/q3socketdevice.h
+++ b/src/qt3support/network/q3socketdevice.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice_unix.cpp b/src/qt3support/network/q3socketdevice_unix.cpp
index d19295f..8849271 100644
--- a/src/qt3support/network/q3socketdevice_unix.cpp
+++ b/src/qt3support/network/q3socketdevice_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp
index 1354cfa..d8f5553 100644
--- a/src/qt3support/network/q3socketdevice_win.cpp
+++ b/src/qt3support/network/q3socketdevice_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3url.cpp b/src/qt3support/network/q3url.cpp
index 565be9c..da260fb 100644
--- a/src/qt3support/network/q3url.cpp
+++ b/src/qt3support/network/q3url.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3url.h b/src/qt3support/network/q3url.h
index 56f5842..5fd6dae 100644
--- a/src/qt3support/network/q3url.h
+++ b/src/qt3support/network/q3url.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3urloperator.cpp b/src/qt3support/network/q3urloperator.cpp
index d753b4d..a2711d9 100644
--- a/src/qt3support/network/q3urloperator.cpp
+++ b/src/qt3support/network/q3urloperator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/network/q3urloperator.h b/src/qt3support/network/q3urloperator.h
index dd92a31..f108f75 100644
--- a/src/qt3support/network/q3urloperator.h
+++ b/src/qt3support/network/q3urloperator.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3accel.cpp b/src/qt3support/other/q3accel.cpp
index 6b07990..6cf6c04 100644
--- a/src/qt3support/other/q3accel.cpp
+++ b/src/qt3support/other/q3accel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3accel.h b/src/qt3support/other/q3accel.h
index 6f03710..01f8165 100644
--- a/src/qt3support/other/q3accel.h
+++ b/src/qt3support/other/q3accel.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3boxlayout.cpp b/src/qt3support/other/q3boxlayout.cpp
index e5e5773..42d5418 100644
--- a/src/qt3support/other/q3boxlayout.cpp
+++ b/src/qt3support/other/q3boxlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3boxlayout.h b/src/qt3support/other/q3boxlayout.h
index 6a201fb..f901406 100644
--- a/src/qt3support/other/q3boxlayout.h
+++ b/src/qt3support/other/q3boxlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3dragobject.cpp b/src/qt3support/other/q3dragobject.cpp
index 2341c3a..35ad4fe6f 100644
--- a/src/qt3support/other/q3dragobject.cpp
+++ b/src/qt3support/other/q3dragobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3dragobject.h b/src/qt3support/other/q3dragobject.h
index 6550803..0cc6dac 100644
--- a/src/qt3support/other/q3dragobject.h
+++ b/src/qt3support/other/q3dragobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3dropsite.cpp b/src/qt3support/other/q3dropsite.cpp
index 4ed017b..426397a 100644
--- a/src/qt3support/other/q3dropsite.cpp
+++ b/src/qt3support/other/q3dropsite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3dropsite.h b/src/qt3support/other/q3dropsite.h
index fd3e8ad..cea597a 100644
--- a/src/qt3support/other/q3dropsite.h
+++ b/src/qt3support/other/q3dropsite.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3gridlayout.h b/src/qt3support/other/q3gridlayout.h
index 0f5739c..1ebb2bf 100644
--- a/src/qt3support/other/q3gridlayout.h
+++ b/src/qt3support/other/q3gridlayout.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3membuf.cpp b/src/qt3support/other/q3membuf.cpp
index 5d76851..49e6460 100644
--- a/src/qt3support/other/q3membuf.cpp
+++ b/src/qt3support/other/q3membuf.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3membuf_p.h b/src/qt3support/other/q3membuf_p.h
index 07a3829..a086e43 100644
--- a/src/qt3support/other/q3membuf_p.h
+++ b/src/qt3support/other/q3membuf_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3mimefactory.cpp b/src/qt3support/other/q3mimefactory.cpp
index c1d8087..35169c7 100644
--- a/src/qt3support/other/q3mimefactory.cpp
+++ b/src/qt3support/other/q3mimefactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3mimefactory.h b/src/qt3support/other/q3mimefactory.h
index 1d95721..1db02f2 100644
--- a/src/qt3support/other/q3mimefactory.h
+++ b/src/qt3support/other/q3mimefactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3polygonscanner.cpp b/src/qt3support/other/q3polygonscanner.cpp
index 38ecdbd..63d67dd 100644
--- a/src/qt3support/other/q3polygonscanner.cpp
+++ b/src/qt3support/other/q3polygonscanner.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3polygonscanner.h b/src/qt3support/other/q3polygonscanner.h
index f9cffe1..6293fad 100644
--- a/src/qt3support/other/q3polygonscanner.h
+++ b/src/qt3support/other/q3polygonscanner.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3process.cpp b/src/qt3support/other/q3process.cpp
index bd1ce95..ff2e0c2 100644
--- a/src/qt3support/other/q3process.cpp
+++ b/src/qt3support/other/q3process.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3process.h b/src/qt3support/other/q3process.h
index 235fc02..cb35343 100644
--- a/src/qt3support/other/q3process.h
+++ b/src/qt3support/other/q3process.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3process_unix.cpp b/src/qt3support/other/q3process_unix.cpp
index 2c5dd57..a37b523 100644
--- a/src/qt3support/other/q3process_unix.cpp
+++ b/src/qt3support/other/q3process_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/q3process_win.cpp b/src/qt3support/other/q3process_win.cpp
index 9b69520..edb69e8 100644
--- a/src/qt3support/other/q3process_win.cpp
+++ b/src/qt3support/other/q3process_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/qiconset.h b/src/qt3support/other/qiconset.h
index e6eeefe..cfb226e 100644
--- a/src/qt3support/other/qiconset.h
+++ b/src/qt3support/other/qiconset.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/other/qt_compat_pch.h b/src/qt3support/other/qt_compat_pch.h
index 192db6a..053ed57 100644
--- a/src/qt3support/other/qt_compat_pch.h
+++ b/src/qt3support/other/qt_compat_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3paintdevicemetrics.cpp b/src/qt3support/painting/q3paintdevicemetrics.cpp
index 17eee41..c71b956 100644
--- a/src/qt3support/painting/q3paintdevicemetrics.cpp
+++ b/src/qt3support/painting/q3paintdevicemetrics.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3paintdevicemetrics.h b/src/qt3support/painting/q3paintdevicemetrics.h
index b01e39d..f98ff8d 100644
--- a/src/qt3support/painting/q3paintdevicemetrics.h
+++ b/src/qt3support/painting/q3paintdevicemetrics.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3paintengine_svg.cpp b/src/qt3support/painting/q3paintengine_svg.cpp
index 5f0ee1c..d845395 100644
--- a/src/qt3support/painting/q3paintengine_svg.cpp
+++ b/src/qt3support/painting/q3paintengine_svg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3paintengine_svg_p.h b/src/qt3support/painting/q3paintengine_svg_p.h
index 7353fb0..4940f27 100644
--- a/src/qt3support/painting/q3paintengine_svg_p.h
+++ b/src/qt3support/painting/q3paintengine_svg_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3painter.cpp b/src/qt3support/painting/q3painter.cpp
index 22a13f3..e4f4562 100644
--- a/src/qt3support/painting/q3painter.cpp
+++ b/src/qt3support/painting/q3painter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3painter.h b/src/qt3support/painting/q3painter.h
index d12011c..d25a634 100644
--- a/src/qt3support/painting/q3painter.h
+++ b/src/qt3support/painting/q3painter.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3picture.cpp b/src/qt3support/painting/q3picture.cpp
index 464d1c8..6d7071d 100644
--- a/src/qt3support/painting/q3picture.cpp
+++ b/src/qt3support/painting/q3picture.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3picture.h b/src/qt3support/painting/q3picture.h
index c28782a..8cda1de 100644
--- a/src/qt3support/painting/q3picture.h
+++ b/src/qt3support/painting/q3picture.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3pointarray.cpp b/src/qt3support/painting/q3pointarray.cpp
index 4fe89d3..9eaec63 100644
--- a/src/qt3support/painting/q3pointarray.cpp
+++ b/src/qt3support/painting/q3pointarray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/painting/q3pointarray.h b/src/qt3support/painting/q3pointarray.h
index 51cba78..409c84b 100644
--- a/src/qt3support/painting/q3pointarray.h
+++ b/src/qt3support/painting/q3pointarray.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3databrowser.cpp b/src/qt3support/sql/q3databrowser.cpp
index a7e24cb..88fd230 100644
--- a/src/qt3support/sql/q3databrowser.cpp
+++ b/src/qt3support/sql/q3databrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3databrowser.h b/src/qt3support/sql/q3databrowser.h
index 092ff93..a532adb 100644
--- a/src/qt3support/sql/q3databrowser.h
+++ b/src/qt3support/sql/q3databrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3datatable.cpp b/src/qt3support/sql/q3datatable.cpp
index 806ddd3..72cb487 100644
--- a/src/qt3support/sql/q3datatable.cpp
+++ b/src/qt3support/sql/q3datatable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3datatable.h b/src/qt3support/sql/q3datatable.h
index 9d25cfc..68d0ec1 100644
--- a/src/qt3support/sql/q3datatable.h
+++ b/src/qt3support/sql/q3datatable.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3dataview.cpp b/src/qt3support/sql/q3dataview.cpp
index 2d43d27..83f6a4b 100644
--- a/src/qt3support/sql/q3dataview.cpp
+++ b/src/qt3support/sql/q3dataview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3dataview.h b/src/qt3support/sql/q3dataview.h
index 067db7a..17ea2a1 100644
--- a/src/qt3support/sql/q3dataview.h
+++ b/src/qt3support/sql/q3dataview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3editorfactory.cpp b/src/qt3support/sql/q3editorfactory.cpp
index 9ea77bd..005147d 100644
--- a/src/qt3support/sql/q3editorfactory.cpp
+++ b/src/qt3support/sql/q3editorfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3editorfactory.h b/src/qt3support/sql/q3editorfactory.h
index 1507998..930a3f5 100644
--- a/src/qt3support/sql/q3editorfactory.h
+++ b/src/qt3support/sql/q3editorfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlcursor.cpp b/src/qt3support/sql/q3sqlcursor.cpp
index e8d838a..f0196ba 100644
--- a/src/qt3support/sql/q3sqlcursor.cpp
+++ b/src/qt3support/sql/q3sqlcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlcursor.h b/src/qt3support/sql/q3sqlcursor.h
index 0fbbf0f..03a7fc1 100644
--- a/src/qt3support/sql/q3sqlcursor.h
+++ b/src/qt3support/sql/q3sqlcursor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqleditorfactory.cpp b/src/qt3support/sql/q3sqleditorfactory.cpp
index 747b60c..702567c 100644
--- a/src/qt3support/sql/q3sqleditorfactory.cpp
+++ b/src/qt3support/sql/q3sqleditorfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqleditorfactory.h b/src/qt3support/sql/q3sqleditorfactory.h
index 233c23f..ef402dc 100644
--- a/src/qt3support/sql/q3sqleditorfactory.h
+++ b/src/qt3support/sql/q3sqleditorfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlfieldinfo.h b/src/qt3support/sql/q3sqlfieldinfo.h
index b55ff85..d0bdb6b 100644
--- a/src/qt3support/sql/q3sqlfieldinfo.h
+++ b/src/qt3support/sql/q3sqlfieldinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlform.cpp b/src/qt3support/sql/q3sqlform.cpp
index 5610ab0..9ed97f7 100644
--- a/src/qt3support/sql/q3sqlform.cpp
+++ b/src/qt3support/sql/q3sqlform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlform.h b/src/qt3support/sql/q3sqlform.h
index d0aff6a..dc3ba58 100644
--- a/src/qt3support/sql/q3sqlform.h
+++ b/src/qt3support/sql/q3sqlform.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlmanager_p.cpp b/src/qt3support/sql/q3sqlmanager_p.cpp
index b491891..6312c00 100644
--- a/src/qt3support/sql/q3sqlmanager_p.cpp
+++ b/src/qt3support/sql/q3sqlmanager_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlmanager_p.h b/src/qt3support/sql/q3sqlmanager_p.h
index 6a69ca6..2dfa2ff 100644
--- a/src/qt3support/sql/q3sqlmanager_p.h
+++ b/src/qt3support/sql/q3sqlmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlpropertymap.cpp b/src/qt3support/sql/q3sqlpropertymap.cpp
index 14ac2c2..74bd9f8 100644
--- a/src/qt3support/sql/q3sqlpropertymap.cpp
+++ b/src/qt3support/sql/q3sqlpropertymap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlpropertymap.h b/src/qt3support/sql/q3sqlpropertymap.h
index 04d79eb..96b5aea 100644
--- a/src/qt3support/sql/q3sqlpropertymap.h
+++ b/src/qt3support/sql/q3sqlpropertymap.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlrecordinfo.h b/src/qt3support/sql/q3sqlrecordinfo.h
index 9255f40..5c42201 100644
--- a/src/qt3support/sql/q3sqlrecordinfo.h
+++ b/src/qt3support/sql/q3sqlrecordinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlselectcursor.cpp b/src/qt3support/sql/q3sqlselectcursor.cpp
index 85ec032..8f69c28 100644
--- a/src/qt3support/sql/q3sqlselectcursor.cpp
+++ b/src/qt3support/sql/q3sqlselectcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/sql/q3sqlselectcursor.h b/src/qt3support/sql/q3sqlselectcursor.h
index c9010fa..8165a7e 100644
--- a/src/qt3support/sql/q3sqlselectcursor.h
+++ b/src/qt3support/sql/q3sqlselectcursor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3multilineedit.cpp b/src/qt3support/text/q3multilineedit.cpp
index 4a1da9f..1c864c9 100644
--- a/src/qt3support/text/q3multilineedit.cpp
+++ b/src/qt3support/text/q3multilineedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3multilineedit.h b/src/qt3support/text/q3multilineedit.h
index 2fca362..5d9db44 100644
--- a/src/qt3support/text/q3multilineedit.h
+++ b/src/qt3support/text/q3multilineedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp
index 8614076..5c04b24 100644
--- a/src/qt3support/text/q3richtext.cpp
+++ b/src/qt3support/text/q3richtext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3richtext_p.cpp b/src/qt3support/text/q3richtext_p.cpp
index 57d858c..9247e72 100644
--- a/src/qt3support/text/q3richtext_p.cpp
+++ b/src/qt3support/text/q3richtext_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3richtext_p.h b/src/qt3support/text/q3richtext_p.h
index 98c67de..7f0a4d4 100644
--- a/src/qt3support/text/q3richtext_p.h
+++ b/src/qt3support/text/q3richtext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3simplerichtext.cpp b/src/qt3support/text/q3simplerichtext.cpp
index da56763..f570c61 100644
--- a/src/qt3support/text/q3simplerichtext.cpp
+++ b/src/qt3support/text/q3simplerichtext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3simplerichtext.h b/src/qt3support/text/q3simplerichtext.h
index bd1ebdc..4074085 100644
--- a/src/qt3support/text/q3simplerichtext.h
+++ b/src/qt3support/text/q3simplerichtext.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3stylesheet.cpp b/src/qt3support/text/q3stylesheet.cpp
index 8ee7d39..b0a64e9 100644
--- a/src/qt3support/text/q3stylesheet.cpp
+++ b/src/qt3support/text/q3stylesheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3stylesheet.h b/src/qt3support/text/q3stylesheet.h
index e33ca8b..dbbf03b 100644
--- a/src/qt3support/text/q3stylesheet.h
+++ b/src/qt3support/text/q3stylesheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3syntaxhighlighter.cpp b/src/qt3support/text/q3syntaxhighlighter.cpp
index 905fa9b..4f43912 100644
--- a/src/qt3support/text/q3syntaxhighlighter.cpp
+++ b/src/qt3support/text/q3syntaxhighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3syntaxhighlighter.h b/src/qt3support/text/q3syntaxhighlighter.h
index 5b45cb9..2cf5a0a 100644
--- a/src/qt3support/text/q3syntaxhighlighter.h
+++ b/src/qt3support/text/q3syntaxhighlighter.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3syntaxhighlighter_p.h b/src/qt3support/text/q3syntaxhighlighter_p.h
index d501437..a813cc9 100644
--- a/src/qt3support/text/q3syntaxhighlighter_p.h
+++ b/src/qt3support/text/q3syntaxhighlighter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textbrowser.cpp b/src/qt3support/text/q3textbrowser.cpp
index 05d44c7..262c30e 100644
--- a/src/qt3support/text/q3textbrowser.cpp
+++ b/src/qt3support/text/q3textbrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textbrowser.h b/src/qt3support/text/q3textbrowser.h
index 7988f43..d6c015d 100644
--- a/src/qt3support/text/q3textbrowser.h
+++ b/src/qt3support/text/q3textbrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textedit.cpp b/src/qt3support/text/q3textedit.cpp
index d4f75ed..1c5f826 100644
--- a/src/qt3support/text/q3textedit.cpp
+++ b/src/qt3support/text/q3textedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textedit.h b/src/qt3support/text/q3textedit.h
index 47f6265..2f1cc4c 100644
--- a/src/qt3support/text/q3textedit.h
+++ b/src/qt3support/text/q3textedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textstream.cpp b/src/qt3support/text/q3textstream.cpp
index 8c86c7c..0476533 100644
--- a/src/qt3support/text/q3textstream.cpp
+++ b/src/qt3support/text/q3textstream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textstream.h b/src/qt3support/text/q3textstream.h
index d0c4f48..6e83559 100644
--- a/src/qt3support/text/q3textstream.h
+++ b/src/qt3support/text/q3textstream.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textview.cpp b/src/qt3support/text/q3textview.cpp
index ce99571..9712ff4 100644
--- a/src/qt3support/text/q3textview.cpp
+++ b/src/qt3support/text/q3textview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/text/q3textview.h b/src/qt3support/text/q3textview.h
index f57dce1..5edd0d2 100644
--- a/src/qt3support/text/q3textview.h
+++ b/src/qt3support/text/q3textview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3asciicache.h b/src/qt3support/tools/q3asciicache.h
index 44a64ef..873e63e 100644
--- a/src/qt3support/tools/q3asciicache.h
+++ b/src/qt3support/tools/q3asciicache.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3asciidict.h b/src/qt3support/tools/q3asciidict.h
index 3a7c925..6bbf388 100644
--- a/src/qt3support/tools/q3asciidict.h
+++ b/src/qt3support/tools/q3asciidict.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3cache.h b/src/qt3support/tools/q3cache.h
index 491b16e..8a227b7 100644
--- a/src/qt3support/tools/q3cache.h
+++ b/src/qt3support/tools/q3cache.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3cleanuphandler.h b/src/qt3support/tools/q3cleanuphandler.h
index e470c9e..921b27f 100644
--- a/src/qt3support/tools/q3cleanuphandler.h
+++ b/src/qt3support/tools/q3cleanuphandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3cstring.cpp b/src/qt3support/tools/q3cstring.cpp
index 31cf48e..6bd8f65 100644
--- a/src/qt3support/tools/q3cstring.cpp
+++ b/src/qt3support/tools/q3cstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3cstring.h b/src/qt3support/tools/q3cstring.h
index b280ebc..604dc9a 100644
--- a/src/qt3support/tools/q3cstring.h
+++ b/src/qt3support/tools/q3cstring.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3deepcopy.cpp b/src/qt3support/tools/q3deepcopy.cpp
index 6b41f08..b562a72 100644
--- a/src/qt3support/tools/q3deepcopy.cpp
+++ b/src/qt3support/tools/q3deepcopy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3deepcopy.h b/src/qt3support/tools/q3deepcopy.h
index 136a507..6df4342 100644
--- a/src/qt3support/tools/q3deepcopy.h
+++ b/src/qt3support/tools/q3deepcopy.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3dict.h b/src/qt3support/tools/q3dict.h
index ce0062a..d18ddf9 100644
--- a/src/qt3support/tools/q3dict.h
+++ b/src/qt3support/tools/q3dict.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3garray.cpp b/src/qt3support/tools/q3garray.cpp
index 83deee0..f4261c4 100644
--- a/src/qt3support/tools/q3garray.cpp
+++ b/src/qt3support/tools/q3garray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3garray.h b/src/qt3support/tools/q3garray.h
index 7160a70..761d812 100644
--- a/src/qt3support/tools/q3garray.h
+++ b/src/qt3support/tools/q3garray.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3gcache.cpp b/src/qt3support/tools/q3gcache.cpp
index ada8330..c29b3f7 100644
--- a/src/qt3support/tools/q3gcache.cpp
+++ b/src/qt3support/tools/q3gcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3gcache.h b/src/qt3support/tools/q3gcache.h
index 36b6f7f..f3756a0 100644
--- a/src/qt3support/tools/q3gcache.h
+++ b/src/qt3support/tools/q3gcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3gdict.cpp b/src/qt3support/tools/q3gdict.cpp
index e8144fe..46299d6 100644
--- a/src/qt3support/tools/q3gdict.cpp
+++ b/src/qt3support/tools/q3gdict.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3gdict.h b/src/qt3support/tools/q3gdict.h
index 95d9ed9..43485a6 100644
--- a/src/qt3support/tools/q3gdict.h
+++ b/src/qt3support/tools/q3gdict.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3glist.cpp b/src/qt3support/tools/q3glist.cpp
index 51e7699..cef4927 100644
--- a/src/qt3support/tools/q3glist.cpp
+++ b/src/qt3support/tools/q3glist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3glist.h b/src/qt3support/tools/q3glist.h
index a85bd69..d33e0a0 100644
--- a/src/qt3support/tools/q3glist.h
+++ b/src/qt3support/tools/q3glist.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3gvector.cpp b/src/qt3support/tools/q3gvector.cpp
index 1554604..a31effe 100644
--- a/src/qt3support/tools/q3gvector.cpp
+++ b/src/qt3support/tools/q3gvector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3gvector.h b/src/qt3support/tools/q3gvector.h
index 46e4995..9e39eec 100644
--- a/src/qt3support/tools/q3gvector.h
+++ b/src/qt3support/tools/q3gvector.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3intcache.h b/src/qt3support/tools/q3intcache.h
index dce145c..5a851db 100644
--- a/src/qt3support/tools/q3intcache.h
+++ b/src/qt3support/tools/q3intcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3intdict.h b/src/qt3support/tools/q3intdict.h
index 0ba14c2..afd94a7 100644
--- a/src/qt3support/tools/q3intdict.h
+++ b/src/qt3support/tools/q3intdict.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3memarray.h b/src/qt3support/tools/q3memarray.h
index 135dfd8..12f8cb5 100644
--- a/src/qt3support/tools/q3memarray.h
+++ b/src/qt3support/tools/q3memarray.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3objectdict.h b/src/qt3support/tools/q3objectdict.h
index b0c02c3..4b5bdca 100644
--- a/src/qt3support/tools/q3objectdict.h
+++ b/src/qt3support/tools/q3objectdict.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3ptrcollection.cpp b/src/qt3support/tools/q3ptrcollection.cpp
index 4a981f6..dfc45ec 100644
--- a/src/qt3support/tools/q3ptrcollection.cpp
+++ b/src/qt3support/tools/q3ptrcollection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3ptrcollection.h b/src/qt3support/tools/q3ptrcollection.h
index 8b42ed3..0eca656 100644
--- a/src/qt3support/tools/q3ptrcollection.h
+++ b/src/qt3support/tools/q3ptrcollection.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3ptrdict.h b/src/qt3support/tools/q3ptrdict.h
index 7df6e78..c7d876f 100644
--- a/src/qt3support/tools/q3ptrdict.h
+++ b/src/qt3support/tools/q3ptrdict.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3ptrlist.h b/src/qt3support/tools/q3ptrlist.h
index 40331e6..7cffe35 100644
--- a/src/qt3support/tools/q3ptrlist.h
+++ b/src/qt3support/tools/q3ptrlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3ptrqueue.h b/src/qt3support/tools/q3ptrqueue.h
index c60b0a9..0f596c8 100644
--- a/src/qt3support/tools/q3ptrqueue.h
+++ b/src/qt3support/tools/q3ptrqueue.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3ptrstack.h b/src/qt3support/tools/q3ptrstack.h
index b55506f..9a3091a 100644
--- a/src/qt3support/tools/q3ptrstack.h
+++ b/src/qt3support/tools/q3ptrstack.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3ptrvector.h b/src/qt3support/tools/q3ptrvector.h
index 53275e9..196fbf8 100644
--- a/src/qt3support/tools/q3ptrvector.h
+++ b/src/qt3support/tools/q3ptrvector.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3semaphore.cpp b/src/qt3support/tools/q3semaphore.cpp
index 9b02e05..7f3a566 100644
--- a/src/qt3support/tools/q3semaphore.cpp
+++ b/src/qt3support/tools/q3semaphore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3semaphore.h b/src/qt3support/tools/q3semaphore.h
index 45c2180..4c9f0f0 100644
--- a/src/qt3support/tools/q3semaphore.h
+++ b/src/qt3support/tools/q3semaphore.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3shared.cpp b/src/qt3support/tools/q3shared.cpp
index 3940215..9ae52f8 100644
--- a/src/qt3support/tools/q3shared.cpp
+++ b/src/qt3support/tools/q3shared.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3shared.h b/src/qt3support/tools/q3shared.h
index df2adb3..19f0e64 100644
--- a/src/qt3support/tools/q3shared.h
+++ b/src/qt3support/tools/q3shared.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3signal.cpp b/src/qt3support/tools/q3signal.cpp
index b6f0011..2137394 100644
--- a/src/qt3support/tools/q3signal.cpp
+++ b/src/qt3support/tools/q3signal.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3signal.h b/src/qt3support/tools/q3signal.h
index 2b82630..de57b8f 100644
--- a/src/qt3support/tools/q3signal.h
+++ b/src/qt3support/tools/q3signal.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3sortedlist.h b/src/qt3support/tools/q3sortedlist.h
index 6b1441b..8d582c2 100644
--- a/src/qt3support/tools/q3sortedlist.h
+++ b/src/qt3support/tools/q3sortedlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3strlist.h b/src/qt3support/tools/q3strlist.h
index 6b87eff..91c6a78 100644
--- a/src/qt3support/tools/q3strlist.h
+++ b/src/qt3support/tools/q3strlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3strvec.h b/src/qt3support/tools/q3strvec.h
index 0b5b900..e66b2d6 100644
--- a/src/qt3support/tools/q3strvec.h
+++ b/src/qt3support/tools/q3strvec.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3tl.h b/src/qt3support/tools/q3tl.h
index dd86668..9d800bd 100644
--- a/src/qt3support/tools/q3tl.h
+++ b/src/qt3support/tools/q3tl.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3valuelist.h b/src/qt3support/tools/q3valuelist.h
index 9cfe6dc..f004145 100644
--- a/src/qt3support/tools/q3valuelist.h
+++ b/src/qt3support/tools/q3valuelist.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3valuestack.h b/src/qt3support/tools/q3valuestack.h
index 732fb75..caa2564 100644
--- a/src/qt3support/tools/q3valuestack.h
+++ b/src/qt3support/tools/q3valuestack.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/tools/q3valuevector.h b/src/qt3support/tools/q3valuevector.h
index cdd5fcd..3ca6420 100644
--- a/src/qt3support/tools/q3valuevector.h
+++ b/src/qt3support/tools/q3valuevector.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3action.cpp b/src/qt3support/widgets/q3action.cpp
index a196b41..95cdf85 100644
--- a/src/qt3support/widgets/q3action.cpp
+++ b/src/qt3support/widgets/q3action.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3action.h b/src/qt3support/widgets/q3action.h
index f999c5a..df5bba8 100644
--- a/src/qt3support/widgets/q3action.h
+++ b/src/qt3support/widgets/q3action.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3button.cpp b/src/qt3support/widgets/q3button.cpp
index bdc9972..6cbe0c4 100644
--- a/src/qt3support/widgets/q3button.cpp
+++ b/src/qt3support/widgets/q3button.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3button.h b/src/qt3support/widgets/q3button.h
index e67252b..dc09877 100644
--- a/src/qt3support/widgets/q3button.h
+++ b/src/qt3support/widgets/q3button.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3buttongroup.cpp b/src/qt3support/widgets/q3buttongroup.cpp
index 62af372..c2e7be4 100644
--- a/src/qt3support/widgets/q3buttongroup.cpp
+++ b/src/qt3support/widgets/q3buttongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3buttongroup.h b/src/qt3support/widgets/q3buttongroup.h
index 1bad56b..9a5297f 100644
--- a/src/qt3support/widgets/q3buttongroup.h
+++ b/src/qt3support/widgets/q3buttongroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3combobox.cpp b/src/qt3support/widgets/q3combobox.cpp
index cd68169..209b04f 100644
--- a/src/qt3support/widgets/q3combobox.cpp
+++ b/src/qt3support/widgets/q3combobox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3combobox.h b/src/qt3support/widgets/q3combobox.h
index a4ae630..d779f71 100644
--- a/src/qt3support/widgets/q3combobox.h
+++ b/src/qt3support/widgets/q3combobox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3datetimeedit.cpp b/src/qt3support/widgets/q3datetimeedit.cpp
index 9fe629e..1fca9e7 100644
--- a/src/qt3support/widgets/q3datetimeedit.cpp
+++ b/src/qt3support/widgets/q3datetimeedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3datetimeedit.h b/src/qt3support/widgets/q3datetimeedit.h
index 600131e..18b2615 100644
--- a/src/qt3support/widgets/q3datetimeedit.h
+++ b/src/qt3support/widgets/q3datetimeedit.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3dockarea.cpp b/src/qt3support/widgets/q3dockarea.cpp
index 2c4c6fb..3aec373 100644
--- a/src/qt3support/widgets/q3dockarea.cpp
+++ b/src/qt3support/widgets/q3dockarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3dockarea.h b/src/qt3support/widgets/q3dockarea.h
index 041e430..c506368 100644
--- a/src/qt3support/widgets/q3dockarea.h
+++ b/src/qt3support/widgets/q3dockarea.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3dockwindow.cpp b/src/qt3support/widgets/q3dockwindow.cpp
index 320f3a0..ef5473b 100644
--- a/src/qt3support/widgets/q3dockwindow.cpp
+++ b/src/qt3support/widgets/q3dockwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3dockwindow.h b/src/qt3support/widgets/q3dockwindow.h
index adbfb89..1069012 100644
--- a/src/qt3support/widgets/q3dockwindow.h
+++ b/src/qt3support/widgets/q3dockwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3frame.cpp b/src/qt3support/widgets/q3frame.cpp
index 9ea634c..4a193ea 100644
--- a/src/qt3support/widgets/q3frame.cpp
+++ b/src/qt3support/widgets/q3frame.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3frame.h b/src/qt3support/widgets/q3frame.h
index 4cabc85..8490481 100644
--- a/src/qt3support/widgets/q3frame.h
+++ b/src/qt3support/widgets/q3frame.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3grid.cpp b/src/qt3support/widgets/q3grid.cpp
index f844a54..4483d7f 100644
--- a/src/qt3support/widgets/q3grid.cpp
+++ b/src/qt3support/widgets/q3grid.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3grid.h b/src/qt3support/widgets/q3grid.h
index fa1e937..8cfdb66 100644
--- a/src/qt3support/widgets/q3grid.h
+++ b/src/qt3support/widgets/q3grid.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3gridview.cpp b/src/qt3support/widgets/q3gridview.cpp
index b270a38..4960fdd 100644
--- a/src/qt3support/widgets/q3gridview.cpp
+++ b/src/qt3support/widgets/q3gridview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3gridview.h b/src/qt3support/widgets/q3gridview.h
index f63a79c..0fe79fc 100644
--- a/src/qt3support/widgets/q3gridview.h
+++ b/src/qt3support/widgets/q3gridview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3groupbox.cpp b/src/qt3support/widgets/q3groupbox.cpp
index 926497c..a3a6700 100644
--- a/src/qt3support/widgets/q3groupbox.cpp
+++ b/src/qt3support/widgets/q3groupbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3groupbox.h b/src/qt3support/widgets/q3groupbox.h
index bbcfc16..06cd192 100644
--- a/src/qt3support/widgets/q3groupbox.h
+++ b/src/qt3support/widgets/q3groupbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3hbox.cpp b/src/qt3support/widgets/q3hbox.cpp
index abffa48..07b4e44 100644
--- a/src/qt3support/widgets/q3hbox.cpp
+++ b/src/qt3support/widgets/q3hbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3hbox.h b/src/qt3support/widgets/q3hbox.h
index 10fb4c6..727a090 100644
--- a/src/qt3support/widgets/q3hbox.h
+++ b/src/qt3support/widgets/q3hbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3header.cpp b/src/qt3support/widgets/q3header.cpp
index 3c4f58a..3f026ae 100644
--- a/src/qt3support/widgets/q3header.cpp
+++ b/src/qt3support/widgets/q3header.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3header.h b/src/qt3support/widgets/q3header.h
index 86318d1..702b59b 100644
--- a/src/qt3support/widgets/q3header.h
+++ b/src/qt3support/widgets/q3header.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3hgroupbox.cpp b/src/qt3support/widgets/q3hgroupbox.cpp
index 6bdb179..d1235df 100644
--- a/src/qt3support/widgets/q3hgroupbox.cpp
+++ b/src/qt3support/widgets/q3hgroupbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3hgroupbox.h b/src/qt3support/widgets/q3hgroupbox.h
index 6044706..d2862b4 100644
--- a/src/qt3support/widgets/q3hgroupbox.h
+++ b/src/qt3support/widgets/q3hgroupbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3mainwindow.cpp b/src/qt3support/widgets/q3mainwindow.cpp
index 0d843dd..202c4ea 100644
--- a/src/qt3support/widgets/q3mainwindow.cpp
+++ b/src/qt3support/widgets/q3mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3mainwindow.h b/src/qt3support/widgets/q3mainwindow.h
index 810785b..cbf33b3 100644
--- a/src/qt3support/widgets/q3mainwindow.h
+++ b/src/qt3support/widgets/q3mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3mainwindow_p.h b/src/qt3support/widgets/q3mainwindow_p.h
index a3281b4..7dddf52 100644
--- a/src/qt3support/widgets/q3mainwindow_p.h
+++ b/src/qt3support/widgets/q3mainwindow_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3popupmenu.cpp b/src/qt3support/widgets/q3popupmenu.cpp
index 4f77b1c..52d91e8 100644
--- a/src/qt3support/widgets/q3popupmenu.cpp
+++ b/src/qt3support/widgets/q3popupmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3popupmenu.h b/src/qt3support/widgets/q3popupmenu.h
index b5ee3f1..4e28730 100644
--- a/src/qt3support/widgets/q3popupmenu.h
+++ b/src/qt3support/widgets/q3popupmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3progressbar.cpp b/src/qt3support/widgets/q3progressbar.cpp
index 414f95f..4a7a8824 100644
--- a/src/qt3support/widgets/q3progressbar.cpp
+++ b/src/qt3support/widgets/q3progressbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3progressbar.h b/src/qt3support/widgets/q3progressbar.h
index b9d0254..aafef6c 100644
--- a/src/qt3support/widgets/q3progressbar.h
+++ b/src/qt3support/widgets/q3progressbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3rangecontrol.cpp b/src/qt3support/widgets/q3rangecontrol.cpp
index e4de70b..b2eca01 100644
--- a/src/qt3support/widgets/q3rangecontrol.cpp
+++ b/src/qt3support/widgets/q3rangecontrol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3rangecontrol.h b/src/qt3support/widgets/q3rangecontrol.h
index 5a6f949..18dc812 100644
--- a/src/qt3support/widgets/q3rangecontrol.h
+++ b/src/qt3support/widgets/q3rangecontrol.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3scrollview.cpp b/src/qt3support/widgets/q3scrollview.cpp
index 414a030..0a8e362 100644
--- a/src/qt3support/widgets/q3scrollview.cpp
+++ b/src/qt3support/widgets/q3scrollview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3scrollview.h b/src/qt3support/widgets/q3scrollview.h
index 5fcdf29..df0d49e 100644
--- a/src/qt3support/widgets/q3scrollview.h
+++ b/src/qt3support/widgets/q3scrollview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3spinwidget.cpp b/src/qt3support/widgets/q3spinwidget.cpp
index 3bfad06..b5d8ae0 100644
--- a/src/qt3support/widgets/q3spinwidget.cpp
+++ b/src/qt3support/widgets/q3spinwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3titlebar.cpp b/src/qt3support/widgets/q3titlebar.cpp
index d00d8a6..47abea5 100644
--- a/src/qt3support/widgets/q3titlebar.cpp
+++ b/src/qt3support/widgets/q3titlebar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3titlebar_p.h b/src/qt3support/widgets/q3titlebar_p.h
index e3b84ad..651d816 100644
--- a/src/qt3support/widgets/q3titlebar_p.h
+++ b/src/qt3support/widgets/q3titlebar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3toolbar.cpp b/src/qt3support/widgets/q3toolbar.cpp
index 93a73c9..0938fb0 100644
--- a/src/qt3support/widgets/q3toolbar.cpp
+++ b/src/qt3support/widgets/q3toolbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3toolbar.h b/src/qt3support/widgets/q3toolbar.h
index a5f66c1..096149c 100644
--- a/src/qt3support/widgets/q3toolbar.h
+++ b/src/qt3support/widgets/q3toolbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3vbox.cpp b/src/qt3support/widgets/q3vbox.cpp
index 4bd77e8..f8db5c7 100644
--- a/src/qt3support/widgets/q3vbox.cpp
+++ b/src/qt3support/widgets/q3vbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3vbox.h b/src/qt3support/widgets/q3vbox.h
index 368f5b3..11c5afc 100644
--- a/src/qt3support/widgets/q3vbox.h
+++ b/src/qt3support/widgets/q3vbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3vgroupbox.cpp b/src/qt3support/widgets/q3vgroupbox.cpp
index ed6c078..10473cb 100644
--- a/src/qt3support/widgets/q3vgroupbox.cpp
+++ b/src/qt3support/widgets/q3vgroupbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3vgroupbox.h b/src/qt3support/widgets/q3vgroupbox.h
index 6ad6bf9..20551f0 100644
--- a/src/qt3support/widgets/q3vgroupbox.h
+++ b/src/qt3support/widgets/q3vgroupbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3whatsthis.cpp b/src/qt3support/widgets/q3whatsthis.cpp
index ad4f7a9..84d3217 100644
--- a/src/qt3support/widgets/q3whatsthis.cpp
+++ b/src/qt3support/widgets/q3whatsthis.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3whatsthis.h b/src/qt3support/widgets/q3whatsthis.h
index 316b711..f95bb9e 100644
--- a/src/qt3support/widgets/q3whatsthis.h
+++ b/src/qt3support/widgets/q3whatsthis.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3widgetstack.cpp b/src/qt3support/widgets/q3widgetstack.cpp
index 2ca0865..18fdde9 100644
--- a/src/qt3support/widgets/q3widgetstack.cpp
+++ b/src/qt3support/widgets/q3widgetstack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/qt3support/widgets/q3widgetstack.h b/src/qt3support/widgets/q3widgetstack.h
index 877aff5..836f3de 100644
--- a/src/qt3support/widgets/q3widgetstack.h
+++ b/src/qt3support/widgets/q3widgetstack.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt3Support module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/script/parser/make-parser.sh b/src/script/parser/make-parser.sh
index 8d445ba..233a3c6 100755
--- a/src/script/parser/make-parser.sh
+++ b/src/script/parser/make-parser.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/script/parser/qscript.g b/src/script/parser/qscript.g
index 95b7436..6e3a0e9 100644
--- a/src/script/parser/qscript.g
+++ b/src/script/parser/qscript.g
@@ -69,11 +69,11 @@
 ** This file is part of the QtScript module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -87,16 +87,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -126,11 +126,11 @@
 ** This file is part of the QtScript module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -144,16 +144,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointdata.cpp b/src/scripttools/debugging/qscriptbreakpointdata.cpp
index 6e41f69..ceff1ad 100644
--- a/src/scripttools/debugging/qscriptbreakpointdata.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointdata_p.h b/src/scripttools/debugging/qscriptbreakpointdata_p.h
index d806600..1c8bee7 100644
--- a/src/scripttools/debugging/qscriptbreakpointdata_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointdata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp
index 4620504..306a907 100644
--- a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h
index b6d65d0..7b06bb1 100644
--- a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp
index 1ca9952..106f74d 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointswidget_p.h b/src/scripttools/debugging/qscriptbreakpointswidget_p.h
index 6e933d1..c7f4865 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidget_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointswidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp b/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp
index 5128674..5b0c8db 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h
index cb7708f..e7cccdf 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h
index 8d3a77b..3534e27 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h b/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h
index 4f2f207..9e3e3e1 100644
--- a/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h
+++ b/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp
index 6af5b9a..cd32122 100644
--- a/src/scripttools/debugging/qscriptcompletiontask.cpp
+++ b/src/scripttools/debugging/qscriptcompletiontask.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptcompletiontask_p.h b/src/scripttools/debugging/qscriptcompletiontask_p.h
index 56de4e7..aa786cd 100644
--- a/src/scripttools/debugging/qscriptcompletiontask_p.h
+++ b/src/scripttools/debugging/qscriptcompletiontask_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp b/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp
index 6abce3e..0d42b55 100644
--- a/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp
+++ b/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h
index fe267f6..423e606 100644
--- a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h
+++ b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h
index 8458166..61dc05a 100644
--- a/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp
index 5214845..b2ec686 100644
--- a/src/scripttools/debugging/qscriptdebugger.cpp
+++ b/src/scripttools/debugging/qscriptdebugger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebugger_p.h b/src/scripttools/debugging/qscriptdebugger_p.h
index 099d681..02fa6ae 100644
--- a/src/scripttools/debugging/qscriptdebugger_p.h
+++ b/src/scripttools/debugging/qscriptdebugger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp
index 551f6c3..cd26b49 100644
--- a/src/scripttools/debugging/qscriptdebuggeragent.cpp
+++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p.h
index 90a6fe0..93add5c 100644
--- a/src/scripttools/debugging/qscriptdebuggeragent_p.h
+++ b/src/scripttools/debugging/qscriptdebuggeragent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h
index 2112d4d..2889498 100644
--- a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend.cpp b/src/scripttools/debugging/qscriptdebuggerbackend.cpp
index e453432..cd16c14 100644
--- a/src/scripttools/debugging/qscriptdebuggerbackend.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerbackend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p.h
index 40bc7a2..f6ab884 100644
--- a/src/scripttools/debugging/qscriptdebuggerbackend_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerbackend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h
index 78368a2..5e81d18 100644
--- a/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
index ef6e1af..99d50f5 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h
index 1cbc1be..42ed1da 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp
index 7c63050..33830ad 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h
index bd65a94..ba049ce 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h
index 0fd4d30..c77b95f 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp
index ec1f692..e76612e 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodeview_p.h b/src/scripttools/debugging/qscriptdebuggercodeview_p.h
index da31e2e..dff9b21 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeview_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodeview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp b/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp
index 8bfb0eb..8be437d 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h
index e683a8a..782dc18 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h
index 2bed34c..741afad 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp
index 6664013..230716c 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h
index b702191..a7a672a 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp
index 185d33e..8a07109 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h
index 73a098f..209ad49 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h
index 463cad9..f8efb68 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommand.cpp b/src/scripttools/debugging/qscriptdebuggercommand.cpp
index fa223ec..c1a7716 100644
--- a/src/scripttools/debugging/qscriptdebuggercommand.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommand_p.h b/src/scripttools/debugging/qscriptdebuggercommand_p.h
index b1fc01a..8c05203 100644
--- a/src/scripttools/debugging/qscriptdebuggercommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommand_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
index 568af59..44da5f5 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
index 949ef31..6e1937c 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp
index 45570ff..5261dfc 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h
index 8549b08..3448c3b 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h
index ca38824..43fd0da 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp
index 382b7c4..2830cbd 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h
index 1ca0af9..0d0dbec 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h
index 784d85e..42f9ed3 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsole.cpp b/src/scripttools/debugging/qscriptdebuggerconsole.cpp
index 2f7a998..8630f45 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsole.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsole.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsole_p.h b/src/scripttools/debugging/qscriptdebuggerconsole_p.h
index d376ec7..90b7892 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsole_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsole_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp
index 6ae7f56..c3ba090 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
index b9cf479..be43e8f 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h
index bd28e1c..7d1c2ba 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
index 555ba56..0620df9 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
index 808dc7d..5f86cc9 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp
index 71aa8db..79d4359 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h
index a4065a2..620b0bb 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h
index b373e86..ab419ea 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
index 63b8347..1ba4187 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
index 93b82e3..5a0dc18 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp
index c9bbcb1..ad785ca 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h
index 6223d96..94d18dd 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h b/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h
index bf55115..c351a2a 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp
index 5db012a..006708d 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h
index 0738b9a..c092c16 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp
index e274484..c0788e8 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h
index 2579f04..0989743 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h
index c1845bb..1bf1021 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerevent.cpp b/src/scripttools/debugging/qscriptdebuggerevent.cpp
index f5f20cf..21a8015 100644
--- a/src/scripttools/debugging/qscriptdebuggerevent.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerevent_p.h b/src/scripttools/debugging/qscriptdebuggerevent_p.h
index e02fa01..95a061e 100644
--- a/src/scripttools/debugging/qscriptdebuggerevent_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerevent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h b/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h
index 3d4bbc1..154185d 100644
--- a/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend.cpp b/src/scripttools/debugging/qscriptdebuggerfrontend.cpp
index fae4865..6c50322 100644
--- a/src/scripttools/debugging/qscriptdebuggerfrontend.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerfrontend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
index 4312d54..208d2c7 100644
--- a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h b/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h
index a6b4a2a..1c4043e 100644
--- a/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerjob.cpp b/src/scripttools/debugging/qscriptdebuggerjob.cpp
index bbf48c0..6a28b2b 100644
--- a/src/scripttools/debugging/qscriptdebuggerjob.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerjob.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p.h
index a2c0956..115cb91 100644
--- a/src/scripttools/debugging/qscriptdebuggerjob_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerjob_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p_p.h
index 109fbbf..3f69ce5 100644
--- a/src/scripttools/debugging/qscriptdebuggerjob_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerjob_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h b/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h
index 18428e1..131a2ee 100644
--- a/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp
index ec6230b..0bc05c5 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h
index 61f6426..03b4260 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
index bbced5f..9043a3a 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h
index 07e915a..373dba4 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp
index 0442293..65770a9 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h
index 35fdf17..1b91c19 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h
index 456e592..d780f12 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h b/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h
index f0bfe8dc..5ac5b68 100644
--- a/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerresponse.cpp b/src/scripttools/debugging/qscriptdebuggerresponse.cpp
index 0caa3e2..5895876 100644
--- a/src/scripttools/debugging/qscriptdebuggerresponse.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerresponse.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerresponse_p.h b/src/scripttools/debugging/qscriptdebuggerresponse_p.h
index 778391f..031b8de 100644
--- a/src/scripttools/debugging/qscriptdebuggerresponse_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerresponse_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h b/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h
index f177619..0cb59b2 100644
--- a/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
index 117c2d6..101026f 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h
index 2b2b3f8..8d7b7d8 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp b/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp
index 5e17e73..3bf5f6e 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h
index 06f18ac..f65d8a0 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp
index 094463d..147f6ac 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h
index c16ef9f..16ba0bf 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp
index 6ccdd44..50bbb10 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h
index fcb9de9..210a026 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h
index 0de2a1e..307594f 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
index 2f18295..7badcfa 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h
index f29f5da..e63299c 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp
index 54bf800..f258264 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h
index 05ccc30..acbf8b2 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
index 3582ce6..404faaf 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h
index 7bc15a1..3b46553 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h
index 10cc05a..ad3970c 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory.cpp b/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory.cpp
index 528998e..f6f72ff 100644
--- a/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_p.h b/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_p.h
index f9b61b3..aa94d6c 100644
--- a/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggervalue.cpp b/src/scripttools/debugging/qscriptdebuggervalue.cpp
index 13de28a..f82e783 100644
--- a/src/scripttools/debugging/qscriptdebuggervalue.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggervalue_p.h b/src/scripttools/debugging/qscriptdebuggervalue_p.h
index a625305..d01e412 100644
--- a/src/scripttools/debugging/qscriptdebuggervalue_p.h
+++ b/src/scripttools/debugging/qscriptdebuggervalue_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
index feb2511..8798d6f 100644
--- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
index 09352b2..3f3b078 100644
--- a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
+++ b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h b/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h
index d704e15..53da03a 100644
--- a/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp
index 3bca96c..7ff4b91 100644
--- a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp
+++ b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h
index 266da8c..fddf6a6 100644
--- a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h
+++ b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp
index 4980e3b..bdc96fe 100644
--- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h
index b5a0be3..108ae2f 100644
--- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h
index 11c14e8..70bd7f8 100644
--- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp
index a425e2a..81904f7 100644
--- a/src/scripttools/debugging/qscriptedit.cpp
+++ b/src/scripttools/debugging/qscriptedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptedit_p.h b/src/scripttools/debugging/qscriptedit_p.h
index 23a45d0..062a75b 100644
--- a/src/scripttools/debugging/qscriptedit_p.h
+++ b/src/scripttools/debugging/qscriptedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp
index cb84ba0..153b552 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.cpp
+++ b/src/scripttools/debugging/qscriptenginedebugger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h
index 4ee0877..8902570 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.h
+++ b/src/scripttools/debugging/qscriptenginedebugger.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp
index a29c66e..37dea8b 100644
--- a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp
+++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h
index e142c3c..98b7629 100644
--- a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h
+++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscripterrorlogwidget.cpp b/src/scripttools/debugging/qscripterrorlogwidget.cpp
index 735c546..acbbcb4 100644
--- a/src/scripttools/debugging/qscripterrorlogwidget.cpp
+++ b/src/scripttools/debugging/qscripterrorlogwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscripterrorlogwidget_p.h b/src/scripttools/debugging/qscripterrorlogwidget_p.h
index e45bf38..40c1bd7 100644
--- a/src/scripttools/debugging/qscripterrorlogwidget_p.h
+++ b/src/scripttools/debugging/qscripterrorlogwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp b/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp
index e29c92a..1b12232 100644
--- a/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp
+++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h
index 0eddf04..55745de 100644
--- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h
index 95e52ab..b561ea1 100644
--- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h
+++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h b/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h
index e8614ba..3e77095 100644
--- a/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h
+++ b/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptobjectsnapshot.cpp b/src/scripttools/debugging/qscriptobjectsnapshot.cpp
index d7bffee..e86d593 100644
--- a/src/scripttools/debugging/qscriptobjectsnapshot.cpp
+++ b/src/scripttools/debugging/qscriptobjectsnapshot.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptobjectsnapshot_p.h b/src/scripttools/debugging/qscriptobjectsnapshot_p.h
index ee72e3c..176e6d3 100644
--- a/src/scripttools/debugging/qscriptobjectsnapshot_p.h
+++ b/src/scripttools/debugging/qscriptobjectsnapshot_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptscriptdata.cpp b/src/scripttools/debugging/qscriptscriptdata.cpp
index 4ef0df4..53e2c1f 100644
--- a/src/scripttools/debugging/qscriptscriptdata.cpp
+++ b/src/scripttools/debugging/qscriptscriptdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptscriptdata_p.h b/src/scripttools/debugging/qscriptscriptdata_p.h
index f3e41dc..979e4eb 100644
--- a/src/scripttools/debugging/qscriptscriptdata_p.h
+++ b/src/scripttools/debugging/qscriptscriptdata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler.cpp b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
index 29b3cb8..826d435 100644
--- a/src/scripttools/debugging/qscriptstdmessagehandler.cpp
+++ b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler_p.h b/src/scripttools/debugging/qscriptstdmessagehandler_p.h
index a39cf94..7c3db10 100644
--- a/src/scripttools/debugging/qscriptstdmessagehandler_p.h
+++ b/src/scripttools/debugging/qscriptstdmessagehandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp
index 81817ec..1dbec38 100644
--- a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp
+++ b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h b/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h
index aedbc9b..e8dcf08 100644
--- a/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h
+++ b/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscripttooltipproviderinterface_p.h b/src/scripttools/debugging/qscripttooltipproviderinterface_p.h
index 1f259b6..036d978 100644
--- a/src/scripttools/debugging/qscripttooltipproviderinterface_p.h
+++ b/src/scripttools/debugging/qscripttooltipproviderinterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptvalueproperty.cpp b/src/scripttools/debugging/qscriptvalueproperty.cpp
index 4abcab0..e08fc9c 100644
--- a/src/scripttools/debugging/qscriptvalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptvalueproperty.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptvalueproperty_p.h b/src/scripttools/debugging/qscriptvalueproperty_p.h
index f4ab529..dc520a8 100644
--- a/src/scripttools/debugging/qscriptvalueproperty_p.h
+++ b/src/scripttools/debugging/qscriptvalueproperty_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptxmlparser.cpp b/src/scripttools/debugging/qscriptxmlparser.cpp
index e4b4e09..3194db7 100644
--- a/src/scripttools/debugging/qscriptxmlparser.cpp
+++ b/src/scripttools/debugging/qscriptxmlparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/scripttools/debugging/qscriptxmlparser_p.h b/src/scripttools/debugging/qscriptxmlparser_p.h
index da75370..cf55864 100644
--- a/src/scripttools/debugging/qscriptxmlparser_p.h
+++ b/src/scripttools/debugging/qscriptxmlparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp
index ea0b42e..090d0cd 100644
--- a/src/sql/drivers/db2/qsql_db2.cpp
+++ b/src/sql/drivers/db2/qsql_db2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/db2/qsql_db2.h b/src/sql/drivers/db2/qsql_db2.h
index 300c9bc..a1e91ff 100644
--- a/src/sql/drivers/db2/qsql_db2.h
+++ b/src/sql/drivers/db2/qsql_db2.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp
index 6b68536..e89f3e1 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h
index 33e684a..6143b0a 100644
--- a/src/sql/drivers/ibase/qsql_ibase.h
+++ b/src/sql/drivers/ibase/qsql_ibase.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 2261887..5cda572 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h
index ae3aaaa..4e47325 100644
--- a/src/sql/drivers/mysql/qsql_mysql.h
+++ b/src/sql/drivers/mysql/qsql_mysql.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index e11cf75..88acf81 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/oci/qsql_oci.h b/src/sql/drivers/oci/qsql_oci.h
index 424fb1a..8850d37 100644
--- a/src/sql/drivers/oci/qsql_oci.h
+++ b/src/sql/drivers/oci/qsql_oci.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 66dabfa..ec9f7e9 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h
index e739a38..6195250 100644
--- a/src/sql/drivers/odbc/qsql_odbc.h
+++ b/src/sql/drivers/odbc/qsql_odbc.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 2a4e595..44e418d 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h
index 22871ff..bb0d67c 100644
--- a/src/sql/drivers/psql/qsql_psql.h
+++ b/src/sql/drivers/psql/qsql_psql.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 4344af4..0265fdf 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h
index d0f589b..3c840a4 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.h
+++ b/src/sql/drivers/sqlite/qsql_sqlite.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
index ea476e5..a4b8043 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.h b/src/sql/drivers/sqlite2/qsql_sqlite2.h
index 1deadbc..80276e2 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.h
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp
index f7f0961..422f866 100644
--- a/src/sql/drivers/tds/qsql_tds.cpp
+++ b/src/sql/drivers/tds/qsql_tds.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h
index 3594a4d..b48f12b 100644
--- a/src/sql/drivers/tds/qsql_tds.h
+++ b/src/sql/drivers/tds/qsql_tds.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h
index 31ddced..884b721 100644
--- a/src/sql/kernel/qsql.h
+++ b/src/sql/kernel/qsql.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp
index 86d6f4e..840114f 100644
--- a/src/sql/kernel/qsqlcachedresult.cpp
+++ b/src/sql/kernel/qsqlcachedresult.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlcachedresult_p.h b/src/sql/kernel/qsqlcachedresult_p.h
index f529c32..ce15cfe 100644
--- a/src/sql/kernel/qsqlcachedresult_p.h
+++ b/src/sql/kernel/qsqlcachedresult_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index 2ab37de..5d2a9fa 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h
index 3e27ff0..5eba895 100644
--- a/src/sql/kernel/qsqldatabase.h
+++ b/src/sql/kernel/qsqldatabase.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp
index 64fd99c..0078954 100644
--- a/src/sql/kernel/qsqldriver.cpp
+++ b/src/sql/kernel/qsqldriver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index 0c46371..f9db907 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqldriverplugin.cpp b/src/sql/kernel/qsqldriverplugin.cpp
index 72ec672..689b56f 100644
--- a/src/sql/kernel/qsqldriverplugin.cpp
+++ b/src/sql/kernel/qsqldriverplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqldriverplugin.h b/src/sql/kernel/qsqldriverplugin.h
index 0187d11..1a50c17 100644
--- a/src/sql/kernel/qsqldriverplugin.h
+++ b/src/sql/kernel/qsqldriverplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlerror.cpp b/src/sql/kernel/qsqlerror.cpp
index 11a0ff0..f068ed5 100644
--- a/src/sql/kernel/qsqlerror.cpp
+++ b/src/sql/kernel/qsqlerror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index a18dc0f..ec73d86 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index 9e4fd5b..6ac1a9b 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index 56aabc2..483dc2d 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlindex.cpp b/src/sql/kernel/qsqlindex.cpp
index b5bda67..45439b5 100644
--- a/src/sql/kernel/qsqlindex.cpp
+++ b/src/sql/kernel/qsqlindex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h
index a029fe5..135e651 100644
--- a/src/sql/kernel/qsqlindex.h
+++ b/src/sql/kernel/qsqlindex.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlnulldriver_p.h b/src/sql/kernel/qsqlnulldriver_p.h
index 9615744..2a62a06 100644
--- a/src/sql/kernel/qsqlnulldriver_p.h
+++ b/src/sql/kernel/qsqlnulldriver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index f253c82..d8a81f9 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h
index 647cb03..fb24d0f 100644
--- a/src/sql/kernel/qsqlquery.h
+++ b/src/sql/kernel/qsqlquery.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index bbc7131..5d0c458 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h
index 394f918..3f9aa49 100644
--- a/src/sql/kernel/qsqlrecord.h
+++ b/src/sql/kernel/qsqlrecord.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index 6382b42..bd0c499 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h
index e7202ac..6400739 100644
--- a/src/sql/kernel/qsqlresult.h
+++ b/src/sql/kernel/qsqlresult.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index 1629737..2358fb4 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h
index 25d5157..97081dd 100644
--- a/src/sql/models/qsqlquerymodel.h
+++ b/src/sql/models/qsqlquerymodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h
index 2764ab6..ca9ee9c 100644
--- a/src/sql/models/qsqlquerymodel_p.h
+++ b/src/sql/models/qsqlquerymodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqlrelationaldelegate.cpp b/src/sql/models/qsqlrelationaldelegate.cpp
index fe2ea59..4f4d797 100644
--- a/src/sql/models/qsqlrelationaldelegate.cpp
+++ b/src/sql/models/qsqlrelationaldelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h
index 7600e52..46f1a31 100644
--- a/src/sql/models/qsqlrelationaldelegate.h
+++ b/src/sql/models/qsqlrelationaldelegate.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 72fafa2..f4c12db 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index 18db067..39538ab 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 8589163..f39e411 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h
index 006a580..8c83c93 100644
--- a/src/sql/models/qsqltablemodel.h
+++ b/src/sql/models/qsqltablemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h
index e9b7c65..2c4e2b1 100644
--- a/src/sql/models/qsqltablemodel_p.h
+++ b/src/sql/models/qsqltablemodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSql module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qgraphicssvgitem.cpp b/src/svg/qgraphicssvgitem.cpp
index e035e1d..5e1e4b6 100644
--- a/src/svg/qgraphicssvgitem.cpp
+++ b/src/svg/qgraphicssvgitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 900cec4..5f9ba72 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgfont.cpp b/src/svg/qsvgfont.cpp
index e893c08..fbad60a 100644
--- a/src/svg/qsvgfont.cpp
+++ b/src/svg/qsvgfont.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h
index 208e4c8..b5a9545 100644
--- a/src/svg/qsvgfont_p.h
+++ b/src/svg/qsvgfont_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index cb9086c..7b3b859 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h
index 4dc3ca8..21dcfe5 100644
--- a/src/svg/qsvggenerator.h
+++ b/src/svg/qsvggenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp
index a29764a..c4617ea 100644
--- a/src/svg/qsvggraphics.cpp
+++ b/src/svg/qsvggraphics.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h
index fdc770a..2d9498d 100644
--- a/src/svg/qsvggraphics_p.h
+++ b/src/svg/qsvggraphics_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index c17ca7a..34eea2f 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h
index b56ec0e..6881757 100644
--- a/src/svg/qsvghandler_p.h
+++ b/src/svg/qsvghandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp
index f6bc1c0..15ed262 100644
--- a/src/svg/qsvgnode.cpp
+++ b/src/svg/qsvgnode.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h
index a34c7c0..946f71e 100644
--- a/src/svg/qsvgnode_p.h
+++ b/src/svg/qsvgnode_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp
index 341dff3..af463d4 100644
--- a/src/svg/qsvgrenderer.cpp
+++ b/src/svg/qsvgrenderer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 90a9e28..314d1df 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp
index db5cb9e..c2990a9 100644
--- a/src/svg/qsvgstructure.cpp
+++ b/src/svg/qsvgstructure.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h
index dd82fc0..3052fde 100644
--- a/src/svg/qsvgstructure_p.h
+++ b/src/svg/qsvgstructure_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index f228a77..ddcc200 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index dfea12c..207ff9c 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
index b21b99f..5848703 100644
--- a/src/svg/qsvgtinydocument.cpp
+++ b/src/svg/qsvgtinydocument.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h
index 3b40770..25f3982 100644
--- a/src/svg/qsvgtinydocument_p.h
+++ b/src/svg/qsvgtinydocument_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp
index 156490c..ef64d02 100644
--- a/src/svg/qsvgwidget.cpp
+++ b/src/svg/qsvgwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index b9ca3f0..8a271b4 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtSvg module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index f7269d6..7b4cf89 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h
index c84f327..00350ef 100644
--- a/src/testlib/qabstracttestlogger_p.h
+++ b/src/testlib/qabstracttestlogger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qasciikey.cpp b/src/testlib/qasciikey.cpp
index 11fbfac..bcf4c73 100644
--- a/src/testlib/qasciikey.cpp
+++ b/src/testlib/qasciikey.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index c92a88a..3fc1fcb 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h
index 46f51ca..27ecc93 100644
--- a/src/testlib/qbenchmark.h
+++ b/src/testlib/qbenchmark.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
index 50329e1..f90c460 100644
--- a/src/testlib/qbenchmark_p.h
+++ b/src/testlib/qbenchmark_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp
index 39eb1c5..63b4c88 100644
--- a/src/testlib/qbenchmarkevent.cpp
+++ b/src/testlib/qbenchmarkevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkevent_p.h b/src/testlib/qbenchmarkevent_p.h
index 5e13b9f..ddd1530 100644
--- a/src/testlib/qbenchmarkevent_p.h
+++ b/src/testlib/qbenchmarkevent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkmeasurement.cpp b/src/testlib/qbenchmarkmeasurement.cpp
index 0a84792..bb460f4 100644
--- a/src/testlib/qbenchmarkmeasurement.cpp
+++ b/src/testlib/qbenchmarkmeasurement.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index 20a3bc1..cac46a0 100644
--- a/src/testlib/qbenchmarkmeasurement_p.h
+++ b/src/testlib/qbenchmarkmeasurement_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkmetric.cpp b/src/testlib/qbenchmarkmetric.cpp
index 7356134..8dc6433 100644
--- a/src/testlib/qbenchmarkmetric.cpp
+++ b/src/testlib/qbenchmarkmetric.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h
index 1815527..a252704 100644
--- a/src/testlib/qbenchmarkmetric.h
+++ b/src/testlib/qbenchmarkmetric.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h
index f0afc04..627d613 100644
--- a/src/testlib/qbenchmarkmetric_p.h
+++ b/src/testlib/qbenchmarkmetric_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index 8c64c0b..f2f88dd 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qbenchmarkvalgrind_p.h b/src/testlib/qbenchmarkvalgrind_p.h
index 7b6893b..414b763 100644
--- a/src/testlib/qbenchmarkvalgrind_p.h
+++ b/src/testlib/qbenchmarkvalgrind_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 1a0e737..a34e4a7 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qplaintestlogger_p.h b/src/testlib/qplaintestlogger_p.h
index f1f1d4e..8937962 100644
--- a/src/testlib/qplaintestlogger_p.h
+++ b/src/testlib/qplaintestlogger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index f6b82a8..d59b640 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qsignaldumper_p.h b/src/testlib/qsignaldumper_p.h
index 443df18..1ce0f0e 100644
--- a/src/testlib/qsignaldumper_p.h
+++ b/src/testlib/qsignaldumper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index 860414a..fe36a40 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 633d635..e1ce276 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h
index a78113a..d8962a8 100644
--- a/src/testlib/qtest_global.h
+++ b/src/testlib/qtest_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h
index d7df2e9..94df0b0 100644
--- a/src/testlib/qtest_gui.h
+++ b/src/testlib/qtest_gui.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index ae2f109..e9ad6fb 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h
index c8d0b18..b5c3be3 100644
--- a/src/testlib/qtestassert.h
+++ b/src/testlib/qtestassert.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestbasicstreamer.cpp b/src/testlib/qtestbasicstreamer.cpp
index b4f569a..03bdd6f 100644
--- a/src/testlib/qtestbasicstreamer.cpp
+++ b/src/testlib/qtestbasicstreamer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestbasicstreamer.h b/src/testlib/qtestbasicstreamer.h
index d11ddbe..538f39f 100644
--- a/src/testlib/qtestbasicstreamer.h
+++ b/src/testlib/qtestbasicstreamer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 17f1a6b..2ffeb02 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index e2ad032..dc6af07 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestcoreelement.h b/src/testlib/qtestcoreelement.h
index e1ad44a..d9e74f3 100644
--- a/src/testlib/qtestcoreelement.h
+++ b/src/testlib/qtestcoreelement.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestcorelist.h b/src/testlib/qtestcorelist.h
index 7f34961..3ddc989 100644
--- a/src/testlib/qtestcorelist.h
+++ b/src/testlib/qtestcorelist.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestdata.cpp b/src/testlib/qtestdata.cpp
index e03716e..4ce06b1 100644
--- a/src/testlib/qtestdata.cpp
+++ b/src/testlib/qtestdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestdata.h b/src/testlib/qtestdata.h
index 5a0d885..fa8972f 100644
--- a/src/testlib/qtestdata.h
+++ b/src/testlib/qtestdata.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestelement.cpp b/src/testlib/qtestelement.cpp
index d05477c..fc16c20 100644
--- a/src/testlib/qtestelement.cpp
+++ b/src/testlib/qtestelement.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestelement.h b/src/testlib/qtestelement.h
index 596d7a0..7126c35 100644
--- a/src/testlib/qtestelement.h
+++ b/src/testlib/qtestelement.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 912d356..6c8ccff 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestelementattribute.h b/src/testlib/qtestelementattribute.h
index 6913847..7bd5477 100644
--- a/src/testlib/qtestelementattribute.h
+++ b/src/testlib/qtestelementattribute.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h
index 0a7b514..095ce6c 100644
--- a/src/testlib/qtestevent.h
+++ b/src/testlib/qtestevent.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h
index 646b5d8..faa10fa 100644
--- a/src/testlib/qtesteventloop.h
+++ b/src/testlib/qtesteventloop.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp
index 9d1ee6a..382cfb1 100644
--- a/src/testlib/qtestfilelogger.cpp
+++ b/src/testlib/qtestfilelogger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestfilelogger.h b/src/testlib/qtestfilelogger.h
index 0ebf9b5..4f93dce 100644
--- a/src/testlib/qtestfilelogger.h
+++ b/src/testlib/qtestfilelogger.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index 6e54cd4..c629750 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestlightxmlstreamer.cpp b/src/testlib/qtestlightxmlstreamer.cpp
index 0ac9ea8..8ae798c 100644
--- a/src/testlib/qtestlightxmlstreamer.cpp
+++ b/src/testlib/qtestlightxmlstreamer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestlightxmlstreamer.h b/src/testlib/qtestlightxmlstreamer.h
index 7b14647..99b35ca 100644
--- a/src/testlib/qtestlightxmlstreamer.h
+++ b/src/testlib/qtestlightxmlstreamer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 398dec5..ca9a20d 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
index d36ff04..2580675 100644
--- a/src/testlib/qtestlog_p.h
+++ b/src/testlib/qtestlog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestlogger.cpp b/src/testlib/qtestlogger.cpp
index f0be6be..9667776 100644
--- a/src/testlib/qtestlogger.cpp
+++ b/src/testlib/qtestlogger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestlogger_p.h b/src/testlib/qtestlogger_p.h
index bb7a358..c261187 100644
--- a/src/testlib/qtestlogger_p.h
+++ b/src/testlib/qtestlogger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h
index 97ac35c..2e903f2 100644
--- a/src/testlib/qtestmouse.h
+++ b/src/testlib/qtestmouse.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 8c52a82..9936af8 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index 9d0b0e7..ad578e6 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestspontaneevent.h b/src/testlib/qtestspontaneevent.h
index d637da1..3d5fe36 100644
--- a/src/testlib/qtestspontaneevent.h
+++ b/src/testlib/qtestspontaneevent.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h
index 82d69d6..5bb5ebb 100644
--- a/src/testlib/qtestsystem.h
+++ b/src/testlib/qtestsystem.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
index a5ff5c3..5d40595 100644
--- a/src/testlib/qtesttable.cpp
+++ b/src/testlib/qtesttable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtesttable_p.h b/src/testlib/qtesttable_p.h
index 50a2950..7a739d2 100644
--- a/src/testlib/qtesttable_p.h
+++ b/src/testlib/qtesttable_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h
index 1beef85..712ac25 100644
--- a/src/testlib/qtesttouch.h
+++ b/src/testlib/qtesttouch.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp
index f63c221..87d8793 100644
--- a/src/testlib/qtestxmlstreamer.cpp
+++ b/src/testlib/qtestxmlstreamer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestxmlstreamer.h b/src/testlib/qtestxmlstreamer.h
index 9649a6b..f51d784 100644
--- a/src/testlib/qtestxmlstreamer.h
+++ b/src/testlib/qtestxmlstreamer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp
index a8c5e52..fc6b733 100644
--- a/src/testlib/qtestxunitstreamer.cpp
+++ b/src/testlib/qtestxunitstreamer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qtestxunitstreamer.h b/src/testlib/qtestxunitstreamer.h
index 06e0c91..cd2b9bb 100644
--- a/src/testlib/qtestxunitstreamer.h
+++ b/src/testlib/qtestxunitstreamer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index 07e8ef0..76efe5a 100644
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/testlib/qxmltestlogger_p.h b/src/testlib/qxmltestlogger_p.h
index ae918dc..c2118f2 100644
--- a/src/testlib/qxmltestlogger_p.h
+++ b/src/testlib/qxmltestlogger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/idc/main.cpp b/src/tools/idc/main.cpp
index 89ce083..e61b64d 100644
--- a/src/tools/idc/main.cpp
+++ b/src/tools/idc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index c3bbba1..b86e456 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h
index fb6ad747..8813d3a 100644
--- a/src/tools/moc/generator.h
+++ b/src/tools/moc/generator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp
index df1ba0d..c2b3853 100644
--- a/src/tools/moc/keywords.cpp
+++ b/src/tools/moc/keywords.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 4997690..81cdd93 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 2c24165..63a1084 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index 5e47d9a..2dfcd03 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/mwerks_mac.cpp b/src/tools/moc/mwerks_mac.cpp
index 5a7676d..5329e51 100644
--- a/src/tools/moc/mwerks_mac.cpp
+++ b/src/tools/moc/mwerks_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/mwerks_mac.h b/src/tools/moc/mwerks_mac.h
index 6f72d9c..09c3a99 100644
--- a/src/tools/moc/mwerks_mac.h
+++ b/src/tools/moc/mwerks_mac.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/outputrevision.h b/src/tools/moc/outputrevision.h
index 029065a..384e582 100644
--- a/src/tools/moc/outputrevision.h
+++ b/src/tools/moc/outputrevision.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/parser.cpp b/src/tools/moc/parser.cpp
index f6529af..9e3df94 100644
--- a/src/tools/moc/parser.cpp
+++ b/src/tools/moc/parser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/parser.h b/src/tools/moc/parser.h
index 06c1f99..b80d2c5 100644
--- a/src/tools/moc/parser.h
+++ b/src/tools/moc/parser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/ppkeywords.cpp b/src/tools/moc/ppkeywords.cpp
index 0a3adaf..28b1ac8 100644
--- a/src/tools/moc/ppkeywords.cpp
+++ b/src/tools/moc/ppkeywords.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index a8f4250..e0d3388 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h
index 94f29e9..e8b45a2 100644
--- a/src/tools/moc/preprocessor.h
+++ b/src/tools/moc/preprocessor.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h
index 673287f..d2c8dfa 100644
--- a/src/tools/moc/symbols.h
+++ b/src/tools/moc/symbols.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/token.cpp b/src/tools/moc/token.cpp
index 3da9446..74cea6c 100644
--- a/src/tools/moc/token.cpp
+++ b/src/tools/moc/token.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h
index 6ca3d84..5559e17 100644
--- a/src/tools/moc/token.h
+++ b/src/tools/moc/token.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh
index 67e9c7b..9fc9c46 100755
--- a/src/tools/moc/util/generate.sh
+++ b/src/tools/moc/util/generate.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp
index 88f187d..35938be 100644
--- a/src/tools/moc/util/generate_keywords.cpp
+++ b/src/tools/moc/util/generate_keywords.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/util/licenseheader.txt b/src/tools/moc/util/licenseheader.txt
index a428c7b..6f45d84 100644
--- a/src/tools/moc/util/licenseheader.txt
+++ b/src/tools/moc/util/licenseheader.txt
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h
index 6c1598f..62215c8 100644
--- a/src/tools/moc/utils.h
+++ b/src/tools/moc/utils.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp
index 27bda5f..fb7d05e 100644
--- a/src/tools/rcc/main.cpp
+++ b/src/tools/rcc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 0e3167d..271de7c 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h
index 4a25aed..836d126 100644
--- a/src/tools/rcc/rcc.h
+++ b/src/tools/rcc/rcc.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppextractimages.cpp b/src/tools/uic/cpp/cppextractimages.cpp
index 5809724..b98f68a 100644
--- a/src/tools/uic/cpp/cppextractimages.cpp
+++ b/src/tools/uic/cpp/cppextractimages.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h
index c2a1f1b..a4b21e1 100644
--- a/src/tools/uic/cpp/cppextractimages.h
+++ b/src/tools/uic/cpp/cppextractimages.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp
index 11676fb..edeffc9 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.cpp
+++ b/src/tools/uic/cpp/cppwritedeclaration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h
index f067aaa..fc9e0dc 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.h
+++ b/src/tools/uic/cpp/cppwritedeclaration.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteicondata.cpp b/src/tools/uic/cpp/cppwriteicondata.cpp
index 7e4b5c8..fb1d3bb 100644
--- a/src/tools/uic/cpp/cppwriteicondata.cpp
+++ b/src/tools/uic/cpp/cppwriteicondata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteicondata.h b/src/tools/uic/cpp/cppwriteicondata.h
index 42cfab0..245a4f2 100644
--- a/src/tools/uic/cpp/cppwriteicondata.h
+++ b/src/tools/uic/cpp/cppwriteicondata.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.cpp b/src/tools/uic/cpp/cppwriteicondeclaration.cpp
index cdad040..3f0ce2a 100644
--- a/src/tools/uic/cpp/cppwriteicondeclaration.cpp
+++ b/src/tools/uic/cpp/cppwriteicondeclaration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.h b/src/tools/uic/cpp/cppwriteicondeclaration.h
index 438de40..bfd502c 100644
--- a/src/tools/uic/cpp/cppwriteicondeclaration.h
+++ b/src/tools/uic/cpp/cppwriteicondeclaration.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.cpp b/src/tools/uic/cpp/cppwriteiconinitialization.cpp
index 194079f..92a04bf 100644
--- a/src/tools/uic/cpp/cppwriteiconinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteiconinitialization.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.h b/src/tools/uic/cpp/cppwriteiconinitialization.h
index 91d3689..64e90bb 100644
--- a/src/tools/uic/cpp/cppwriteiconinitialization.h
+++ b/src/tools/uic/cpp/cppwriteiconinitialization.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 7b9d03a..85ff22f 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index 656b6c9..67a5c08 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index b06eb7a..1510dee 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index 7507166..a490519 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp
index b2c0b4c..6aa5645 100644
--- a/src/tools/uic/customwidgetsinfo.cpp
+++ b/src/tools/uic/customwidgetsinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h
index afc8f06..2b8cedc 100644
--- a/src/tools/uic/customwidgetsinfo.h
+++ b/src/tools/uic/customwidgetsinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/databaseinfo.cpp b/src/tools/uic/databaseinfo.cpp
index 705a9be..3ab98ed 100644
--- a/src/tools/uic/databaseinfo.cpp
+++ b/src/tools/uic/databaseinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h
index 1d2f76f..1988b95 100644
--- a/src/tools/uic/databaseinfo.h
+++ b/src/tools/uic/databaseinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index 65d63e0..8df26f2 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h
index 0faea92..1395bf1 100644
--- a/src/tools/uic/driver.h
+++ b/src/tools/uic/driver.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/globaldefs.h b/src/tools/uic/globaldefs.h
index 11607cd..3b1df70 100644
--- a/src/tools/uic/globaldefs.h
+++ b/src/tools/uic/globaldefs.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index db4eea1..c7a09ad 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h
index 011a8f8..7e9e521 100644
--- a/src/tools/uic/option.h
+++ b/src/tools/uic/option.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/treewalker.cpp b/src/tools/uic/treewalker.cpp
index f12ab98..be0cacf 100644
--- a/src/tools/uic/treewalker.cpp
+++ b/src/tools/uic/treewalker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h
index 1b8d2d3..9ad8382 100644
--- a/src/tools/uic/treewalker.h
+++ b/src/tools/uic/treewalker.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp
index e80523f..ba6d744 100644
--- a/src/tools/uic/ui4.cpp
+++ b/src/tools/uic/ui4.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index 1f38f88..413d54f 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index f39966e..3efd8b5 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h
index b57c01d..34f6e43 100644
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h
index ba994ed..2729690 100644
--- a/src/tools/uic/utils.h
+++ b/src/tools/uic/utils.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/validator.cpp b/src/tools/uic/validator.cpp
index ceecb40..225665a 100644
--- a/src/tools/uic/validator.cpp
+++ b/src/tools/uic/validator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h
index fd53fc6..883b4da 100644
--- a/src/tools/uic/validator.h
+++ b/src/tools/uic/validator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/converter.cpp b/src/tools/uic3/converter.cpp
index 2ee939d..b7ddb3d 100644
--- a/src/tools/uic3/converter.cpp
+++ b/src/tools/uic3/converter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/deps.cpp b/src/tools/uic3/deps.cpp
index 44c4d52..7f65887 100644
--- a/src/tools/uic3/deps.cpp
+++ b/src/tools/uic3/deps.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/domtool.cpp b/src/tools/uic3/domtool.cpp
index 526b41c..5da0c58 100644
--- a/src/tools/uic3/domtool.cpp
+++ b/src/tools/uic3/domtool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/domtool.h b/src/tools/uic3/domtool.h
index ad597a1..262b08d 100644
--- a/src/tools/uic3/domtool.h
+++ b/src/tools/uic3/domtool.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/embed.cpp b/src/tools/uic3/embed.cpp
index 5970732..d59c557 100644
--- a/src/tools/uic3/embed.cpp
+++ b/src/tools/uic3/embed.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/form.cpp b/src/tools/uic3/form.cpp
index 9df644a..71de10a 100644
--- a/src/tools/uic3/form.cpp
+++ b/src/tools/uic3/form.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/main.cpp b/src/tools/uic3/main.cpp
index d7657b1..c9516f9 100644
--- a/src/tools/uic3/main.cpp
+++ b/src/tools/uic3/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/object.cpp b/src/tools/uic3/object.cpp
index d6076d9..76c3fe0 100644
--- a/src/tools/uic3/object.cpp
+++ b/src/tools/uic3/object.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/parser.cpp b/src/tools/uic3/parser.cpp
index 96d357c..eb11899 100644
--- a/src/tools/uic3/parser.cpp
+++ b/src/tools/uic3/parser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/parser.h b/src/tools/uic3/parser.h
index 2d966c2..67f85b2 100644
--- a/src/tools/uic3/parser.h
+++ b/src/tools/uic3/parser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/qt3to4.cpp b/src/tools/uic3/qt3to4.cpp
index e478e35..432de2b 100644
--- a/src/tools/uic3/qt3to4.cpp
+++ b/src/tools/uic3/qt3to4.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/qt3to4.h b/src/tools/uic3/qt3to4.h
index 71025c5..5639111 100644
--- a/src/tools/uic3/qt3to4.h
+++ b/src/tools/uic3/qt3to4.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/subclassing.cpp b/src/tools/uic3/subclassing.cpp
index 507dd01..b27eef2 100644
--- a/src/tools/uic3/subclassing.cpp
+++ b/src/tools/uic3/subclassing.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/ui3reader.cpp b/src/tools/uic3/ui3reader.cpp
index fd50a19..05ae792 100644
--- a/src/tools/uic3/ui3reader.cpp
+++ b/src/tools/uic3/ui3reader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/ui3reader.h b/src/tools/uic3/ui3reader.h
index abe323e..18f26b6 100644
--- a/src/tools/uic3/ui3reader.h
+++ b/src/tools/uic3/ui3reader.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/uic.cpp b/src/tools/uic3/uic.cpp
index 9cc5811..9a9fefa 100644
--- a/src/tools/uic3/uic.cpp
+++ b/src/tools/uic3/uic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/uic.h b/src/tools/uic3/uic.h
index d27a1da..41a02c6 100644
--- a/src/tools/uic3/uic.h
+++ b/src/tools/uic3/uic.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/widgetinfo.cpp b/src/tools/uic3/widgetinfo.cpp
index 275aac4..364fe33 100644
--- a/src/tools/uic3/widgetinfo.cpp
+++ b/src/tools/uic3/widgetinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/tools/uic3/widgetinfo.h b/src/tools/uic3/widgetinfo.h
index 7a4c127..99c4663 100644
--- a/src/tools/uic3/widgetinfo.h
+++ b/src/tools/uic3/widgetinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 662c796..f36c2d5 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h
index 4168040..32567f0 100644
--- a/src/xml/dom/qdom.h
+++ b/src/xml/dom/qdom.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 09e6d1e..a81cbc0 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 387cc8b..f8da87e 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xml/stream/qxmlstream.h b/src/xml/stream/qxmlstream.h
index 7989530..e76381a 100644
--- a/src/xml/stream/qxmlstream.h
+++ b/src/xml/stream/qxmlstream.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/Mainpage.dox b/src/xmlpatterns/Mainpage.dox
index ecb624f..9db72d0 100644
--- a/src/xmlpatterns/Mainpage.dox
+++ b/src/xmlpatterns/Mainpage.dox
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceliterators.cpp b/src/xmlpatterns/acceltree/qacceliterators.cpp
index 481a93a..16f144e 100644
--- a/src/xmlpatterns/acceltree/qacceliterators.cpp
+++ b/src/xmlpatterns/acceltree/qacceliterators.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h
index 58b7721..04fd83b 100644
--- a/src/xmlpatterns/acceltree/qacceliterators_p.h
+++ b/src/xmlpatterns/acceltree/qacceliterators_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp
index a7999d5..09704f9 100644
--- a/src/xmlpatterns/acceltree/qacceltree.cpp
+++ b/src/xmlpatterns/acceltree/qacceltree.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h
index e8f95b2..1f85500 100644
--- a/src/xmlpatterns/acceltree/qacceltree_p.h
+++ b/src/xmlpatterns/acceltree/qacceltree_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder.cpp b/src/xmlpatterns/acceltree/qacceltreebuilder.cpp
index 60d45df..ad74af6 100644
--- a/src/xmlpatterns/acceltree/qacceltreebuilder.cpp
+++ b/src/xmlpatterns/acceltree/qacceltreebuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
index f5c3891..a1d4ae9 100644
--- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
index 1307cdb..b9f3b8a 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
index 20e9b57..a9ce7ae 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp b/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
index 3e71e35..50f40bf 100644
--- a/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
+++ b/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
index b18edae..1b30654 100644
--- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
+++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.cpp b/src/xmlpatterns/api/qabstractmessagehandler.cpp
index 24a452c..268c79b 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.cpp
+++ b/src/xmlpatterns/api/qabstractmessagehandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index 9c66e4a..8de57d4 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstracturiresolver.cpp b/src/xmlpatterns/api/qabstracturiresolver.cpp
index 2bb3544..0ca91f0 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.cpp
+++ b/src/xmlpatterns/api/qabstracturiresolver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index 077dfa6..4c7de72 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp b/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
index c4de400..7ec4fd7 100644
--- a/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
+++ b/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
index ad9b644..69eb18a 100644
--- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
+++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
index 0f9760d..064b14d 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index 9a4c548..702c3c7 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
index 20a00ba..2e46541 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlpullprovider.cpp b/src/xmlpatterns/api/qabstractxmlpullprovider.cpp
index 6dbd50b..90f5459 100644
--- a/src/xmlpatterns/api/qabstractxmlpullprovider.cpp
+++ b/src/xmlpatterns/api/qabstractxmlpullprovider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
index 547bf4b..2ced918 100644
--- a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
+++ b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.cpp b/src/xmlpatterns/api/qabstractxmlreceiver.cpp
index 83eaae0..243c8e5 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver.cpp
+++ b/src/xmlpatterns/api/qabstractxmlreceiver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.h b/src/xmlpatterns/api/qabstractxmlreceiver.h
index 604feb2..477fb17 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver.h
+++ b/src/xmlpatterns/api/qabstractxmlreceiver.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver_p.h b/src/xmlpatterns/api/qabstractxmlreceiver_p.h
index 5d2417a..266b731 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver_p.h
+++ b/src/xmlpatterns/api/qabstractxmlreceiver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
index 5280962..a610062 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler.cpp
+++ b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qcoloringmessagehandler_p.h b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
index 862310d..d4de43e 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler_p.h
+++ b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the XMLPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qcoloroutput.cpp b/src/xmlpatterns/api/qcoloroutput.cpp
index d07efc8..49eb356 100644
--- a/src/xmlpatterns/api/qcoloroutput.cpp
+++ b/src/xmlpatterns/api/qcoloroutput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h
index 7d8a68d..b91daf3 100644
--- a/src/xmlpatterns/api/qcoloroutput_p.h
+++ b/src/xmlpatterns/api/qcoloroutput_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the XMLPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h
index 80b6ff1..9fca535 100644
--- a/src/xmlpatterns/api/qdeviceresourceloader_p.h
+++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qiodevicedelegate.cpp b/src/xmlpatterns/api/qiodevicedelegate.cpp
index 235c0c7..610c859 100644
--- a/src/xmlpatterns/api/qiodevicedelegate.cpp
+++ b/src/xmlpatterns/api/qiodevicedelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qiodevicedelegate_p.h b/src/xmlpatterns/api/qiodevicedelegate_p.h
index 0ffede7..6f11d14 100644
--- a/src/xmlpatterns/api/qiodevicedelegate_p.h
+++ b/src/xmlpatterns/api/qiodevicedelegate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator.cpp b/src/xmlpatterns/api/qnetworkaccessdelegator.cpp
index ed45f07..6681f6c 100644
--- a/src/xmlpatterns/api/qnetworkaccessdelegator.cpp
+++ b/src/xmlpatterns/api/qnetworkaccessdelegator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
index 7925e4e..7233820 100644
--- a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
+++ b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qpullbridge.cpp b/src/xmlpatterns/api/qpullbridge.cpp
index 80dac38..fc09464 100644
--- a/src/xmlpatterns/api/qpullbridge.cpp
+++ b/src/xmlpatterns/api/qpullbridge.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qpullbridge_p.h b/src/xmlpatterns/api/qpullbridge_p.h
index 1553a3e..a6af63f 100644
--- a/src/xmlpatterns/api/qpullbridge_p.h
+++ b/src/xmlpatterns/api/qpullbridge_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qreferencecountedvalue_p.h b/src/xmlpatterns/api/qreferencecountedvalue_p.h
index 39fb7e3..6d7c5b5 100644
--- a/src/xmlpatterns/api/qreferencecountedvalue_p.h
+++ b/src/xmlpatterns/api/qreferencecountedvalue_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qresourcedelegator.cpp b/src/xmlpatterns/api/qresourcedelegator.cpp
index cc07705..a898db8 100644
--- a/src/xmlpatterns/api/qresourcedelegator.cpp
+++ b/src/xmlpatterns/api/qresourcedelegator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h
index 6d8205b..1ed4be1 100644
--- a/src/xmlpatterns/api/qresourcedelegator_p.h
+++ b/src/xmlpatterns/api/qresourcedelegator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.cpp b/src/xmlpatterns/api/qsimplexmlnodemodel.cpp
index 60689bf..6bcda05 100644
--- a/src/xmlpatterns/api/qsimplexmlnodemodel.cpp
+++ b/src/xmlpatterns/api/qsimplexmlnodemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index ae912b8..784bcb6 100644
--- a/src/xmlpatterns/api/qsimplexmlnodemodel.h
+++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qsourcelocation.cpp b/src/xmlpatterns/api/qsourcelocation.cpp
index 7dee203..df9dc5b 100644
--- a/src/xmlpatterns/api/qsourcelocation.cpp
+++ b/src/xmlpatterns/api/qsourcelocation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qsourcelocation.h b/src/xmlpatterns/api/qsourcelocation.h
index 3c7608d..eaeaa39 100644
--- a/src/xmlpatterns/api/qsourcelocation.h
+++ b/src/xmlpatterns/api/qsourcelocation.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/quriloader.cpp b/src/xmlpatterns/api/quriloader.cpp
index e0a7542..ce5463f 100644
--- a/src/xmlpatterns/api/quriloader.cpp
+++ b/src/xmlpatterns/api/quriloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/quriloader_p.h b/src/xmlpatterns/api/quriloader_p.h
index 799572c..31606d1 100644
--- a/src/xmlpatterns/api/quriloader_p.h
+++ b/src/xmlpatterns/api/quriloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qvariableloader.cpp b/src/xmlpatterns/api/qvariableloader.cpp
index 612fa67..a7cf95f 100644
--- a/src/xmlpatterns/api/qvariableloader.cpp
+++ b/src/xmlpatterns/api/qvariableloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qvariableloader_p.h b/src/xmlpatterns/api/qvariableloader_p.h
index 1652edf..a48996b 100644
--- a/src/xmlpatterns/api/qvariableloader_p.h
+++ b/src/xmlpatterns/api/qvariableloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlformatter.cpp b/src/xmlpatterns/api/qxmlformatter.cpp
index 881ee3d..9cfe8c8 100644
--- a/src/xmlpatterns/api/qxmlformatter.cpp
+++ b/src/xmlpatterns/api/qxmlformatter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h
index 22f6dcf..173cc20 100644
--- a/src/xmlpatterns/api/qxmlformatter.h
+++ b/src/xmlpatterns/api/qxmlformatter.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlname.cpp b/src/xmlpatterns/api/qxmlname.cpp
index 32e3e38..de4e713 100644
--- a/src/xmlpatterns/api/qxmlname.cpp
+++ b/src/xmlpatterns/api/qxmlname.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h
index efe324f..6619e05 100644
--- a/src/xmlpatterns/api/qxmlname.h
+++ b/src/xmlpatterns/api/qxmlname.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlnamepool.cpp b/src/xmlpatterns/api/qxmlnamepool.cpp
index 49bca5a..61d63cf 100644
--- a/src/xmlpatterns/api/qxmlnamepool.cpp
+++ b/src/xmlpatterns/api/qxmlnamepool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlnamepool.h b/src/xmlpatterns/api/qxmlnamepool.h
index 36e3ff9..2cf0540 100644
--- a/src/xmlpatterns/api/qxmlnamepool.h
+++ b/src/xmlpatterns/api/qxmlnamepool.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlpatternistcli_p.h b/src/xmlpatterns/api/qxmlpatternistcli_p.h
index a4981cf..fbbc98a 100644
--- a/src/xmlpatterns/api/qxmlpatternistcli_p.h
+++ b/src/xmlpatterns/api/qxmlpatternistcli_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the XMLPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlquery.cpp b/src/xmlpatterns/api/qxmlquery.cpp
index 55af49b..14c11d2 100644
--- a/src/xmlpatterns/api/qxmlquery.cpp
+++ b/src/xmlpatterns/api/qxmlquery.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlquery.h b/src/xmlpatterns/api/qxmlquery.h
index 26c870f..e665dbc 100644
--- a/src/xmlpatterns/api/qxmlquery.h
+++ b/src/xmlpatterns/api/qxmlquery.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlquery_p.h b/src/xmlpatterns/api/qxmlquery_p.h
index b54c34f..ceab9f6 100644
--- a/src/xmlpatterns/api/qxmlquery_p.h
+++ b/src/xmlpatterns/api/qxmlquery_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlresultitems.cpp b/src/xmlpatterns/api/qxmlresultitems.cpp
index 98c5bdc..a820c49 100644
--- a/src/xmlpatterns/api/qxmlresultitems.cpp
+++ b/src/xmlpatterns/api/qxmlresultitems.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h
index 7ae54e3..0156e63 100644
--- a/src/xmlpatterns/api/qxmlresultitems.h
+++ b/src/xmlpatterns/api/qxmlresultitems.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlresultitems_p.h b/src/xmlpatterns/api/qxmlresultitems_p.h
index 013e33a..5a4fb60 100644
--- a/src/xmlpatterns/api/qxmlresultitems_p.h
+++ b/src/xmlpatterns/api/qxmlresultitems_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlschema.cpp b/src/xmlpatterns/api/qxmlschema.cpp
index ee92195..033decb 100644
--- a/src/xmlpatterns/api/qxmlschema.cpp
+++ b/src/xmlpatterns/api/qxmlschema.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlschema.h b/src/xmlpatterns/api/qxmlschema.h
index 145f2dc..d17b91c 100644
--- a/src/xmlpatterns/api/qxmlschema.h
+++ b/src/xmlpatterns/api/qxmlschema.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlschema_p.cpp b/src/xmlpatterns/api/qxmlschema_p.cpp
index f5ed5c0..66b644c 100644
--- a/src/xmlpatterns/api/qxmlschema_p.cpp
+++ b/src/xmlpatterns/api/qxmlschema_p.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlschema_p.h b/src/xmlpatterns/api/qxmlschema_p.h
index 2376fe3..9cb9982 100644
--- a/src/xmlpatterns/api/qxmlschema_p.h
+++ b/src/xmlpatterns/api/qxmlschema_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlschemavalidator.cpp b/src/xmlpatterns/api/qxmlschemavalidator.cpp
index 682d34f..c997cf1 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator.cpp
+++ b/src/xmlpatterns/api/qxmlschemavalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlschemavalidator.h b/src/xmlpatterns/api/qxmlschemavalidator.h
index 7121d19..1f3cf8f 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator.h
+++ b/src/xmlpatterns/api/qxmlschemavalidator.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlschemavalidator_p.h b/src/xmlpatterns/api/qxmlschemavalidator_p.h
index fb9492a..ac3a16d 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator_p.h
+++ b/src/xmlpatterns/api/qxmlschemavalidator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlserializer.cpp b/src/xmlpatterns/api/qxmlserializer.cpp
index 77385c0..89cd8f2 100644
--- a/src/xmlpatterns/api/qxmlserializer.cpp
+++ b/src/xmlpatterns/api/qxmlserializer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h
index 6e737aa..5cda794 100644
--- a/src/xmlpatterns/api/qxmlserializer.h
+++ b/src/xmlpatterns/api/qxmlserializer.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/api/qxmlserializer_p.h b/src/xmlpatterns/api/qxmlserializer_p.h
index 92e1118..eece188 100644
--- a/src/xmlpatterns/api/qxmlserializer_p.h
+++ b/src/xmlpatterns/api/qxmlserializer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp
index a298698..4399b7e 100644
--- a/src/xmlpatterns/data/qabstractdatetime.cpp
+++ b/src/xmlpatterns/data/qabstractdatetime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h
index e5138cc..8d89ebb 100644
--- a/src/xmlpatterns/data/qabstractdatetime_p.h
+++ b/src/xmlpatterns/data/qabstractdatetime_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractduration.cpp b/src/xmlpatterns/data/qabstractduration.cpp
index 44a1b66..3098522 100644
--- a/src/xmlpatterns/data/qabstractduration.cpp
+++ b/src/xmlpatterns/data/qabstractduration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractduration_p.h b/src/xmlpatterns/data/qabstractduration_p.h
index e0b86e7..90b369e 100644
--- a/src/xmlpatterns/data/qabstractduration_p.h
+++ b/src/xmlpatterns/data/qabstractduration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractfloat.cpp b/src/xmlpatterns/data/qabstractfloat.cpp
index d3384fe..7f2dfa5 100644
--- a/src/xmlpatterns/data/qabstractfloat.cpp
+++ b/src/xmlpatterns/data/qabstractfloat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h
index fe38c42..0c6d56f 100644
--- a/src/xmlpatterns/data/qabstractfloat_p.h
+++ b/src/xmlpatterns/data/qabstractfloat_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractfloatcasters.cpp b/src/xmlpatterns/data/qabstractfloatcasters.cpp
index de8f39e..efc56f6 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters.cpp
+++ b/src/xmlpatterns/data/qabstractfloatcasters.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h
index 6e35887..0c12fca 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters_p.h
+++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractfloatmathematician.cpp b/src/xmlpatterns/data/qabstractfloatmathematician.cpp
index 161e0ad..b832b29 100644
--- a/src/xmlpatterns/data/qabstractfloatmathematician.cpp
+++ b/src/xmlpatterns/data/qabstractfloatmathematician.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
index 864e794..05479f0 100644
--- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h
+++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qanyuri.cpp b/src/xmlpatterns/data/qanyuri.cpp
index 5201c2d..e823bca 100644
--- a/src/xmlpatterns/data/qanyuri.cpp
+++ b/src/xmlpatterns/data/qanyuri.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h
index cb08cc1..28fdc65 100644
--- a/src/xmlpatterns/data/qanyuri_p.h
+++ b/src/xmlpatterns/data/qanyuri_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccaster.cpp b/src/xmlpatterns/data/qatomiccaster.cpp
index 2d096a8..5f78b53 100644
--- a/src/xmlpatterns/data/qatomiccaster.cpp
+++ b/src/xmlpatterns/data/qatomiccaster.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccaster_p.h b/src/xmlpatterns/data/qatomiccaster_p.h
index 3b9af6c..3d21136 100644
--- a/src/xmlpatterns/data/qatomiccaster_p.h
+++ b/src/xmlpatterns/data/qatomiccaster_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccasters.cpp b/src/xmlpatterns/data/qatomiccasters.cpp
index e72d880..d13db03 100644
--- a/src/xmlpatterns/data/qatomiccasters.cpp
+++ b/src/xmlpatterns/data/qatomiccasters.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h
index c99d25f..e90f428 100644
--- a/src/xmlpatterns/data/qatomiccasters_p.h
+++ b/src/xmlpatterns/data/qatomiccasters_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccomparator.cpp b/src/xmlpatterns/data/qatomiccomparator.cpp
index 1dcdef0..1be0db6 100644
--- a/src/xmlpatterns/data/qatomiccomparator.cpp
+++ b/src/xmlpatterns/data/qatomiccomparator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccomparator_p.h b/src/xmlpatterns/data/qatomiccomparator_p.h
index ee685a6..9e469cb 100644
--- a/src/xmlpatterns/data/qatomiccomparator_p.h
+++ b/src/xmlpatterns/data/qatomiccomparator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccomparators.cpp b/src/xmlpatterns/data/qatomiccomparators.cpp
index ff594f9..4839723 100644
--- a/src/xmlpatterns/data/qatomiccomparators.cpp
+++ b/src/xmlpatterns/data/qatomiccomparators.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h
index d17271c..15a89c5 100644
--- a/src/xmlpatterns/data/qatomiccomparators_p.h
+++ b/src/xmlpatterns/data/qatomiccomparators_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomicmathematician.cpp b/src/xmlpatterns/data/qatomicmathematician.cpp
index 9841755..d4ea920 100644
--- a/src/xmlpatterns/data/qatomicmathematician.cpp
+++ b/src/xmlpatterns/data/qatomicmathematician.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomicmathematician_p.h b/src/xmlpatterns/data/qatomicmathematician_p.h
index 64b1bf3..3b9d65c 100644
--- a/src/xmlpatterns/data/qatomicmathematician_p.h
+++ b/src/xmlpatterns/data/qatomicmathematician_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomicmathematicians.cpp b/src/xmlpatterns/data/qatomicmathematicians.cpp
index da3a242..0cf9946 100644
--- a/src/xmlpatterns/data/qatomicmathematicians.cpp
+++ b/src/xmlpatterns/data/qatomicmathematicians.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h
index cdefee3..c9399fc 100644
--- a/src/xmlpatterns/data/qatomicmathematicians_p.h
+++ b/src/xmlpatterns/data/qatomicmathematicians_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomicstring.cpp b/src/xmlpatterns/data/qatomicstring.cpp
index cefadf8..7736b70 100644
--- a/src/xmlpatterns/data/qatomicstring.cpp
+++ b/src/xmlpatterns/data/qatomicstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h
index 7921323..d6fb19d 100644
--- a/src/xmlpatterns/data/qatomicstring_p.h
+++ b/src/xmlpatterns/data/qatomicstring_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp
index c4f3578..fc07cce 100644
--- a/src/xmlpatterns/data/qatomicvalue.cpp
+++ b/src/xmlpatterns/data/qatomicvalue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qbase64binary.cpp b/src/xmlpatterns/data/qbase64binary.cpp
index fee115a..0023b07 100644
--- a/src/xmlpatterns/data/qbase64binary.cpp
+++ b/src/xmlpatterns/data/qbase64binary.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h
index 12477b0..6e8ac94 100644
--- a/src/xmlpatterns/data/qbase64binary_p.h
+++ b/src/xmlpatterns/data/qbase64binary_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qboolean.cpp b/src/xmlpatterns/data/qboolean.cpp
index c219239..9e4bc09 100644
--- a/src/xmlpatterns/data/qboolean.cpp
+++ b/src/xmlpatterns/data/qboolean.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h
index 85afa86..e5f5006 100644
--- a/src/xmlpatterns/data/qboolean_p.h
+++ b/src/xmlpatterns/data/qboolean_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qcommonvalues.cpp b/src/xmlpatterns/data/qcommonvalues.cpp
index a1cbdd3..983ff0f 100644
--- a/src/xmlpatterns/data/qcommonvalues.cpp
+++ b/src/xmlpatterns/data/qcommonvalues.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h
index 3a84c2a..e83cf7f 100644
--- a/src/xmlpatterns/data/qcommonvalues_p.h
+++ b/src/xmlpatterns/data/qcommonvalues_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qcomparisonfactory.cpp b/src/xmlpatterns/data/qcomparisonfactory.cpp
index 66d72af..abadb49 100644
--- a/src/xmlpatterns/data/qcomparisonfactory.cpp
+++ b/src/xmlpatterns/data/qcomparisonfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qcomparisonfactory_p.h b/src/xmlpatterns/data/qcomparisonfactory_p.h
index 61f65b1..8e47132 100644
--- a/src/xmlpatterns/data/qcomparisonfactory_p.h
+++ b/src/xmlpatterns/data/qcomparisonfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qdate.cpp b/src/xmlpatterns/data/qdate.cpp
index a3a44af..ddf0e09 100644
--- a/src/xmlpatterns/data/qdate.cpp
+++ b/src/xmlpatterns/data/qdate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h
index 949c88c..5d5487f 100644
--- a/src/xmlpatterns/data/qdate_p.h
+++ b/src/xmlpatterns/data/qdate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qdaytimeduration.cpp b/src/xmlpatterns/data/qdaytimeduration.cpp
index d81555a..4603098 100644
--- a/src/xmlpatterns/data/qdaytimeduration.cpp
+++ b/src/xmlpatterns/data/qdaytimeduration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h
index eef28c2..32ea23a 100644
--- a/src/xmlpatterns/data/qdaytimeduration_p.h
+++ b/src/xmlpatterns/data/qdaytimeduration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qdecimal.cpp b/src/xmlpatterns/data/qdecimal.cpp
index 3b29955..3954430 100644
--- a/src/xmlpatterns/data/qdecimal.cpp
+++ b/src/xmlpatterns/data/qdecimal.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h
index 2a5e0b3..b68f1ec 100644
--- a/src/xmlpatterns/data/qdecimal_p.h
+++ b/src/xmlpatterns/data/qdecimal_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h
index 485949a..9df4b34 100644
--- a/src/xmlpatterns/data/qderivedinteger_p.h
+++ b/src/xmlpatterns/data/qderivedinteger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h
index d39715d..81f26bf 100644
--- a/src/xmlpatterns/data/qderivedstring_p.h
+++ b/src/xmlpatterns/data/qderivedstring_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qduration.cpp b/src/xmlpatterns/data/qduration.cpp
index e3cfd4f..e174ad6 100644
--- a/src/xmlpatterns/data/qduration.cpp
+++ b/src/xmlpatterns/data/qduration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h
index 39c54bc..7643eda 100644
--- a/src/xmlpatterns/data/qduration_p.h
+++ b/src/xmlpatterns/data/qduration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgday.cpp b/src/xmlpatterns/data/qgday.cpp
index 7d11dfb..2a3eb75 100644
--- a/src/xmlpatterns/data/qgday.cpp
+++ b/src/xmlpatterns/data/qgday.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h
index 3910a12..87af9a1 100644
--- a/src/xmlpatterns/data/qgday_p.h
+++ b/src/xmlpatterns/data/qgday_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgmonth.cpp b/src/xmlpatterns/data/qgmonth.cpp
index 70dffae..3a5986d 100644
--- a/src/xmlpatterns/data/qgmonth.cpp
+++ b/src/xmlpatterns/data/qgmonth.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h
index b08fdf3..72ec296 100644
--- a/src/xmlpatterns/data/qgmonth_p.h
+++ b/src/xmlpatterns/data/qgmonth_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgmonthday.cpp b/src/xmlpatterns/data/qgmonthday.cpp
index 8916c09..46b29aa 100644
--- a/src/xmlpatterns/data/qgmonthday.cpp
+++ b/src/xmlpatterns/data/qgmonthday.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h
index 322e31b..a1c8120 100644
--- a/src/xmlpatterns/data/qgmonthday_p.h
+++ b/src/xmlpatterns/data/qgmonthday_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgyear.cpp b/src/xmlpatterns/data/qgyear.cpp
index 81a95a3..9457cc9 100644
--- a/src/xmlpatterns/data/qgyear.cpp
+++ b/src/xmlpatterns/data/qgyear.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h
index 1f5ebe2..4e5064e 100644
--- a/src/xmlpatterns/data/qgyear_p.h
+++ b/src/xmlpatterns/data/qgyear_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgyearmonth.cpp b/src/xmlpatterns/data/qgyearmonth.cpp
index f5a6a3f..cc7b779 100644
--- a/src/xmlpatterns/data/qgyearmonth.cpp
+++ b/src/xmlpatterns/data/qgyearmonth.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h
index a0f5ba7..d4f84c7 100644
--- a/src/xmlpatterns/data/qgyearmonth_p.h
+++ b/src/xmlpatterns/data/qgyearmonth_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qhexbinary.cpp b/src/xmlpatterns/data/qhexbinary.cpp
index 8637f58..9daf056 100644
--- a/src/xmlpatterns/data/qhexbinary.cpp
+++ b/src/xmlpatterns/data/qhexbinary.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h
index 715330c..12962ff 100644
--- a/src/xmlpatterns/data/qhexbinary_p.h
+++ b/src/xmlpatterns/data/qhexbinary_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qinteger.cpp b/src/xmlpatterns/data/qinteger.cpp
index a404092..7c6c0cb 100644
--- a/src/xmlpatterns/data/qinteger.cpp
+++ b/src/xmlpatterns/data/qinteger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h
index dcffcc4..849b422 100644
--- a/src/xmlpatterns/data/qinteger_p.h
+++ b/src/xmlpatterns/data/qinteger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qitem.cpp b/src/xmlpatterns/data/qitem.cpp
index 5244fc1..6311722 100644
--- a/src/xmlpatterns/data/qitem.cpp
+++ b/src/xmlpatterns/data/qitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h
index b68c2d4..6a61302 100644
--- a/src/xmlpatterns/data/qitem_p.h
+++ b/src/xmlpatterns/data/qitem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qnodebuilder.cpp b/src/xmlpatterns/data/qnodebuilder.cpp
index 268ad3e..11df0eb 100644
--- a/src/xmlpatterns/data/qnodebuilder.cpp
+++ b/src/xmlpatterns/data/qnodebuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qnodebuilder_p.h b/src/xmlpatterns/data/qnodebuilder_p.h
index c5bc31b..4e47f23 100644
--- a/src/xmlpatterns/data/qnodebuilder_p.h
+++ b/src/xmlpatterns/data/qnodebuilder_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qnodemodel.cpp b/src/xmlpatterns/data/qnodemodel.cpp
index 60841ad..107d559 100644
--- a/src/xmlpatterns/data/qnodemodel.cpp
+++ b/src/xmlpatterns/data/qnodemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qqnamevalue.cpp b/src/xmlpatterns/data/qqnamevalue.cpp
index 9d0c0f4..e89ac37 100644
--- a/src/xmlpatterns/data/qqnamevalue.cpp
+++ b/src/xmlpatterns/data/qqnamevalue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h
index 50c137e..aa7cc54 100644
--- a/src/xmlpatterns/data/qqnamevalue_p.h
+++ b/src/xmlpatterns/data/qqnamevalue_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qresourceloader.cpp b/src/xmlpatterns/data/qresourceloader.cpp
index f1358a2..73133e0 100644
--- a/src/xmlpatterns/data/qresourceloader.cpp
+++ b/src/xmlpatterns/data/qresourceloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qresourceloader_p.h b/src/xmlpatterns/data/qresourceloader_p.h
index 7cd9f51..9b5692c 100644
--- a/src/xmlpatterns/data/qresourceloader_p.h
+++ b/src/xmlpatterns/data/qresourceloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qschemadatetime.cpp b/src/xmlpatterns/data/qschemadatetime.cpp
index 923590b..bca4745 100644
--- a/src/xmlpatterns/data/qschemadatetime.cpp
+++ b/src/xmlpatterns/data/qschemadatetime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h
index bfafd92..ebeee78 100644
--- a/src/xmlpatterns/data/qschemadatetime_p.h
+++ b/src/xmlpatterns/data/qschemadatetime_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qschemanumeric.cpp b/src/xmlpatterns/data/qschemanumeric.cpp
index 53e550d..e62a583 100644
--- a/src/xmlpatterns/data/qschemanumeric.cpp
+++ b/src/xmlpatterns/data/qschemanumeric.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qschemanumeric_p.h b/src/xmlpatterns/data/qschemanumeric_p.h
index 7d703f1..0cefeb0 100644
--- a/src/xmlpatterns/data/qschemanumeric_p.h
+++ b/src/xmlpatterns/data/qschemanumeric_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qschematime.cpp b/src/xmlpatterns/data/qschematime.cpp
index 10979d0..cfa867d 100644
--- a/src/xmlpatterns/data/qschematime.cpp
+++ b/src/xmlpatterns/data/qschematime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h
index bd63714..d74264b 100644
--- a/src/xmlpatterns/data/qschematime_p.h
+++ b/src/xmlpatterns/data/qschematime_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qsequencereceiver.cpp b/src/xmlpatterns/data/qsequencereceiver.cpp
index 4079625..3370296 100644
--- a/src/xmlpatterns/data/qsequencereceiver.cpp
+++ b/src/xmlpatterns/data/qsequencereceiver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qsequencereceiver_p.h b/src/xmlpatterns/data/qsequencereceiver_p.h
index 9e13e66..4bc1225 100644
--- a/src/xmlpatterns/data/qsequencereceiver_p.h
+++ b/src/xmlpatterns/data/qsequencereceiver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qsorttuple.cpp b/src/xmlpatterns/data/qsorttuple.cpp
index 0c3d699..c8aec91 100644
--- a/src/xmlpatterns/data/qsorttuple.cpp
+++ b/src/xmlpatterns/data/qsorttuple.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h
index 5aa97bc..12e476b 100644
--- a/src/xmlpatterns/data/qsorttuple_p.h
+++ b/src/xmlpatterns/data/qsorttuple_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/quntypedatomic.cpp b/src/xmlpatterns/data/quntypedatomic.cpp
index 9c2a289..086dda3 100644
--- a/src/xmlpatterns/data/quntypedatomic.cpp
+++ b/src/xmlpatterns/data/quntypedatomic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h
index 2cfad4e..daa9936 100644
--- a/src/xmlpatterns/data/quntypedatomic_p.h
+++ b/src/xmlpatterns/data/quntypedatomic_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qvalidationerror.cpp b/src/xmlpatterns/data/qvalidationerror.cpp
index b6e2d31..2d63df9 100644
--- a/src/xmlpatterns/data/qvalidationerror.cpp
+++ b/src/xmlpatterns/data/qvalidationerror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h
index 721ea9e..213e97f 100644
--- a/src/xmlpatterns/data/qvalidationerror_p.h
+++ b/src/xmlpatterns/data/qvalidationerror_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qvaluefactory.cpp b/src/xmlpatterns/data/qvaluefactory.cpp
index 8f7e5a3..699fcde 100644
--- a/src/xmlpatterns/data/qvaluefactory.cpp
+++ b/src/xmlpatterns/data/qvaluefactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qvaluefactory_p.h b/src/xmlpatterns/data/qvaluefactory_p.h
index e383d27..1d6d4b2 100644
--- a/src/xmlpatterns/data/qvaluefactory_p.h
+++ b/src/xmlpatterns/data/qvaluefactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qyearmonthduration.cpp b/src/xmlpatterns/data/qyearmonthduration.cpp
index beb6db5..14b5209 100644
--- a/src/xmlpatterns/data/qyearmonthduration.cpp
+++ b/src/xmlpatterns/data/qyearmonthduration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h
index 01fcadf..b50adcd 100644
--- a/src/xmlpatterns/data/qyearmonthduration_p.h
+++ b/src/xmlpatterns/data/qyearmonthduration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/documentationGroups.dox b/src/xmlpatterns/documentationGroups.dox
index 8af085d..b4c9455 100644
--- a/src/xmlpatterns/documentationGroups.dox
+++ b/src/xmlpatterns/documentationGroups.dox
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/createReportContext.sh b/src/xmlpatterns/environment/createReportContext.sh
index 570b1ee..454f012 100755
--- a/src/xmlpatterns/environment/createReportContext.sh
+++ b/src/xmlpatterns/environment/createReportContext.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/xmlpatterns/environment/createReportContext.xsl b/src/xmlpatterns/environment/createReportContext.xsl
index 1b0d84e..686a033 100644
--- a/src/xmlpatterns/environment/createReportContext.xsl
+++ b/src/xmlpatterns/environment/createReportContext.xsl
@@ -9,11 +9,11 @@
 ** This file is part of the Patternist project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ***************************************************************************
@@ -98,11 +98,11 @@ NOTE: Be aware of binary compatibility when using this stylesheet.
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -116,16 +116,16 @@ NOTE: Be aware of binary compatibility when using this stylesheet.
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qcurrentitemcontext.cpp b/src/xmlpatterns/environment/qcurrentitemcontext.cpp
index e0fe8eb..8325ff0 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext.cpp
+++ b/src/xmlpatterns/environment/qcurrentitemcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
index 0c59edc..148f94b 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h
+++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp b/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
index a3eb260..29d203b 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
index dd74f34..40ed973 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp b/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
index d34126b..ab42111 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
index bd08cef..5e549ab 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qdynamiccontext.cpp b/src/xmlpatterns/environment/qdynamiccontext.cpp
index 17901ee..042d80b 100644
--- a/src/xmlpatterns/environment/qdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qdynamiccontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h
index bd95295..a76138d 100644
--- a/src/xmlpatterns/environment/qdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdynamiccontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qfocus.cpp b/src/xmlpatterns/environment/qfocus.cpp
index ceef1bc..bfc454d 100644
--- a/src/xmlpatterns/environment/qfocus.cpp
+++ b/src/xmlpatterns/environment/qfocus.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h
index 5711422..774cac2 100644
--- a/src/xmlpatterns/environment/qfocus_p.h
+++ b/src/xmlpatterns/environment/qfocus_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext.cpp b/src/xmlpatterns/environment/qgenericdynamiccontext.cpp
index 7c843bc..9c4131c 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
index cdbf0a4..462183c 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qgenericstaticcontext.cpp b/src/xmlpatterns/environment/qgenericstaticcontext.cpp
index 63d7dd3..653dc84 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext.cpp
+++ b/src/xmlpatterns/environment/qgenericstaticcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
index 3c773c7..6439284 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp b/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
index 903e8d5..2edba8c 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
index 8745193..e41db41 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qreportcontext.cpp b/src/xmlpatterns/environment/qreportcontext.cpp
index 220e0a3..5043df9 100644
--- a/src/xmlpatterns/environment/qreportcontext.cpp
+++ b/src/xmlpatterns/environment/qreportcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h
index 0600805..f698204 100644
--- a/src/xmlpatterns/environment/qreportcontext_p.h
+++ b/src/xmlpatterns/environment/qreportcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstackcontextbase.cpp b/src/xmlpatterns/environment/qstackcontextbase.cpp
index 198ace1..bd1e215 100644
--- a/src/xmlpatterns/environment/qstackcontextbase.cpp
+++ b/src/xmlpatterns/environment/qstackcontextbase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h
index dda8902..eaa17d3 100644
--- a/src/xmlpatterns/environment/qstackcontextbase_p.h
+++ b/src/xmlpatterns/environment/qstackcontextbase_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext.cpp b/src/xmlpatterns/environment/qstaticbaseuricontext.cpp
index ccf7dc6..f9892f9 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext.cpp
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
index 6aba56f..80c593c 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp b/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
index d0e2434..f2504e4 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
index 32935b1..94d3118 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticcontext.cpp b/src/xmlpatterns/environment/qstaticcontext.cpp
index fe3e749..1d9cbf8 100644
--- a/src/xmlpatterns/environment/qstaticcontext.cpp
+++ b/src/xmlpatterns/environment/qstaticcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h
index 3b1b050..dee16e1 100644
--- a/src/xmlpatterns/environment/qstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext.cpp b/src/xmlpatterns/environment/qstaticcurrentcontext.cpp
index 6501141..f76ef86 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext.cpp
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
index 3066e10..7852cce 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticfocuscontext.cpp b/src/xmlpatterns/environment/qstaticfocuscontext.cpp
index 26811ea..2fe673d 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext.cpp
+++ b/src/xmlpatterns/environment/qstaticfocuscontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
index cfe0403..529d9ed 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h
+++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext.cpp b/src/xmlpatterns/environment/qstaticnamespacecontext.cpp
index efe18ba..ff5535b 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext.cpp
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
index b765de6..77d244f 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qandexpression.cpp b/src/xmlpatterns/expr/qandexpression.cpp
index 75a32c8..8ec7727 100644
--- a/src/xmlpatterns/expr/qandexpression.cpp
+++ b/src/xmlpatterns/expr/qandexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h
index ee230df..930d25d 100644
--- a/src/xmlpatterns/expr/qandexpression_p.h
+++ b/src/xmlpatterns/expr/qandexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qapplytemplate.cpp b/src/xmlpatterns/expr/qapplytemplate.cpp
index 5d73901..c619414 100644
--- a/src/xmlpatterns/expr/qapplytemplate.cpp
+++ b/src/xmlpatterns/expr/qapplytemplate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h
index 12f5d3f..bad0287 100644
--- a/src/xmlpatterns/expr/qapplytemplate_p.h
+++ b/src/xmlpatterns/expr/qapplytemplate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qargumentreference.cpp b/src/xmlpatterns/expr/qargumentreference.cpp
index 17a933c..9a5768e 100644
--- a/src/xmlpatterns/expr/qargumentreference.cpp
+++ b/src/xmlpatterns/expr/qargumentreference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h
index 218cba6..58cc7ce 100644
--- a/src/xmlpatterns/expr/qargumentreference_p.h
+++ b/src/xmlpatterns/expr/qargumentreference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp
index b6463b5..3e993b8 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression.cpp
+++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h
index 66c1f13..7736062 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression_p.h
+++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qattributeconstructor.cpp b/src/xmlpatterns/expr/qattributeconstructor.cpp
index e3e8951..965c3ff 100644
--- a/src/xmlpatterns/expr/qattributeconstructor.cpp
+++ b/src/xmlpatterns/expr/qattributeconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h
index 095c0cf..402b6eb 100644
--- a/src/xmlpatterns/expr/qattributeconstructor_p.h
+++ b/src/xmlpatterns/expr/qattributeconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qattributenamevalidator.cpp b/src/xmlpatterns/expr/qattributenamevalidator.cpp
index 4f4713c..cc530b2 100644
--- a/src/xmlpatterns/expr/qattributenamevalidator.cpp
+++ b/src/xmlpatterns/expr/qattributenamevalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h
index a7c181c..869f94b 100644
--- a/src/xmlpatterns/expr/qattributenamevalidator_p.h
+++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qaxisstep.cpp b/src/xmlpatterns/expr/qaxisstep.cpp
index abe3b53..149f037 100644
--- a/src/xmlpatterns/expr/qaxisstep.cpp
+++ b/src/xmlpatterns/expr/qaxisstep.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h
index 16a4ee9..d82648c 100644
--- a/src/xmlpatterns/expr/qaxisstep_p.h
+++ b/src/xmlpatterns/expr/qaxisstep_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h
index cc86fff..1b06d42 100644
--- a/src/xmlpatterns/expr/qcachecells_p.h
+++ b/src/xmlpatterns/expr/qcachecells_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcallsite.cpp b/src/xmlpatterns/expr/qcallsite.cpp
index 83726db..5a68936 100644
--- a/src/xmlpatterns/expr/qcallsite.cpp
+++ b/src/xmlpatterns/expr/qcallsite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h
index a17019a..0f1e369 100644
--- a/src/xmlpatterns/expr/qcallsite_p.h
+++ b/src/xmlpatterns/expr/qcallsite_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcalltargetdescription.cpp b/src/xmlpatterns/expr/qcalltargetdescription.cpp
index 64c0dd0..a84e635 100644
--- a/src/xmlpatterns/expr/qcalltargetdescription.cpp
+++ b/src/xmlpatterns/expr/qcalltargetdescription.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h
index d9095d0..e09a2ea 100644
--- a/src/xmlpatterns/expr/qcalltargetdescription_p.h
+++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcalltemplate.cpp b/src/xmlpatterns/expr/qcalltemplate.cpp
index 2ff2252..d2639ed 100644
--- a/src/xmlpatterns/expr/qcalltemplate.cpp
+++ b/src/xmlpatterns/expr/qcalltemplate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h
index cf8c3a1..d5a2c5a 100644
--- a/src/xmlpatterns/expr/qcalltemplate_p.h
+++ b/src/xmlpatterns/expr/qcalltemplate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcastableas.cpp b/src/xmlpatterns/expr/qcastableas.cpp
index ac72e85..ee6a78b 100644
--- a/src/xmlpatterns/expr/qcastableas.cpp
+++ b/src/xmlpatterns/expr/qcastableas.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h
index 60d0e9a..fcc1887 100644
--- a/src/xmlpatterns/expr/qcastableas_p.h
+++ b/src/xmlpatterns/expr/qcastableas_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcastas.cpp b/src/xmlpatterns/expr/qcastas.cpp
index 46c6747..1e9eb43 100644
--- a/src/xmlpatterns/expr/qcastas.cpp
+++ b/src/xmlpatterns/expr/qcastas.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h
index f804c6d..004d7da 100644
--- a/src/xmlpatterns/expr/qcastas_p.h
+++ b/src/xmlpatterns/expr/qcastas_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcastingplatform.cpp b/src/xmlpatterns/expr/qcastingplatform.cpp
index 4507595..c96392b 100644
--- a/src/xmlpatterns/expr/qcastingplatform.cpp
+++ b/src/xmlpatterns/expr/qcastingplatform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h
index 85d8be7..4f885d5 100644
--- a/src/xmlpatterns/expr/qcastingplatform_p.h
+++ b/src/xmlpatterns/expr/qcastingplatform_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcollationchecker.cpp b/src/xmlpatterns/expr/qcollationchecker.cpp
index 5e1047b..7d05a4d 100644
--- a/src/xmlpatterns/expr/qcollationchecker.cpp
+++ b/src/xmlpatterns/expr/qcollationchecker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h
index e1bf10a..b1b2f2a 100644
--- a/src/xmlpatterns/expr/qcollationchecker_p.h
+++ b/src/xmlpatterns/expr/qcollationchecker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcombinenodes.cpp b/src/xmlpatterns/expr/qcombinenodes.cpp
index 1c878af..05d8e16 100644
--- a/src/xmlpatterns/expr/qcombinenodes.cpp
+++ b/src/xmlpatterns/expr/qcombinenodes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h
index d006798..108d10d 100644
--- a/src/xmlpatterns/expr/qcombinenodes_p.h
+++ b/src/xmlpatterns/expr/qcombinenodes_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcommentconstructor.cpp b/src/xmlpatterns/expr/qcommentconstructor.cpp
index 957a989b..5dc46c3 100644
--- a/src/xmlpatterns/expr/qcommentconstructor.cpp
+++ b/src/xmlpatterns/expr/qcommentconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h
index 4f8ce92..cfe3bf5 100644
--- a/src/xmlpatterns/expr/qcommentconstructor_p.h
+++ b/src/xmlpatterns/expr/qcommentconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcomparisonplatform.cpp b/src/xmlpatterns/expr/qcomparisonplatform.cpp
index e930e67..4a6a91b 100644
--- a/src/xmlpatterns/expr/qcomparisonplatform.cpp
+++ b/src/xmlpatterns/expr/qcomparisonplatform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcomparisonplatform_p.h b/src/xmlpatterns/expr/qcomparisonplatform_p.h
index 6be8c1d..fefa59d 100644
--- a/src/xmlpatterns/expr/qcomparisonplatform_p.h
+++ b/src/xmlpatterns/expr/qcomparisonplatform_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp b/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
index 9091447..910d69d 100644
--- a/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
+++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
index 35c08d8..46ec836 100644
--- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcontextitem.cpp b/src/xmlpatterns/expr/qcontextitem.cpp
index 070e685..ecdc0f9 100644
--- a/src/xmlpatterns/expr/qcontextitem.cpp
+++ b/src/xmlpatterns/expr/qcontextitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h
index a77a0fc..8a959d3 100644
--- a/src/xmlpatterns/expr/qcontextitem_p.h
+++ b/src/xmlpatterns/expr/qcontextitem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcopyof.cpp b/src/xmlpatterns/expr/qcopyof.cpp
index df570c5..8097677 100644
--- a/src/xmlpatterns/expr/qcopyof.cpp
+++ b/src/xmlpatterns/expr/qcopyof.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h
index ad65824..95305ab 100644
--- a/src/xmlpatterns/expr/qcopyof_p.h
+++ b/src/xmlpatterns/expr/qcopyof_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcurrentitemstore.cpp b/src/xmlpatterns/expr/qcurrentitemstore.cpp
index 5c5d499..a41c691 100644
--- a/src/xmlpatterns/expr/qcurrentitemstore.cpp
+++ b/src/xmlpatterns/expr/qcurrentitemstore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h
index f4c440d..5883460 100644
--- a/src/xmlpatterns/expr/qcurrentitemstore_p.h
+++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qdocumentconstructor.cpp b/src/xmlpatterns/expr/qdocumentconstructor.cpp
index ee1af85..b2facff 100644
--- a/src/xmlpatterns/expr/qdocumentconstructor.cpp
+++ b/src/xmlpatterns/expr/qdocumentconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h
index 1ea236e..f03ce3f 100644
--- a/src/xmlpatterns/expr/qdocumentconstructor_p.h
+++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp b/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
index 7d3b4e5..11d2a11 100644
--- a/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
+++ b/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
index ddbd2af..e5bf2d7 100644
--- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
+++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qdynamiccontextstore.cpp b/src/xmlpatterns/expr/qdynamiccontextstore.cpp
index 32d00ba..6a7cfc3 100644
--- a/src/xmlpatterns/expr/qdynamiccontextstore.cpp
+++ b/src/xmlpatterns/expr/qdynamiccontextstore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
index 461da23..12dfd71 100644
--- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h
+++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qelementconstructor.cpp b/src/xmlpatterns/expr/qelementconstructor.cpp
index 34bb9c3..3c04153 100644
--- a/src/xmlpatterns/expr/qelementconstructor.cpp
+++ b/src/xmlpatterns/expr/qelementconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h
index c93f43d..b841aee 100644
--- a/src/xmlpatterns/expr/qelementconstructor_p.h
+++ b/src/xmlpatterns/expr/qelementconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qemptycontainer.cpp b/src/xmlpatterns/expr/qemptycontainer.cpp
index f4f2fe5..827de42 100644
--- a/src/xmlpatterns/expr/qemptycontainer.cpp
+++ b/src/xmlpatterns/expr/qemptycontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h
index b96d3ff..e8f7fba 100644
--- a/src/xmlpatterns/expr/qemptycontainer_p.h
+++ b/src/xmlpatterns/expr/qemptycontainer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qemptysequence.cpp b/src/xmlpatterns/expr/qemptysequence.cpp
index ee08272..17d0390 100644
--- a/src/xmlpatterns/expr/qemptysequence.cpp
+++ b/src/xmlpatterns/expr/qemptysequence.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h
index b38a4f1..2be98a9 100644
--- a/src/xmlpatterns/expr/qemptysequence_p.h
+++ b/src/xmlpatterns/expr/qemptysequence_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qevaluationcache.cpp b/src/xmlpatterns/expr/qevaluationcache.cpp
index 78fe8c7..e3cd8c8 100644
--- a/src/xmlpatterns/expr/qevaluationcache.cpp
+++ b/src/xmlpatterns/expr/qevaluationcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index 109c153..f31dd20 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpression.cpp b/src/xmlpatterns/expr/qexpression.cpp
index d18f099..a61b1bf 100644
--- a/src/xmlpatterns/expr/qexpression.cpp
+++ b/src/xmlpatterns/expr/qexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h
index cd836bf..d49463c 100644
--- a/src/xmlpatterns/expr/qexpression_p.h
+++ b/src/xmlpatterns/expr/qexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h
index 7ba255b..3fc3471 100644
--- a/src/xmlpatterns/expr/qexpressiondispatch_p.h
+++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpressionfactory.cpp b/src/xmlpatterns/expr/qexpressionfactory.cpp
index d352b13..d949f74 100644
--- a/src/xmlpatterns/expr/qexpressionfactory.cpp
+++ b/src/xmlpatterns/expr/qexpressionfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h
index c5694fc..6525a52 100644
--- a/src/xmlpatterns/expr/qexpressionfactory_p.h
+++ b/src/xmlpatterns/expr/qexpressionfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpressionsequence.cpp b/src/xmlpatterns/expr/qexpressionsequence.cpp
index 07c0f14..0b2edcd 100644
--- a/src/xmlpatterns/expr/qexpressionsequence.cpp
+++ b/src/xmlpatterns/expr/qexpressionsequence.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h
index 26834bf..066b5a0 100644
--- a/src/xmlpatterns/expr/qexpressionsequence_p.h
+++ b/src/xmlpatterns/expr/qexpressionsequence_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference.cpp b/src/xmlpatterns/expr/qexpressionvariablereference.cpp
index ec3f959..0a51bef 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference.cpp
+++ b/src/xmlpatterns/expr/qexpressionvariablereference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index 8866c30..74ed8fe 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexternalvariableloader.cpp b/src/xmlpatterns/expr/qexternalvariableloader.cpp
index 48c4da2..ade4e6f 100644
--- a/src/xmlpatterns/expr/qexternalvariableloader.cpp
+++ b/src/xmlpatterns/expr/qexternalvariableloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h
index 505aacf..6ad1710 100644
--- a/src/xmlpatterns/expr/qexternalvariableloader_p.h
+++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexternalvariablereference.cpp b/src/xmlpatterns/expr/qexternalvariablereference.cpp
index 1738c4b..e8b821a5 100644
--- a/src/xmlpatterns/expr/qexternalvariablereference.cpp
+++ b/src/xmlpatterns/expr/qexternalvariablereference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h
index f3c7547..62c1b42 100644
--- a/src/xmlpatterns/expr/qexternalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qfirstitempredicate.cpp b/src/xmlpatterns/expr/qfirstitempredicate.cpp
index b8f6394..5bf8ec6 100644
--- a/src/xmlpatterns/expr/qfirstitempredicate.cpp
+++ b/src/xmlpatterns/expr/qfirstitempredicate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h
index 789fab6..d814b1a 100644
--- a/src/xmlpatterns/expr/qfirstitempredicate_p.h
+++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qforclause.cpp b/src/xmlpatterns/expr/qforclause.cpp
index a70332b..6aa3226 100644
--- a/src/xmlpatterns/expr/qforclause.cpp
+++ b/src/xmlpatterns/expr/qforclause.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h
index edf571a..6daeb1f 100644
--- a/src/xmlpatterns/expr/qforclause_p.h
+++ b/src/xmlpatterns/expr/qforclause_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qgeneralcomparison.cpp b/src/xmlpatterns/expr/qgeneralcomparison.cpp
index 03688a5..a41ca71 100644
--- a/src/xmlpatterns/expr/qgeneralcomparison.cpp
+++ b/src/xmlpatterns/expr/qgeneralcomparison.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h
index e0493ed..1dda5c4 100644
--- a/src/xmlpatterns/expr/qgeneralcomparison_p.h
+++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qgenericpredicate.cpp b/src/xmlpatterns/expr/qgenericpredicate.cpp
index 5946e06..3f60999 100644
--- a/src/xmlpatterns/expr/qgenericpredicate.cpp
+++ b/src/xmlpatterns/expr/qgenericpredicate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h
index 824e097..9decddc 100644
--- a/src/xmlpatterns/expr/qgenericpredicate_p.h
+++ b/src/xmlpatterns/expr/qgenericpredicate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qifthenclause.cpp b/src/xmlpatterns/expr/qifthenclause.cpp
index 1fdc8e8..eb3e3d2 100644
--- a/src/xmlpatterns/expr/qifthenclause.cpp
+++ b/src/xmlpatterns/expr/qifthenclause.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h
index 36ee7e0..55b6bf0 100644
--- a/src/xmlpatterns/expr/qifthenclause_p.h
+++ b/src/xmlpatterns/expr/qifthenclause_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qinstanceof.cpp b/src/xmlpatterns/expr/qinstanceof.cpp
index 2bccb5e..95907bc 100644
--- a/src/xmlpatterns/expr/qinstanceof.cpp
+++ b/src/xmlpatterns/expr/qinstanceof.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h
index c19c26d..c972f85 100644
--- a/src/xmlpatterns/expr/qinstanceof_p.h
+++ b/src/xmlpatterns/expr/qinstanceof_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qletclause.cpp b/src/xmlpatterns/expr/qletclause.cpp
index c238ef2..a7b0e16 100644
--- a/src/xmlpatterns/expr/qletclause.cpp
+++ b/src/xmlpatterns/expr/qletclause.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h
index 17f3f9f..47f50e4 100644
--- a/src/xmlpatterns/expr/qletclause_p.h
+++ b/src/xmlpatterns/expr/qletclause_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qliteral.cpp b/src/xmlpatterns/expr/qliteral.cpp
index 0a67456..6ac59c9 100644
--- a/src/xmlpatterns/expr/qliteral.cpp
+++ b/src/xmlpatterns/expr/qliteral.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h
index 8be4372..c47fc53 100644
--- a/src/xmlpatterns/expr/qliteral_p.h
+++ b/src/xmlpatterns/expr/qliteral_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qliteralsequence.cpp b/src/xmlpatterns/expr/qliteralsequence.cpp
index f24a068..e7b0636 100644
--- a/src/xmlpatterns/expr/qliteralsequence.cpp
+++ b/src/xmlpatterns/expr/qliteralsequence.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h
index 4a8b1c3..f631573 100644
--- a/src/xmlpatterns/expr/qliteralsequence_p.h
+++ b/src/xmlpatterns/expr/qliteralsequence_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qnamespaceconstructor.cpp b/src/xmlpatterns/expr/qnamespaceconstructor.cpp
index d621b88..413a9fd 100644
--- a/src/xmlpatterns/expr/qnamespaceconstructor.cpp
+++ b/src/xmlpatterns/expr/qnamespaceconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
index 526f0b8..3a24bc0 100644
--- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qncnameconstructor.cpp b/src/xmlpatterns/expr/qncnameconstructor.cpp
index 4af556a..2a7a2a0 100644
--- a/src/xmlpatterns/expr/qncnameconstructor.cpp
+++ b/src/xmlpatterns/expr/qncnameconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h
index 1a20d5b..c311050 100644
--- a/src/xmlpatterns/expr/qncnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qncnameconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qnodecomparison.cpp b/src/xmlpatterns/expr/qnodecomparison.cpp
index db17416..8907e17 100644
--- a/src/xmlpatterns/expr/qnodecomparison.cpp
+++ b/src/xmlpatterns/expr/qnodecomparison.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h
index 96f232a..b4e42ae 100644
--- a/src/xmlpatterns/expr/qnodecomparison_p.h
+++ b/src/xmlpatterns/expr/qnodecomparison_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qnodesort.cpp b/src/xmlpatterns/expr/qnodesort.cpp
index 976b955..ec80765 100644
--- a/src/xmlpatterns/expr/qnodesort.cpp
+++ b/src/xmlpatterns/expr/qnodesort.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h
index 6f0bbc4..35fbc44 100644
--- a/src/xmlpatterns/expr/qnodesort_p.h
+++ b/src/xmlpatterns/expr/qnodesort_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h
index 75f60d4..f902256 100644
--- a/src/xmlpatterns/expr/qoperandsiterator_p.h
+++ b/src/xmlpatterns/expr/qoperandsiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qoptimizationpasses.cpp b/src/xmlpatterns/expr/qoptimizationpasses.cpp
index 52038bc..3c89130 100644
--- a/src/xmlpatterns/expr/qoptimizationpasses.cpp
+++ b/src/xmlpatterns/expr/qoptimizationpasses.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h
index 2050674..bd88e13 100644
--- a/src/xmlpatterns/expr/qoptimizationpasses_p.h
+++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qoptimizerblocks.cpp b/src/xmlpatterns/expr/qoptimizerblocks.cpp
index 5ab7050..a999d92 100644
--- a/src/xmlpatterns/expr/qoptimizerblocks.cpp
+++ b/src/xmlpatterns/expr/qoptimizerblocks.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h
index 03f0051..d4bb782 100644
--- a/src/xmlpatterns/expr/qoptimizerblocks_p.h
+++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qoptimizerframework.cpp b/src/xmlpatterns/expr/qoptimizerframework.cpp
index 98d39f8e..f0efb32 100644
--- a/src/xmlpatterns/expr/qoptimizerframework.cpp
+++ b/src/xmlpatterns/expr/qoptimizerframework.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h
index e50a58d..2db4da5 100644
--- a/src/xmlpatterns/expr/qoptimizerframework_p.h
+++ b/src/xmlpatterns/expr/qoptimizerframework_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qorderby.cpp b/src/xmlpatterns/expr/qorderby.cpp
index cf97c9c..ed53f13 100644
--- a/src/xmlpatterns/expr/qorderby.cpp
+++ b/src/xmlpatterns/expr/qorderby.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h
index 4f199e0..1d1ce9e 100644
--- a/src/xmlpatterns/expr/qorderby_p.h
+++ b/src/xmlpatterns/expr/qorderby_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qorexpression.cpp b/src/xmlpatterns/expr/qorexpression.cpp
index 96a358d..504cd3b 100644
--- a/src/xmlpatterns/expr/qorexpression.cpp
+++ b/src/xmlpatterns/expr/qorexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h
index 38f2157..fcb105f 100644
--- a/src/xmlpatterns/expr/qorexpression_p.h
+++ b/src/xmlpatterns/expr/qorexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qpaircontainer.cpp b/src/xmlpatterns/expr/qpaircontainer.cpp
index 147afad..fe1fea6 100644
--- a/src/xmlpatterns/expr/qpaircontainer.cpp
+++ b/src/xmlpatterns/expr/qpaircontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h
index 207ffe0..bbfd0dc 100644
--- a/src/xmlpatterns/expr/qpaircontainer_p.h
+++ b/src/xmlpatterns/expr/qpaircontainer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qparentnodeaxis.cpp b/src/xmlpatterns/expr/qparentnodeaxis.cpp
index 99a3b9d..2020b96 100644
--- a/src/xmlpatterns/expr/qparentnodeaxis.cpp
+++ b/src/xmlpatterns/expr/qparentnodeaxis.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h
index 2a8a6c5..2d3de01 100644
--- a/src/xmlpatterns/expr/qparentnodeaxis_p.h
+++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qpath.cpp b/src/xmlpatterns/expr/qpath.cpp
index f3d04d8..d549ab1 100644
--- a/src/xmlpatterns/expr/qpath.cpp
+++ b/src/xmlpatterns/expr/qpath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h
index 139618a..61f0f77 100644
--- a/src/xmlpatterns/expr/qpath_p.h
+++ b/src/xmlpatterns/expr/qpath_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qpositionalvariablereference.cpp b/src/xmlpatterns/expr/qpositionalvariablereference.cpp
index af4680f..adf730a 100644
--- a/src/xmlpatterns/expr/qpositionalvariablereference.cpp
+++ b/src/xmlpatterns/expr/qpositionalvariablereference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
index b103aa6..5a632ec 100644
--- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp b/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
index 78e0bd0..f62e6e0 100644
--- a/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
+++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
index b4f6741..7fd6b19 100644
--- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
+++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qqnameconstructor.cpp b/src/xmlpatterns/expr/qqnameconstructor.cpp
index 18ea90a..07222ce 100644
--- a/src/xmlpatterns/expr/qqnameconstructor.cpp
+++ b/src/xmlpatterns/expr/qqnameconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h
index 6bd3a22..a3c228a 100644
--- a/src/xmlpatterns/expr/qqnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qqnameconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qquantifiedexpression.cpp b/src/xmlpatterns/expr/qquantifiedexpression.cpp
index 52c2ae6..a4d4db0 100644
--- a/src/xmlpatterns/expr/qquantifiedexpression.cpp
+++ b/src/xmlpatterns/expr/qquantifiedexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h
index ffd14a7..959ca3f 100644
--- a/src/xmlpatterns/expr/qquantifiedexpression_p.h
+++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qrangeexpression.cpp b/src/xmlpatterns/expr/qrangeexpression.cpp
index 41cdcff..29cefb1 100644
--- a/src/xmlpatterns/expr/qrangeexpression.cpp
+++ b/src/xmlpatterns/expr/qrangeexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h
index b3abe11..4d408b9 100644
--- a/src/xmlpatterns/expr/qrangeexpression_p.h
+++ b/src/xmlpatterns/expr/qrangeexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qrangevariablereference.cpp b/src/xmlpatterns/expr/qrangevariablereference.cpp
index 4b9c833..71aa272 100644
--- a/src/xmlpatterns/expr/qrangevariablereference.cpp
+++ b/src/xmlpatterns/expr/qrangevariablereference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h
index 973bc37..c561e18 100644
--- a/src/xmlpatterns/expr/qrangevariablereference_p.h
+++ b/src/xmlpatterns/expr/qrangevariablereference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qreturnorderby.cpp b/src/xmlpatterns/expr/qreturnorderby.cpp
index 46f823f..023d366 100644
--- a/src/xmlpatterns/expr/qreturnorderby.cpp
+++ b/src/xmlpatterns/expr/qreturnorderby.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h
index a01197c..4a50898 100644
--- a/src/xmlpatterns/expr/qreturnorderby_p.h
+++ b/src/xmlpatterns/expr/qreturnorderby_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor.cpp b/src/xmlpatterns/expr/qsimplecontentconstructor.cpp
index 2c37323..ffa4cb2 100644
--- a/src/xmlpatterns/expr/qsimplecontentconstructor.cpp
+++ b/src/xmlpatterns/expr/qsimplecontentconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
index 6e299f1..725a39f 100644
--- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qsinglecontainer.cpp b/src/xmlpatterns/expr/qsinglecontainer.cpp
index 9b47ccb..09289c6 100644
--- a/src/xmlpatterns/expr/qsinglecontainer.cpp
+++ b/src/xmlpatterns/expr/qsinglecontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h
index 928f849..8d3eb65 100644
--- a/src/xmlpatterns/expr/qsinglecontainer_p.h
+++ b/src/xmlpatterns/expr/qsinglecontainer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qsourcelocationreflection.cpp b/src/xmlpatterns/expr/qsourcelocationreflection.cpp
index e88944d..01cc819 100644
--- a/src/xmlpatterns/expr/qsourcelocationreflection.cpp
+++ b/src/xmlpatterns/expr/qsourcelocationreflection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
index 4dd882a..f12ad91 100644
--- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h
+++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qstaticbaseuristore.cpp b/src/xmlpatterns/expr/qstaticbaseuristore.cpp
index becd66e..6d7eb7d 100644
--- a/src/xmlpatterns/expr/qstaticbaseuristore.cpp
+++ b/src/xmlpatterns/expr/qstaticbaseuristore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
index ae6fecb..cf33c9e 100644
--- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h
+++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp b/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
index 5cf5c51..8779f45 100644
--- a/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
+++ b/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
index 3503e97..c6ac2a5 100644
--- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
+++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplate.cpp b/src/xmlpatterns/expr/qtemplate.cpp
index aa2c7c8..be78a47 100644
--- a/src/xmlpatterns/expr/qtemplate.cpp
+++ b/src/xmlpatterns/expr/qtemplate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h
index 7b18202..eaa6fdb 100644
--- a/src/xmlpatterns/expr/qtemplate_p.h
+++ b/src/xmlpatterns/expr/qtemplate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplateinvoker.cpp b/src/xmlpatterns/expr/qtemplateinvoker.cpp
index 3e860ae..ec18a1d 100644
--- a/src/xmlpatterns/expr/qtemplateinvoker.cpp
+++ b/src/xmlpatterns/expr/qtemplateinvoker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h
index 5e31b98..0b4b966 100644
--- a/src/xmlpatterns/expr/qtemplateinvoker_p.h
+++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplatemode.cpp b/src/xmlpatterns/expr/qtemplatemode.cpp
index f0bf7c0..83e2c53 100644
--- a/src/xmlpatterns/expr/qtemplatemode.cpp
+++ b/src/xmlpatterns/expr/qtemplatemode.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h
index d473ba3..cae179e 100644
--- a/src/xmlpatterns/expr/qtemplatemode_p.h
+++ b/src/xmlpatterns/expr/qtemplatemode_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference.cpp b/src/xmlpatterns/expr/qtemplateparameterreference.cpp
index a75542e..d60b0fc 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference.cpp
+++ b/src/xmlpatterns/expr/qtemplateparameterreference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index e1548de..42adcb2 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h
index e662531..e86677c 100644
--- a/src/xmlpatterns/expr/qtemplatepattern_p.h
+++ b/src/xmlpatterns/expr/qtemplatepattern_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtextnodeconstructor.cpp b/src/xmlpatterns/expr/qtextnodeconstructor.cpp
index ea45db4..34b7ea4 100644
--- a/src/xmlpatterns/expr/qtextnodeconstructor.cpp
+++ b/src/xmlpatterns/expr/qtextnodeconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
index a0aab8a..00937f1 100644
--- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h
+++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtreatas.cpp b/src/xmlpatterns/expr/qtreatas.cpp
index d877078..a3efd3f 100644
--- a/src/xmlpatterns/expr/qtreatas.cpp
+++ b/src/xmlpatterns/expr/qtreatas.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h
index d2bc6da..00eec03 100644
--- a/src/xmlpatterns/expr/qtreatas_p.h
+++ b/src/xmlpatterns/expr/qtreatas_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtriplecontainer.cpp b/src/xmlpatterns/expr/qtriplecontainer.cpp
index 81653e6..c3dacf5 100644
--- a/src/xmlpatterns/expr/qtriplecontainer.cpp
+++ b/src/xmlpatterns/expr/qtriplecontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h
index 09d165d..b80de92 100644
--- a/src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/src/xmlpatterns/expr/qtriplecontainer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtruthpredicate.cpp b/src/xmlpatterns/expr/qtruthpredicate.cpp
index 4278229..8a23ef3 100644
--- a/src/xmlpatterns/expr/qtruthpredicate.cpp
+++ b/src/xmlpatterns/expr/qtruthpredicate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h
index 273552c..bf23968 100644
--- a/src/xmlpatterns/expr/qtruthpredicate_p.h
+++ b/src/xmlpatterns/expr/qtruthpredicate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qunaryexpression.cpp b/src/xmlpatterns/expr/qunaryexpression.cpp
index 9fcfdd8..c196bdc 100644
--- a/src/xmlpatterns/expr/qunaryexpression.cpp
+++ b/src/xmlpatterns/expr/qunaryexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h
index ceaac9c..b84d6d8 100644
--- a/src/xmlpatterns/expr/qunaryexpression_p.h
+++ b/src/xmlpatterns/expr/qunaryexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qunlimitedcontainer.cpp b/src/xmlpatterns/expr/qunlimitedcontainer.cpp
index 8459884..649e833 100644
--- a/src/xmlpatterns/expr/qunlimitedcontainer.cpp
+++ b/src/xmlpatterns/expr/qunlimitedcontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
index c61995c..d3ffbf0 100644
--- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h
+++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference.cpp b/src/xmlpatterns/expr/qunresolvedvariablereference.cpp
index 4fd7bf2..2e1744f 100644
--- a/src/xmlpatterns/expr/qunresolvedvariablereference.cpp
+++ b/src/xmlpatterns/expr/qunresolvedvariablereference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
index da176d0..9145a5b 100644
--- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
+++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/quserfunction.cpp b/src/xmlpatterns/expr/quserfunction.cpp
index 027179f..d92d742 100644
--- a/src/xmlpatterns/expr/quserfunction.cpp
+++ b/src/xmlpatterns/expr/quserfunction.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h
index d04112e..d3b52b4 100644
--- a/src/xmlpatterns/expr/quserfunction_p.h
+++ b/src/xmlpatterns/expr/quserfunction_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/quserfunctioncallsite.cpp b/src/xmlpatterns/expr/quserfunctioncallsite.cpp
index 34fa7d3..5c4e0ee 100644
--- a/src/xmlpatterns/expr/quserfunctioncallsite.cpp
+++ b/src/xmlpatterns/expr/quserfunctioncallsite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
index 7036147..678471a 100644
--- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h
+++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvalidate.cpp b/src/xmlpatterns/expr/qvalidate.cpp
index 1fab559..4fdf410 100644
--- a/src/xmlpatterns/expr/qvalidate.cpp
+++ b/src/xmlpatterns/expr/qvalidate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h
index 53efabe..47e3181 100644
--- a/src/xmlpatterns/expr/qvalidate_p.h
+++ b/src/xmlpatterns/expr/qvalidate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvaluecomparison.cpp b/src/xmlpatterns/expr/qvaluecomparison.cpp
index 0e0ceac..36520e2 100644
--- a/src/xmlpatterns/expr/qvaluecomparison.cpp
+++ b/src/xmlpatterns/expr/qvaluecomparison.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h
index c36cea1..b1e873c 100644
--- a/src/xmlpatterns/expr/qvaluecomparison_p.h
+++ b/src/xmlpatterns/expr/qvaluecomparison_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvariabledeclaration.cpp b/src/xmlpatterns/expr/qvariabledeclaration.cpp
index ea335c9..e194510 100644
--- a/src/xmlpatterns/expr/qvariabledeclaration.cpp
+++ b/src/xmlpatterns/expr/qvariabledeclaration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h
index 262c527..47a9ba5 100644
--- a/src/xmlpatterns/expr/qvariabledeclaration_p.h
+++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvariablereference.cpp b/src/xmlpatterns/expr/qvariablereference.cpp
index aead9ff..0d6dfe7 100644
--- a/src/xmlpatterns/expr/qvariablereference.cpp
+++ b/src/xmlpatterns/expr/qvariablereference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h
index a1ab2f4..e7ec173 100644
--- a/src/xmlpatterns/expr/qvariablereference_p.h
+++ b/src/xmlpatterns/expr/qvariablereference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h
index 4ca9d71..50841ce 100644
--- a/src/xmlpatterns/expr/qwithparam_p.h
+++ b/src/xmlpatterns/expr/qwithparam_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
index 520342e..6767a6e 100644
--- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
+++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
index 4245e69..3a461ff 100644
--- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory.cpp b/src/xmlpatterns/functions/qabstractfunctionfactory.cpp
index 8950881..20cf813 100644
--- a/src/xmlpatterns/functions/qabstractfunctionfactory.cpp
+++ b/src/xmlpatterns/functions/qabstractfunctionfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
index 76c03ca..98dc5b8 100644
--- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qaccessorfns.cpp b/src/xmlpatterns/functions/qaccessorfns.cpp
index c9253a6..1bf5f64 100644
--- a/src/xmlpatterns/functions/qaccessorfns.cpp
+++ b/src/xmlpatterns/functions/qaccessorfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h
index 2066d3f..553ec18 100644
--- a/src/xmlpatterns/functions/qaccessorfns_p.h
+++ b/src/xmlpatterns/functions/qaccessorfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qaggregatefns.cpp b/src/xmlpatterns/functions/qaggregatefns.cpp
index d14ffa5..50dccb0 100644
--- a/src/xmlpatterns/functions/qaggregatefns.cpp
+++ b/src/xmlpatterns/functions/qaggregatefns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h
index 906eca7..16b12dc 100644
--- a/src/xmlpatterns/functions/qaggregatefns_p.h
+++ b/src/xmlpatterns/functions/qaggregatefns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qaggregator.cpp b/src/xmlpatterns/functions/qaggregator.cpp
index 64b0a96..f6efb8c 100644
--- a/src/xmlpatterns/functions/qaggregator.cpp
+++ b/src/xmlpatterns/functions/qaggregator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h
index cde2be2..fce5f2b 100644
--- a/src/xmlpatterns/functions/qaggregator_p.h
+++ b/src/xmlpatterns/functions/qaggregator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qassemblestringfns.cpp b/src/xmlpatterns/functions/qassemblestringfns.cpp
index 1169ad1..26ae94d 100644
--- a/src/xmlpatterns/functions/qassemblestringfns.cpp
+++ b/src/xmlpatterns/functions/qassemblestringfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h
index ef2c597..ee9ad57 100644
--- a/src/xmlpatterns/functions/qassemblestringfns_p.h
+++ b/src/xmlpatterns/functions/qassemblestringfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qbooleanfns.cpp b/src/xmlpatterns/functions/qbooleanfns.cpp
index 3340ecb..8741359 100644
--- a/src/xmlpatterns/functions/qbooleanfns.cpp
+++ b/src/xmlpatterns/functions/qbooleanfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h
index c7acea3..ef73774 100644
--- a/src/xmlpatterns/functions/qbooleanfns_p.h
+++ b/src/xmlpatterns/functions/qbooleanfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcomparescaseaware.cpp b/src/xmlpatterns/functions/qcomparescaseaware.cpp
index 09128a2..452d9d2 100644
--- a/src/xmlpatterns/functions/qcomparescaseaware.cpp
+++ b/src/xmlpatterns/functions/qcomparescaseaware.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h
index 6c489f2..afa92f2 100644
--- a/src/xmlpatterns/functions/qcomparescaseaware_p.h
+++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcomparestringfns.cpp b/src/xmlpatterns/functions/qcomparestringfns.cpp
index c2a3b67..9686cf6 100644
--- a/src/xmlpatterns/functions/qcomparestringfns.cpp
+++ b/src/xmlpatterns/functions/qcomparestringfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h
index 43586f1..2f3ec88 100644
--- a/src/xmlpatterns/functions/qcomparestringfns_p.h
+++ b/src/xmlpatterns/functions/qcomparestringfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcomparingaggregator.cpp b/src/xmlpatterns/functions/qcomparingaggregator.cpp
index eadfd7d..c1442e1 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator.cpp
+++ b/src/xmlpatterns/functions/qcomparingaggregator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h
index 7a75187..dd7dc6c 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator_p.h
+++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp b/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
index a0cb142..5883921 100644
--- a/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
+++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
index fa75bc4..0af6e97 100644
--- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
+++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcontextfns.cpp b/src/xmlpatterns/functions/qcontextfns.cpp
index 2bbb331..4b93c13 100644
--- a/src/xmlpatterns/functions/qcontextfns.cpp
+++ b/src/xmlpatterns/functions/qcontextfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h
index 28f52ad..4f5b0af 100644
--- a/src/xmlpatterns/functions/qcontextfns_p.h
+++ b/src/xmlpatterns/functions/qcontextfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcontextnodechecker.cpp b/src/xmlpatterns/functions/qcontextnodechecker.cpp
index aafda6f..788adf6 100644
--- a/src/xmlpatterns/functions/qcontextnodechecker.cpp
+++ b/src/xmlpatterns/functions/qcontextnodechecker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcontextnodechecker_p.h b/src/xmlpatterns/functions/qcontextnodechecker_p.h
index 237e150..80a98d6 100644
--- a/src/xmlpatterns/functions/qcontextnodechecker_p.h
+++ b/src/xmlpatterns/functions/qcontextnodechecker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcurrentfn.cpp b/src/xmlpatterns/functions/qcurrentfn.cpp
index 50f0a37..86705ec 100644
--- a/src/xmlpatterns/functions/qcurrentfn.cpp
+++ b/src/xmlpatterns/functions/qcurrentfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h
index 458f2a5..e202644 100644
--- a/src/xmlpatterns/functions/qcurrentfn_p.h
+++ b/src/xmlpatterns/functions/qcurrentfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdatetimefn.cpp b/src/xmlpatterns/functions/qdatetimefn.cpp
index 1348d9f..b25760c 100644
--- a/src/xmlpatterns/functions/qdatetimefn.cpp
+++ b/src/xmlpatterns/functions/qdatetimefn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h
index f4a32c8..8063a50 100644
--- a/src/xmlpatterns/functions/qdatetimefn_p.h
+++ b/src/xmlpatterns/functions/qdatetimefn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdatetimefns.cpp b/src/xmlpatterns/functions/qdatetimefns.cpp
index db4c780..b9abfd6 100644
--- a/src/xmlpatterns/functions/qdatetimefns.cpp
+++ b/src/xmlpatterns/functions/qdatetimefns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h
index 2af34be..07824b8 100644
--- a/src/xmlpatterns/functions/qdatetimefns_p.h
+++ b/src/xmlpatterns/functions/qdatetimefns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdeepequalfn.cpp b/src/xmlpatterns/functions/qdeepequalfn.cpp
index a4a18b9..007299d 100644
--- a/src/xmlpatterns/functions/qdeepequalfn.cpp
+++ b/src/xmlpatterns/functions/qdeepequalfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h
index 522f032..a88458c 100644
--- a/src/xmlpatterns/functions/qdeepequalfn_p.h
+++ b/src/xmlpatterns/functions/qdeepequalfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdocumentfn.cpp b/src/xmlpatterns/functions/qdocumentfn.cpp
index 4c7dd82..011c9d2 100644
--- a/src/xmlpatterns/functions/qdocumentfn.cpp
+++ b/src/xmlpatterns/functions/qdocumentfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h
index 4a3c894..13ac201 100644
--- a/src/xmlpatterns/functions/qdocumentfn_p.h
+++ b/src/xmlpatterns/functions/qdocumentfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qelementavailablefn.cpp b/src/xmlpatterns/functions/qelementavailablefn.cpp
index f09abea..6dedc14 100644
--- a/src/xmlpatterns/functions/qelementavailablefn.cpp
+++ b/src/xmlpatterns/functions/qelementavailablefn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h
index 30af7f9..828af87 100644
--- a/src/xmlpatterns/functions/qelementavailablefn_p.h
+++ b/src/xmlpatterns/functions/qelementavailablefn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qerrorfn.cpp b/src/xmlpatterns/functions/qerrorfn.cpp
index 4211997..2e93ed1 100644
--- a/src/xmlpatterns/functions/qerrorfn.cpp
+++ b/src/xmlpatterns/functions/qerrorfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h
index d62a087..b922099 100644
--- a/src/xmlpatterns/functions/qerrorfn_p.h
+++ b/src/xmlpatterns/functions/qerrorfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionargument.cpp b/src/xmlpatterns/functions/qfunctionargument.cpp
index f59c5b5..7702d2e 100644
--- a/src/xmlpatterns/functions/qfunctionargument.cpp
+++ b/src/xmlpatterns/functions/qfunctionargument.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionargument_p.h b/src/xmlpatterns/functions/qfunctionargument_p.h
index 0ad9ec2..b60e3e2 100644
--- a/src/xmlpatterns/functions/qfunctionargument_p.h
+++ b/src/xmlpatterns/functions/qfunctionargument_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionavailablefn.cpp b/src/xmlpatterns/functions/qfunctionavailablefn.cpp
index fb8a765..7ca2793 100644
--- a/src/xmlpatterns/functions/qfunctionavailablefn.cpp
+++ b/src/xmlpatterns/functions/qfunctionavailablefn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
index b6bf3bb..ad4e304 100644
--- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h
+++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctioncall.cpp b/src/xmlpatterns/functions/qfunctioncall.cpp
index b94027a..08d3100 100644
--- a/src/xmlpatterns/functions/qfunctioncall.cpp
+++ b/src/xmlpatterns/functions/qfunctioncall.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h
index 49572a4..156e93d 100644
--- a/src/xmlpatterns/functions/qfunctioncall_p.h
+++ b/src/xmlpatterns/functions/qfunctioncall_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionfactory.cpp b/src/xmlpatterns/functions/qfunctionfactory.cpp
index e869d35..e3d19cb 100644
--- a/src/xmlpatterns/functions/qfunctionfactory.cpp
+++ b/src/xmlpatterns/functions/qfunctionfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionfactory_p.h b/src/xmlpatterns/functions/qfunctionfactory_p.h
index 8da709a..ce3ef78 100644
--- a/src/xmlpatterns/functions/qfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection.cpp b/src/xmlpatterns/functions/qfunctionfactorycollection.cpp
index 61aa53b..dd9fdcd 100644
--- a/src/xmlpatterns/functions/qfunctionfactorycollection.cpp
+++ b/src/xmlpatterns/functions/qfunctionfactorycollection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
index 5e4fe6c..f3c180a 100644
--- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionsignature.cpp b/src/xmlpatterns/functions/qfunctionsignature.cpp
index 2ac5b02..3aac88c 100644
--- a/src/xmlpatterns/functions/qfunctionsignature.cpp
+++ b/src/xmlpatterns/functions/qfunctionsignature.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h
index d937e12..4a61480 100644
--- a/src/xmlpatterns/functions/qfunctionsignature_p.h
+++ b/src/xmlpatterns/functions/qfunctionsignature_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qgenerateidfn.cpp b/src/xmlpatterns/functions/qgenerateidfn.cpp
index b24ce7c..01dd131 100644
--- a/src/xmlpatterns/functions/qgenerateidfn.cpp
+++ b/src/xmlpatterns/functions/qgenerateidfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h
index 329c268..e375b98 100644
--- a/src/xmlpatterns/functions/qgenerateidfn_p.h
+++ b/src/xmlpatterns/functions/qgenerateidfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qnodefns.cpp b/src/xmlpatterns/functions/qnodefns.cpp
index a7aa95f..2f75e61 100644
--- a/src/xmlpatterns/functions/qnodefns.cpp
+++ b/src/xmlpatterns/functions/qnodefns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h
index e7347fc..8fc4635 100644
--- a/src/xmlpatterns/functions/qnodefns_p.h
+++ b/src/xmlpatterns/functions/qnodefns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qnumericfns.cpp b/src/xmlpatterns/functions/qnumericfns.cpp
index 083e6a6..716be52 100644
--- a/src/xmlpatterns/functions/qnumericfns.cpp
+++ b/src/xmlpatterns/functions/qnumericfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h
index fae99874..fd9ab25 100644
--- a/src/xmlpatterns/functions/qnumericfns_p.h
+++ b/src/xmlpatterns/functions/qnumericfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns.cpp b/src/xmlpatterns/functions/qpatternmatchingfns.cpp
index 1db69a5..882012e 100644
--- a/src/xmlpatterns/functions/qpatternmatchingfns.cpp
+++ b/src/xmlpatterns/functions/qpatternmatchingfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
index 279efce..35c2c0d 100644
--- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h
+++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qpatternplatform.cpp b/src/xmlpatterns/functions/qpatternplatform.cpp
index 378127e..92d4da7 100644
--- a/src/xmlpatterns/functions/qpatternplatform.cpp
+++ b/src/xmlpatterns/functions/qpatternplatform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h
index b18bee8..f037cea 100644
--- a/src/xmlpatterns/functions/qpatternplatform_p.h
+++ b/src/xmlpatterns/functions/qpatternplatform_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qqnamefns.cpp b/src/xmlpatterns/functions/qqnamefns.cpp
index 0198d8f..12d630a 100644
--- a/src/xmlpatterns/functions/qqnamefns.cpp
+++ b/src/xmlpatterns/functions/qqnamefns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h
index 362a7e5..5fea146 100644
--- a/src/xmlpatterns/functions/qqnamefns_p.h
+++ b/src/xmlpatterns/functions/qqnamefns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qresolveurifn.cpp b/src/xmlpatterns/functions/qresolveurifn.cpp
index a5b9376..9105a79 100644
--- a/src/xmlpatterns/functions/qresolveurifn.cpp
+++ b/src/xmlpatterns/functions/qresolveurifn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h
index 24119dd..cb13f62 100644
--- a/src/xmlpatterns/functions/qresolveurifn_p.h
+++ b/src/xmlpatterns/functions/qresolveurifn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsequencefns.cpp b/src/xmlpatterns/functions/qsequencefns.cpp
index 21ecee1..03cd9fa 100644
--- a/src/xmlpatterns/functions/qsequencefns.cpp
+++ b/src/xmlpatterns/functions/qsequencefns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index 85c1dae..a03588b 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
index 4f17ef2..cb5e8d3 100644
--- a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
+++ b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
index 9dde61e..240af51 100644
--- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
+++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
index cef5c23..ce54069 100644
--- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp b/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
index ab80aac..abc9161 100644
--- a/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
+++ b/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
index c0929c0..1588bb5 100644
--- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qstringvaluefns.cpp b/src/xmlpatterns/functions/qstringvaluefns.cpp
index aa6c010..a0675ab 100644
--- a/src/xmlpatterns/functions/qstringvaluefns.cpp
+++ b/src/xmlpatterns/functions/qstringvaluefns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h
index 893e4b5..21ecf2b 100644
--- a/src/xmlpatterns/functions/qstringvaluefns_p.h
+++ b/src/xmlpatterns/functions/qstringvaluefns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsubstringfns.cpp b/src/xmlpatterns/functions/qsubstringfns.cpp
index 7824898..ac08688 100644
--- a/src/xmlpatterns/functions/qsubstringfns.cpp
+++ b/src/xmlpatterns/functions/qsubstringfns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h
index d1dfb4c..6f57386 100644
--- a/src/xmlpatterns/functions/qsubstringfns_p.h
+++ b/src/xmlpatterns/functions/qsubstringfns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsystempropertyfn.cpp b/src/xmlpatterns/functions/qsystempropertyfn.cpp
index 18a9b04..d6401aa 100644
--- a/src/xmlpatterns/functions/qsystempropertyfn.cpp
+++ b/src/xmlpatterns/functions/qsystempropertyfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h
index e5e5cbf..f9d1fdc 100644
--- a/src/xmlpatterns/functions/qsystempropertyfn_p.h
+++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qtimezonefns.cpp b/src/xmlpatterns/functions/qtimezonefns.cpp
index 6d446bc..452d650 100644
--- a/src/xmlpatterns/functions/qtimezonefns.cpp
+++ b/src/xmlpatterns/functions/qtimezonefns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h
index 988f6d6..5c735b3 100644
--- a/src/xmlpatterns/functions/qtimezonefns_p.h
+++ b/src/xmlpatterns/functions/qtimezonefns_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qtracefn.cpp b/src/xmlpatterns/functions/qtracefn.cpp
index ccd113d..03112fe 100644
--- a/src/xmlpatterns/functions/qtracefn.cpp
+++ b/src/xmlpatterns/functions/qtracefn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h
index ec6f77b..67b4bc0 100644
--- a/src/xmlpatterns/functions/qtracefn_p.h
+++ b/src/xmlpatterns/functions/qtracefn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qtypeavailablefn.cpp b/src/xmlpatterns/functions/qtypeavailablefn.cpp
index 1adfd63..b0af15c 100644
--- a/src/xmlpatterns/functions/qtypeavailablefn.cpp
+++ b/src/xmlpatterns/functions/qtypeavailablefn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h
index c931d67..beb49d6 100644
--- a/src/xmlpatterns/functions/qtypeavailablefn_p.h
+++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp b/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
index ace0a98..33b7943 100644
--- a/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
+++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
index 7bdbcb6..d7ecf20 100644
--- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedentityurifn.cpp b/src/xmlpatterns/functions/qunparsedentityurifn.cpp
index 67d2c5c..b5596b4 100644
--- a/src/xmlpatterns/functions/qunparsedentityurifn.cpp
+++ b/src/xmlpatterns/functions/qunparsedentityurifn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
index 5c21854..1a45e79 100644
--- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp b/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
index c162486..0a06f01 100644
--- a/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
+++ b/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
index 687604a..ead0754 100644
--- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedtextfn.cpp b/src/xmlpatterns/functions/qunparsedtextfn.cpp
index 6b72e40..4f75d96 100644
--- a/src/xmlpatterns/functions/qunparsedtextfn.cpp
+++ b/src/xmlpatterns/functions/qunparsedtextfn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h
index a02b1dd..0d0491d 100644
--- a/src/xmlpatterns/functions/qunparsedtextfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qxpath10corefunctions.cpp b/src/xmlpatterns/functions/qxpath10corefunctions.cpp
index dd0ff16..db538c8 100644
--- a/src/xmlpatterns/functions/qxpath10corefunctions.cpp
+++ b/src/xmlpatterns/functions/qxpath10corefunctions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
index 93cad80..acd38d6 100644
--- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qxpath20corefunctions.cpp b/src/xmlpatterns/functions/qxpath20corefunctions.cpp
index dfc52e4..b1fe12c 100644
--- a/src/xmlpatterns/functions/qxpath20corefunctions.cpp
+++ b/src/xmlpatterns/functions/qxpath20corefunctions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
index 303c277..526a90b 100644
--- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qxslt20corefunctions.cpp b/src/xmlpatterns/functions/qxslt20corefunctions.cpp
index 6231b8a..b747f8a 100644
--- a/src/xmlpatterns/functions/qxslt20corefunctions.cpp
+++ b/src/xmlpatterns/functions/qxslt20corefunctions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
index 36296fa..3847618 100644
--- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qcachingiterator.cpp b/src/xmlpatterns/iterators/qcachingiterator.cpp
index c9ffd14..450961c 100644
--- a/src/xmlpatterns/iterators/qcachingiterator.cpp
+++ b/src/xmlpatterns/iterators/qcachingiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h
index a948da6..cacd704 100644
--- a/src/xmlpatterns/iterators/qcachingiterator_p.h
+++ b/src/xmlpatterns/iterators/qcachingiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator.cpp b/src/xmlpatterns/iterators/qdeduplicateiterator.cpp
index cb8db2c..c6190ec 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator.cpp
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
index 70e34e6..5ea370c 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qdistinctiterator.cpp b/src/xmlpatterns/iterators/qdistinctiterator.cpp
index 8ef4be6..49d2e7a 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator.cpp
+++ b/src/xmlpatterns/iterators/qdistinctiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h
index 155d7c1..59bbd31 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator_p.h
+++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h
index 5f369ad..5e78908 100644
--- a/src/xmlpatterns/iterators/qemptyiterator_p.h
+++ b/src/xmlpatterns/iterators/qemptyiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qexceptiterator.cpp b/src/xmlpatterns/iterators/qexceptiterator.cpp
index 044f392..02d6e97 100644
--- a/src/xmlpatterns/iterators/qexceptiterator.cpp
+++ b/src/xmlpatterns/iterators/qexceptiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h
index c0ed25a..fc0b405 100644
--- a/src/xmlpatterns/iterators/qexceptiterator_p.h
+++ b/src/xmlpatterns/iterators/qexceptiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qindexofiterator.cpp b/src/xmlpatterns/iterators/qindexofiterator.cpp
index 59ed9e2..0112200 100644
--- a/src/xmlpatterns/iterators/qindexofiterator.cpp
+++ b/src/xmlpatterns/iterators/qindexofiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h
index 4339439..7102e0a 100644
--- a/src/xmlpatterns/iterators/qindexofiterator_p.h
+++ b/src/xmlpatterns/iterators/qindexofiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qinsertioniterator.cpp b/src/xmlpatterns/iterators/qinsertioniterator.cpp
index ff36117..10ea554 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator.cpp
+++ b/src/xmlpatterns/iterators/qinsertioniterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h
index 60006b4..206d0a1 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator_p.h
+++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qintersectiterator.cpp b/src/xmlpatterns/iterators/qintersectiterator.cpp
index 5804aa1..1581589 100644
--- a/src/xmlpatterns/iterators/qintersectiterator.cpp
+++ b/src/xmlpatterns/iterators/qintersectiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h
index 660c08b..e9844dc 100644
--- a/src/xmlpatterns/iterators/qintersectiterator_p.h
+++ b/src/xmlpatterns/iterators/qintersectiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
index 59d2dc6..8494898 100644
--- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qrangeiterator.cpp b/src/xmlpatterns/iterators/qrangeiterator.cpp
index 2460caf..b6755b7 100644
--- a/src/xmlpatterns/iterators/qrangeiterator.cpp
+++ b/src/xmlpatterns/iterators/qrangeiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h
index b9fb3ee..2059f5a 100644
--- a/src/xmlpatterns/iterators/qrangeiterator_p.h
+++ b/src/xmlpatterns/iterators/qrangeiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qremovaliterator.cpp b/src/xmlpatterns/iterators/qremovaliterator.cpp
index bd7452e..2dd9d16 100644
--- a/src/xmlpatterns/iterators/qremovaliterator.cpp
+++ b/src/xmlpatterns/iterators/qremovaliterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h
index 7e1131d..66d1621 100644
--- a/src/xmlpatterns/iterators/qremovaliterator_p.h
+++ b/src/xmlpatterns/iterators/qremovaliterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
index cdda87c..acec6de 100644
--- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h
index 92ec0f3..c896acd 100644
--- a/src/xmlpatterns/iterators/qsingletoniterator_p.h
+++ b/src/xmlpatterns/iterators/qsingletoniterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator.cpp b/src/xmlpatterns/iterators/qsubsequenceiterator.cpp
index a413b09..7b2fdad 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator.cpp
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
index 9ebc509..a3a4a75 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator.cpp b/src/xmlpatterns/iterators/qtocodepointsiterator.cpp
index 8b499c6..b1f718c 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator.cpp
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
index 203c81c..383ad27 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qunioniterator.cpp b/src/xmlpatterns/iterators/qunioniterator.cpp
index b2cddda..702eed5 100644
--- a/src/xmlpatterns/iterators/qunioniterator.cpp
+++ b/src/xmlpatterns/iterators/qunioniterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h
index 3effbdf..b094ceb 100644
--- a/src/xmlpatterns/iterators/qunioniterator_p.h
+++ b/src/xmlpatterns/iterators/qunioniterator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qargumentconverter.cpp b/src/xmlpatterns/janitors/qargumentconverter.cpp
index e430d15..abf4dea 100644
--- a/src/xmlpatterns/janitors/qargumentconverter.cpp
+++ b/src/xmlpatterns/janitors/qargumentconverter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h
index 2de7eaf..7b848e5 100644
--- a/src/xmlpatterns/janitors/qargumentconverter_p.h
+++ b/src/xmlpatterns/janitors/qargumentconverter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qatomizer.cpp b/src/xmlpatterns/janitors/qatomizer.cpp
index 5fe4df7..76cdf44 100644
--- a/src/xmlpatterns/janitors/qatomizer.cpp
+++ b/src/xmlpatterns/janitors/qatomizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h
index 297a92a..98268c2 100644
--- a/src/xmlpatterns/janitors/qatomizer_p.h
+++ b/src/xmlpatterns/janitors/qatomizer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qcardinalityverifier.cpp b/src/xmlpatterns/janitors/qcardinalityverifier.cpp
index c7c7b6c..c4ee62a 100644
--- a/src/xmlpatterns/janitors/qcardinalityverifier.cpp
+++ b/src/xmlpatterns/janitors/qcardinalityverifier.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
index d0e939b..c4e3c72 100644
--- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h
+++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qebvextractor.cpp b/src/xmlpatterns/janitors/qebvextractor.cpp
index 5602edc..6b5bddc 100644
--- a/src/xmlpatterns/janitors/qebvextractor.cpp
+++ b/src/xmlpatterns/janitors/qebvextractor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h
index 44f6a16..e228a90 100644
--- a/src/xmlpatterns/janitors/qebvextractor_p.h
+++ b/src/xmlpatterns/janitors/qebvextractor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qitemverifier.cpp b/src/xmlpatterns/janitors/qitemverifier.cpp
index 8f6ce6e..42abac4 100644
--- a/src/xmlpatterns/janitors/qitemverifier.cpp
+++ b/src/xmlpatterns/janitors/qitemverifier.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h
index 7e9d664..c19a0f1 100644
--- a/src/xmlpatterns/janitors/qitemverifier_p.h
+++ b/src/xmlpatterns/janitors/qitemverifier_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter.cpp b/src/xmlpatterns/janitors/quntypedatomicconverter.cpp
index 2aaaec8..4e49d53 100644
--- a/src/xmlpatterns/janitors/quntypedatomicconverter.cpp
+++ b/src/xmlpatterns/janitors/quntypedatomicconverter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
index 1173f95..82ee36c 100644
--- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
+++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/TokenLookup.gperf b/src/xmlpatterns/parser/TokenLookup.gperf
index 83cd53d..27af222 100644
--- a/src/xmlpatterns/parser/TokenLookup.gperf
+++ b/src/xmlpatterns/parser/TokenLookup.gperf
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/createParser.sh b/src/xmlpatterns/parser/createParser.sh
index c639933..ca687cb 100755
--- a/src/xmlpatterns/parser/createParser.sh
+++ b/src/xmlpatterns/parser/createParser.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/xmlpatterns/parser/createTokenLookup.sh b/src/xmlpatterns/parser/createTokenLookup.sh
index e11a3ba..0f1c187 100755
--- a/src/xmlpatterns/parser/createTokenLookup.sh
+++ b/src/xmlpatterns/parser/createTokenLookup.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/xmlpatterns/parser/createXSLTTokenLookup.sh b/src/xmlpatterns/parser/createXSLTTokenLookup.sh
index 6b6c8ad..2773aeb 100755
--- a/src/xmlpatterns/parser/createXSLTTokenLookup.sh
+++ b/src/xmlpatterns/parser/createXSLTTokenLookup.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/src/xmlpatterns/parser/qmaintainingreader.cpp b/src/xmlpatterns/parser/qmaintainingreader.cpp
index b473940..d758cee 100644
--- a/src/xmlpatterns/parser/qmaintainingreader.cpp
+++ b/src/xmlpatterns/parser/qmaintainingreader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h
index 6d92586..0c6a4d2 100644
--- a/src/xmlpatterns/parser/qmaintainingreader_p.h
+++ b/src/xmlpatterns/parser/qmaintainingreader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qparsercontext.cpp b/src/xmlpatterns/parser/qparsercontext.cpp
index 9f6ab41..40f8db4 100644
--- a/src/xmlpatterns/parser/qparsercontext.cpp
+++ b/src/xmlpatterns/parser/qparsercontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qparsercontext_p.h b/src/xmlpatterns/parser/qparsercontext_p.h
index 403f911..2120d50 100644
--- a/src/xmlpatterns/parser/qparsercontext_p.h
+++ b/src/xmlpatterns/parser/qparsercontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp
index 6daa470..5c1769b 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qquerytransformparser_p.h b/src/xmlpatterns/parser/qquerytransformparser_p.h
index 0b316ec..22401be 100644
--- a/src/xmlpatterns/parser/qquerytransformparser_p.h
+++ b/src/xmlpatterns/parser/qquerytransformparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qtokenizer_p.h b/src/xmlpatterns/parser/qtokenizer_p.h
index 38834ef..5c2033d 100644
--- a/src/xmlpatterns/parser/qtokenizer_p.h
+++ b/src/xmlpatterns/parser/qtokenizer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qtokenlookup.cpp b/src/xmlpatterns/parser/qtokenlookup.cpp
index 059b159..d1c45dc 100644
--- a/src/xmlpatterns/parser/qtokenlookup.cpp
+++ b/src/xmlpatterns/parser/qtokenlookup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qtokenrevealer.cpp b/src/xmlpatterns/parser/qtokenrevealer.cpp
index 7c97d79..80a29c4 100644
--- a/src/xmlpatterns/parser/qtokenrevealer.cpp
+++ b/src/xmlpatterns/parser/qtokenrevealer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qtokenrevealer_p.h b/src/xmlpatterns/parser/qtokenrevealer_p.h
index 5c967a6..13bef36 100644
--- a/src/xmlpatterns/parser/qtokenrevealer_p.h
+++ b/src/xmlpatterns/parser/qtokenrevealer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qtokensource.cpp b/src/xmlpatterns/parser/qtokensource.cpp
index e025aac..19eb1e9 100644
--- a/src/xmlpatterns/parser/qtokensource.cpp
+++ b/src/xmlpatterns/parser/qtokensource.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h
index 70088a8..91f358d 100644
--- a/src/xmlpatterns/parser/qtokensource_p.h
+++ b/src/xmlpatterns/parser/qtokensource_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp
index 8075671..738e577 100644
--- a/src/xmlpatterns/parser/querytransformparser.ypp
+++ b/src/xmlpatterns/parser/querytransformparser.ypp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -59,11 +59,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -77,16 +77,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qxquerytokenizer.cpp b/src/xmlpatterns/parser/qxquerytokenizer.cpp
index 912ef5d..6236210 100644
--- a/src/xmlpatterns/parser/qxquerytokenizer.cpp
+++ b/src/xmlpatterns/parser/qxquerytokenizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h
index bd89ac8..30f7e9a 100644
--- a/src/xmlpatterns/parser/qxquerytokenizer_p.h
+++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qxslttokenizer.cpp b/src/xmlpatterns/parser/qxslttokenizer.cpp
index 5827334..96abb94 100644
--- a/src/xmlpatterns/parser/qxslttokenizer.cpp
+++ b/src/xmlpatterns/parser/qxslttokenizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h
index fa3f1e4..9a89b47 100644
--- a/src/xmlpatterns/parser/qxslttokenizer_p.h
+++ b/src/xmlpatterns/parser/qxslttokenizer_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qxslttokenlookup.cpp b/src/xmlpatterns/parser/qxslttokenlookup.cpp
index 781ba0d..1976eec 100644
--- a/src/xmlpatterns/parser/qxslttokenlookup.cpp
+++ b/src/xmlpatterns/parser/qxslttokenlookup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qxslttokenlookup.xml b/src/xmlpatterns/parser/qxslttokenlookup.xml
index 3f0f3c6..09b5d6c 100644
--- a/src/xmlpatterns/parser/qxslttokenlookup.xml
+++ b/src/xmlpatterns/parser/qxslttokenlookup.xml
@@ -117,11 +117,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -135,16 +135,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/qxslttokenlookup_p.h b/src/xmlpatterns/parser/qxslttokenlookup_p.h
index 6d004b0..be5b1e2 100644
--- a/src/xmlpatterns/parser/qxslttokenlookup_p.h
+++ b/src/xmlpatterns/parser/qxslttokenlookup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/parser/trolltechHeader.txt b/src/xmlpatterns/parser/trolltechHeader.txt
index 984cbdc..cc89ced 100644
--- a/src/xmlpatterns/parser/trolltechHeader.txt
+++ b/src/xmlpatterns/parser/trolltechHeader.txt
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/projection/qdocumentprojector.cpp b/src/xmlpatterns/projection/qdocumentprojector.cpp
index 8a43dc7..53ef155 100644
--- a/src/xmlpatterns/projection/qdocumentprojector.cpp
+++ b/src/xmlpatterns/projection/qdocumentprojector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h
index 8e7ec65..aa955e4 100644
--- a/src/xmlpatterns/projection/qdocumentprojector_p.h
+++ b/src/xmlpatterns/projection/qdocumentprojector_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h
index 3f0fca7..b919df0 100644
--- a/src/xmlpatterns/projection/qprojectedexpression_p.h
+++ b/src/xmlpatterns/projection/qprojectedexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/qtokenautomaton/exampleFile.xml b/src/xmlpatterns/qtokenautomaton/exampleFile.xml
index 09c659b..3ef1fac 100644
--- a/src/xmlpatterns/qtokenautomaton/exampleFile.xml
+++ b/src/xmlpatterns/qtokenautomaton/exampleFile.xml
@@ -26,11 +26,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -44,16 +44,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qnamespacesupport.cpp b/src/xmlpatterns/schema/qnamespacesupport.cpp
index 05b87e3..e497dc0 100644
--- a/src/xmlpatterns/schema/qnamespacesupport.cpp
+++ b/src/xmlpatterns/schema/qnamespacesupport.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qnamespacesupport_p.h b/src/xmlpatterns/schema/qnamespacesupport_p.h
index 2a2cb1e..163cf28 100644
--- a/src/xmlpatterns/schema/qnamespacesupport_p.h
+++ b/src/xmlpatterns/schema/qnamespacesupport_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdalternative.cpp b/src/xmlpatterns/schema/qxsdalternative.cpp
index 279a184..11fa034 100644
--- a/src/xmlpatterns/schema/qxsdalternative.cpp
+++ b/src/xmlpatterns/schema/qxsdalternative.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdalternative_p.h b/src/xmlpatterns/schema/qxsdalternative_p.h
index f94f0ac..987eeb3 100644
--- a/src/xmlpatterns/schema/qxsdalternative_p.h
+++ b/src/xmlpatterns/schema/qxsdalternative_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdannotated.cpp b/src/xmlpatterns/schema/qxsdannotated.cpp
index 151057d..bc06802 100644
--- a/src/xmlpatterns/schema/qxsdannotated.cpp
+++ b/src/xmlpatterns/schema/qxsdannotated.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdannotated_p.h b/src/xmlpatterns/schema/qxsdannotated_p.h
index f8d7fe1..d591b28 100644
--- a/src/xmlpatterns/schema/qxsdannotated_p.h
+++ b/src/xmlpatterns/schema/qxsdannotated_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdannotation.cpp b/src/xmlpatterns/schema/qxsdannotation.cpp
index 9c76378..01ad38e 100644
--- a/src/xmlpatterns/schema/qxsdannotation.cpp
+++ b/src/xmlpatterns/schema/qxsdannotation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdannotation_p.h b/src/xmlpatterns/schema/qxsdannotation_p.h
index a8e2d55..4884a6f 100644
--- a/src/xmlpatterns/schema/qxsdannotation_p.h
+++ b/src/xmlpatterns/schema/qxsdannotation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdapplicationinformation.cpp b/src/xmlpatterns/schema/qxsdapplicationinformation.cpp
index 45c6391..2cbf65a 100644
--- a/src/xmlpatterns/schema/qxsdapplicationinformation.cpp
+++ b/src/xmlpatterns/schema/qxsdapplicationinformation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
index 1a549cb..ebdf492 100644
--- a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
+++ b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdassertion.cpp b/src/xmlpatterns/schema/qxsdassertion.cpp
index 2f2d8aa..5adada2 100644
--- a/src/xmlpatterns/schema/qxsdassertion.cpp
+++ b/src/xmlpatterns/schema/qxsdassertion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdassertion_p.h b/src/xmlpatterns/schema/qxsdassertion_p.h
index c511c85..20d9f63 100644
--- a/src/xmlpatterns/schema/qxsdassertion_p.h
+++ b/src/xmlpatterns/schema/qxsdassertion_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattribute.cpp b/src/xmlpatterns/schema/qxsdattribute.cpp
index 68f9e3d..e22125b 100644
--- a/src/xmlpatterns/schema/qxsdattribute.cpp
+++ b/src/xmlpatterns/schema/qxsdattribute.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattribute_p.h b/src/xmlpatterns/schema/qxsdattribute_p.h
index d64d335..42f7dfe 100644
--- a/src/xmlpatterns/schema/qxsdattribute_p.h
+++ b/src/xmlpatterns/schema/qxsdattribute_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributegroup.cpp b/src/xmlpatterns/schema/qxsdattributegroup.cpp
index b0dbc8a..a00f62c 100644
--- a/src/xmlpatterns/schema/qxsdattributegroup.cpp
+++ b/src/xmlpatterns/schema/qxsdattributegroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributegroup_p.h b/src/xmlpatterns/schema/qxsdattributegroup_p.h
index 0d76d53..462e785 100644
--- a/src/xmlpatterns/schema/qxsdattributegroup_p.h
+++ b/src/xmlpatterns/schema/qxsdattributegroup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributereference.cpp b/src/xmlpatterns/schema/qxsdattributereference.cpp
index 853705a..483a188 100644
--- a/src/xmlpatterns/schema/qxsdattributereference.cpp
+++ b/src/xmlpatterns/schema/qxsdattributereference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h
index 9c3ef80..c213b94 100644
--- a/src/xmlpatterns/schema/qxsdattributereference_p.h
+++ b/src/xmlpatterns/schema/qxsdattributereference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributeterm.cpp b/src/xmlpatterns/schema/qxsdattributeterm.cpp
index afed862..1745487 100644
--- a/src/xmlpatterns/schema/qxsdattributeterm.cpp
+++ b/src/xmlpatterns/schema/qxsdattributeterm.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributeterm_p.h b/src/xmlpatterns/schema/qxsdattributeterm_p.h
index 45f5402..5464ea3 100644
--- a/src/xmlpatterns/schema/qxsdattributeterm_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeterm_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributeuse.cpp b/src/xmlpatterns/schema/qxsdattributeuse.cpp
index 4055d48..fc155d2 100644
--- a/src/xmlpatterns/schema/qxsdattributeuse.cpp
+++ b/src/xmlpatterns/schema/qxsdattributeuse.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h
index 648620f..48dbd84 100644
--- a/src/xmlpatterns/schema/qxsdattributeuse_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdcomplextype.cpp b/src/xmlpatterns/schema/qxsdcomplextype.cpp
index 42aeb60..4b80f8d 100644
--- a/src/xmlpatterns/schema/qxsdcomplextype.cpp
+++ b/src/xmlpatterns/schema/qxsdcomplextype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h
index d28d2fc..7c5ab06 100644
--- a/src/xmlpatterns/schema/qxsdcomplextype_p.h
+++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsddocumentation.cpp b/src/xmlpatterns/schema/qxsddocumentation.cpp
index de610b4..4196665 100644
--- a/src/xmlpatterns/schema/qxsddocumentation.cpp
+++ b/src/xmlpatterns/schema/qxsddocumentation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsddocumentation_p.h b/src/xmlpatterns/schema/qxsddocumentation_p.h
index cdccfd7..a4df969 100644
--- a/src/xmlpatterns/schema/qxsddocumentation_p.h
+++ b/src/xmlpatterns/schema/qxsddocumentation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdelement.cpp b/src/xmlpatterns/schema/qxsdelement.cpp
index 1ebec06..ca1cc6e 100644
--- a/src/xmlpatterns/schema/qxsdelement.cpp
+++ b/src/xmlpatterns/schema/qxsdelement.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h
index 93c5983..811fcc9 100644
--- a/src/xmlpatterns/schema/qxsdelement_p.h
+++ b/src/xmlpatterns/schema/qxsdelement_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdfacet.cpp b/src/xmlpatterns/schema/qxsdfacet.cpp
index 80acc74..e3786e3 100644
--- a/src/xmlpatterns/schema/qxsdfacet.cpp
+++ b/src/xmlpatterns/schema/qxsdfacet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdfacet_p.h b/src/xmlpatterns/schema/qxsdfacet_p.h
index 349e211..6aff513 100644
--- a/src/xmlpatterns/schema/qxsdfacet_p.h
+++ b/src/xmlpatterns/schema/qxsdfacet_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdidcache.cpp b/src/xmlpatterns/schema/qxsdidcache.cpp
index cfca2e9..796bca5 100644
--- a/src/xmlpatterns/schema/qxsdidcache.cpp
+++ b/src/xmlpatterns/schema/qxsdidcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdidcache_p.h b/src/xmlpatterns/schema/qxsdidcache_p.h
index b24e4b7..b89ee6a 100644
--- a/src/xmlpatterns/schema/qxsdidcache_p.h
+++ b/src/xmlpatterns/schema/qxsdidcache_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdidchelper.cpp b/src/xmlpatterns/schema/qxsdidchelper.cpp
index 7740929..8e18519 100644
--- a/src/xmlpatterns/schema/qxsdidchelper.cpp
+++ b/src/xmlpatterns/schema/qxsdidchelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdidchelper_p.h b/src/xmlpatterns/schema/qxsdidchelper_p.h
index f3a9bac..6ff6728 100644
--- a/src/xmlpatterns/schema/qxsdidchelper_p.h
+++ b/src/xmlpatterns/schema/qxsdidchelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdidentityconstraint.cpp b/src/xmlpatterns/schema/qxsdidentityconstraint.cpp
index 12f8446..d4ae90b 100644
--- a/src/xmlpatterns/schema/qxsdidentityconstraint.cpp
+++ b/src/xmlpatterns/schema/qxsdidentityconstraint.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
index a675ea0..51703a1 100644
--- a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
+++ b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdinstancereader.cpp b/src/xmlpatterns/schema/qxsdinstancereader.cpp
index a7cb735..21daefe 100644
--- a/src/xmlpatterns/schema/qxsdinstancereader.cpp
+++ b/src/xmlpatterns/schema/qxsdinstancereader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdinstancereader_p.h b/src/xmlpatterns/schema/qxsdinstancereader_p.h
index 9c9fcd1..4669f06 100644
--- a/src/xmlpatterns/schema/qxsdinstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdinstancereader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdmodelgroup.cpp b/src/xmlpatterns/schema/qxsdmodelgroup.cpp
index 69e5fad..1e1b213 100644
--- a/src/xmlpatterns/schema/qxsdmodelgroup.cpp
+++ b/src/xmlpatterns/schema/qxsdmodelgroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
index c4f54e5..2ca92b3 100644
--- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h
+++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdnotation.cpp b/src/xmlpatterns/schema/qxsdnotation.cpp
index 2cd27a4..fced404 100644
--- a/src/xmlpatterns/schema/qxsdnotation.cpp
+++ b/src/xmlpatterns/schema/qxsdnotation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdnotation_p.h b/src/xmlpatterns/schema/qxsdnotation_p.h
index 598392a..c32df91 100644
--- a/src/xmlpatterns/schema/qxsdnotation_p.h
+++ b/src/xmlpatterns/schema/qxsdnotation_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdparticle.cpp b/src/xmlpatterns/schema/qxsdparticle.cpp
index 650524c..a05f186 100644
--- a/src/xmlpatterns/schema/qxsdparticle.cpp
+++ b/src/xmlpatterns/schema/qxsdparticle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdparticle_p.h b/src/xmlpatterns/schema/qxsdparticle_p.h
index 4e6561e..148b10a 100644
--- a/src/xmlpatterns/schema/qxsdparticle_p.h
+++ b/src/xmlpatterns/schema/qxsdparticle_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdparticlechecker.cpp b/src/xmlpatterns/schema/qxsdparticlechecker.cpp
index 15c2afe..3038164 100644
--- a/src/xmlpatterns/schema/qxsdparticlechecker.cpp
+++ b/src/xmlpatterns/schema/qxsdparticlechecker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdparticlechecker_p.h b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
index 40c525a..293cf9a 100644
--- a/src/xmlpatterns/schema/qxsdparticlechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdreference.cpp b/src/xmlpatterns/schema/qxsdreference.cpp
index d98a405..7f3b01e 100644
--- a/src/xmlpatterns/schema/qxsdreference.cpp
+++ b/src/xmlpatterns/schema/qxsdreference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h
index 028d190..688d46d 100644
--- a/src/xmlpatterns/schema/qxsdreference_p.h
+++ b/src/xmlpatterns/schema/qxsdreference_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschema.cpp b/src/xmlpatterns/schema/qxsdschema.cpp
index cb766d1..a2120ae 100644
--- a/src/xmlpatterns/schema/qxsdschema.cpp
+++ b/src/xmlpatterns/schema/qxsdschema.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschema_p.h b/src/xmlpatterns/schema/qxsdschema_p.h
index e63324e..9923acf 100644
--- a/src/xmlpatterns/schema/qxsdschema_p.h
+++ b/src/xmlpatterns/schema/qxsdschema_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemachecker.cpp b/src/xmlpatterns/schema/qxsdschemachecker.cpp
index 0d16940..bb6763c 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker.cpp
+++ b/src/xmlpatterns/schema/qxsdschemachecker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp b/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
index 3a44365..ef7c171 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
+++ b/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemachecker_p.h b/src/xmlpatterns/schema/qxsdschemachecker_p.h
index b4966d9..2815a76 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker_p.h
+++ b/src/xmlpatterns/schema/qxsdschemachecker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemachecker_setup.cpp b/src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
index 11bf8b7..ca1d71f 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
+++ b/src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemacontext.cpp b/src/xmlpatterns/schema/qxsdschemacontext.cpp
index 8e22632..07ac7b9 100644
--- a/src/xmlpatterns/schema/qxsdschemacontext.cpp
+++ b/src/xmlpatterns/schema/qxsdschemacontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h
index 6a04ba3..bf2122e 100644
--- a/src/xmlpatterns/schema/qxsdschemacontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemadebugger.cpp b/src/xmlpatterns/schema/qxsdschemadebugger.cpp
index 8ec7381..8ad832d 100644
--- a/src/xmlpatterns/schema/qxsdschemadebugger.cpp
+++ b/src/xmlpatterns/schema/qxsdschemadebugger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemadebugger_p.h b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
index 2225b88..13c8318 100644
--- a/src/xmlpatterns/schema/qxsdschemadebugger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemahelper.cpp b/src/xmlpatterns/schema/qxsdschemahelper.cpp
index 7813808..483720c 100644
--- a/src/xmlpatterns/schema/qxsdschemahelper.cpp
+++ b/src/xmlpatterns/schema/qxsdschemahelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemahelper_p.h b/src/xmlpatterns/schema/qxsdschemahelper_p.h
index 410b224..3790895 100644
--- a/src/xmlpatterns/schema/qxsdschemahelper_p.h
+++ b/src/xmlpatterns/schema/qxsdschemahelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemamerger.cpp b/src/xmlpatterns/schema/qxsdschemamerger.cpp
index 4ffcea3..d34cc4d 100644
--- a/src/xmlpatterns/schema/qxsdschemamerger.cpp
+++ b/src/xmlpatterns/schema/qxsdschemamerger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemamerger_p.h b/src/xmlpatterns/schema/qxsdschemamerger_p.h
index 599a08b..4a7ab55 100644
--- a/src/xmlpatterns/schema/qxsdschemamerger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemamerger_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp
index fd0b95c..0b6bc4a 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h
index 80d44a5..d3dd721 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp b/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
index 88e5f93..f0e3cd8 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp b/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
index 381d4d0..5e6a7f2 100644
--- a/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
index 19c516a..94235d5 100644
--- a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
index f3d1ed0..eaf85b2 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver_p.h b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
index ef0154b..1db88ce 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschematoken.cpp b/src/xmlpatterns/schema/qxsdschematoken.cpp
index a04f8ae..f062886 100644
--- a/src/xmlpatterns/schema/qxsdschematoken.cpp
+++ b/src/xmlpatterns/schema/qxsdschematoken.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschematoken_p.h b/src/xmlpatterns/schema/qxsdschematoken_p.h
index fbf71f0..fdd75bd 100644
--- a/src/xmlpatterns/schema/qxsdschematoken_p.h
+++ b/src/xmlpatterns/schema/qxsdschematoken_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory.cpp b/src/xmlpatterns/schema/qxsdschematypesfactory.cpp
index b5f319b..6de252a 100644
--- a/src/xmlpatterns/schema/qxsdschematypesfactory.cpp
+++ b/src/xmlpatterns/schema/qxsdschematypesfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
index 74ecc3c..600527d 100644
--- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
+++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdsimpletype.cpp b/src/xmlpatterns/schema/qxsdsimpletype.cpp
index 6fd5658..b01e1d9 100644
--- a/src/xmlpatterns/schema/qxsdsimpletype.cpp
+++ b/src/xmlpatterns/schema/qxsdsimpletype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h
index 6305fc7..a5f443f 100644
--- a/src/xmlpatterns/schema/qxsdsimpletype_p.h
+++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdstatemachine.cpp b/src/xmlpatterns/schema/qxsdstatemachine.cpp
index 8a43411..7816c1a 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine.cpp
+++ b/src/xmlpatterns/schema/qxsdstatemachine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h
index 294eb50..f857f06 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp b/src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
index fed8a41..f46d92c 100644
--- a/src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
+++ b/src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
index c17ca9b..068b2f8 100644
--- a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdterm.cpp b/src/xmlpatterns/schema/qxsdterm.cpp
index 19af613..ea1cd83 100644
--- a/src/xmlpatterns/schema/qxsdterm.cpp
+++ b/src/xmlpatterns/schema/qxsdterm.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdterm_p.h b/src/xmlpatterns/schema/qxsdterm_p.h
index 6b3f66a..1d05d1b 100644
--- a/src/xmlpatterns/schema/qxsdterm_p.h
+++ b/src/xmlpatterns/schema/qxsdterm_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdtypechecker.cpp b/src/xmlpatterns/schema/qxsdtypechecker.cpp
index 4bb03f5..589b238 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker.cpp
+++ b/src/xmlpatterns/schema/qxsdtypechecker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h
index ae90bdc..c6e2b0d 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsduserschematype.cpp b/src/xmlpatterns/schema/qxsduserschematype.cpp
index 95892e1..a28e5a8 100644
--- a/src/xmlpatterns/schema/qxsduserschematype.cpp
+++ b/src/xmlpatterns/schema/qxsduserschematype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h
index 72162d5..0849209 100644
--- a/src/xmlpatterns/schema/qxsduserschematype_p.h
+++ b/src/xmlpatterns/schema/qxsduserschematype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
index 3cbb6c1..d04fa8d 100644
--- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
+++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
index c502835..4730ae2 100644
--- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
index 622a39f..35f2db6 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
index 4dc736a..3cdbde4 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdwildcard.cpp b/src/xmlpatterns/schema/qxsdwildcard.cpp
index abf490e..8f4c5a1 100644
--- a/src/xmlpatterns/schema/qxsdwildcard.cpp
+++ b/src/xmlpatterns/schema/qxsdwildcard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h
index 8940f13..d895c56 100644
--- a/src/xmlpatterns/schema/qxsdwildcard_p.h
+++ b/src/xmlpatterns/schema/qxsdwildcard_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdxpathexpression.cpp b/src/xmlpatterns/schema/qxsdxpathexpression.cpp
index d5b4f1a..588abb2 100644
--- a/src/xmlpatterns/schema/qxsdxpathexpression.cpp
+++ b/src/xmlpatterns/schema/qxsdxpathexpression.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/qxsdxpathexpression_p.h b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
index 8685da5..c92c6a3 100644
--- a/src/xmlpatterns/schema/qxsdxpathexpression_p.h
+++ b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/schema/tokens.xml b/src/xmlpatterns/schema/tokens.xml
index b3b8e18..cb689ba 100644
--- a/src/xmlpatterns/schema/tokens.xml
+++ b/src/xmlpatterns/schema/tokens.xml
@@ -116,11 +116,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -134,16 +134,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qabstractnodetest.cpp b/src/xmlpatterns/type/qabstractnodetest.cpp
index 35f8ad4..4814c75 100644
--- a/src/xmlpatterns/type/qabstractnodetest.cpp
+++ b/src/xmlpatterns/type/qabstractnodetest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h
index a23e464..5c61f05 100644
--- a/src/xmlpatterns/type/qabstractnodetest_p.h
+++ b/src/xmlpatterns/type/qabstractnodetest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanyitemtype.cpp b/src/xmlpatterns/type/qanyitemtype.cpp
index 0527181..287516d 100644
--- a/src/xmlpatterns/type/qanyitemtype.cpp
+++ b/src/xmlpatterns/type/qanyitemtype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h
index ea6de71..ed26cf7 100644
--- a/src/xmlpatterns/type/qanyitemtype_p.h
+++ b/src/xmlpatterns/type/qanyitemtype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanynodetype.cpp b/src/xmlpatterns/type/qanynodetype.cpp
index 3e65482..b02a9a5 100644
--- a/src/xmlpatterns/type/qanynodetype.cpp
+++ b/src/xmlpatterns/type/qanynodetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h
index 2cda59d..dfe8b26 100644
--- a/src/xmlpatterns/type/qanynodetype_p.h
+++ b/src/xmlpatterns/type/qanynodetype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanysimpletype.cpp b/src/xmlpatterns/type/qanysimpletype.cpp
index abc0809..c6ccfba 100644
--- a/src/xmlpatterns/type/qanysimpletype.cpp
+++ b/src/xmlpatterns/type/qanysimpletype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h
index a0a1465..aeeb4e8 100644
--- a/src/xmlpatterns/type/qanysimpletype_p.h
+++ b/src/xmlpatterns/type/qanysimpletype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanytype.cpp b/src/xmlpatterns/type/qanytype.cpp
index 841f034..a0984e3 100644
--- a/src/xmlpatterns/type/qanytype.cpp
+++ b/src/xmlpatterns/type/qanytype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h
index f7260ef..f2c34e1 100644
--- a/src/xmlpatterns/type/qanytype_p.h
+++ b/src/xmlpatterns/type/qanytype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccasterlocator.cpp b/src/xmlpatterns/type/qatomiccasterlocator.cpp
index b6f03aa..626cc40 100644
--- a/src/xmlpatterns/type/qatomiccasterlocator.cpp
+++ b/src/xmlpatterns/type/qatomiccasterlocator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h
index 8c787fd..1facd08 100644
--- a/src/xmlpatterns/type/qatomiccasterlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccasterlocators.cpp b/src/xmlpatterns/type/qatomiccasterlocators.cpp
index 34e61b5..93f8f02 100644
--- a/src/xmlpatterns/type/qatomiccasterlocators.cpp
+++ b/src/xmlpatterns/type/qatomiccasterlocators.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h
index 624ebe9..cafd8de 100644
--- a/src/xmlpatterns/type/qatomiccasterlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator.cpp b/src/xmlpatterns/type/qatomiccomparatorlocator.cpp
index 27c7c05..6a14414 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocator.cpp
+++ b/src/xmlpatterns/type/qatomiccomparatorlocator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
index 6d63a99..f8cb0db 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp
index 00af406..0c9fa06 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp
+++ b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
index 613662a..3adfe27 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator.cpp b/src/xmlpatterns/type/qatomicmathematicianlocator.cpp
index b12823b..8881007 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocator.cpp
+++ b/src/xmlpatterns/type/qatomicmathematicianlocator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
index eee8a70..08403a3 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
index b7310d0..d6ca2fc 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
+++ b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
index dacfe05..f092e7c 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomictype.cpp b/src/xmlpatterns/type/qatomictype.cpp
index c7f448c..4e90fbc 100644
--- a/src/xmlpatterns/type/qatomictype.cpp
+++ b/src/xmlpatterns/type/qatomictype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h
index f1889e5..12fa6f6 100644
--- a/src/xmlpatterns/type/qatomictype_p.h
+++ b/src/xmlpatterns/type/qatomictype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qatomictypedispatch_p.h b/src/xmlpatterns/type/qatomictypedispatch_p.h
index 037527e..131957e 100644
--- a/src/xmlpatterns/type/qatomictypedispatch_p.h
+++ b/src/xmlpatterns/type/qatomictypedispatch_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbasictypesfactory.cpp b/src/xmlpatterns/type/qbasictypesfactory.cpp
index 302fe79..3d36e50 100644
--- a/src/xmlpatterns/type/qbasictypesfactory.cpp
+++ b/src/xmlpatterns/type/qbasictypesfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h
index c131d7a..c6dedc3 100644
--- a/src/xmlpatterns/type/qbasictypesfactory_p.h
+++ b/src/xmlpatterns/type/qbasictypesfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltinatomictype.cpp b/src/xmlpatterns/type/qbuiltinatomictype.cpp
index e4b4645..74bb077 100644
--- a/src/xmlpatterns/type/qbuiltinatomictype.cpp
+++ b/src/xmlpatterns/type/qbuiltinatomictype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h
index af1474f..793d5bd 100644
--- a/src/xmlpatterns/type/qbuiltinatomictype_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltinatomictypes.cpp b/src/xmlpatterns/type/qbuiltinatomictypes.cpp
index a6773f5..274b332 100644
--- a/src/xmlpatterns/type/qbuiltinatomictypes.cpp
+++ b/src/xmlpatterns/type/qbuiltinatomictypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
index bdaa846..fec05ea 100644
--- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltinnodetype.cpp b/src/xmlpatterns/type/qbuiltinnodetype.cpp
index ce2007c..8b88bfc 100644
--- a/src/xmlpatterns/type/qbuiltinnodetype.cpp
+++ b/src/xmlpatterns/type/qbuiltinnodetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h
index ca97058..ff2c5c6 100644
--- a/src/xmlpatterns/type/qbuiltinnodetype_p.h
+++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltintypes.cpp b/src/xmlpatterns/type/qbuiltintypes.cpp
index a399c7b..6fc1b77 100644
--- a/src/xmlpatterns/type/qbuiltintypes.cpp
+++ b/src/xmlpatterns/type/qbuiltintypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qbuiltintypes_p.h b/src/xmlpatterns/type/qbuiltintypes_p.h
index 3386140..c6a019d 100644
--- a/src/xmlpatterns/type/qbuiltintypes_p.h
+++ b/src/xmlpatterns/type/qbuiltintypes_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qcardinality.cpp b/src/xmlpatterns/type/qcardinality.cpp
index eee4729..12c4a4c 100644
--- a/src/xmlpatterns/type/qcardinality.cpp
+++ b/src/xmlpatterns/type/qcardinality.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qcardinality_p.h b/src/xmlpatterns/type/qcardinality_p.h
index 13ecdc4..438f09f 100644
--- a/src/xmlpatterns/type/qcardinality_p.h
+++ b/src/xmlpatterns/type/qcardinality_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qcommonsequencetypes.cpp b/src/xmlpatterns/type/qcommonsequencetypes.cpp
index ab49b08..c67ecc1 100644
--- a/src/xmlpatterns/type/qcommonsequencetypes.cpp
+++ b/src/xmlpatterns/type/qcommonsequencetypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qcommonsequencetypes_p.h b/src/xmlpatterns/type/qcommonsequencetypes_p.h
index 26dd918..b0efa3c 100644
--- a/src/xmlpatterns/type/qcommonsequencetypes_p.h
+++ b/src/xmlpatterns/type/qcommonsequencetypes_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qebvtype.cpp b/src/xmlpatterns/type/qebvtype.cpp
index 6433e86..815ed65 100644
--- a/src/xmlpatterns/type/qebvtype.cpp
+++ b/src/xmlpatterns/type/qebvtype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h
index a720994..84bf5c7 100644
--- a/src/xmlpatterns/type/qebvtype_p.h
+++ b/src/xmlpatterns/type/qebvtype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qemptysequencetype.cpp b/src/xmlpatterns/type/qemptysequencetype.cpp
index a13aad2..d5609be 100644
--- a/src/xmlpatterns/type/qemptysequencetype.cpp
+++ b/src/xmlpatterns/type/qemptysequencetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h
index 9f35492..e2e235d 100644
--- a/src/xmlpatterns/type/qemptysequencetype_p.h
+++ b/src/xmlpatterns/type/qemptysequencetype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qgenericsequencetype.cpp b/src/xmlpatterns/type/qgenericsequencetype.cpp
index 73f5bb0..9af5532 100644
--- a/src/xmlpatterns/type/qgenericsequencetype.cpp
+++ b/src/xmlpatterns/type/qgenericsequencetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h
index 36a5603..a9b44a2 100644
--- a/src/xmlpatterns/type/qgenericsequencetype_p.h
+++ b/src/xmlpatterns/type/qgenericsequencetype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qitemtype.cpp b/src/xmlpatterns/type/qitemtype.cpp
index 1572bd1..d39db69 100644
--- a/src/xmlpatterns/type/qitemtype.cpp
+++ b/src/xmlpatterns/type/qitemtype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qitemtype_p.h b/src/xmlpatterns/type/qitemtype_p.h
index db11ba8..e41fdb4 100644
--- a/src/xmlpatterns/type/qitemtype_p.h
+++ b/src/xmlpatterns/type/qitemtype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qlocalnametest.cpp b/src/xmlpatterns/type/qlocalnametest.cpp
index fa51996..8dc5103 100644
--- a/src/xmlpatterns/type/qlocalnametest.cpp
+++ b/src/xmlpatterns/type/qlocalnametest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h
index 52071c8..b81c1af 100644
--- a/src/xmlpatterns/type/qlocalnametest_p.h
+++ b/src/xmlpatterns/type/qlocalnametest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qmultiitemtype.cpp b/src/xmlpatterns/type/qmultiitemtype.cpp
index 8be25f5..539a423 100644
--- a/src/xmlpatterns/type/qmultiitemtype.cpp
+++ b/src/xmlpatterns/type/qmultiitemtype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h
index ddfda33..0dc351a 100644
--- a/src/xmlpatterns/type/qmultiitemtype_p.h
+++ b/src/xmlpatterns/type/qmultiitemtype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnamedschemacomponent.cpp b/src/xmlpatterns/type/qnamedschemacomponent.cpp
index 0edd593..0cd53ff 100644
--- a/src/xmlpatterns/type/qnamedschemacomponent.cpp
+++ b/src/xmlpatterns/type/qnamedschemacomponent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnamedschemacomponent_p.h b/src/xmlpatterns/type/qnamedschemacomponent_p.h
index 2c8c6ce..3f62286 100644
--- a/src/xmlpatterns/type/qnamedschemacomponent_p.h
+++ b/src/xmlpatterns/type/qnamedschemacomponent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnamespacenametest.cpp b/src/xmlpatterns/type/qnamespacenametest.cpp
index 0df1f5c..3b14619 100644
--- a/src/xmlpatterns/type/qnamespacenametest.cpp
+++ b/src/xmlpatterns/type/qnamespacenametest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h
index f8af8b1..3725ddc 100644
--- a/src/xmlpatterns/type/qnamespacenametest_p.h
+++ b/src/xmlpatterns/type/qnamespacenametest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnonetype.cpp b/src/xmlpatterns/type/qnonetype.cpp
index 513592b..73fe3de 100644
--- a/src/xmlpatterns/type/qnonetype.cpp
+++ b/src/xmlpatterns/type/qnonetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h
index a79478c..f7d630c 100644
--- a/src/xmlpatterns/type/qnonetype_p.h
+++ b/src/xmlpatterns/type/qnonetype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnumerictype.cpp b/src/xmlpatterns/type/qnumerictype.cpp
index da4934f..51fbb51 100644
--- a/src/xmlpatterns/type/qnumerictype.cpp
+++ b/src/xmlpatterns/type/qnumerictype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h
index 813862d..fe2edb7 100644
--- a/src/xmlpatterns/type/qnumerictype_p.h
+++ b/src/xmlpatterns/type/qnumerictype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h
index c378a66..41069ce 100644
--- a/src/xmlpatterns/type/qprimitives_p.h
+++ b/src/xmlpatterns/type/qprimitives_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qqnametest.cpp b/src/xmlpatterns/type/qqnametest.cpp
index 48a381b..b0c63ff 100644
--- a/src/xmlpatterns/type/qqnametest.cpp
+++ b/src/xmlpatterns/type/qqnametest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h
index a027ad5..76c770a 100644
--- a/src/xmlpatterns/type/qqnametest_p.h
+++ b/src/xmlpatterns/type/qqnametest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qschemacomponent.cpp b/src/xmlpatterns/type/qschemacomponent.cpp
index 5bcd112..386de84 100644
--- a/src/xmlpatterns/type/qschemacomponent.cpp
+++ b/src/xmlpatterns/type/qschemacomponent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qschemacomponent_p.h b/src/xmlpatterns/type/qschemacomponent_p.h
index c333ce1..3747c1d 100644
--- a/src/xmlpatterns/type/qschemacomponent_p.h
+++ b/src/xmlpatterns/type/qschemacomponent_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qschematype.cpp b/src/xmlpatterns/type/qschematype.cpp
index 7fa7cc3..13a63e0 100644
--- a/src/xmlpatterns/type/qschematype.cpp
+++ b/src/xmlpatterns/type/qschematype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h
index ff8b86b..23117f0 100644
--- a/src/xmlpatterns/type/qschematype_p.h
+++ b/src/xmlpatterns/type/qschematype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qschematypefactory.cpp b/src/xmlpatterns/type/qschematypefactory.cpp
index 021cbf6..ecf2388 100644
--- a/src/xmlpatterns/type/qschematypefactory.cpp
+++ b/src/xmlpatterns/type/qschematypefactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qschematypefactory_p.h b/src/xmlpatterns/type/qschematypefactory_p.h
index a78f1ff..1d3c436 100644
--- a/src/xmlpatterns/type/qschematypefactory_p.h
+++ b/src/xmlpatterns/type/qschematypefactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qsequencetype.cpp b/src/xmlpatterns/type/qsequencetype.cpp
index 13c504c..6d3fe3e 100644
--- a/src/xmlpatterns/type/qsequencetype.cpp
+++ b/src/xmlpatterns/type/qsequencetype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h
index fc537a9..7aedb9f 100644
--- a/src/xmlpatterns/type/qsequencetype_p.h
+++ b/src/xmlpatterns/type/qsequencetype_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qtypechecker.cpp b/src/xmlpatterns/type/qtypechecker.cpp
index 879fe0e..ff90074 100644
--- a/src/xmlpatterns/type/qtypechecker.cpp
+++ b/src/xmlpatterns/type/qtypechecker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qtypechecker_p.h b/src/xmlpatterns/type/qtypechecker_p.h
index 947be48..57da27b 100644
--- a/src/xmlpatterns/type/qtypechecker_p.h
+++ b/src/xmlpatterns/type/qtypechecker_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/quntyped.cpp b/src/xmlpatterns/type/quntyped.cpp
index 8beffaa..dde4840 100644
--- a/src/xmlpatterns/type/quntyped.cpp
+++ b/src/xmlpatterns/type/quntyped.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h
index 065f981..5b2d347 100644
--- a/src/xmlpatterns/type/quntyped_p.h
+++ b/src/xmlpatterns/type/quntyped_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qxsltnodetest.cpp b/src/xmlpatterns/type/qxsltnodetest.cpp
index 79c4eb3..45ea531 100644
--- a/src/xmlpatterns/type/qxsltnodetest.cpp
+++ b/src/xmlpatterns/type/qxsltnodetest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h
index 7b84b03..2e59d5c 100644
--- a/src/xmlpatterns/type/qxsltnodetest_p.h
+++ b/src/xmlpatterns/type/qxsltnodetest_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qautoptr.cpp b/src/xmlpatterns/utils/qautoptr.cpp
index 93694fc..59a698b 100644
--- a/src/xmlpatterns/utils/qautoptr.cpp
+++ b/src/xmlpatterns/utils/qautoptr.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qautoptr_p.h b/src/xmlpatterns/utils/qautoptr_p.h
index 060e7be..d8252ba 100644
--- a/src/xmlpatterns/utils/qautoptr_p.h
+++ b/src/xmlpatterns/utils/qautoptr_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qcommonnamespaces_p.h b/src/xmlpatterns/utils/qcommonnamespaces_p.h
index f222783..2e1bc2a 100644
--- a/src/xmlpatterns/utils/qcommonnamespaces_p.h
+++ b/src/xmlpatterns/utils/qcommonnamespaces_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qcppcastinghelper_p.h b/src/xmlpatterns/utils/qcppcastinghelper_p.h
index 12e2dff..1bdb19d 100644
--- a/src/xmlpatterns/utils/qcppcastinghelper_p.h
+++ b/src/xmlpatterns/utils/qcppcastinghelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qdebug_p.h b/src/xmlpatterns/utils/qdebug_p.h
index 9e7409a..c73deaa 100644
--- a/src/xmlpatterns/utils/qdebug_p.h
+++ b/src/xmlpatterns/utils/qdebug_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp b/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
index 0b41831..9ef1350 100644
--- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
+++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
index 62ba0c2..c7c0c48 100644
--- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp b/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
index 7073a5b..c34a0d5 100644
--- a/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
+++ b/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
index cdcee1c..5e4c091 100644
--- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qnamepool.cpp b/src/xmlpatterns/utils/qnamepool.cpp
index 1bd209f..a873ffd 100644
--- a/src/xmlpatterns/utils/qnamepool.cpp
+++ b/src/xmlpatterns/utils/qnamepool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qnamepool_p.h b/src/xmlpatterns/utils/qnamepool_p.h
index 6b059d9..49375fa 100644
--- a/src/xmlpatterns/utils/qnamepool_p.h
+++ b/src/xmlpatterns/utils/qnamepool_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h
index aaf102e..fd4f34a 100644
--- a/src/xmlpatterns/utils/qnamespacebinding_p.h
+++ b/src/xmlpatterns/utils/qnamespacebinding_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qnamespaceresolver.cpp b/src/xmlpatterns/utils/qnamespaceresolver.cpp
index c0b1732..92c9a26 100644
--- a/src/xmlpatterns/utils/qnamespaceresolver.cpp
+++ b/src/xmlpatterns/utils/qnamespaceresolver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qnamespaceresolver_p.h b/src/xmlpatterns/utils/qnamespaceresolver_p.h
index 1d202b9..6ef64b5 100644
--- a/src/xmlpatterns/utils/qnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnamespaceresolver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver.cpp b/src/xmlpatterns/utils/qnodenamespaceresolver.cpp
index 882978a..a189b1e 100644
--- a/src/xmlpatterns/utils/qnodenamespaceresolver.cpp
+++ b/src/xmlpatterns/utils/qnodenamespaceresolver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
index 5e2208f..0ebb2e5 100644
--- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qoutputvalidator.cpp b/src/xmlpatterns/utils/qoutputvalidator.cpp
index d5fc0c2..93c1b8a 100644
--- a/src/xmlpatterns/utils/qoutputvalidator.cpp
+++ b/src/xmlpatterns/utils/qoutputvalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h
index 3925968..61773d6 100644
--- a/src/xmlpatterns/utils/qoutputvalidator_p.h
+++ b/src/xmlpatterns/utils/qoutputvalidator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qpatternistlocale.cpp b/src/xmlpatterns/utils/qpatternistlocale.cpp
index d47a635..a4e89fe 100644
--- a/src/xmlpatterns/utils/qpatternistlocale.cpp
+++ b/src/xmlpatterns/utils/qpatternistlocale.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qpatternistlocale_p.h b/src/xmlpatterns/utils/qpatternistlocale_p.h
index 50dbb64..b06ccfc 100644
--- a/src/xmlpatterns/utils/qpatternistlocale_p.h
+++ b/src/xmlpatterns/utils/qpatternistlocale_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qxpathhelper.cpp b/src/xmlpatterns/utils/qxpathhelper.cpp
index 24dddc5..a8a6d71 100644
--- a/src/xmlpatterns/utils/qxpathhelper.cpp
+++ b/src/xmlpatterns/utils/qxpathhelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/xmlpatterns/utils/qxpathhelper_p.h b/src/xmlpatterns/utils/qxpathhelper_p.h
index bb0a1d1..bac8fde 100644
--- a/src/xmlpatterns/utils/qxpathhelper_p.h
+++ b/src/xmlpatterns/utils/qxpathhelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/framework.cpp b/tests/arthur/common/framework.cpp
index 19d33ec..9e4e1fe 100644
--- a/tests/arthur/common/framework.cpp
+++ b/tests/arthur/common/framework.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/framework.h b/tests/arthur/common/framework.h
index 8a4d837..2060028 100644
--- a/tests/arthur/common/framework.h
+++ b/tests/arthur/common/framework.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index c4f09a4..aaa4b6c 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h
index aed4840..98c40b9 100644
--- a/tests/arthur/common/paintcommands.h
+++ b/tests/arthur/common/paintcommands.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/qengines.cpp b/tests/arthur/common/qengines.cpp
index 12457fd..ec5b968 100644
--- a/tests/arthur/common/qengines.cpp
+++ b/tests/arthur/common/qengines.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/qengines.h b/tests/arthur/common/qengines.h
index 48405c7..e8ba1b3 100644
--- a/tests/arthur/common/qengines.h
+++ b/tests/arthur/common/qengines.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/xmldata.cpp b/tests/arthur/common/xmldata.cpp
index ab237a3..5934ad1 100644
--- a/tests/arthur/common/xmldata.cpp
+++ b/tests/arthur/common/xmldata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/common/xmldata.h b/tests/arthur/common/xmldata.h
index 99e6e91..7c2574c 100644
--- a/tests/arthur/common/xmldata.h
+++ b/tests/arthur/common/xmldata.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/datagenerator/datagenerator.cpp b/tests/arthur/datagenerator/datagenerator.cpp
index 7692f68..b5ccb35 100644
--- a/tests/arthur/datagenerator/datagenerator.cpp
+++ b/tests/arthur/datagenerator/datagenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/datagenerator/datagenerator.h b/tests/arthur/datagenerator/datagenerator.h
index c6c6eb0..75957ce 100644
--- a/tests/arthur/datagenerator/datagenerator.h
+++ b/tests/arthur/datagenerator/datagenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/datagenerator/main.cpp b/tests/arthur/datagenerator/main.cpp
index c217b25..82c22f4 100644
--- a/tests/arthur/datagenerator/main.cpp
+++ b/tests/arthur/datagenerator/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/datagenerator/xmlgenerator.cpp b/tests/arthur/datagenerator/xmlgenerator.cpp
index e18d821..cfde332 100644
--- a/tests/arthur/datagenerator/xmlgenerator.cpp
+++ b/tests/arthur/datagenerator/xmlgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/datagenerator/xmlgenerator.h b/tests/arthur/datagenerator/xmlgenerator.h
index b8c77a8..d88dac5 100644
--- a/tests/arthur/datagenerator/xmlgenerator.h
+++ b/tests/arthur/datagenerator/xmlgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.cpp b/tests/arthur/htmlgenerator/htmlgenerator.cpp
index e683017..5d1c54b 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.cpp
+++ b/tests/arthur/htmlgenerator/htmlgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.h b/tests/arthur/htmlgenerator/htmlgenerator.h
index 85b56fa..5712d96 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.h
+++ b/tests/arthur/htmlgenerator/htmlgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/htmlgenerator/main.cpp b/tests/arthur/htmlgenerator/main.cpp
index 7521e0c..f537d50 100644
--- a/tests/arthur/htmlgenerator/main.cpp
+++ b/tests/arthur/htmlgenerator/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/lance/interactivewidget.cpp b/tests/arthur/lance/interactivewidget.cpp
index 307c3f7..446208c 100644
--- a/tests/arthur/lance/interactivewidget.cpp
+++ b/tests/arthur/lance/interactivewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/lance/interactivewidget.h b/tests/arthur/lance/interactivewidget.h
index a49b46c..a82c414 100644
--- a/tests/arthur/lance/interactivewidget.h
+++ b/tests/arthur/lance/interactivewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp
index 85ee8b5..b9bc824 100644
--- a/tests/arthur/lance/main.cpp
+++ b/tests/arthur/lance/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/lance/widgets.h b/tests/arthur/lance/widgets.h
index f7d3268..9d96b36 100644
--- a/tests/arthur/lance/widgets.h
+++ b/tests/arthur/lance/widgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/performancediff/main.cpp b/tests/arthur/performancediff/main.cpp
index 8cb3ac9..aadf9a9 100644
--- a/tests/arthur/performancediff/main.cpp
+++ b/tests/arthur/performancediff/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/performancediff/performancediff.cpp b/tests/arthur/performancediff/performancediff.cpp
index 94f73c3..dd23c7e 100644
--- a/tests/arthur/performancediff/performancediff.cpp
+++ b/tests/arthur/performancediff/performancediff.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/performancediff/performancediff.h b/tests/arthur/performancediff/performancediff.h
index 48dd4e7..ccdcc5d 100644
--- a/tests/arthur/performancediff/performancediff.h
+++ b/tests/arthur/performancediff/performancediff.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/shower/main.cpp b/tests/arthur/shower/main.cpp
index 3474b4a..3194aab 100644
--- a/tests/arthur/shower/main.cpp
+++ b/tests/arthur/shower/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/shower/shower.cpp b/tests/arthur/shower/shower.cpp
index 1de162c..79a29a8 100644
--- a/tests/arthur/shower/shower.cpp
+++ b/tests/arthur/shower/shower.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/arthur/shower/shower.h b/tests/arthur/shower/shower.h
index 3013c7b..fb85bdb 100644
--- a/tests/arthur/shower/shower.h
+++ b/tests/arthur/shower/shower.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/atwrapper/atWrapper.cpp b/tests/auto/atwrapper/atWrapper.cpp
index d9f5d17..4adcf1c 100644
--- a/tests/auto/atwrapper/atWrapper.cpp
+++ b/tests/auto/atwrapper/atWrapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/atwrapper/atWrapper.h b/tests/auto/atwrapper/atWrapper.h
index f477f53..4ef8fdb 100644
--- a/tests/auto/atwrapper/atWrapper.h
+++ b/tests/auto/atwrapper/atWrapper.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/atwrapper/atWrapperAutotest.cpp b/tests/auto/atwrapper/atWrapperAutotest.cpp
index adea487..5e98949 100644
--- a/tests/auto/atwrapper/atWrapperAutotest.cpp
+++ b/tests/auto/atwrapper/atWrapperAutotest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh
index 8005880..a46917d 100755
--- a/tests/auto/bic/gen.sh
+++ b/tests/auto/bic/gen.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/bic/qbic.cpp b/tests/auto/bic/qbic.cpp
index e115453..4bf8b26 100644
--- a/tests/auto/bic/qbic.cpp
+++ b/tests/auto/bic/qbic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/bic/qbic.h b/tests/auto/bic/qbic.h
index ab98809..36a7143 100644
--- a/tests/auto/bic/qbic.h
+++ b/tests/auto/bic/qbic.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index 400fcc1..268b8f2 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
index c11243e..428938e 100644
--- a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
+++ b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp
index f81535e..0102c06 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/collections/tst_collections.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/compiler/baseclass.cpp b/tests/auto/compiler/baseclass.cpp
index 0ea1cf8..8503043 100644
--- a/tests/auto/compiler/baseclass.cpp
+++ b/tests/auto/compiler/baseclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/compiler/baseclass.h b/tests/auto/compiler/baseclass.h
index 14ad947..fd88249 100644
--- a/tests/auto/compiler/baseclass.h
+++ b/tests/auto/compiler/baseclass.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/compiler/derivedclass.cpp b/tests/auto/compiler/derivedclass.cpp
index 1d3a70c..43176b1 100644
--- a/tests/auto/compiler/derivedclass.cpp
+++ b/tests/auto/compiler/derivedclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/compiler/derivedclass.h b/tests/auto/compiler/derivedclass.h
index d6aa443..4686ace 100644
--- a/tests/auto/compiler/derivedclass.h
+++ b/tests/auto/compiler/derivedclass.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/compiler/tst_compiler.cpp b/tests/auto/compiler/tst_compiler.cpp
index 90eb357..5006039 100644
--- a/tests/auto/compiler/tst_compiler.cpp
+++ b/tests/auto/compiler/tst_compiler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/compilerwarnings/test_cpp.txt b/tests/auto/compilerwarnings/test_cpp.txt
index 1d317b8..ab3f820 100644
--- a/tests/auto/compilerwarnings/test_cpp.txt
+++ b/tests/auto/compilerwarnings/test_cpp.txt
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
index 8d344d8..382724c 100644
--- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
+++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index cff0b46..934be7c 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
index feae417..4ae1228 100644
--- a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
+++ b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp
index 8e8eedc..4355e97 100644
--- a/tests/auto/declarative/parserstress/tst_parserstress.cpp
+++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
index 15e107c..80482c6 100644
--- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
+++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
index 8cbe813..87c8903 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 2c9d982..65fb644 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
index 174967b..c8f5a9b 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
+++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
index 653b34a..db14eb8 100644
--- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index 2f00f60..14b32de 100644
--- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
index 8a19b8b..9e47315 100644
--- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
+++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
index d384372..7caf7ff 100644
--- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index 100224b..071b666 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index e6a81b8..029dbff 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 80241ba..bb1fc1a 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
index c9cb839..bbee228 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
+++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
index 36f2222..ac5c749 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
+++ b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h b/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h
index 0cadbe5..3b3d866 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h
+++ b/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 653515a..85a8421 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index c61be55..a200cf7 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
index 810a0f7..607e201 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index 220318d..02e68d0 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 4feb630..c7bd9aa 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
index 092c83e..fecf140 100644
--- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
+++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
index 0279953..1c17603 100644
--- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
+++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 25edb36..3d55676 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
index f56c032..cecab0f 100644
--- a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
+++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
index ec8f048..9cf9e5b 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
+++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
index b2e3a5b..46ab634 100644
--- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index 158ee51..6a71ee4 100644
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 975cf8f..168ffdf 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 6fce2ad..68d8720 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index cd12e3a..aca5a70 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
index 03df71f..fc2de4d 100644
--- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
+++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
index db1f191..3ce7299 100644
--- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
+++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index e9dad6b..fe89e44 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
index 20cd976..19fcc52 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index ac55bae..dcfb6b0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index c6b2302..98ec6f2 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
index bbdba74..a285b0f 100644
--- a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
+++ b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index b433570..fdcc08b 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
index 7689270..a7dee49 100644
--- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 6452bae..2aeaa54 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index 8d04616..29655ab 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
index 862b7d2..9e5b23d 100644
--- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
+++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
index 7d89bee..2527e2d 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 2081f0e..267ea0c 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index e4ec01f..4f3387c 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
index caf69fc..182c4a9 100644
--- a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
+++ b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index eb4bdbb..a37caa1 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index b20d8ec..a40f0e1 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 57a8354..62e15eb 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
index 0ca0e03..e138ad8 100644
--- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
+++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
index c825e85..648e82f 100644
--- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
+++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
index 895ee6c..542821f 100644
--- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
+++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
index 91a4d68..2c25ae8 100644
--- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp b/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp
index b0743c0..8b984b7 100644
--- a/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp
+++ b/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
index d9164f6..a5bd3e5 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
index 4b17a47..b1de4f3 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
+++ b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
index b71ed91..3988b26 100644
--- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
+++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 0d10c10..68a1c89 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
index e475d42..47a418a 100644
--- a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
+++ b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
index b8f5851..04c4182 100644
--- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
+++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index d6c37ae..47b9392 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 472c5ef..86e59bb 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 76e0102..25c15bd 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
index 8c3e618..89a39a7 100644
--- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
+++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
index e30a319..42bdf6a 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
index 7ed3993..c244008 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index a4819f3..599e1bd 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
index 6450e38..2209d8b 100644
--- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
+++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
index 1c1c04b..941cf90 100644
--- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
+++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
index d73a872..f078794 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
index 1f460a3..de6849a 100644
--- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
index 3140265..af01a1b 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
+++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
index 89252fb..504adaf 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index bd19bd3..091ef18 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 0f6d531..3ef1e57 100644
--- a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index a2d3273..af9daad 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
index 7d34698..57a5203 100644
--- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/runall.sh b/tests/auto/declarative/runall.sh
index 62e03e3..c8ca973 100755
--- a/tests/auto/declarative/runall.sh
+++ b/tests/auto/declarative/runall.sh
@@ -9,11 +9,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 ############################################################################/
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp
index cbd055b..d8c3cf6 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/shared/debugutil.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h
index 434e053..bdfe233 100644
--- a/tests/auto/declarative/shared/debugutil_p.h
+++ b/tests/auto/declarative/shared/debugutil_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/shared/testhttpserver.cpp b/tests/auto/declarative/shared/testhttpserver.cpp
index 5d56327..7b95b9f 100644
--- a/tests/auto/declarative/shared/testhttpserver.cpp
+++ b/tests/auto/declarative/shared/testhttpserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/declarative/shared/testhttpserver.h b/tests/auto/declarative/shared/testhttpserver.h
index 638237d..a4c107c 100644
--- a/tests/auto/declarative/shared/testhttpserver.h
+++ b/tests/auto/declarative/shared/testhttpserver.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/exceptionsafety/tst_exceptionsafety.cpp
index 6638d90..f013818 100644
--- a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp
+++ b/tests/auto/exceptionsafety/tst_exceptionsafety.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/exceptionsafety_objects/oomsimulator.h b/tests/auto/exceptionsafety_objects/oomsimulator.h
index 5b15515..ad1a788 100644
--- a/tests/auto/exceptionsafety_objects/oomsimulator.h
+++ b/tests/auto/exceptionsafety_objects/oomsimulator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
index 91d1a44..a97cb9b 100644
--- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
+++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/gestures/tst_gestures.cpp
index 667cdd3..62ec80e 100644
--- a/tests/auto/gestures/tst_gestures.cpp
+++ b/tests/auto/gestures/tst_gestures.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/guiapplauncher/tst_guiapplauncher.cpp b/tests/auto/guiapplauncher/tst_guiapplauncher.cpp
index 4b3ce18..7bfc72a 100644
--- a/tests/auto/guiapplauncher/tst_guiapplauncher.cpp
+++ b/tests/auto/guiapplauncher/tst_guiapplauncher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/guiapplauncher/windowmanager.cpp b/tests/auto/guiapplauncher/windowmanager.cpp
index 446dc71..c5aeef8 100644
--- a/tests/auto/guiapplauncher/windowmanager.cpp
+++ b/tests/auto/guiapplauncher/windowmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/guiapplauncher/windowmanager.h b/tests/auto/guiapplauncher/windowmanager.h
index 432e781..3532bd5 100644
--- a/tests/auto/guiapplauncher/windowmanager.h
+++ b/tests/auto/guiapplauncher/windowmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/headers/headersclean.cpp b/tests/auto/headers/headersclean.cpp
index c98cd10..c8f65af 100644
--- a/tests/auto/headers/headersclean.cpp
+++ b/tests/auto/headers/headersclean.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp
index 7ccf058..3f69c48 100644
--- a/tests/auto/headers/tst_headers.cpp
+++ b/tests/auto/headers/tst_headers.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp
index bcc3be4..c9531ea 100644
--- a/tests/auto/languagechange/tst_languagechange.cpp
+++ b/tests/auto/languagechange/tst_languagechange.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lconvert/data/makeplurals.pl b/tests/auto/linguist/lconvert/data/makeplurals.pl
index a2d1d700..33e690c 100755
--- a/tests/auto/linguist/lconvert/data/makeplurals.pl
+++ b/tests/auto/linguist/lconvert/data/makeplurals.pl
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp
index a3c29d8..ee9515a 100644
--- a/tests/auto/linguist/lconvert/tst_lconvert.cpp
+++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp
index 3b2c2d2..0a20bab 100644
--- a/tests/auto/linguist/lrelease/tst_lrelease.cpp
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.cpp b/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.cpp
index b295802..0915608 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/cmdline_order/a.h b/tests/auto/linguist/lupdate/testdata/good/cmdline_order/a.h
index 7059132..945b8cd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/cmdline_order/a.h
+++ b/tests/auto/linguist/lupdate/testdata/good/cmdline_order/a.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/cmdline_order/b.h b/tests/auto/linguist/lupdate/testdata/good/cmdline_order/b.h
index ce3e1a2..151d618 100644
--- a/tests/auto/linguist/lupdate/testdata/good/cmdline_order/b.h
+++ b/tests/auto/linguist/lupdate/testdata/good/cmdline_order/b.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
index 094065e..6a637ab 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp
index 3ffe281..48a88b6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp
index f48aa3a..64f4d46 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp
index f06277d..474d12f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/main.cpp
index e4210c5..73ff716 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/main.cpp
index e4210c5..73ff716 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp
index 1a24ab2..cff7163 100644
--- a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.h b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.h
index cc07d7c..6428295 100644
--- a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.h
+++ b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp b/tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp
index 542c228..7066145 100644
--- a/tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp
index e805a1e..9165f89 100644
--- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp
index d362a88..c1d256e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
index 2c3ccb4..4dcde8f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.cpp b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.cpp
index c5c0c0a..1f91144 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
index 540bdb4..955524c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
index 1313fcd..4622419 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
index ddc3ac0..e3579ad 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
index f3a98d1..e2f164d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
index 07a16aa..de8ea60 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
index 5e48819..d8d34bb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/main.cpp b/tests/auto/linguist/lupdate/testdata/good/namespaces/main.cpp
index a5b36ca..ddcc80b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
index 4409ddc..8b5af81 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.cpp
index 068aff4..eed4ddb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
index 3cc2f4a..8dfdbb0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
index 706e8d0..e3a1818 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp
index 06e6fe0..1a6a506 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.h b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.h
index bf84c86..cc5c04d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.h
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main2.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main2.cpp
index a01270c..7ec35a4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main2.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main3.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main3.cpp
index 3b9be1b..df8e6f7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main3.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main3.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java b/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
index 0d32895..a742d5b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
index 094f726..45be08a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp b/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp
index 670561a..846c0db 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/main.cpp b/tests/auto/linguist/lupdate/testdata/good/preprocess/main.cpp
index 1de85d7..9049674 100644
--- a/tests/auto/linguist/lupdate/testdata/good/preprocess/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main.cpp
index 86c8b94..67ceca8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.cpp
index 435d5c0..23979cf 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.cpp
index 0c6ff5f..1fd0651 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.cpp
index 9217ef7..c0bc9cd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
index 9ccef4d..1f2bbb2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.cpp
index c7f1c6f..43ac0c8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.cpp
index 84b4eda..8a380143 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.cpp
index 7470a67..b288f9c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.cpp
index aa483b0..daf53d1 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a
index 0183e0b..3f47f5a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.cpp
index 4d1c833..8b8d11a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b
index 78436d7..1160aef 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.cpp
index e115b5b..fa7a220 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/e b/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
index 1aa4bc5..beb2426 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.cpp
index d5d63a8..ef89142 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z b/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z
index c140981..49d86da 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces b/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces
index 6850723..b01c19e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/with b/tests/auto/linguist/lupdate/testdata/good/proparsing2/with
index 59d8ede..7c407a2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/with
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/with
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d
index a3364fa..76b3724 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable
index 07885fa..af94635 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.cpp
index 0ded690..dfe00c2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.cpp
index 82c0ee1..456c0c0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.cpp
index 7bd7eb7..7e2308e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.cpp
index de260a8..c522eba 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.cpp
index 86c8b94..67ceca8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.cpp
index 435d5c0..23979cf 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.cpp
index 7988bce..fc2752c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.cpp
index 0c6ff5f..1fd0651 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.cpp
index 9217ef7..c0bc9cd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.cpp
index 86c8b94..67ceca8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.cpp
index 86c8b94..67ceca8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.cpp
index 435d5c0..23979cf 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.cpp
index 0c6ff5f..1fd0651 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.cpp
index 9217ef7..c0bc9cd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp b/tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp
index 257b240..3f46f57 100644
--- a/tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/respfile/source1.cpp b/tests/auto/linguist/lupdate/testdata/good/respfile/source1.cpp
index 3327d1e..bc021b4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/respfile/source1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/respfile/source1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/respfile/source2.cpp b/tests/auto/linguist/lupdate/testdata/good/respfile/source2.cpp
index f284a61..df86390 100644
--- a/tests/auto/linguist/lupdate/testdata/good/respfile/source2.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/respfile/source2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp
index 78c7317..050f61b 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui b/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
index 042d6ee..fd15680 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++
index 123ab64..ac122f0 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cpp
index bad92f3..d7f2950 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx
index 8484211..006380f 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
index bc32a7f..57efaab 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/main.cpp
index 0f1dc70..e31363a 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/main.cpp
index 8c82c80..76e9afe 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/main.cpp
index ff85936..763c394 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/main.cpp
index 0f1dc70..e31363a 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp
index 8c82c80..76e9afe 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp
index ff85936..763c394 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp
index 5ba6c52..d608137 100644
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macgui/guitest.cpp b/tests/auto/macgui/guitest.cpp
index 6b8ec18..a98eb54 100644
--- a/tests/auto/macgui/guitest.cpp
+++ b/tests/auto/macgui/guitest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macgui/guitest.h b/tests/auto/macgui/guitest.h
index 48f53b1..9804ec4 100644
--- a/tests/auto/macgui/guitest.h
+++ b/tests/auto/macgui/guitest.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macgui/tst_macgui.cpp b/tests/auto/macgui/tst_macgui.cpp
index 7f558a3..dcf103a 100644
--- a/tests/auto/macgui/tst_macgui.cpp
+++ b/tests/auto/macgui/tst_macgui.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/expectedeventlist.cpp b/tests/auto/macnativeevents/expectedeventlist.cpp
index 0679dcb..7318ca3 100644
--- a/tests/auto/macnativeevents/expectedeventlist.cpp
+++ b/tests/auto/macnativeevents/expectedeventlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/expectedeventlist.h b/tests/auto/macnativeevents/expectedeventlist.h
index bd9f358..53202b1 100644
--- a/tests/auto/macnativeevents/expectedeventlist.h
+++ b/tests/auto/macnativeevents/expectedeventlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/nativeeventlist.cpp b/tests/auto/macnativeevents/nativeeventlist.cpp
index 1a90ee0..d1bc7f2 100644
--- a/tests/auto/macnativeevents/nativeeventlist.cpp
+++ b/tests/auto/macnativeevents/nativeeventlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/nativeeventlist.h b/tests/auto/macnativeevents/nativeeventlist.h
index efcca43..a3bf706 100644
--- a/tests/auto/macnativeevents/nativeeventlist.h
+++ b/tests/auto/macnativeevents/nativeeventlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/qnativeevents.cpp b/tests/auto/macnativeevents/qnativeevents.cpp
index cb4b82e..463f809 100644
--- a/tests/auto/macnativeevents/qnativeevents.cpp
+++ b/tests/auto/macnativeevents/qnativeevents.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/qnativeevents.h b/tests/auto/macnativeevents/qnativeevents.h
index a98e4e4..118ce53 100644
--- a/tests/auto/macnativeevents/qnativeevents.h
+++ b/tests/auto/macnativeevents/qnativeevents.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/qnativeevents_mac.cpp b/tests/auto/macnativeevents/qnativeevents_mac.cpp
index 6c04bf3..7f259e1 100644
--- a/tests/auto/macnativeevents/qnativeevents_mac.cpp
+++ b/tests/auto/macnativeevents/qnativeevents_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/macnativeevents/tst_macnativeevents.cpp
index d582417..68f4899 100644
--- a/tests/auto/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macplist/app/main.cpp b/tests/auto/macplist/app/main.cpp
index 6e7b465..8999fd6 100644
--- a/tests/auto/macplist/app/main.cpp
+++ b/tests/auto/macplist/app/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/macplist/tst_macplist.cpp b/tests/auto/macplist/tst_macplist.cpp
index 02258a0..6c59281 100644
--- a/tests/auto/macplist/tst_macplist.cpp
+++ b/tests/auto/macplist/tst_macplist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/maketestselftest/checktest/main.cpp b/tests/auto/maketestselftest/checktest/main.cpp
index af98953..56515d3 100644
--- a/tests/auto/maketestselftest/checktest/main.cpp
+++ b/tests/auto/maketestselftest/checktest/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp
index a9077e3..c7fab77 100644
--- a/tests/auto/maketestselftest/tst_maketestselftest.cpp
+++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/audiooutput.cpp b/tests/auto/mediaobject/dummy/audiooutput.cpp
index 879d583..1e34cc7 100644
--- a/tests/auto/mediaobject/dummy/audiooutput.cpp
+++ b/tests/auto/mediaobject/dummy/audiooutput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/audiooutput.h b/tests/auto/mediaobject/dummy/audiooutput.h
index 0994946..f0785de 100644
--- a/tests/auto/mediaobject/dummy/audiooutput.h
+++ b/tests/auto/mediaobject/dummy/audiooutput.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/backend.cpp b/tests/auto/mediaobject/dummy/backend.cpp
index dc66b36..4897f20 100644
--- a/tests/auto/mediaobject/dummy/backend.cpp
+++ b/tests/auto/mediaobject/dummy/backend.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/backend.h b/tests/auto/mediaobject/dummy/backend.h
index f3b11ba..5807822 100644
--- a/tests/auto/mediaobject/dummy/backend.h
+++ b/tests/auto/mediaobject/dummy/backend.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/mediaobject.cpp b/tests/auto/mediaobject/dummy/mediaobject.cpp
index 1d7fc43..88c0089 100644
--- a/tests/auto/mediaobject/dummy/mediaobject.cpp
+++ b/tests/auto/mediaobject/dummy/mediaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/mediaobject.h b/tests/auto/mediaobject/dummy/mediaobject.h
index 8aee645..def7d7f 100644
--- a/tests/auto/mediaobject/dummy/mediaobject.h
+++ b/tests/auto/mediaobject/dummy/mediaobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/videowidget.cpp b/tests/auto/mediaobject/dummy/videowidget.cpp
index cfff473..1ce1837 100644
--- a/tests/auto/mediaobject/dummy/videowidget.cpp
+++ b/tests/auto/mediaobject/dummy/videowidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/dummy/videowidget.h b/tests/auto/mediaobject/dummy/videowidget.h
index 1f86854..8708106 100644
--- a/tests/auto/mediaobject/dummy/videowidget.h
+++ b/tests/auto/mediaobject/dummy/videowidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test sutie of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/qtesthelper.h b/tests/auto/mediaobject/qtesthelper.h
index 39d5b91..d74c249 100644
--- a/tests/auto/mediaobject/qtesthelper.h
+++ b/tests/auto/mediaobject/qtesthelper.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp
index 322e2e4..5c2c486 100644
--- a/tests/auto/mediaobject/tst_mediaobject.cpp
+++ b/tests/auto/mediaobject/tst_mediaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/mediaobject_wince_ds9/dummy.cpp b/tests/auto/mediaobject_wince_ds9/dummy.cpp
index d2bfffe..25d6859 100644
--- a/tests/auto/mediaobject_wince_ds9/dummy.cpp
+++ b/tests/auto/mediaobject_wince_ds9/dummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/Test.framework/Headers/testinterface.h b/tests/auto/moc/Test.framework/Headers/testinterface.h
index f0970c3..566981f 100644
--- a/tests/auto/moc/Test.framework/Headers/testinterface.h
+++ b/tests/auto/moc/Test.framework/Headers/testinterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/assign-namespace.h b/tests/auto/moc/assign-namespace.h
index a57f2ce..243706b 100644
--- a/tests/auto/moc/assign-namespace.h
+++ b/tests/auto/moc/assign-namespace.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/backslash-newlines.h b/tests/auto/moc/backslash-newlines.h
index bb44d70..4557df9 100644
--- a/tests/auto/moc/backslash-newlines.h
+++ b/tests/auto/moc/backslash-newlines.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/c-comments.h b/tests/auto/moc/c-comments.h
index b132776..3e6e72b 100644
--- a/tests/auto/moc/c-comments.h
+++ b/tests/auto/moc/c-comments.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/cstyle-enums.h b/tests/auto/moc/cstyle-enums.h
index ec254a5..f51080c 100644
--- a/tests/auto/moc/cstyle-enums.h
+++ b/tests/auto/moc/cstyle-enums.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/dir-in-include-path.h b/tests/auto/moc/dir-in-include-path.h
index db545d7..555acd6 100644
--- a/tests/auto/moc/dir-in-include-path.h
+++ b/tests/auto/moc/dir-in-include-path.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/error-on-wrong-notify.h b/tests/auto/moc/error-on-wrong-notify.h
index 4b6284a..1c19700 100644
--- a/tests/auto/moc/error-on-wrong-notify.h
+++ b/tests/auto/moc/error-on-wrong-notify.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/escapes-in-string-literals.h b/tests/auto/moc/escapes-in-string-literals.h
index 6072cd3..638b541 100644
--- a/tests/auto/moc/escapes-in-string-literals.h
+++ b/tests/auto/moc/escapes-in-string-literals.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/extraqualification.h b/tests/auto/moc/extraqualification.h
index 1c45041..6902d3e 100644
--- a/tests/auto/moc/extraqualification.h
+++ b/tests/auto/moc/extraqualification.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/forgotten-qinterface.h b/tests/auto/moc/forgotten-qinterface.h
index e84f1a3..d63f694 100644
--- a/tests/auto/moc/forgotten-qinterface.h
+++ b/tests/auto/moc/forgotten-qinterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/gadgetwithnoenums.h b/tests/auto/moc/gadgetwithnoenums.h
index 4ab6225..291bcf8 100644
--- a/tests/auto/moc/gadgetwithnoenums.h
+++ b/tests/auto/moc/gadgetwithnoenums.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/interface-from-framework.h b/tests/auto/moc/interface-from-framework.h
index 1599c44..c89664e 100644
--- a/tests/auto/moc/interface-from-framework.h
+++ b/tests/auto/moc/interface-from-framework.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/macro-on-cmdline.h b/tests/auto/moc/macro-on-cmdline.h
index 405e916..1ed04db 100644
--- a/tests/auto/moc/macro-on-cmdline.h
+++ b/tests/auto/moc/macro-on-cmdline.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/namespaced-flags.h b/tests/auto/moc/namespaced-flags.h
index 0d74702..96c133b 100644
--- a/tests/auto/moc/namespaced-flags.h
+++ b/tests/auto/moc/namespaced-flags.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/moc/no-keywords.h
index b125b3f..2d07501 100644
--- a/tests/auto/moc/no-keywords.h
+++ b/tests/auto/moc/no-keywords.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/oldstyle-casts.h b/tests/auto/moc/oldstyle-casts.h
index 6db94c4..1d2d474 100644
--- a/tests/auto/moc/oldstyle-casts.h
+++ b/tests/auto/moc/oldstyle-casts.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/parse-boost.h b/tests/auto/moc/parse-boost.h
index 2e4e0af..90cad84 100644
--- a/tests/auto/moc/parse-boost.h
+++ b/tests/auto/moc/parse-boost.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/pure-virtual-signals.h b/tests/auto/moc/pure-virtual-signals.h
index 2782646..b3ba7bd 100644
--- a/tests/auto/moc/pure-virtual-signals.h
+++ b/tests/auto/moc/pure-virtual-signals.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/qinvokable.h b/tests/auto/moc/qinvokable.h
index 3d58398..6839120 100644
--- a/tests/auto/moc/qinvokable.h
+++ b/tests/auto/moc/qinvokable.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/qprivateslots.h b/tests/auto/moc/qprivateslots.h
index be6d65a..4f72fa1 100644
--- a/tests/auto/moc/qprivateslots.h
+++ b/tests/auto/moc/qprivateslots.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/single_function_keyword.h b/tests/auto/moc/single_function_keyword.h
index 822a60b..40bdbb9 100644
--- a/tests/auto/moc/single_function_keyword.h
+++ b/tests/auto/moc/single_function_keyword.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/slots-with-void-template.h b/tests/auto/moc/slots-with-void-template.h
index 9b3d637..7b82b0a 100644
--- a/tests/auto/moc/slots-with-void-template.h
+++ b/tests/auto/moc/slots-with-void-template.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/task189996.h b/tests/auto/moc/task189996.h
index 4c21fac..90c6c6c 100644
--- a/tests/auto/moc/task189996.h
+++ b/tests/auto/moc/task189996.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/task192552.h b/tests/auto/moc/task192552.h
index c7db2bd..08c2315 100644
--- a/tests/auto/moc/task192552.h
+++ b/tests/auto/moc/task192552.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/task234909.h b/tests/auto/moc/task234909.h
index 210999d..8b0ebf3 100644
--- a/tests/auto/moc/task234909.h
+++ b/tests/auto/moc/task234909.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/task240368.h b/tests/auto/moc/task240368.h
index 484cd35..e684a6e 100644
--- a/tests/auto/moc/task240368.h
+++ b/tests/auto/moc/task240368.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/task87883.h b/tests/auto/moc/task87883.h
index a6491a7..e29674b 100644
--- a/tests/auto/moc/task87883.h
+++ b/tests/auto/moc/task87883.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/template-gtgt.h b/tests/auto/moc/template-gtgt.h
index 35dea06..4047759 100644
--- a/tests/auto/moc/template-gtgt.h
+++ b/tests/auto/moc/template-gtgt.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/testproject/Plugin/Plugin.h b/tests/auto/moc/testproject/Plugin/Plugin.h
index 350dcec..b17bd86 100644
--- a/tests/auto/moc/testproject/Plugin/Plugin.h
+++ b/tests/auto/moc/testproject/Plugin/Plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/trigraphs.h b/tests/auto/moc/trigraphs.h
index 062b04d..16e8e90 100644
--- a/tests/auto/moc/trigraphs.h
+++ b/tests/auto/moc/trigraphs.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp
index bb23f49..ca69c2f 100644
--- a/tests/auto/moc/tst_moc.cpp
+++ b/tests/auto/moc/tst_moc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/using-namespaces.h b/tests/auto/moc/using-namespaces.h
index 245d7a0..32ee9d4 100644
--- a/tests/auto/moc/using-namespaces.h
+++ b/tests/auto/moc/using-namespaces.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/warn-on-multiple-qobject-subclasses.h b/tests/auto/moc/warn-on-multiple-qobject-subclasses.h
index 9f89f74..a8cf75e 100644
--- a/tests/auto/moc/warn-on-multiple-qobject-subclasses.h
+++ b/tests/auto/moc/warn-on-multiple-qobject-subclasses.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/warn-on-property-without-read.h b/tests/auto/moc/warn-on-property-without-read.h
index 7675dae..5b3a49a 100644
--- a/tests/auto/moc/warn-on-property-without-read.h
+++ b/tests/auto/moc/warn-on-property-without-read.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/moc/win-newlines.h b/tests/auto/moc/win-newlines.h
index 8ea810b..4666be8 100644
--- a/tests/auto/moc/win-newlines.h
+++ b/tests/auto/moc/win-newlines.h
@@ -6,35 +6,35 @@
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** 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, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/modeltest/dynamictreemodel.cpp
index fa634b6..a6192ff 100644
--- a/tests/auto/modeltest/dynamictreemodel.cpp
+++ b/tests/auto/modeltest/dynamictreemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/modeltest/dynamictreemodel.h b/tests/auto/modeltest/dynamictreemodel.h
index 9633755..305a3f2 100644
--- a/tests/auto/modeltest/dynamictreemodel.h
+++ b/tests/auto/modeltest/dynamictreemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/modeltest/modeltest.cpp b/tests/auto/modeltest/modeltest.cpp
index b245202..53d8bd5 100644
--- a/tests/auto/modeltest/modeltest.cpp
+++ b/tests/auto/modeltest/modeltest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/modeltest/modeltest.h b/tests/auto/modeltest/modeltest.h
index 244adbe..36df5af 100644
--- a/tests/auto/modeltest/modeltest.h
+++ b/tests/auto/modeltest/modeltest.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/modeltest/tst_modeltest.cpp
index da5cd6a..97515a4 100644
--- a/tests/auto/modeltest/tst_modeltest.cpp
+++ b/tests/auto/modeltest/tst_modeltest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 6730946..5fc2a30 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index 752e368..cca8b78 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp b/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
index 359d4fc..1aa491d 100644
--- a/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
+++ b/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/patternistexamples/tst_patternistexamples.cpp b/tests/auto/patternistexamples/tst_patternistexamples.cpp
index 1053d71..d8f256d 100644
--- a/tests/auto/patternistexamples/tst_patternistexamples.cpp
+++ b/tests/auto/patternistexamples/tst_patternistexamples.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/patternistheaders/tst_patternistheaders.cpp b/tests/auto/patternistheaders/tst_patternistheaders.cpp
index e9d6144..364c068 100644
--- a/tests/auto/patternistheaders/tst_patternistheaders.cpp
+++ b/tests/auto/patternistheaders/tst_patternistheaders.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3accel/tst_q3accel.cpp b/tests/auto/q3accel/tst_q3accel.cpp
index 575032f..4b5224f 100644
--- a/tests/auto/q3accel/tst_q3accel.cpp
+++ b/tests/auto/q3accel/tst_q3accel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3action/tst_q3action.cpp b/tests/auto/q3action/tst_q3action.cpp
index 16d0a9c..860081d 100644
--- a/tests/auto/q3action/tst_q3action.cpp
+++ b/tests/auto/q3action/tst_q3action.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3actiongroup/tst_q3actiongroup.cpp b/tests/auto/q3actiongroup/tst_q3actiongroup.cpp
index 3c20f97..05dbdec 100644
--- a/tests/auto/q3actiongroup/tst_q3actiongroup.cpp
+++ b/tests/auto/q3actiongroup/tst_q3actiongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3buttongroup/clickLock/main.cpp b/tests/auto/q3buttongroup/clickLock/main.cpp
index cb88d69..92e38f3 100644
--- a/tests/auto/q3buttongroup/clickLock/main.cpp
+++ b/tests/auto/q3buttongroup/clickLock/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3buttongroup/tst_q3buttongroup.cpp b/tests/auto/q3buttongroup/tst_q3buttongroup.cpp
index a194e8f..2371685 100644
--- a/tests/auto/q3buttongroup/tst_q3buttongroup.cpp
+++ b/tests/auto/q3buttongroup/tst_q3buttongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3canvas/tst_q3canvas.cpp b/tests/auto/q3canvas/tst_q3canvas.cpp
index ffed3d3..2fb532e 100644
--- a/tests/auto/q3canvas/tst_q3canvas.cpp
+++ b/tests/auto/q3canvas/tst_q3canvas.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3checklistitem/tst_q3checklistitem.cpp b/tests/auto/q3checklistitem/tst_q3checklistitem.cpp
index 74f76dc..4fbe75e 100644
--- a/tests/auto/q3checklistitem/tst_q3checklistitem.cpp
+++ b/tests/auto/q3checklistitem/tst_q3checklistitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3combobox/tst_q3combobox.cpp b/tests/auto/q3combobox/tst_q3combobox.cpp
index 7b451a8..5f55be5 100644
--- a/tests/auto/q3combobox/tst_q3combobox.cpp
+++ b/tests/auto/q3combobox/tst_q3combobox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3cstring/tst_q3cstring.cpp b/tests/auto/q3cstring/tst_q3cstring.cpp
index 737b544..a7226be 100644
--- a/tests/auto/q3cstring/tst_q3cstring.cpp
+++ b/tests/auto/q3cstring/tst_q3cstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3databrowser/tst_q3databrowser.cpp b/tests/auto/q3databrowser/tst_q3databrowser.cpp
index 12901ca..b39d08d 100644
--- a/tests/auto/q3databrowser/tst_q3databrowser.cpp
+++ b/tests/auto/q3databrowser/tst_q3databrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3dateedit/tst_q3dateedit.cpp b/tests/auto/q3dateedit/tst_q3dateedit.cpp
index 771bf38..de3c526 100644
--- a/tests/auto/q3dateedit/tst_q3dateedit.cpp
+++ b/tests/auto/q3dateedit/tst_q3dateedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp b/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp
index bf4c034..57b60c4 100644
--- a/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp
+++ b/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3deepcopy/tst_q3deepcopy.cpp b/tests/auto/q3deepcopy/tst_q3deepcopy.cpp
index 9e90bc8..33b0ccf 100644
--- a/tests/auto/q3deepcopy/tst_q3deepcopy.cpp
+++ b/tests/auto/q3deepcopy/tst_q3deepcopy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3dict/tst_q3dict.cpp b/tests/auto/q3dict/tst_q3dict.cpp
index e83b02e..77e620a 100644
--- a/tests/auto/q3dict/tst_q3dict.cpp
+++ b/tests/auto/q3dict/tst_q3dict.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3dns/tst_q3dns.cpp b/tests/auto/q3dns/tst_q3dns.cpp
index bcbb154..78ab05d 100644
--- a/tests/auto/q3dns/tst_q3dns.cpp
+++ b/tests/auto/q3dns/tst_q3dns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3dockwindow/tst_q3dockwindow.cpp b/tests/auto/q3dockwindow/tst_q3dockwindow.cpp
index 0629369..6324694 100644
--- a/tests/auto/q3dockwindow/tst_q3dockwindow.cpp
+++ b/tests/auto/q3dockwindow/tst_q3dockwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3filedialog/tst_q3filedialog.cpp b/tests/auto/q3filedialog/tst_q3filedialog.cpp
index 1b16816..3df8f8e 100644
--- a/tests/auto/q3filedialog/tst_q3filedialog.cpp
+++ b/tests/auto/q3filedialog/tst_q3filedialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3frame/tst_q3frame.cpp b/tests/auto/q3frame/tst_q3frame.cpp
index d14db8a..59504e8 100644
--- a/tests/auto/q3frame/tst_q3frame.cpp
+++ b/tests/auto/q3frame/tst_q3frame.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3groupbox/tst_q3groupbox.cpp b/tests/auto/q3groupbox/tst_q3groupbox.cpp
index 2cf4e24..0a393ae 100644
--- a/tests/auto/q3groupbox/tst_q3groupbox.cpp
+++ b/tests/auto/q3groupbox/tst_q3groupbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3hbox/tst_q3hbox.cpp b/tests/auto/q3hbox/tst_q3hbox.cpp
index 70bb98a..7c390c7 100644
--- a/tests/auto/q3hbox/tst_q3hbox.cpp
+++ b/tests/auto/q3hbox/tst_q3hbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3header/tst_q3header.cpp b/tests/auto/q3header/tst_q3header.cpp
index ec79276..f81d6d7 100644
--- a/tests/auto/q3header/tst_q3header.cpp
+++ b/tests/auto/q3header/tst_q3header.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3iconview/tst_q3iconview.cpp b/tests/auto/q3iconview/tst_q3iconview.cpp
index 01e750f..f7b238e 100644
--- a/tests/auto/q3iconview/tst_q3iconview.cpp
+++ b/tests/auto/q3iconview/tst_q3iconview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3listbox/tst_qlistbox.cpp b/tests/auto/q3listbox/tst_qlistbox.cpp
index 337f640..1a59bba 100644
--- a/tests/auto/q3listbox/tst_qlistbox.cpp
+++ b/tests/auto/q3listbox/tst_qlistbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3listview/tst_q3listview.cpp b/tests/auto/q3listview/tst_q3listview.cpp
index 56fa25f..9d1a9a2 100644
--- a/tests/auto/q3listview/tst_q3listview.cpp
+++ b/tests/auto/q3listview/tst_q3listview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp b/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp
index 8790c90..32c6304 100644
--- a/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp
+++ b/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3mainwindow/tst_q3mainwindow.cpp b/tests/auto/q3mainwindow/tst_q3mainwindow.cpp
index 3679a71..423811b 100644
--- a/tests/auto/q3mainwindow/tst_q3mainwindow.cpp
+++ b/tests/auto/q3mainwindow/tst_q3mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3popupmenu/tst_q3popupmenu.cpp b/tests/auto/q3popupmenu/tst_q3popupmenu.cpp
index 8e20dd9..5d1e597 100644
--- a/tests/auto/q3popupmenu/tst_q3popupmenu.cpp
+++ b/tests/auto/q3popupmenu/tst_q3popupmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3process/cat/main.cpp b/tests/auto/q3process/cat/main.cpp
index 23897ba..e1646f6 100644
--- a/tests/auto/q3process/cat/main.cpp
+++ b/tests/auto/q3process/cat/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3process/echo/main.cpp b/tests/auto/q3process/echo/main.cpp
index 4f4e2be..2a1ecc1 100644
--- a/tests/auto/q3process/echo/main.cpp
+++ b/tests/auto/q3process/echo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3process/tst_q3process.cpp b/tests/auto/q3process/tst_q3process.cpp
index 6b649ef..81fd25f 100644
--- a/tests/auto/q3process/tst_q3process.cpp
+++ b/tests/auto/q3process/tst_q3process.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3progressbar/tst_q3progressbar.cpp b/tests/auto/q3progressbar/tst_q3progressbar.cpp
index 5286ff0..1b2e321 100644
--- a/tests/auto/q3progressbar/tst_q3progressbar.cpp
+++ b/tests/auto/q3progressbar/tst_q3progressbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3progressdialog/tst_q3progressdialog.cpp b/tests/auto/q3progressdialog/tst_q3progressdialog.cpp
index 861f797..77d2ff9 100644
--- a/tests/auto/q3progressdialog/tst_q3progressdialog.cpp
+++ b/tests/auto/q3progressdialog/tst_q3progressdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3ptrlist/tst_q3ptrlist.cpp b/tests/auto/q3ptrlist/tst_q3ptrlist.cpp
index a95a595..b23e7b7 100644
--- a/tests/auto/q3ptrlist/tst_q3ptrlist.cpp
+++ b/tests/auto/q3ptrlist/tst_q3ptrlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3richtext/tst_q3richtext.cpp b/tests/auto/q3richtext/tst_q3richtext.cpp
index a5b99a8..8571e48 100644
--- a/tests/auto/q3richtext/tst_q3richtext.cpp
+++ b/tests/auto/q3richtext/tst_q3richtext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3scrollview/tst_qscrollview.cpp b/tests/auto/q3scrollview/tst_qscrollview.cpp
index 6147f80..8e00bc1 100644
--- a/tests/auto/q3scrollview/tst_qscrollview.cpp
+++ b/tests/auto/q3scrollview/tst_qscrollview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3semaphore/tst_q3semaphore.cpp b/tests/auto/q3semaphore/tst_q3semaphore.cpp
index 15554d4..9fd9118 100644
--- a/tests/auto/q3semaphore/tst_q3semaphore.cpp
+++ b/tests/auto/q3semaphore/tst_q3semaphore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3serversocket/tst_q3serversocket.cpp b/tests/auto/q3serversocket/tst_q3serversocket.cpp
index 8ebaa0a..d2cd425 100644
--- a/tests/auto/q3serversocket/tst_q3serversocket.cpp
+++ b/tests/auto/q3serversocket/tst_q3serversocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3socket/tst_qsocket.cpp b/tests/auto/q3socket/tst_qsocket.cpp
index 9c6ea14..2a34b32 100644
--- a/tests/auto/q3socket/tst_qsocket.cpp
+++ b/tests/auto/q3socket/tst_qsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3socketdevice/tst_q3socketdevice.cpp b/tests/auto/q3socketdevice/tst_q3socketdevice.cpp
index 307635e..3553e38 100644
--- a/tests/auto/q3socketdevice/tst_q3socketdevice.cpp
+++ b/tests/auto/q3socketdevice/tst_q3socketdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
index f3c2c09..1c3b3c7 100644
--- a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
+++ b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp b/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp
index b69ae79..a60e733 100644
--- a/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp
+++ b/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3stylesheet/tst_q3stylesheet.cpp b/tests/auto/q3stylesheet/tst_q3stylesheet.cpp
index 347962f..8d687ad 100644
--- a/tests/auto/q3stylesheet/tst_q3stylesheet.cpp
+++ b/tests/auto/q3stylesheet/tst_q3stylesheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3tabdialog/tst_q3tabdialog.cpp b/tests/auto/q3tabdialog/tst_q3tabdialog.cpp
index 6829cf6..bf40e88 100644
--- a/tests/auto/q3tabdialog/tst_q3tabdialog.cpp
+++ b/tests/auto/q3tabdialog/tst_q3tabdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3table/tst_q3table.cpp b/tests/auto/q3table/tst_q3table.cpp
index 93de251..7c32671 100644
--- a/tests/auto/q3table/tst_q3table.cpp
+++ b/tests/auto/q3table/tst_q3table.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3textbrowser/tst_q3textbrowser.cpp b/tests/auto/q3textbrowser/tst_q3textbrowser.cpp
index 0c86ce2..19fcecf 100644
--- a/tests/auto/q3textbrowser/tst_q3textbrowser.cpp
+++ b/tests/auto/q3textbrowser/tst_q3textbrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3textedit/tst_q3textedit.cpp b/tests/auto/q3textedit/tst_q3textedit.cpp
index 2cd646f..c766443 100644
--- a/tests/auto/q3textedit/tst_q3textedit.cpp
+++ b/tests/auto/q3textedit/tst_q3textedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3textstream/tst_q3textstream.cpp b/tests/auto/q3textstream/tst_q3textstream.cpp
index 4714da2..895dbd8 100644
--- a/tests/auto/q3textstream/tst_q3textstream.cpp
+++ b/tests/auto/q3textstream/tst_q3textstream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3timeedit/tst_q3timeedit.cpp b/tests/auto/q3timeedit/tst_q3timeedit.cpp
index bad2a99..8051b55 100644
--- a/tests/auto/q3timeedit/tst_q3timeedit.cpp
+++ b/tests/auto/q3timeedit/tst_q3timeedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3toolbar/tst_q3toolbar.cpp b/tests/auto/q3toolbar/tst_q3toolbar.cpp
index ab18d16..315bd72 100644
--- a/tests/auto/q3toolbar/tst_q3toolbar.cpp
+++ b/tests/auto/q3toolbar/tst_q3toolbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3uridrag/tst_q3uridrag.cpp b/tests/auto/q3uridrag/tst_q3uridrag.cpp
index 17fb1ab..cfd8a7e 100644
--- a/tests/auto/q3uridrag/tst_q3uridrag.cpp
+++ b/tests/auto/q3uridrag/tst_q3uridrag.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3urloperator/tst_q3urloperator.cpp b/tests/auto/q3urloperator/tst_q3urloperator.cpp
index d9e7e99..bed8c43 100644
--- a/tests/auto/q3urloperator/tst_q3urloperator.cpp
+++ b/tests/auto/q3urloperator/tst_q3urloperator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3valuelist/tst_q3valuelist.cpp b/tests/auto/q3valuelist/tst_q3valuelist.cpp
index c6b3106..5e141cd 100644
--- a/tests/auto/q3valuelist/tst_q3valuelist.cpp
+++ b/tests/auto/q3valuelist/tst_q3valuelist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3valuevector/tst_q3valuevector.cpp b/tests/auto/q3valuevector/tst_q3valuevector.cpp
index 50b2f07..48f0d0a 100644
--- a/tests/auto/q3valuevector/tst_q3valuevector.cpp
+++ b/tests/auto/q3valuevector/tst_q3valuevector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q3widgetstack/tst_q3widgetstack.cpp b/tests/auto/q3widgetstack/tst_q3widgetstack.cpp
index 6fedb8c..5b2ff24 100644
--- a/tests/auto/q3widgetstack/tst_q3widgetstack.cpp
+++ b/tests/auto/q3widgetstack/tst_q3widgetstack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/q_func_info/tst_q_func_info.cpp b/tests/auto/q_func_info/tst_q_func_info.cpp
index cf7afad..fba251a 100644
--- a/tests/auto/q_func_info/tst_q_func_info.cpp
+++ b/tests/auto/q_func_info/tst_q_func_info.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/qabstractbutton/tst_qabstractbutton.cpp
index 0519657..f71f859 100644
--- a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/qabstractbutton/tst_qabstractbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
index b723253..f13c124 100644
--- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
index ea86c16..b37bb18 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp b/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
index 56c555a..d0d843b 100644
--- a/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
+++ b/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 04bd432..9d6929a 100644
--- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
index 0700e9e..f0b0b58 100644
--- a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
+++ b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp
index 88c2ef1..b81b32c 100644
--- a/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
index da83826..68b60b2 100644
--- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp
index cf069db..e6ac466 100644
--- a/tests/auto/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractsocket/tst_qabstractsocket.cpp b/tests/auto/qabstractsocket/tst_qabstractsocket.cpp
index d037c1d..a4e9b20 100644
--- a/tests/auto/qabstractsocket/tst_qabstractsocket.cpp
+++ b/tests/auto/qabstractsocket/tst_qabstractsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp
index 73ff067..16c913b 100644
--- a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp
+++ b/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
index 202e928..c1dfe14 100644
--- a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
+++ b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstracturiresolver/TestURIResolver.h b/tests/auto/qabstracturiresolver/TestURIResolver.h
index 89ff5a9..5d083ef 100644
--- a/tests/auto/qabstracturiresolver/TestURIResolver.h
+++ b/tests/auto/qabstracturiresolver/TestURIResolver.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp b/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
index a20de57..3ae29d0 100644
--- a/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
+++ b/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp b/tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp
index 2da9952..760ff30 100644
--- a/tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp
+++ b/tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp b/tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp
index 592c3e5..1bc9210 100644
--- a/tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp
+++ b/tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp b/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
index e087ef4..a6c799f 100644
--- a/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
+++ b/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
index 18dc279..4b84518 100644
--- a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
+++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.h b/tests/auto/qabstractxmlnodemodel/LoadingModel.h
index 3539cf4..bd06ecf 100644
--- a/tests/auto/qabstractxmlnodemodel/LoadingModel.h
+++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractxmlnodemodel/TestNodeModel.h b/tests/auto/qabstractxmlnodemodel/TestNodeModel.h
index 184fc20..07c5d22 100644
--- a/tests/auto/qabstractxmlnodemodel/TestNodeModel.h
+++ b/tests/auto/qabstractxmlnodemodel/TestNodeModel.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
index 5141f69..9804356 100644
--- a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
+++ b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h b/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
index be7381a..f91b926 100644
--- a/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
+++ b/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp b/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
index f0fea3d..c8ee237 100644
--- a/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
+++ b/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index cea259c..52eab5a 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
index 4421ac8..ba18411 100644
--- a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
+++ b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp
index 313178e..7747e44 100644
--- a/tests/auto/qaction/tst_qaction.cpp
+++ b/tests/auto/qaction/tst_qaction.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qactiongroup/tst_qactiongroup.cpp b/tests/auto/qactiongroup/tst_qactiongroup.cpp
index 9ec1c7f..ba9bef1 100644
--- a/tests/auto/qactiongroup/tst_qactiongroup.cpp
+++ b/tests/auto/qactiongroup/tst_qactiongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp
index 690bbbd..95b84a8 100644
--- a/tests/auto/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/qanimationgroup/tst_qanimationgroup.cpp
index eee559d..8be0d31 100644
--- a/tests/auto/qanimationgroup/tst_qanimationgroup.cpp
+++ b/tests/auto/qanimationgroup/tst_qanimationgroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplication/desktopsettingsaware/main.cpp b/tests/auto/qapplication/desktopsettingsaware/main.cpp
index 6648384..aacd071 100644
--- a/tests/auto/qapplication/desktopsettingsaware/main.cpp
+++ b/tests/auto/qapplication/desktopsettingsaware/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplication/modal/base.cpp b/tests/auto/qapplication/modal/base.cpp
index 9022c36..8ab5a41 100644
--- a/tests/auto/qapplication/modal/base.cpp
+++ b/tests/auto/qapplication/modal/base.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplication/modal/base.h b/tests/auto/qapplication/modal/base.h
index faa1765..bc7ab59 100644
--- a/tests/auto/qapplication/modal/base.h
+++ b/tests/auto/qapplication/modal/base.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/qapplication/modal/main.cpp
index f9d8fb4..bd3c4c8 100644
--- a/tests/auto/qapplication/modal/main.cpp
+++ b/tests/auto/qapplication/modal/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 91ae921..86e9c53 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplication/wincmdline/main.cpp b/tests/auto/qapplication/wincmdline/main.cpp
index 150de74..3b53055 100644
--- a/tests/auto/qapplication/wincmdline/main.cpp
+++ b/tests/auto/qapplication/wincmdline/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp b/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
index 45219c8..11f02a1 100644
--- a/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
+++ b/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/qatomicint/tst_qatomicint.cpp
index 90ab4a2..488cf30 100644
--- a/tests/auto/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/qatomicint/tst_qatomicint.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp
index 9871e13..cb2f6c1 100644
--- a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp
+++ b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index 7e16ed9..e2b8eea 100644
--- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
index 0206798..ae5fd30 100644
--- a/tests/auto/qaudioformat/tst_qaudioformat.cpp
+++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index 84c3874..3ebee99 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index 437ef5e..4af6510 100644
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qauthenticator/tst_qauthenticator.cpp b/tests/auto/qauthenticator/tst_qauthenticator.cpp
index 37d6774..a7ddf79 100644
--- a/tests/auto/qauthenticator/tst_qauthenticator.cpp
+++ b/tests/auto/qauthenticator/tst_qauthenticator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the FOO module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qautoptr/tst_qautoptr.cpp b/tests/auto/qautoptr/tst_qautoptr.cpp
index 1d91ee0..290c4de 100644
--- a/tests/auto/qautoptr/tst_qautoptr.cpp
+++ b/tests/auto/qautoptr/tst_qautoptr.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qbearertestcommon.h b/tests/auto/qbearertestcommon.h
index 138c444..596e5db 100644
--- a/tests/auto/qbearertestcommon.h
+++ b/tests/auto/qbearertestcommon.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qbitarray/tst_qbitarray.cpp b/tests/auto/qbitarray/tst_qbitarray.cpp
index 30f4f58..36366fa 100644
--- a/tests/auto/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/qbitarray/tst_qbitarray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp
index c4acfdc..277f67a 100644
--- a/tests/auto/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/qbrush/tst_qbrush.cpp
index 7e94f37..e8236f0 100644
--- a/tests/auto/qbrush/tst_qbrush.cpp
+++ b/tests/auto/qbrush/tst_qbrush.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qbuffer/tst_qbuffer.cpp b/tests/auto/qbuffer/tst_qbuffer.cpp
index dd5ca91..6828608 100644
--- a/tests/auto/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/qbuffer/tst_qbuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
index a610a7f..9c65f47 100644
--- a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp
index 07fdbc3..52fa9c2 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/qbytearray/tst_qbytearray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp
index e8a1ba3..d309a64 100644
--- a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp
+++ b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcache/tst_qcache.cpp b/tests/auto/qcache/tst_qcache.cpp
index b7dd376..2a46343 100644
--- a/tests/auto/qcache/tst_qcache.cpp
+++ b/tests/auto/qcache/tst_qcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
index 042d8e0..7534209 100644
--- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp
index 93aaf96..f28dde0 100644
--- a/tests/auto/qchar/tst_qchar.cpp
+++ b/tests/auto/qchar/tst_qchar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcheckbox/tst_qcheckbox.cpp b/tests/auto/qcheckbox/tst_qcheckbox.cpp
index d16370c..4492524 100644
--- a/tests/auto/qcheckbox/tst_qcheckbox.cpp
+++ b/tests/auto/qcheckbox/tst_qcheckbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qclipboard/copier/main.cpp b/tests/auto/qclipboard/copier/main.cpp
index 26b55fe..3c1d323 100644
--- a/tests/auto/qclipboard/copier/main.cpp
+++ b/tests/auto/qclipboard/copier/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qclipboard/paster/main.cpp b/tests/auto/qclipboard/paster/main.cpp
index f9f2a57..01dd896 100644
--- a/tests/auto/qclipboard/paster/main.cpp
+++ b/tests/auto/qclipboard/paster/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index d1f3e86..f4d566d 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/qcolor/tst_qcolor.cpp
index f0821ab..cd35c7d 100644
--- a/tests/auto/qcolor/tst_qcolor.cpp
+++ b/tests/auto/qcolor/tst_qcolor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcolordialog/tst_qcolordialog.cpp b/tests/auto/qcolordialog/tst_qcolordialog.cpp
index aa4cb7d..3a85cbb 100644
--- a/tests/auto/qcolordialog/tst_qcolordialog.cpp
+++ b/tests/auto/qcolordialog/tst_qcolordialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index 1da8c5d..ca29905 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index 1fcea9e..b0d2acd 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index e3ec933..6e5a727 100644
--- a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp
index 1590528..4e10481 100644
--- a/tests/auto/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/qcompleter/tst_qcompleter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcomplextext/bidireorderstring.h b/tests/auto/qcomplextext/bidireorderstring.h
index 8e952e1..360c1bf 100644
--- a/tests/auto/qcomplextext/bidireorderstring.h
+++ b/tests/auto/qcomplextext/bidireorderstring.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcomplextext/tst_qcomplextext.cpp b/tests/auto/qcomplextext/tst_qcomplextext.cpp
index 4a96725..d72ec56 100644
--- a/tests/auto/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/qcomplextext/tst_qcomplextext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp b/tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp
index f64e815..ec0dced 100644
--- a/tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp
+++ b/tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp
index 01da4bd..d079f07 100644
--- a/tests/auto/qcopchannel/testSend/main.cpp
+++ b/tests/auto/qcopchannel/testSend/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcopchannel/tst_qcopchannel.cpp b/tests/auto/qcopchannel/tst_qcopchannel.cpp
index 09cb5f8..ce9f1d7 100644
--- a/tests/auto/qcopchannel/tst_qcopchannel.cpp
+++ b/tests/auto/qcopchannel/tst_qcopchannel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/qcoreapplication/tst_qcoreapplication.cpp
index c7c0e88..f658d94 100644
--- a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/qcoreapplication/tst_qcoreapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/qcryptographichash/tst_qcryptographichash.cpp
index 06ea557..f61dae6 100644
--- a/tests/auto/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/qcryptographichash/tst_qcryptographichash.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp
index 966563c..d47b529 100644
--- a/tests/auto/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/qcssparser/tst_qcssparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp
index c03bc71..d704be9 100644
--- a/tests/auto/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/qdatastream/tst_qdatastream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index 57ee7aa..a6d9c22 100644
--- a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdate/tst_qdate.cpp b/tests/auto/qdate/tst_qdate.cpp
index 60772eb..5a77f66 100644
--- a/tests/auto/qdate/tst_qdate.cpp
+++ b/tests/auto/qdate/tst_qdate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp
index 1841487..f7c5dbb 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/qdatetime/tst_qdatetime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
index 3125258..26ddd26 100644
--- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
index b282be0..6ec1875 100644
--- a/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
+++ b/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusabstractinterface/interface.cpp b/tests/auto/qdbusabstractinterface/interface.cpp
index 15a25f3..f490838 100644
--- a/tests/auto/qdbusabstractinterface/interface.cpp
+++ b/tests/auto/qdbusabstractinterface/interface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusabstractinterface/interface.h b/tests/auto/qdbusabstractinterface/interface.h
index 36f78d0..0b2252e 100644
--- a/tests/auto/qdbusabstractinterface/interface.h
+++ b/tests/auto/qdbusabstractinterface/interface.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusabstractinterface/pinger.cpp b/tests/auto/qdbusabstractinterface/pinger.cpp
index 38d3598..8f21a76 100644
--- a/tests/auto/qdbusabstractinterface/pinger.cpp
+++ b/tests/auto/qdbusabstractinterface/pinger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusabstractinterface/pinger.h b/tests/auto/qdbusabstractinterface/pinger.h
index e43eedc..0066d07 100644
--- a/tests/auto/qdbusabstractinterface/pinger.h
+++ b/tests/auto/qdbusabstractinterface/pinger.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtDBus module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
index 008d8e6..2ec38dc 100644
--- a/tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
+++ b/tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
index 96209b1..94b636e 100644
--- a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
+++ b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/qdbuscontext/tst_qdbuscontext.cpp
index 2b7ac06..416305a 100644
--- a/tests/auto/qdbuscontext/tst_qdbuscontext.cpp
+++ b/tests/auto/qdbuscontext/tst_qdbuscontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
index a870e47..ab59b27 100644
--- a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
+++ b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
index 675dc0f..cd0d2bd 100644
--- a/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
+++ b/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusmarshall/common.h b/tests/auto/qdbusmarshall/common.h
index 170e160..7352bee 100644
--- a/tests/auto/qdbusmarshall/common.h
+++ b/tests/auto/qdbusmarshall/common.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusmarshall/dummy.cpp b/tests/auto/qdbusmarshall/dummy.cpp
index d2bfffe..25d6859 100644
--- a/tests/auto/qdbusmarshall/dummy.cpp
+++ b/tests/auto/qdbusmarshall/dummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusmarshall/qpong/qpong.cpp b/tests/auto/qdbusmarshall/qpong/qpong.cpp
index c5c0782..a2e04e6 100644
--- a/tests/auto/qdbusmarshall/qpong/qpong.cpp
+++ b/tests/auto/qdbusmarshall/qpong/qpong.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
index 6a5920b..2071592 100644
--- a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp
index f87f918..a478466 100644
--- a/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp
+++ b/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp
index 537c793..9341cd1 100644
--- a/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp
+++ b/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp
index a55a427..392bfbe 100644
--- a/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp
+++ b/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
index bfb9987..b49e346 100644
--- a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
+++ b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusperformance/server/server.cpp b/tests/auto/qdbusperformance/server/server.cpp
index 9138110..0efeecc 100644
--- a/tests/auto/qdbusperformance/server/server.cpp
+++ b/tests/auto/qdbusperformance/server/server.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusperformance/serverobject.h b/tests/auto/qdbusperformance/serverobject.h
index 87df5b3..cb1ca8a 100644
--- a/tests/auto/qdbusperformance/serverobject.h
+++ b/tests/auto/qdbusperformance/serverobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusperformance/tst_qdbusperformance.cpp b/tests/auto/qdbusperformance/tst_qdbusperformance.cpp
index d0fc229..4caea23 100644
--- a/tests/auto/qdbusperformance/tst_qdbusperformance.cpp
+++ b/tests/auto/qdbusperformance/tst_qdbusperformance.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusreply/tst_qdbusreply.cpp b/tests/auto/qdbusreply/tst_qdbusreply.cpp
index 0213504..80bed54 100644
--- a/tests/auto/qdbusreply/tst_qdbusreply.cpp
+++ b/tests/auto/qdbusreply/tst_qdbusreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp b/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
index c283c05..f92cb00 100644
--- a/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
+++ b/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp
index 9d96ad8..b4fe07e 100644
--- a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp
+++ b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp
index 58ecf93..2620f3f 100644
--- a/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp
+++ b/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdebug/tst_qdebug.cpp b/tests/auto/qdebug/tst_qdebug.cpp
index 6e003f8..b9b0b45 100644
--- a/tests/auto/qdebug/tst_qdebug.cpp
+++ b/tests/auto/qdebug/tst_qdebug.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
index f59e8a7..b4fafda 100644
--- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
+++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
index d846615..be1af89 100644
--- a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
+++ b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdial/tst_qdial.cpp b/tests/auto/qdial/tst_qdial.cpp
index 2428eae..f9405fd 100644
--- a/tests/auto/qdial/tst_qdial.cpp
+++ b/tests/auto/qdial/tst_qdial.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp
index 8b6aee6..1efc026 100644
--- a/tests/auto/qdialog/tst_qdialog.cpp
+++ b/tests/auto/qdialog/tst_qdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 195f8b6..f09ce84 100644
--- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdir/testdir/dir/qrc_qdir.cpp b/tests/auto/qdir/testdir/dir/qrc_qdir.cpp
index e40f805..4085819 100644
--- a/tests/auto/qdir/testdir/dir/qrc_qdir.cpp
+++ b/tests/auto/qdir/testdir/dir/qrc_qdir.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdir/testdir/dir/tst_qdir.cpp b/tests/auto/qdir/testdir/dir/tst_qdir.cpp
index e40f805..4085819 100644
--- a/tests/auto/qdir/testdir/dir/tst_qdir.cpp
+++ b/tests/auto/qdir/testdir/dir/tst_qdir.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index fb83a5a..d66d8fe 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdirectpainter/runDirectPainter/main.cpp b/tests/auto/qdirectpainter/runDirectPainter/main.cpp
index 0be6ba3..9bdd57c 100644
--- a/tests/auto/qdirectpainter/runDirectPainter/main.cpp
+++ b/tests/auto/qdirectpainter/runDirectPainter/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp
index 9a7a1ba..52573c3 100644
--- a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp
+++ b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp
index 1a873b8..fee626e 100644
--- a/tests/auto/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp
index 41bbd87..98834ab 100644
--- a/tests/auto/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdockwidget/tst_qdockwidget.cpp b/tests/auto/qdockwidget/tst_qdockwidget.cpp
index 2059101..3dad346 100644
--- a/tests/auto/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/qdockwidget/tst_qdockwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp
index 8bf7620..8b8dc95 100644
--- a/tests/auto/qdom/tst_qdom.cpp
+++ b/tests/auto/qdom/tst_qdom.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
index 258d8dc..c302fce 100644
--- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp
index 26890b3..18dd9c3 100644
--- a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp
+++ b/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qdrag/tst_qdrag.cpp b/tests/auto/qdrag/tst_qdrag.cpp
index b13bf2d..b430b77 100644
--- a/tests/auto/qdrag/tst_qdrag.cpp
+++ b/tests/auto/qdrag/tst_qdrag.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
index 2411ab6..046482b 100644
--- a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp
index 87df57d..2f160c7 100644
--- a/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp
+++ b/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qerrormessage/tst_qerrormessage.cpp b/tests/auto/qerrormessage/tst_qerrormessage.cpp
index 1a01a57..33ad57e 100644
--- a/tests/auto/qerrormessage/tst_qerrormessage.cpp
+++ b/tests/auto/qerrormessage/tst_qerrormessage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qevent/tst_qevent.cpp b/tests/auto/qevent/tst_qevent.cpp
index b28ea25..56e5631 100644
--- a/tests/auto/qevent/tst_qevent.cpp
+++ b/tests/auto/qevent/tst_qevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp
index 8c2ffd9..893be46 100644
--- a/tests/auto/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/qeventloop/tst_qeventloop.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp b/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
index 59d2b5c..bf9b22a 100644
--- a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
+++ b/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfile/largefile/tst_largefile.cpp b/tests/auto/qfile/largefile/tst_largefile.cpp
index 60c5f89..665ced6 100644
--- a/tests/auto/qfile/largefile/tst_largefile.cpp
+++ b/tests/auto/qfile/largefile/tst_largefile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfile/stdinprocess/main.cpp b/tests/auto/qfile/stdinprocess/main.cpp
index 54d4086..37191b9 100644
--- a/tests/auto/qfile/stdinprocess/main.cpp
+++ b/tests/auto/qfile/stdinprocess/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp
index ee799f3..4d87aaa 100644
--- a/tests/auto/qfile/tst_qfile.cpp
+++ b/tests/auto/qfile/tst_qfile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index ca7c445..537e779 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
index 6299c24..1f77e81 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp
index 1ee69ce..207d59f 100644
--- a/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp
+++ b/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 208110a..61af0dc 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index c234c96..b6233c7 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index a26e34d..cbcd045 100644
--- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qflags/tst_qflags.cpp b/tests/auto/qflags/tst_qflags.cpp
index 17eb405..1713412 100644
--- a/tests/auto/qflags/tst_qflags.cpp
+++ b/tests/auto/qflags/tst_qflags.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfocusevent/tst_qfocusevent.cpp b/tests/auto/qfocusevent/tst_qfocusevent.cpp
index 2e3255a..0b611b3 100644
--- a/tests/auto/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/qfocusevent/tst_qfocusevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfocusframe/tst_qfocusframe.cpp b/tests/auto/qfocusframe/tst_qfocusframe.cpp
index 39c9948..306ee01 100644
--- a/tests/auto/qfocusframe/tst_qfocusframe.cpp
+++ b/tests/auto/qfocusframe/tst_qfocusframe.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/qfont/tst_qfont.cpp
index 7bda665..463caf6 100644
--- a/tests/auto/qfont/tst_qfont.cpp
+++ b/tests/auto/qfont/tst_qfont.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
index 7103af7..5480b90 100644
--- a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
index 357b82e..b9df4d9 100644
--- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfontdialog/tst_qfontdialog.cpp b/tests/auto/qfontdialog/tst_qfontdialog.cpp
index 8860e82..59e2c07 100644
--- a/tests/auto/qfontdialog/tst_qfontdialog.cpp
+++ b/tests/auto/qfontdialog/tst_qfontdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm b/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm
index 0b1db82..7deaef1 100644
--- a/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm
+++ b/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp
index a22d624..84e04bd 100644
--- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/qformlayout/tst_qformlayout.cpp
index a121686..333df5d 100644
--- a/tests/auto/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/qformlayout/tst_qformlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp
index 2a42d6d..2b59360 100644
--- a/tests/auto/qftp/tst_qftp.cpp
+++ b/tests/auto/qftp/tst_qftp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfuture/tst_qfuture.cpp b/tests/auto/qfuture/tst_qfuture.cpp
index 5cc8547..fe8057a 100644
--- a/tests/auto/qfuture/tst_qfuture.cpp
+++ b/tests/auto/qfuture/tst_qfuture.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfuture/versioncheck.h b/tests/auto/qfuture/versioncheck.h
index 0ac007d..7eddbaa 100644
--- a/tests/auto/qfuture/versioncheck.h
+++ b/tests/auto/qfuture/versioncheck.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp
index c53c67a..4726fb2 100644
--- a/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgetputenv/tst_qgetputenv.cpp b/tests/auto/qgetputenv/tst_qgetputenv.cpp
index 2f1196c..c7dfd0c 100644
--- a/tests/auto/qgetputenv/tst_qgetputenv.cpp
+++ b/tests/auto/qgetputenv/tst_qgetputenv.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index e411508..fc786d2 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qglbuffer/tst_qglbuffer.cpp b/tests/auto/qglbuffer/tst_qglbuffer.cpp
index b7d5821..6c5214e 100644
--- a/tests/auto/qglbuffer/tst_qglbuffer.cpp
+++ b/tests/auto/qglbuffer/tst_qglbuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qglobal/tst_qglobal.cpp b/tests/auto/qglobal/tst_qglobal.cpp
index 8f61c18..75810f3 100644
--- a/tests/auto/qglobal/tst_qglobal.cpp
+++ b/tests/auto/qglobal/tst_qglobal.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp
index cce3161..53e7154 100644
--- a/tests/auto/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/qglthreads/tst_qglthreads.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qglthreads/tst_qglthreads.h b/tests/auto/qglthreads/tst_qglthreads.h
index 9e97909..ada0583 100644
--- a/tests/auto/qglthreads/tst_qglthreads.h
+++ b/tests/auto/qglthreads/tst_qglthreads.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index fa3e0f9..963f9e4 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index 7880d2d..cb6770c 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 07fa630..add532e 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index af23b46..20b5db7 100644
--- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 5b03767..08195b8 100644
--- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index a1909e7..5c8dc4f 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp b/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
index f334615..6b46cdb 100644
--- a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
+++ b/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
index dad3279..9c99114 100644
--- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
index dbffa6e..a688628 100644
--- a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
+++ b/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 6107fa1..8b2f7c3 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
index d958f2c..11575ba 100644
--- a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
+++ b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
index 46539c9..32001ba 100644
--- a/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
+++ b/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
index f4e223a..a0d04ce 100644
--- a/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
+++ b/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 411c790..304c677 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index b8e729e..2085821 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index dba8a64..d9ed15f 100644
--- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp
index 31cd5946..dc1727b 100644
--- a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp
+++ b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 7b5ac7a..043e467 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp
index 6ed2c6d..3571efc 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 7f24ddc..5f64125 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp
index e0924de..9b5dd3a 100644
--- a/tests/auto/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qgroupbox/tst_qgroupbox.cpp b/tests/auto/qgroupbox/tst_qgroupbox.cpp
index 90c43cb..a767a7e 100644
--- a/tests/auto/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/qgroupbox/tst_qgroupbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qguivariant/tst_qguivariant.cpp b/tests/auto/qguivariant/tst_qguivariant.cpp
index 2599839..7d01836 100644
--- a/tests/auto/qguivariant/tst_qguivariant.cpp
+++ b/tests/auto/qguivariant/tst_qguivariant.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhash/tst_qhash.cpp b/tests/auto/qhash/tst_qhash.cpp
index 3a7b54a..759f018 100644
--- a/tests/auto/qhash/tst_qhash.cpp
+++ b/tests/auto/qhash/tst_qhash.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp
index da0a0bb..758d372 100644
--- a/tests/auto/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/qheaderview/tst_qheaderview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp
index f71aaf3..2a13322 100644
--- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp
+++ b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
index 0790c12..62ee806 100644
--- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
+++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
index a190081..6e1ab85 100644
--- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
+++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp
index 23fd9d7..a4dc735 100644
--- a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp
+++ b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
index 9c458f7..d29fcdc 100644
--- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
+++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhostaddress/tst_qhostaddress.cpp b/tests/auto/qhostaddress/tst_qhostaddress.cpp
index 093bf31..bf92385 100644
--- a/tests/auto/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/qhostaddress/tst_qhostaddress.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index c336746..ec17fe7 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhttp/dummyserver.h b/tests/auto/qhttp/dummyserver.h
index 2fc2472..ef28651 100644
--- a/tests/auto/qhttp/dummyserver.h
+++ b/tests/auto/qhttp/dummyserver.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp
index 320225d..e8aaa39 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/qhttp/tst_qhttp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index 89f608e..4937a48 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp b/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
index 203e280..595b5c7 100644
--- a/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
+++ b/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
index f86ba63..04d1ddc 100644
--- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
+++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/qicoimageformat/tst_qicoimageformat.cpp
index 7c53b72..0b84b81 100644
--- a/tests/auto/qicoimageformat/tst_qicoimageformat.cpp
+++ b/tests/auto/qicoimageformat/tst_qicoimageformat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp
index e68664c..09ac147 100644
--- a/tests/auto/qicon/tst_qicon.cpp
+++ b/tests/auto/qicon/tst_qicon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp
index b446941..619daac 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/qimage/tst_qimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/qimageiohandler/tst_qimageiohandler.cpp
index 98dab94..3670758 100644
--- a/tests/auto/qimageiohandler/tst_qimageiohandler.cpp
+++ b/tests/auto/qimageiohandler/tst_qimageiohandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index 3bee5d9..3fbb66b 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/qimagewriter/tst_qimagewriter.cpp
index c6ec715..088506f 100644
--- a/tests/auto/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/qimagewriter/tst_qimagewriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp
index 7811a53..c77bdbe 100644
--- a/tests/auto/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/qinputdialog/tst_qinputdialog.cpp
index 0d6644a..eb1e43f 100644
--- a/tests/auto/qinputdialog/tst_qinputdialog.cpp
+++ b/tests/auto/qinputdialog/tst_qinputdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qintvalidator/tst_qintvalidator.cpp b/tests/auto/qintvalidator/tst_qintvalidator.cpp
index 46ad0dd..f750649 100644
--- a/tests/auto/qintvalidator/tst_qintvalidator.cpp
+++ b/tests/auto/qintvalidator/tst_qintvalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp
index 7048754..97f1c7b 100644
--- a/tests/auto/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/qiodevice/tst_qiodevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
index 2a378fe..ab1e09f 100644
--- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
index 8c69fb1..e0b243b 100644
--- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
+++ b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/qitemmodel/modelstotest.cpp
index 3c98b10..d5db366 100644
--- a/tests/auto/qitemmodel/modelstotest.cpp
+++ b/tests/auto/qitemmodel/modelstotest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp
index d36df9c..5a882c0 100644
--- a/tests/auto/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 3b2a716..7e41eb8 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp
index e952097..e2a492a 100644
--- a/tests/auto/qitemview/tst_qitemview.cpp
+++ b/tests/auto/qitemview/tst_qitemview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qitemview/viewstotest.cpp b/tests/auto/qitemview/viewstotest.cpp
index a849df9..0052ffc 100644
--- a/tests/auto/qitemview/viewstotest.cpp
+++ b/tests/auto/qitemview/viewstotest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp
index 60f022f..87308ee 100644
--- a/tests/auto/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/qlabel/tst_qlabel.cpp
index 153149e7..7125332 100644
--- a/tests/auto/qlabel/tst_qlabel.cpp
+++ b/tests/auto/qlabel/tst_qlabel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp
index c6fe3f0..64cb132 100644
--- a/tests/auto/qlayout/tst_qlayout.cpp
+++ b/tests/auto/qlayout/tst_qlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlcdnumber/tst_qlcdnumber.cpp b/tests/auto/qlcdnumber/tst_qlcdnumber.cpp
index fc2ad66..64881e5 100644
--- a/tests/auto/qlcdnumber/tst_qlcdnumber.cpp
+++ b/tests/auto/qlcdnumber/tst_qlcdnumber.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlibrary/lib/mylib.c b/tests/auto/qlibrary/lib/mylib.c
index fe2fcb0..8edb929 100644
--- a/tests/auto/qlibrary/lib/mylib.c
+++ b/tests/auto/qlibrary/lib/mylib.c
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlibrary/lib2/mylib.c b/tests/auto/qlibrary/lib2/mylib.c
index fe115d5..f965d1e 100644
--- a/tests/auto/qlibrary/lib2/mylib.c
+++ b/tests/auto/qlibrary/lib2/mylib.c
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/qlibrary/tst_qlibrary.cpp
index d4884db..72479c9 100644
--- a/tests/auto/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/qlibrary/tst_qlibrary.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qline/tst_qline.cpp b/tests/auto/qline/tst_qline.cpp
index 1a8cdb8..c33ee29 100644
--- a/tests/auto/qline/tst_qline.cpp
+++ b/tests/auto/qline/tst_qline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp
index 93bd447..4543038 100644
--- a/tests/auto/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/qlineedit/tst_qlineedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlist/tst_qlist.cpp b/tests/auto/qlist/tst_qlist.cpp
index ba8aefa..e3af5e1 100644
--- a/tests/auto/qlist/tst_qlist.cpp
+++ b/tests/auto/qlist/tst_qlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp
index 425ac89..d7ea275 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/qlistview/tst_qlistview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index eb3fb6b..3abdda3 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp b/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp
index 0e8ec92..837e84c 100644
--- a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp
+++ b/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp
index 7e9b8ec..0aa77ac 100644
--- a/tests/auto/qlocale/tst_qlocale.cpp
+++ b/tests/auto/qlocale/tst_qlocale.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlocalsocket/example/client/main.cpp b/tests/auto/qlocalsocket/example/client/main.cpp
index cfad56f..599f3cf 100644
--- a/tests/auto/qlocalsocket/example/client/main.cpp
+++ b/tests/auto/qlocalsocket/example/client/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlocalsocket/example/server/main.cpp b/tests/auto/qlocalsocket/example/server/main.cpp
index d259557..0b138da 100644
--- a/tests/auto/qlocalsocket/example/server/main.cpp
+++ b/tests/auto/qlocalsocket/example/server/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlocalsocket/lackey/main.cpp b/tests/auto/qlocalsocket/lackey/main.cpp
index 1bba4f8..b58a2db 100644
--- a/tests/auto/qlocalsocket/lackey/main.cpp
+++ b/tests/auto/qlocalsocket/lackey/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index 9c09917..bc59fb3 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/qmacstyle/tst_qmacstyle.cpp
index d016c9a..948acdf 100644
--- a/tests/auto/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/qmacstyle/tst_qmacstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp
index 5a69d9c..cfbb8c5 100644
--- a/tests/auto/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testcompiler.cpp b/tests/auto/qmake/testcompiler.cpp
index d4e5848..758e7ab 100644
--- a/tests/auto/qmake/testcompiler.cpp
+++ b/tests/auto/qmake/testcompiler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testcompiler.h b/tests/auto/qmake/testcompiler.h
index 59c4104..accb4c8 100644
--- a/tests/auto/qmake/testcompiler.h
+++ b/tests/auto/qmake/testcompiler.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/main.cpp b/tests/auto/qmake/testdata/findDeps/main.cpp
index 446a1dd..133c721 100644
--- a/tests/auto/qmake/testdata/findDeps/main.cpp
+++ b/tests/auto/qmake/testdata/findDeps/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object1.h b/tests/auto/qmake/testdata/findDeps/object1.h
index 91aba82..f71ba53 100644
--- a/tests/auto/qmake/testdata/findDeps/object1.h
+++ b/tests/auto/qmake/testdata/findDeps/object1.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object2.h b/tests/auto/qmake/testdata/findDeps/object2.h
index 320aad3..be855d4 100644
--- a/tests/auto/qmake/testdata/findDeps/object2.h
+++ b/tests/auto/qmake/testdata/findDeps/object2.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object3.h b/tests/auto/qmake/testdata/findDeps/object3.h
index bf4a722..4169772 100644
--- a/tests/auto/qmake/testdata/findDeps/object3.h
+++ b/tests/auto/qmake/testdata/findDeps/object3.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object4.h b/tests/auto/qmake/testdata/findDeps/object4.h
index cfd6abd..ba5c10a 100644
--- a/tests/auto/qmake/testdata/findDeps/object4.h
+++ b/tests/auto/qmake/testdata/findDeps/object4.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object5.h b/tests/auto/qmake/testdata/findDeps/object5.h
index fdc53b1..3c8ad68 100644
--- a/tests/auto/qmake/testdata/findDeps/object5.h
+++ b/tests/auto/qmake/testdata/findDeps/object5.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object6.h b/tests/auto/qmake/testdata/findDeps/object6.h
index 33ee417..2afffdf 100644
--- a/tests/auto/qmake/testdata/findDeps/object6.h
+++ b/tests/auto/qmake/testdata/findDeps/object6.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object7.h b/tests/auto/qmake/testdata/findDeps/object7.h
index ed61453..f2727f4 100644
--- a/tests/auto/qmake/testdata/findDeps/object7.h
+++ b/tests/auto/qmake/testdata/findDeps/object7.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object8.h b/tests/auto/qmake/testdata/findDeps/object8.h
index 8f26c10..7f47bb8 100644
--- a/tests/auto/qmake/testdata/findDeps/object8.h
+++ b/tests/auto/qmake/testdata/findDeps/object8.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findDeps/object9.h b/tests/auto/qmake/testdata/findDeps/object9.h
index f75195a..af00efb 100644
--- a/tests/auto/qmake/testdata/findDeps/object9.h
+++ b/tests/auto/qmake/testdata/findDeps/object9.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/main.cpp b/tests/auto/qmake/testdata/findMocs/main.cpp
index b19ec42..fc6321c 100644
--- a/tests/auto/qmake/testdata/findMocs/main.cpp
+++ b/tests/auto/qmake/testdata/findMocs/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/object1.h b/tests/auto/qmake/testdata/findMocs/object1.h
index 3d4766c..a284951 100644
--- a/tests/auto/qmake/testdata/findMocs/object1.h
+++ b/tests/auto/qmake/testdata/findMocs/object1.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/object2.h b/tests/auto/qmake/testdata/findMocs/object2.h
index 0955db0..17b0edd 100644
--- a/tests/auto/qmake/testdata/findMocs/object2.h
+++ b/tests/auto/qmake/testdata/findMocs/object2.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/object3.h b/tests/auto/qmake/testdata/findMocs/object3.h
index 7aefb38..f38df5e 100644
--- a/tests/auto/qmake/testdata/findMocs/object3.h
+++ b/tests/auto/qmake/testdata/findMocs/object3.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/object4.h b/tests/auto/qmake/testdata/findMocs/object4.h
index 91840da..68082b0 100644
--- a/tests/auto/qmake/testdata/findMocs/object4.h
+++ b/tests/auto/qmake/testdata/findMocs/object4.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/object5.h b/tests/auto/qmake/testdata/findMocs/object5.h
index 876b9fe..b056195 100644
--- a/tests/auto/qmake/testdata/findMocs/object5.h
+++ b/tests/auto/qmake/testdata/findMocs/object5.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/object6.h b/tests/auto/qmake/testdata/findMocs/object6.h
index eca8f44..69513f1 100644
--- a/tests/auto/qmake/testdata/findMocs/object6.h
+++ b/tests/auto/qmake/testdata/findMocs/object6.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/findMocs/object7.h b/tests/auto/qmake/testdata/findMocs/object7.h
index c6d5b8e..5ea6e11 100644
--- a/tests/auto/qmake/testdata/findMocs/object7.h
+++ b/tests/auto/qmake/testdata/findMocs/object7.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/1.cpp b/tests/auto/qmake/testdata/functions/1.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/1.cpp
+++ b/tests/auto/qmake/testdata/functions/1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/2.cpp b/tests/auto/qmake/testdata/functions/2.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/2.cpp
+++ b/tests/auto/qmake/testdata/functions/2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/one/1.cpp b/tests/auto/qmake/testdata/functions/one/1.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/one/1.cpp
+++ b/tests/auto/qmake/testdata/functions/one/1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/one/2.cpp b/tests/auto/qmake/testdata/functions/one/2.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/one/2.cpp
+++ b/tests/auto/qmake/testdata/functions/one/2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/three/wildcard21.cpp b/tests/auto/qmake/testdata/functions/three/wildcard21.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/three/wildcard21.cpp
+++ b/tests/auto/qmake/testdata/functions/three/wildcard21.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/three/wildcard22.cpp b/tests/auto/qmake/testdata/functions/three/wildcard22.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/three/wildcard22.cpp
+++ b/tests/auto/qmake/testdata/functions/three/wildcard22.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/two/1.cpp b/tests/auto/qmake/testdata/functions/two/1.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/two/1.cpp
+++ b/tests/auto/qmake/testdata/functions/two/1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/two/2.cpp b/tests/auto/qmake/testdata/functions/two/2.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/two/2.cpp
+++ b/tests/auto/qmake/testdata/functions/two/2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/wildcard21.cpp b/tests/auto/qmake/testdata/functions/wildcard21.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/wildcard21.cpp
+++ b/tests/auto/qmake/testdata/functions/wildcard21.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/functions/wildcard22.cpp b/tests/auto/qmake/testdata/functions/wildcard22.cpp
index ddf4140..d1754b0 100644
--- a/tests/auto/qmake/testdata/functions/wildcard22.cpp
+++ b/tests/auto/qmake/testdata/functions/wildcard22.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/include_dir/main.cpp b/tests/auto/qmake/testdata/include_dir/main.cpp
index 08315ed..9c0f42b 100644
--- a/tests/auto/qmake/testdata/include_dir/main.cpp
+++ b/tests/auto/qmake/testdata/include_dir/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/include_dir/test_file.cpp b/tests/auto/qmake/testdata/include_dir/test_file.cpp
index 6d3b9a6..acaeb6a 100644
--- a/tests/auto/qmake/testdata/include_dir/test_file.cpp
+++ b/tests/auto/qmake/testdata/include_dir/test_file.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/include_dir/test_file.h b/tests/auto/qmake/testdata/include_dir/test_file.h
index 64cc1b5..13fa426 100644
--- a/tests/auto/qmake/testdata/include_dir/test_file.h
+++ b/tests/auto/qmake/testdata/include_dir/test_file.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/include_function/main.cpp b/tests/auto/qmake/testdata/include_function/main.cpp
index 3ada048..42ec7b3 100644
--- a/tests/auto/qmake/testdata/include_function/main.cpp
+++ b/tests/auto/qmake/testdata/include_function/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/install_depends/main.cpp b/tests/auto/qmake/testdata/install_depends/main.cpp
index 08315ed..9c0f42b 100644
--- a/tests/auto/qmake/testdata/install_depends/main.cpp
+++ b/tests/auto/qmake/testdata/install_depends/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/install_depends/test_file.cpp b/tests/auto/qmake/testdata/install_depends/test_file.cpp
index 9d81438..eed368d 100644
--- a/tests/auto/qmake/testdata/install_depends/test_file.cpp
+++ b/tests/auto/qmake/testdata/install_depends/test_file.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/install_depends/test_file.h b/tests/auto/qmake/testdata/install_depends/test_file.h
index b64438f..824c922 100644
--- a/tests/auto/qmake/testdata/install_depends/test_file.h
+++ b/tests/auto/qmake/testdata/install_depends/test_file.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/one_space/main.cpp b/tests/auto/qmake/testdata/one_space/main.cpp
index 5f0219c..cf285b0 100644
--- a/tests/auto/qmake/testdata/one_space/main.cpp
+++ b/tests/auto/qmake/testdata/one_space/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/quotedfilenames/main.cpp b/tests/auto/qmake/testdata/quotedfilenames/main.cpp
index 24534ba..fdd3d29 100644
--- a/tests/auto/qmake/testdata/quotedfilenames/main.cpp
+++ b/tests/auto/qmake/testdata/quotedfilenames/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/shadow_files/main.cpp b/tests/auto/qmake/testdata/shadow_files/main.cpp
index 08315ed..9c0f42b 100644
--- a/tests/auto/qmake/testdata/shadow_files/main.cpp
+++ b/tests/auto/qmake/testdata/shadow_files/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/shadow_files/test_file.cpp b/tests/auto/qmake/testdata/shadow_files/test_file.cpp
index 9d81438..eed368d 100644
--- a/tests/auto/qmake/testdata/shadow_files/test_file.cpp
+++ b/tests/auto/qmake/testdata/shadow_files/test_file.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/shadow_files/test_file.h b/tests/auto/qmake/testdata/shadow_files/test_file.h
index b64438f..824c922 100644
--- a/tests/auto/qmake/testdata/shadow_files/test_file.h
+++ b/tests/auto/qmake/testdata/shadow_files/test_file.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/simple_app/main.cpp b/tests/auto/qmake/testdata/simple_app/main.cpp
index 76d8ac9..67a947c 100644
--- a/tests/auto/qmake/testdata/simple_app/main.cpp
+++ b/tests/auto/qmake/testdata/simple_app/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/simple_app/test_file.cpp b/tests/auto/qmake/testdata/simple_app/test_file.cpp
index 9d81438..eed368d 100644
--- a/tests/auto/qmake/testdata/simple_app/test_file.cpp
+++ b/tests/auto/qmake/testdata/simple_app/test_file.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/simple_app/test_file.h b/tests/auto/qmake/testdata/simple_app/test_file.h
index b64438f..824c922 100644
--- a/tests/auto/qmake/testdata/simple_app/test_file.h
+++ b/tests/auto/qmake/testdata/simple_app/test_file.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/simple_dll/simple.cpp b/tests/auto/qmake/testdata/simple_dll/simple.cpp
index be27377..44fe77e 100644
--- a/tests/auto/qmake/testdata/simple_dll/simple.cpp
+++ b/tests/auto/qmake/testdata/simple_dll/simple.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/simple_dll/simple.h b/tests/auto/qmake/testdata/simple_dll/simple.h
index 611decf..0c5064f 100644
--- a/tests/auto/qmake/testdata/simple_dll/simple.h
+++ b/tests/auto/qmake/testdata/simple_dll/simple.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/simple_lib/simple.cpp b/tests/auto/qmake/testdata/simple_lib/simple.cpp
index be27377..44fe77e 100644
--- a/tests/auto/qmake/testdata/simple_lib/simple.cpp
+++ b/tests/auto/qmake/testdata/simple_lib/simple.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/simple_lib/simple.h b/tests/auto/qmake/testdata/simple_lib/simple.h
index fce3533..3e921eb 100644
--- a/tests/auto/qmake/testdata/simple_lib/simple.h
+++ b/tests/auto/qmake/testdata/simple_lib/simple.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp b/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp
index 76d8ac9..67a947c 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp
+++ b/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp
index 9d81438..eed368d 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp
+++ b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h
index b64438f..824c922 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h
+++ b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp
index be27377..44fe77e 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp
+++ b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h
index 611decf..0c5064f 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h
+++ b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 1d3e128..1763cb3 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmap/tst_qmap.cpp b/tests/auto/qmap/tst_qmap.cpp
index a1b8de7..106700a 100644
--- a/tests/auto/qmap/tst_qmap.cpp
+++ b/tests/auto/qmap/tst_qmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmargins/tst_qmargins.cpp b/tests/auto/qmargins/tst_qmargins.cpp
index 0243117..3c2164b 100644
--- a/tests/auto/qmargins/tst_qmargins.cpp
+++ b/tests/auto/qmargins/tst_qmargins.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmath/tst_qmath.cpp b/tests/auto/qmath/tst_qmath.cpp
index 04769f3..554aad1 100644
--- a/tests/auto/qmath/tst_qmath.cpp
+++ b/tests/auto/qmath/tst_qmath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
index 5709196..e236539 100644
--- a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp
index f865738..ca8526d 100644
--- a/tests/auto/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
index a927d66..344e036 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index 7065b13..f1aedf9 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp
index cc9fb0c..35dc770 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/qmenubar/tst_qmenubar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp
index d4ca064..45cf1e9 100644
--- a/tests/auto/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp
index 8c2a0f9..2d27468 100644
--- a/tests/auto/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmetatype/tst_qmetatype.cpp b/tests/auto/qmetatype/tst_qmetatype.cpp
index 8558e06..5a09522 100644
--- a/tests/auto/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/qmetatype/tst_qmetatype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmimedata/tst_qmimedata.cpp b/tests/auto/qmimedata/tst_qmimedata.cpp
index be7a654..8fa36f1 100644
--- a/tests/auto/qmimedata/tst_qmimedata.cpp
+++ b/tests/auto/qmimedata/tst_qmimedata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmouseevent/tst_qmouseevent.cpp b/tests/auto/qmouseevent/tst_qmouseevent.cpp
index 1092516..766dd9e 100644
--- a/tests/auto/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/qmouseevent/tst_qmouseevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp
index 99a8913..5a7db13 100644
--- a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp
+++ b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmovie/tst_qmovie.cpp b/tests/auto/qmovie/tst_qmovie.cpp
index 80a551b..fac6cf3 100644
--- a/tests/auto/qmovie/tst_qmovie.cpp
+++ b/tests/auto/qmovie/tst_qmovie.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/qmultiscreen/tst_qmultiscreen.cpp
index cb8b8be..57d0da8 100644
--- a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp
+++ b/tests/auto/qmultiscreen/tst_qmultiscreen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmutex/tst_qmutex.cpp b/tests/auto/qmutex/tst_qmutex.cpp
index 1e6a684..a7c615a 100644
--- a/tests/auto/qmutex/tst_qmutex.cpp
+++ b/tests/auto/qmutex/tst_qmutex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp
index d441233..fcc04cb 100644
--- a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp
+++ b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
index 2b0b632..011bd36 100644
--- a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
+++ b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp b/tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
index 375c839..37b5bcb 100644
--- a/tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
+++ b/tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index 99d775d..0476cb7 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp b/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
index 5787408..af899f8 100644
--- a/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
+++ b/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp b/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
index b58a4e6..efac464 100644
--- a/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
+++ b/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index e66719a..7ff69a6 100644
--- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
index c732a5b..8bede51 100644
--- a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
+++ b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
index 72d8eda..c853b61 100644
--- a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 01b9c0c..2893259 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 245a5c6..c70329d 100644
--- a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
index e4a7d13..4ce3747 100644
--- a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp b/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp
index 3df5470..cfd785d 100644
--- a/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp
+++ b/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkreply/echo/main.cpp b/tests/auto/qnetworkreply/echo/main.cpp
index 14a3462..4e386c9 100644
--- a/tests/auto/qnetworkreply/echo/main.cpp
+++ b/tests/auto/qnetworkreply/echo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 306b5f8..6ec25e1 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
index 30222d7..1879592 100644
--- a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp
index ec2fad9..6ddf19b 100644
--- a/tests/auto/qnetworksession/lackey/main.cpp
+++ b/tests/auto/qnetworksession/lackey/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
index 3388cd5..b2e131f 100644
--- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qnumeric/tst_qnumeric.cpp b/tests/auto/qnumeric/tst_qnumeric.cpp
index b63e5c7..512e9b5 100644
--- a/tests/auto/qnumeric/tst_qnumeric.cpp
+++ b/tests/auto/qnumeric/tst_qnumeric.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qobject/moc_oldnormalizeobject.cpp b/tests/auto/qobject/moc_oldnormalizeobject.cpp
index 3b1e658..6185d67 100644
--- a/tests/auto/qobject/moc_oldnormalizeobject.cpp
+++ b/tests/auto/qobject/moc_oldnormalizeobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qobject/oldnormalizeobject.h b/tests/auto/qobject/oldnormalizeobject.h
index 3adf04d..1b196e9 100644
--- a/tests/auto/qobject/oldnormalizeobject.h
+++ b/tests/auto/qobject/oldnormalizeobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qobject/signalbug.cpp b/tests/auto/qobject/signalbug.cpp
index aa2078f..b763464 100644
--- a/tests/auto/qobject/signalbug.cpp
+++ b/tests/auto/qobject/signalbug.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qobject/signalbug.h b/tests/auto/qobject/signalbug.h
index 0563f16..ca3e00d 100644
--- a/tests/auto/qobject/signalbug.h
+++ b/tests/auto/qobject/signalbug.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 5f6262e..60d33b5 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp b/tests/auto/qobjectperformance/tst_qobjectperformance.cpp
index c001c1f..1f53131 100644
--- a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp
+++ b/tests/auto/qobjectperformance/tst_qobjectperformance.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp
index a856c74..9b070ec 100644
--- a/tests/auto/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpaintengine/tst_qpaintengine.cpp b/tests/auto/qpaintengine/tst_qpaintengine.cpp
index a98a392..1a58edc 100644
--- a/tests/auto/qpaintengine/tst_qpaintengine.cpp
+++ b/tests/auto/qpaintengine/tst_qpaintengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 45f5c3e..aea6513 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpainter/utils/createImages/main.cpp b/tests/auto/qpainter/utils/createImages/main.cpp
index ca1a805..84056be 100644
--- a/tests/auto/qpainter/utils/createImages/main.cpp
+++ b/tests/auto/qpainter/utils/createImages/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/qpainterpath/tst_qpainterpath.cpp
index d0cddda..25e74f9 100644
--- a/tests/auto/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/qpainterpath/tst_qpainterpath.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp b/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp
index a358734..c705a2f 100644
--- a/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp
+++ b/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpalette/tst_qpalette.cpp b/tests/auto/qpalette/tst_qpalette.cpp
index 2501f8d..9f9979b 100644
--- a/tests/auto/qpalette/tst_qpalette.cpp
+++ b/tests/auto/qpalette/tst_qpalette.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
index d2d86fb..9d63179 100644
--- a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
+++ b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpathclipper/pathcompare.h b/tests/auto/qpathclipper/pathcompare.h
index eb25e4c..8e651a2 100644
--- a/tests/auto/qpathclipper/pathcompare.h
+++ b/tests/auto/qpathclipper/pathcompare.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpathclipper/paths.cpp b/tests/auto/qpathclipper/paths.cpp
index 63ad984..31c8127 100644
--- a/tests/auto/qpathclipper/paths.cpp
+++ b/tests/auto/qpathclipper/paths.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpathclipper/paths.h b/tests/auto/qpathclipper/paths.h
index 59afbfc..aa74b61 100644
--- a/tests/auto/qpathclipper/paths.h
+++ b/tests/auto/qpathclipper/paths.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/qpathclipper/tst_qpathclipper.cpp
index 4dc12cb..b7349c3 100644
--- a/tests/auto/qpathclipper/tst_qpathclipper.cpp
+++ b/tests/auto/qpathclipper/tst_qpathclipper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp
index 605cee6..4b3c2b2 100644
--- a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp
+++ b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpen/tst_qpen.cpp b/tests/auto/qpen/tst_qpen.cpp
index b0c2cad..9abe844 100644
--- a/tests/auto/qpen/tst_qpen.cpp
+++ b/tests/auto/qpen/tst_qpen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpicture/tst_qpicture.cpp b/tests/auto/qpicture/tst_qpicture.cpp
index 09f6503..3251291 100644
--- a/tests/auto/qpicture/tst_qpicture.cpp
+++ b/tests/auto/qpicture/tst_qpicture.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 24cbb21..d5e6c99 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
index 70f2ac3..d63fdcd 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
index f0f087d..edd7f3d 100644
--- a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
index a6dd8be..c308040 100644
--- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qplugin/debugplugin/main.cpp b/tests/auto/qplugin/debugplugin/main.cpp
index 7740f07..ccebff4 100644
--- a/tests/auto/qplugin/debugplugin/main.cpp
+++ b/tests/auto/qplugin/debugplugin/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qplugin/releaseplugin/main.cpp b/tests/auto/qplugin/releaseplugin/main.cpp
index eb3dfff..1414b85 100644
--- a/tests/auto/qplugin/releaseplugin/main.cpp
+++ b/tests/auto/qplugin/releaseplugin/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qplugin/tst_qplugin.cpp b/tests/auto/qplugin/tst_qplugin.cpp
index 5774e5f..8de7303 100644
--- a/tests/auto/qplugin/tst_qplugin.cpp
+++ b/tests/auto/qplugin/tst_qplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp b/tests/auto/qpluginloader/almostplugin/almostplugin.cpp
index 0f8e4d2..87055ba 100644
--- a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp
+++ b/tests/auto/qpluginloader/almostplugin/almostplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.h b/tests/auto/qpluginloader/almostplugin/almostplugin.h
index 5805a07..802071a 100644
--- a/tests/auto/qpluginloader/almostplugin/almostplugin.h
+++ b/tests/auto/qpluginloader/almostplugin/almostplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpluginloader/lib/mylib.c b/tests/auto/qpluginloader/lib/mylib.c
index 7eaa485..95649b3 100644
--- a/tests/auto/qpluginloader/lib/mylib.c
+++ b/tests/auto/qpluginloader/lib/mylib.c
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpluginloader/theplugin/plugininterface.h b/tests/auto/qpluginloader/theplugin/plugininterface.h
index 9b69429..4c6cc6f 100644
--- a/tests/auto/qpluginloader/theplugin/plugininterface.h
+++ b/tests/auto/qpluginloader/theplugin/plugininterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.cpp b/tests/auto/qpluginloader/theplugin/theplugin.cpp
index 3c7e396..b29bbdc 100644
--- a/tests/auto/qpluginloader/theplugin/theplugin.cpp
+++ b/tests/auto/qpluginloader/theplugin/theplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.h b/tests/auto/qpluginloader/theplugin/theplugin.h
index 4afb233..9ef7ea2 100644
--- a/tests/auto/qpluginloader/theplugin/theplugin.h
+++ b/tests/auto/qpluginloader/theplugin/theplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp
index e913cb5..99f0130 100644
--- a/tests/auto/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpoint/tst_qpoint.cpp b/tests/auto/qpoint/tst_qpoint.cpp
index fb4b67f..2b1c5d3 100644
--- a/tests/auto/qpoint/tst_qpoint.cpp
+++ b/tests/auto/qpoint/tst_qpoint.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpointer/tst_qpointer.cpp b/tests/auto/qpointer/tst_qpointer.cpp
index 5a07e41..e285d3a 100644
--- a/tests/auto/qpointer/tst_qpointer.cpp
+++ b/tests/auto/qpointer/tst_qpointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpolygon/tst_qpolygon.cpp b/tests/auto/qpolygon/tst_qpolygon.cpp
index eb7cbd5..4deb2a0 100644
--- a/tests/auto/qpolygon/tst_qpolygon.cpp
+++ b/tests/auto/qpolygon/tst_qpolygon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index e908961..97fb6d8 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
index c3fad6c..7e9dc94 100644
--- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
+++ b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/fileWriterProcess/main.cpp b/tests/auto/qprocess/fileWriterProcess/main.cpp
index 4724d8b..10ed980 100644
--- a/tests/auto/qprocess/fileWriterProcess/main.cpp
+++ b/tests/auto/qprocess/fileWriterProcess/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testDetached/main.cpp b/tests/auto/qprocess/testDetached/main.cpp
index 927e3f5..b8ab33d 100644
--- a/tests/auto/qprocess/testDetached/main.cpp
+++ b/tests/auto/qprocess/testDetached/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testExitCodes/main.cpp b/tests/auto/qprocess/testExitCodes/main.cpp
index f8f8dd1..c589caf 100644
--- a/tests/auto/qprocess/testExitCodes/main.cpp
+++ b/tests/auto/qprocess/testExitCodes/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testGuiProcess/main.cpp b/tests/auto/qprocess/testGuiProcess/main.cpp
index 708bbb5..cb10258 100644
--- a/tests/auto/qprocess/testGuiProcess/main.cpp
+++ b/tests/auto/qprocess/testGuiProcess/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessCrash/main.cpp b/tests/auto/qprocess/testProcessCrash/main.cpp
index 498a032..77db210 100644
--- a/tests/auto/qprocess/testProcessCrash/main.cpp
+++ b/tests/auto/qprocess/testProcessCrash/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp b/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp
index d0d6850..1794313 100644
--- a/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp
+++ b/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessEOF/main.cpp b/tests/auto/qprocess/testProcessEOF/main.cpp
index ff5efc0..1b0e405 100644
--- a/tests/auto/qprocess/testProcessEOF/main.cpp
+++ b/tests/auto/qprocess/testProcessEOF/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessEcho/main.cpp b/tests/auto/qprocess/testProcessEcho/main.cpp
index 9fd1410..df972b9 100644
--- a/tests/auto/qprocess/testProcessEcho/main.cpp
+++ b/tests/auto/qprocess/testProcessEcho/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessEcho2/main.cpp b/tests/auto/qprocess/testProcessEcho2/main.cpp
index cef7fbf..7fed1a0 100644
--- a/tests/auto/qprocess/testProcessEcho2/main.cpp
+++ b/tests/auto/qprocess/testProcessEcho2/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessEcho3/main.cpp b/tests/auto/qprocess/testProcessEcho3/main.cpp
index 74dfae5..6be90bb 100644
--- a/tests/auto/qprocess/testProcessEcho3/main.cpp
+++ b/tests/auto/qprocess/testProcessEcho3/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessEchoGui/main_win.cpp b/tests/auto/qprocess/testProcessEchoGui/main_win.cpp
index 6b31ea0..f4ce6db 100644
--- a/tests/auto/qprocess/testProcessEchoGui/main_win.cpp
+++ b/tests/auto/qprocess/testProcessEchoGui/main_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessEnvironment/main.cpp b/tests/auto/qprocess/testProcessEnvironment/main.cpp
index 96a9f63..99c5108 100644
--- a/tests/auto/qprocess/testProcessEnvironment/main.cpp
+++ b/tests/auto/qprocess/testProcessEnvironment/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessLoopback/main.cpp b/tests/auto/qprocess/testProcessLoopback/main.cpp
index ddbe780..cd9f7e6 100644
--- a/tests/auto/qprocess/testProcessLoopback/main.cpp
+++ b/tests/auto/qprocess/testProcessLoopback/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessNormal/main.cpp b/tests/auto/qprocess/testProcessNormal/main.cpp
index a6fec4d..3736c0f 100644
--- a/tests/auto/qprocess/testProcessNormal/main.cpp
+++ b/tests/auto/qprocess/testProcessNormal/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessOutput/main.cpp b/tests/auto/qprocess/testProcessOutput/main.cpp
index e2faaa3..d489eaa 100644
--- a/tests/auto/qprocess/testProcessOutput/main.cpp
+++ b/tests/auto/qprocess/testProcessOutput/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp
index ae5d3ae..fce9373 100644
--- a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp
+++ b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testSetWorkingDirectory/main.cpp b/tests/auto/qprocess/testSetWorkingDirectory/main.cpp
index 8e31092..bcc7099 100644
--- a/tests/auto/qprocess/testSetWorkingDirectory/main.cpp
+++ b/tests/auto/qprocess/testSetWorkingDirectory/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testSoftExit/main_unix.cpp b/tests/auto/qprocess/testSoftExit/main_unix.cpp
index e57ef7a..c2fb66e 100644
--- a/tests/auto/qprocess/testSoftExit/main_unix.cpp
+++ b/tests/auto/qprocess/testSoftExit/main_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testSoftExit/main_win.cpp b/tests/auto/qprocess/testSoftExit/main_win.cpp
index 459d19d..44c08d7 100644
--- a/tests/auto/qprocess/testSoftExit/main_win.cpp
+++ b/tests/auto/qprocess/testSoftExit/main_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/testSpaceInName/main.cpp b/tests/auto/qprocess/testSpaceInName/main.cpp
index 454e533..b936fb7 100644
--- a/tests/auto/qprocess/testSpaceInName/main.cpp
+++ b/tests/auto/qprocess/testSpaceInName/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index fd310f4..0be8483 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp
index c03943a..d745e05 100644
--- a/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp
+++ b/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp
index 7d94e3c..82cd0ef 100644
--- a/tests/auto/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/qprogressdialog/tst_qprogressdialog.cpp
index 46377be..8c5ebf3 100644
--- a/tests/auto/qprogressdialog/tst_qprogressdialog.cpp
+++ b/tests/auto/qprogressdialog/tst_qprogressdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
index ea527de..bd8d526 100644
--- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/qpushbutton/tst_qpushbutton.cpp
index 05886a8..9a3f109 100644
--- a/tests/auto/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/qpushbutton/tst_qpushbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qquaternion/tst_qquaternion.cpp b/tests/auto/qquaternion/tst_qquaternion.cpp
index ed5966f..e6fdf42 100644
--- a/tests/auto/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/qquaternion/tst_qquaternion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qqueue/tst_qqueue.cpp b/tests/auto/qqueue/tst_qqueue.cpp
index 74a29af..fa7bb28 100644
--- a/tests/auto/qqueue/tst_qqueue.cpp
+++ b/tests/auto/qqueue/tst_qqueue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qradiobutton/tst_qradiobutton.cpp b/tests/auto/qradiobutton/tst_qradiobutton.cpp
index c074496..17b2b15 100644
--- a/tests/auto/qradiobutton/tst_qradiobutton.cpp
+++ b/tests/auto/qradiobutton/tst_qradiobutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qrand/tst_qrand.cpp b/tests/auto/qrand/tst_qrand.cpp
index 68d60cf..0bd798d 100644
--- a/tests/auto/qrand/tst_qrand.cpp
+++ b/tests/auto/qrand/tst_qrand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qreadlocker/tst_qreadlocker.cpp b/tests/auto/qreadlocker/tst_qreadlocker.cpp
index 5984e85..3b188d2 100644
--- a/tests/auto/qreadlocker/tst_qreadlocker.cpp
+++ b/tests/auto/qreadlocker/tst_qreadlocker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp
index ebd6035..0f8044b 100644
--- a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qrect/tst_qrect.cpp b/tests/auto/qrect/tst_qrect.cpp
index f528232..c8069f1 100644
--- a/tests/auto/qrect/tst_qrect.cpp
+++ b/tests/auto/qrect/tst_qrect.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp
index d0d26ee..b69cb78 100644
--- a/tests/auto/qregexp/tst_qregexp.cpp
+++ b/tests/auto/qregexp/tst_qregexp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp b/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp
index 3c7f44d..25fde2b 100644
--- a/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp
+++ b/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/qregion/tst_qregion.cpp
index 1716c94..e51fa87 100644
--- a/tests/auto/qregion/tst_qregion.cpp
+++ b/tests/auto/qregion/tst_qregion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qresourceengine/tst_qresourceengine.cpp b/tests/auto/qresourceengine/tst_qresourceengine.cpp
index cfc3e3e..eed6143 100644
--- a/tests/auto/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/qresourceengine/tst_qresourceengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qringbuffer/tst_qringbuffer.cpp b/tests/auto/qringbuffer/tst_qringbuffer.cpp
index c815a04..9e88d79 100644
--- a/tests/auto/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/qringbuffer/tst_qringbuffer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp b/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp
index 309ff9d..d67d1c0 100644
--- a/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp
+++ b/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
index c17fff8..a895522 100644
--- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptable/tst_qscriptable.cpp b/tests/auto/qscriptable/tst_qscriptable.cpp
index 3c781b1..5edca44 100644
--- a/tests/auto/qscriptable/tst_qscriptable.cpp
+++ b/tests/auto/qscriptable/tst_qscriptable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp
index b4dbe73..65bcff5 100644
--- a/tests/auto/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index 617c183..6ea9fcc 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
index 8012809..9c22afc 100644
--- a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
+++ b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index f96aea6..97f3cb6 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index c30a636..982589c 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
index c5e4954..9436d14 100644
--- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
+++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
index 11813d8..60f2c4c 100644
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index a280256..4cb8541 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptstring/tst_qscriptstring.cpp b/tests/auto/qscriptstring/tst_qscriptstring.cpp
index ea4a92b..e1667c7 100644
--- a/tests/auto/qscriptstring/tst_qscriptstring.cpp
+++ b/tests/auto/qscriptstring/tst_qscriptstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index 5f9a578..56da09a 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/testgen/gen.py b/tests/auto/qscriptvalue/testgen/gen.py
index 6e48f46..92bcb68 100755
--- a/tests/auto/qscriptvalue/testgen/gen.py
+++ b/tests/auto/qscriptvalue/testgen/gen.py
@@ -4,11 +4,11 @@
 #Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -22,16 +22,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 
 from __future__ import with_statement
@@ -79,11 +79,11 @@ mainTempl = Template("""/*******************************************************
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -97,16 +97,16 @@ mainTempl = Template("""/*******************************************************
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/testgen/main.cpp b/tests/auto/qscriptvalue/testgen/main.cpp
index 0672635..159a125 100644
--- a/tests/auto/qscriptvalue/testgen/main.cpp
+++ b/tests/auto/qscriptvalue/testgen/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/testgen/testgenerator.cpp b/tests/auto/qscriptvalue/testgen/testgenerator.cpp
index a291110..b193570 100644
--- a/tests/auto/qscriptvalue/testgen/testgenerator.cpp
+++ b/tests/auto/qscriptvalue/testgen/testgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -116,11 +116,11 @@ static QString generateLicence()
             "** This file is part of the test suite of the Qt Toolkit.\n"
             "**\n"
             "** $QT_BEGIN_LICENSE:LGPL$\n"
-            "** No Commercial Usage\n"
-            "** This file contains pre-release code and may not be distributed.\n"
-            "** You may use this file in accordance with the terms and conditions\n"
-            "** contained in the Technology Preview License Agreement accompanying\n"
-            "** this package.\n"
+            "** Commercial Usage\n"
+            "** Licensees holding valid Qt Commercial licenses may use this file in\n"
+            "** accordance with the Qt Commercial License Agreement provided with the\n"
+            "** Software or, alternatively, in accordance with the terms contained in\n"
+            "** a written agreement between you and Nokia.\n"
             "**\n"
             "** GNU Lesser General Public License Usage\n"
             "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
@@ -134,16 +134,16 @@ static QString generateLicence()
             "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
             "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
             "**\n"
+            "** GNU General Public License Usage\n"
+            "** Alternatively, this file may be used under the terms of the GNU\n"
+            "** General Public License version 3.0 as published by the Free Software\n"
+            "** Foundation and appearing in the file LICENSE.GPL included in the\n"
+            "** packaging of this file.  Please review the following information to\n"
+            "** ensure the GNU General Public License version 3.0 requirements will be\n"
+            "** met: http://www.gnu.org/copyleft/gpl.html.\n"
+            "**\n"
             "** If you have questions regarding the use of this file, please contact\n"
             "** Nokia at qt-info@nokia.com.\n"
-            "**\n"
-            "**\n"
-            "**\n"
-            "**\n"
-            "**\n"
-            "**\n"
-            "**\n"
-            "**\n"
             "** $QT_END_LICENSE$\n"
             "**\n"
             "****************************************************************************/\n"
diff --git a/tests/auto/qscriptvalue/testgen/testgenerator.h b/tests/auto/qscriptvalue/testgen/testgenerator.h
index 1c61fc5..c9ce187 100644
--- a/tests/auto/qscriptvalue/testgen/testgenerator.h
+++ b/tests/auto/qscriptvalue/testgen/testgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 83a3388..a67cc2b 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h
index 8bfaa6a..15ce24f 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_cast.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_cast.cpp
index e651810..cba89c5 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_cast.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_cast.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp
index 6e1f8ee..009c29b 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_init.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_init.cpp
index a9eb2ca..5e441b1 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_init.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_init.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_isXXX.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_isXXX.cpp
index 106043b..60859e1 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_isXXX.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_isXXX.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_toXXX.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_toXXX.cpp
index 754f4e0..baa362f 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue_generated_toXXX.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue_generated_toXXX.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp b/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
index 55773f0..0c0beb2 100644
--- a/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
+++ b/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscrollarea/tst_qscrollarea.cpp b/tests/auto/qscrollarea/tst_qscrollarea.cpp
index f19b62a..ab8cc9f 100644
--- a/tests/auto/qscrollarea/tst_qscrollarea.cpp
+++ b/tests/auto/qscrollarea/tst_qscrollarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qscrollbar/tst_qscrollbar.cpp b/tests/auto/qscrollbar/tst_qscrollbar.cpp
index 16d5b42..d7aad8e 100644
--- a/tests/auto/qscrollbar/tst_qscrollbar.cpp
+++ b/tests/auto/qscrollbar/tst_qscrollbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsemaphore/tst_qsemaphore.cpp b/tests/auto/qsemaphore/tst_qsemaphore.cpp
index 7cede30..1b43233 100644
--- a/tests/auto/qsemaphore/tst_qsemaphore.cpp
+++ b/tests/auto/qsemaphore/tst_qsemaphore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
index e16be8b..c933611 100644
--- a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
+++ b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qset/tst_qset.cpp b/tests/auto/qset/tst_qset.cpp
index 319cdf4..e4d3027 100644
--- a/tests/auto/qset/tst_qset.cpp
+++ b/tests/auto/qset/tst_qset.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp
index 0395eff..25272c8 100644
--- a/tests/auto/qsettings/tst_qsettings.cpp
+++ b/tests/auto/qsettings/tst_qsettings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index e685cd3..6808cb6 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h
index 1170cd5..ce7e129 100644
--- a/tests/auto/qsharedpointer/externaltests.h
+++ b/tests/auto/qsharedpointer/externaltests.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/forwarddeclaration.cpp b/tests/auto/qsharedpointer/forwarddeclaration.cpp
index eb76ca8..9267c50 100644
--- a/tests/auto/qsharedpointer/forwarddeclaration.cpp
+++ b/tests/auto/qsharedpointer/forwarddeclaration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/forwarddeclared.cpp b/tests/auto/qsharedpointer/forwarddeclared.cpp
index 42d1b5b..1c27c52 100644
--- a/tests/auto/qsharedpointer/forwarddeclared.cpp
+++ b/tests/auto/qsharedpointer/forwarddeclared.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/forwarddeclared.h b/tests/auto/qsharedpointer/forwarddeclared.h
index aa2219a..b0c6a5e 100644
--- a/tests/auto/qsharedpointer/forwarddeclared.h
+++ b/tests/auto/qsharedpointer/forwarddeclared.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 6b4904f..18a5df7 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/wrapper.cpp b/tests/auto/qsharedpointer/wrapper.cpp
index a5bd274..63e85ea 100644
--- a/tests/auto/qsharedpointer/wrapper.cpp
+++ b/tests/auto/qsharedpointer/wrapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer/wrapper.h b/tests/auto/qsharedpointer/wrapper.h
index a4f9f98..aab973b 100644
--- a/tests/auto/qsharedpointer/wrapper.h
+++ b/tests/auto/qsharedpointer/wrapper.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
index 57e159d..624acdb 100644
--- a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
+++ b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/qshortcut/tst_qshortcut.cpp
index 6df4cc4..5ba150a 100644
--- a/tests/auto/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/qshortcut/tst_qshortcut.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/qsidebar/tst_qsidebar.cpp
index 03af817..a7dca52 100644
--- a/tests/auto/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/qsidebar/tst_qsidebar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/qsignalmapper/tst_qsignalmapper.cpp
index 7852c1d..4c5d5c2 100644
--- a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp
+++ b/tests/auto/qsignalmapper/tst_qsignalmapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsignalspy/tst_qsignalspy.cpp b/tests/auto/qsignalspy/tst_qsignalspy.cpp
index cad4d54..3c97bce 100644
--- a/tests/auto/qsignalspy/tst_qsignalspy.cpp
+++ b/tests/auto/qsignalspy/tst_qsignalspy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h b/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
index 6cac598..c14f459 100644
--- a/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
+++ b/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
index 07f3939..4811955 100644
--- a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
+++ b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsize/tst_qsize.cpp b/tests/auto/qsize/tst_qsize.cpp
index 174ece2..a2561f8 100644
--- a/tests/auto/qsize/tst_qsize.cpp
+++ b/tests/auto/qsize/tst_qsize.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsizef/tst_qsizef.cpp b/tests/auto/qsizef/tst_qsizef.cpp
index ae86925..92ea87d 100644
--- a/tests/auto/qsizef/tst_qsizef.cpp
+++ b/tests/auto/qsizef/tst_qsizef.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsizegrip/tst_qsizegrip.cpp b/tests/auto/qsizegrip/tst_qsizegrip.cpp
index ad23e09..7c7b861 100644
--- a/tests/auto/qsizegrip/tst_qsizegrip.cpp
+++ b/tests/auto/qsizegrip/tst_qsizegrip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qslider/tst_qslider.cpp b/tests/auto/qslider/tst_qslider.cpp
index f39ce31..1429d34 100644
--- a/tests/auto/qslider/tst_qslider.cpp
+++ b/tests/auto/qslider/tst_qslider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
index 9aa19e5..6803b48 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 8f0cbc3..8314ee9 100644
--- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsoftkeymanager/tst_qsoftkeymanager.cpp b/tests/auto/qsoftkeymanager/tst_qsoftkeymanager.cpp
index 609e62f..9d824dc 100644
--- a/tests/auto/qsoftkeymanager/tst_qsoftkeymanager.cpp
+++ b/tests/auto/qsoftkeymanager/tst_qsoftkeymanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 66caf4a..3490754 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsound/tst_qsound.cpp b/tests/auto/qsound/tst_qsound.cpp
index eda99a1..4900e35 100644
--- a/tests/auto/qsound/tst_qsound.cpp
+++ b/tests/auto/qsound/tst_qsound.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
index 6729a3e..8d46820 100644
--- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
+++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/qspinbox/tst_qspinbox.cpp
index 2c4a3a3..0086bfe 100644
--- a/tests/auto/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/qspinbox/tst_qspinbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp
index e7b5dc7..92ba063 100644
--- a/tests/auto/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/qsplitter/tst_qsplitter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/qsql/tst_qsql.cpp
index e44a7d1..18e705f 100644
--- a/tests/auto/qsql/tst_qsql.cpp
+++ b/tests/auto/qsql/tst_qsql.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h
index 5837719..46219c7 100644
--- a/tests/auto/qsqldatabase/tst_databases.h
+++ b/tests/auto/qsqldatabase/tst_databases.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index b2b592b..ef61948 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/qsqldriver/tst_qsqldriver.cpp
index f2393ba..c009acc 100644
--- a/tests/auto/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/qsqldriver/tst_qsqldriver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqlerror/tst_qsqlerror.cpp b/tests/auto/qsqlerror/tst_qsqlerror.cpp
index 8fadac2..37e7f86 100644
--- a/tests/auto/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/qsqlerror/tst_qsqlerror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqlfield/tst_qsqlfield.cpp b/tests/auto/qsqlfield/tst_qsqlfield.cpp
index 6a1cd59..2b4d2a4 100644
--- a/tests/auto/qsqlfield/tst_qsqlfield.cpp
+++ b/tests/auto/qsqlfield/tst_qsqlfield.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index c7a61a5..ab1da0a 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp
index b64d599..3f04d42 100644
--- a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp
index f51736f..cb00196 100644
--- a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp
+++ b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index c4bd540..735cd1d 100644
--- a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
index 38e5387..39c3d64 100644
--- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsqlthread/tst_qsqlthread.cpp b/tests/auto/qsqlthread/tst_qsqlthread.cpp
index 791f804..54e09f5 100644
--- a/tests/auto/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/qsqlthread/tst_qsqlthread.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsslcertificate/certificates/gencertificates.sh b/tests/auto/qsslcertificate/certificates/gencertificates.sh
index 0e66d7b..dab94b0 100755
--- a/tests/auto/qsslcertificate/certificates/gencertificates.sh
+++ b/tests/auto/qsslcertificate/certificates/gencertificates.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index 963bf11..2cc4ebb 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsslcipher/tst_qsslcipher.cpp b/tests/auto/qsslcipher/tst_qsslcipher.cpp
index 07874b5..1707d07 100644
--- a/tests/auto/qsslcipher/tst_qsslcipher.cpp
+++ b/tests/auto/qsslcipher/tst_qsslcipher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsslerror/tst_qsslerror.cpp b/tests/auto/qsslerror/tst_qsslerror.cpp
index 2bf01a6..18cdf44 100644
--- a/tests/auto/qsslerror/tst_qsslerror.cpp
+++ b/tests/auto/qsslerror/tst_qsslerror.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsslkey/keys/genkeys.sh b/tests/auto/qsslkey/keys/genkeys.sh
index 08da2d4..59c403f 100755
--- a/tests/auto/qsslkey/keys/genkeys.sh
+++ b/tests/auto/qsslkey/keys/genkeys.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/qsslkey/tst_qsslkey.cpp b/tests/auto/qsslkey/tst_qsslkey.cpp
index 0e39919..07468d3 100644
--- a/tests/auto/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/qsslkey/tst_qsslkey.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index d6a7a01..71aa38c 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/qstackedlayout/tst_qstackedlayout.cpp
index d0ad749..a1ab427 100644
--- a/tests/auto/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/qstackedlayout/tst_qstackedlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/qstackedwidget/tst_qstackedwidget.cpp
index 011cbb1..fb7d3c9 100644
--- a/tests/auto/qstackedwidget/tst_qstackedwidget.cpp
+++ b/tests/auto/qstackedwidget/tst_qstackedwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstandarditem/tst_qstandarditem.cpp b/tests/auto/qstandarditem/tst_qstandarditem.cpp
index e125df7..45c790b 100644
--- a/tests/auto/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/qstandarditem/tst_qstandarditem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 4e67740..c907fd9 100644
--- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstate/tst_qstate.cpp b/tests/auto/qstate/tst_qstate.cpp
index 0d39c72..9f6b992 100644
--- a/tests/auto/qstate/tst_qstate.cpp
+++ b/tests/auto/qstate/tst_qstate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index 2bf76e7..219685e 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp
index 68c3ea9..55e8d8b 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/qstatictext/tst_qstatictext.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstatusbar/tst_qstatusbar.cpp b/tests/auto/qstatusbar/tst_qstatusbar.cpp
index 58d3527..32d6458 100644
--- a/tests/auto/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/qstatusbar/tst_qstatusbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstl/tst_qstl.cpp b/tests/auto/qstl/tst_qstl.cpp
index e551ee7..16ecb27 100644
--- a/tests/auto/qstl/tst_qstl.cpp
+++ b/tests/auto/qstl/tst_qstl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstring/double_data.h b/tests/auto/qstring/double_data.h
index 2370bfc..12be06e 100644
--- a/tests/auto/qstring/double_data.h
+++ b/tests/auto/qstring/double_data.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp
index ef82769..d21015d 100644
--- a/tests/auto/qstring/tst_qstring.cpp
+++ b/tests/auto/qstring/tst_qstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringbuilder1/stringbuilder.cpp b/tests/auto/qstringbuilder1/stringbuilder.cpp
index e9ae7a6..8efe357 100644
--- a/tests/auto/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/qstringbuilder1/stringbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp
index 5c2cb72..a38238c 100644
--- a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp
+++ b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp
index ca6da66..13348c1 100644
--- a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp
+++ b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp
index 747b9b8..047b76a 100644
--- a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp
+++ b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp
index 2fde39d..f282277 100644
--- a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp
+++ b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringlist/tst_qstringlist.cpp b/tests/auto/qstringlist/tst_qstringlist.cpp
index 210903c..fd8868d 100644
--- a/tests/auto/qstringlist/tst_qstringlist.cpp
+++ b/tests/auto/qstringlist/tst_qstringlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringlistmodel/qmodellistener.h b/tests/auto/qstringlistmodel/qmodellistener.h
index 093cb6f..f879c69 100644
--- a/tests/auto/qstringlistmodel/qmodellistener.h
+++ b/tests/auto/qstringlistmodel/qmodellistener.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp
index fdcd637..fd3137c 100644
--- a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstringmatcher/tst_qstringmatcher.cpp b/tests/auto/qstringmatcher/tst_qstringmatcher.cpp
index 630a829..4b2e4b6 100644
--- a/tests/auto/qstringmatcher/tst_qstringmatcher.cpp
+++ b/tests/auto/qstringmatcher/tst_qstringmatcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index a76c82d..46ed3f0 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstyleoption/tst_qstyleoption.cpp b/tests/auto/qstyleoption/tst_qstyleoption.cpp
index c11c8d7..41f25cc 100644
--- a/tests/auto/qstyleoption/tst_qstyleoption.cpp
+++ b/tests/auto/qstyleoption/tst_qstyleoption.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 04b1e79..7f5aa41 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp
index 9adac67..b2b4661 100644
--- a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp
+++ b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index 393bc2a..fc049a5 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
index 02e2921..845e468 100644
--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index 026bd69..a328f43 100644
--- a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp
index b1ec0ff..af64f90 100644
--- a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp
+++ b/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/qtabbar/tst_qtabbar.cpp
index ac3de20..f03c2cb 100644
--- a/tests/auto/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/qtabbar/tst_qtabbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 3e5d077..4809fe8 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtablewidget/tst_qtablewidget.cpp b/tests/auto/qtablewidget/tst_qtablewidget.cpp
index 35840d3..2d91fcf 100644
--- a/tests/auto/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/qtablewidget/tst_qtablewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp
index 504579f..960fa02 100644
--- a/tests/auto/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index d547c0b..4b03b62 100644
--- a/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index 4f7822d..3c59ca1 100644
--- a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtconcurrentmap/functions.h b/tests/auto/qtconcurrentmap/functions.h
index 3f55c77..4630ae9 100644
--- a/tests/auto/qtconcurrentmap/functions.h
+++ b/tests/auto/qtconcurrentmap/functions.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp
index 894bac4..b2ef020 100644
--- a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 8fdc50c..c9a0fb3 100644
--- a/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
index 23fd19b..32aaa8d 100644
--- a/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtcpserver/crashingServer/main.cpp b/tests/auto/qtcpserver/crashingServer/main.cpp
index b4a7b71..cbb25b9 100644
--- a/tests/auto/qtcpserver/crashingServer/main.cpp
+++ b/tests/auto/qtcpserver/crashingServer/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/qtcpserver/tst_qtcpserver.cpp
index b2151b9..aff744d 100644
--- a/tests/auto/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/qtcpserver/tst_qtcpserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtcpsocket/stressTest/Test.cpp b/tests/auto/qtcpsocket/stressTest/Test.cpp
index 9760df2..1791203 100644
--- a/tests/auto/qtcpsocket/stressTest/Test.cpp
+++ b/tests/auto/qtcpsocket/stressTest/Test.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtcpsocket/stressTest/Test.h b/tests/auto/qtcpsocket/stressTest/Test.h
index 7ac777d..df7a564 100644
--- a/tests/auto/qtcpsocket/stressTest/Test.h
+++ b/tests/auto/qtcpsocket/stressTest/Test.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtcpsocket/stressTest/main.cpp b/tests/auto/qtcpsocket/stressTest/main.cpp
index b1d488a..c5ce928 100644
--- a/tests/auto/qtcpsocket/stressTest/main.cpp
+++ b/tests/auto/qtcpsocket/stressTest/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index e3b2ca5..7eee6f3 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
index 1304f4e..85e089a 100644
--- a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/XrenderFake.h b/tests/auto/qtessellator/XrenderFake.h
index a2aa5b0..cc50f86 100644
--- a/tests/auto/qtessellator/XrenderFake.h
+++ b/tests/auto/qtessellator/XrenderFake.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/arc.cpp b/tests/auto/qtessellator/arc.cpp
index 3b6dcfc..3565022 100644
--- a/tests/auto/qtessellator/arc.cpp
+++ b/tests/auto/qtessellator/arc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/arc.h b/tests/auto/qtessellator/arc.h
index 7589001..e7f06e5 100644
--- a/tests/auto/qtessellator/arc.h
+++ b/tests/auto/qtessellator/arc.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/dataparser.cpp b/tests/auto/qtessellator/dataparser.cpp
index 0ab961d..f07f741 100644
--- a/tests/auto/qtessellator/dataparser.cpp
+++ b/tests/auto/qtessellator/dataparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/dataparser.h b/tests/auto/qtessellator/dataparser.h
index 8808ed9..2b12fba 100644
--- a/tests/auto/qtessellator/dataparser.h
+++ b/tests/auto/qtessellator/dataparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/oldtessellator.cpp b/tests/auto/qtessellator/oldtessellator.cpp
index 7c3977d..5453723 100644
--- a/tests/auto/qtessellator/oldtessellator.cpp
+++ b/tests/auto/qtessellator/oldtessellator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/oldtessellator.h b/tests/auto/qtessellator/oldtessellator.h
index fb71eac..1896b19 100644
--- a/tests/auto/qtessellator/oldtessellator.h
+++ b/tests/auto/qtessellator/oldtessellator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/qnum.h b/tests/auto/qtessellator/qnum.h
index 3473a61..b39924e 100644
--- a/tests/auto/qtessellator/qnum.h
+++ b/tests/auto/qtessellator/qnum.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/sample_data.h b/tests/auto/qtessellator/sample_data.h
index 0387102..c6a430a 100644
--- a/tests/auto/qtessellator/sample_data.h
+++ b/tests/auto/qtessellator/sample_data.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/simple.cpp b/tests/auto/qtessellator/simple.cpp
index 68d32a5..89de044 100644
--- a/tests/auto/qtessellator/simple.cpp
+++ b/tests/auto/qtessellator/simple.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/simple.h b/tests/auto/qtessellator/simple.h
index da6a52b..da7f5d1 100644
--- a/tests/auto/qtessellator/simple.h
+++ b/tests/auto/qtessellator/simple.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/testtessellator.cpp b/tests/auto/qtessellator/testtessellator.cpp
index 4f4a37a..67ea88e 100644
--- a/tests/auto/qtessellator/testtessellator.cpp
+++ b/tests/auto/qtessellator/testtessellator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/testtessellator.h b/tests/auto/qtessellator/testtessellator.h
index 0714a44..ce44854 100644
--- a/tests/auto/qtessellator/testtessellator.h
+++ b/tests/auto/qtessellator/testtessellator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/tst_tessellator.cpp b/tests/auto/qtessellator/tst_tessellator.cpp
index 7cc4c3d..5114aff 100644
--- a/tests/auto/qtessellator/tst_tessellator.cpp
+++ b/tests/auto/qtessellator/tst_tessellator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/utils.cpp b/tests/auto/qtessellator/utils.cpp
index c10b896..dc27dd2 100644
--- a/tests/auto/qtessellator/utils.cpp
+++ b/tests/auto/qtessellator/utils.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtessellator/utils.h b/tests/auto/qtessellator/utils.h
index 935b1b4..c502061 100644
--- a/tests/auto/qtessellator/utils.h
+++ b/tests/auto/qtessellator/utils.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextblock/tst_qtextblock.cpp b/tests/auto/qtextblock/tst_qtextblock.cpp
index a93c68f..e996e97 100644
--- a/tests/auto/qtextblock/tst_qtextblock.cpp
+++ b/tests/auto/qtextblock/tst_qtextblock.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index a562fbe..07a5b74 100644
--- a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/qtextbrowser/tst_qtextbrowser.cpp
index 7fcdb42..362966b 100644
--- a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/qtextbrowser/tst_qtextbrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextcodec/echo/main.cpp b/tests/auto/qtextcodec/echo/main.cpp
index dfba118..1f101ab 100644
--- a/tests/auto/qtextcodec/echo/main.cpp
+++ b/tests/auto/qtextcodec/echo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index cc41591..ebd67ce 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/qtextcursor/tst_qtextcursor.cpp
index 41835bb..18f8c50 100644
--- a/tests/auto/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/qtextcursor/tst_qtextcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextdocument/common.h b/tests/auto/qtextdocument/common.h
index 45161c1..9c0d702 100644
--- a/tests/auto/qtextdocument/common.h
+++ b/tests/auto/qtextdocument/common.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp
index 808299b..0ad3caf 100644
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 694e624..e21ed22 100644
--- a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
index 6a93b58..ba10e3b 100644
--- a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
+++ b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 101baa5..54b6fc2 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextformat/tst_qtextformat.cpp b/tests/auto/qtextformat/tst_qtextformat.cpp
index 9b71481..58feaf6 100644
--- a/tests/auto/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/qtextformat/tst_qtextformat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp
index 659ba1a..b80f200 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextlist/tst_qtextlist.cpp b/tests/auto/qtextlist/tst_qtextlist.cpp
index 3e92836..976280c 100644
--- a/tests/auto/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/qtextlist/tst_qtextlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextobject/tst_qtextobject.cpp b/tests/auto/qtextobject/tst_qtextobject.cpp
index 78ecfaf..465fb26 100644
--- a/tests/auto/qtextobject/tst_qtextobject.cpp
+++ b/tests/auto/qtextobject/tst_qtextobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
index a463d86..11e31b0 100644
--- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
index 2097dd6..4a1b56f 100644
--- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextscriptengine/generate/main.cpp b/tests/auto/qtextscriptengine/generate/main.cpp
index 0b764f2..5f36025 100644
--- a/tests/auto/qtextscriptengine/generate/main.cpp
+++ b/tests/auto/qtextscriptengine/generate/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
index 0a7458f..e5043b0 100644
--- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextstream/readAllStdinProcess/main.cpp b/tests/auto/qtextstream/readAllStdinProcess/main.cpp
index a27f955..8eb45dc 100644
--- a/tests/auto/qtextstream/readAllStdinProcess/main.cpp
+++ b/tests/auto/qtextstream/readAllStdinProcess/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextstream/readLineStdinProcess/main.cpp b/tests/auto/qtextstream/readLineStdinProcess/main.cpp
index 555b3c4..625aa67 100644
--- a/tests/auto/qtextstream/readLineStdinProcess/main.cpp
+++ b/tests/auto/qtextstream/readLineStdinProcess/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextstream/stdinProcess/main.cpp b/tests/auto/qtextstream/stdinProcess/main.cpp
index a9c5d97..b227c7f 100644
--- a/tests/auto/qtextstream/stdinProcess/main.cpp
+++ b/tests/auto/qtextstream/stdinProcess/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp
index 4c78ef0..d9ee460 100644
--- a/tests/auto/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtexttable/tst_qtexttable.cpp b/tests/auto/qtexttable/tst_qtexttable.cpp
index a811b85..1b415db 100644
--- a/tests/auto/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/qtexttable/tst_qtexttable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp
index 7a5b053..151479e 100644
--- a/tests/auto/qthread/tst_qthread.cpp
+++ b/tests/auto/qthread/tst_qthread.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qthreadonce/qthreadonce.cpp b/tests/auto/qthreadonce/qthreadonce.cpp
index caeb9c7..d342d5a 100644
--- a/tests/auto/qthreadonce/qthreadonce.cpp
+++ b/tests/auto/qthreadonce/qthreadonce.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qthreadonce/qthreadonce.h b/tests/auto/qthreadonce/qthreadonce.h
index 8175558..94b2436 100644
--- a/tests/auto/qthreadonce/qthreadonce.h
+++ b/tests/auto/qthreadonce/qthreadonce.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qthreadonce/tst_qthreadonce.cpp b/tests/auto/qthreadonce/tst_qthreadonce.cpp
index cf618b3..7cd6471 100644
--- a/tests/auto/qthreadonce/tst_qthreadonce.cpp
+++ b/tests/auto/qthreadonce/tst_qthreadonce.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qthreadpool/tst_qthreadpool.cpp b/tests/auto/qthreadpool/tst_qthreadpool.cpp
index 7c8b410..a23ae25 100644
--- a/tests/auto/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/qthreadpool/tst_qthreadpool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
index d8b404f..0e5db90 100644
--- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtime/tst_qtime.cpp b/tests/auto/qtime/tst_qtime.cpp
index ea245e3..ddb8075 100644
--- a/tests/auto/qtime/tst_qtime.cpp
+++ b/tests/auto/qtime/tst_qtime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtimeline/tst_qtimeline.cpp b/tests/auto/qtimeline/tst_qtimeline.cpp
index 47d0550..2b61f1e 100644
--- a/tests/auto/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/qtimeline/tst_qtimeline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index f23d065..74319f7 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/lackey/main.cpp b/tests/auto/qtipc/lackey/main.cpp
index fef8d22..1dfde2b 100644
--- a/tests/auto/qtipc/lackey/main.cpp
+++ b/tests/auto/qtipc/lackey/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
index ea906b7..ec246a1 100644
--- a/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
+++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
index 4ead748..b2c6c05 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
index 7cd6b89..aceffc4 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
index 7995a91..8575b01 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
index 525aa78..36efb68 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
index ac97100..b47dee1 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index 1f65ae7..6312500 100644
--- a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
index cb3bb6b..e47bfc4 100644
--- a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtmd5/tst_qtmd5.cpp b/tests/auto/qtmd5/tst_qtmd5.cpp
index ad518c6..cd03c05 100644
--- a/tests/auto/qtmd5/tst_qtmd5.cpp
+++ b/tests/auto/qtmd5/tst_qtmd5.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/generateTokenizers.sh b/tests/auto/qtokenautomaton/generateTokenizers.sh
index 5e6f9e5..e3b099c 100755
--- a/tests/auto/qtokenautomaton/generateTokenizers.sh
+++ b/tests/auto/qtokenautomaton/generateTokenizers.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp b/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp
index 15e2af1..324f3ab 100644
--- a/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp
+++ b/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/basic/basic.h b/tests/auto/qtokenautomaton/tokenizers/basic/basic.h
index 9a7529b..104553a 100644
--- a/tests/auto/qtokenautomaton/tokenizers/basic/basic.h
+++ b/tests/auto/qtokenautomaton/tokenizers/basic/basic.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
index 5bbe5a3..d4efbb3 100644
--- a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
+++ b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
index bc4ec94..792ab4b 100644
--- a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
+++ b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
index 56568d9..e3a8df5 100644
--- a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
+++ b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
index 7daded2..4fd226c 100644
--- a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
+++ b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
index 40c406a..ebe19a7 100644
--- a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
+++ b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
@@ -30,11 +30,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -48,16 +48,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
index cd161e4..90d6dd1 100644
--- a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
+++ b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
index 423d44d..65b4f36 100644
--- a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
+++ b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp
index e2ed5d4..d4a6e18 100644
--- a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp
+++ b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h
index 03f93c7..63cab63 100644
--- a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h
+++ b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
index 6e43566..3594790 100644
--- a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
+++ b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
index 4a655b8..59c327a 100644
--- a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
+++ b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp b/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp
index 4bfd322..f129bd0 100644
--- a/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp
+++ b/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtoolbar/tst_qtoolbar.cpp b/tests/auto/qtoolbar/tst_qtoolbar.cpp
index 07e81c1..e1e9f5c 100644
--- a/tests/auto/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/qtoolbar/tst_qtoolbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtoolbox/tst_qtoolbox.cpp b/tests/auto/qtoolbox/tst_qtoolbox.cpp
index fb20f51..e80ca8d 100644
--- a/tests/auto/qtoolbox/tst_qtoolbox.cpp
+++ b/tests/auto/qtoolbox/tst_qtoolbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
index 4b5880c..7eaefe9 100644
--- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtooltip/tst_qtooltip.cpp b/tests/auto/qtooltip/tst_qtooltip.cpp
index 1cbb997..ea65e99 100644
--- a/tests/auto/qtooltip/tst_qtooltip.cpp
+++ b/tests/auto/qtooltip/tst_qtooltip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/qtouchevent/tst_qtouchevent.cpp
index 4219ef4..e1c71d1 100644
--- a/tests/auto/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the $MODULE$ of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtransform/tst_qtransform.cpp b/tests/auto/qtransform/tst_qtransform.cpp
index c784b3a..14ec8a5 100644
--- a/tests/auto/qtransform/tst_qtransform.cpp
+++ b/tests/auto/qtransform/tst_qtransform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp b/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp
index 8eea0e0..dccc126 100644
--- a/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp
+++ b/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtranslator/tst_qtranslator.cpp b/tests/auto/qtranslator/tst_qtranslator.cpp
index f2bfbf0..b8ac30c9 100644
--- a/tests/auto/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/qtranslator/tst_qtranslator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index c7b53e9..80047ca 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp
index 1e37384..0d6df5b 100644
--- a/tests/auto/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
index 5ac97c7..55dade7 100644
--- a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
+++ b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtwidgets/mainwindow.cpp b/tests/auto/qtwidgets/mainwindow.cpp
index 341c416..cf0e116 100644
--- a/tests/auto/qtwidgets/mainwindow.cpp
+++ b/tests/auto/qtwidgets/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtwidgets/mainwindow.h b/tests/auto/qtwidgets/mainwindow.h
index 8a4521a..f863530 100644
--- a/tests/auto/qtwidgets/mainwindow.h
+++ b/tests/auto/qtwidgets/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qtwidgets/tst_qtwidgets.cpp b/tests/auto/qtwidgets/tst_qtwidgets.cpp
index 501402b..0299afd 100644
--- a/tests/auto/qtwidgets/tst_qtwidgets.cpp
+++ b/tests/auto/qtwidgets/tst_qtwidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qudpsocket/clientserver/main.cpp b/tests/auto/qudpsocket/clientserver/main.cpp
index fc25245..d47b3be 100644
--- a/tests/auto/qudpsocket/clientserver/main.cpp
+++ b/tests/auto/qudpsocket/clientserver/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp
index abed55c..03131e8 100644
--- a/tests/auto/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qudpsocket/udpServer/main.cpp b/tests/auto/qudpsocket/udpServer/main.cpp
index 1b3d40a..24ba510 100644
--- a/tests/auto/qudpsocket/udpServer/main.cpp
+++ b/tests/auto/qudpsocket/udpServer/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qundogroup/tst_qundogroup.cpp b/tests/auto/qundogroup/tst_qundogroup.cpp
index 1e4c0f3..dd31184 100644
--- a/tests/auto/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/qundogroup/tst_qundogroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qundostack/tst_qundostack.cpp b/tests/auto/qundostack/tst_qundostack.cpp
index cc08850..9aa1d76 100644
--- a/tests/auto/qundostack/tst_qundostack.cpp
+++ b/tests/auto/qundostack/tst_qundostack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qurl/idna-test.c b/tests/auto/qurl/idna-test.c
index 12ab99d..58b94f2 100644
--- a/tests/auto/qurl/idna-test.c
+++ b/tests/auto/qurl/idna-test.c
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 63f9721..9d3e223 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/quuid/testProcessUniqueness/main.cpp b/tests/auto/quuid/testProcessUniqueness/main.cpp
index 4d33c84..e471a24 100644
--- a/tests/auto/quuid/testProcessUniqueness/main.cpp
+++ b/tests/auto/quuid/testProcessUniqueness/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/quuid/tst_quuid.cpp b/tests/auto/quuid/tst_quuid.cpp
index 409d8cf..2e089ef 100644
--- a/tests/auto/quuid/tst_quuid.cpp
+++ b/tests/auto/quuid/tst_quuid.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 98d7436..68d94d4 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
index 26da506..2b982d0 100644
--- a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qvector/tst_qvector.cpp b/tests/auto/qvector/tst_qvector.cpp
index 2bc8d15..25967ca 100644
--- a/tests/auto/qvector/tst_qvector.cpp
+++ b/tests/auto/qvector/tst_qvector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qvectornd/tst_qvectornd.cpp b/tests/auto/qvectornd/tst_qvectornd.cpp
index 2850f32..9e679c5 100644
--- a/tests/auto/qvectornd/tst_qvectornd.cpp
+++ b/tests/auto/qvectornd/tst_qvectornd.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qvideoframe/tst_qvideoframe.cpp b/tests/auto/qvideoframe/tst_qvideoframe.cpp
index 3176af0..2a53636 100644
--- a/tests/auto/qvideoframe/tst_qvideoframe.cpp
+++ b/tests/auto/qvideoframe/tst_qvideoframe.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
index a4bfb89..5ac58b4 100644
--- a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
+++ b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
index 5391591..3db284b 100644
--- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwebelement/dummy.cpp b/tests/auto/qwebelement/dummy.cpp
index d2bfffe..25d6859 100644
--- a/tests/auto/qwebelement/dummy.cpp
+++ b/tests/auto/qwebelement/dummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwebframe/dummy.cpp b/tests/auto/qwebframe/dummy.cpp
index d2bfffe..25d6859 100644
--- a/tests/auto/qwebframe/dummy.cpp
+++ b/tests/auto/qwebframe/dummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwebhistory/dummy.cpp b/tests/auto/qwebhistory/dummy.cpp
index d2bfffe..25d6859 100644
--- a/tests/auto/qwebhistory/dummy.cpp
+++ b/tests/auto/qwebhistory/dummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwebhistoryinterface/dummy.cpp b/tests/auto/qwebhistoryinterface/dummy.cpp
index d2bfffe..25d6859 100644
--- a/tests/auto/qwebhistoryinterface/dummy.cpp
+++ b/tests/auto/qwebhistoryinterface/dummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwebpage/dummy.cpp b/tests/auto/qwebpage/dummy.cpp
index d2bfffe..25d6859 100644
--- a/tests/auto/qwebpage/dummy.cpp
+++ b/tests/auto/qwebpage/dummy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 098ce3c..02d512f 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.h b/tests/auto/qwidget/tst_qwidget_mac_helpers.h
index f310aef..68eb70a 100644
--- a/tests/auto/qwidget/tst_qwidget_mac_helpers.h
+++ b/tests/auto/qwidget/tst_qwidget_mac_helpers.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm b/tests/auto/qwidget/tst_qwidget_mac_helpers.mm
index 0572a4c..bde6eac 100644
--- a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm
+++ b/tests/auto/qwidget/tst_qwidget_mac_helpers.mm
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwidget_window/tst_qwidget_window.cpp b/tests/auto/qwidget_window/tst_qwidget_window.cpp
index 20df113..e04107f 100644
--- a/tests/auto/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/qwidget_window/tst_qwidget_window.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
index efe4838..b9f1fd8 100644
--- a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index 7dde402..96da822 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp
index a0d3d07..a0f6143 100644
--- a/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp
+++ b/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/qwizard/tst_qwizard.cpp
index f797227..291cf63 100644
--- a/tests/auto/qwizard/tst_qwizard.cpp
+++ b/tests/auto/qwizard/tst_qwizard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwmatrix/tst_qwmatrix.cpp b/tests/auto/qwmatrix/tst_qwmatrix.cpp
index 6fce79c..e00277b 100644
--- a/tests/auto/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/qwmatrix/tst_qwmatrix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/qworkspace/tst_qworkspace.cpp
index 4cf76b5..8775f72 100644
--- a/tests/auto/qworkspace/tst_qworkspace.cpp
+++ b/tests/auto/qworkspace/tst_qworkspace.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwritelocker/tst_qwritelocker.cpp b/tests/auto/qwritelocker/tst_qwritelocker.cpp
index 2dad004..5b35250 100644
--- a/tests/auto/qwritelocker/tst_qwritelocker.cpp
+++ b/tests/auto/qwritelocker/tst_qwritelocker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp b/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp
index 8876aca..5b7af10 100644
--- a/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp
+++ b/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp b/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp
index e68461d..a0fdae6 100644
--- a/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp
+++ b/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp
index c3f72c4..2ba99a9 100644
--- a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp
+++ b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp
index 01fd169..d6a1dbd 100644
--- a/tests/auto/qx11info/tst_qx11info.cpp
+++ b/tests/auto/qx11info/tst_qx11info.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxml/tst_qxml.cpp b/tests/auto/qxml/tst_qxml.cpp
index 53874ba..619d310 100644
--- a/tests/auto/qxml/tst_qxml.cpp
+++ b/tests/auto/qxml/tst_qxml.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlformatter/tst_qxmlformatter.cpp b/tests/auto/qxmlformatter/tst_qxmlformatter.cpp
index 37cdbae..e09356f 100644
--- a/tests/auto/qxmlformatter/tst_qxmlformatter.cpp
+++ b/tests/auto/qxmlformatter/tst_qxmlformatter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp
index 3670aa6..68be581 100644
--- a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp
+++ b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlitem/tst_qxmlitem.cpp b/tests/auto/qxmlitem/tst_qxmlitem.cpp
index 8a75a8e..e0b64ab 100644
--- a/tests/auto/qxmlitem/tst_qxmlitem.cpp
+++ b/tests/auto/qxmlitem/tst_qxmlitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlname/tst_qxmlname.cpp b/tests/auto/qxmlname/tst_qxmlname.cpp
index d6ed114..79a0401 100644
--- a/tests/auto/qxmlname/tst_qxmlname.cpp
+++ b/tests/auto/qxmlname/tst_qxmlname.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp b/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
index ee0562e..e607f12 100644
--- a/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
+++ b/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
index 74f7eda..14eeca2 100644
--- a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
+++ b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/MessageSilencer.h b/tests/auto/qxmlquery/MessageSilencer.h
index 08fb1b8..95b7b61 100644
--- a/tests/auto/qxmlquery/MessageSilencer.h
+++ b/tests/auto/qxmlquery/MessageSilencer.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/MessageValidator.cpp b/tests/auto/qxmlquery/MessageValidator.cpp
index 8746ccd..a4ec6a0 100644
--- a/tests/auto/qxmlquery/MessageValidator.cpp
+++ b/tests/auto/qxmlquery/MessageValidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/MessageValidator.h b/tests/auto/qxmlquery/MessageValidator.h
index adf7e57..2d9d986 100644
--- a/tests/auto/qxmlquery/MessageValidator.h
+++ b/tests/auto/qxmlquery/MessageValidator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/NetworkOverrider.h b/tests/auto/qxmlquery/NetworkOverrider.h
index 9e8e438..7ae7fac 100644
--- a/tests/auto/qxmlquery/NetworkOverrider.h
+++ b/tests/auto/qxmlquery/NetworkOverrider.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/PushBaseliner.h b/tests/auto/qxmlquery/PushBaseliner.h
index ee2ad91..bf5eb87 100644
--- a/tests/auto/qxmlquery/PushBaseliner.h
+++ b/tests/auto/qxmlquery/PushBaseliner.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/TestFundament.cpp b/tests/auto/qxmlquery/TestFundament.cpp
index e5c56e9..2f1e721 100644
--- a/tests/auto/qxmlquery/TestFundament.cpp
+++ b/tests/auto/qxmlquery/TestFundament.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/TestFundament.h b/tests/auto/qxmlquery/TestFundament.h
index 5a9d9e8..318d680 100644
--- a/tests/auto/qxmlquery/TestFundament.h
+++ b/tests/auto/qxmlquery/TestFundament.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 2187aeb..d3d6631 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp b/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
index 9da08aa..11665b5 100644
--- a/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
+++ b/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlschema/tst_qxmlschema.cpp b/tests/auto/qxmlschema/tst_qxmlschema.cpp
index 583702d..675c13a 100644
--- a/tests/auto/qxmlschema/tst_qxmlschema.cpp
+++ b/tests/auto/qxmlschema/tst_qxmlschema.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
index 6e5d51a..55d3eba 100644
--- a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
+++ b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlserializer/tst_qxmlserializer.cpp b/tests/auto/qxmlserializer/tst_qxmlserializer.cpp
index d17c2fa..e41b520 100644
--- a/tests/auto/qxmlserializer/tst_qxmlserializer.cpp
+++ b/tests/auto/qxmlserializer/tst_qxmlserializer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlsimplereader/generate_ref_files.sh b/tests/auto/qxmlsimplereader/generate_ref_files.sh
index 2f4fe2c..ba4b315 100755
--- a/tests/auto/qxmlsimplereader/generate_ref_files.sh
+++ b/tests/auto/qxmlsimplereader/generate_ref_files.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/qxmlsimplereader/parser/main.cpp b/tests/auto/qxmlsimplereader/parser/main.cpp
index d4b1f0e..c79c8a3 100644
--- a/tests/auto/qxmlsimplereader/parser/main.cpp
+++ b/tests/auto/qxmlsimplereader/parser/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlsimplereader/parser/parser.cpp b/tests/auto/qxmlsimplereader/parser/parser.cpp
index c9d4d00..db7b424 100644
--- a/tests/auto/qxmlsimplereader/parser/parser.cpp
+++ b/tests/auto/qxmlsimplereader/parser/parser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlsimplereader/parser/parser.h b/tests/auto/qxmlsimplereader/parser/parser.h
index ebd91d4..4b6352f 100644
--- a/tests/auto/qxmlsimplereader/parser/parser.h
+++ b/tests/auto/qxmlsimplereader/parser/parser.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
index 0e57306..e159412 100644
--- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlstream/qc14n.h b/tests/auto/qxmlstream/qc14n.h
index 93fa6b4..e8450b5 100644
--- a/tests/auto/qxmlstream/qc14n.h
+++ b/tests/auto/qxmlstream/qc14n.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qxmlstream/setupSuite.sh b/tests/auto/qxmlstream/setupSuite.sh
index 9933f61..c3f6e98 100755
--- a/tests/auto/qxmlstream/setupSuite.sh
+++ b/tests/auto/qxmlstream/setupSuite.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp
index 7d5e3b7..64ccc39 100644
--- a/tests/auto/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qzip/tst_qzip.cpp b/tests/auto/qzip/tst_qzip.cpp
index cb3acf5..aaef6eb 100644
--- a/tests/auto/qzip/tst_qzip.cpp
+++ b/tests/auto/qzip/tst_qzip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/rcc/tst_rcc.cpp b/tests/auto/rcc/tst_rcc.cpp
index 5dd09a3..3e469b1 100644
--- a/tests/auto/rcc/tst_rcc.cpp
+++ b/tests/auto/rcc/tst_rcc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/alive/qtestalive.cpp b/tests/auto/selftests/alive/qtestalive.cpp
index f93e9c0..e45b8ab 100644
--- a/tests/auto/selftests/alive/qtestalive.cpp
+++ b/tests/auto/selftests/alive/qtestalive.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/alive/tst_alive.cpp b/tests/auto/selftests/alive/tst_alive.cpp
index e9c2f8a..fc1b02a 100644
--- a/tests/auto/selftests/alive/tst_alive.cpp
+++ b/tests/auto/selftests/alive/tst_alive.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/assert/tst_assert.cpp b/tests/auto/selftests/assert/tst_assert.cpp
index 5988175..5d7380b 100644
--- a/tests/auto/selftests/assert/tst_assert.cpp
+++ b/tests/auto/selftests/assert/tst_assert.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/badxml/tst_badxml.cpp b/tests/auto/selftests/badxml/tst_badxml.cpp
index d4eae56..85bf682 100644
--- a/tests/auto/selftests/badxml/tst_badxml.cpp
+++ b/tests/auto/selftests/badxml/tst_badxml.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
index 15915c5..2261b5f 100644
--- a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
+++ b/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
index d3b09d7..c323ff2 100644
--- a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
+++ b/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp
index 1f40368..e0094f7 100644
--- a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp
+++ b/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp b/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
index eeaa448..af6626f 100644
--- a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
+++ b/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp b/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
index 28dd58b..2deb357 100644
--- a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
+++ b/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/cmptest/tst_cmptest.cpp b/tests/auto/selftests/cmptest/tst_cmptest.cpp
index 187b042..c7b7c59 100644
--- a/tests/auto/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/selftests/cmptest/tst_cmptest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp b/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp
index e7ace5a..fadd16b 100644
--- a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp
+++ b/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/crashes/tst_crashes.cpp b/tests/auto/selftests/crashes/tst_crashes.cpp
index 487889a..6ae41cc 100644
--- a/tests/auto/selftests/crashes/tst_crashes.cpp
+++ b/tests/auto/selftests/crashes/tst_crashes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/datatable/tst_datatable.cpp b/tests/auto/selftests/datatable/tst_datatable.cpp
index d5c8a97..465edee 100644
--- a/tests/auto/selftests/datatable/tst_datatable.cpp
+++ b/tests/auto/selftests/datatable/tst_datatable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/datetime/tst_datetime.cpp b/tests/auto/selftests/datetime/tst_datetime.cpp
index f2b030d..1326c61 100644
--- a/tests/auto/selftests/datetime/tst_datetime.cpp
+++ b/tests/auto/selftests/datetime/tst_datetime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/differentexec/tst_differentexec.cpp b/tests/auto/selftests/differentexec/tst_differentexec.cpp
index 348cf85..47b9c8b 100644
--- a/tests/auto/selftests/differentexec/tst_differentexec.cpp
+++ b/tests/auto/selftests/differentexec/tst_differentexec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp b/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp
index 940c568..4a6b54b 100644
--- a/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp
+++ b/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/expectfail/tst_expectfail.cpp b/tests/auto/selftests/expectfail/tst_expectfail.cpp
index 7ced97d..6376294 100644
--- a/tests/auto/selftests/expectfail/tst_expectfail.cpp
+++ b/tests/auto/selftests/expectfail/tst_expectfail.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/failinit/tst_failinit.cpp b/tests/auto/selftests/failinit/tst_failinit.cpp
index 0d96875..98d3484 100644
--- a/tests/auto/selftests/failinit/tst_failinit.cpp
+++ b/tests/auto/selftests/failinit/tst_failinit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp b/tests/auto/selftests/failinitdata/tst_failinitdata.cpp
index e22f5e6..7df7267 100644
--- a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp
+++ b/tests/auto/selftests/failinitdata/tst_failinitdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp b/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp
index 132bc44..3261966 100644
--- a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp
+++ b/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/globaldata/tst_globaldata.cpp b/tests/auto/selftests/globaldata/tst_globaldata.cpp
index 9e2ca45..b8abd8b 100644
--- a/tests/auto/selftests/globaldata/tst_globaldata.cpp
+++ b/tests/auto/selftests/globaldata/tst_globaldata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/longstring/tst_longstring.cpp b/tests/auto/selftests/longstring/tst_longstring.cpp
index 30cbf6c..bb4313f 100644
--- a/tests/auto/selftests/longstring/tst_longstring.cpp
+++ b/tests/auto/selftests/longstring/tst_longstring.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.cpp b/tests/auto/selftests/maxwarnings/maxwarnings.cpp
index c27a7ec..03ba197 100644
--- a/tests/auto/selftests/maxwarnings/maxwarnings.cpp
+++ b/tests/auto/selftests/maxwarnings/maxwarnings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/multiexec/tst_multiexec.cpp b/tests/auto/selftests/multiexec/tst_multiexec.cpp
index 7a22214..d448fd9 100644
--- a/tests/auto/selftests/multiexec/tst_multiexec.cpp
+++ b/tests/auto/selftests/multiexec/tst_multiexec.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp b/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp
index 3aeb76f..38845dc 100644
--- a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp
+++ b/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/singleskip/tst_singleskip.cpp b/tests/auto/selftests/singleskip/tst_singleskip.cpp
index da6f778..b4ed222 100644
--- a/tests/auto/selftests/singleskip/tst_singleskip.cpp
+++ b/tests/auto/selftests/singleskip/tst_singleskip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/skip/tst_skip.cpp b/tests/auto/selftests/skip/tst_skip.cpp
index 17de8ba..0e9b18a 100644
--- a/tests/auto/selftests/skip/tst_skip.cpp
+++ b/tests/auto/selftests/skip/tst_skip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp b/tests/auto/selftests/skipglobal/tst_skipglobal.cpp
index 6de2a88..599e875 100644
--- a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp
+++ b/tests/auto/selftests/skipglobal/tst_skipglobal.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/skipinit/tst_skipinit.cpp b/tests/auto/selftests/skipinit/tst_skipinit.cpp
index 95dde84..415e12b 100644
--- a/tests/auto/selftests/skipinit/tst_skipinit.cpp
+++ b/tests/auto/selftests/skipinit/tst_skipinit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp b/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp
index 5434cde..9805e32 100644
--- a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp
+++ b/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/sleep/tst_sleep.cpp b/tests/auto/selftests/sleep/tst_sleep.cpp
index 07e4a39..8059187 100644
--- a/tests/auto/selftests/sleep/tst_sleep.cpp
+++ b/tests/auto/selftests/sleep/tst_sleep.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/strcmp/tst_strcmp.cpp b/tests/auto/selftests/strcmp/tst_strcmp.cpp
index 92ba4db..50aad17 100644
--- a/tests/auto/selftests/strcmp/tst_strcmp.cpp
+++ b/tests/auto/selftests/strcmp/tst_strcmp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/subtest/tst_subtest.cpp b/tests/auto/selftests/subtest/tst_subtest.cpp
index ab7bf58..6e11ccb 100644
--- a/tests/auto/selftests/subtest/tst_subtest.cpp
+++ b/tests/auto/selftests/subtest/tst_subtest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index 0818b4c..15aaf6e 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp b/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
index 20b1bda..d12db61 100644
--- a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
+++ b/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/warnings/tst_warnings.cpp b/tests/auto/selftests/warnings/tst_warnings.cpp
index 37b3b28..75c1cfd 100644
--- a/tests/auto/selftests/warnings/tst_warnings.cpp
+++ b/tests/auto/selftests/warnings/tst_warnings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/selftests/xunit/tst_xunit.cpp b/tests/auto/selftests/xunit/tst_xunit.cpp
index 5eda89b..e166fb4 100644
--- a/tests/auto/selftests/xunit/tst_xunit.cpp
+++ b/tests/auto/selftests/xunit/tst_xunit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/symbian/orientationchange/tst_orientationchange.cpp b/tests/auto/symbian/orientationchange/tst_orientationchange.cpp
index eb3709d..58d4d60 100644
--- a/tests/auto/symbian/orientationchange/tst_orientationchange.cpp
+++ b/tests/auto/symbian/orientationchange/tst_orientationchange.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/symbian/qmainexceptions/tst_qmainexceptions.cpp b/tests/auto/symbian/qmainexceptions/tst_qmainexceptions.cpp
index d723f71..c7bea3a 100644
--- a/tests/auto/symbian/qmainexceptions/tst_qmainexceptions.cpp
+++ b/tests/auto/symbian/qmainexceptions/tst_qmainexceptions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp
index 28970eb..2e27d46 100644
--- a/tests/auto/symbols/tst_symbols.cpp
+++ b/tests/auto/symbols/tst_symbols.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/test.pl b/tests/auto/test.pl
index 68a08d7..e15d5bc 100755
--- a/tests/auto/test.pl
+++ b/tests/auto/test.pl
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/uic/baseline/batchtranslation.ui b/tests/auto/uic/baseline/batchtranslation.ui
index 1d173b5..e9cdcb7 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui
+++ b/tests/auto/uic/baseline/batchtranslation.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/uic/baseline/batchtranslation.ui.h
index 0ff690f..ef2afa6 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui.h
+++ b/tests/auto/uic/baseline/batchtranslation.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/config.ui b/tests/auto/uic/baseline/config.ui
index a5a275e..3279bc4 100644
--- a/tests/auto/uic/baseline/config.ui
+++ b/tests/auto/uic/baseline/config.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/uic/baseline/config.ui.h
index 2f0dac3..11d0d49 100644
--- a/tests/auto/uic/baseline/config.ui.h
+++ b/tests/auto/uic/baseline/config.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui b/tests/auto/uic/baseline/config_fromuic3.ui
index 2e7addb..521af13 100644
--- a/tests/auto/uic/baseline/config_fromuic3.ui
+++ b/tests/auto/uic/baseline/config_fromuic3.ui
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui.h b/tests/auto/uic/baseline/config_fromuic3.ui.h
index a97e8bc..d2307ab 100644
--- a/tests/auto/uic/baseline/config_fromuic3.ui.h
+++ b/tests/auto/uic/baseline/config_fromuic3.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/finddialog.ui b/tests/auto/uic/baseline/finddialog.ui
index 74c1913..ae6d487 100644
--- a/tests/auto/uic/baseline/finddialog.ui
+++ b/tests/auto/uic/baseline/finddialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/uic/baseline/finddialog.ui.h
index 64f772b..77d8e52 100644
--- a/tests/auto/uic/baseline/finddialog.ui.h
+++ b/tests/auto/uic/baseline/finddialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui b/tests/auto/uic/baseline/formwindowsettings.ui
index cad86a4..dd0e369 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui
+++ b/tests/auto/uic/baseline/formwindowsettings.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/uic/baseline/formwindowsettings.ui.h
index e3c0401..762af4b 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui.h
+++ b/tests/auto/uic/baseline/formwindowsettings.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/helpdialog.ui b/tests/auto/uic/baseline/helpdialog.ui
index eb4d07f..a6713db 100644
--- a/tests/auto/uic/baseline/helpdialog.ui
+++ b/tests/auto/uic/baseline/helpdialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h
index 7703711..a2f6675 100644
--- a/tests/auto/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/uic/baseline/helpdialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui b/tests/auto/uic/baseline/listwidgeteditor.ui
index f7d7dd5..10e7394 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/uic/baseline/listwidgeteditor.ui.h
index 1d391e9..61f145c 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui b/tests/auto/uic/baseline/mainwindowbase.ui
index dd5c77c..9215a45 100644
--- a/tests/auto/uic/baseline/mainwindowbase.ui
+++ b/tests/auto/uic/baseline/mainwindowbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h
index c5a4266..da1d47a 100644
--- a/tests/auto/uic/baseline/mainwindowbase.ui.h
+++ b/tests/auto/uic/baseline/mainwindowbase.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/newactiondialog.ui b/tests/auto/uic/baseline/newactiondialog.ui
index 97c1085..0d30045 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui
+++ b/tests/auto/uic/baseline/newactiondialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/newactiondialog.ui.h b/tests/auto/uic/baseline/newactiondialog.ui.h
index 83fa849..2cfbb20 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui.h
+++ b/tests/auto/uic/baseline/newactiondialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/newform.ui b/tests/auto/uic/baseline/newform.ui
index bd4973c..209b1db 100644
--- a/tests/auto/uic/baseline/newform.ui
+++ b/tests/auto/uic/baseline/newform.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/uic/baseline/newform.ui.h
index 161c2ca..24664a9 100644
--- a/tests/auto/uic/baseline/newform.ui.h
+++ b/tests/auto/uic/baseline/newform.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/orderdialog.ui b/tests/auto/uic/baseline/orderdialog.ui
index fdbb197..1ff2e2e 100644
--- a/tests/auto/uic/baseline/orderdialog.ui
+++ b/tests/auto/uic/baseline/orderdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/orderdialog.ui.h b/tests/auto/uic/baseline/orderdialog.ui.h
index 7a79378..a98b7de 100644
--- a/tests/auto/uic/baseline/orderdialog.ui.h
+++ b/tests/auto/uic/baseline/orderdialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/paletteeditor.ui b/tests/auto/uic/baseline/paletteeditor.ui
index 6a9924e..babd23f 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui
+++ b/tests/auto/uic/baseline/paletteeditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h
index 6c0f120..be37464 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui.h
+++ b/tests/auto/uic/baseline/paletteeditor.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
index 2d9526d..2d60c9c 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
index 40485ac..fd0ae31 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui b/tests/auto/uic/baseline/phrasebookbox.ui
index 38d22ee..eade5d0 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui
+++ b/tests/auto/uic/baseline/phrasebookbox.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/uic/baseline/phrasebookbox.ui.h
index 05cc43a..5ea7497 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui.h
+++ b/tests/auto/uic/baseline/phrasebookbox.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/plugindialog.ui b/tests/auto/uic/baseline/plugindialog.ui
index a5b5cbc..77cca16 100644
--- a/tests/auto/uic/baseline/plugindialog.ui
+++ b/tests/auto/uic/baseline/plugindialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/plugindialog.ui.h b/tests/auto/uic/baseline/plugindialog.ui.h
index b38cc19..5778299 100644
--- a/tests/auto/uic/baseline/plugindialog.ui.h
+++ b/tests/auto/uic/baseline/plugindialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/previewwidget.ui b/tests/auto/uic/baseline/previewwidget.ui
index cae6bd8..7b2f682 100644
--- a/tests/auto/uic/baseline/previewwidget.ui
+++ b/tests/auto/uic/baseline/previewwidget.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/uic/baseline/previewwidget.ui.h
index 8f0ba42..25c79bf 100644
--- a/tests/auto/uic/baseline/previewwidget.ui.h
+++ b/tests/auto/uic/baseline/previewwidget.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui b/tests/auto/uic/baseline/previewwidgetbase.ui
index 5e13e1e..7751e1b 100644
--- a/tests/auto/uic/baseline/previewwidgetbase.ui
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui.h b/tests/auto/uic/baseline/previewwidgetbase.ui.h
index b4ea676..229876c 100644
--- a/tests/auto/uic/baseline/previewwidgetbase.ui.h
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/qfiledialog.ui b/tests/auto/uic/baseline/qfiledialog.ui
index 1af2967..c8d0278 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui
+++ b/tests/auto/uic/baseline/qfiledialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/qfiledialog.ui.h b/tests/auto/uic/baseline/qfiledialog.ui.h
index c065e78..7852b18 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui.h
+++ b/tests/auto/uic/baseline/qfiledialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui b/tests/auto/uic/baseline/qtgradientdialog.ui
index 363a44b..6914967 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui.h b/tests/auto/uic/baseline/qtgradientdialog.ui.h
index 24137fb..551b3d6 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui b/tests/auto/uic/baseline/qtgradienteditor.ui
index d5df5f8..c84c009 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui.h b/tests/auto/uic/baseline/qtgradienteditor.ui.h
index 19efa6e..51bf49e 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui.h
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui b/tests/auto/uic/baseline/qtgradientviewdialog.ui
index 06841d4..2699f58 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
index d3e810e..f99b766 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui b/tests/auto/uic/baseline/saveformastemplate.ui
index 8fc0163..29d4ea3 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui
+++ b/tests/auto/uic/baseline/saveformastemplate.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui.h b/tests/auto/uic/baseline/saveformastemplate.ui.h
index 7ad02cc..9ce5dbd 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui.h
+++ b/tests/auto/uic/baseline/saveformastemplate.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/statistics.ui b/tests/auto/uic/baseline/statistics.ui
index 383e7b1..2de0350 100644
--- a/tests/auto/uic/baseline/statistics.ui
+++ b/tests/auto/uic/baseline/statistics.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/uic/baseline/statistics.ui.h
index 1ecc245..d687d7c 100644
--- a/tests/auto/uic/baseline/statistics.ui.h
+++ b/tests/auto/uic/baseline/statistics.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui b/tests/auto/uic/baseline/stringlisteditor.ui
index 7675ea9..6261712 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui
+++ b/tests/auto/uic/baseline/stringlisteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/uic/baseline/stringlisteditor.ui.h
index 8a6aeb9..2e114cf 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui.h
+++ b/tests/auto/uic/baseline/stringlisteditor.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui b/tests/auto/uic/baseline/tabbedbrowser.ui
index f7b5d0b..80056d9 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/uic/baseline/tabbedbrowser.ui.h
index be6b438..8174ab5 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui b/tests/auto/uic/baseline/tablewidgeteditor.ui
index 44c7108..96f5be5 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
index b30fae5..4297681 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/translatedialog.ui b/tests/auto/uic/baseline/translatedialog.ui
index 49e11e1..704184a 100644
--- a/tests/auto/uic/baseline/translatedialog.ui
+++ b/tests/auto/uic/baseline/translatedialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/uic/baseline/translatedialog.ui.h
index e54473c..ef7e5ab 100644
--- a/tests/auto/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/uic/baseline/translatedialog.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui b/tests/auto/uic/baseline/treewidgeteditor.ui
index 8c8b095..1a9cbe5 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui.h b/tests/auto/uic/baseline/treewidgeteditor.ui.h
index d9e483c..4bfa856 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui b/tests/auto/uic/baseline/trpreviewtool.ui
index ba99df9..5eb90c2 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui
+++ b/tests/auto/uic/baseline/trpreviewtool.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/uic/baseline/trpreviewtool.ui.h
index 01f0e80..33fdcdc 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui.h
+++ b/tests/auto/uic/baseline/trpreviewtool.ui.h
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************
diff --git a/tests/auto/uic/tst_uic.cpp b/tests/auto/uic/tst_uic.cpp
index c1ff261..89801c8 100644
--- a/tests/auto/uic/tst_uic.cpp
+++ b/tests/auto/uic/tst_uic.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/uic3/baseline/about.ui b/tests/auto/uic3/baseline/about.ui
index 496c927..a8e2c78 100644
--- a/tests/auto/uic3/baseline/about.ui
+++ b/tests/auto/uic3/baseline/about.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/about.ui.4 b/tests/auto/uic3/baseline/about.ui.4
index c2f90a2..ac6a375 100644
--- a/tests/auto/uic3/baseline/about.ui.4
+++ b/tests/auto/uic3/baseline/about.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/actioneditor.ui b/tests/auto/uic3/baseline/actioneditor.ui
index 3226a05..cf942d6 100644
--- a/tests/auto/uic3/baseline/actioneditor.ui
+++ b/tests/auto/uic3/baseline/actioneditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/actioneditor.ui.4 b/tests/auto/uic3/baseline/actioneditor.ui.4
index cbe9fe5..e02df96 100644
--- a/tests/auto/uic3/baseline/actioneditor.ui.4
+++ b/tests/auto/uic3/baseline/actioneditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/config.ui b/tests/auto/uic3/baseline/config.ui
index 2b857a7..de222d8 100644
--- a/tests/auto/uic3/baseline/config.ui
+++ b/tests/auto/uic3/baseline/config.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/config.ui.4 b/tests/auto/uic3/baseline/config.ui.4
index 2e7addb..521af13 100644
--- a/tests/auto/uic3/baseline/config.ui.4
+++ b/tests/auto/uic3/baseline/config.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/configtoolboxdialog.ui b/tests/auto/uic3/baseline/configtoolboxdialog.ui
index bf11aed..4798a6a 100644
--- a/tests/auto/uic3/baseline/configtoolboxdialog.ui
+++ b/tests/auto/uic3/baseline/configtoolboxdialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/configtoolboxdialog.ui.4 b/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
index 4ae9e06..8478468 100644
--- a/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
+++ b/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/connectiondialog.ui b/tests/auto/uic3/baseline/connectiondialog.ui
index 660dee8..d410f6d 100644
--- a/tests/auto/uic3/baseline/connectiondialog.ui
+++ b/tests/auto/uic3/baseline/connectiondialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/connectiondialog.ui.4 b/tests/auto/uic3/baseline/connectiondialog.ui.4
index 987acdf..3f36908 100644
--- a/tests/auto/uic3/baseline/connectiondialog.ui.4
+++ b/tests/auto/uic3/baseline/connectiondialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/createtemplate.ui b/tests/auto/uic3/baseline/createtemplate.ui
index f7345df..05b91c8 100644
--- a/tests/auto/uic3/baseline/createtemplate.ui
+++ b/tests/auto/uic3/baseline/createtemplate.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/createtemplate.ui.4 b/tests/auto/uic3/baseline/createtemplate.ui.4
index e611050..73d7bbd 100644
--- a/tests/auto/uic3/baseline/createtemplate.ui.4
+++ b/tests/auto/uic3/baseline/createtemplate.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/customwidgeteditor.ui b/tests/auto/uic3/baseline/customwidgeteditor.ui
index 55acaea..028756f 100644
--- a/tests/auto/uic3/baseline/customwidgeteditor.ui
+++ b/tests/auto/uic3/baseline/customwidgeteditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/customwidgeteditor.ui.4 b/tests/auto/uic3/baseline/customwidgeteditor.ui.4
index 978e329..93e2e1d 100644
--- a/tests/auto/uic3/baseline/customwidgeteditor.ui.4
+++ b/tests/auto/uic3/baseline/customwidgeteditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/dbconnection.ui b/tests/auto/uic3/baseline/dbconnection.ui
index 0f21a9f..6be524d 100644
--- a/tests/auto/uic3/baseline/dbconnection.ui
+++ b/tests/auto/uic3/baseline/dbconnection.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/dbconnection.ui.4 b/tests/auto/uic3/baseline/dbconnection.ui.4
index fc08f49..14bc3a74 100644
--- a/tests/auto/uic3/baseline/dbconnection.ui.4
+++ b/tests/auto/uic3/baseline/dbconnection.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/dbconnectioneditor.ui b/tests/auto/uic3/baseline/dbconnectioneditor.ui
index 3886f98..3c2a5bc 100644
--- a/tests/auto/uic3/baseline/dbconnectioneditor.ui
+++ b/tests/auto/uic3/baseline/dbconnectioneditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/dbconnectioneditor.ui.4 b/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
index 1fe2dc7..e93a725 100644
--- a/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
+++ b/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/dbconnections.ui b/tests/auto/uic3/baseline/dbconnections.ui
index 198ff76..11d070a 100644
--- a/tests/auto/uic3/baseline/dbconnections.ui
+++ b/tests/auto/uic3/baseline/dbconnections.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/dbconnections.ui.4 b/tests/auto/uic3/baseline/dbconnections.ui.4
index b008125..24f0627 100644
--- a/tests/auto/uic3/baseline/dbconnections.ui.4
+++ b/tests/auto/uic3/baseline/dbconnections.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/editfunctions.ui b/tests/auto/uic3/baseline/editfunctions.ui
index 5b0ad26..80018bb 100644
--- a/tests/auto/uic3/baseline/editfunctions.ui
+++ b/tests/auto/uic3/baseline/editfunctions.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/editfunctions.ui.4 b/tests/auto/uic3/baseline/editfunctions.ui.4
index e8e9838..e525633 100644
--- a/tests/auto/uic3/baseline/editfunctions.ui.4
+++ b/tests/auto/uic3/baseline/editfunctions.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/finddialog.ui b/tests/auto/uic3/baseline/finddialog.ui
index f6acdca..0718e84 100644
--- a/tests/auto/uic3/baseline/finddialog.ui
+++ b/tests/auto/uic3/baseline/finddialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/finddialog.ui.4 b/tests/auto/uic3/baseline/finddialog.ui.4
index 89c4f6e..878e880 100644
--- a/tests/auto/uic3/baseline/finddialog.ui.4
+++ b/tests/auto/uic3/baseline/finddialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/formsettings.ui b/tests/auto/uic3/baseline/formsettings.ui
index 064262c..da45548 100644
--- a/tests/auto/uic3/baseline/formsettings.ui
+++ b/tests/auto/uic3/baseline/formsettings.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/formsettings.ui.4 b/tests/auto/uic3/baseline/formsettings.ui.4
index 5f769db..d4d626a 100644
--- a/tests/auto/uic3/baseline/formsettings.ui.4
+++ b/tests/auto/uic3/baseline/formsettings.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/gotolinedialog.ui b/tests/auto/uic3/baseline/gotolinedialog.ui
index 3c8d21e..cf90ff5 100644
--- a/tests/auto/uic3/baseline/gotolinedialog.ui
+++ b/tests/auto/uic3/baseline/gotolinedialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/gotolinedialog.ui.4 b/tests/auto/uic3/baseline/gotolinedialog.ui.4
index b91269f..baf3798 100644
--- a/tests/auto/uic3/baseline/gotolinedialog.ui.4
+++ b/tests/auto/uic3/baseline/gotolinedialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/helpdialog.ui b/tests/auto/uic3/baseline/helpdialog.ui
index 5683b52..f382ced 100644
--- a/tests/auto/uic3/baseline/helpdialog.ui
+++ b/tests/auto/uic3/baseline/helpdialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/helpdialog.ui.4 b/tests/auto/uic3/baseline/helpdialog.ui.4
index b640005..93212b9 100644
--- a/tests/auto/uic3/baseline/helpdialog.ui.4
+++ b/tests/auto/uic3/baseline/helpdialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/iconvieweditor.ui b/tests/auto/uic3/baseline/iconvieweditor.ui
index dd26fd5..c8da373 100644
--- a/tests/auto/uic3/baseline/iconvieweditor.ui
+++ b/tests/auto/uic3/baseline/iconvieweditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/iconvieweditor.ui.4 b/tests/auto/uic3/baseline/iconvieweditor.ui.4
index 48a248c..e2b886e 100644
--- a/tests/auto/uic3/baseline/iconvieweditor.ui.4
+++ b/tests/auto/uic3/baseline/iconvieweditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/listboxeditor.ui b/tests/auto/uic3/baseline/listboxeditor.ui
index 1a5b6c1..f3affec 100644
--- a/tests/auto/uic3/baseline/listboxeditor.ui
+++ b/tests/auto/uic3/baseline/listboxeditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/listboxeditor.ui.4 b/tests/auto/uic3/baseline/listboxeditor.ui.4
index bcf3226..dec4e59 100644
--- a/tests/auto/uic3/baseline/listboxeditor.ui.4
+++ b/tests/auto/uic3/baseline/listboxeditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/listeditor.ui b/tests/auto/uic3/baseline/listeditor.ui
index 947e0fe..5968c62 100644
--- a/tests/auto/uic3/baseline/listeditor.ui
+++ b/tests/auto/uic3/baseline/listeditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/listeditor.ui.4 b/tests/auto/uic3/baseline/listeditor.ui.4
index dad5a4e..42b30e7 100644
--- a/tests/auto/uic3/baseline/listeditor.ui.4
+++ b/tests/auto/uic3/baseline/listeditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/listvieweditor.ui b/tests/auto/uic3/baseline/listvieweditor.ui
index 4c07588..0a5023e 100644
--- a/tests/auto/uic3/baseline/listvieweditor.ui
+++ b/tests/auto/uic3/baseline/listvieweditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/listvieweditor.ui.4 b/tests/auto/uic3/baseline/listvieweditor.ui.4
index 024b148..11a9d20 100644
--- a/tests/auto/uic3/baseline/listvieweditor.ui.4
+++ b/tests/auto/uic3/baseline/listvieweditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/mainfilesettings.ui b/tests/auto/uic3/baseline/mainfilesettings.ui
index be3b85a..7225d55 100644
--- a/tests/auto/uic3/baseline/mainfilesettings.ui
+++ b/tests/auto/uic3/baseline/mainfilesettings.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/mainfilesettings.ui.4 b/tests/auto/uic3/baseline/mainfilesettings.ui.4
index db9033f..8915ff4 100644
--- a/tests/auto/uic3/baseline/mainfilesettings.ui.4
+++ b/tests/auto/uic3/baseline/mainfilesettings.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/mainwindowbase.ui b/tests/auto/uic3/baseline/mainwindowbase.ui
index 435266a..95f895d 100644
--- a/tests/auto/uic3/baseline/mainwindowbase.ui
+++ b/tests/auto/uic3/baseline/mainwindowbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/mainwindowbase.ui.4 b/tests/auto/uic3/baseline/mainwindowbase.ui.4
index 8b61514..f099be7 100644
--- a/tests/auto/uic3/baseline/mainwindowbase.ui.4
+++ b/tests/auto/uic3/baseline/mainwindowbase.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/mainwindowwizard.ui b/tests/auto/uic3/baseline/mainwindowwizard.ui
index 5c8a80b..75ad82f 100644
--- a/tests/auto/uic3/baseline/mainwindowwizard.ui
+++ b/tests/auto/uic3/baseline/mainwindowwizard.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/mainwindowwizard.ui.4 b/tests/auto/uic3/baseline/mainwindowwizard.ui.4
index e979ec9..be9417f 100644
--- a/tests/auto/uic3/baseline/mainwindowwizard.ui.4
+++ b/tests/auto/uic3/baseline/mainwindowwizard.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/multilineeditor.ui b/tests/auto/uic3/baseline/multilineeditor.ui
index ec1d10c..ae744ce 100644
--- a/tests/auto/uic3/baseline/multilineeditor.ui
+++ b/tests/auto/uic3/baseline/multilineeditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/multilineeditor.ui.4 b/tests/auto/uic3/baseline/multilineeditor.ui.4
index bbedf70..7f41852 100644
--- a/tests/auto/uic3/baseline/multilineeditor.ui.4
+++ b/tests/auto/uic3/baseline/multilineeditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/newform.ui b/tests/auto/uic3/baseline/newform.ui
index 4ef1e20..1a504bc 100644
--- a/tests/auto/uic3/baseline/newform.ui
+++ b/tests/auto/uic3/baseline/newform.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/newform.ui.4 b/tests/auto/uic3/baseline/newform.ui.4
index 26944fb..2f82ad1 100644
--- a/tests/auto/uic3/baseline/newform.ui.4
+++ b/tests/auto/uic3/baseline/newform.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/paletteeditor.ui b/tests/auto/uic3/baseline/paletteeditor.ui
index 9b1c867..521fec3 100644
--- a/tests/auto/uic3/baseline/paletteeditor.ui
+++ b/tests/auto/uic3/baseline/paletteeditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/paletteeditor.ui.4 b/tests/auto/uic3/baseline/paletteeditor.ui.4
index 0cc66bd..130022a 100644
--- a/tests/auto/uic3/baseline/paletteeditor.ui.4
+++ b/tests/auto/uic3/baseline/paletteeditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/paletteeditoradvanced.ui b/tests/auto/uic3/baseline/paletteeditoradvanced.ui
index 1d4b571..cc4e949 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvanced.ui
+++ b/tests/auto/uic3/baseline/paletteeditoradvanced.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4 b/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
index 1c98529..3ddb761 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
+++ b/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
index 7c22eaa..3487464 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
+++ b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4 b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
index 95b0ea0..2f03555 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
+++ b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui
index 6e0512e..41ae9f4 100644
--- a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui
+++ b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4 b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
index 0817f1c..a905497 100644
--- a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
+++ b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/pixmapfunction.ui b/tests/auto/uic3/baseline/pixmapfunction.ui
index cf150dd..7eb14e5 100644
--- a/tests/auto/uic3/baseline/pixmapfunction.ui
+++ b/tests/auto/uic3/baseline/pixmapfunction.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/pixmapfunction.ui.4 b/tests/auto/uic3/baseline/pixmapfunction.ui.4
index c6e7ddb..0ed6948 100644
--- a/tests/auto/uic3/baseline/pixmapfunction.ui.4
+++ b/tests/auto/uic3/baseline/pixmapfunction.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/preferences.ui b/tests/auto/uic3/baseline/preferences.ui
index 34c48a1..753c67d 100644
--- a/tests/auto/uic3/baseline/preferences.ui
+++ b/tests/auto/uic3/baseline/preferences.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/preferences.ui.4 b/tests/auto/uic3/baseline/preferences.ui.4
index 41fd130..3448f62 100644
--- a/tests/auto/uic3/baseline/preferences.ui.4
+++ b/tests/auto/uic3/baseline/preferences.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/previewwidget.ui b/tests/auto/uic3/baseline/previewwidget.ui
index 41ba5d4..5a4db60 100644
--- a/tests/auto/uic3/baseline/previewwidget.ui
+++ b/tests/auto/uic3/baseline/previewwidget.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/previewwidget.ui.4 b/tests/auto/uic3/baseline/previewwidget.ui.4
index 36cf91d..150cfca 100644
--- a/tests/auto/uic3/baseline/previewwidget.ui.4
+++ b/tests/auto/uic3/baseline/previewwidget.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/previewwidgetbase.ui b/tests/auto/uic3/baseline/previewwidgetbase.ui
index a6d21ca..adf3dac 100644
--- a/tests/auto/uic3/baseline/previewwidgetbase.ui
+++ b/tests/auto/uic3/baseline/previewwidgetbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/previewwidgetbase.ui.4 b/tests/auto/uic3/baseline/previewwidgetbase.ui.4
index 673850b..0c6a203 100644
--- a/tests/auto/uic3/baseline/previewwidgetbase.ui.4
+++ b/tests/auto/uic3/baseline/previewwidgetbase.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/projectsettings.ui b/tests/auto/uic3/baseline/projectsettings.ui
index e35cde6..ef7b101 100644
--- a/tests/auto/uic3/baseline/projectsettings.ui
+++ b/tests/auto/uic3/baseline/projectsettings.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/projectsettings.ui.4 b/tests/auto/uic3/baseline/projectsettings.ui.4
index a84f3b8..f1a09b8 100644
--- a/tests/auto/uic3/baseline/projectsettings.ui.4
+++ b/tests/auto/uic3/baseline/projectsettings.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/qactivexselect.ui b/tests/auto/uic3/baseline/qactivexselect.ui
index 07e7483..e9ce3f0 100644
--- a/tests/auto/uic3/baseline/qactivexselect.ui
+++ b/tests/auto/uic3/baseline/qactivexselect.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/qactivexselect.ui.4 b/tests/auto/uic3/baseline/qactivexselect.ui.4
index c3d29f5..1730476 100644
--- a/tests/auto/uic3/baseline/qactivexselect.ui.4
+++ b/tests/auto/uic3/baseline/qactivexselect.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/replacedialog.ui b/tests/auto/uic3/baseline/replacedialog.ui
index 6ad9387..929cc54 100644
--- a/tests/auto/uic3/baseline/replacedialog.ui
+++ b/tests/auto/uic3/baseline/replacedialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/replacedialog.ui.4 b/tests/auto/uic3/baseline/replacedialog.ui.4
index ac17951..c4efc09 100644
--- a/tests/auto/uic3/baseline/replacedialog.ui.4
+++ b/tests/auto/uic3/baseline/replacedialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/richtextfontdialog.ui b/tests/auto/uic3/baseline/richtextfontdialog.ui
index 19e73e9..9a75c87 100644
--- a/tests/auto/uic3/baseline/richtextfontdialog.ui
+++ b/tests/auto/uic3/baseline/richtextfontdialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/richtextfontdialog.ui.4 b/tests/auto/uic3/baseline/richtextfontdialog.ui.4
index f9afbd9..24c970c 100644
--- a/tests/auto/uic3/baseline/richtextfontdialog.ui.4
+++ b/tests/auto/uic3/baseline/richtextfontdialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/settingsdialog.ui b/tests/auto/uic3/baseline/settingsdialog.ui
index d3a0b3a..df71576 100644
--- a/tests/auto/uic3/baseline/settingsdialog.ui
+++ b/tests/auto/uic3/baseline/settingsdialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/settingsdialog.ui.4 b/tests/auto/uic3/baseline/settingsdialog.ui.4
index 7a649b7..d88b15a 100644
--- a/tests/auto/uic3/baseline/settingsdialog.ui.4
+++ b/tests/auto/uic3/baseline/settingsdialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/sqlformwizard.ui b/tests/auto/uic3/baseline/sqlformwizard.ui
index 84f747a..d17dfcd 100644
--- a/tests/auto/uic3/baseline/sqlformwizard.ui
+++ b/tests/auto/uic3/baseline/sqlformwizard.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/sqlformwizard.ui.4 b/tests/auto/uic3/baseline/sqlformwizard.ui.4
index 3215f4f..43e0505 100644
--- a/tests/auto/uic3/baseline/sqlformwizard.ui.4
+++ b/tests/auto/uic3/baseline/sqlformwizard.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/startdialog.ui b/tests/auto/uic3/baseline/startdialog.ui
index 7f99b8f..0d73819 100644
--- a/tests/auto/uic3/baseline/startdialog.ui
+++ b/tests/auto/uic3/baseline/startdialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/startdialog.ui.4 b/tests/auto/uic3/baseline/startdialog.ui.4
index ad883bc..646fe22 100644
--- a/tests/auto/uic3/baseline/startdialog.ui.4
+++ b/tests/auto/uic3/baseline/startdialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/statistics.ui b/tests/auto/uic3/baseline/statistics.ui
index 6c2a406..ab284d8 100644
--- a/tests/auto/uic3/baseline/statistics.ui
+++ b/tests/auto/uic3/baseline/statistics.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/statistics.ui.4 b/tests/auto/uic3/baseline/statistics.ui.4
index bad7065..effaa89 100644
--- a/tests/auto/uic3/baseline/statistics.ui.4
+++ b/tests/auto/uic3/baseline/statistics.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/tabbedbrowser.ui b/tests/auto/uic3/baseline/tabbedbrowser.ui
index 1b496b1..9f7cbef 100644
--- a/tests/auto/uic3/baseline/tabbedbrowser.ui
+++ b/tests/auto/uic3/baseline/tabbedbrowser.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/tabbedbrowser.ui.4 b/tests/auto/uic3/baseline/tabbedbrowser.ui.4
index 52402d7..d75b451 100644
--- a/tests/auto/uic3/baseline/tabbedbrowser.ui.4
+++ b/tests/auto/uic3/baseline/tabbedbrowser.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/tableeditor.ui b/tests/auto/uic3/baseline/tableeditor.ui
index f566278..ce367ae 100644
--- a/tests/auto/uic3/baseline/tableeditor.ui
+++ b/tests/auto/uic3/baseline/tableeditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/tableeditor.ui.4 b/tests/auto/uic3/baseline/tableeditor.ui.4
index ffcb8b4..35d1bd3 100644
--- a/tests/auto/uic3/baseline/tableeditor.ui.4
+++ b/tests/auto/uic3/baseline/tableeditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/topicchooser.ui b/tests/auto/uic3/baseline/topicchooser.ui
index 67968cb..becfd68 100644
--- a/tests/auto/uic3/baseline/topicchooser.ui
+++ b/tests/auto/uic3/baseline/topicchooser.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/topicchooser.ui.4 b/tests/auto/uic3/baseline/topicchooser.ui.4
index cd51409..71061ff 100644
--- a/tests/auto/uic3/baseline/topicchooser.ui.4
+++ b/tests/auto/uic3/baseline/topicchooser.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/variabledialog.ui b/tests/auto/uic3/baseline/variabledialog.ui
index ce13154..4ea0ed1 100644
--- a/tests/auto/uic3/baseline/variabledialog.ui
+++ b/tests/auto/uic3/baseline/variabledialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/variabledialog.ui.4 b/tests/auto/uic3/baseline/variabledialog.ui.4
index d105152..01ac4b7 100644
--- a/tests/auto/uic3/baseline/variabledialog.ui.4
+++ b/tests/auto/uic3/baseline/variabledialog.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/wizardeditor.ui b/tests/auto/uic3/baseline/wizardeditor.ui
index 50b1de2..3a551d3 100644
--- a/tests/auto/uic3/baseline/wizardeditor.ui
+++ b/tests/auto/uic3/baseline/wizardeditor.ui
@@ -9,11 +9,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/baseline/wizardeditor.ui.4 b/tests/auto/uic3/baseline/wizardeditor.ui.4
index 620241e..38875db 100644
--- a/tests/auto/uic3/baseline/wizardeditor.ui.4
+++ b/tests/auto/uic3/baseline/wizardeditor.ui.4
@@ -10,11 +10,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,16 +28,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uic3/tst_uic3.cpp b/tests/auto/uic3/tst_uic3.cpp
index ac45bf4..3e6372f 100644
--- a/tests/auto/uic3/tst_uic3.cpp
+++ b/tests/auto/uic3/tst_uic3.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/uiloader/baseline/batchtranslation.ui b/tests/auto/uiloader/baseline/batchtranslation.ui
index 1d173b5..e9cdcb7 100644
--- a/tests/auto/uiloader/baseline/batchtranslation.ui
+++ b/tests/auto/uiloader/baseline/batchtranslation.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/config.ui b/tests/auto/uiloader/baseline/config.ui
index a5a275e..3279bc4 100644
--- a/tests/auto/uiloader/baseline/config.ui
+++ b/tests/auto/uiloader/baseline/config.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/finddialog.ui b/tests/auto/uiloader/baseline/finddialog.ui
index 74c1913..ae6d487 100644
--- a/tests/auto/uiloader/baseline/finddialog.ui
+++ b/tests/auto/uiloader/baseline/finddialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/formwindowsettings.ui b/tests/auto/uiloader/baseline/formwindowsettings.ui
index cad86a4..dd0e369 100644
--- a/tests/auto/uiloader/baseline/formwindowsettings.ui
+++ b/tests/auto/uiloader/baseline/formwindowsettings.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/helpdialog.ui b/tests/auto/uiloader/baseline/helpdialog.ui
index eb4d07f..a6713db 100644
--- a/tests/auto/uiloader/baseline/helpdialog.ui
+++ b/tests/auto/uiloader/baseline/helpdialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/listwidgeteditor.ui b/tests/auto/uiloader/baseline/listwidgeteditor.ui
index f7d7dd5..10e7394 100644
--- a/tests/auto/uiloader/baseline/listwidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/listwidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/mainwindowbase.ui b/tests/auto/uiloader/baseline/mainwindowbase.ui
index dd5c77c..9215a45 100644
--- a/tests/auto/uiloader/baseline/mainwindowbase.ui
+++ b/tests/auto/uiloader/baseline/mainwindowbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/newactiondialog.ui b/tests/auto/uiloader/baseline/newactiondialog.ui
index 97c1085..0d30045 100644
--- a/tests/auto/uiloader/baseline/newactiondialog.ui
+++ b/tests/auto/uiloader/baseline/newactiondialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/newform.ui b/tests/auto/uiloader/baseline/newform.ui
index bd4973c..209b1db 100644
--- a/tests/auto/uiloader/baseline/newform.ui
+++ b/tests/auto/uiloader/baseline/newform.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/orderdialog.ui b/tests/auto/uiloader/baseline/orderdialog.ui
index fdbb197..1ff2e2e 100644
--- a/tests/auto/uiloader/baseline/orderdialog.ui
+++ b/tests/auto/uiloader/baseline/orderdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/paletteeditor.ui b/tests/auto/uiloader/baseline/paletteeditor.ui
index 6a9924e..babd23f 100644
--- a/tests/auto/uiloader/baseline/paletteeditor.ui
+++ b/tests/auto/uiloader/baseline/paletteeditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui b/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
index 2d9526d..2d60c9c 100644
--- a/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
+++ b/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/phrasebookbox.ui b/tests/auto/uiloader/baseline/phrasebookbox.ui
index 38d22ee..eade5d0 100644
--- a/tests/auto/uiloader/baseline/phrasebookbox.ui
+++ b/tests/auto/uiloader/baseline/phrasebookbox.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/plugindialog.ui b/tests/auto/uiloader/baseline/plugindialog.ui
index a5b5cbc..77cca16 100644
--- a/tests/auto/uiloader/baseline/plugindialog.ui
+++ b/tests/auto/uiloader/baseline/plugindialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/previewwidget.ui b/tests/auto/uiloader/baseline/previewwidget.ui
index cae6bd8..7b2f682 100644
--- a/tests/auto/uiloader/baseline/previewwidget.ui
+++ b/tests/auto/uiloader/baseline/previewwidget.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/previewwidgetbase.ui b/tests/auto/uiloader/baseline/previewwidgetbase.ui
index 5e13e1e..7751e1b 100644
--- a/tests/auto/uiloader/baseline/previewwidgetbase.ui
+++ b/tests/auto/uiloader/baseline/previewwidgetbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/qfiledialog.ui b/tests/auto/uiloader/baseline/qfiledialog.ui
index 1af2967..c8d0278 100644
--- a/tests/auto/uiloader/baseline/qfiledialog.ui
+++ b/tests/auto/uiloader/baseline/qfiledialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/qtgradientdialog.ui b/tests/auto/uiloader/baseline/qtgradientdialog.ui
index 363a44b..6914967 100644
--- a/tests/auto/uiloader/baseline/qtgradientdialog.ui
+++ b/tests/auto/uiloader/baseline/qtgradientdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/qtgradienteditor.ui b/tests/auto/uiloader/baseline/qtgradienteditor.ui
index d5a0e8f..988e2dc 100644
--- a/tests/auto/uiloader/baseline/qtgradienteditor.ui
+++ b/tests/auto/uiloader/baseline/qtgradienteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/qtgradientviewdialog.ui b/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
index 06841d4..2699f58 100644
--- a/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
+++ b/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/saveformastemplate.ui b/tests/auto/uiloader/baseline/saveformastemplate.ui
index 8fc0163..29d4ea3 100644
--- a/tests/auto/uiloader/baseline/saveformastemplate.ui
+++ b/tests/auto/uiloader/baseline/saveformastemplate.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/statistics.ui b/tests/auto/uiloader/baseline/statistics.ui
index 383e7b1..2de0350 100644
--- a/tests/auto/uiloader/baseline/statistics.ui
+++ b/tests/auto/uiloader/baseline/statistics.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/stringlisteditor.ui b/tests/auto/uiloader/baseline/stringlisteditor.ui
index 7675ea9..6261712 100644
--- a/tests/auto/uiloader/baseline/stringlisteditor.ui
+++ b/tests/auto/uiloader/baseline/stringlisteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/tabbedbrowser.ui b/tests/auto/uiloader/baseline/tabbedbrowser.ui
index f7b5d0b..80056d9 100644
--- a/tests/auto/uiloader/baseline/tabbedbrowser.ui
+++ b/tests/auto/uiloader/baseline/tabbedbrowser.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/tablewidgeteditor.ui b/tests/auto/uiloader/baseline/tablewidgeteditor.ui
index 44c7108..96f5be5 100644
--- a/tests/auto/uiloader/baseline/tablewidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/tablewidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/translatedialog.ui b/tests/auto/uiloader/baseline/translatedialog.ui
index 49e11e1..704184a 100644
--- a/tests/auto/uiloader/baseline/translatedialog.ui
+++ b/tests/auto/uiloader/baseline/translatedialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/treewidgeteditor.ui b/tests/auto/uiloader/baseline/treewidgeteditor.ui
index 8c8b095..1a9cbe5 100644
--- a/tests/auto/uiloader/baseline/treewidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/treewidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/baseline/trpreviewtool.ui b/tests/auto/uiloader/baseline/trpreviewtool.ui
index ba99df9..5eb90c2 100644
--- a/tests/auto/uiloader/baseline/trpreviewtool.ui
+++ b/tests/auto/uiloader/baseline/trpreviewtool.ui
@@ -9,11 +9,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tests/auto/uiloader/tst_screenshot/main.cpp b/tests/auto/uiloader/tst_screenshot/main.cpp
index c8a036a..8e6a5e8 100644
--- a/tests/auto/uiloader/tst_screenshot/main.cpp
+++ b/tests/auto/uiloader/tst_screenshot/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/uiloader/uiloader/tst_uiloader.cpp b/tests/auto/uiloader/uiloader/tst_uiloader.cpp
index d5dcb23..df5971e 100644
--- a/tests/auto/uiloader/uiloader/tst_uiloader.cpp
+++ b/tests/auto/uiloader/uiloader/tst_uiloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/uiloader/uiloader/uiloader.cpp b/tests/auto/uiloader/uiloader/uiloader.cpp
index c2500c7..2ec46b4 100644
--- a/tests/auto/uiloader/uiloader/uiloader.cpp
+++ b/tests/auto/uiloader/uiloader/uiloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/uiloader/uiloader/uiloader.h b/tests/auto/uiloader/uiloader/uiloader.h
index e1d3868..df40be4 100644
--- a/tests/auto/uiloader/uiloader/uiloader.h
+++ b/tests/auto/uiloader/uiloader/uiloader.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/utf8/tst_utf8.cpp b/tests/auto/utf8/tst_utf8.cpp
index 7bbbfab..a3c6c65 100644
--- a/tests/auto/utf8/tst_utf8.cpp
+++ b/tests/auto/utf8/tst_utf8.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/windowsmobile/test/ddhelper.cpp b/tests/auto/windowsmobile/test/ddhelper.cpp
index afb7db2..a70c189 100644
--- a/tests/auto/windowsmobile/test/ddhelper.cpp
+++ b/tests/auto/windowsmobile/test/ddhelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/windowsmobile/test/ddhelper.h b/tests/auto/windowsmobile/test/ddhelper.h
index fec5fbc..5bb940a 100644
--- a/tests/auto/windowsmobile/test/ddhelper.h
+++ b/tests/auto/windowsmobile/test/ddhelper.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
index bde1e08..b0b96c5 100644
--- a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
+++ b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/windowsmobile/testQMenuBar/main.cpp b/tests/auto/windowsmobile/testQMenuBar/main.cpp
index 193790d..2e03bb8 100644
--- a/tests/auto/windowsmobile/testQMenuBar/main.cpp
+++ b/tests/auto/windowsmobile/testQMenuBar/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index d270a01..83e17d6 100644
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh b/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
index 29d21f7..2dee9b2 100755
--- a/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
+++ b/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
index f4f6181..28596e8 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
+++ b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp b/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
index 56cc897..60ece44 100644
--- a/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
+++ b/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh b/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
index 5cafa1b..3575ea5 100755
--- a/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
+++ b/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp b/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
index b5e2a1c..7d43b4d 100644
--- a/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
+++ b/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ASTItem.cpp b/tests/auto/xmlpatternssdk/ASTItem.cpp
index 3b4fbdc..04b8529 100644
--- a/tests/auto/xmlpatternssdk/ASTItem.cpp
+++ b/tests/auto/xmlpatternssdk/ASTItem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ASTItem.h b/tests/auto/xmlpatternssdk/ASTItem.h
index ca3ac8f..d92c148 100644
--- a/tests/auto/xmlpatternssdk/ASTItem.h
+++ b/tests/auto/xmlpatternssdk/ASTItem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
index 1b5121e..e4ff845 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
index d5e676d..3603958 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.cpp b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
index 3f07737..789b72b 100644
--- a/tests/auto/xmlpatternssdk/ErrorHandler.cpp
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h
index 25447a9..782da11 100644
--- a/tests/auto/xmlpatternssdk/ErrorHandler.h
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ErrorItem.cpp b/tests/auto/xmlpatternssdk/ErrorItem.cpp
index 57edc1f..58f57e6 100644
--- a/tests/auto/xmlpatternssdk/ErrorItem.cpp
+++ b/tests/auto/xmlpatternssdk/ErrorItem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ErrorItem.h b/tests/auto/xmlpatternssdk/ErrorItem.h
index 1d05872..e4e333a 100644
--- a/tests/auto/xmlpatternssdk/ErrorItem.h
+++ b/tests/auto/xmlpatternssdk/ErrorItem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ExitCode.h b/tests/auto/xmlpatternssdk/ExitCode.h
index e1810b1..3b7a2fa 100644
--- a/tests/auto/xmlpatternssdk/ExitCode.h
+++ b/tests/auto/xmlpatternssdk/ExitCode.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.cpp b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
index abbc8b3..0a457dd 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 2d9d398..eefcb1a 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.cpp b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
index 605c754..a1408d4 100644
--- a/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h
index 129d8d7..c18874b 100644
--- a/tests/auto/xmlpatternssdk/ExpressionNamer.h
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
index a83a100..b283472 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
index 2d88222..dd18367 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/Global.cpp b/tests/auto/xmlpatternssdk/Global.cpp
index f78e421..825124e 100644
--- a/tests/auto/xmlpatternssdk/Global.cpp
+++ b/tests/auto/xmlpatternssdk/Global.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h
index 53c32cb..8ffebea 100644
--- a/tests/auto/xmlpatternssdk/Global.h
+++ b/tests/auto/xmlpatternssdk/Global.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ResultThreader.cpp b/tests/auto/xmlpatternssdk/ResultThreader.cpp
index 3296854..dc3eefa 100644
--- a/tests/auto/xmlpatternssdk/ResultThreader.cpp
+++ b/tests/auto/xmlpatternssdk/ResultThreader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h
index 19749f0..6384338 100644
--- a/tests/auto/xmlpatternssdk/ResultThreader.h
+++ b/tests/auto/xmlpatternssdk/ResultThreader.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.cpp b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
index 6a46bcc..dc103ff 100644
--- a/tests/auto/xmlpatternssdk/TestBaseLine.cpp
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h
index e297128..4671a6a 100644
--- a/tests/auto/xmlpatternssdk/TestBaseLine.h
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestCase.cpp b/tests/auto/xmlpatternssdk/TestCase.cpp
index 7b424d2..c6a66aa 100644
--- a/tests/auto/xmlpatternssdk/TestCase.cpp
+++ b/tests/auto/xmlpatternssdk/TestCase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h
index 28df5f1..02b0aaf 100644
--- a/tests/auto/xmlpatternssdk/TestCase.h
+++ b/tests/auto/xmlpatternssdk/TestCase.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestContainer.cpp b/tests/auto/xmlpatternssdk/TestContainer.cpp
index ec6196c..b3b96d5 100644
--- a/tests/auto/xmlpatternssdk/TestContainer.cpp
+++ b/tests/auto/xmlpatternssdk/TestContainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestContainer.h b/tests/auto/xmlpatternssdk/TestContainer.h
index 5b93491..c6ade91 100644
--- a/tests/auto/xmlpatternssdk/TestContainer.h
+++ b/tests/auto/xmlpatternssdk/TestContainer.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestGroup.cpp b/tests/auto/xmlpatternssdk/TestGroup.cpp
index f2cd2bd..d46538e 100644
--- a/tests/auto/xmlpatternssdk/TestGroup.cpp
+++ b/tests/auto/xmlpatternssdk/TestGroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestGroup.h b/tests/auto/xmlpatternssdk/TestGroup.h
index 5f4798f..e457b81 100644
--- a/tests/auto/xmlpatternssdk/TestGroup.h
+++ b/tests/auto/xmlpatternssdk/TestGroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestItem.h b/tests/auto/xmlpatternssdk/TestItem.h
index 0b3c606..ac25967 100644
--- a/tests/auto/xmlpatternssdk/TestItem.h
+++ b/tests/auto/xmlpatternssdk/TestItem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestResult.cpp b/tests/auto/xmlpatternssdk/TestResult.cpp
index 2374bc0..bc50ed7 100644
--- a/tests/auto/xmlpatternssdk/TestResult.cpp
+++ b/tests/auto/xmlpatternssdk/TestResult.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestResult.h b/tests/auto/xmlpatternssdk/TestResult.h
index 6951f90..5ddb904 100644
--- a/tests/auto/xmlpatternssdk/TestResult.h
+++ b/tests/auto/xmlpatternssdk/TestResult.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestResultHandler.cpp b/tests/auto/xmlpatternssdk/TestResultHandler.cpp
index b87d481..dcc261c 100644
--- a/tests/auto/xmlpatternssdk/TestResultHandler.cpp
+++ b/tests/auto/xmlpatternssdk/TestResultHandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestResultHandler.h b/tests/auto/xmlpatternssdk/TestResultHandler.h
index a786ac4..0c78959 100644
--- a/tests/auto/xmlpatternssdk/TestResultHandler.h
+++ b/tests/auto/xmlpatternssdk/TestResultHandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestSuite.cpp b/tests/auto/xmlpatternssdk/TestSuite.cpp
index 2c3e49c..ef09772 100644
--- a/tests/auto/xmlpatternssdk/TestSuite.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuite.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestSuite.h b/tests/auto/xmlpatternssdk/TestSuite.h
index d14dc62..b7b8c7d 100644
--- a/tests/auto/xmlpatternssdk/TestSuite.h
+++ b/tests/auto/xmlpatternssdk/TestSuite.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
index 7c687f3..243b008 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.h b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
index 76156c0..fcff831 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestSuiteResult.cpp b/tests/auto/xmlpatternssdk/TestSuiteResult.cpp
index 4e81859..932357d 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteResult.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuiteResult.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TestSuiteResult.h b/tests/auto/xmlpatternssdk/TestSuiteResult.h
index 491c2b2..1227465 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteResult.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteResult.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TreeItem.cpp b/tests/auto/xmlpatternssdk/TreeItem.cpp
index b34262d..66ab98027 100644
--- a/tests/auto/xmlpatternssdk/TreeItem.cpp
+++ b/tests/auto/xmlpatternssdk/TreeItem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h
index f5e051f..2647d8b 100644
--- a/tests/auto/xmlpatternssdk/TreeItem.h
+++ b/tests/auto/xmlpatternssdk/TreeItem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TreeModel.cpp b/tests/auto/xmlpatternssdk/TreeModel.cpp
index e27f8e0..c900471 100644
--- a/tests/auto/xmlpatternssdk/TreeModel.cpp
+++ b/tests/auto/xmlpatternssdk/TreeModel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/TreeModel.h b/tests/auto/xmlpatternssdk/TreeModel.h
index 1d8ea72..37b4b4b 100644
--- a/tests/auto/xmlpatternssdk/TreeModel.h
+++ b/tests/auto/xmlpatternssdk/TreeModel.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/Worker.cpp b/tests/auto/xmlpatternssdk/Worker.cpp
index 0121099..8c5238e 100644
--- a/tests/auto/xmlpatternssdk/Worker.cpp
+++ b/tests/auto/xmlpatternssdk/Worker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/Worker.h b/tests/auto/xmlpatternssdk/Worker.h
index b3d7ae2..6824e16 100644
--- a/tests/auto/xmlpatternssdk/Worker.h
+++ b/tests/auto/xmlpatternssdk/Worker.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XMLWriter.cpp b/tests/auto/xmlpatternssdk/XMLWriter.cpp
index 60a5344..bfcdea0 100644
--- a/tests/auto/xmlpatternssdk/XMLWriter.cpp
+++ b/tests/auto/xmlpatternssdk/XMLWriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XMLWriter.h b/tests/auto/xmlpatternssdk/XMLWriter.h
index 2b629bb..b0ead91 100644
--- a/tests/auto/xmlpatternssdk/XMLWriter.h
+++ b/tests/auto/xmlpatternssdk/XMLWriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.cpp b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp
index 6a8645b..72f066c 100644
--- a/tests/auto/xmlpatternssdk/XQTSTestCase.cpp
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h
index 8872b32..96e2222 100644
--- a/tests/auto/xmlpatternssdk/XQTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
index 3cbb681..1429ef3 100644
--- a/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
+++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XSDTSTestCase.h b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
index 947687a..91ee623 100644
--- a/tests/auto/xmlpatternssdk/XSDTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
@@ -7,11 +7,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
index a868d19..62e408f 100644
--- a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
index 5493c7d..e22349e 100644
--- a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
index cfc3b2b..78d67a0 100644
--- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
index 8614789..308a48c 100644
--- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
index 24ee158..d34fdaa 100644
--- a/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
+++ b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
index 24ee158..d34fdaa 100644
--- a/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
+++ b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
index a10c01a..ff59a3f 100644
--- a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
+++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
index f90aea2..d53e3db 100644
--- a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
+++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
index 092e966..bcbe31a 100644
--- a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
+++ b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
index 91dee63..fa09574 100644
--- a/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
+++ b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
index 9c44d42..722ce05 100644
--- a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
+++ b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
index e1d75da..8ac0665 100644
--- a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
+++ b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/MainWindow.cpp b/tests/auto/xmlpatternsview/view/MainWindow.cpp
index e2fae32..36406d4 100644
--- a/tests/auto/xmlpatternsview/view/MainWindow.cpp
+++ b/tests/auto/xmlpatternsview/view/MainWindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/MainWindow.h b/tests/auto/xmlpatternsview/view/MainWindow.h
index b449c59..a27d9b9 100644
--- a/tests/auto/xmlpatternsview/view/MainWindow.h
+++ b/tests/auto/xmlpatternsview/view/MainWindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/TestCaseView.cpp b/tests/auto/xmlpatternsview/view/TestCaseView.cpp
index 4eb45ab..943c777 100644
--- a/tests/auto/xmlpatternsview/view/TestCaseView.cpp
+++ b/tests/auto/xmlpatternsview/view/TestCaseView.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/TestCaseView.h b/tests/auto/xmlpatternsview/view/TestCaseView.h
index 3f6582c..46c9c01 100644
--- a/tests/auto/xmlpatternsview/view/TestCaseView.h
+++ b/tests/auto/xmlpatternsview/view/TestCaseView.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/TestResultView.cpp b/tests/auto/xmlpatternsview/view/TestResultView.cpp
index 708f851..c01310d 100644
--- a/tests/auto/xmlpatternsview/view/TestResultView.cpp
+++ b/tests/auto/xmlpatternsview/view/TestResultView.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/TestResultView.h b/tests/auto/xmlpatternsview/view/TestResultView.h
index f4245d8..61b702b 100644
--- a/tests/auto/xmlpatternsview/view/TestResultView.h
+++ b/tests/auto/xmlpatternsview/view/TestResultView.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp b/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
index d6b591c..888a955 100644
--- a/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
+++ b/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/TreeSortFilter.h b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
index 994e97d..4fa8666 100644
--- a/tests/auto/xmlpatternsview/view/TreeSortFilter.h
+++ b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/UserTestCase.cpp b/tests/auto/xmlpatternsview/view/UserTestCase.cpp
index f1a7b69..b5c26e2 100644
--- a/tests/auto/xmlpatternsview/view/UserTestCase.cpp
+++ b/tests/auto/xmlpatternsview/view/UserTestCase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/UserTestCase.h b/tests/auto/xmlpatternsview/view/UserTestCase.h
index d7b2d82..3f0179c 100644
--- a/tests/auto/xmlpatternsview/view/UserTestCase.h
+++ b/tests/auto/xmlpatternsview/view/UserTestCase.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/XDTItemItem.cpp b/tests/auto/xmlpatternsview/view/XDTItemItem.cpp
index 060b1cf..09beda1 100644
--- a/tests/auto/xmlpatternsview/view/XDTItemItem.cpp
+++ b/tests/auto/xmlpatternsview/view/XDTItemItem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/XDTItemItem.h b/tests/auto/xmlpatternsview/view/XDTItemItem.h
index 491564d..8607c1c 100644
--- a/tests/auto/xmlpatternsview/view/XDTItemItem.h
+++ b/tests/auto/xmlpatternsview/view/XDTItemItem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsview/view/main.cpp b/tests/auto/xmlpatternsview/view/main.cpp
index 8623f02..c34dc11 100644
--- a/tests/auto/xmlpatternsview/view/main.cpp
+++ b/tests/auto/xmlpatternsview/view/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsxqts/summarizeBaseline.sh b/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
index 3682c8d..1899d35 100755
--- a/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
+++ b/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
index 6e10e3f..738a3a7 100644
--- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.h b/tests/auto/xmlpatternsxqts/tst_suitetest.h
index 70e56af..9505687 100644
--- a/tests/auto/xmlpatternsxqts/tst_suitetest.h
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
index 890234e..4528cd6 100644
--- a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh b/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
index 42b6fe0..aec047e 100755
--- a/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
+++ b/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp b/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
index 3294170..469420e 100644
--- a/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
+++ b/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp
index 50d8b9d..7d0605f 100644
--- a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp
+++ b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp b/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp
index 4fe4723..0f7fb30 100644
--- a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp
+++ b/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp b/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
index ad5ae98..b50b6a2 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
+++ b/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
index afa6b7b..adb601e 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
index 267d53f..55547a5 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h
index 4aad3a1..0e5eb61 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h
+++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qfile/main.cpp b/tests/benchmarks/corelib/io/qfile/main.cpp
index 2dc0e86..612c028 100644
--- a/tests/benchmarks/corelib/io/qfile/main.cpp
+++ b/tests/benchmarks/corelib/io/qfile/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qfileinfo/main.cpp b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
index 025787f..477ad97 100644
--- a/tests/benchmarks/corelib/io/qfileinfo/main.cpp
+++ b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qiodevice/main.cpp b/tests/benchmarks/corelib/io/qiodevice/main.cpp
index 4af697c..ea6aa23 100644
--- a/tests/benchmarks/corelib/io/qiodevice/main.cpp
+++ b/tests/benchmarks/corelib/io/qiodevice/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/main.cpp b/tests/benchmarks/corelib/io/qtemporaryfile/main.cpp
index 8b71189..8bbfab8 100644
--- a/tests/benchmarks/corelib/io/qtemporaryfile/main.cpp
+++ b/tests/benchmarks/corelib/io/qtemporaryfile/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/io/qurl/main.cpp b/tests/benchmarks/corelib/io/qurl/main.cpp
index 49ace64..a575b28 100644
--- a/tests/benchmarks/corelib/io/qurl/main.cpp
+++ b/tests/benchmarks/corelib/io/qurl/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/events/main.cpp b/tests/benchmarks/corelib/kernel/events/main.cpp
index 0dd2c18..d651865 100644
--- a/tests/benchmarks/corelib/kernel/events/main.cpp
+++ b/tests/benchmarks/corelib/kernel/events/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
index eef6020..5a6434a 100644
--- a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
+++ b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 36399af..1ea2e54 100644
--- a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/qobject/main.cpp b/tests/benchmarks/corelib/kernel/qobject/main.cpp
index 8d05fcd..27470b7 100644
--- a/tests/benchmarks/corelib/kernel/qobject/main.cpp
+++ b/tests/benchmarks/corelib/kernel/qobject/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/qobject/object.cpp b/tests/benchmarks/corelib/kernel/qobject/object.cpp
index 3920e97..a3a9658 100644
--- a/tests/benchmarks/corelib/kernel/qobject/object.cpp
+++ b/tests/benchmarks/corelib/kernel/qobject/object.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/qobject/object.h b/tests/benchmarks/corelib/kernel/qobject/object.h
index 8f8fbe9..f6ba380 100644
--- a/tests/benchmarks/corelib/kernel/qobject/object.h
+++ b/tests/benchmarks/corelib/kernel/qobject/object.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
index 2f265bf..8ef0c47 100644
--- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
+++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
index 58cec4f..6b9a03a 100644
--- a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index faae4d7..2d4d335 100644
--- a/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/containers-associative/main.cpp b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
index afb1ea5..7b0fc4e 100644
--- a/tests/benchmarks/corelib/tools/containers-associative/main.cpp
+++ b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
index edf0eff..0f98a10 100644
--- a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
+++ b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qbytearray/main.cpp b/tests/benchmarks/corelib/tools/qbytearray/main.cpp
index 22d4815..65be7bc 100644
--- a/tests/benchmarks/corelib/tools/qbytearray/main.cpp
+++ b/tests/benchmarks/corelib/tools/qbytearray/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qrect/main.cpp b/tests/benchmarks/corelib/tools/qrect/main.cpp
index e293bfa..2b6d573 100644
--- a/tests/benchmarks/corelib/tools/qrect/main.cpp
+++ b/tests/benchmarks/corelib/tools/qrect/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp
index 51cde95..e1642f4 100644
--- a/tests/benchmarks/corelib/tools/qregexp/main.cpp
+++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qstring/data.h b/tests/benchmarks/corelib/tools/qstring/data.h
index c7a7467..a9cb9c3 100644
--- a/tests/benchmarks/corelib/tools/qstring/data.h
+++ b/tests/benchmarks/corelib/tools/qstring/data.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qstring/generatelist.pl b/tests/benchmarks/corelib/tools/qstring/generatelist.pl
index d027adb..c0a7dae9 100644
--- a/tests/benchmarks/corelib/tools/qstring/generatelist.pl
+++ b/tests/benchmarks/corelib/tools/qstring/generatelist.pl
@@ -6,11 +6,11 @@
 ## This file is part of the QtCore module of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -24,16 +24,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 #
 # Parses a file (passed as argument) that contains a dump of pairs of
diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp
index 9616052..d3ee2d6 100644
--- a/tests/benchmarks/corelib/tools/qstring/main.cpp
+++ b/tests/benchmarks/corelib/tools/qstring/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp b/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp
index d46a36b..9b61ecb 100644
--- a/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp
+++ b/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qstringlist/main.cpp b/tests/benchmarks/corelib/tools/qstringlist/main.cpp
index a4969bf..caca87b 100644
--- a/tests/benchmarks/corelib/tools/qstringlist/main.cpp
+++ b/tests/benchmarks/corelib/tools/qstringlist/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qvector/main.cpp b/tests/benchmarks/corelib/tools/qvector/main.cpp
index 29c4440..41eb226 100644
--- a/tests/benchmarks/corelib/tools/qvector/main.cpp
+++ b/tests/benchmarks/corelib/tools/qvector/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qvector/outofline.cpp b/tests/benchmarks/corelib/tools/qvector/outofline.cpp
index e8d036e..8a65652 100644
--- a/tests/benchmarks/corelib/tools/qvector/outofline.cpp
+++ b/tests/benchmarks/corelib/tools/qvector/outofline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtTest module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
index 1824d20..c6c2927 100644
--- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h
+++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/binding/testtypes.cpp b/tests/benchmarks/declarative/binding/testtypes.cpp
index 1fc9ccd..f153c19 100644
--- a/tests/benchmarks/declarative/binding/testtypes.cpp
+++ b/tests/benchmarks/declarative/binding/testtypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/binding/testtypes.h b/tests/benchmarks/declarative/binding/testtypes.h
index 0cbaa42..9f23aad 100644
--- a/tests/benchmarks/declarative/binding/testtypes.h
+++ b/tests/benchmarks/declarative/binding/testtypes.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/declarative/binding/tst_binding.cpp
index 6e3e146..78897d9 100644
--- a/tests/benchmarks/declarative/binding/tst_binding.cpp
+++ b/tests/benchmarks/declarative/binding/tst_binding.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml b/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
index b757900..d24a07a 100644
--- a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
+++ b/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/compilation/tst_compilation.cpp b/tests/benchmarks/declarative/compilation/tst_compilation.cpp
index 2f4cd15..51e7739 100644
--- a/tests/benchmarks/declarative/compilation/tst_compilation.cpp
+++ b/tests/benchmarks/declarative/compilation/tst_compilation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/creation/data/item.qml b/tests/benchmarks/declarative/creation/data/item.qml
index a6223d0..0e51676 100644
--- a/tests/benchmarks/declarative/creation/data/item.qml
+++ b/tests/benchmarks/declarative/creation/data/item.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/creation/data/qobject.qml b/tests/benchmarks/declarative/creation/data/qobject.qml
index 33aeb57..166e51d 100644
--- a/tests/benchmarks/declarative/creation/data/qobject.qml
+++ b/tests/benchmarks/declarative/creation/data/qobject.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 6bf7943..682c909 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/painting/paintbenchmark.cpp b/tests/benchmarks/declarative/painting/paintbenchmark.cpp
index 073e14e..4e5b6d4 100644
--- a/tests/benchmarks/declarative/painting/paintbenchmark.cpp
+++ b/tests/benchmarks/declarative/painting/paintbenchmark.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/pointers/tst_pointers.cpp b/tests/benchmarks/declarative/pointers/tst_pointers.cpp
index 7257bee..5a2eab1 100644
--- a/tests/benchmarks/declarative/pointers/tst_pointers.cpp
+++ b/tests/benchmarks/declarative/pointers/tst_pointers.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
index 464c77f..098b678 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
index 2aada7c..850949b 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
index e484ef7..8354aa2 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
index 3ce3296..2a66128 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
index 073ed90..da6e534 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
index 6cf304c..b56a47d 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
index c4fc05c..6e771e3 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
index 7bc6ca2..b11fc03 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h
index 0cbaa42..9f23aad 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
index 13420ff..71d48e1 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 104746e..13f8239 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
index 90145e8..8b5a4dc 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
index 29dfbe5..398adae 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index 6e71e7d..198d119 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/example.qml b/tests/benchmarks/declarative/qmltime/example.qml
index 4b6de1d..7f9e6a1 100644
--- a/tests/benchmarks/declarative/qmltime/example.qml
+++ b/tests/benchmarks/declarative/qmltime/example.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp
index e1b73ca..6472255 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.cpp
+++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
index f9418f8..1e9da44 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
index ef6839f..b3416c4 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
index b719001..25e104f 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
index d109313..ee74c54 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
index 6c055dc..e78fa74 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
index eed5339..c416e8b 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
index cc27f04..433462c 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
index 7f8909d..4b04c0d 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
index 05e287b..2bdbf2d 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
index 7199a50..29d9c51 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
index a668423..875f193 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
index 7070d91..aac9565 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
index 7bf14de..abaa5b4 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
index 2b95d60..83af55d 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
index 417ec94..b31a0ec 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
index 3e9a076..04d788f 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
index d87aa32..27f1494 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
index dc2fcb4..c1ce527 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
index 3adefbc..54bb45f 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/CustomObject.qml b/tests/benchmarks/declarative/script/data/CustomObject.qml
index 97f6d39..3e00bf3 100644
--- a/tests/benchmarks/declarative/script/data/CustomObject.qml
+++ b/tests/benchmarks/declarative/script/data/CustomObject.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/block.qml b/tests/benchmarks/declarative/script/data/block.qml
index 4575050..400eb05 100644
--- a/tests/benchmarks/declarative/script/data/block.qml
+++ b/tests/benchmarks/declarative/script/data/block.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/global.js b/tests/benchmarks/declarative/script/data/global.js
index 5b86b4d..b45908b 100644
--- a/tests/benchmarks/declarative/script/data/global.js
+++ b/tests/benchmarks/declarative/script/data/global.js
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/global_prop.qml b/tests/benchmarks/declarative/script/data/global_prop.qml
index 29bbb7d..65c5398 100644
--- a/tests/benchmarks/declarative/script/data/global_prop.qml
+++ b/tests/benchmarks/declarative/script/data/global_prop.qml
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/signal_args.qml b/tests/benchmarks/declarative/script/data/signal_args.qml
index 68e4d2a..34fc20e 100644
--- a/tests/benchmarks/declarative/script/data/signal_args.qml
+++ b/tests/benchmarks/declarative/script/data/signal_args.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/signal_qml.qml b/tests/benchmarks/declarative/script/data/signal_qml.qml
index b161a66..d4b31dd 100644
--- a/tests/benchmarks/declarative/script/data/signal_qml.qml
+++ b/tests/benchmarks/declarative/script/data/signal_qml.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/signal_unconnected.qml b/tests/benchmarks/declarative/script/data/signal_unconnected.qml
index e358c7b..11d4b8b 100644
--- a/tests/benchmarks/declarative/script/data/signal_unconnected.qml
+++ b/tests/benchmarks/declarative/script/data/signal_unconnected.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/signal_unusedArgs.qml b/tests/benchmarks/declarative/script/data/signal_unusedArgs.qml
index 4941694..fc4114a 100644
--- a/tests/benchmarks/declarative/script/data/signal_unusedArgs.qml
+++ b/tests/benchmarks/declarative/script/data/signal_unusedArgs.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/slot_complex.qml b/tests/benchmarks/declarative/script/data/slot_complex.qml
index 49e247c..d0ff5f8 100644
--- a/tests/benchmarks/declarative/script/data/slot_complex.qml
+++ b/tests/benchmarks/declarative/script/data/slot_complex.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/slot_complex_js.qml b/tests/benchmarks/declarative/script/data/slot_complex_js.qml
index c0864aa..2b557fa 100644
--- a/tests/benchmarks/declarative/script/data/slot_complex_js.qml
+++ b/tests/benchmarks/declarative/script/data/slot_complex_js.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/slot_simple.qml b/tests/benchmarks/declarative/script/data/slot_simple.qml
index 110aacf..1cacaba 100644
--- a/tests/benchmarks/declarative/script/data/slot_simple.qml
+++ b/tests/benchmarks/declarative/script/data/slot_simple.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/data/slot_simple_js.qml b/tests/benchmarks/declarative/script/data/slot_simple_js.qml
index 14fc0cd..c09356f 100644
--- a/tests/benchmarks/declarative/script/data/slot_simple_js.qml
+++ b/tests/benchmarks/declarative/script/data/slot_simple_js.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index 5a7e151..6f3c81f 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml
index 6f0666b..7737a1c 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml
+++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml
index 79ba001..407eb8e 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml
+++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml
index 57c9c5e..17ff0f0 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml
+++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml
index ad75840..e051912 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml
+++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/typeimports/data/cpp.qml b/tests/benchmarks/declarative/typeimports/data/cpp.qml
index efe1e1f..97d9038 100644
--- a/tests/benchmarks/declarative/typeimports/data/cpp.qml
+++ b/tests/benchmarks/declarative/typeimports/data/cpp.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/typeimports/data/qml.qml b/tests/benchmarks/declarative/typeimports/data/qml.qml
index da723a3..51756e1 100644
--- a/tests/benchmarks/declarative/typeimports/data/qml.qml
+++ b/tests/benchmarks/declarative/typeimports/data/qml.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp b/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp
index 4bab89f..587976d 100644
--- a/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp
+++ b/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp b/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
index f79cc5b..30eb2db 100644
--- a/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
+++ b/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/animation/qanimation/dummyanimation.h b/tests/benchmarks/gui/animation/qanimation/dummyanimation.h
index 1df76be..de24eb5 100644
--- a/tests/benchmarks/gui/animation/qanimation/dummyanimation.h
+++ b/tests/benchmarks/gui/animation/qanimation/dummyanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/animation/qanimation/dummyobject.cpp b/tests/benchmarks/gui/animation/qanimation/dummyobject.cpp
index 2b66cda..463c85b 100644
--- a/tests/benchmarks/gui/animation/qanimation/dummyobject.cpp
+++ b/tests/benchmarks/gui/animation/qanimation/dummyobject.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/animation/qanimation/dummyobject.h b/tests/benchmarks/gui/animation/qanimation/dummyobject.h
index 31614fd..6c75366 100644
--- a/tests/benchmarks/gui/animation/qanimation/dummyobject.h
+++ b/tests/benchmarks/gui/animation/qanimation/dummyobject.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/animation/qanimation/main.cpp b/tests/benchmarks/gui/animation/qanimation/main.cpp
index 8b9884e..5458d3b 100644
--- a/tests/benchmarks/gui/animation/qanimation/main.cpp
+++ b/tests/benchmarks/gui/animation/qanimation/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/animation/qanimation/rectanimation.cpp b/tests/benchmarks/gui/animation/qanimation/rectanimation.cpp
index e6d7a7e..02e3e3f 100644
--- a/tests/benchmarks/gui/animation/qanimation/rectanimation.cpp
+++ b/tests/benchmarks/gui/animation/qanimation/rectanimation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/animation/qanimation/rectanimation.h b/tests/benchmarks/gui/animation/qanimation/rectanimation.h
index 42b9376..4056cea 100644
--- a/tests/benchmarks/gui/animation/qanimation/rectanimation.h
+++ b/tests/benchmarks/gui/animation/qanimation/rectanimation.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp
index 2c1274c..82f3b54 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp
index f866fd7..ec3a077 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h
index 026bd11..db5918f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp
index fe03a21..a252c94 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h
index 2e191a1..eb742ba 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp
index f6d7a6c..6682b77 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h
index 5e15d52..a1dcd14 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp
index 528bd87..5410e7b 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h
index 3649cb0..096bc11 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp
index e4cef5d..e94bbc0 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h
index e69dbfe..70c8fd1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
index 3380ea4..bc99a45 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h
index adea9da..151a468 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp
index 4fadac6..fb4782f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h
index 8676d92..e5a7adc 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp
index 0c3eba4..5d97bac 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h
index a6c0ff1..714c0ea 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.cpp
index e2b6f78..724ba2a 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
index fbe7426..454d091 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp
index 44bbc7f..8ec168e 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
index 3828a58..d91c6b1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp
index f05904e..c2e9b93 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h
index d40e34c..f3adea9 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.cpp
index 38076e9..7786fc1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h
index 8f90395..bcdaf9a 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp
index 344d7e8..4f7d288 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h
index 29ea302..8de4ad9 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp
index b91a84c..2165ee4 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h
index 76d8354..21aab46 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp
index e794622..709fc17 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h
index 7db47a0..c3a2371 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp
index 89e8215..c7fbae9 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h
index 31b69a5..da4429b 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
index fe10b28..df33258 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h
index dfa12d6..7601cd6 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp
index 736b9fe..7c86738 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h
index 342083f..cb0e693 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
index ad62a9d..9864164 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
index 7591be6..f01f4ec 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp
index 3de39b8..f546e5d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h
index 1f762ec..891d868 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp
index f84b90a..349b196 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.h
index a155eef..37b3380 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h
index 990843a..c1f71ae 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp
index 4cf05e5..d857b5b 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h
index 3b0ae04..42c4f0f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp
index 1cdcaf9..9c973cd 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h
index d3c9f35..c6b38a5 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller_p.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller_p.h
index 69c04a0..4665efa 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller_p.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.cpp
index bffedf7..370f673e 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h
index d2c0122..2513df3 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp
index af25628..878e1eb 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.h
index 152cce7..a9501e8 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
index 106f435..8daed8e 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h
index 25a0546..ec49df8 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp
index 4ed8608..348320d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h
index 51db185..72cfadd 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
index 75bc320..03c9a53 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
index 365b1fd..3e2d862 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp
index 68ffcd5..cf95ebf 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h
index e2722ed..f208161 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp
index 2f113ee..673fa8f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h
index 1e73424..bab8ea6 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h
index 4a81e89..c1a0664 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 01285d1..993c311 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index e17cf1c..30668c4 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 10d73d5..c9dc77c 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.cpp
index 77b86c1..87d9142 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.h
index 9db23f9..ef40293 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp
index ea2f94a..adcd9c8 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.cpp
index 452b42c..65fb031 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h
index 558bbef..a43eaa1 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
index 6c4ca08..912dbda 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h
index fc5c226..8697499 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
index 63b0da9..3ca247f 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
index 3f30393..79d9491 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
index 4c1020a..f3882e5 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
index 9db23f9..ef40293 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
index 8cada67..525f3e5 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
index 1a73bb7..f57a208 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index ba56d58..7e54b63 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 7db98ce..0e77553 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/image/blendbench/main.cpp b/tests/benchmarks/gui/image/blendbench/main.cpp
index d420d6c..6793379 100644
--- a/tests/benchmarks/gui/image/blendbench/main.cpp
+++ b/tests/benchmarks/gui/image/blendbench/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
index 1c76d46..617157d 100644
--- a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
+++ b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
index 3f38d19..efe66ab 100644
--- a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp b/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp
index 27e5025..e0832f8 100644
--- a/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp b/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
index 1031ba7..c5116a5 100644
--- a/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
index a84d8b5..570f9a1 100644
--- a/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/kernel/qapplication/main.cpp b/tests/benchmarks/gui/kernel/qapplication/main.cpp
index c912497..0e1ac8e 100644
--- a/tests/benchmarks/gui/kernel/qapplication/main.cpp
+++ b/tests/benchmarks/gui/kernel/qapplication/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
index 7015bd1..2bef200 100644
--- a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp b/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp
index e962198..2b3baa3 100644
--- a/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp
+++ b/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
index 7930092..735a3ce 100644
--- a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
index 318b671..c01cb4e 100644
--- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/painting/qregion/main.cpp b/tests/benchmarks/gui/painting/qregion/main.cpp
index 1d19854..cc2f373 100644
--- a/tests/benchmarks/gui/painting/qregion/main.cpp
+++ b/tests/benchmarks/gui/painting/qregion/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
index 824825b..3580ac9 100644
--- a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
+++ b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
@@ -7,11 +7,11 @@
 ** This file is part of the FOO module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp
index 8eef472..291445f 100644
--- a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp
+++ b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp b/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp
index ff2633d..9cdcb11 100644
--- a/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp
+++ b/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp b/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp
index b33cf58..1f3286e 100644
--- a/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
index d051b12..9eca903 100644
--- a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
+++ b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/text/qfontmetrics/main.cpp b/tests/benchmarks/gui/text/qfontmetrics/main.cpp
index d3f85ef..718c1fc 100644
--- a/tests/benchmarks/gui/text/qfontmetrics/main.cpp
+++ b/tests/benchmarks/gui/text/qfontmetrics/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp
index 63daae0..9e1c9d4 100644
--- a/tests/benchmarks/gui/text/qtext/main.cpp
+++ b/tests/benchmarks/gui/text/qtext/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
index 7534e09..f4b1233 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 90ae153..f8d40cb 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/network/kernel/qhostinfo/main.cpp b/tests/benchmarks/network/kernel/qhostinfo/main.cpp
index f4648d6..8299f62 100644
--- a/tests/benchmarks/network/kernel/qhostinfo/main.cpp
+++ b/tests/benchmarks/network/kernel/qhostinfo/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
index c77c619..0e7b699 100644
--- a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/opengl/main.cpp b/tests/benchmarks/opengl/main.cpp
index c042fce..219a438 100644
--- a/tests/benchmarks/opengl/main.cpp
+++ b/tests/benchmarks/opengl/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp
index 2cb9421..971801b 100644
--- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp
+++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
index 6ab78b1..1588945 100644
--- a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
index 4610046..eceb2c4 100644
--- a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp b/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp
index d7bb04b..22d2422 100644
--- a/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp b/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
index 7d06744..9ba234a 100644
--- a/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
+++ b/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp
index 895ffe0..100b5a6 100644
--- a/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp
index 2f90837..34c76e6 100644
--- a/tests/manual/bearerex/bearerex.cpp
+++ b/tests/manual/bearerex/bearerex.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h
index b81d486..f8e2601 100644
--- a/tests/manual/bearerex/bearerex.h
+++ b/tests/manual/bearerex/bearerex.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/bearerex/datatransferer.cpp b/tests/manual/bearerex/datatransferer.cpp
index c3c13a8..bd0d1ee 100644
--- a/tests/manual/bearerex/datatransferer.cpp
+++ b/tests/manual/bearerex/datatransferer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/bearerex/datatransferer.h b/tests/manual/bearerex/datatransferer.h
index f2159b7..dd2e4fc 100644
--- a/tests/manual/bearerex/datatransferer.h
+++ b/tests/manual/bearerex/datatransferer.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/bearerex/main.cpp b/tests/manual/bearerex/main.cpp
index 704321a..ebcd32b 100644
--- a/tests/manual/bearerex/main.cpp
+++ b/tests/manual/bearerex/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/bearerex/xqlistwidget.cpp b/tests/manual/bearerex/xqlistwidget.cpp
index e4b12f2..ae0234d 100644
--- a/tests/manual/bearerex/xqlistwidget.cpp
+++ b/tests/manual/bearerex/xqlistwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/bearerex/xqlistwidget.h b/tests/manual/bearerex/xqlistwidget.h
index 7c12138..2c1ba54 100644
--- a/tests/manual/bearerex/xqlistwidget.h
+++ b/tests/manual/bearerex/xqlistwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/graphicsview/gestures.cpp b/tests/manual/gestures/graphicsview/gestures.cpp
index 5a970d4..f9d4d31 100644
--- a/tests/manual/gestures/graphicsview/gestures.cpp
+++ b/tests/manual/gestures/graphicsview/gestures.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/graphicsview/gestures.h b/tests/manual/gestures/graphicsview/gestures.h
index 1c05355..133b58d 100644
--- a/tests/manual/gestures/graphicsview/gestures.h
+++ b/tests/manual/gestures/graphicsview/gestures.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/graphicsview/imageitem.cpp b/tests/manual/gestures/graphicsview/imageitem.cpp
index e14699b..0d77b2e 100644
--- a/tests/manual/gestures/graphicsview/imageitem.cpp
+++ b/tests/manual/gestures/graphicsview/imageitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/graphicsview/imageitem.h b/tests/manual/gestures/graphicsview/imageitem.h
index dea8f26..a3503d7 100644
--- a/tests/manual/gestures/graphicsview/imageitem.h
+++ b/tests/manual/gestures/graphicsview/imageitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/graphicsview/main.cpp b/tests/manual/gestures/graphicsview/main.cpp
index 6f00cf5..d424223 100644
--- a/tests/manual/gestures/graphicsview/main.cpp
+++ b/tests/manual/gestures/graphicsview/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp b/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp
index 4eb7582..bbc8c9d 100644
--- a/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp
+++ b/tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/graphicsview/mousepangesturerecognizer.h b/tests/manual/gestures/graphicsview/mousepangesturerecognizer.h
index 9682f22..567d83d 100644
--- a/tests/manual/gestures/graphicsview/mousepangesturerecognizer.h
+++ b/tests/manual/gestures/graphicsview/mousepangesturerecognizer.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/scrollarea/main.cpp b/tests/manual/gestures/scrollarea/main.cpp
index 8854856..62e750d 100644
--- a/tests/manual/gestures/scrollarea/main.cpp
+++ b/tests/manual/gestures/scrollarea/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp b/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp
index 9f93eee..a06f561 100644
--- a/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp
+++ b/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/gestures/scrollarea/mousepangesturerecognizer.h b/tests/manual/gestures/scrollarea/mousepangesturerecognizer.h
index 9682f22..567d83d 100644
--- a/tests/manual/gestures/scrollarea/mousepangesturerecognizer.h
+++ b/tests/manual/gestures/scrollarea/mousepangesturerecognizer.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/inputmethodhints/inputmethodhints.cpp b/tests/manual/inputmethodhints/inputmethodhints.cpp
index 0c00b8d..6ddf19d 100644
--- a/tests/manual/inputmethodhints/inputmethodhints.cpp
+++ b/tests/manual/inputmethodhints/inputmethodhints.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h
index 988a4be..a5e1fc6 100644
--- a/tests/manual/inputmethodhints/inputmethodhints.h
+++ b/tests/manual/inputmethodhints/inputmethodhints.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/inputmethodhints/main.cpp b/tests/manual/inputmethodhints/main.cpp
index 022bf3f..cc4a406 100644
--- a/tests/manual/inputmethodhints/main.cpp
+++ b/tests/manual/inputmethodhints/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/keypadnavigation/main.cpp b/tests/manual/keypadnavigation/main.cpp
index 5115a78..b9a5fa2 100644
--- a/tests/manual/keypadnavigation/main.cpp
+++ b/tests/manual/keypadnavigation/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
index 90a95e7..f80abab 100644
--- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
+++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/network_stresstest/minihttpserver.cpp b/tests/manual/network_stresstest/minihttpserver.cpp
index 3630674..b9fa995 100644
--- a/tests/manual/network_stresstest/minihttpserver.cpp
+++ b/tests/manual/network_stresstest/minihttpserver.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the FOO module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/network_stresstest/minihttpserver.h b/tests/manual/network_stresstest/minihttpserver.h
index 9fcc8fc..4fe205f 100644
--- a/tests/manual/network_stresstest/minihttpserver.h
+++ b/tests/manual/network_stresstest/minihttpserver.h
@@ -7,11 +7,11 @@
 ** This file is part of the FOO module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp
index 34d83e1..a1f32ed 100644
--- a/tests/manual/network_stresstest/tst_network_stresstest.cpp
+++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qcursor/allcursors/main.cpp b/tests/manual/qcursor/allcursors/main.cpp
index 825b12a..1c893be 100644
--- a/tests/manual/qcursor/allcursors/main.cpp
+++ b/tests/manual/qcursor/allcursors/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qcursor/allcursors/mainwindow.cpp b/tests/manual/qcursor/allcursors/mainwindow.cpp
index 2ebe611..187efef 100644
--- a/tests/manual/qcursor/allcursors/mainwindow.cpp
+++ b/tests/manual/qcursor/allcursors/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qcursor/allcursors/mainwindow.h b/tests/manual/qcursor/allcursors/mainwindow.h
index 3d482c3..b08d918 100644
--- a/tests/manual/qcursor/allcursors/mainwindow.h
+++ b/tests/manual/qcursor/allcursors/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qcursor/grab_override/main.cpp b/tests/manual/qcursor/grab_override/main.cpp
index 825b12a..1c893be 100644
--- a/tests/manual/qcursor/grab_override/main.cpp
+++ b/tests/manual/qcursor/grab_override/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qcursor/grab_override/mainwindow.cpp b/tests/manual/qcursor/grab_override/mainwindow.cpp
index 4071970..eea4bd1 100644
--- a/tests/manual/qcursor/grab_override/mainwindow.cpp
+++ b/tests/manual/qcursor/grab_override/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qcursor/grab_override/mainwindow.h b/tests/manual/qcursor/grab_override/mainwindow.h
index d2d7cb3..03d5ee6 100644
--- a/tests/manual/qcursor/grab_override/mainwindow.h
+++ b/tests/manual/qcursor/grab_override/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qdesktopwidget/main.cpp b/tests/manual/qdesktopwidget/main.cpp
index dbd0cbc..f86ac0a 100644
--- a/tests/manual/qdesktopwidget/main.cpp
+++ b/tests/manual/qdesktopwidget/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qgraphicsitemgroup/customitem.cpp b/tests/manual/qgraphicsitemgroup/customitem.cpp
index 12bbd07..cee8c4c 100644
--- a/tests/manual/qgraphicsitemgroup/customitem.cpp
+++ b/tests/manual/qgraphicsitemgroup/customitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qgraphicsitemgroup/customitem.h b/tests/manual/qgraphicsitemgroup/customitem.h
index 1ba2078..d4463d8 100644
--- a/tests/manual/qgraphicsitemgroup/customitem.h
+++ b/tests/manual/qgraphicsitemgroup/customitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qgraphicsitemgroup/main.cpp b/tests/manual/qgraphicsitemgroup/main.cpp
index c5d8e4e..0fb7998 100644
--- a/tests/manual/qgraphicsitemgroup/main.cpp
+++ b/tests/manual/qgraphicsitemgroup/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qgraphicsitemgroup/widget.cpp b/tests/manual/qgraphicsitemgroup/widget.cpp
index fb1d9e8..5f790f3 100644
--- a/tests/manual/qgraphicsitemgroup/widget.cpp
+++ b/tests/manual/qgraphicsitemgroup/widget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qgraphicsitemgroup/widget.h b/tests/manual/qgraphicsitemgroup/widget.h
index a41b800..be324b2 100644
--- a/tests/manual/qgraphicsitemgroup/widget.h
+++ b/tests/manual/qgraphicsitemgroup/widget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qhttpnetworkconnection/main.cpp b/tests/manual/qhttpnetworkconnection/main.cpp
index bd3ea70..de0e6cd 100644
--- a/tests/manual/qhttpnetworkconnection/main.cpp
+++ b/tests/manual/qhttpnetworkconnection/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qimagereader/main.cpp b/tests/manual/qimagereader/main.cpp
index 64f809b..e268bf5 100644
--- a/tests/manual/qimagereader/main.cpp
+++ b/tests/manual/qimagereader/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp
index 015d66e..79f8f98 100644
--- a/tests/manual/qnetworkreply/main.cpp
+++ b/tests/manual/qnetworkreply/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/device_information/main.cpp b/tests/manual/qtabletevent/device_information/main.cpp
index 6fdb443..baf2601 100644
--- a/tests/manual/qtabletevent/device_information/main.cpp
+++ b/tests/manual/qtabletevent/device_information/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.cpp b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
index 804c46c..6dd5aea 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.h b/tests/manual/qtabletevent/device_information/tabletwidget.h
index e108321..4d1c1b3 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.h
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/event_compression/main.cpp b/tests/manual/qtabletevent/event_compression/main.cpp
index f8aba5f..967a33a 100644
--- a/tests/manual/qtabletevent/event_compression/main.cpp
+++ b/tests/manual/qtabletevent/event_compression/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/event_compression/mousestatwidget.cpp b/tests/manual/qtabletevent/event_compression/mousestatwidget.cpp
index 2c9a494..b56f0dc 100644
--- a/tests/manual/qtabletevent/event_compression/mousestatwidget.cpp
+++ b/tests/manual/qtabletevent/event_compression/mousestatwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/event_compression/mousestatwidget.h b/tests/manual/qtabletevent/event_compression/mousestatwidget.h
index d93d952..ef12e11 100644
--- a/tests/manual/qtabletevent/event_compression/mousestatwidget.h
+++ b/tests/manual/qtabletevent/event_compression/mousestatwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/regular_widgets/main.cpp b/tests/manual/qtabletevent/regular_widgets/main.cpp
index a39e094..c6ae130 100644
--- a/tests/manual/qtabletevent/regular_widgets/main.cpp
+++ b/tests/manual/qtabletevent/regular_widgets/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the FOO module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtbug-8933/main.cpp b/tests/manual/qtbug-8933/main.cpp
index c5d8e4e..0fb7998 100644
--- a/tests/manual/qtbug-8933/main.cpp
+++ b/tests/manual/qtbug-8933/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtbug-8933/widget.cpp b/tests/manual/qtbug-8933/widget.cpp
index 4120a8f..1b0840f 100644
--- a/tests/manual/qtbug-8933/widget.cpp
+++ b/tests/manual/qtbug-8933/widget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtbug-8933/widget.h b/tests/manual/qtbug-8933/widget.h
index 01aa141..8f76bba 100644
--- a/tests/manual/qtbug-8933/widget.h
+++ b/tests/manual/qtbug-8933/widget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtouchevent/main.cpp b/tests/manual/qtouchevent/main.cpp
index 9cccdcb..5980a05 100644
--- a/tests/manual/qtouchevent/main.cpp
+++ b/tests/manual/qtouchevent/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtouchevent/touchwidget.cpp b/tests/manual/qtouchevent/touchwidget.cpp
index 6f6343b..8fa9b71 100644
--- a/tests/manual/qtouchevent/touchwidget.cpp
+++ b/tests/manual/qtouchevent/touchwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtouchevent/touchwidget.h b/tests/manual/qtouchevent/touchwidget.h
index bd55f14..d801b38 100644
--- a/tests/manual/qtouchevent/touchwidget.h
+++ b/tests/manual/qtouchevent/touchwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qwidget_zorder/main.cpp b/tests/manual/qwidget_zorder/main.cpp
index dc6190a..65ce6ec 100644
--- a/tests/manual/qwidget_zorder/main.cpp
+++ b/tests/manual/qwidget_zorder/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/mainwindow/main.cpp b/tests/manual/repaint/mainwindow/main.cpp
index c8524b8..ab6261d 100644
--- a/tests/manual/repaint/mainwindow/main.cpp
+++ b/tests/manual/repaint/mainwindow/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/scrollarea/main.cpp b/tests/manual/repaint/scrollarea/main.cpp
index 33a0a1f..b8ddbe5 100644
--- a/tests/manual/repaint/scrollarea/main.cpp
+++ b/tests/manual/repaint/scrollarea/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/shared/shared.h b/tests/manual/repaint/shared/shared.h
index d1caf30..2e8259a 100644
--- a/tests/manual/repaint/shared/shared.h
+++ b/tests/manual/repaint/shared/shared.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/splitter/main.cpp b/tests/manual/repaint/splitter/main.cpp
index 626e826..56e6f42 100644
--- a/tests/manual/repaint/splitter/main.cpp
+++ b/tests/manual/repaint/splitter/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/tableview/main.cpp b/tests/manual/repaint/tableview/main.cpp
index 80d71bc..f7d3cef 100644
--- a/tests/manual/repaint/tableview/main.cpp
+++ b/tests/manual/repaint/tableview/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/task141091/main.cpp b/tests/manual/repaint/task141091/main.cpp
index 3987bfa..8c7bb5d 100644
--- a/tests/manual/repaint/task141091/main.cpp
+++ b/tests/manual/repaint/task141091/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/toplevel/main.cpp b/tests/manual/repaint/toplevel/main.cpp
index aa7cab3..b190757 100644
--- a/tests/manual/repaint/toplevel/main.cpp
+++ b/tests/manual/repaint/toplevel/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/repaint/widget/main.cpp b/tests/manual/repaint/widget/main.cpp
index 8c86b2a..13dc6b9 100644
--- a/tests/manual/repaint/widget/main.cpp
+++ b/tests/manual/repaint/widget/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/textrendering/glyphshaping/main.cpp b/tests/manual/textrendering/glyphshaping/main.cpp
index 9a731c1..08f56ae 100644
--- a/tests/manual/textrendering/glyphshaping/main.cpp
+++ b/tests/manual/textrendering/glyphshaping/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp
index 5a690a1..98b1586 100644
--- a/tests/manual/textrendering/textperformance/main.cpp
+++ b/tests/manual/textrendering/textperformance/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp
index 83cd989..f0e1b33 100644
--- a/tests/manual/windowflags/controllerwindow.cpp
+++ b/tests/manual/windowflags/controllerwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h
index a246e46..8305bed 100644
--- a/tests/manual/windowflags/controllerwindow.h
+++ b/tests/manual/windowflags/controllerwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/main.cpp b/tests/manual/windowflags/main.cpp
index cfccce5..5949770 100644
--- a/tests/manual/windowflags/main.cpp
+++ b/tests/manual/windowflags/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp
index 28d9ef8..5ba6386 100644
--- a/tests/manual/windowflags/previewwindow.cpp
+++ b/tests/manual/windowflags/previewwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h
index a4d5b87..9df5150 100644
--- a/tests/manual/windowflags/previewwindow.h
+++ b/tests/manual/windowflags/previewwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/shared/filesystem.h b/tests/shared/filesystem.h
index 2d46c0d..75f750a 100644
--- a/tests/shared/filesystem.h
+++ b/tests/shared/filesystem.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/shared/util.h b/tests/shared/util.h
index b759005..a833524 100644
--- a/tests/shared/util.h
+++ b/tests/shared/util.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/dumpcpp/main.cpp b/tools/activeqt/dumpcpp/main.cpp
index 74beda5..e3b4ba3 100644
--- a/tools/activeqt/dumpcpp/main.cpp
+++ b/tools/activeqt/dumpcpp/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/dumpdoc/main.cpp b/tools/activeqt/dumpdoc/main.cpp
index fdc286d..53d31eb 100644
--- a/tools/activeqt/dumpdoc/main.cpp
+++ b/tools/activeqt/dumpdoc/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/ambientproperties.cpp b/tools/activeqt/testcon/ambientproperties.cpp
index 10c6e54..3149cc5 100644
--- a/tools/activeqt/testcon/ambientproperties.cpp
+++ b/tools/activeqt/testcon/ambientproperties.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/ambientproperties.h b/tools/activeqt/testcon/ambientproperties.h
index 0bdbc8d..5d97f7f 100644
--- a/tools/activeqt/testcon/ambientproperties.h
+++ b/tools/activeqt/testcon/ambientproperties.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/ambientproperties.ui b/tools/activeqt/testcon/ambientproperties.ui
index 406d09d..b03374b 100644
--- a/tools/activeqt/testcon/ambientproperties.ui
+++ b/tools/activeqt/testcon/ambientproperties.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/activeqt/testcon/changeproperties.cpp b/tools/activeqt/testcon/changeproperties.cpp
index 00a2cab..174d2dc 100644
--- a/tools/activeqt/testcon/changeproperties.cpp
+++ b/tools/activeqt/testcon/changeproperties.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/changeproperties.h b/tools/activeqt/testcon/changeproperties.h
index 468eb41..809cf99 100644
--- a/tools/activeqt/testcon/changeproperties.h
+++ b/tools/activeqt/testcon/changeproperties.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/changeproperties.ui b/tools/activeqt/testcon/changeproperties.ui
index 2f29019..0467c67 100644
--- a/tools/activeqt/testcon/changeproperties.ui
+++ b/tools/activeqt/testcon/changeproperties.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/activeqt/testcon/controlinfo.cpp b/tools/activeqt/testcon/controlinfo.cpp
index 21b8b8c..eeff793 100644
--- a/tools/activeqt/testcon/controlinfo.cpp
+++ b/tools/activeqt/testcon/controlinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/controlinfo.h b/tools/activeqt/testcon/controlinfo.h
index 2236fdc..f5795e2 100644
--- a/tools/activeqt/testcon/controlinfo.h
+++ b/tools/activeqt/testcon/controlinfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/controlinfo.ui b/tools/activeqt/testcon/controlinfo.ui
index 436ba3a..5f6a483 100644
--- a/tools/activeqt/testcon/controlinfo.ui
+++ b/tools/activeqt/testcon/controlinfo.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/activeqt/testcon/docuwindow.cpp b/tools/activeqt/testcon/docuwindow.cpp
index b78313c..b8ed7c5 100644
--- a/tools/activeqt/testcon/docuwindow.cpp
+++ b/tools/activeqt/testcon/docuwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/docuwindow.h b/tools/activeqt/testcon/docuwindow.h
index 807bbba..8328f6e 100644
--- a/tools/activeqt/testcon/docuwindow.h
+++ b/tools/activeqt/testcon/docuwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/invokemethod.cpp b/tools/activeqt/testcon/invokemethod.cpp
index b6d4b7d..6f3a866 100644
--- a/tools/activeqt/testcon/invokemethod.cpp
+++ b/tools/activeqt/testcon/invokemethod.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/invokemethod.h b/tools/activeqt/testcon/invokemethod.h
index cd30077..a1a6d43 100644
--- a/tools/activeqt/testcon/invokemethod.h
+++ b/tools/activeqt/testcon/invokemethod.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/invokemethod.ui b/tools/activeqt/testcon/invokemethod.ui
index c323c2d..ac9a9ce 100644
--- a/tools/activeqt/testcon/invokemethod.ui
+++ b/tools/activeqt/testcon/invokemethod.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/activeqt/testcon/main.cpp b/tools/activeqt/testcon/main.cpp
index 078ac10..7be5f34 100644
--- a/tools/activeqt/testcon/main.cpp
+++ b/tools/activeqt/testcon/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/mainwindow.cpp b/tools/activeqt/testcon/mainwindow.cpp
index 847f4a1..67c1027 100644
--- a/tools/activeqt/testcon/mainwindow.cpp
+++ b/tools/activeqt/testcon/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/mainwindow.h b/tools/activeqt/testcon/mainwindow.h
index 5ba58e0..5ba8656 100644
--- a/tools/activeqt/testcon/mainwindow.h
+++ b/tools/activeqt/testcon/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/activeqt/testcon/mainwindow.ui b/tools/activeqt/testcon/mainwindow.ui
index 1c061df..128f66e 100644
--- a/tools/activeqt/testcon/mainwindow.ui
+++ b/tools/activeqt/testcon/mainwindow.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/activeqt/testcon/scripts/perlscript.pl b/tools/activeqt/testcon/scripts/perlscript.pl
index 77226f3..8819856 100644
--- a/tools/activeqt/testcon/scripts/perlscript.pl
+++ b/tools/activeqt/testcon/scripts/perlscript.pl
@@ -7,11 +7,11 @@
 ## This file is part of the ActiveQt module of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tools/activeqt/testcon/scripts/pythonscript.py b/tools/activeqt/testcon/scripts/pythonscript.py
index fadd7d4..5bf042d 100644
--- a/tools/activeqt/testcon/scripts/pythonscript.py
+++ b/tools/activeqt/testcon/scripts/pythonscript.py
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/tools/assistant/lib/qclucenefieldnames.cpp b/tools/assistant/lib/qclucenefieldnames.cpp
index 5c3a474..35f7904 100644
--- a/tools/assistant/lib/qclucenefieldnames.cpp
+++ b/tools/assistant/lib/qclucenefieldnames.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qclucenefieldnames_p.h b/tools/assistant/lib/qclucenefieldnames_p.h
index a611382..6ce7395 100644
--- a/tools/assistant/lib/qclucenefieldnames_p.h
+++ b/tools/assistant/lib/qclucenefieldnames_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelp_global.cpp b/tools/assistant/lib/qhelp_global.cpp
index c2c916b..caeb5dd 100644
--- a/tools/assistant/lib/qhelp_global.cpp
+++ b/tools/assistant/lib/qhelp_global.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelp_global.h b/tools/assistant/lib/qhelp_global.h
index f803109..631601d 100644
--- a/tools/assistant/lib/qhelp_global.h
+++ b/tools/assistant/lib/qhelp_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpcollectionhandler.cpp b/tools/assistant/lib/qhelpcollectionhandler.cpp
index bd8dc20..cd03a46 100644
--- a/tools/assistant/lib/qhelpcollectionhandler.cpp
+++ b/tools/assistant/lib/qhelpcollectionhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpcollectionhandler_p.h b/tools/assistant/lib/qhelpcollectionhandler_p.h
index 8901b06..39065d6 100644
--- a/tools/assistant/lib/qhelpcollectionhandler_p.h
+++ b/tools/assistant/lib/qhelpcollectionhandler_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpcontentwidget.cpp b/tools/assistant/lib/qhelpcontentwidget.cpp
index 6f3f942..9b64e82 100644
--- a/tools/assistant/lib/qhelpcontentwidget.cpp
+++ b/tools/assistant/lib/qhelpcontentwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpcontentwidget.h b/tools/assistant/lib/qhelpcontentwidget.h
index 74919f5..fed0eaf 100644
--- a/tools/assistant/lib/qhelpcontentwidget.h
+++ b/tools/assistant/lib/qhelpcontentwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpdatainterface.cpp b/tools/assistant/lib/qhelpdatainterface.cpp
index 9c744cb..1a4d606 100644
--- a/tools/assistant/lib/qhelpdatainterface.cpp
+++ b/tools/assistant/lib/qhelpdatainterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpdatainterface_p.h b/tools/assistant/lib/qhelpdatainterface_p.h
index 52380e2..d2575ca 100644
--- a/tools/assistant/lib/qhelpdatainterface_p.h
+++ b/tools/assistant/lib/qhelpdatainterface_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpdbreader.cpp b/tools/assistant/lib/qhelpdbreader.cpp
index 5c0f595..4b9c111 100644
--- a/tools/assistant/lib/qhelpdbreader.cpp
+++ b/tools/assistant/lib/qhelpdbreader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpdbreader_p.h b/tools/assistant/lib/qhelpdbreader_p.h
index 59363c6..119f564 100644
--- a/tools/assistant/lib/qhelpdbreader_p.h
+++ b/tools/assistant/lib/qhelpdbreader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpengine.cpp b/tools/assistant/lib/qhelpengine.cpp
index e8ae31b..ec0fbc5 100644
--- a/tools/assistant/lib/qhelpengine.cpp
+++ b/tools/assistant/lib/qhelpengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpengine.h b/tools/assistant/lib/qhelpengine.h
index 3577f4b..0e7128e 100644
--- a/tools/assistant/lib/qhelpengine.h
+++ b/tools/assistant/lib/qhelpengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpengine_p.h b/tools/assistant/lib/qhelpengine_p.h
index 6ad677c..3cd050d 100644
--- a/tools/assistant/lib/qhelpengine_p.h
+++ b/tools/assistant/lib/qhelpengine_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpenginecore.cpp b/tools/assistant/lib/qhelpenginecore.cpp
index d72dfe4..545e44f 100644
--- a/tools/assistant/lib/qhelpenginecore.cpp
+++ b/tools/assistant/lib/qhelpenginecore.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpenginecore.h b/tools/assistant/lib/qhelpenginecore.h
index db25c0b..a31a086 100644
--- a/tools/assistant/lib/qhelpenginecore.h
+++ b/tools/assistant/lib/qhelpenginecore.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpgenerator.cpp b/tools/assistant/lib/qhelpgenerator.cpp
index 85bdd75..ea60e97 100644
--- a/tools/assistant/lib/qhelpgenerator.cpp
+++ b/tools/assistant/lib/qhelpgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpgenerator_p.h b/tools/assistant/lib/qhelpgenerator_p.h
index 823a07a..8a2e4ae 100644
--- a/tools/assistant/lib/qhelpgenerator_p.h
+++ b/tools/assistant/lib/qhelpgenerator_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpindexwidget.cpp b/tools/assistant/lib/qhelpindexwidget.cpp
index 11b9966..50b18a7 100644
--- a/tools/assistant/lib/qhelpindexwidget.cpp
+++ b/tools/assistant/lib/qhelpindexwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpindexwidget.h b/tools/assistant/lib/qhelpindexwidget.h
index 0306ccb..bea098a 100644
--- a/tools/assistant/lib/qhelpindexwidget.h
+++ b/tools/assistant/lib/qhelpindexwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpprojectdata.cpp b/tools/assistant/lib/qhelpprojectdata.cpp
index 5247847..ee95e56 100644
--- a/tools/assistant/lib/qhelpprojectdata.cpp
+++ b/tools/assistant/lib/qhelpprojectdata.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpprojectdata_p.h b/tools/assistant/lib/qhelpprojectdata_p.h
index 40a7f59..70309ff 100644
--- a/tools/assistant/lib/qhelpprojectdata_p.h
+++ b/tools/assistant/lib/qhelpprojectdata_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchengine.cpp b/tools/assistant/lib/qhelpsearchengine.cpp
index 164163a..32ba1d0 100644
--- a/tools/assistant/lib/qhelpsearchengine.cpp
+++ b/tools/assistant/lib/qhelpsearchengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchengine.h b/tools/assistant/lib/qhelpsearchengine.h
index 0b07920..8035882 100644
--- a/tools/assistant/lib/qhelpsearchengine.h
+++ b/tools/assistant/lib/qhelpsearchengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindex_default.cpp b/tools/assistant/lib/qhelpsearchindex_default.cpp
index c2f636d..f91e271 100644
--- a/tools/assistant/lib/qhelpsearchindex_default.cpp
+++ b/tools/assistant/lib/qhelpsearchindex_default.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindex_default_p.h b/tools/assistant/lib/qhelpsearchindex_default_p.h
index 2a77e05..37a4124 100644
--- a/tools/assistant/lib/qhelpsearchindex_default_p.h
+++ b/tools/assistant/lib/qhelpsearchindex_default_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexreader.cpp b/tools/assistant/lib/qhelpsearchindexreader.cpp
index e79fca6..a38f5e2 100644
--- a/tools/assistant/lib/qhelpsearchindexreader.cpp
+++ b/tools/assistant/lib/qhelpsearchindexreader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp
index 75cc2b9..189233b 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp
+++ b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
index 7f53733..faaa94d 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
+++ b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexreader_default.cpp b/tools/assistant/lib/qhelpsearchindexreader_default.cpp
index 11a50d9..be2db73 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_default.cpp
+++ b/tools/assistant/lib/qhelpsearchindexreader_default.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexreader_default_p.h b/tools/assistant/lib/qhelpsearchindexreader_default_p.h
index 27764db..6165f86 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_default_p.h
+++ b/tools/assistant/lib/qhelpsearchindexreader_default_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexreader_p.h b/tools/assistant/lib/qhelpsearchindexreader_p.h
index 4d27c0f..bde25ec 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_p.h
+++ b/tools/assistant/lib/qhelpsearchindexreader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
index 4baa376..c5b77a6 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
+++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h b/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h
index db1e533..ba5192c 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h
+++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp
index 827d145..47d2cdb 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp
+++ b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default_p.h b/tools/assistant/lib/qhelpsearchindexwriter_default_p.h
index 625cb84..fdbf09e 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_default_p.h
+++ b/tools/assistant/lib/qhelpsearchindexwriter_default_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchquerywidget.cpp b/tools/assistant/lib/qhelpsearchquerywidget.cpp
index 1634a0d..09bc571 100644
--- a/tools/assistant/lib/qhelpsearchquerywidget.cpp
+++ b/tools/assistant/lib/qhelpsearchquerywidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchquerywidget.h b/tools/assistant/lib/qhelpsearchquerywidget.h
index 2afc4b4..55dc505 100644
--- a/tools/assistant/lib/qhelpsearchquerywidget.h
+++ b/tools/assistant/lib/qhelpsearchquerywidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchresultwidget.cpp b/tools/assistant/lib/qhelpsearchresultwidget.cpp
index 2f5489b..e524d43 100644
--- a/tools/assistant/lib/qhelpsearchresultwidget.cpp
+++ b/tools/assistant/lib/qhelpsearchresultwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/lib/qhelpsearchresultwidget.h b/tools/assistant/lib/qhelpsearchresultwidget.h
index ff29adc..425f8d6 100644
--- a/tools/assistant/lib/qhelpsearchresultwidget.h
+++ b/tools/assistant/lib/qhelpsearchresultwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/aboutdialog.cpp b/tools/assistant/tools/assistant/aboutdialog.cpp
index a9bc352..91922f3 100644
--- a/tools/assistant/tools/assistant/aboutdialog.cpp
+++ b/tools/assistant/tools/assistant/aboutdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/aboutdialog.h b/tools/assistant/tools/assistant/aboutdialog.h
index 94aa5d4..3cc77e1 100644
--- a/tools/assistant/tools/assistant/aboutdialog.h
+++ b/tools/assistant/tools/assistant/aboutdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkdialog.cpp b/tools/assistant/tools/assistant/bookmarkdialog.cpp
index d9e9a53..513d0c1 100644
--- a/tools/assistant/tools/assistant/bookmarkdialog.cpp
+++ b/tools/assistant/tools/assistant/bookmarkdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkdialog.h b/tools/assistant/tools/assistant/bookmarkdialog.h
index e177af6..35acf5f 100644
--- a/tools/assistant/tools/assistant/bookmarkdialog.h
+++ b/tools/assistant/tools/assistant/bookmarkdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkfiltermodel.cpp b/tools/assistant/tools/assistant/bookmarkfiltermodel.cpp
index 7a7c2e3..851b3f1 100644
--- a/tools/assistant/tools/assistant/bookmarkfiltermodel.cpp
+++ b/tools/assistant/tools/assistant/bookmarkfiltermodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkfiltermodel.h b/tools/assistant/tools/assistant/bookmarkfiltermodel.h
index 4ea7ab9..23a23c7 100644
--- a/tools/assistant/tools/assistant/bookmarkfiltermodel.h
+++ b/tools/assistant/tools/assistant/bookmarkfiltermodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkitem.cpp b/tools/assistant/tools/assistant/bookmarkitem.cpp
index 2c92113..510781b 100644
--- a/tools/assistant/tools/assistant/bookmarkitem.cpp
+++ b/tools/assistant/tools/assistant/bookmarkitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkitem.h b/tools/assistant/tools/assistant/bookmarkitem.h
index 7c5b8d0..7f13748 100644
--- a/tools/assistant/tools/assistant/bookmarkitem.h
+++ b/tools/assistant/tools/assistant/bookmarkitem.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 23632b1..c83f7b1 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.h b/tools/assistant/tools/assistant/bookmarkmanager.h
index c26dad8..563ba01 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.h
+++ b/tools/assistant/tools/assistant/bookmarkmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp b/tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp
index 65df6be..4e2fa1b 100644
--- a/tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkmanagerwidget.h b/tools/assistant/tools/assistant/bookmarkmanagerwidget.h
index 56433cb..c49a97e 100644
--- a/tools/assistant/tools/assistant/bookmarkmanagerwidget.h
+++ b/tools/assistant/tools/assistant/bookmarkmanagerwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkmodel.cpp b/tools/assistant/tools/assistant/bookmarkmodel.cpp
index 4c30b42..78be6c6 100644
--- a/tools/assistant/tools/assistant/bookmarkmodel.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/bookmarkmodel.h b/tools/assistant/tools/assistant/bookmarkmodel.h
index f74baea..876b119 100644
--- a/tools/assistant/tools/assistant/bookmarkmodel.h
+++ b/tools/assistant/tools/assistant/bookmarkmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index f42dfdf..b3f2e29 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/centralwidget.h b/tools/assistant/tools/assistant/centralwidget.h
index f286ff7..ecc154a 100644
--- a/tools/assistant/tools/assistant/centralwidget.h
+++ b/tools/assistant/tools/assistant/centralwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/cmdlineparser.cpp b/tools/assistant/tools/assistant/cmdlineparser.cpp
index 1cf2915..92c4203 100644
--- a/tools/assistant/tools/assistant/cmdlineparser.cpp
+++ b/tools/assistant/tools/assistant/cmdlineparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/cmdlineparser.h b/tools/assistant/tools/assistant/cmdlineparser.h
index db66494..320cacd 100644
--- a/tools/assistant/tools/assistant/cmdlineparser.h
+++ b/tools/assistant/tools/assistant/cmdlineparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/contentwindow.cpp b/tools/assistant/tools/assistant/contentwindow.cpp
index 8afa1df..e7ed41c 100644
--- a/tools/assistant/tools/assistant/contentwindow.cpp
+++ b/tools/assistant/tools/assistant/contentwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/contentwindow.h b/tools/assistant/tools/assistant/contentwindow.h
index 62855dd..b615911 100644
--- a/tools/assistant/tools/assistant/contentwindow.h
+++ b/tools/assistant/tools/assistant/contentwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/filternamedialog.cpp b/tools/assistant/tools/assistant/filternamedialog.cpp
index f75f999..8df566e 100644
--- a/tools/assistant/tools/assistant/filternamedialog.cpp
+++ b/tools/assistant/tools/assistant/filternamedialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/filternamedialog.h b/tools/assistant/tools/assistant/filternamedialog.h
index 691146b..e909f3d 100644
--- a/tools/assistant/tools/assistant/filternamedialog.h
+++ b/tools/assistant/tools/assistant/filternamedialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/findwidget.cpp b/tools/assistant/tools/assistant/findwidget.cpp
index 60318d4..ce42791 100644
--- a/tools/assistant/tools/assistant/findwidget.cpp
+++ b/tools/assistant/tools/assistant/findwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/findwidget.h b/tools/assistant/tools/assistant/findwidget.h
index cf78003..8ef8596 100644
--- a/tools/assistant/tools/assistant/findwidget.h
+++ b/tools/assistant/tools/assistant/findwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index a53a9ee..ab19070 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpenginewrapper.h b/tools/assistant/tools/assistant/helpenginewrapper.h
index c1041b6..4fe38f3 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.h
+++ b/tools/assistant/tools/assistant/helpenginewrapper.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp
index 6499139..eafb9c3 100644
--- a/tools/assistant/tools/assistant/helpviewer.cpp
+++ b/tools/assistant/tools/assistant/helpviewer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h
index def9418..0705bdb 100644
--- a/tools/assistant/tools/assistant/helpviewer.h
+++ b/tools/assistant/tools/assistant/helpviewer.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.cpp b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
index 7f82b56..a4ea7b9 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.h b/tools/assistant/tools/assistant/helpviewer_qtb.h
index 58aacd7..c96db88 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.h
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index 221e1b8..5476104 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h
index d4a27a2..3e69ba6 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.h
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/indexwindow.cpp b/tools/assistant/tools/assistant/indexwindow.cpp
index 63ddbe4..c14588d 100644
--- a/tools/assistant/tools/assistant/indexwindow.cpp
+++ b/tools/assistant/tools/assistant/indexwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/indexwindow.h b/tools/assistant/tools/assistant/indexwindow.h
index eb587b1..19e9b0b 100644
--- a/tools/assistant/tools/assistant/indexwindow.h
+++ b/tools/assistant/tools/assistant/indexwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/installdialog.cpp b/tools/assistant/tools/assistant/installdialog.cpp
index f3bf6f6..067c574 100644
--- a/tools/assistant/tools/assistant/installdialog.cpp
+++ b/tools/assistant/tools/assistant/installdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/installdialog.h b/tools/assistant/tools/assistant/installdialog.h
index afafc63..7a4b65b 100644
--- a/tools/assistant/tools/assistant/installdialog.h
+++ b/tools/assistant/tools/assistant/installdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp
index bb86bfe..4d78d3f 100644
--- a/tools/assistant/tools/assistant/main.cpp
+++ b/tools/assistant/tools/assistant/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 65a58c0..62edb2b 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/mainwindow.h b/tools/assistant/tools/assistant/mainwindow.h
index 8219140..6440da2 100644
--- a/tools/assistant/tools/assistant/mainwindow.h
+++ b/tools/assistant/tools/assistant/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/preferencesdialog.cpp b/tools/assistant/tools/assistant/preferencesdialog.cpp
index 0e1d719..1e77d3c 100644
--- a/tools/assistant/tools/assistant/preferencesdialog.cpp
+++ b/tools/assistant/tools/assistant/preferencesdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/preferencesdialog.h b/tools/assistant/tools/assistant/preferencesdialog.h
index 2894494..521d261 100644
--- a/tools/assistant/tools/assistant/preferencesdialog.h
+++ b/tools/assistant/tools/assistant/preferencesdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/qtdocinstaller.cpp b/tools/assistant/tools/assistant/qtdocinstaller.cpp
index 5a501bf..fdc875b 100644
--- a/tools/assistant/tools/assistant/qtdocinstaller.cpp
+++ b/tools/assistant/tools/assistant/qtdocinstaller.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/qtdocinstaller.h b/tools/assistant/tools/assistant/qtdocinstaller.h
index 92a707b..a4f4c40 100644
--- a/tools/assistant/tools/assistant/qtdocinstaller.h
+++ b/tools/assistant/tools/assistant/qtdocinstaller.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/remotecontrol.cpp b/tools/assistant/tools/assistant/remotecontrol.cpp
index 5ecdd69..2b12061 100644
--- a/tools/assistant/tools/assistant/remotecontrol.cpp
+++ b/tools/assistant/tools/assistant/remotecontrol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/remotecontrol.h b/tools/assistant/tools/assistant/remotecontrol.h
index 0777878..95ee6c8 100644
--- a/tools/assistant/tools/assistant/remotecontrol.h
+++ b/tools/assistant/tools/assistant/remotecontrol.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/remotecontrol_win.h b/tools/assistant/tools/assistant/remotecontrol_win.h
index 71e43ea..5b39149 100644
--- a/tools/assistant/tools/assistant/remotecontrol_win.h
+++ b/tools/assistant/tools/assistant/remotecontrol_win.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/searchwidget.cpp b/tools/assistant/tools/assistant/searchwidget.cpp
index d83790d..f398f1b 100644
--- a/tools/assistant/tools/assistant/searchwidget.cpp
+++ b/tools/assistant/tools/assistant/searchwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/searchwidget.h b/tools/assistant/tools/assistant/searchwidget.h
index 750497b..145ab22 100644
--- a/tools/assistant/tools/assistant/searchwidget.h
+++ b/tools/assistant/tools/assistant/searchwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/topicchooser.cpp b/tools/assistant/tools/assistant/topicchooser.cpp
index 262fea8..60355bd 100644
--- a/tools/assistant/tools/assistant/topicchooser.cpp
+++ b/tools/assistant/tools/assistant/topicchooser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/topicchooser.h b/tools/assistant/tools/assistant/topicchooser.h
index 4113cee..b42505f 100644
--- a/tools/assistant/tools/assistant/topicchooser.h
+++ b/tools/assistant/tools/assistant/topicchooser.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/tracer.h b/tools/assistant/tools/assistant/tracer.h
index 66d450a..36379c2 100644
--- a/tools/assistant/tools/assistant/tracer.h
+++ b/tools/assistant/tools/assistant/tracer.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/xbelsupport.cpp b/tools/assistant/tools/assistant/xbelsupport.cpp
index ce49230..4fd853f 100644
--- a/tools/assistant/tools/assistant/xbelsupport.cpp
+++ b/tools/assistant/tools/assistant/xbelsupport.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/assistant/xbelsupport.h b/tools/assistant/tools/assistant/xbelsupport.h
index 037415f..54fe5d4 100644
--- a/tools/assistant/tools/assistant/xbelsupport.h
+++ b/tools/assistant/tools/assistant/xbelsupport.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qcollectiongenerator/main.cpp b/tools/assistant/tools/qcollectiongenerator/main.cpp
index 46e301c..82e9de6 100644
--- a/tools/assistant/tools/qcollectiongenerator/main.cpp
+++ b/tools/assistant/tools/qcollectiongenerator/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/adpreader.cpp b/tools/assistant/tools/qhelpconverter/adpreader.cpp
index 065e702..673964c 100644
--- a/tools/assistant/tools/qhelpconverter/adpreader.cpp
+++ b/tools/assistant/tools/qhelpconverter/adpreader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/adpreader.h b/tools/assistant/tools/qhelpconverter/adpreader.h
index 4c335d9..f4ac45a 100644
--- a/tools/assistant/tools/qhelpconverter/adpreader.h
+++ b/tools/assistant/tools/qhelpconverter/adpreader.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/conversionwizard.cpp b/tools/assistant/tools/qhelpconverter/conversionwizard.cpp
index f32372d..ac73794 100644
--- a/tools/assistant/tools/qhelpconverter/conversionwizard.cpp
+++ b/tools/assistant/tools/qhelpconverter/conversionwizard.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/conversionwizard.h b/tools/assistant/tools/qhelpconverter/conversionwizard.h
index bf49a5f..01cf054 100644
--- a/tools/assistant/tools/qhelpconverter/conversionwizard.h
+++ b/tools/assistant/tools/qhelpconverter/conversionwizard.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/filespage.cpp b/tools/assistant/tools/qhelpconverter/filespage.cpp
index fd4a40e..aaf1778 100644
--- a/tools/assistant/tools/qhelpconverter/filespage.cpp
+++ b/tools/assistant/tools/qhelpconverter/filespage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/filespage.h b/tools/assistant/tools/qhelpconverter/filespage.h
index bbdf2d4..6676699 100644
--- a/tools/assistant/tools/qhelpconverter/filespage.h
+++ b/tools/assistant/tools/qhelpconverter/filespage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/filterpage.cpp b/tools/assistant/tools/qhelpconverter/filterpage.cpp
index c15a580..645a458 100644
--- a/tools/assistant/tools/qhelpconverter/filterpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/filterpage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/filterpage.h b/tools/assistant/tools/qhelpconverter/filterpage.h
index 1c66e3c..ae976a0 100644
--- a/tools/assistant/tools/qhelpconverter/filterpage.h
+++ b/tools/assistant/tools/qhelpconverter/filterpage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/finishpage.cpp b/tools/assistant/tools/qhelpconverter/finishpage.cpp
index f0228e3..60694d5 100644
--- a/tools/assistant/tools/qhelpconverter/finishpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/finishpage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/finishpage.h b/tools/assistant/tools/qhelpconverter/finishpage.h
index c0f3429..dc2fff4 100644
--- a/tools/assistant/tools/qhelpconverter/finishpage.h
+++ b/tools/assistant/tools/qhelpconverter/finishpage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/generalpage.cpp b/tools/assistant/tools/qhelpconverter/generalpage.cpp
index cac31c4..1d57e22 100644
--- a/tools/assistant/tools/qhelpconverter/generalpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/generalpage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/generalpage.h b/tools/assistant/tools/qhelpconverter/generalpage.h
index b1ce00a..656520c 100644
--- a/tools/assistant/tools/qhelpconverter/generalpage.h
+++ b/tools/assistant/tools/qhelpconverter/generalpage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/helpwindow.cpp b/tools/assistant/tools/qhelpconverter/helpwindow.cpp
index 2c7e030..a874fe2 100644
--- a/tools/assistant/tools/qhelpconverter/helpwindow.cpp
+++ b/tools/assistant/tools/qhelpconverter/helpwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/helpwindow.h b/tools/assistant/tools/qhelpconverter/helpwindow.h
index 5511ab8..67cfcf8 100644
--- a/tools/assistant/tools/qhelpconverter/helpwindow.h
+++ b/tools/assistant/tools/qhelpconverter/helpwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/identifierpage.cpp b/tools/assistant/tools/qhelpconverter/identifierpage.cpp
index 98bf957..21570d3 100644
--- a/tools/assistant/tools/qhelpconverter/identifierpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/identifierpage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/identifierpage.h b/tools/assistant/tools/qhelpconverter/identifierpage.h
index 4907cb9..ff73f26 100644
--- a/tools/assistant/tools/qhelpconverter/identifierpage.h
+++ b/tools/assistant/tools/qhelpconverter/identifierpage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/inputpage.cpp b/tools/assistant/tools/qhelpconverter/inputpage.cpp
index 7a45baa..826e283 100644
--- a/tools/assistant/tools/qhelpconverter/inputpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/inputpage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/inputpage.h b/tools/assistant/tools/qhelpconverter/inputpage.h
index 28a7075..07f182a 100644
--- a/tools/assistant/tools/qhelpconverter/inputpage.h
+++ b/tools/assistant/tools/qhelpconverter/inputpage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/main.cpp b/tools/assistant/tools/qhelpconverter/main.cpp
index 5ee624d..8981396 100644
--- a/tools/assistant/tools/qhelpconverter/main.cpp
+++ b/tools/assistant/tools/qhelpconverter/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/outputpage.cpp b/tools/assistant/tools/qhelpconverter/outputpage.cpp
index 4992485..5a1001a 100644
--- a/tools/assistant/tools/qhelpconverter/outputpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/outputpage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/outputpage.h b/tools/assistant/tools/qhelpconverter/outputpage.h
index fb37805..6087bee 100644
--- a/tools/assistant/tools/qhelpconverter/outputpage.h
+++ b/tools/assistant/tools/qhelpconverter/outputpage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/pathpage.cpp b/tools/assistant/tools/qhelpconverter/pathpage.cpp
index 0885bc2..81c07ec 100644
--- a/tools/assistant/tools/qhelpconverter/pathpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/pathpage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/pathpage.h b/tools/assistant/tools/qhelpconverter/pathpage.h
index 7c001d7..8826adb 100644
--- a/tools/assistant/tools/qhelpconverter/pathpage.h
+++ b/tools/assistant/tools/qhelpconverter/pathpage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp b/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp
index ad70714..e883048 100644
--- a/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp
+++ b/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/qhcpwriter.h b/tools/assistant/tools/qhelpconverter/qhcpwriter.h
index dde7446..1227d6b 100644
--- a/tools/assistant/tools/qhelpconverter/qhcpwriter.h
+++ b/tools/assistant/tools/qhelpconverter/qhcpwriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/qhpwriter.cpp b/tools/assistant/tools/qhelpconverter/qhpwriter.cpp
index 52b6b68..204fe0b 100644
--- a/tools/assistant/tools/qhelpconverter/qhpwriter.cpp
+++ b/tools/assistant/tools/qhelpconverter/qhpwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpconverter/qhpwriter.h b/tools/assistant/tools/qhelpconverter/qhpwriter.h
index 2c33063..815fad3 100644
--- a/tools/assistant/tools/qhelpconverter/qhpwriter.h
+++ b/tools/assistant/tools/qhelpconverter/qhpwriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/qhelpgenerator/main.cpp b/tools/assistant/tools/qhelpgenerator/main.cpp
index 637786c..6f8567e 100644
--- a/tools/assistant/tools/qhelpgenerator/main.cpp
+++ b/tools/assistant/tools/qhelpgenerator/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/shared/collectionconfiguration.cpp b/tools/assistant/tools/shared/collectionconfiguration.cpp
index e3944b6..20bae6b 100644
--- a/tools/assistant/tools/shared/collectionconfiguration.cpp
+++ b/tools/assistant/tools/shared/collectionconfiguration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/shared/collectionconfiguration.h b/tools/assistant/tools/shared/collectionconfiguration.h
index b7bf247..ef71969 100644
--- a/tools/assistant/tools/shared/collectionconfiguration.h
+++ b/tools/assistant/tools/shared/collectionconfiguration.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/shared/helpgenerator.cpp b/tools/assistant/tools/shared/helpgenerator.cpp
index 4812bc5..71f03e6 100644
--- a/tools/assistant/tools/shared/helpgenerator.cpp
+++ b/tools/assistant/tools/shared/helpgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/assistant/tools/shared/helpgenerator.h b/tools/assistant/tools/shared/helpgenerator.h
index 6da1c2b..33365c9 100644
--- a/tools/assistant/tools/shared/helpgenerator.h
+++ b/tools/assistant/tools/shared/helpgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/checksdk/cesdkhandler.cpp b/tools/checksdk/cesdkhandler.cpp
index 52b0913..4065a13 100644
--- a/tools/checksdk/cesdkhandler.cpp
+++ b/tools/checksdk/cesdkhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/checksdk/cesdkhandler.h b/tools/checksdk/cesdkhandler.h
index 0d886c8..b43d195 100644
--- a/tools/checksdk/cesdkhandler.h
+++ b/tools/checksdk/cesdkhandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/checksdk/main.cpp b/tools/checksdk/main.cpp
index 9ce7790..cd3ddf0 100644
--- a/tools/checksdk/main.cpp
+++ b/tools/checksdk/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/configure_pch.h b/tools/configure/configure_pch.h
index 4931770..d366d6d 100644
--- a/tools/configure/configure_pch.h
+++ b/tools/configure/configure_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a2c7fe9..983416a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index b3c07f7..be13613 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 03fd0cc..d734f73 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index 16af8df..fdc012d 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 096d8a8..cfd05ab 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp
index c91f048..08abda8 100644
--- a/tools/configure/tools.cpp
+++ b/tools/configure/tools.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/configure/tools.h b/tools/configure/tools.h
index 5e0eb02..b7b504f 100644
--- a/tools/configure/tools.h
+++ b/tools/configure/tools.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/data/generate_header.xsl b/tools/designer/data/generate_header.xsl
index 453ccf7..a391c4f 100644
--- a/tools/designer/data/generate_header.xsl
+++ b/tools/designer/data/generate_header.xsl
@@ -343,11 +343,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -361,16 +361,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/data/generate_impl.xsl b/tools/designer/data/generate_impl.xsl
index 6c6571d..117ef10 100644
--- a/tools/designer/data/generate_impl.xsl
+++ b/tools/designer/data/generate_impl.xsl
@@ -1099,11 +1099,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -1117,16 +1117,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor.cpp b/tools/designer/src/components/buddyeditor/buddyeditor.cpp
index e367f9a..67e5864 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor.h b/tools/designer/src/components/buddyeditor/buddyeditor.h
index 6468cc2..24c5c90 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor.h
+++ b/tools/designer/src/components/buddyeditor/buddyeditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_global.h b/tools/designer/src/components/buddyeditor/buddyeditor_global.h
index 3f97c2c..11c4f2c 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_global.h
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp
index c20d639..87865da 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
index 6174875..294e4d0 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h
index 770d41d..d512d6a 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp
index f843d84..7323a11 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_tool.h b/tools/designer/src/components/buddyeditor/buddyeditor_tool.h
index 6d5d4c7..0177af1 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_tool.h
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_tool.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
index d0e3a63..803519e 100644
--- a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
+++ b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.h b/tools/designer/src/components/formeditor/brushmanagerproxy.h
index ef93454..7c835d4 100644
--- a/tools/designer/src/components/formeditor/brushmanagerproxy.h
+++ b/tools/designer/src/components/formeditor/brushmanagerproxy.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/default_actionprovider.cpp b/tools/designer/src/components/formeditor/default_actionprovider.cpp
index 1e908f0..fff522b 100644
--- a/tools/designer/src/components/formeditor/default_actionprovider.cpp
+++ b/tools/designer/src/components/formeditor/default_actionprovider.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/default_actionprovider.h b/tools/designer/src/components/formeditor/default_actionprovider.h
index 4e4357e..ad21d24 100644
--- a/tools/designer/src/components/formeditor/default_actionprovider.h
+++ b/tools/designer/src/components/formeditor/default_actionprovider.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/default_container.cpp b/tools/designer/src/components/formeditor/default_container.cpp
index ff35c19..7f397bb 100644
--- a/tools/designer/src/components/formeditor/default_container.cpp
+++ b/tools/designer/src/components/formeditor/default_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/default_container.h b/tools/designer/src/components/formeditor/default_container.h
index d23a737..5d9fef3 100644
--- a/tools/designer/src/components/formeditor/default_container.h
+++ b/tools/designer/src/components/formeditor/default_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/default_layoutdecoration.cpp b/tools/designer/src/components/formeditor/default_layoutdecoration.cpp
index ebdc8c1..207ec3f 100644
--- a/tools/designer/src/components/formeditor/default_layoutdecoration.cpp
+++ b/tools/designer/src/components/formeditor/default_layoutdecoration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/default_layoutdecoration.h b/tools/designer/src/components/formeditor/default_layoutdecoration.h
index 36bd9b6..f9ad1d8 100644
--- a/tools/designer/src/components/formeditor/default_layoutdecoration.h
+++ b/tools/designer/src/components/formeditor/default_layoutdecoration.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/deviceprofiledialog.cpp b/tools/designer/src/components/formeditor/deviceprofiledialog.cpp
index 1ed30f9..0c354bc 100644
--- a/tools/designer/src/components/formeditor/deviceprofiledialog.cpp
+++ b/tools/designer/src/components/formeditor/deviceprofiledialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/deviceprofiledialog.h b/tools/designer/src/components/formeditor/deviceprofiledialog.h
index 5778b04..9854d74 100644
--- a/tools/designer/src/components/formeditor/deviceprofiledialog.h
+++ b/tools/designer/src/components/formeditor/deviceprofiledialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/dpi_chooser.cpp b/tools/designer/src/components/formeditor/dpi_chooser.cpp
index e79c757..d0015fc 100644
--- a/tools/designer/src/components/formeditor/dpi_chooser.cpp
+++ b/tools/designer/src/components/formeditor/dpi_chooser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/dpi_chooser.h b/tools/designer/src/components/formeditor/dpi_chooser.h
index 7984a9e..95f5acf 100644
--- a/tools/designer/src/components/formeditor/dpi_chooser.h
+++ b/tools/designer/src/components/formeditor/dpi_chooser.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/embeddedoptionspage.cpp b/tools/designer/src/components/formeditor/embeddedoptionspage.cpp
index 4affcf8..d397c66 100644
--- a/tools/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/tools/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/embeddedoptionspage.h b/tools/designer/src/components/formeditor/embeddedoptionspage.h
index 6679474..482ea82 100644
--- a/tools/designer/src/components/formeditor/embeddedoptionspage.h
+++ b/tools/designer/src/components/formeditor/embeddedoptionspage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formeditor.cpp b/tools/designer/src/components/formeditor/formeditor.cpp
index 600ef15..3ceaf1f 100644
--- a/tools/designer/src/components/formeditor/formeditor.cpp
+++ b/tools/designer/src/components/formeditor/formeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formeditor.h b/tools/designer/src/components/formeditor/formeditor.h
index e438112..333def1 100644
--- a/tools/designer/src/components/formeditor/formeditor.h
+++ b/tools/designer/src/components/formeditor/formeditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formeditor_global.h b/tools/designer/src/components/formeditor/formeditor_global.h
index 7fb3fbf..4241721 100644
--- a/tools/designer/src/components/formeditor/formeditor_global.h
+++ b/tools/designer/src/components/formeditor/formeditor_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp
index 8e0cc66..183120a 100644
--- a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp
+++ b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formeditor_optionspage.h b/tools/designer/src/components/formeditor/formeditor_optionspage.h
index a9d06d4..53a926c 100644
--- a/tools/designer/src/components/formeditor/formeditor_optionspage.h
+++ b/tools/designer/src/components/formeditor/formeditor_optionspage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index 15775f6..34c0c34 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindow.h b/tools/designer/src/components/formeditor/formwindow.h
index dc0026f..0a4a825 100644
--- a/tools/designer/src/components/formeditor/formwindow.h
+++ b/tools/designer/src/components/formeditor/formwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindow_dnditem.cpp b/tools/designer/src/components/formeditor/formwindow_dnditem.cpp
index e34742c..d875587 100644
--- a/tools/designer/src/components/formeditor/formwindow_dnditem.cpp
+++ b/tools/designer/src/components/formeditor/formwindow_dnditem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindow_dnditem.h b/tools/designer/src/components/formeditor/formwindow_dnditem.h
index 55b91ee..ce1498e 100644
--- a/tools/designer/src/components/formeditor/formwindow_dnditem.h
+++ b/tools/designer/src/components/formeditor/formwindow_dnditem.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
index a15d408..41d8e1d 100644
--- a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
+++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.h b/tools/designer/src/components/formeditor/formwindow_widgetstack.h
index 13a0f89..d42ef59 100644
--- a/tools/designer/src/components/formeditor/formwindow_widgetstack.h
+++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindowcursor.cpp b/tools/designer/src/components/formeditor/formwindowcursor.cpp
index 156c0da..af9ab9e 100644
--- a/tools/designer/src/components/formeditor/formwindowcursor.cpp
+++ b/tools/designer/src/components/formeditor/formwindowcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindowcursor.h b/tools/designer/src/components/formeditor/formwindowcursor.h
index 0bfa626..b20842d 100644
--- a/tools/designer/src/components/formeditor/formwindowcursor.h
+++ b/tools/designer/src/components/formeditor/formwindowcursor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindowmanager.cpp b/tools/designer/src/components/formeditor/formwindowmanager.cpp
index ce809ff..462e1d2 100644
--- a/tools/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/tools/designer/src/components/formeditor/formwindowmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindowmanager.h b/tools/designer/src/components/formeditor/formwindowmanager.h
index 021edba..b5450b7 100644
--- a/tools/designer/src/components/formeditor/formwindowmanager.h
+++ b/tools/designer/src/components/formeditor/formwindowmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindowsettings.cpp b/tools/designer/src/components/formeditor/formwindowsettings.cpp
index 31d1e8d..d8db2e3 100644
--- a/tools/designer/src/components/formeditor/formwindowsettings.cpp
+++ b/tools/designer/src/components/formeditor/formwindowsettings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindowsettings.h b/tools/designer/src/components/formeditor/formwindowsettings.h
index 5c05385..f3c4fe8 100644
--- a/tools/designer/src/components/formeditor/formwindowsettings.h
+++ b/tools/designer/src/components/formeditor/formwindowsettings.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/formwindowsettings.ui b/tools/designer/src/components/formeditor/formwindowsettings.ui
index b7106f8..abe1122 100644
--- a/tools/designer/src/components/formeditor/formwindowsettings.ui
+++ b/tools/designer/src/components/formeditor/formwindowsettings.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/components/formeditor/iconcache.cpp b/tools/designer/src/components/formeditor/iconcache.cpp
index 00f4b3d..ad112d3 100644
--- a/tools/designer/src/components/formeditor/iconcache.cpp
+++ b/tools/designer/src/components/formeditor/iconcache.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/iconcache.h b/tools/designer/src/components/formeditor/iconcache.h
index 74698e3..f134e49 100644
--- a/tools/designer/src/components/formeditor/iconcache.h
+++ b/tools/designer/src/components/formeditor/iconcache.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/itemview_propertysheet.cpp b/tools/designer/src/components/formeditor/itemview_propertysheet.cpp
index 8c3d910..d3d364c 100644
--- a/tools/designer/src/components/formeditor/itemview_propertysheet.cpp
+++ b/tools/designer/src/components/formeditor/itemview_propertysheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/itemview_propertysheet.h b/tools/designer/src/components/formeditor/itemview_propertysheet.h
index 2ccacc2..36995b8 100644
--- a/tools/designer/src/components/formeditor/itemview_propertysheet.h
+++ b/tools/designer/src/components/formeditor/itemview_propertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/layout_propertysheet.cpp b/tools/designer/src/components/formeditor/layout_propertysheet.cpp
index 9e2fb7b..60b8442 100644
--- a/tools/designer/src/components/formeditor/layout_propertysheet.cpp
+++ b/tools/designer/src/components/formeditor/layout_propertysheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/layout_propertysheet.h b/tools/designer/src/components/formeditor/layout_propertysheet.h
index cfe7bf9..d736d87 100644
--- a/tools/designer/src/components/formeditor/layout_propertysheet.h
+++ b/tools/designer/src/components/formeditor/layout_propertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/line_propertysheet.cpp b/tools/designer/src/components/formeditor/line_propertysheet.cpp
index 66cde93..2bd66ea 100644
--- a/tools/designer/src/components/formeditor/line_propertysheet.cpp
+++ b/tools/designer/src/components/formeditor/line_propertysheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/line_propertysheet.h b/tools/designer/src/components/formeditor/line_propertysheet.h
index 756e20b..f6d8dd7 100644
--- a/tools/designer/src/components/formeditor/line_propertysheet.h
+++ b/tools/designer/src/components/formeditor/line_propertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/previewactiongroup.cpp b/tools/designer/src/components/formeditor/previewactiongroup.cpp
index 0cc0b75..a5b187a 100644
--- a/tools/designer/src/components/formeditor/previewactiongroup.cpp
+++ b/tools/designer/src/components/formeditor/previewactiongroup.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/previewactiongroup.h b/tools/designer/src/components/formeditor/previewactiongroup.h
index a38588e..ccaaf47 100644
--- a/tools/designer/src/components/formeditor/previewactiongroup.h
+++ b/tools/designer/src/components/formeditor/previewactiongroup.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index 1d78695..a464f02 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.h b/tools/designer/src/components/formeditor/qdesigner_resource.h
index 47dd263..74fff9b 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.h
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qdesignerundostack.cpp b/tools/designer/src/components/formeditor/qdesignerundostack.cpp
index 007031d..c36894d 100644
--- a/tools/designer/src/components/formeditor/qdesignerundostack.cpp
+++ b/tools/designer/src/components/formeditor/qdesignerundostack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qdesignerundostack.h b/tools/designer/src/components/formeditor/qdesignerundostack.h
index 5451ad8..8d1e579 100644
--- a/tools/designer/src/components/formeditor/qdesignerundostack.h
+++ b/tools/designer/src/components/formeditor/qdesignerundostack.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp
index df15cff..783e812 100644
--- a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp
+++ b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
index 57ac429..1948ef8 100644
--- a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
+++ b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qmainwindow_container.cpp b/tools/designer/src/components/formeditor/qmainwindow_container.cpp
index 9b5326a..5a15d01 100644
--- a/tools/designer/src/components/formeditor/qmainwindow_container.cpp
+++ b/tools/designer/src/components/formeditor/qmainwindow_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qmainwindow_container.h b/tools/designer/src/components/formeditor/qmainwindow_container.h
index 2359501..8ff30a4 100644
--- a/tools/designer/src/components/formeditor/qmainwindow_container.h
+++ b/tools/designer/src/components/formeditor/qmainwindow_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qmdiarea_container.cpp b/tools/designer/src/components/formeditor/qmdiarea_container.cpp
index 5e266f4..9602ced 100644
--- a/tools/designer/src/components/formeditor/qmdiarea_container.cpp
+++ b/tools/designer/src/components/formeditor/qmdiarea_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qmdiarea_container.h b/tools/designer/src/components/formeditor/qmdiarea_container.h
index 9f4a817..baecd10 100644
--- a/tools/designer/src/components/formeditor/qmdiarea_container.h
+++ b/tools/designer/src/components/formeditor/qmdiarea_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.cpp b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
index 2c428ca..45c704d 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.cpp
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h
index 48dcf4f..5b0a483 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.h
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qwizard_container.cpp b/tools/designer/src/components/formeditor/qwizard_container.cpp
index 40b2f33..edd9288 100644
--- a/tools/designer/src/components/formeditor/qwizard_container.cpp
+++ b/tools/designer/src/components/formeditor/qwizard_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qwizard_container.h b/tools/designer/src/components/formeditor/qwizard_container.h
index 5cef99f..00388f8 100644
--- a/tools/designer/src/components/formeditor/qwizard_container.h
+++ b/tools/designer/src/components/formeditor/qwizard_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qworkspace_container.cpp b/tools/designer/src/components/formeditor/qworkspace_container.cpp
index 2035b0c..4c916f6 100644
--- a/tools/designer/src/components/formeditor/qworkspace_container.cpp
+++ b/tools/designer/src/components/formeditor/qworkspace_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/qworkspace_container.h b/tools/designer/src/components/formeditor/qworkspace_container.h
index 10616f1..9a1eab1 100644
--- a/tools/designer/src/components/formeditor/qworkspace_container.h
+++ b/tools/designer/src/components/formeditor/qworkspace_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/spacer_propertysheet.cpp b/tools/designer/src/components/formeditor/spacer_propertysheet.cpp
index bfd3202..1dba502 100644
--- a/tools/designer/src/components/formeditor/spacer_propertysheet.cpp
+++ b/tools/designer/src/components/formeditor/spacer_propertysheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/spacer_propertysheet.h b/tools/designer/src/components/formeditor/spacer_propertysheet.h
index 266d332..d07dffa 100644
--- a/tools/designer/src/components/formeditor/spacer_propertysheet.h
+++ b/tools/designer/src/components/formeditor/spacer_propertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/templateoptionspage.cpp b/tools/designer/src/components/formeditor/templateoptionspage.cpp
index 0a38c4d..4049236 100644
--- a/tools/designer/src/components/formeditor/templateoptionspage.cpp
+++ b/tools/designer/src/components/formeditor/templateoptionspage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/templateoptionspage.h b/tools/designer/src/components/formeditor/templateoptionspage.h
index 6e29e22..e85abdd 100644
--- a/tools/designer/src/components/formeditor/templateoptionspage.h
+++ b/tools/designer/src/components/formeditor/templateoptionspage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/tool_widgeteditor.cpp b/tools/designer/src/components/formeditor/tool_widgeteditor.cpp
index 68a11de..2878d7c 100644
--- a/tools/designer/src/components/formeditor/tool_widgeteditor.cpp
+++ b/tools/designer/src/components/formeditor/tool_widgeteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/tool_widgeteditor.h b/tools/designer/src/components/formeditor/tool_widgeteditor.h
index 46c9f9a..09a04fe 100644
--- a/tools/designer/src/components/formeditor/tool_widgeteditor.h
+++ b/tools/designer/src/components/formeditor/tool_widgeteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/widgetselection.cpp b/tools/designer/src/components/formeditor/widgetselection.cpp
index 8ab362b..03a98fc 100644
--- a/tools/designer/src/components/formeditor/widgetselection.cpp
+++ b/tools/designer/src/components/formeditor/widgetselection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/formeditor/widgetselection.h b/tools/designer/src/components/formeditor/widgetselection.h
index bf43bb9..2f85ab4 100644
--- a/tools/designer/src/components/formeditor/widgetselection.h
+++ b/tools/designer/src/components/formeditor/widgetselection.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/lib/lib_pch.h b/tools/designer/src/components/lib/lib_pch.h
index 6deeb41..f20fb4b 100644
--- a/tools/designer/src/components/lib/lib_pch.h
+++ b/tools/designer/src/components/lib/lib_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/lib/qdesigner_components.cpp b/tools/designer/src/components/lib/qdesigner_components.cpp
index ea2dae3..cbbaad2 100644
--- a/tools/designer/src/components/lib/qdesigner_components.cpp
+++ b/tools/designer/src/components/lib/qdesigner_components.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/objectinspector/objectinspector.cpp b/tools/designer/src/components/objectinspector/objectinspector.cpp
index 9652e22..1edd07d 100644
--- a/tools/designer/src/components/objectinspector/objectinspector.cpp
+++ b/tools/designer/src/components/objectinspector/objectinspector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/objectinspector/objectinspector.h b/tools/designer/src/components/objectinspector/objectinspector.h
index 3913496..76ce5d2 100644
--- a/tools/designer/src/components/objectinspector/objectinspector.h
+++ b/tools/designer/src/components/objectinspector/objectinspector.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/objectinspector/objectinspector_global.h b/tools/designer/src/components/objectinspector/objectinspector_global.h
index da48dbd..c80ab9f 100644
--- a/tools/designer/src/components/objectinspector/objectinspector_global.h
+++ b/tools/designer/src/components/objectinspector/objectinspector_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/objectinspector/objectinspectormodel.cpp b/tools/designer/src/components/objectinspector/objectinspectormodel.cpp
index 93e1df1..24cf156 100644
--- a/tools/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/tools/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/objectinspector/objectinspectormodel_p.h b/tools/designer/src/components/objectinspector/objectinspectormodel_p.h
index e2ed985..c244f83 100644
--- a/tools/designer/src/components/objectinspector/objectinspectormodel_p.h
+++ b/tools/designer/src/components/objectinspector/objectinspectormodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp b/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp
index 2300b47..df0ddb7 100644
--- a/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp
+++ b/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/brushpropertymanager.h b/tools/designer/src/components/propertyeditor/brushpropertymanager.h
index 6cdb65f..da2e2f7 100644
--- a/tools/designer/src/components/propertyeditor/brushpropertymanager.h
+++ b/tools/designer/src/components/propertyeditor/brushpropertymanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
index 9ab2940..6c2bbd0 100644
--- a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.h b/tools/designer/src/components/propertyeditor/designerpropertymanager.h
index 11f900b..70e855a 100644
--- a/tools/designer/src/components/propertyeditor/designerpropertymanager.h
+++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/fontmapping.xml b/tools/designer/src/components/propertyeditor/fontmapping.xml
index 633a920..1c0f821 100644
--- a/tools/designer/src/components/propertyeditor/fontmapping.xml
+++ b/tools/designer/src/components/propertyeditor/fontmapping.xml
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 **************************************************************************-->
diff --git a/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp b/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp
index 9442b01..0d6c2f3 100644
--- a/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp
+++ b/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/fontpropertymanager.h b/tools/designer/src/components/propertyeditor/fontpropertymanager.h
index ed762a4..3291035 100644
--- a/tools/designer/src/components/propertyeditor/fontpropertymanager.h
+++ b/tools/designer/src/components/propertyeditor/fontpropertymanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
index 51d2f1f..724340d 100644
--- a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
+++ b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h
index cfd2130..0c4fd71 100644
--- a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h
+++ b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/paletteeditor.cpp b/tools/designer/src/components/propertyeditor/paletteeditor.cpp
index 067946b..b48bcd9 100644
--- a/tools/designer/src/components/propertyeditor/paletteeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/paletteeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/paletteeditor.h b/tools/designer/src/components/propertyeditor/paletteeditor.h
index cedefe8..f8f20bc 100644
--- a/tools/designer/src/components/propertyeditor/paletteeditor.h
+++ b/tools/designer/src/components/propertyeditor/paletteeditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/paletteeditor.ui b/tools/designer/src/components/propertyeditor/paletteeditor.ui
index 48cef86..6f85e20 100644
--- a/tools/designer/src/components/propertyeditor/paletteeditor.ui
+++ b/tools/designer/src/components/propertyeditor/paletteeditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp b/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp
index cc8b99c..872d320 100644
--- a/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp
+++ b/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/paletteeditorbutton.h b/tools/designer/src/components/propertyeditor/paletteeditorbutton.h
index 0f150b9..4bcbca2 100644
--- a/tools/designer/src/components/propertyeditor/paletteeditorbutton.h
+++ b/tools/designer/src/components/propertyeditor/paletteeditorbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/previewframe.cpp b/tools/designer/src/components/propertyeditor/previewframe.cpp
index 45d7db7..57fa1c3 100644
--- a/tools/designer/src/components/propertyeditor/previewframe.cpp
+++ b/tools/designer/src/components/propertyeditor/previewframe.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/previewframe.h b/tools/designer/src/components/propertyeditor/previewframe.h
index 45c38bb..f61c422 100644
--- a/tools/designer/src/components/propertyeditor/previewframe.h
+++ b/tools/designer/src/components/propertyeditor/previewframe.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/previewwidget.cpp b/tools/designer/src/components/propertyeditor/previewwidget.cpp
index 9ab0e35..cbb3b4e 100644
--- a/tools/designer/src/components/propertyeditor/previewwidget.cpp
+++ b/tools/designer/src/components/propertyeditor/previewwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/previewwidget.h b/tools/designer/src/components/propertyeditor/previewwidget.h
index 7970f40..941a4af 100644
--- a/tools/designer/src/components/propertyeditor/previewwidget.h
+++ b/tools/designer/src/components/propertyeditor/previewwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/previewwidget.ui b/tools/designer/src/components/propertyeditor/previewwidget.ui
index cff7558..ab7fe75 100644
--- a/tools/designer/src/components/propertyeditor/previewwidget.ui
+++ b/tools/designer/src/components/propertyeditor/previewwidget.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
index a8ca8ad..e12a76f 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.h b/tools/designer/src/components/propertyeditor/propertyeditor.h
index f0ea94f..076fdf5 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.h
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor_global.h b/tools/designer/src/components/propertyeditor/propertyeditor_global.h
index 5c11a35..b53d272 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor_global.h
+++ b/tools/designer/src/components/propertyeditor/propertyeditor_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp b/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp
index 55833a8..c8e1d65 100644
--- a/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp
+++ b/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/qlonglongvalidator.h b/tools/designer/src/components/propertyeditor/qlonglongvalidator.h
index 2aeaf160..df8feec 100644
--- a/tools/designer/src/components/propertyeditor/qlonglongvalidator.h
+++ b/tools/designer/src/components/propertyeditor/qlonglongvalidator.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/stringlisteditor.cpp b/tools/designer/src/components/propertyeditor/stringlisteditor.cpp
index 99992e2..a7b21f2 100644
--- a/tools/designer/src/components/propertyeditor/stringlisteditor.cpp
+++ b/tools/designer/src/components/propertyeditor/stringlisteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/stringlisteditor.h b/tools/designer/src/components/propertyeditor/stringlisteditor.h
index c53f86d..9e0d10f 100644
--- a/tools/designer/src/components/propertyeditor/stringlisteditor.h
+++ b/tools/designer/src/components/propertyeditor/stringlisteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/stringlisteditor.ui b/tools/designer/src/components/propertyeditor/stringlisteditor.ui
index 81aa17f..79bea9b 100644
--- a/tools/designer/src/components/propertyeditor/stringlisteditor.ui
+++ b/tools/designer/src/components/propertyeditor/stringlisteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp
index ea64fce..1f751e0 100644
--- a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp
+++ b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h
index 1484def..929af1d 100644
--- a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h
+++ b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/connectdialog.cpp b/tools/designer/src/components/signalsloteditor/connectdialog.cpp
index ff6be16..346746f 100644
--- a/tools/designer/src/components/signalsloteditor/connectdialog.cpp
+++ b/tools/designer/src/components/signalsloteditor/connectdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/connectdialog_p.h b/tools/designer/src/components/signalsloteditor/connectdialog_p.h
index f564ddc..a0291bb 100644
--- a/tools/designer/src/components/signalsloteditor/connectdialog_p.h
+++ b/tools/designer/src/components/signalsloteditor/connectdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
index 8674ac1..23771b8 100644
--- a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h b/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h
index 92edfeb..3945874 100644
--- a/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h
+++ b/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp
index b801c5e..b1ee2be 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor.h b/tools/designer/src/components/signalsloteditor/signalsloteditor.h
index 38659fa..0ff8616 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor.h
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h
index 8b488dc..88d039f 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp
index e80ca83..18762b3 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h
index 8325e14..c9422b0 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
index cced86e..08f1f91 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h
index 3fe772f..14f068e 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
index 6bdf7ad..fb6463c 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h
index 4bfa76d..b5af02d 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index 5547761..18bd1bc 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h
index 665f0b7..43b6b09 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor.cpp b/tools/designer/src/components/tabordereditor/tabordereditor.cpp
index 37acabc..24c7d90 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor.cpp
+++ b/tools/designer/src/components/tabordereditor/tabordereditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor.h b/tools/designer/src/components/tabordereditor/tabordereditor.h
index 08f190f..450555d 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor.h
+++ b/tools/designer/src/components/tabordereditor/tabordereditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_global.h b/tools/designer/src/components/tabordereditor/tabordereditor_global.h
index 768bf0a..f7a34a5 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_global.h
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp
index 4441fe3..3a5aed2 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
index 82e754c..49fef73 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h
index 1bc6d1c..ee716e4 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp
index 3698528..6966253 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_tool.h b/tools/designer/src/components/tabordereditor/tabordereditor_tool.h
index f9a62c2..100a7a5 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_tool.h
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_tool.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/button_taskmenu.cpp b/tools/designer/src/components/taskmenu/button_taskmenu.cpp
index 6b91c60..766720e 100644
--- a/tools/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/button_taskmenu.h b/tools/designer/src/components/taskmenu/button_taskmenu.h
index 4382453..1870448 100644
--- a/tools/designer/src/components/taskmenu/button_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/button_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp b/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp
index 4848630..5e5ed92 100644
--- a/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/combobox_taskmenu.h b/tools/designer/src/components/taskmenu/combobox_taskmenu.h
index 098c753..c5f3d5f 100644
--- a/tools/designer/src/components/taskmenu/combobox_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/combobox_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
index f84674a..9889675 100644
--- a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h
index 7135734..11d4b82 100644
--- a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp
index c50df50..4d86c9d 100644
--- a/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/groupbox_taskmenu.h b/tools/designer/src/components/taskmenu/groupbox_taskmenu.h
index 48de7d9..f00e5cd 100644
--- a/tools/designer/src/components/taskmenu/groupbox_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/groupbox_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/inplace_editor.cpp b/tools/designer/src/components/taskmenu/inplace_editor.cpp
index 5732500..8bf54e6 100644
--- a/tools/designer/src/components/taskmenu/inplace_editor.cpp
+++ b/tools/designer/src/components/taskmenu/inplace_editor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/inplace_editor.h b/tools/designer/src/components/taskmenu/inplace_editor.h
index a129492..29919f5 100644
--- a/tools/designer/src/components/taskmenu/inplace_editor.h
+++ b/tools/designer/src/components/taskmenu/inplace_editor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp b/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp
index bd94570..1709b1e 100644
--- a/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp
+++ b/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/inplace_widget_helper.h b/tools/designer/src/components/taskmenu/inplace_widget_helper.h
index 7bb53a1..a424b9b 100644
--- a/tools/designer/src/components/taskmenu/inplace_widget_helper.h
+++ b/tools/designer/src/components/taskmenu/inplace_widget_helper.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/itemlisteditor.cpp b/tools/designer/src/components/taskmenu/itemlisteditor.cpp
index 9f8e9c8..17027cb 100644
--- a/tools/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/tools/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/itemlisteditor.h b/tools/designer/src/components/taskmenu/itemlisteditor.h
index 3905d81..c1ced31 100644
--- a/tools/designer/src/components/taskmenu/itemlisteditor.h
+++ b/tools/designer/src/components/taskmenu/itemlisteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/itemlisteditor.ui b/tools/designer/src/components/taskmenu/itemlisteditor.ui
index b434323..a078b1e 100644
--- a/tools/designer/src/components/taskmenu/itemlisteditor.ui
+++ b/tools/designer/src/components/taskmenu/itemlisteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/components/taskmenu/label_taskmenu.cpp b/tools/designer/src/components/taskmenu/label_taskmenu.cpp
index 15f0ac0..6fccc8a 100644
--- a/tools/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/label_taskmenu.h b/tools/designer/src/components/taskmenu/label_taskmenu.h
index e3158b8..bdc4775 100644
--- a/tools/designer/src/components/taskmenu/label_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/label_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/layouttaskmenu.cpp b/tools/designer/src/components/taskmenu/layouttaskmenu.cpp
index aa6a568..563d925 100644
--- a/tools/designer/src/components/taskmenu/layouttaskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/layouttaskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/layouttaskmenu.h b/tools/designer/src/components/taskmenu/layouttaskmenu.h
index db5f643..50eab55 100644
--- a/tools/designer/src/components/taskmenu/layouttaskmenu.h
+++ b/tools/designer/src/components/taskmenu/layouttaskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp
index 8b525d5..b7c9930 100644
--- a/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/lineedit_taskmenu.h b/tools/designer/src/components/taskmenu/lineedit_taskmenu.h
index ffd225e..67efda9 100644
--- a/tools/designer/src/components/taskmenu/lineedit_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/lineedit_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp
index 409870b..eed1db7 100644
--- a/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/listwidget_taskmenu.h b/tools/designer/src/components/taskmenu/listwidget_taskmenu.h
index a57df6e..4d25297 100644
--- a/tools/designer/src/components/taskmenu/listwidget_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/listwidget_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/listwidgeteditor.cpp b/tools/designer/src/components/taskmenu/listwidgeteditor.cpp
index edb6b06..1275db5 100644
--- a/tools/designer/src/components/taskmenu/listwidgeteditor.cpp
+++ b/tools/designer/src/components/taskmenu/listwidgeteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/listwidgeteditor.h b/tools/designer/src/components/taskmenu/listwidgeteditor.h
index 21ef7a5..6092f30 100644
--- a/tools/designer/src/components/taskmenu/listwidgeteditor.h
+++ b/tools/designer/src/components/taskmenu/listwidgeteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/menutaskmenu.cpp b/tools/designer/src/components/taskmenu/menutaskmenu.cpp
index be753d4..22b729b 100644
--- a/tools/designer/src/components/taskmenu/menutaskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/menutaskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/menutaskmenu.h b/tools/designer/src/components/taskmenu/menutaskmenu.h
index 78081e8..610f0a3 100644
--- a/tools/designer/src/components/taskmenu/menutaskmenu.h
+++ b/tools/designer/src/components/taskmenu/menutaskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
index 2724ce6..2a994c6 100644
--- a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h
index a537778..dbc22b9 100644
--- a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp b/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp
index 7dd5442..52dba2c 100644
--- a/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp
+++ b/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/tablewidgeteditor.h b/tools/designer/src/components/taskmenu/tablewidgeteditor.h
index ff54ea5..594f7f3 100644
--- a/tools/designer/src/components/taskmenu/tablewidgeteditor.h
+++ b/tools/designer/src/components/taskmenu/tablewidgeteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/tablewidgeteditor.ui b/tools/designer/src/components/taskmenu/tablewidgeteditor.ui
index c580af4..41afb57 100644
--- a/tools/designer/src/components/taskmenu/tablewidgeteditor.ui
+++ b/tools/designer/src/components/taskmenu/tablewidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/components/taskmenu/taskmenu_component.cpp b/tools/designer/src/components/taskmenu/taskmenu_component.cpp
index 446485b..a4e80df 100644
--- a/tools/designer/src/components/taskmenu/taskmenu_component.cpp
+++ b/tools/designer/src/components/taskmenu/taskmenu_component.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/taskmenu_component.h b/tools/designer/src/components/taskmenu/taskmenu_component.h
index 50bd1a8..5f640ab 100644
--- a/tools/designer/src/components/taskmenu/taskmenu_component.h
+++ b/tools/designer/src/components/taskmenu/taskmenu_component.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/taskmenu_global.h b/tools/designer/src/components/taskmenu/taskmenu_global.h
index 782b0e7..f673dc8 100644
--- a/tools/designer/src/components/taskmenu/taskmenu_global.h
+++ b/tools/designer/src/components/taskmenu/taskmenu_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp b/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp
index fc16710..deac27e 100644
--- a/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/textedit_taskmenu.h b/tools/designer/src/components/taskmenu/textedit_taskmenu.h
index 7ed4176..e4ab886 100644
--- a/tools/designer/src/components/taskmenu/textedit_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/textedit_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp
index 4f1c79c..ec6378a 100644
--- a/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/toolbar_taskmenu.h b/tools/designer/src/components/taskmenu/toolbar_taskmenu.h
index bd5b27d..0317987 100644
--- a/tools/designer/src/components/taskmenu/toolbar_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/toolbar_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp
index bc1238e..4412a00 100644
--- a/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/treewidget_taskmenu.h b/tools/designer/src/components/taskmenu/treewidget_taskmenu.h
index 88656c0..0ac7466 100644
--- a/tools/designer/src/components/taskmenu/treewidget_taskmenu.h
+++ b/tools/designer/src/components/taskmenu/treewidget_taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/treewidgeteditor.cpp b/tools/designer/src/components/taskmenu/treewidgeteditor.cpp
index c4063d1..f97ac12 100644
--- a/tools/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/tools/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/treewidgeteditor.h b/tools/designer/src/components/taskmenu/treewidgeteditor.h
index 8cb7def..6cc8a98 100644
--- a/tools/designer/src/components/taskmenu/treewidgeteditor.h
+++ b/tools/designer/src/components/taskmenu/treewidgeteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/taskmenu/treewidgeteditor.ui b/tools/designer/src/components/taskmenu/treewidgeteditor.ui
index e7fba1c..51b1ea0 100644
--- a/tools/designer/src/components/taskmenu/treewidgeteditor.ui
+++ b/tools/designer/src/components/taskmenu/treewidgeteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/components/widgetbox/widgetbox.cpp b/tools/designer/src/components/widgetbox/widgetbox.cpp
index 091135a..338eac0 100644
--- a/tools/designer/src/components/widgetbox/widgetbox.cpp
+++ b/tools/designer/src/components/widgetbox/widgetbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetbox.h b/tools/designer/src/components/widgetbox/widgetbox.h
index c5c0cf0..fe6e092 100644
--- a/tools/designer/src/components/widgetbox/widgetbox.h
+++ b/tools/designer/src/components/widgetbox/widgetbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetbox.xml b/tools/designer/src/components/widgetbox/widgetbox.xml
index 2974af9..a8868f8 100644
--- a/tools/designer/src/components/widgetbox/widgetbox.xml
+++ b/tools/designer/src/components/widgetbox/widgetbox.xml
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 **************************************************************************-->
diff --git a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index 25798d3..92f64aa 100644
--- a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetbox_dnditem.h b/tools/designer/src/components/widgetbox/widgetbox_dnditem.h
index 71d6f12..5759244 100644
--- a/tools/designer/src/components/widgetbox/widgetbox_dnditem.h
+++ b/tools/designer/src/components/widgetbox/widgetbox_dnditem.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetbox_global.h b/tools/designer/src/components/widgetbox/widgetbox_global.h
index a583786..d08ea06 100644
--- a/tools/designer/src/components/widgetbox/widgetbox_global.h
+++ b/tools/designer/src/components/widgetbox/widgetbox_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index 1a8611c..b7f8823 100644
--- a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h
index 27545a3..16667c9 100644
--- a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h
+++ b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 9c6ed83..47daf7b 100644
--- a/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/components/widgetbox/widgetboxtreewidget.h b/tools/designer/src/components/widgetbox/widgetboxtreewidget.h
index b20d0f8..75087a6 100644
--- a/tools/designer/src/components/widgetbox/widgetboxtreewidget.h
+++ b/tools/designer/src/components/widgetbox/widgetboxtreewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/appfontdialog.cpp b/tools/designer/src/designer/appfontdialog.cpp
index 64f7a13..bbfe241 100644
--- a/tools/designer/src/designer/appfontdialog.cpp
+++ b/tools/designer/src/designer/appfontdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/appfontdialog.h b/tools/designer/src/designer/appfontdialog.h
index 8138c5e..750509e 100644
--- a/tools/designer/src/designer/appfontdialog.h
+++ b/tools/designer/src/designer/appfontdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/assistantclient.cpp b/tools/designer/src/designer/assistantclient.cpp
index bddaf63..6f1c705 100644
--- a/tools/designer/src/designer/assistantclient.cpp
+++ b/tools/designer/src/designer/assistantclient.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/assistantclient.h b/tools/designer/src/designer/assistantclient.h
index dcc8e64..acfd210 100644
--- a/tools/designer/src/designer/assistantclient.h
+++ b/tools/designer/src/designer/assistantclient.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/designer_enums.h b/tools/designer/src/designer/designer_enums.h
index cde9e9e..b31a6a9 100644
--- a/tools/designer/src/designer/designer_enums.h
+++ b/tools/designer/src/designer/designer_enums.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/main.cpp b/tools/designer/src/designer/main.cpp
index a71afa0..efaccdc 100644
--- a/tools/designer/src/designer/main.cpp
+++ b/tools/designer/src/designer/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/mainwindow.cpp b/tools/designer/src/designer/mainwindow.cpp
index 86bc47e..98eef23 100644
--- a/tools/designer/src/designer/mainwindow.cpp
+++ b/tools/designer/src/designer/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/mainwindow.h b/tools/designer/src/designer/mainwindow.h
index 5796073..68ce06f 100644
--- a/tools/designer/src/designer/mainwindow.h
+++ b/tools/designer/src/designer/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/newform.cpp b/tools/designer/src/designer/newform.cpp
index ff81d0e..81a4e6b 100644
--- a/tools/designer/src/designer/newform.cpp
+++ b/tools/designer/src/designer/newform.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/newform.h b/tools/designer/src/designer/newform.h
index 1c7cb7f..c270622 100644
--- a/tools/designer/src/designer/newform.h
+++ b/tools/designer/src/designer/newform.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/preferencesdialog.cpp b/tools/designer/src/designer/preferencesdialog.cpp
index 9628bf9..2613556 100644
--- a/tools/designer/src/designer/preferencesdialog.cpp
+++ b/tools/designer/src/designer/preferencesdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/preferencesdialog.h b/tools/designer/src/designer/preferencesdialog.h
index 4913cb0..5df0df4 100644
--- a/tools/designer/src/designer/preferencesdialog.h
+++ b/tools/designer/src/designer/preferencesdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner.cpp b/tools/designer/src/designer/qdesigner.cpp
index 3a8d4cf..c132ef5 100644
--- a/tools/designer/src/designer/qdesigner.cpp
+++ b/tools/designer/src/designer/qdesigner.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner.h b/tools/designer/src/designer/qdesigner.h
index 52db710..fa2e160 100644
--- a/tools/designer/src/designer/qdesigner.h
+++ b/tools/designer/src/designer/qdesigner.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_actions.cpp b/tools/designer/src/designer/qdesigner_actions.cpp
index 86b6214..332a553 100644
--- a/tools/designer/src/designer/qdesigner_actions.cpp
+++ b/tools/designer/src/designer/qdesigner_actions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_actions.h b/tools/designer/src/designer/qdesigner_actions.h
index d8f9e42..a25629e 100644
--- a/tools/designer/src/designer/qdesigner_actions.h
+++ b/tools/designer/src/designer/qdesigner_actions.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_appearanceoptions.cpp b/tools/designer/src/designer/qdesigner_appearanceoptions.cpp
index d75e640..3c55d46 100644
--- a/tools/designer/src/designer/qdesigner_appearanceoptions.cpp
+++ b/tools/designer/src/designer/qdesigner_appearanceoptions.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_appearanceoptions.h b/tools/designer/src/designer/qdesigner_appearanceoptions.h
index db105b0..389874d 100644
--- a/tools/designer/src/designer/qdesigner_appearanceoptions.h
+++ b/tools/designer/src/designer/qdesigner_appearanceoptions.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_formwindow.cpp b/tools/designer/src/designer/qdesigner_formwindow.cpp
index 9ae9688..ba4f934 100644
--- a/tools/designer/src/designer/qdesigner_formwindow.cpp
+++ b/tools/designer/src/designer/qdesigner_formwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_formwindow.h b/tools/designer/src/designer/qdesigner_formwindow.h
index c79c0a9..ef6a339 100644
--- a/tools/designer/src/designer/qdesigner_formwindow.h
+++ b/tools/designer/src/designer/qdesigner_formwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_pch.h b/tools/designer/src/designer/qdesigner_pch.h
index e91be9f..1169f31 100644
--- a/tools/designer/src/designer/qdesigner_pch.h
+++ b/tools/designer/src/designer/qdesigner_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_server.cpp b/tools/designer/src/designer/qdesigner_server.cpp
index de1532c..02d0984 100644
--- a/tools/designer/src/designer/qdesigner_server.cpp
+++ b/tools/designer/src/designer/qdesigner_server.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_server.h b/tools/designer/src/designer/qdesigner_server.h
index 90cc624..139904c 100644
--- a/tools/designer/src/designer/qdesigner_server.h
+++ b/tools/designer/src/designer/qdesigner_server.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_settings.cpp b/tools/designer/src/designer/qdesigner_settings.cpp
index cc6cec5..9a76ab8 100644
--- a/tools/designer/src/designer/qdesigner_settings.cpp
+++ b/tools/designer/src/designer/qdesigner_settings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_settings.h b/tools/designer/src/designer/qdesigner_settings.h
index fad9d1c..40035c3 100644
--- a/tools/designer/src/designer/qdesigner_settings.h
+++ b/tools/designer/src/designer/qdesigner_settings.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_toolwindow.cpp b/tools/designer/src/designer/qdesigner_toolwindow.cpp
index f267cdb..c5ba89d 100644
--- a/tools/designer/src/designer/qdesigner_toolwindow.cpp
+++ b/tools/designer/src/designer/qdesigner_toolwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_toolwindow.h b/tools/designer/src/designer/qdesigner_toolwindow.h
index 2ec4d33..29d1a05 100644
--- a/tools/designer/src/designer/qdesigner_toolwindow.h
+++ b/tools/designer/src/designer/qdesigner_toolwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_workbench.cpp b/tools/designer/src/designer/qdesigner_workbench.cpp
index 168c468..f75d377 100644
--- a/tools/designer/src/designer/qdesigner_workbench.cpp
+++ b/tools/designer/src/designer/qdesigner_workbench.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/qdesigner_workbench.h b/tools/designer/src/designer/qdesigner_workbench.h
index 8359f34..47a0313 100644
--- a/tools/designer/src/designer/qdesigner_workbench.h
+++ b/tools/designer/src/designer/qdesigner_workbench.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/saveformastemplate.cpp b/tools/designer/src/designer/saveformastemplate.cpp
index c65187b..c195987 100644
--- a/tools/designer/src/designer/saveformastemplate.cpp
+++ b/tools/designer/src/designer/saveformastemplate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/saveformastemplate.h b/tools/designer/src/designer/saveformastemplate.h
index 938b081..020d99f 100644
--- a/tools/designer/src/designer/saveformastemplate.h
+++ b/tools/designer/src/designer/saveformastemplate.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/saveformastemplate.ui b/tools/designer/src/designer/saveformastemplate.ui
index b69af62..9865feb 100644
--- a/tools/designer/src/designer/saveformastemplate.ui
+++ b/tools/designer/src/designer/saveformastemplate.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp
index d9b03aa..29d3004 100644
--- a/tools/designer/src/designer/versiondialog.cpp
+++ b/tools/designer/src/designer/versiondialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/designer/versiondialog.h b/tools/designer/src/designer/versiondialog.h
index d7a0d62..ceb757c 100644
--- a/tools/designer/src/designer/versiondialog.h
+++ b/tools/designer/src/designer/versiondialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/components/qdesigner_components.h b/tools/designer/src/lib/components/qdesigner_components.h
index 2ba7e32..0a466cd 100644
--- a/tools/designer/src/lib/components/qdesigner_components.h
+++ b/tools/designer/src/lib/components/qdesigner_components.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/components/qdesigner_components_global.h b/tools/designer/src/lib/components/qdesigner_components_global.h
index 5edc23b..f191cf4 100644
--- a/tools/designer/src/lib/components/qdesigner_components_global.h
+++ b/tools/designer/src/lib/components/qdesigner_components_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/extension/default_extensionfactory.cpp b/tools/designer/src/lib/extension/default_extensionfactory.cpp
index 715c2e5..6ae58e6 100644
--- a/tools/designer/src/lib/extension/default_extensionfactory.cpp
+++ b/tools/designer/src/lib/extension/default_extensionfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/extension/default_extensionfactory.h b/tools/designer/src/lib/extension/default_extensionfactory.h
index c594222..32a81e3 100644
--- a/tools/designer/src/lib/extension/default_extensionfactory.h
+++ b/tools/designer/src/lib/extension/default_extensionfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/extension/extension.cpp b/tools/designer/src/lib/extension/extension.cpp
index 0283031..6818789 100644
--- a/tools/designer/src/lib/extension/extension.cpp
+++ b/tools/designer/src/lib/extension/extension.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/extension/extension.h b/tools/designer/src/lib/extension/extension.h
index d13e517..f0117d8 100644
--- a/tools/designer/src/lib/extension/extension.h
+++ b/tools/designer/src/lib/extension/extension.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/extension/extension_global.h b/tools/designer/src/lib/extension/extension_global.h
index 2e0594f..2328fc2 100644
--- a/tools/designer/src/lib/extension/extension_global.h
+++ b/tools/designer/src/lib/extension/extension_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/extension/qextensionmanager.cpp b/tools/designer/src/lib/extension/qextensionmanager.cpp
index 7950d9f..c7ea7fc 100644
--- a/tools/designer/src/lib/extension/qextensionmanager.cpp
+++ b/tools/designer/src/lib/extension/qextensionmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/extension/qextensionmanager.h b/tools/designer/src/lib/extension/qextensionmanager.h
index 6975f5c..8761387 100644
--- a/tools/designer/src/lib/extension/qextensionmanager.h
+++ b/tools/designer/src/lib/extension/qextensionmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/lib_pch.h b/tools/designer/src/lib/lib_pch.h
index ae07cfa..40d480b 100644
--- a/tools/designer/src/lib/lib_pch.h
+++ b/tools/designer/src/lib/lib_pch.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractactioneditor.cpp b/tools/designer/src/lib/sdk/abstractactioneditor.cpp
index 2a76db1..063e99d 100644
--- a/tools/designer/src/lib/sdk/abstractactioneditor.cpp
+++ b/tools/designer/src/lib/sdk/abstractactioneditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractactioneditor.h b/tools/designer/src/lib/sdk/abstractactioneditor.h
index 05742b3..6a1d8fa 100644
--- a/tools/designer/src/lib/sdk/abstractactioneditor.h
+++ b/tools/designer/src/lib/sdk/abstractactioneditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractbrushmanager.h b/tools/designer/src/lib/sdk/abstractbrushmanager.h
index d3e77b0..7a09999 100644
--- a/tools/designer/src/lib/sdk/abstractbrushmanager.h
+++ b/tools/designer/src/lib/sdk/abstractbrushmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractdialoggui.cpp b/tools/designer/src/lib/sdk/abstractdialoggui.cpp
index a4238c4..4d5111f 100644
--- a/tools/designer/src/lib/sdk/abstractdialoggui.cpp
+++ b/tools/designer/src/lib/sdk/abstractdialoggui.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractdialoggui_p.h b/tools/designer/src/lib/sdk/abstractdialoggui_p.h
index f9792e0..fa960d3 100644
--- a/tools/designer/src/lib/sdk/abstractdialoggui_p.h
+++ b/tools/designer/src/lib/sdk/abstractdialoggui_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractdnditem.h b/tools/designer/src/lib/sdk/abstractdnditem.h
index 34065b7..83dc02d 100644
--- a/tools/designer/src/lib/sdk/abstractdnditem.h
+++ b/tools/designer/src/lib/sdk/abstractdnditem.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformeditor.cpp b/tools/designer/src/lib/sdk/abstractformeditor.cpp
index c301f46..9b2662a 100644
--- a/tools/designer/src/lib/sdk/abstractformeditor.cpp
+++ b/tools/designer/src/lib/sdk/abstractformeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformeditor.h b/tools/designer/src/lib/sdk/abstractformeditor.h
index 54ceaef..4b521b0 100644
--- a/tools/designer/src/lib/sdk/abstractformeditor.h
+++ b/tools/designer/src/lib/sdk/abstractformeditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp b/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp
index dfd07ae..c017aab 100644
--- a/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp
+++ b/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformeditorplugin.h b/tools/designer/src/lib/sdk/abstractformeditorplugin.h
index 0a70ca3..1b6a8f0 100644
--- a/tools/designer/src/lib/sdk/abstractformeditorplugin.h
+++ b/tools/designer/src/lib/sdk/abstractformeditorplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindow.cpp b/tools/designer/src/lib/sdk/abstractformwindow.cpp
index 0fb94ee..b362fa2 100644
--- a/tools/designer/src/lib/sdk/abstractformwindow.cpp
+++ b/tools/designer/src/lib/sdk/abstractformwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindow.h b/tools/designer/src/lib/sdk/abstractformwindow.h
index 243ef3a..357788d 100644
--- a/tools/designer/src/lib/sdk/abstractformwindow.h
+++ b/tools/designer/src/lib/sdk/abstractformwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp b/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp
index ddd812e..576e927 100644
--- a/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp
+++ b/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindowcursor.h b/tools/designer/src/lib/sdk/abstractformwindowcursor.h
index ecdd76c..5d2eaf9 100644
--- a/tools/designer/src/lib/sdk/abstractformwindowcursor.h
+++ b/tools/designer/src/lib/sdk/abstractformwindowcursor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp b/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp
index ee35b99..15f283a 100644
--- a/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp
+++ b/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindowmanager.h b/tools/designer/src/lib/sdk/abstractformwindowmanager.h
index 15059a2..9fc667a 100644
--- a/tools/designer/src/lib/sdk/abstractformwindowmanager.h
+++ b/tools/designer/src/lib/sdk/abstractformwindowmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindowtool.cpp b/tools/designer/src/lib/sdk/abstractformwindowtool.cpp
index cb65a00..ab8c25a 100644
--- a/tools/designer/src/lib/sdk/abstractformwindowtool.cpp
+++ b/tools/designer/src/lib/sdk/abstractformwindowtool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractformwindowtool.h b/tools/designer/src/lib/sdk/abstractformwindowtool.h
index 7390ac8..9a9de82 100644
--- a/tools/designer/src/lib/sdk/abstractformwindowtool.h
+++ b/tools/designer/src/lib/sdk/abstractformwindowtool.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstracticoncache.h b/tools/designer/src/lib/sdk/abstracticoncache.h
index fee5006..e0d1cfe 100644
--- a/tools/designer/src/lib/sdk/abstracticoncache.h
+++ b/tools/designer/src/lib/sdk/abstracticoncache.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractintegration.cpp b/tools/designer/src/lib/sdk/abstractintegration.cpp
index c5a60db..acd28e2 100644
--- a/tools/designer/src/lib/sdk/abstractintegration.cpp
+++ b/tools/designer/src/lib/sdk/abstractintegration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractintegration.h b/tools/designer/src/lib/sdk/abstractintegration.h
index 9b2b856..2b8be09 100644
--- a/tools/designer/src/lib/sdk/abstractintegration.h
+++ b/tools/designer/src/lib/sdk/abstractintegration.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractintrospection.cpp b/tools/designer/src/lib/sdk/abstractintrospection.cpp
index 618f35f..b5dd795 100644
--- a/tools/designer/src/lib/sdk/abstractintrospection.cpp
+++ b/tools/designer/src/lib/sdk/abstractintrospection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractintrospection_p.h b/tools/designer/src/lib/sdk/abstractintrospection_p.h
index f29102b..a5c99b5 100644
--- a/tools/designer/src/lib/sdk/abstractintrospection_p.h
+++ b/tools/designer/src/lib/sdk/abstractintrospection_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractlanguage.h b/tools/designer/src/lib/sdk/abstractlanguage.h
index 561a4b8..097aa89 100644
--- a/tools/designer/src/lib/sdk/abstractlanguage.h
+++ b/tools/designer/src/lib/sdk/abstractlanguage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractmetadatabase.cpp b/tools/designer/src/lib/sdk/abstractmetadatabase.cpp
index 0686b70..e32adc0 100644
--- a/tools/designer/src/lib/sdk/abstractmetadatabase.cpp
+++ b/tools/designer/src/lib/sdk/abstractmetadatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractmetadatabase.h b/tools/designer/src/lib/sdk/abstractmetadatabase.h
index 45a4f9e..1b6967d 100644
--- a/tools/designer/src/lib/sdk/abstractmetadatabase.h
+++ b/tools/designer/src/lib/sdk/abstractmetadatabase.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractnewformwidget.cpp b/tools/designer/src/lib/sdk/abstractnewformwidget.cpp
index e948673..b513a8c 100644
--- a/tools/designer/src/lib/sdk/abstractnewformwidget.cpp
+++ b/tools/designer/src/lib/sdk/abstractnewformwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractnewformwidget_p.h b/tools/designer/src/lib/sdk/abstractnewformwidget_p.h
index 5126381..bccb2a1 100644
--- a/tools/designer/src/lib/sdk/abstractnewformwidget_p.h
+++ b/tools/designer/src/lib/sdk/abstractnewformwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractobjectinspector.cpp b/tools/designer/src/lib/sdk/abstractobjectinspector.cpp
index 68cac5f..2d1097f 100644
--- a/tools/designer/src/lib/sdk/abstractobjectinspector.cpp
+++ b/tools/designer/src/lib/sdk/abstractobjectinspector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractobjectinspector.h b/tools/designer/src/lib/sdk/abstractobjectinspector.h
index 337835f..d490143 100644
--- a/tools/designer/src/lib/sdk/abstractobjectinspector.h
+++ b/tools/designer/src/lib/sdk/abstractobjectinspector.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractoptionspage_p.h b/tools/designer/src/lib/sdk/abstractoptionspage_p.h
index 9b47db7..e43e7f6 100644
--- a/tools/designer/src/lib/sdk/abstractoptionspage_p.h
+++ b/tools/designer/src/lib/sdk/abstractoptionspage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp b/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp
index 2e658c5..0033c6e 100644
--- a/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp
+++ b/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractpromotioninterface.h b/tools/designer/src/lib/sdk/abstractpromotioninterface.h
index b6ff534..4d65a34 100644
--- a/tools/designer/src/lib/sdk/abstractpromotioninterface.h
+++ b/tools/designer/src/lib/sdk/abstractpromotioninterface.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp b/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp
index 89d4a01..5c3b326 100644
--- a/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp
+++ b/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractpropertyeditor.h b/tools/designer/src/lib/sdk/abstractpropertyeditor.h
index 6eb757f..5e0a624 100644
--- a/tools/designer/src/lib/sdk/abstractpropertyeditor.h
+++ b/tools/designer/src/lib/sdk/abstractpropertyeditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp b/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp
index 8563dc8..354fcba 100644
--- a/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp
+++ b/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractresourcebrowser.h b/tools/designer/src/lib/sdk/abstractresourcebrowser.h
index 20cd82b..c578ab9 100644
--- a/tools/designer/src/lib/sdk/abstractresourcebrowser.h
+++ b/tools/designer/src/lib/sdk/abstractresourcebrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractsettings_p.h b/tools/designer/src/lib/sdk/abstractsettings_p.h
index d1b145a..4bb5f78 100644
--- a/tools/designer/src/lib/sdk/abstractsettings_p.h
+++ b/tools/designer/src/lib/sdk/abstractsettings_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractwidgetbox.cpp b/tools/designer/src/lib/sdk/abstractwidgetbox.cpp
index 4e24585..3f1134e 100644
--- a/tools/designer/src/lib/sdk/abstractwidgetbox.cpp
+++ b/tools/designer/src/lib/sdk/abstractwidgetbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractwidgetbox.h b/tools/designer/src/lib/sdk/abstractwidgetbox.h
index c534996..c1a17e7 100644
--- a/tools/designer/src/lib/sdk/abstractwidgetbox.h
+++ b/tools/designer/src/lib/sdk/abstractwidgetbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp b/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp
index 58a195f..c2716b3 100644
--- a/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp
+++ b/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractwidgetdatabase.h b/tools/designer/src/lib/sdk/abstractwidgetdatabase.h
index ac37667..5c0a750 100644
--- a/tools/designer/src/lib/sdk/abstractwidgetdatabase.h
+++ b/tools/designer/src/lib/sdk/abstractwidgetdatabase.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp b/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp
index 440b5e3..7c1769a 100644
--- a/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp
+++ b/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/abstractwidgetfactory.h b/tools/designer/src/lib/sdk/abstractwidgetfactory.h
index 2b5b8e8..4f21b80 100644
--- a/tools/designer/src/lib/sdk/abstractwidgetfactory.h
+++ b/tools/designer/src/lib/sdk/abstractwidgetfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/dynamicpropertysheet.h b/tools/designer/src/lib/sdk/dynamicpropertysheet.h
index 3471ce4..470449d 100644
--- a/tools/designer/src/lib/sdk/dynamicpropertysheet.h
+++ b/tools/designer/src/lib/sdk/dynamicpropertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/extrainfo.cpp b/tools/designer/src/lib/sdk/extrainfo.cpp
index aea452b..32d35a6 100644
--- a/tools/designer/src/lib/sdk/extrainfo.cpp
+++ b/tools/designer/src/lib/sdk/extrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/extrainfo.h b/tools/designer/src/lib/sdk/extrainfo.h
index 95eb910..0fefbec 100644
--- a/tools/designer/src/lib/sdk/extrainfo.h
+++ b/tools/designer/src/lib/sdk/extrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/layoutdecoration.h b/tools/designer/src/lib/sdk/layoutdecoration.h
index 902e4b5..f2ca116 100644
--- a/tools/designer/src/lib/sdk/layoutdecoration.h
+++ b/tools/designer/src/lib/sdk/layoutdecoration.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/membersheet.h b/tools/designer/src/lib/sdk/membersheet.h
index ca4f626..6c49aab 100644
--- a/tools/designer/src/lib/sdk/membersheet.h
+++ b/tools/designer/src/lib/sdk/membersheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/propertysheet.h b/tools/designer/src/lib/sdk/propertysheet.h
index 5ec2481..4ed7053 100644
--- a/tools/designer/src/lib/sdk/propertysheet.h
+++ b/tools/designer/src/lib/sdk/propertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/script.cpp b/tools/designer/src/lib/sdk/script.cpp
index 34c55d3..a8a2a9c 100644
--- a/tools/designer/src/lib/sdk/script.cpp
+++ b/tools/designer/src/lib/sdk/script.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/script_p.h b/tools/designer/src/lib/sdk/script_p.h
index 326d0aa..89308f8 100644
--- a/tools/designer/src/lib/sdk/script_p.h
+++ b/tools/designer/src/lib/sdk/script_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/sdk_global.h b/tools/designer/src/lib/sdk/sdk_global.h
index e0ed838..0c7560d 100644
--- a/tools/designer/src/lib/sdk/sdk_global.h
+++ b/tools/designer/src/lib/sdk/sdk_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/sdk/taskmenu.h b/tools/designer/src/lib/sdk/taskmenu.h
index b582777..9a1ea05 100644
--- a/tools/designer/src/lib/sdk/taskmenu.h
+++ b/tools/designer/src/lib/sdk/taskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/actioneditor.cpp b/tools/designer/src/lib/shared/actioneditor.cpp
index 26ac8a8..e5860fd 100644
--- a/tools/designer/src/lib/shared/actioneditor.cpp
+++ b/tools/designer/src/lib/shared/actioneditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/actioneditor_p.h b/tools/designer/src/lib/shared/actioneditor_p.h
index 1fe16cf..4a5a862 100644
--- a/tools/designer/src/lib/shared/actioneditor_p.h
+++ b/tools/designer/src/lib/shared/actioneditor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/actionprovider_p.h b/tools/designer/src/lib/shared/actionprovider_p.h
index 1d78144..e450ad7 100644
--- a/tools/designer/src/lib/shared/actionprovider_p.h
+++ b/tools/designer/src/lib/shared/actionprovider_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/actionrepository.cpp b/tools/designer/src/lib/shared/actionrepository.cpp
index a54c1e7..f305a2d 100644
--- a/tools/designer/src/lib/shared/actionrepository.cpp
+++ b/tools/designer/src/lib/shared/actionrepository.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/actionrepository_p.h b/tools/designer/src/lib/shared/actionrepository_p.h
index 6e17e7b..d58e2e1 100644
--- a/tools/designer/src/lib/shared/actionrepository_p.h
+++ b/tools/designer/src/lib/shared/actionrepository_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/codedialog.cpp b/tools/designer/src/lib/shared/codedialog.cpp
index 484f343..506b6c4 100644
--- a/tools/designer/src/lib/shared/codedialog.cpp
+++ b/tools/designer/src/lib/shared/codedialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/codedialog_p.h b/tools/designer/src/lib/shared/codedialog_p.h
index 65a1950..fd9303a 100644
--- a/tools/designer/src/lib/shared/codedialog_p.h
+++ b/tools/designer/src/lib/shared/codedialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/connectionedit.cpp b/tools/designer/src/lib/shared/connectionedit.cpp
index 0bebe47..006b0a1 100644
--- a/tools/designer/src/lib/shared/connectionedit.cpp
+++ b/tools/designer/src/lib/shared/connectionedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/connectionedit_p.h b/tools/designer/src/lib/shared/connectionedit_p.h
index 37dfe75..39167ba 100644
--- a/tools/designer/src/lib/shared/connectionedit_p.h
+++ b/tools/designer/src/lib/shared/connectionedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/csshighlighter.cpp b/tools/designer/src/lib/shared/csshighlighter.cpp
index 3c905df..b72b218 100644
--- a/tools/designer/src/lib/shared/csshighlighter.cpp
+++ b/tools/designer/src/lib/shared/csshighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/csshighlighter_p.h b/tools/designer/src/lib/shared/csshighlighter_p.h
index 3448bd5..3105a1b 100644
--- a/tools/designer/src/lib/shared/csshighlighter_p.h
+++ b/tools/designer/src/lib/shared/csshighlighter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/deviceprofile.cpp b/tools/designer/src/lib/shared/deviceprofile.cpp
index 2737a1d..5761a94 100644
--- a/tools/designer/src/lib/shared/deviceprofile.cpp
+++ b/tools/designer/src/lib/shared/deviceprofile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/deviceprofile_p.h b/tools/designer/src/lib/shared/deviceprofile_p.h
index 64c9891..fb58bd9 100644
--- a/tools/designer/src/lib/shared/deviceprofile_p.h
+++ b/tools/designer/src/lib/shared/deviceprofile_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/dialoggui.cpp b/tools/designer/src/lib/shared/dialoggui.cpp
index 9574156..151b059 100644
--- a/tools/designer/src/lib/shared/dialoggui.cpp
+++ b/tools/designer/src/lib/shared/dialoggui.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/dialoggui_p.h b/tools/designer/src/lib/shared/dialoggui_p.h
index 176576d..80075b1 100644
--- a/tools/designer/src/lib/shared/dialoggui_p.h
+++ b/tools/designer/src/lib/shared/dialoggui_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/extensionfactory_p.h b/tools/designer/src/lib/shared/extensionfactory_p.h
index 1c91ddb..32de45e 100644
--- a/tools/designer/src/lib/shared/extensionfactory_p.h
+++ b/tools/designer/src/lib/shared/extensionfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/filterwidget.cpp b/tools/designer/src/lib/shared/filterwidget.cpp
index a501c02..3a16311 100644
--- a/tools/designer/src/lib/shared/filterwidget.cpp
+++ b/tools/designer/src/lib/shared/filterwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/filterwidget_p.h b/tools/designer/src/lib/shared/filterwidget_p.h
index 8ca2073..72c2585 100644
--- a/tools/designer/src/lib/shared/filterwidget_p.h
+++ b/tools/designer/src/lib/shared/filterwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/formlayoutmenu.cpp b/tools/designer/src/lib/shared/formlayoutmenu.cpp
index 8d9f9a6..cb0e94e 100644
--- a/tools/designer/src/lib/shared/formlayoutmenu.cpp
+++ b/tools/designer/src/lib/shared/formlayoutmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/formlayoutmenu_p.h b/tools/designer/src/lib/shared/formlayoutmenu_p.h
index 35c45a8..b9e35f7 100644
--- a/tools/designer/src/lib/shared/formlayoutmenu_p.h
+++ b/tools/designer/src/lib/shared/formlayoutmenu_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/formwindowbase.cpp b/tools/designer/src/lib/shared/formwindowbase.cpp
index 5292f5f..bf11fff 100644
--- a/tools/designer/src/lib/shared/formwindowbase.cpp
+++ b/tools/designer/src/lib/shared/formwindowbase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/formwindowbase_p.h b/tools/designer/src/lib/shared/formwindowbase_p.h
index 5944e62..c878456 100644
--- a/tools/designer/src/lib/shared/formwindowbase_p.h
+++ b/tools/designer/src/lib/shared/formwindowbase_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/grid.cpp b/tools/designer/src/lib/shared/grid.cpp
index 42296e1..b1033e7 100644
--- a/tools/designer/src/lib/shared/grid.cpp
+++ b/tools/designer/src/lib/shared/grid.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/grid_p.h b/tools/designer/src/lib/shared/grid_p.h
index 66267a0..ba554b7 100644
--- a/tools/designer/src/lib/shared/grid_p.h
+++ b/tools/designer/src/lib/shared/grid_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/gridpanel.cpp b/tools/designer/src/lib/shared/gridpanel.cpp
index 2695d4b..181d3e9 100644
--- a/tools/designer/src/lib/shared/gridpanel.cpp
+++ b/tools/designer/src/lib/shared/gridpanel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/gridpanel_p.h b/tools/designer/src/lib/shared/gridpanel_p.h
index bbca4fb..73959a4 100644
--- a/tools/designer/src/lib/shared/gridpanel_p.h
+++ b/tools/designer/src/lib/shared/gridpanel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/htmlhighlighter.cpp b/tools/designer/src/lib/shared/htmlhighlighter.cpp
index 8728a58..ffe04d2 100644
--- a/tools/designer/src/lib/shared/htmlhighlighter.cpp
+++ b/tools/designer/src/lib/shared/htmlhighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/htmlhighlighter_p.h b/tools/designer/src/lib/shared/htmlhighlighter_p.h
index 9bbd15e..997293c 100644
--- a/tools/designer/src/lib/shared/htmlhighlighter_p.h
+++ b/tools/designer/src/lib/shared/htmlhighlighter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/iconloader.cpp b/tools/designer/src/lib/shared/iconloader.cpp
index ed312b8..2165a5e 100644
--- a/tools/designer/src/lib/shared/iconloader.cpp
+++ b/tools/designer/src/lib/shared/iconloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/iconloader_p.h b/tools/designer/src/lib/shared/iconloader_p.h
index 5b80d8b..2938b85 100644
--- a/tools/designer/src/lib/shared/iconloader_p.h
+++ b/tools/designer/src/lib/shared/iconloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/iconselector.cpp b/tools/designer/src/lib/shared/iconselector.cpp
index 4bb7430..ca04cb3 100644
--- a/tools/designer/src/lib/shared/iconselector.cpp
+++ b/tools/designer/src/lib/shared/iconselector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h
index 3373f80..c80ad71 100644
--- a/tools/designer/src/lib/shared/iconselector_p.h
+++ b/tools/designer/src/lib/shared/iconselector_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/invisible_widget.cpp b/tools/designer/src/lib/shared/invisible_widget.cpp
index e0c7a40..7cd1b81 100644
--- a/tools/designer/src/lib/shared/invisible_widget.cpp
+++ b/tools/designer/src/lib/shared/invisible_widget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/invisible_widget_p.h b/tools/designer/src/lib/shared/invisible_widget_p.h
index 0bcba89..668d575 100644
--- a/tools/designer/src/lib/shared/invisible_widget_p.h
+++ b/tools/designer/src/lib/shared/invisible_widget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/layout.cpp b/tools/designer/src/lib/shared/layout.cpp
index f49b1c8..8c29d1e 100644
--- a/tools/designer/src/lib/shared/layout.cpp
+++ b/tools/designer/src/lib/shared/layout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/layout_p.h b/tools/designer/src/lib/shared/layout_p.h
index c683a5e..6976fbf 100644
--- a/tools/designer/src/lib/shared/layout_p.h
+++ b/tools/designer/src/lib/shared/layout_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/layoutinfo.cpp b/tools/designer/src/lib/shared/layoutinfo.cpp
index ad2dda4..4a9b86d 100644
--- a/tools/designer/src/lib/shared/layoutinfo.cpp
+++ b/tools/designer/src/lib/shared/layoutinfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/layoutinfo_p.h b/tools/designer/src/lib/shared/layoutinfo_p.h
index 0b946b5..5454bb8 100644
--- a/tools/designer/src/lib/shared/layoutinfo_p.h
+++ b/tools/designer/src/lib/shared/layoutinfo_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/metadatabase.cpp b/tools/designer/src/lib/shared/metadatabase.cpp
index 45f87a7..f1be41c 100644
--- a/tools/designer/src/lib/shared/metadatabase.cpp
+++ b/tools/designer/src/lib/shared/metadatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/metadatabase_p.h b/tools/designer/src/lib/shared/metadatabase_p.h
index 2e15c13..1c41c0c 100644
--- a/tools/designer/src/lib/shared/metadatabase_p.h
+++ b/tools/designer/src/lib/shared/metadatabase_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/morphmenu.cpp b/tools/designer/src/lib/shared/morphmenu.cpp
index de85d37..3249679 100644
--- a/tools/designer/src/lib/shared/morphmenu.cpp
+++ b/tools/designer/src/lib/shared/morphmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/morphmenu_p.h b/tools/designer/src/lib/shared/morphmenu_p.h
index a53f94f..52468e6 100644
--- a/tools/designer/src/lib/shared/morphmenu_p.h
+++ b/tools/designer/src/lib/shared/morphmenu_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/newactiondialog.cpp b/tools/designer/src/lib/shared/newactiondialog.cpp
index b411464..086e2af 100644
--- a/tools/designer/src/lib/shared/newactiondialog.cpp
+++ b/tools/designer/src/lib/shared/newactiondialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/newactiondialog.ui b/tools/designer/src/lib/shared/newactiondialog.ui
index f9cafd1..9b10ff2 100644
--- a/tools/designer/src/lib/shared/newactiondialog.ui
+++ b/tools/designer/src/lib/shared/newactiondialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/lib/shared/newactiondialog_p.h b/tools/designer/src/lib/shared/newactiondialog_p.h
index a71c23f..5f48250 100644
--- a/tools/designer/src/lib/shared/newactiondialog_p.h
+++ b/tools/designer/src/lib/shared/newactiondialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/newformwidget.cpp b/tools/designer/src/lib/shared/newformwidget.cpp
index 9c78d99..a3f853c 100644
--- a/tools/designer/src/lib/shared/newformwidget.cpp
+++ b/tools/designer/src/lib/shared/newformwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/newformwidget.ui b/tools/designer/src/lib/shared/newformwidget.ui
index c22f45b..8f2c6f3 100644
--- a/tools/designer/src/lib/shared/newformwidget.ui
+++ b/tools/designer/src/lib/shared/newformwidget.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/lib/shared/newformwidget_p.h b/tools/designer/src/lib/shared/newformwidget_p.h
index 262660c..88afcdc 100644
--- a/tools/designer/src/lib/shared/newformwidget_p.h
+++ b/tools/designer/src/lib/shared/newformwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/orderdialog.cpp b/tools/designer/src/lib/shared/orderdialog.cpp
index 1d28aba..76303fc 100644
--- a/tools/designer/src/lib/shared/orderdialog.cpp
+++ b/tools/designer/src/lib/shared/orderdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/orderdialog.ui b/tools/designer/src/lib/shared/orderdialog.ui
index 0901d16..946ad60 100644
--- a/tools/designer/src/lib/shared/orderdialog.ui
+++ b/tools/designer/src/lib/shared/orderdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/lib/shared/orderdialog_p.h b/tools/designer/src/lib/shared/orderdialog_p.h
index 14b4c17..1ccf26f 100644
--- a/tools/designer/src/lib/shared/orderdialog_p.h
+++ b/tools/designer/src/lib/shared/orderdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/plaintexteditor.cpp b/tools/designer/src/lib/shared/plaintexteditor.cpp
index 75c3b0f..d2c96f0 100644
--- a/tools/designer/src/lib/shared/plaintexteditor.cpp
+++ b/tools/designer/src/lib/shared/plaintexteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/plaintexteditor_p.h b/tools/designer/src/lib/shared/plaintexteditor_p.h
index 02b47ac..baf9a09 100644
--- a/tools/designer/src/lib/shared/plaintexteditor_p.h
+++ b/tools/designer/src/lib/shared/plaintexteditor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/plugindialog.cpp b/tools/designer/src/lib/shared/plugindialog.cpp
index 63ba81c..107f71f 100644
--- a/tools/designer/src/lib/shared/plugindialog.cpp
+++ b/tools/designer/src/lib/shared/plugindialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/plugindialog.ui b/tools/designer/src/lib/shared/plugindialog.ui
index 268d021..c726023 100644
--- a/tools/designer/src/lib/shared/plugindialog.ui
+++ b/tools/designer/src/lib/shared/plugindialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/designer/src/lib/shared/plugindialog_p.h b/tools/designer/src/lib/shared/plugindialog_p.h
index fdd3878..f4c2119 100644
--- a/tools/designer/src/lib/shared/plugindialog_p.h
+++ b/tools/designer/src/lib/shared/plugindialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/pluginmanager.cpp b/tools/designer/src/lib/shared/pluginmanager.cpp
index b319b40..1ef9080 100644
--- a/tools/designer/src/lib/shared/pluginmanager.cpp
+++ b/tools/designer/src/lib/shared/pluginmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/pluginmanager_p.h b/tools/designer/src/lib/shared/pluginmanager_p.h
index 000d111..6465e55 100644
--- a/tools/designer/src/lib/shared/pluginmanager_p.h
+++ b/tools/designer/src/lib/shared/pluginmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/previewconfigurationwidget.cpp b/tools/designer/src/lib/shared/previewconfigurationwidget.cpp
index d116d58..d2b59cc 100644
--- a/tools/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/tools/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/previewconfigurationwidget_p.h b/tools/designer/src/lib/shared/previewconfigurationwidget_p.h
index 100b296..334fe7a 100644
--- a/tools/designer/src/lib/shared/previewconfigurationwidget_p.h
+++ b/tools/designer/src/lib/shared/previewconfigurationwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/previewmanager.cpp b/tools/designer/src/lib/shared/previewmanager.cpp
index 332f459..2399cc0 100644
--- a/tools/designer/src/lib/shared/previewmanager.cpp
+++ b/tools/designer/src/lib/shared/previewmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/previewmanager_p.h b/tools/designer/src/lib/shared/previewmanager_p.h
index 577e8770..da1c40b 100644
--- a/tools/designer/src/lib/shared/previewmanager_p.h
+++ b/tools/designer/src/lib/shared/previewmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/promotionmodel.cpp b/tools/designer/src/lib/shared/promotionmodel.cpp
index d063f0e..3400422 100644
--- a/tools/designer/src/lib/shared/promotionmodel.cpp
+++ b/tools/designer/src/lib/shared/promotionmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/promotionmodel_p.h b/tools/designer/src/lib/shared/promotionmodel_p.h
index 2d86a7a..2f92122 100644
--- a/tools/designer/src/lib/shared/promotionmodel_p.h
+++ b/tools/designer/src/lib/shared/promotionmodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/promotiontaskmenu.cpp b/tools/designer/src/lib/shared/promotiontaskmenu.cpp
index ae6f7e6..3053f11 100644
--- a/tools/designer/src/lib/shared/promotiontaskmenu.cpp
+++ b/tools/designer/src/lib/shared/promotiontaskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/promotiontaskmenu_p.h b/tools/designer/src/lib/shared/promotiontaskmenu_p.h
index 8d5f9a3..8ebb128 100644
--- a/tools/designer/src/lib/shared/promotiontaskmenu_p.h
+++ b/tools/designer/src/lib/shared/promotiontaskmenu_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/propertylineedit.cpp b/tools/designer/src/lib/shared/propertylineedit.cpp
index 159aec1..f003586 100644
--- a/tools/designer/src/lib/shared/propertylineedit.cpp
+++ b/tools/designer/src/lib/shared/propertylineedit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/propertylineedit_p.h b/tools/designer/src/lib/shared/propertylineedit_p.h
index 074f59e..940ed2a 100644
--- a/tools/designer/src/lib/shared/propertylineedit_p.h
+++ b/tools/designer/src/lib/shared/propertylineedit_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_command.cpp b/tools/designer/src/lib/shared/qdesigner_command.cpp
index 69206df..21d2519 100644
--- a/tools/designer/src/lib/shared/qdesigner_command.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_command.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_command2.cpp b/tools/designer/src/lib/shared/qdesigner_command2.cpp
index c16bf40..ac3be2d 100644
--- a/tools/designer/src/lib/shared/qdesigner_command2.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_command2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_command2_p.h b/tools/designer/src/lib/shared/qdesigner_command2_p.h
index 5c7b9d6..f3a00c7 100644
--- a/tools/designer/src/lib/shared/qdesigner_command2_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_command2_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_command_p.h b/tools/designer/src/lib/shared/qdesigner_command_p.h
index e93a5a6..de9c5b0 100644
--- a/tools/designer/src/lib/shared/qdesigner_command_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_command_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_dnditem.cpp b/tools/designer/src/lib/shared/qdesigner_dnditem.cpp
index 8384a9f..1199be5 100644
--- a/tools/designer/src/lib/shared/qdesigner_dnditem.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_dnditem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_dnditem_p.h b/tools/designer/src/lib/shared/qdesigner_dnditem_p.h
index f5ab350..e394fe4 100644
--- a/tools/designer/src/lib/shared/qdesigner_dnditem_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_dnditem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp b/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp
index 90fe289..e9a55fc 100644
--- a/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h b/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h
index c540bc7..6538500 100644
--- a/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp b/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp
index 14e0d81..2ef50b0 100644
--- a/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h b/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h
index cf2638b..93e51a7 100644
--- a/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp b/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp
index a64a986..1631df9 100644
--- a/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h b/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h
index 5822fe2..dfe172c 100644
--- a/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp b/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp
index 490373e..8e99a6f 100644
--- a/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h b/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h
index d73d70c..9f696f6 100644
--- a/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp b/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
index 036dc23..b4c9325 100644
--- a/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h b/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h
index 95d56e0..6c22cbe 100644
--- a/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_integration.cpp b/tools/designer/src/lib/shared/qdesigner_integration.cpp
index 30e3960..d574db6 100644
--- a/tools/designer/src/lib/shared/qdesigner_integration.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_integration.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_integration_p.h b/tools/designer/src/lib/shared/qdesigner_integration_p.h
index 938268f..219da5d 100644
--- a/tools/designer/src/lib/shared/qdesigner_integration_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_integration_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_introspection.cpp b/tools/designer/src/lib/shared/qdesigner_introspection.cpp
index 7bc60d4..83aa8ee 100644
--- a/tools/designer/src/lib/shared/qdesigner_introspection.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_introspection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_introspection_p.h b/tools/designer/src/lib/shared/qdesigner_introspection_p.h
index 0b295df..a824dc5 100644
--- a/tools/designer/src/lib/shared/qdesigner_introspection_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_introspection_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_membersheet.cpp b/tools/designer/src/lib/shared/qdesigner_membersheet.cpp
index e6b9aa2..f134029 100644
--- a/tools/designer/src/lib/shared/qdesigner_membersheet.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_membersheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_membersheet_p.h b/tools/designer/src/lib/shared/qdesigner_membersheet_p.h
index 97813bb..832393c 100644
--- a/tools/designer/src/lib/shared/qdesigner_membersheet_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_membersheet_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_menu.cpp b/tools/designer/src/lib/shared/qdesigner_menu.cpp
index 31a226a..d988b52 100644
--- a/tools/designer/src/lib/shared/qdesigner_menu.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_menu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_menu_p.h b/tools/designer/src/lib/shared/qdesigner_menu_p.h
index ae1e0e7..a0e1932 100644
--- a/tools/designer/src/lib/shared/qdesigner_menu_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_menu_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_menubar.cpp b/tools/designer/src/lib/shared/qdesigner_menubar.cpp
index 8d53037..7eb6907 100644
--- a/tools/designer/src/lib/shared/qdesigner_menubar.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_menubar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_menubar_p.h b/tools/designer/src/lib/shared/qdesigner_menubar_p.h
index 0b5fae9..b872041 100644
--- a/tools/designer/src/lib/shared/qdesigner_menubar_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_menubar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp b/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp
index 985689f..863caba 100644
--- a/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h b/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h
index f4b6672..ee7d6fe 100644
--- a/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_promotion.cpp b/tools/designer/src/lib/shared/qdesigner_promotion.cpp
index b23487f..0e05bac 100644
--- a/tools/designer/src/lib/shared/qdesigner_promotion.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_promotion.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_promotion_p.h b/tools/designer/src/lib/shared/qdesigner_promotion_p.h
index 537fcb1..ccea1d3 100644
--- a/tools/designer/src/lib/shared/qdesigner_promotion_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_promotion_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp
index eca6615..9bc1803 100644
--- a/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h b/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h
index 1e63d81..ceff66c 100644
--- a/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
index 6cc054c..910aa5b 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h b/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h
index 75b23ca..6ca0678 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp b/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp
index 9a1739e..e550308 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h b/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h
index 27078f2..27092fa 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
index 086f46d..76301c7 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h b/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h
index 0105eac..b6ab37c 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_qsettings.cpp b/tools/designer/src/lib/shared/qdesigner_qsettings.cpp
index 6e0f5df..2bf2920 100644
--- a/tools/designer/src/lib/shared/qdesigner_qsettings.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_qsettings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_qsettings_p.h b/tools/designer/src/lib/shared/qdesigner_qsettings_p.h
index 94e53cd..221110d 100644
--- a/tools/designer/src/lib/shared/qdesigner_qsettings_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_qsettings_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp b/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp
index 76d7c2b..5e9527b 100644
--- a/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h b/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h
index 993f5fb..31be9e1 100644
--- a/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp b/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp
index ecd97fa..73cc152 100644
--- a/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h b/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h
index c15ce73..178f151 100644
--- a/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp b/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp
index cd95f5b..0278482 100644
--- a/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h b/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h
index da7f572..8ee77cf 100644
--- a/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_toolbar.cpp b/tools/designer/src/lib/shared/qdesigner_toolbar.cpp
index e3bc64c..6df5baa 100644
--- a/tools/designer/src/lib/shared/qdesigner_toolbar.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_toolbar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_toolbar_p.h b/tools/designer/src/lib/shared/qdesigner_toolbar_p.h
index 8375b4a..8ec3e74 100644
--- a/tools/designer/src/lib/shared/qdesigner_toolbar_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_toolbar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_toolbox.cpp b/tools/designer/src/lib/shared/qdesigner_toolbox.cpp
index 986bfbe..dceddae 100644
--- a/tools/designer/src/lib/shared/qdesigner_toolbox.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_toolbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_toolbox_p.h b/tools/designer/src/lib/shared/qdesigner_toolbox_p.h
index dd14a8d..33de256 100644
--- a/tools/designer/src/lib/shared/qdesigner_toolbox_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_toolbox_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_utils.cpp b/tools/designer/src/lib/shared/qdesigner_utils.cpp
index 3bd0704..cf4ea17 100644
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_utils_p.h b/tools/designer/src/lib/shared/qdesigner_utils_p.h
index fac0697..f209939 100644
--- a/tools/designer/src/lib/shared/qdesigner_utils_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_utils_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_widget.cpp b/tools/designer/src/lib/shared/qdesigner_widget.cpp
index 898bb5a..9bbe584 100644
--- a/tools/designer/src/lib/shared/qdesigner_widget.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_widget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_widget_p.h b/tools/designer/src/lib/shared/qdesigner_widget_p.h
index 59ad2b7..b84fc18 100644
--- a/tools/designer/src/lib/shared/qdesigner_widget_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_widget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp b/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp
index 8231f40..e196e08 100644
--- a/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h b/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h
index 13b7f74..5b6da9b 100644
--- a/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp b/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp
index 4ed494e..3b9d655 100644
--- a/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h b/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h
index 9558c74..0f1d0a2 100644
--- a/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qlayout_widget.cpp b/tools/designer/src/lib/shared/qlayout_widget.cpp
index acec815..bf9b285 100644
--- a/tools/designer/src/lib/shared/qlayout_widget.cpp
+++ b/tools/designer/src/lib/shared/qlayout_widget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qlayout_widget_p.h b/tools/designer/src/lib/shared/qlayout_widget_p.h
index f029817..33bab5a 100644
--- a/tools/designer/src/lib/shared/qlayout_widget_p.h
+++ b/tools/designer/src/lib/shared/qlayout_widget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qscripthighlighter.cpp b/tools/designer/src/lib/shared/qscripthighlighter.cpp
index 74586c9..34a0c19 100644
--- a/tools/designer/src/lib/shared/qscripthighlighter.cpp
+++ b/tools/designer/src/lib/shared/qscripthighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qscripthighlighter_p.h b/tools/designer/src/lib/shared/qscripthighlighter_p.h
index 58839bc..cd42bf0 100644
--- a/tools/designer/src/lib/shared/qscripthighlighter_p.h
+++ b/tools/designer/src/lib/shared/qscripthighlighter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qsimpleresource.cpp b/tools/designer/src/lib/shared/qsimpleresource.cpp
index 95ab4e5..deacaeb 100644
--- a/tools/designer/src/lib/shared/qsimpleresource.cpp
+++ b/tools/designer/src/lib/shared/qsimpleresource.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qsimpleresource_p.h b/tools/designer/src/lib/shared/qsimpleresource_p.h
index 9567018..5977422 100644
--- a/tools/designer/src/lib/shared/qsimpleresource_p.h
+++ b/tools/designer/src/lib/shared/qsimpleresource_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
index f033c36..c974928 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
index 28c3d5f..da51431 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qtresourcemodel.cpp b/tools/designer/src/lib/shared/qtresourcemodel.cpp
index e3fc805..2d80c43 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/tools/designer/src/lib/shared/qtresourcemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h
index cfcacfa..8184eb8 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel_p.h
+++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qtresourceview.cpp b/tools/designer/src/lib/shared/qtresourceview.cpp
index 18fd07b..6d4c522 100644
--- a/tools/designer/src/lib/shared/qtresourceview.cpp
+++ b/tools/designer/src/lib/shared/qtresourceview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h
index 8da2975..a56c6ed 100644
--- a/tools/designer/src/lib/shared/qtresourceview_p.h
+++ b/tools/designer/src/lib/shared/qtresourceview_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/richtexteditor.cpp b/tools/designer/src/lib/shared/richtexteditor.cpp
index ec7c2e5..18e4f26 100644
--- a/tools/designer/src/lib/shared/richtexteditor.cpp
+++ b/tools/designer/src/lib/shared/richtexteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/richtexteditor_p.h b/tools/designer/src/lib/shared/richtexteditor_p.h
index 44023ef..59cd890 100644
--- a/tools/designer/src/lib/shared/richtexteditor_p.h
+++ b/tools/designer/src/lib/shared/richtexteditor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/scriptcommand.cpp b/tools/designer/src/lib/shared/scriptcommand.cpp
index 9e71808..e293af4 100644
--- a/tools/designer/src/lib/shared/scriptcommand.cpp
+++ b/tools/designer/src/lib/shared/scriptcommand.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/scriptcommand_p.h b/tools/designer/src/lib/shared/scriptcommand_p.h
index d5192da..2696349 100644
--- a/tools/designer/src/lib/shared/scriptcommand_p.h
+++ b/tools/designer/src/lib/shared/scriptcommand_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/scriptdialog.cpp b/tools/designer/src/lib/shared/scriptdialog.cpp
index 8be5675..f057f0e 100644
--- a/tools/designer/src/lib/shared/scriptdialog.cpp
+++ b/tools/designer/src/lib/shared/scriptdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/scriptdialog_p.h b/tools/designer/src/lib/shared/scriptdialog_p.h
index 678fff0..98177d8 100644
--- a/tools/designer/src/lib/shared/scriptdialog_p.h
+++ b/tools/designer/src/lib/shared/scriptdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/scripterrordialog.cpp b/tools/designer/src/lib/shared/scripterrordialog.cpp
index 306cd7e..330ed74 100644
--- a/tools/designer/src/lib/shared/scripterrordialog.cpp
+++ b/tools/designer/src/lib/shared/scripterrordialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/scripterrordialog_p.h b/tools/designer/src/lib/shared/scripterrordialog_p.h
index e8cfa31..8d97900 100644
--- a/tools/designer/src/lib/shared/scripterrordialog_p.h
+++ b/tools/designer/src/lib/shared/scripterrordialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/shared_enums_p.h b/tools/designer/src/lib/shared/shared_enums_p.h
index 7066ccb..ec101a1 100644
--- a/tools/designer/src/lib/shared/shared_enums_p.h
+++ b/tools/designer/src/lib/shared/shared_enums_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/shared_global_p.h b/tools/designer/src/lib/shared/shared_global_p.h
index d6e946c..b0d6416 100644
--- a/tools/designer/src/lib/shared/shared_global_p.h
+++ b/tools/designer/src/lib/shared/shared_global_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/shared_settings.cpp b/tools/designer/src/lib/shared/shared_settings.cpp
index 281b5c6..bffd267 100644
--- a/tools/designer/src/lib/shared/shared_settings.cpp
+++ b/tools/designer/src/lib/shared/shared_settings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/shared_settings_p.h b/tools/designer/src/lib/shared/shared_settings_p.h
index 29ad3ab..bea54ce 100644
--- a/tools/designer/src/lib/shared/shared_settings_p.h
+++ b/tools/designer/src/lib/shared/shared_settings_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/sheet_delegate.cpp b/tools/designer/src/lib/shared/sheet_delegate.cpp
index c5b596f..8872493 100644
--- a/tools/designer/src/lib/shared/sheet_delegate.cpp
+++ b/tools/designer/src/lib/shared/sheet_delegate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/sheet_delegate_p.h b/tools/designer/src/lib/shared/sheet_delegate_p.h
index 3d34936..6fdf401 100644
--- a/tools/designer/src/lib/shared/sheet_delegate_p.h
+++ b/tools/designer/src/lib/shared/sheet_delegate_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/signalslotdialog.cpp b/tools/designer/src/lib/shared/signalslotdialog.cpp
index 685cc93..d570970 100644
--- a/tools/designer/src/lib/shared/signalslotdialog.cpp
+++ b/tools/designer/src/lib/shared/signalslotdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/signalslotdialog_p.h b/tools/designer/src/lib/shared/signalslotdialog_p.h
index 4058cbe..d9e5348 100644
--- a/tools/designer/src/lib/shared/signalslotdialog_p.h
+++ b/tools/designer/src/lib/shared/signalslotdialog_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/spacer_widget.cpp b/tools/designer/src/lib/shared/spacer_widget.cpp
index 5727745..cef19cf 100644
--- a/tools/designer/src/lib/shared/spacer_widget.cpp
+++ b/tools/designer/src/lib/shared/spacer_widget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/spacer_widget_p.h b/tools/designer/src/lib/shared/spacer_widget_p.h
index 7c7fec1..6e2ab03 100644
--- a/tools/designer/src/lib/shared/spacer_widget_p.h
+++ b/tools/designer/src/lib/shared/spacer_widget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/stylesheeteditor.cpp b/tools/designer/src/lib/shared/stylesheeteditor.cpp
index e809447..7309fa6 100644
--- a/tools/designer/src/lib/shared/stylesheeteditor.cpp
+++ b/tools/designer/src/lib/shared/stylesheeteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/stylesheeteditor_p.h b/tools/designer/src/lib/shared/stylesheeteditor_p.h
index fd78dec..98a9c67 100644
--- a/tools/designer/src/lib/shared/stylesheeteditor_p.h
+++ b/tools/designer/src/lib/shared/stylesheeteditor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/textpropertyeditor.cpp b/tools/designer/src/lib/shared/textpropertyeditor.cpp
index 881be1c..375e07d 100644
--- a/tools/designer/src/lib/shared/textpropertyeditor.cpp
+++ b/tools/designer/src/lib/shared/textpropertyeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/textpropertyeditor_p.h b/tools/designer/src/lib/shared/textpropertyeditor_p.h
index 48f7898..40fa522 100644
--- a/tools/designer/src/lib/shared/textpropertyeditor_p.h
+++ b/tools/designer/src/lib/shared/textpropertyeditor_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/widgetdatabase.cpp b/tools/designer/src/lib/shared/widgetdatabase.cpp
index 0c3e949..8752210 100644
--- a/tools/designer/src/lib/shared/widgetdatabase.cpp
+++ b/tools/designer/src/lib/shared/widgetdatabase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/widgetdatabase_p.h b/tools/designer/src/lib/shared/widgetdatabase_p.h
index 873e79b..3d9b96c 100644
--- a/tools/designer/src/lib/shared/widgetdatabase_p.h
+++ b/tools/designer/src/lib/shared/widgetdatabase_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/widgetfactory.cpp b/tools/designer/src/lib/shared/widgetfactory.cpp
index c7b13a1..0bd5dfd 100644
--- a/tools/designer/src/lib/shared/widgetfactory.cpp
+++ b/tools/designer/src/lib/shared/widgetfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/widgetfactory_p.h b/tools/designer/src/lib/shared/widgetfactory_p.h
index f6ab3b8..b44130f 100644
--- a/tools/designer/src/lib/shared/widgetfactory_p.h
+++ b/tools/designer/src/lib/shared/widgetfactory_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/zoomwidget.cpp b/tools/designer/src/lib/shared/zoomwidget.cpp
index f5d7434..80261a3 100644
--- a/tools/designer/src/lib/shared/zoomwidget.cpp
+++ b/tools/designer/src/lib/shared/zoomwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/shared/zoomwidget_p.h b/tools/designer/src/lib/shared/zoomwidget_p.h
index 9d42ef8..898824a 100644
--- a/tools/designer/src/lib/shared/zoomwidget_p.h
+++ b/tools/designer/src/lib/shared/zoomwidget_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 6f009e3..bcd33b7 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **sw
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.h b/tools/designer/src/lib/uilib/abstractformbuilder.h
index 200532b..da354cd 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.h
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/container.h b/tools/designer/src/lib/uilib/container.h
index b96c19c..478ddf6 100644
--- a/tools/designer/src/lib/uilib/container.h
+++ b/tools/designer/src/lib/uilib/container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/customwidget.h b/tools/designer/src/lib/uilib/customwidget.h
index 9003fd6..40410f0 100644
--- a/tools/designer/src/lib/uilib/customwidget.h
+++ b/tools/designer/src/lib/uilib/customwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp
index c97daac..e9a7b95 100644
--- a/tools/designer/src/lib/uilib/formbuilder.cpp
+++ b/tools/designer/src/lib/uilib/formbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/formbuilder.h b/tools/designer/src/lib/uilib/formbuilder.h
index d2cf6a6..d2ac9e6 100644
--- a/tools/designer/src/lib/uilib/formbuilder.h
+++ b/tools/designer/src/lib/uilib/formbuilder.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/formbuilderextra.cpp b/tools/designer/src/lib/uilib/formbuilderextra.cpp
index 6c3357f..fdea1c3 100644
--- a/tools/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/tools/designer/src/lib/uilib/formbuilderextra.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/formbuilderextra_p.h b/tools/designer/src/lib/uilib/formbuilderextra_p.h
index 4505323..8dd2009 100644
--- a/tools/designer/src/lib/uilib/formbuilderextra_p.h
+++ b/tools/designer/src/lib/uilib/formbuilderextra_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/formscriptrunner.cpp b/tools/designer/src/lib/uilib/formscriptrunner.cpp
index 2060247..21315ac 100644
--- a/tools/designer/src/lib/uilib/formscriptrunner.cpp
+++ b/tools/designer/src/lib/uilib/formscriptrunner.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/formscriptrunner_p.h b/tools/designer/src/lib/uilib/formscriptrunner_p.h
index 3343f47..605ca07 100644
--- a/tools/designer/src/lib/uilib/formscriptrunner_p.h
+++ b/tools/designer/src/lib/uilib/formscriptrunner_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/properties.cpp b/tools/designer/src/lib/uilib/properties.cpp
index 615aa8a..c1b6890 100644
--- a/tools/designer/src/lib/uilib/properties.cpp
+++ b/tools/designer/src/lib/uilib/properties.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/properties_p.h b/tools/designer/src/lib/uilib/properties_p.h
index b17c24e..ea697dc 100644
--- a/tools/designer/src/lib/uilib/properties_p.h
+++ b/tools/designer/src/lib/uilib/properties_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/qdesignerexportwidget.h b/tools/designer/src/lib/uilib/qdesignerexportwidget.h
index c05dfd0..444d690 100644
--- a/tools/designer/src/lib/uilib/qdesignerexportwidget.h
+++ b/tools/designer/src/lib/uilib/qdesignerexportwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/resourcebuilder.cpp b/tools/designer/src/lib/uilib/resourcebuilder.cpp
index 810bea0..32e84f0 100644
--- a/tools/designer/src/lib/uilib/resourcebuilder.cpp
+++ b/tools/designer/src/lib/uilib/resourcebuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/resourcebuilder_p.h b/tools/designer/src/lib/uilib/resourcebuilder_p.h
index ae52ad9..8eb4304 100644
--- a/tools/designer/src/lib/uilib/resourcebuilder_p.h
+++ b/tools/designer/src/lib/uilib/resourcebuilder_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/textbuilder.cpp b/tools/designer/src/lib/uilib/textbuilder.cpp
index a510418..64cdb47 100644
--- a/tools/designer/src/lib/uilib/textbuilder.cpp
+++ b/tools/designer/src/lib/uilib/textbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/textbuilder_p.h b/tools/designer/src/lib/uilib/textbuilder_p.h
index 0eac687..dcceea2 100644
--- a/tools/designer/src/lib/uilib/textbuilder_p.h
+++ b/tools/designer/src/lib/uilib/textbuilder_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/ui4.cpp b/tools/designer/src/lib/uilib/ui4.cpp
index c13bd59..d9bee39 100644
--- a/tools/designer/src/lib/uilib/ui4.cpp
+++ b/tools/designer/src/lib/uilib/ui4.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/ui4_p.h b/tools/designer/src/lib/uilib/ui4_p.h
index 1f38f88..413d54f 100644
--- a/tools/designer/src/lib/uilib/ui4_p.h
+++ b/tools/designer/src/lib/uilib/ui4_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/lib/uilib/uilib_global.h b/tools/designer/src/lib/uilib/uilib_global.h
index 8a5452d..a86f5de 100644
--- a/tools/designer/src/lib/uilib/uilib_global.h
+++ b/tools/designer/src/lib/uilib/uilib_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp
index 1ada176..5c971ff 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
index 9f3c252..4b027ad 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp
index 8298bd3..3774ab0 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h
index 8af3fe8..382a7af 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
index b6ad8e5..ca8d4b3 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
index afae962..9610e11 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
index 4692eb7..47caa51 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
+++ b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
index 814f8de..745a143 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
+++ b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp
index 6f62873..1635bea 100644
--- a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp
+++ b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h
index 50132a6..594f5e1 100644
--- a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h
+++ b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/phononcollection.cpp b/tools/designer/src/plugins/phononwidgets/phononcollection.cpp
index 288e94a..689829c 100644
--- a/tools/designer/src/plugins/phononwidgets/phononcollection.cpp
+++ b/tools/designer/src/plugins/phononwidgets/phononcollection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp
index 7f597ff..30ef01b 100644
--- a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp
+++ b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h
index f65cdc2..9151eda 100644
--- a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h
+++ b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp
index 489a08c..bbed0d7 100644
--- a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp
+++ b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h
index 0aabd7a..6d66a25 100644
--- a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h
+++ b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp
index a440436..dcc0321 100644
--- a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp
+++ b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h
index 8ed614e..8c8e91e 100644
--- a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h
+++ b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp
index 24eb829..9ff4be6 100644
--- a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp
+++ b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h
index 4bab7af..2ce4221 100644
--- a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h
+++ b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
index 7148ad0..57fa6c6 100644
--- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
+++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
index 2f13f16..b951586 100644
--- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
+++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp b/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
index c90e191..c6335ae 100644
--- a/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
+++ b/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/qwebview/qwebview_plugin.h b/tools/designer/src/plugins/qwebview/qwebview_plugin.h
index 4ba6447..d896012 100644
--- a/tools/designer/src/plugins/qwebview/qwebview_plugin.h
+++ b/tools/designer/src/plugins/qwebview/qwebview_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/tools/view3d/view3d.cpp b/tools/designer/src/plugins/tools/view3d/view3d.cpp
index 347e250..92b8736 100644
--- a/tools/designer/src/plugins/tools/view3d/view3d.cpp
+++ b/tools/designer/src/plugins/tools/view3d/view3d.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/tools/view3d/view3d.h b/tools/designer/src/plugins/tools/view3d/view3d.h
index da53e77..f74db50 100644
--- a/tools/designer/src/plugins/tools/view3d/view3d.h
+++ b/tools/designer/src/plugins/tools/view3d/view3d.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/tools/view3d/view3d_global.h b/tools/designer/src/plugins/tools/view3d/view3d_global.h
index d985316..d97d1f9 100644
--- a/tools/designer/src/plugins/tools/view3d/view3d_global.h
+++ b/tools/designer/src/plugins/tools/view3d/view3d_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp b/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp
index 30f901c..e00e49a 100644
--- a/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp
+++ b/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/tools/view3d/view3d_plugin.h b/tools/designer/src/plugins/tools/view3d/view3d_plugin.h
index 466378b..8641a60 100644
--- a/tools/designer/src/plugins/tools/view3d/view3d_plugin.h
+++ b/tools/designer/src/plugins/tools/view3d/view3d_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp b/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp
index 3636d60..cb398e7 100644
--- a/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp
+++ b/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/tools/view3d/view3d_tool.h b/tools/designer/src/plugins/tools/view3d/view3d_tool.h
index f9bba24..589f49d 100644
--- a/tools/designer/src/plugins/tools/view3d/view3d_tool.h
+++ b/tools/designer/src/plugins/tools/view3d/view3d_tool.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp
index a1e7380..56569d0 100644
--- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp
+++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h
index 4f2b3b2..72e93ba 100644
--- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h
+++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp
index b2cad86..e6eded8 100644
--- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h
index e20e344..52a3023 100644
--- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp
index 2db3509..e294804 100644
--- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp
+++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h
index bfb6738..13957c2 100644
--- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h
+++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp
index b8c00b6..ec7b049 100644
--- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h
index 68d6913..7d998dc 100644
--- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp
index b5487d0..bbbd9e9 100644
--- a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp
+++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h
index e5222ed..18f6575 100644
--- a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h
+++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp
index 4b6dea1..ec53213 100644
--- a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h
index f9c82a2..4e04eca 100644
--- a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp
index f13d1f2..80a02c1 100644
--- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp
+++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h
index 11eb959..5d1ed0c 100644
--- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h
+++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp
index c57a906..f884ecb 100644
--- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h
index 4ac7daa..7509077 100644
--- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp
index 0554117..b1b1221 100644
--- a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp
+++ b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h
index 4de8b71..3385eb0 100644
--- a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h
+++ b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp
index 5e385a0..276cf68 100644
--- a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h
index 0df5e0a..8b21851 100644
--- a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp
index 9f6e11d..f9ecdf7 100644
--- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp
+++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h
index beeaf3b..90c3af7 100644
--- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h
+++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp
index 2b0cc56..3a753d2 100644
--- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h
index 77bfb58..814a16d 100644
--- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp
index 5ecbf3c..19080f1 100644
--- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp
+++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h
index 22562b1..4b66cc2 100644
--- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h
+++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp
index e0d9b50..62965ce 100644
--- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h
index 3a2ffe0..e50e7cf 100644
--- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp
index 78a4bc3..46ee873 100644
--- a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp
+++ b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h
index f4695de..859ff16 100644
--- a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h
+++ b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp
index efe011b..0918aa9 100644
--- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp
+++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h
index 266c00c..3303410 100644
--- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h
+++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp
index 59d48ff..5039a5a 100644
--- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h
index d61b4a1..b90e40c 100644
--- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp
index 9369768..61c6b1e 100644
--- a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp
+++ b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h
index 67062ce..fe568c6 100644
--- a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h
+++ b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp
index 019fe1f..ff2a40b 100644
--- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp
+++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h
index f96ba74..9aea4b4 100644
--- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h
+++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp
index 95278aa..06b30c2 100644
--- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp
+++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h
index c9fff40..d8c1089 100644
--- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h
+++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp b/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp
index 6d517cf..93a8cbe 100644
--- a/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp
+++ b/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index c7e7829..b6770e6 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/uitools/quiloader.h b/tools/designer/src/uitools/quiloader.h
index d1a0528..1397613 100644
--- a/tools/designer/src/uitools/quiloader.h
+++ b/tools/designer/src/uitools/quiloader.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/designer/src/uitools/quiloader_p.h b/tools/designer/src/uitools/quiloader_p.h
index 820198a..44e7461 100644
--- a/tools/designer/src/uitools/quiloader_p.h
+++ b/tools/designer/src/uitools/quiloader_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/kmap2qmap/main.cpp b/tools/kmap2qmap/main.cpp
index 3fb61d6..70ef94a 100644
--- a/tools/kmap2qmap/main.cpp
+++ b/tools/kmap2qmap/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp
index d691548..a48268b 100644
--- a/tools/linguist/lconvert/main.cpp
+++ b/tools/linguist/lconvert/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/batchtranslation.ui b/tools/linguist/linguist/batchtranslation.ui
index 380c4fc..1617e00 100644
--- a/tools/linguist/linguist/batchtranslation.ui
+++ b/tools/linguist/linguist/batchtranslation.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/linguist/linguist/batchtranslationdialog.cpp b/tools/linguist/linguist/batchtranslationdialog.cpp
index 8864666..4dff00c 100644
--- a/tools/linguist/linguist/batchtranslationdialog.cpp
+++ b/tools/linguist/linguist/batchtranslationdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/batchtranslationdialog.h b/tools/linguist/linguist/batchtranslationdialog.h
index c811738..c256341 100644
--- a/tools/linguist/linguist/batchtranslationdialog.h
+++ b/tools/linguist/linguist/batchtranslationdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/errorsview.cpp b/tools/linguist/linguist/errorsview.cpp
index 9e225e6..96ce908 100644
--- a/tools/linguist/linguist/errorsview.cpp
+++ b/tools/linguist/linguist/errorsview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/errorsview.h b/tools/linguist/linguist/errorsview.h
index 41351c5..2c2853f 100644
--- a/tools/linguist/linguist/errorsview.h
+++ b/tools/linguist/linguist/errorsview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/finddialog.cpp b/tools/linguist/linguist/finddialog.cpp
index 55514fd..029be4e 100644
--- a/tools/linguist/linguist/finddialog.cpp
+++ b/tools/linguist/linguist/finddialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h
index f97253d..df73105 100644
--- a/tools/linguist/linguist/finddialog.h
+++ b/tools/linguist/linguist/finddialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/finddialog.ui b/tools/linguist/linguist/finddialog.ui
index 59372d9..07ecbb4 100644
--- a/tools/linguist/linguist/finddialog.ui
+++ b/tools/linguist/linguist/finddialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/linguist/linguist/formpreviewview.cpp b/tools/linguist/linguist/formpreviewview.cpp
index f360a16..349cca4 100644
--- a/tools/linguist/linguist/formpreviewview.cpp
+++ b/tools/linguist/linguist/formpreviewview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/formpreviewview.h b/tools/linguist/linguist/formpreviewview.h
index c328d02..f688025 100644
--- a/tools/linguist/linguist/formpreviewview.h
+++ b/tools/linguist/linguist/formpreviewview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/globals.cpp b/tools/linguist/linguist/globals.cpp
index d3054ea..c30de05 100644
--- a/tools/linguist/linguist/globals.cpp
+++ b/tools/linguist/linguist/globals.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/globals.h b/tools/linguist/linguist/globals.h
index 87e2aa9..e4723eb 100644
--- a/tools/linguist/linguist/globals.h
+++ b/tools/linguist/linguist/globals.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp
index ee72c6d..670b2a0 100644
--- a/tools/linguist/linguist/main.cpp
+++ b/tools/linguist/linguist/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 18baa24..49d9453 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/mainwindow.h b/tools/linguist/linguist/mainwindow.h
index a1fa891..3eab81b 100644
--- a/tools/linguist/linguist/mainwindow.h
+++ b/tools/linguist/linguist/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/mainwindow.ui b/tools/linguist/linguist/mainwindow.ui
index 4edde5e..4f888eb 100644
--- a/tools/linguist/linguist/mainwindow.ui
+++ b/tools/linguist/linguist/mainwindow.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp
index 3848723..4298eec 100644
--- a/tools/linguist/linguist/messageeditor.cpp
+++ b/tools/linguist/linguist/messageeditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/messageeditor.h b/tools/linguist/linguist/messageeditor.h
index 8e560f8..c378d51 100644
--- a/tools/linguist/linguist/messageeditor.h
+++ b/tools/linguist/linguist/messageeditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/messageeditorwidgets.cpp b/tools/linguist/linguist/messageeditorwidgets.cpp
index 4d31db2..4d8f46e 100644
--- a/tools/linguist/linguist/messageeditorwidgets.cpp
+++ b/tools/linguist/linguist/messageeditorwidgets.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/messageeditorwidgets.h b/tools/linguist/linguist/messageeditorwidgets.h
index f20cb54..2f8460f 100644
--- a/tools/linguist/linguist/messageeditorwidgets.h
+++ b/tools/linguist/linguist/messageeditorwidgets.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/messagehighlighter.cpp b/tools/linguist/linguist/messagehighlighter.cpp
index 7ff7950..86e34bc 100644
--- a/tools/linguist/linguist/messagehighlighter.cpp
+++ b/tools/linguist/linguist/messagehighlighter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/messagehighlighter.h b/tools/linguist/linguist/messagehighlighter.h
index e801f63..9964b21 100644
--- a/tools/linguist/linguist/messagehighlighter.h
+++ b/tools/linguist/linguist/messagehighlighter.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/messagemodel.cpp b/tools/linguist/linguist/messagemodel.cpp
index 39ba9fd..307fcb5 100644
--- a/tools/linguist/linguist/messagemodel.cpp
+++ b/tools/linguist/linguist/messagemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/messagemodel.h b/tools/linguist/linguist/messagemodel.h
index 7d98873..d31b0d6 100644
--- a/tools/linguist/linguist/messagemodel.h
+++ b/tools/linguist/linguist/messagemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index 709ec35..a666965 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phrase.h b/tools/linguist/linguist/phrase.h
index 82ecd58..ffeb705 100644
--- a/tools/linguist/linguist/phrase.h
+++ b/tools/linguist/linguist/phrase.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp
index 028dc2f..2ffa351 100644
--- a/tools/linguist/linguist/phrasebookbox.cpp
+++ b/tools/linguist/linguist/phrasebookbox.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h
index 389d2b8..a51b90e 100644
--- a/tools/linguist/linguist/phrasebookbox.h
+++ b/tools/linguist/linguist/phrasebookbox.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phrasebookbox.ui b/tools/linguist/linguist/phrasebookbox.ui
index 13345ba..b613b53 100644
--- a/tools/linguist/linguist/phrasebookbox.ui
+++ b/tools/linguist/linguist/phrasebookbox.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/linguist/linguist/phrasemodel.cpp b/tools/linguist/linguist/phrasemodel.cpp
index 3cc1a70..531a810 100644
--- a/tools/linguist/linguist/phrasemodel.cpp
+++ b/tools/linguist/linguist/phrasemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phrasemodel.h b/tools/linguist/linguist/phrasemodel.h
index 12830bd..2a28f0e 100644
--- a/tools/linguist/linguist/phrasemodel.h
+++ b/tools/linguist/linguist/phrasemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phraseview.cpp b/tools/linguist/linguist/phraseview.cpp
index e8a8314..8cf09b5 100644
--- a/tools/linguist/linguist/phraseview.cpp
+++ b/tools/linguist/linguist/phraseview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/phraseview.h b/tools/linguist/linguist/phraseview.h
index 3f9125f..8927fe2 100644
--- a/tools/linguist/linguist/phraseview.h
+++ b/tools/linguist/linguist/phraseview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/printout.cpp b/tools/linguist/linguist/printout.cpp
index 581dc00..c4a1760 100644
--- a/tools/linguist/linguist/printout.cpp
+++ b/tools/linguist/linguist/printout.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/printout.h b/tools/linguist/linguist/printout.h
index 53646a5..30699fb 100644
--- a/tools/linguist/linguist/printout.h
+++ b/tools/linguist/linguist/printout.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/recentfiles.cpp b/tools/linguist/linguist/recentfiles.cpp
index 58ac681..f28ef50 100644
--- a/tools/linguist/linguist/recentfiles.cpp
+++ b/tools/linguist/linguist/recentfiles.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/recentfiles.h b/tools/linguist/linguist/recentfiles.h
index e6fcb9e..b7cf73f 100644
--- a/tools/linguist/linguist/recentfiles.h
+++ b/tools/linguist/linguist/recentfiles.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/sourcecodeview.cpp b/tools/linguist/linguist/sourcecodeview.cpp
index d2eef56..b9f806f 100644
--- a/tools/linguist/linguist/sourcecodeview.cpp
+++ b/tools/linguist/linguist/sourcecodeview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/sourcecodeview.h b/tools/linguist/linguist/sourcecodeview.h
index 524516c..323d61e 100644
--- a/tools/linguist/linguist/sourcecodeview.h
+++ b/tools/linguist/linguist/sourcecodeview.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/statistics.cpp b/tools/linguist/linguist/statistics.cpp
index d35c652..858919c 100644
--- a/tools/linguist/linguist/statistics.cpp
+++ b/tools/linguist/linguist/statistics.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/statistics.h b/tools/linguist/linguist/statistics.h
index c0086b9..716948d 100644
--- a/tools/linguist/linguist/statistics.h
+++ b/tools/linguist/linguist/statistics.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/statistics.ui b/tools/linguist/linguist/statistics.ui
index e9a2d91..6bbd375 100644
--- a/tools/linguist/linguist/statistics.ui
+++ b/tools/linguist/linguist/statistics.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/linguist/linguist/translatedialog.cpp b/tools/linguist/linguist/translatedialog.cpp
index 12c38b8..4f8480d 100644
--- a/tools/linguist/linguist/translatedialog.cpp
+++ b/tools/linguist/linguist/translatedialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/translatedialog.h b/tools/linguist/linguist/translatedialog.h
index 3912c38..12293d3 100644
--- a/tools/linguist/linguist/translatedialog.h
+++ b/tools/linguist/linguist/translatedialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/translatedialog.ui b/tools/linguist/linguist/translatedialog.ui
index a020b44..d48300a 100644
--- a/tools/linguist/linguist/translatedialog.ui
+++ b/tools/linguist/linguist/translatedialog.ui
@@ -9,11 +9,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/linguist/linguist/translationsettingsdialog.cpp b/tools/linguist/linguist/translationsettingsdialog.cpp
index db30538..4c3be66 100644
--- a/tools/linguist/linguist/translationsettingsdialog.cpp
+++ b/tools/linguist/linguist/translationsettingsdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/linguist/translationsettingsdialog.h b/tools/linguist/linguist/translationsettingsdialog.h
index 4d9acbc..906e776 100644
--- a/tools/linguist/linguist/translationsettingsdialog.h
+++ b/tools/linguist/linguist/translationsettingsdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 9fd977d..bc2d419 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -7,11 +7,11 @@
 .\" This file is part of the QtGui module of the Qt Toolkit.
 .\"
 .\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
+.\" Commercial Usage
+.\" Licensees holding valid Qt Commercial licenses may use this file in
+.\" accordance with the Qt Commercial License Agreement provided with the
+.\" Software or, alternatively, in accordance with the terms contained in
+.\" a written agreement between you and Nokia.
 .\"
 .\" GNU Lesser General Public License Usage
 .\" Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 .\" rights.  These rights are described in the Nokia 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.
+.\"
 .\" If you have questions regarding the use of this file, please contact
 .\" Nokia at qt-info@nokia.com.
-.\"
-.\"
-.\"
-.\"
-.\"
-.\"
-.\"
-.\"
 .\" $QT_END_LICENSE$
 .\" 
 .SH NAME
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 19377ef..875df1c 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index 6ea7299..464eab2 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/java.cpp b/tools/linguist/lupdate/java.cpp
index 165b6a3..11187b0 100644
--- a/tools/linguist/lupdate/java.cpp
+++ b/tools/linguist/lupdate/java.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1
index 2978c99..ceebe9d 100644
--- a/tools/linguist/lupdate/lupdate.1
+++ b/tools/linguist/lupdate/lupdate.1
@@ -7,11 +7,11 @@
 .\" This file is part of the QtGui module of the Qt Toolkit.
 .\"
 .\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
+.\" Commercial Usage
+.\" Licensees holding valid Qt Commercial licenses may use this file in
+.\" accordance with the Qt Commercial License Agreement provided with the
+.\" Software or, alternatively, in accordance with the terms contained in
+.\" a written agreement between you and Nokia.
 .\"
 .\" GNU Lesser General Public License Usage
 .\" Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 .\" rights.  These rights are described in the Nokia 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.
+.\"
 .\" If you have questions regarding the use of this file, please contact
 .\" Nokia at qt-info@nokia.com.
-.\"
-.\"
-.\"
-.\"
-.\"
-.\"
-.\"
-.\"
 .\" $QT_END_LICENSE$
 .\"
 .SH NAME
diff --git a/tools/linguist/lupdate/lupdate.h b/tools/linguist/lupdate/lupdate.h
index 136884b..1e15b96 100644
--- a/tools/linguist/lupdate/lupdate.h
+++ b/tools/linguist/lupdate/lupdate.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index d96e205..68d0bcc 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp
index 87c150c..7007e54 100644
--- a/tools/linguist/lupdate/merge.cpp
+++ b/tools/linguist/lupdate/merge.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp
index 01b9a1d..21ebb28 100644
--- a/tools/linguist/lupdate/qdeclarative.cpp
+++ b/tools/linguist/lupdate/qdeclarative.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/qscript.cpp b/tools/linguist/lupdate/qscript.cpp
index 5323022..ccdf670 100644
--- a/tools/linguist/lupdate/qscript.cpp
+++ b/tools/linguist/lupdate/qscript.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g
index 3655f2e..7bf5c69 100644
--- a/tools/linguist/lupdate/qscript.g
+++ b/tools/linguist/lupdate/qscript.g
@@ -7,11 +7,11 @@
 -- This file is part of the Qt Linguist of the Qt Toolkit.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the Technology Preview License Agreement accompanying
--- this package.
+-- Commercial Usage
+-- Licensees holding valid Qt Commercial licenses may use this file in
+-- accordance with the Qt Commercial License Agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Nokia.
 --
 -- GNU Lesser General Public License Usage
 -- Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 -- rights.  These rights are described in the Nokia 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.
+--
 -- If you have questions regarding the use of this file, please contact
 -- Nokia at qt-info@nokia.com.
---
---
---
---
---
---
---
---
 -- $QT_END_LICENSE$
 --
 ----------------------------------------------------------------------------
diff --git a/tools/linguist/lupdate/ui.cpp b/tools/linguist/lupdate/ui.cpp
index 797ab1f..0c2dadf 100644
--- a/tools/linguist/lupdate/ui.cpp
+++ b/tools/linguist/lupdate/ui.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/abstractproitemvisitor.h b/tools/linguist/shared/abstractproitemvisitor.h
index 97908a6..6fa96a8 100644
--- a/tools/linguist/shared/abstractproitemvisitor.h
+++ b/tools/linguist/shared/abstractproitemvisitor.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/numerus.cpp b/tools/linguist/shared/numerus.cpp
index 6066732..f3311b3 100644
--- a/tools/linguist/shared/numerus.cpp
+++ b/tools/linguist/shared/numerus.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp
index 3fd05ee..58b3885 100644
--- a/tools/linguist/shared/po.cpp
+++ b/tools/linguist/shared/po.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index a21408c..2497281 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/profileevaluator.h b/tools/linguist/shared/profileevaluator.h
index 53f3b9b..d733285 100644
--- a/tools/linguist/shared/profileevaluator.h
+++ b/tools/linguist/shared/profileevaluator.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/proitems.cpp b/tools/linguist/shared/proitems.cpp
index a59e3d9..056c4f0 100644
--- a/tools/linguist/shared/proitems.cpp
+++ b/tools/linguist/shared/proitems.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/proitems.h b/tools/linguist/shared/proitems.h
index 159e01f..932ffbe 100644
--- a/tools/linguist/shared/proitems.h
+++ b/tools/linguist/shared/proitems.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/proparserutils.h b/tools/linguist/shared/proparserutils.h
index b246535..7f8532c 100644
--- a/tools/linguist/shared/proparserutils.h
+++ b/tools/linguist/shared/proparserutils.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp
index 6678943..c832c17 100644
--- a/tools/linguist/shared/qm.cpp
+++ b/tools/linguist/shared/qm.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/qph.cpp b/tools/linguist/shared/qph.cpp
index 5beb135..7a0d39e 100644
--- a/tools/linguist/shared/qph.cpp
+++ b/tools/linguist/shared/qph.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/simtexth.cpp b/tools/linguist/shared/simtexth.cpp
index d8c9b8f..29d7828 100644
--- a/tools/linguist/shared/simtexth.cpp
+++ b/tools/linguist/shared/simtexth.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/simtexth.h b/tools/linguist/shared/simtexth.h
index f958019..0bf0036 100644
--- a/tools/linguist/shared/simtexth.h
+++ b/tools/linguist/shared/simtexth.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/translator.cpp b/tools/linguist/shared/translator.cpp
index 36af8da..d4b9574 100644
--- a/tools/linguist/shared/translator.cpp
+++ b/tools/linguist/shared/translator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h
index 02cfb07..cf173f8 100644
--- a/tools/linguist/shared/translator.h
+++ b/tools/linguist/shared/translator.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/translatormessage.cpp b/tools/linguist/shared/translatormessage.cpp
index 7971595..9080721 100644
--- a/tools/linguist/shared/translatormessage.cpp
+++ b/tools/linguist/shared/translatormessage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/translatormessage.h b/tools/linguist/shared/translatormessage.h
index 3737630..ee3ca51 100644
--- a/tools/linguist/shared/translatormessage.h
+++ b/tools/linguist/shared/translatormessage.h
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/ts.cpp b/tools/linguist/shared/ts.cpp
index 491c201..65780b8 100644
--- a/tools/linguist/shared/ts.cpp
+++ b/tools/linguist/shared/ts.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/shared/xliff.cpp b/tools/linguist/shared/xliff.cpp
index 70724ef..4dcb871 100644
--- a/tools/linguist/shared/xliff.cpp
+++ b/tools/linguist/shared/xliff.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/tests/data/main.cpp b/tools/linguist/tests/data/main.cpp
index c18ac52..8a30e62 100644
--- a/tools/linguist/tests/data/main.cpp
+++ b/tools/linguist/tests/data/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/tests/tst_linguist.cpp b/tools/linguist/tests/tst_linguist.cpp
index a180a45..703e389 100644
--- a/tools/linguist/tests/tst_linguist.cpp
+++ b/tools/linguist/tests/tst_linguist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/tests/tst_linguist.h b/tools/linguist/tests/tst_linguist.h
index 08cda2b..395d44e 100644
--- a/tools/linguist/tests/tst_linguist.h
+++ b/tools/linguist/tests/tst_linguist.h
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/tests/tst_lupdate.cpp b/tools/linguist/tests/tst_lupdate.cpp
index bfc530f..126edeb 100644
--- a/tools/linguist/tests/tst_lupdate.cpp
+++ b/tools/linguist/tests/tst_lupdate.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/linguist/tests/tst_simtexth.cpp b/tools/linguist/tests/tst_simtexth.cpp
index 789481d..89f1c4d 100644
--- a/tools/linguist/tests/tst_simtexth.cpp
+++ b/tools/linguist/tests/tst_simtexth.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/macdeployqt/macchangeqt/main.cpp b/tools/macdeployqt/macchangeqt/main.cpp
index e5f72cc..4291233 100644
--- a/tools/macdeployqt/macchangeqt/main.cpp
+++ b/tools/macdeployqt/macchangeqt/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/macdeployqt/macdeployqt/main.cpp b/tools/macdeployqt/macdeployqt/main.cpp
index d62562e..a46cbb2 100644
--- a/tools/macdeployqt/macdeployqt/main.cpp
+++ b/tools/macdeployqt/macdeployqt/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp
index 52cf04b..73dd4c5 100644
--- a/tools/macdeployqt/shared/shared.cpp
+++ b/tools/macdeployqt/shared/shared.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/macdeployqt/shared/shared.h b/tools/macdeployqt/shared/shared.h
index 1f33bb6..e40be80 100644
--- a/tools/macdeployqt/shared/shared.h
+++ b/tools/macdeployqt/shared/shared.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/macdeployqt/tests/tst_deployment_mac.cpp b/tools/macdeployqt/tests/tst_deployment_mac.cpp
index f7e16c5..30cb9c3 100644
--- a/tools/macdeployqt/tests/tst_deployment_mac.cpp
+++ b/tools/macdeployqt/tests/tst_deployment_mac.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp
index 432e764..5bd5079 100644
--- a/tools/makeqpf/main.cpp
+++ b/tools/makeqpf/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/makeqpf/mainwindow.cpp b/tools/makeqpf/mainwindow.cpp
index 166a193..f419cdb 100644
--- a/tools/makeqpf/mainwindow.cpp
+++ b/tools/makeqpf/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/makeqpf/mainwindow.h b/tools/makeqpf/mainwindow.h
index 37652c2..485f2a8 100644
--- a/tools/makeqpf/mainwindow.h
+++ b/tools/makeqpf/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/makeqpf/qpf2.cpp b/tools/makeqpf/qpf2.cpp
index cafdb79..ab68437 100644
--- a/tools/makeqpf/qpf2.cpp
+++ b/tools/makeqpf/qpf2.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/makeqpf/qpf2.h b/tools/makeqpf/qpf2.h
index e312834..006b74d 100644
--- a/tools/makeqpf/qpf2.h
+++ b/tools/makeqpf/qpf2.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/pixeltool/main.cpp b/tools/pixeltool/main.cpp
index 9aa7774..284d291 100644
--- a/tools/pixeltool/main.cpp
+++ b/tools/pixeltool/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/pixeltool/qpixeltool.cpp b/tools/pixeltool/qpixeltool.cpp
index f64dfba..6eaad03 100644
--- a/tools/pixeltool/qpixeltool.cpp
+++ b/tools/pixeltool/qpixeltool.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/pixeltool/qpixeltool.h b/tools/pixeltool/qpixeltool.h
index 80df39c..d41fc8e 100644
--- a/tools/pixeltool/qpixeltool.h
+++ b/tools/pixeltool/qpixeltool.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/ast.cpp b/tools/porting/src/ast.cpp
index 847ee1a..bd6e2ea 100644
--- a/tools/porting/src/ast.cpp
+++ b/tools/porting/src/ast.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/ast.h b/tools/porting/src/ast.h
index f5df4e0..3a16b79 100644
--- a/tools/porting/src/ast.h
+++ b/tools/porting/src/ast.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/codemodel.cpp b/tools/porting/src/codemodel.cpp
index c499268..d22894e 100644
--- a/tools/porting/src/codemodel.cpp
+++ b/tools/porting/src/codemodel.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h
index 04ad178..08dd341 100644
--- a/tools/porting/src/codemodel.h
+++ b/tools/porting/src/codemodel.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/codemodelattributes.cpp b/tools/porting/src/codemodelattributes.cpp
index 892ef57..70389a3 100644
--- a/tools/porting/src/codemodelattributes.cpp
+++ b/tools/porting/src/codemodelattributes.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/codemodelattributes.h b/tools/porting/src/codemodelattributes.h
index e44cf41..671b419 100644
--- a/tools/porting/src/codemodelattributes.h
+++ b/tools/porting/src/codemodelattributes.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/codemodelwalker.cpp b/tools/porting/src/codemodelwalker.cpp
index 884c0be..b1b2534 100644
--- a/tools/porting/src/codemodelwalker.cpp
+++ b/tools/porting/src/codemodelwalker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/codemodelwalker.h b/tools/porting/src/codemodelwalker.h
index 49a7a59..fd52603 100644
--- a/tools/porting/src/codemodelwalker.h
+++ b/tools/porting/src/codemodelwalker.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/cpplexer.cpp b/tools/porting/src/cpplexer.cpp
index b5c7bd0..a918596 100644
--- a/tools/porting/src/cpplexer.cpp
+++ b/tools/porting/src/cpplexer.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/cpplexer.h b/tools/porting/src/cpplexer.h
index 4576b64..54dd261 100644
--- a/tools/porting/src/cpplexer.h
+++ b/tools/porting/src/cpplexer.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/errors.cpp b/tools/porting/src/errors.cpp
index 9081dba..63f3b30 100644
--- a/tools/porting/src/errors.cpp
+++ b/tools/porting/src/errors.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/errors.h b/tools/porting/src/errors.h
index dbac833..46bc26f 100644
--- a/tools/porting/src/errors.h
+++ b/tools/porting/src/errors.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/fileporter.cpp b/tools/porting/src/fileporter.cpp
index ba9d46f..b8d1693 100644
--- a/tools/porting/src/fileporter.cpp
+++ b/tools/porting/src/fileporter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/fileporter.h b/tools/porting/src/fileporter.h
index a98c873..bd64318 100644
--- a/tools/porting/src/fileporter.h
+++ b/tools/porting/src/fileporter.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/filewriter.cpp b/tools/porting/src/filewriter.cpp
index cfbe672..2d20035 100644
--- a/tools/porting/src/filewriter.cpp
+++ b/tools/porting/src/filewriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/filewriter.h b/tools/porting/src/filewriter.h
index 5d48383..90d0e6a 100644
--- a/tools/porting/src/filewriter.h
+++ b/tools/porting/src/filewriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/list.h b/tools/porting/src/list.h
index 8671bc8..8f156ea 100644
--- a/tools/porting/src/list.h
+++ b/tools/porting/src/list.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/logger.cpp b/tools/porting/src/logger.cpp
index 72448d1..1e899f5 100644
--- a/tools/porting/src/logger.cpp
+++ b/tools/porting/src/logger.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/logger.h b/tools/porting/src/logger.h
index 332c323..00cf478 100644
--- a/tools/porting/src/logger.h
+++ b/tools/porting/src/logger.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/parser.cpp b/tools/porting/src/parser.cpp
index 4e6855c..21f710c 100644
--- a/tools/porting/src/parser.cpp
+++ b/tools/porting/src/parser.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/parser.h b/tools/porting/src/parser.h
index 93df5e6..04ffb98 100644
--- a/tools/porting/src/parser.h
+++ b/tools/porting/src/parser.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/port.cpp b/tools/porting/src/port.cpp
index 7d317e9..3be3352 100644
--- a/tools/porting/src/port.cpp
+++ b/tools/porting/src/port.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/portingrules.cpp b/tools/porting/src/portingrules.cpp
index 198769c..ebbec91 100644
--- a/tools/porting/src/portingrules.cpp
+++ b/tools/porting/src/portingrules.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/portingrules.h b/tools/porting/src/portingrules.h
index 372341c..d144100 100644
--- a/tools/porting/src/portingrules.h
+++ b/tools/porting/src/portingrules.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/preprocessorcontrol.cpp b/tools/porting/src/preprocessorcontrol.cpp
index 673ed08..6588e85 100644
--- a/tools/porting/src/preprocessorcontrol.cpp
+++ b/tools/porting/src/preprocessorcontrol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/preprocessorcontrol.h b/tools/porting/src/preprocessorcontrol.h
index 435b5c0..60ffa3f 100644
--- a/tools/porting/src/preprocessorcontrol.h
+++ b/tools/porting/src/preprocessorcontrol.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/projectporter.cpp b/tools/porting/src/projectporter.cpp
index c254a97..dab8328 100644
--- a/tools/porting/src/projectporter.cpp
+++ b/tools/porting/src/projectporter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/projectporter.h b/tools/porting/src/projectporter.h
index daacf94..d85e607 100644
--- a/tools/porting/src/projectporter.h
+++ b/tools/porting/src/projectporter.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/proparser.cpp b/tools/porting/src/proparser.cpp
index 8660414..2106a44 100644
--- a/tools/porting/src/proparser.cpp
+++ b/tools/porting/src/proparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/proparser.h b/tools/porting/src/proparser.h
index 77ea065..05644b6 100644
--- a/tools/porting/src/proparser.h
+++ b/tools/porting/src/proparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/q3porting.xml b/tools/porting/src/q3porting.xml
index 39f341f..07bfaf5 100644
--- a/tools/porting/src/q3porting.xml
+++ b/tools/porting/src/q3porting.xml
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 **************************************************************************-->
diff --git a/tools/porting/src/qtsimplexml.cpp b/tools/porting/src/qtsimplexml.cpp
index a58d091..b378a8c 100644
--- a/tools/porting/src/qtsimplexml.cpp
+++ b/tools/porting/src/qtsimplexml.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/qtsimplexml.h b/tools/porting/src/qtsimplexml.h
index b0417be..0e82c43 100644
--- a/tools/porting/src/qtsimplexml.h
+++ b/tools/porting/src/qtsimplexml.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/replacetoken.cpp b/tools/porting/src/replacetoken.cpp
index 714a266..d9822c6 100644
--- a/tools/porting/src/replacetoken.cpp
+++ b/tools/porting/src/replacetoken.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/replacetoken.h b/tools/porting/src/replacetoken.h
index e0efbd6..468ecad 100644
--- a/tools/porting/src/replacetoken.h
+++ b/tools/porting/src/replacetoken.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpp.cpp b/tools/porting/src/rpp.cpp
index 2e2aa97..bd29d68 100644
--- a/tools/porting/src/rpp.cpp
+++ b/tools/porting/src/rpp.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpp.h b/tools/porting/src/rpp.h
index 214e652..2b1dfef 100644
--- a/tools/porting/src/rpp.h
+++ b/tools/porting/src/rpp.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rppexpressionbuilder.cpp b/tools/porting/src/rppexpressionbuilder.cpp
index 9240ffb..bddd29f 100644
--- a/tools/porting/src/rppexpressionbuilder.cpp
+++ b/tools/porting/src/rppexpressionbuilder.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rppexpressionbuilder.h b/tools/porting/src/rppexpressionbuilder.h
index f8b23d5..e06ba7a 100644
--- a/tools/porting/src/rppexpressionbuilder.h
+++ b/tools/porting/src/rppexpressionbuilder.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpplexer.cpp b/tools/porting/src/rpplexer.cpp
index 57df9bb..8dd45e4 100644
--- a/tools/porting/src/rpplexer.cpp
+++ b/tools/porting/src/rpplexer.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpplexer.h b/tools/porting/src/rpplexer.h
index 0defc8c..57874da 100644
--- a/tools/porting/src/rpplexer.h
+++ b/tools/porting/src/rpplexer.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpptreeevaluator.cpp b/tools/porting/src/rpptreeevaluator.cpp
index 20e7cd7..ffb9592 100644
--- a/tools/porting/src/rpptreeevaluator.cpp
+++ b/tools/porting/src/rpptreeevaluator.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpptreeevaluator.h b/tools/porting/src/rpptreeevaluator.h
index b8f4566..48e4563 100644
--- a/tools/porting/src/rpptreeevaluator.h
+++ b/tools/porting/src/rpptreeevaluator.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpptreewalker.cpp b/tools/porting/src/rpptreewalker.cpp
index 7179156..f3ed4dc 100644
--- a/tools/porting/src/rpptreewalker.cpp
+++ b/tools/porting/src/rpptreewalker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/rpptreewalker.h b/tools/porting/src/rpptreewalker.h
index 5d13d0e..b667f0f 100644
--- a/tools/porting/src/rpptreewalker.h
+++ b/tools/porting/src/rpptreewalker.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/semantic.cpp b/tools/porting/src/semantic.cpp
index bd9175f..a5c8657 100644
--- a/tools/porting/src/semantic.cpp
+++ b/tools/porting/src/semantic.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/semantic.h b/tools/porting/src/semantic.h
index a504320..2a28618 100644
--- a/tools/porting/src/semantic.h
+++ b/tools/porting/src/semantic.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/smallobject.cpp b/tools/porting/src/smallobject.cpp
index d05dff2..d540c5e 100644
--- a/tools/porting/src/smallobject.cpp
+++ b/tools/porting/src/smallobject.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/smallobject.h b/tools/porting/src/smallobject.h
index a1e37c0..a0600d9 100644
--- a/tools/porting/src/smallobject.h
+++ b/tools/porting/src/smallobject.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/textreplacement.cpp b/tools/porting/src/textreplacement.cpp
index d298d67..631f9da 100644
--- a/tools/porting/src/textreplacement.cpp
+++ b/tools/porting/src/textreplacement.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/textreplacement.h b/tools/porting/src/textreplacement.h
index f90fb82..f66fa00 100644
--- a/tools/porting/src/textreplacement.h
+++ b/tools/porting/src/textreplacement.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokenengine.cpp b/tools/porting/src/tokenengine.cpp
index b94512f..995d0aa 100644
--- a/tools/porting/src/tokenengine.cpp
+++ b/tools/porting/src/tokenengine.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokenengine.h b/tools/porting/src/tokenengine.h
index db68d88..154437a 100644
--- a/tools/porting/src/tokenengine.h
+++ b/tools/porting/src/tokenengine.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokenizer.cpp b/tools/porting/src/tokenizer.cpp
index 5cbc31b..5722931 100644
--- a/tools/porting/src/tokenizer.cpp
+++ b/tools/porting/src/tokenizer.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokenizer.h b/tools/porting/src/tokenizer.h
index 4d9533d..fe03a46 100644
--- a/tools/porting/src/tokenizer.h
+++ b/tools/porting/src/tokenizer.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokenreplacements.cpp b/tools/porting/src/tokenreplacements.cpp
index fa3cff8..85b7119 100644
--- a/tools/porting/src/tokenreplacements.cpp
+++ b/tools/porting/src/tokenreplacements.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokenreplacements.h b/tools/porting/src/tokenreplacements.h
index 8108cbb..52f001d 100644
--- a/tools/porting/src/tokenreplacements.h
+++ b/tools/porting/src/tokenreplacements.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokens.h b/tools/porting/src/tokens.h
index 33422fc..b09e300 100644
--- a/tools/porting/src/tokens.h
+++ b/tools/porting/src/tokens.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/tokenstreamadapter.h b/tools/porting/src/tokenstreamadapter.h
index bdda4ba..399e836 100644
--- a/tools/porting/src/tokenstreamadapter.h
+++ b/tools/porting/src/tokenstreamadapter.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/translationunit.cpp b/tools/porting/src/translationunit.cpp
index 0b8ba8d..193dccf 100644
--- a/tools/porting/src/translationunit.cpp
+++ b/tools/porting/src/translationunit.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/translationunit.h b/tools/porting/src/translationunit.h
index b10d42a..2573620 100644
--- a/tools/porting/src/translationunit.h
+++ b/tools/porting/src/translationunit.h
@@ -7,11 +7,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/treewalker.cpp b/tools/porting/src/treewalker.cpp
index c4ff8c3..bda0286 100644
--- a/tools/porting/src/treewalker.cpp
+++ b/tools/porting/src/treewalker.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/porting/src/treewalker.h b/tools/porting/src/treewalker.h
index e26e90b..50e4c56 100644
--- a/tools/porting/src/treewalker.h
+++ b/tools/porting/src/treewalker.h
@@ -8,11 +8,11 @@
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qconfig/feature.cpp b/tools/qconfig/feature.cpp
index 98bc97c..10b2035 100644
--- a/tools/qconfig/feature.cpp
+++ b/tools/qconfig/feature.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qconfig/feature.h b/tools/qconfig/feature.h
index fdee6ad..68d55d1 100644
--- a/tools/qconfig/feature.h
+++ b/tools/qconfig/feature.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qconfig/featuretreemodel.cpp b/tools/qconfig/featuretreemodel.cpp
index ff4f9d9..3b9b782 100644
--- a/tools/qconfig/featuretreemodel.cpp
+++ b/tools/qconfig/featuretreemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qconfig/featuretreemodel.h b/tools/qconfig/featuretreemodel.h
index afcdf37..3a0febd 100644
--- a/tools/qconfig/featuretreemodel.h
+++ b/tools/qconfig/featuretreemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qconfig/graphics.h b/tools/qconfig/graphics.h
index a3490d9..4902b49 100644
--- a/tools/qconfig/graphics.h
+++ b/tools/qconfig/graphics.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index ce1c407..f9ebbdc 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbus/qdbus.cpp b/tools/qdbus/qdbus/qdbus.cpp
index ce18cb9..d22d2e4 100644
--- a/tools/qdbus/qdbus/qdbus.cpp
+++ b/tools/qdbus/qdbus/qdbus.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
index ba2bdd8..55fbe26 100644
--- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusviewer/main.cpp b/tools/qdbus/qdbusviewer/main.cpp
index fadcafc..5c27639 100644
--- a/tools/qdbus/qdbusviewer/main.cpp
+++ b/tools/qdbus/qdbusviewer/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusviewer/propertydialog.cpp b/tools/qdbus/qdbusviewer/propertydialog.cpp
index 56c21fa..9816a4c 100644
--- a/tools/qdbus/qdbusviewer/propertydialog.cpp
+++ b/tools/qdbus/qdbusviewer/propertydialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusviewer/propertydialog.h b/tools/qdbus/qdbusviewer/propertydialog.h
index d56d33f..0daa93f 100644
--- a/tools/qdbus/qdbusviewer/propertydialog.h
+++ b/tools/qdbus/qdbusviewer/propertydialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusviewer/qdbusmodel.cpp b/tools/qdbus/qdbusviewer/qdbusmodel.cpp
index f85e288..b077612 100644
--- a/tools/qdbus/qdbusviewer/qdbusmodel.cpp
+++ b/tools/qdbus/qdbusviewer/qdbusmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusviewer/qdbusmodel.h b/tools/qdbus/qdbusviewer/qdbusmodel.h
index e83c381..7614aaa 100644
--- a/tools/qdbus/qdbusviewer/qdbusmodel.h
+++ b/tools/qdbus/qdbusviewer/qdbusmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
index 9878aff..7739651 100644
--- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.h b/tools/qdbus/qdbusviewer/qdbusviewer.h
index d5d1a69..0a92afd 100644
--- a/tools/qdbus/qdbusviewer/qdbusviewer.h
+++ b/tools/qdbus/qdbusviewer/qdbusviewer.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
index d9343e3..cd52197 100644
--- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/apigenerator.cpp b/tools/qdoc3/apigenerator.cpp
index 41c89c7..c7156a6 100644
--- a/tools/qdoc3/apigenerator.cpp
+++ b/tools/qdoc3/apigenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/apigenerator.h b/tools/qdoc3/apigenerator.h
index fefef5d..8037988 100644
--- a/tools/qdoc3/apigenerator.h
+++ b/tools/qdoc3/apigenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/archiveextractor.cpp b/tools/qdoc3/archiveextractor.cpp
index 6d3d736..524caa1 100644
--- a/tools/qdoc3/archiveextractor.cpp
+++ b/tools/qdoc3/archiveextractor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/archiveextractor.h b/tools/qdoc3/archiveextractor.h
index 678945a..39f8377 100644
--- a/tools/qdoc3/archiveextractor.h
+++ b/tools/qdoc3/archiveextractor.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp
index 88f44ea..7df6900 100644
--- a/tools/qdoc3/atom.cpp
+++ b/tools/qdoc3/atom.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/atom.h b/tools/qdoc3/atom.h
index 70fbae9..1b4903f 100644
--- a/tools/qdoc3/atom.h
+++ b/tools/qdoc3/atom.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/bookgenerator.cpp b/tools/qdoc3/bookgenerator.cpp
index bbcdd11..73a35a4 100644
--- a/tools/qdoc3/bookgenerator.cpp
+++ b/tools/qdoc3/bookgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/bookgenerator.h b/tools/qdoc3/bookgenerator.h
index 69b65fc..f3c8d6d 100644
--- a/tools/qdoc3/bookgenerator.h
+++ b/tools/qdoc3/bookgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/ccodeparser.cpp b/tools/qdoc3/ccodeparser.cpp
index 48aa539..f8c7c6a 100644
--- a/tools/qdoc3/ccodeparser.cpp
+++ b/tools/qdoc3/ccodeparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/ccodeparser.h b/tools/qdoc3/ccodeparser.h
index 1771fc9..0954c64 100644
--- a/tools/qdoc3/ccodeparser.h
+++ b/tools/qdoc3/ccodeparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/codechunk.cpp b/tools/qdoc3/codechunk.cpp
index 0028af5..a83e413 100644
--- a/tools/qdoc3/codechunk.cpp
+++ b/tools/qdoc3/codechunk.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/codechunk.h b/tools/qdoc3/codechunk.h
index a0c554e..88427e4 100644
--- a/tools/qdoc3/codechunk.h
+++ b/tools/qdoc3/codechunk.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp
index ec86ae3..02eb181 100644
--- a/tools/qdoc3/codemarker.cpp
+++ b/tools/qdoc3/codemarker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h
index f17b28e..02732e6 100644
--- a/tools/qdoc3/codemarker.h
+++ b/tools/qdoc3/codemarker.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index 65d9572..16acd83 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/codeparser.h b/tools/qdoc3/codeparser.h
index ebba601..a9264f4 100644
--- a/tools/qdoc3/codeparser.h
+++ b/tools/qdoc3/codeparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/command.cpp b/tools/qdoc3/command.cpp
index b78ad07..2ebd079 100644
--- a/tools/qdoc3/command.cpp
+++ b/tools/qdoc3/command.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/command.h b/tools/qdoc3/command.h
index 2346aff..ce1de81 100644
--- a/tools/qdoc3/command.h
+++ b/tools/qdoc3/command.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/config.cpp b/tools/qdoc3/config.cpp
index 4d1c378..0999164 100644
--- a/tools/qdoc3/config.cpp
+++ b/tools/qdoc3/config.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h
index 335a0d6..d391b74 100644
--- a/tools/qdoc3/config.h
+++ b/tools/qdoc3/config.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 3615a84..632b096 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/cppcodemarker.h b/tools/qdoc3/cppcodemarker.h
index 804a302..a1fa74e 100644
--- a/tools/qdoc3/cppcodemarker.h
+++ b/tools/qdoc3/cppcodemarker.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index a120e45..bfbf6ff 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/cppcodeparser.h b/tools/qdoc3/cppcodeparser.h
index 55d9ddf..ae6b97a 100644
--- a/tools/qdoc3/cppcodeparser.h
+++ b/tools/qdoc3/cppcodeparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/cpptoqsconverter.cpp b/tools/qdoc3/cpptoqsconverter.cpp
index 1a44c16..c823927 100644
--- a/tools/qdoc3/cpptoqsconverter.cpp
+++ b/tools/qdoc3/cpptoqsconverter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/cpptoqsconverter.h b/tools/qdoc3/cpptoqsconverter.h
index 001091b..0784986 100644
--- a/tools/qdoc3/cpptoqsconverter.h
+++ b/tools/qdoc3/cpptoqsconverter.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/dcfsection.cpp b/tools/qdoc3/dcfsection.cpp
index ea10dbf..45c3b7d 100644
--- a/tools/qdoc3/dcfsection.cpp
+++ b/tools/qdoc3/dcfsection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/dcfsection.h b/tools/qdoc3/dcfsection.h
index 0318511..dc14f38 100644
--- a/tools/qdoc3/dcfsection.h
+++ b/tools/qdoc3/dcfsection.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index a83a321..2f08ff7 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -8,11 +8,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 446f735..18533cc 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 280f055..9f21c46 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/doc.h b/tools/qdoc3/doc.h
index 3e76456..458b435 100644
--- a/tools/qdoc3/doc.h
+++ b/tools/qdoc3/doc.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/doc/examples/main.cpp b/tools/qdoc3/doc/examples/main.cpp
index e439d3e..d8176cc 100644
--- a/tools/qdoc3/doc/examples/main.cpp
+++ b/tools/qdoc3/doc/examples/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/editdistance.cpp b/tools/qdoc3/editdistance.cpp
index 5915c70..093426b 100644
--- a/tools/qdoc3/editdistance.cpp
+++ b/tools/qdoc3/editdistance.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/editdistance.h b/tools/qdoc3/editdistance.h
index 1173929..4073e8a 100644
--- a/tools/qdoc3/editdistance.h
+++ b/tools/qdoc3/editdistance.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 7f39be2..77f9a07 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 326a247..6d749f5 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index 98246c4..b73b0de 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/helpprojectwriter.h b/tools/qdoc3/helpprojectwriter.h
index 7a67dff..d8ba228 100644
--- a/tools/qdoc3/helpprojectwriter.h
+++ b/tools/qdoc3/helpprojectwriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 77e306a..948efa6 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index d885ada..b45d783 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/jambiapiparser.cpp b/tools/qdoc3/jambiapiparser.cpp
index 23f2716..6913f53 100644
--- a/tools/qdoc3/jambiapiparser.cpp
+++ b/tools/qdoc3/jambiapiparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/jambiapiparser.h b/tools/qdoc3/jambiapiparser.h
index ecfaab5..10fe3c7 100644
--- a/tools/qdoc3/jambiapiparser.h
+++ b/tools/qdoc3/jambiapiparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/javacodemarker.cpp b/tools/qdoc3/javacodemarker.cpp
index c9a8f60..94f2a88 100644
--- a/tools/qdoc3/javacodemarker.cpp
+++ b/tools/qdoc3/javacodemarker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/javacodemarker.h b/tools/qdoc3/javacodemarker.h
index c2aabc0..331850b 100644
--- a/tools/qdoc3/javacodemarker.h
+++ b/tools/qdoc3/javacodemarker.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/javadocgenerator.cpp b/tools/qdoc3/javadocgenerator.cpp
index eb9c1c9..56d7d78 100644
--- a/tools/qdoc3/javadocgenerator.cpp
+++ b/tools/qdoc3/javadocgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/javadocgenerator.h b/tools/qdoc3/javadocgenerator.h
index b485502..3d2a0e2 100644
--- a/tools/qdoc3/javadocgenerator.h
+++ b/tools/qdoc3/javadocgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/linguistgenerator.cpp b/tools/qdoc3/linguistgenerator.cpp
index 702f0fb..a9f4ce4 100644
--- a/tools/qdoc3/linguistgenerator.cpp
+++ b/tools/qdoc3/linguistgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/linguistgenerator.h b/tools/qdoc3/linguistgenerator.h
index 979db02..abc97be 100644
--- a/tools/qdoc3/linguistgenerator.h
+++ b/tools/qdoc3/linguistgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/location.cpp b/tools/qdoc3/location.cpp
index dee87d1..7a4b988 100644
--- a/tools/qdoc3/location.cpp
+++ b/tools/qdoc3/location.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/location.h b/tools/qdoc3/location.h
index bdb7f42..f4fd71e 100644
--- a/tools/qdoc3/location.h
+++ b/tools/qdoc3/location.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/loutgenerator.cpp b/tools/qdoc3/loutgenerator.cpp
index caf98e8..3c2aacd 100644
--- a/tools/qdoc3/loutgenerator.cpp
+++ b/tools/qdoc3/loutgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/loutgenerator.h b/tools/qdoc3/loutgenerator.h
index 484d38f..8137edc 100644
--- a/tools/qdoc3/loutgenerator.h
+++ b/tools/qdoc3/loutgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 2bfe38e..800c396 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/mangenerator.cpp b/tools/qdoc3/mangenerator.cpp
index 1e85b73..ebdb764 100644
--- a/tools/qdoc3/mangenerator.cpp
+++ b/tools/qdoc3/mangenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/mangenerator.h b/tools/qdoc3/mangenerator.h
index 0fca342..e2ea566 100644
--- a/tools/qdoc3/mangenerator.h
+++ b/tools/qdoc3/mangenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 41f90d5..13c35e8 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 40b78ef..d507a4f 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/openedlist.cpp b/tools/qdoc3/openedlist.cpp
index a0b009c..5e0eacf 100644
--- a/tools/qdoc3/openedlist.cpp
+++ b/tools/qdoc3/openedlist.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/openedlist.h b/tools/qdoc3/openedlist.h
index f4d1673..341fd30 100644
--- a/tools/qdoc3/openedlist.h
+++ b/tools/qdoc3/openedlist.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index a187c2e..f01bd7c 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/pagegenerator.h b/tools/qdoc3/pagegenerator.h
index 1aa24a1..fa52999 100644
--- a/tools/qdoc3/pagegenerator.h
+++ b/tools/qdoc3/pagegenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/plaincodemarker.cpp b/tools/qdoc3/plaincodemarker.cpp
index d825c13..a0f0156 100644
--- a/tools/qdoc3/plaincodemarker.cpp
+++ b/tools/qdoc3/plaincodemarker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/plaincodemarker.h b/tools/qdoc3/plaincodemarker.h
index 7afb88e..8f85e83 100644
--- a/tools/qdoc3/plaincodemarker.h
+++ b/tools/qdoc3/plaincodemarker.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/polyarchiveextractor.cpp b/tools/qdoc3/polyarchiveextractor.cpp
index b2574ab..bdb33f0 100644
--- a/tools/qdoc3/polyarchiveextractor.cpp
+++ b/tools/qdoc3/polyarchiveextractor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/polyarchiveextractor.h b/tools/qdoc3/polyarchiveextractor.h
index 7ed0f62..104ae1f 100644
--- a/tools/qdoc3/polyarchiveextractor.h
+++ b/tools/qdoc3/polyarchiveextractor.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/polyuncompressor.cpp b/tools/qdoc3/polyuncompressor.cpp
index 97b5e0d..d78a1c2 100644
--- a/tools/qdoc3/polyuncompressor.cpp
+++ b/tools/qdoc3/polyuncompressor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/polyuncompressor.h b/tools/qdoc3/polyuncompressor.h
index e12f475..7b19a5f 100644
--- a/tools/qdoc3/polyuncompressor.h
+++ b/tools/qdoc3/polyuncompressor.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/qsakernelparser.cpp b/tools/qdoc3/qsakernelparser.cpp
index 8f12eda..b0e1a2f 100644
--- a/tools/qdoc3/qsakernelparser.cpp
+++ b/tools/qdoc3/qsakernelparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/qsakernelparser.h b/tools/qdoc3/qsakernelparser.h
index 9ac84fb..9ab6ea0 100644
--- a/tools/qdoc3/qsakernelparser.h
+++ b/tools/qdoc3/qsakernelparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/qscodemarker.cpp b/tools/qdoc3/qscodemarker.cpp
index 2ee5d99..eb4d305 100644
--- a/tools/qdoc3/qscodemarker.cpp
+++ b/tools/qdoc3/qscodemarker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/qscodemarker.h b/tools/qdoc3/qscodemarker.h
index c6a177f..8d67d47 100644
--- a/tools/qdoc3/qscodemarker.h
+++ b/tools/qdoc3/qscodemarker.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/qscodeparser.cpp b/tools/qdoc3/qscodeparser.cpp
index 3b8bc1a..fc0bf78 100644
--- a/tools/qdoc3/qscodeparser.cpp
+++ b/tools/qdoc3/qscodeparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/qscodeparser.h b/tools/qdoc3/qscodeparser.h
index 28924d7..ea59273 100644
--- a/tools/qdoc3/qscodeparser.h
+++ b/tools/qdoc3/qscodeparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/quoter.cpp b/tools/qdoc3/quoter.cpp
index b8055a7..7e78890 100644
--- a/tools/qdoc3/quoter.cpp
+++ b/tools/qdoc3/quoter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/quoter.h b/tools/qdoc3/quoter.h
index d984194..e7405fe 100644
--- a/tools/qdoc3/quoter.h
+++ b/tools/qdoc3/quoter.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/separator.cpp b/tools/qdoc3/separator.cpp
index ab3cc39..8664e8a 100644
--- a/tools/qdoc3/separator.cpp
+++ b/tools/qdoc3/separator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/separator.h b/tools/qdoc3/separator.h
index 1f06aad..3899f4a 100644
--- a/tools/qdoc3/separator.h
+++ b/tools/qdoc3/separator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/sgmlgenerator.cpp b/tools/qdoc3/sgmlgenerator.cpp
index 1858028..e62526d 100644
--- a/tools/qdoc3/sgmlgenerator.cpp
+++ b/tools/qdoc3/sgmlgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/sgmlgenerator.h b/tools/qdoc3/sgmlgenerator.h
index ef1f07f..95925ab 100644
--- a/tools/qdoc3/sgmlgenerator.h
+++ b/tools/qdoc3/sgmlgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/text.cpp b/tools/qdoc3/text.cpp
index 7093a43..5e910fe 100644
--- a/tools/qdoc3/text.cpp
+++ b/tools/qdoc3/text.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/text.h b/tools/qdoc3/text.h
index 879f6da..de44358 100644
--- a/tools/qdoc3/text.h
+++ b/tools/qdoc3/text.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/tokenizer.cpp b/tools/qdoc3/tokenizer.cpp
index 05ad5ee..433d490 100644
--- a/tools/qdoc3/tokenizer.cpp
+++ b/tools/qdoc3/tokenizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/tokenizer.h b/tools/qdoc3/tokenizer.h
index bd35965..bbfac24 100644
--- a/tools/qdoc3/tokenizer.h
+++ b/tools/qdoc3/tokenizer.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/tr.h b/tools/qdoc3/tr.h
index 4d601e9..5b06c3a 100644
--- a/tools/qdoc3/tr.h
+++ b/tools/qdoc3/tr.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index 540ffa9..d1ddb38 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/tree.h b/tools/qdoc3/tree.h
index b34c3a8..c7748a5 100644
--- a/tools/qdoc3/tree.h
+++ b/tools/qdoc3/tree.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/uncompressor.cpp b/tools/qdoc3/uncompressor.cpp
index afb88e6..13141a1 100644
--- a/tools/qdoc3/uncompressor.cpp
+++ b/tools/qdoc3/uncompressor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/uncompressor.h b/tools/qdoc3/uncompressor.h
index cae675f..10a06c5 100644
--- a/tools/qdoc3/uncompressor.h
+++ b/tools/qdoc3/uncompressor.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/webxmlgenerator.cpp b/tools/qdoc3/webxmlgenerator.cpp
index 6020b1b..4ebf2ba 100644
--- a/tools/qdoc3/webxmlgenerator.cpp
+++ b/tools/qdoc3/webxmlgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/webxmlgenerator.h b/tools/qdoc3/webxmlgenerator.h
index 071896a..7cd497e 100644
--- a/tools/qdoc3/webxmlgenerator.h
+++ b/tools/qdoc3/webxmlgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qdoc3/yyindent.cpp b/tools/qdoc3/yyindent.cpp
index 8bad91f..5d0ed5f 100644
--- a/tools/qdoc3/yyindent.cpp
+++ b/tools/qdoc3/yyindent.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qev/qev.cpp b/tools/qev/qev.cpp
index a47ea5e..d322389 100644
--- a/tools/qev/qev.cpp
+++ b/tools/qev/qev.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
index 0670ac4..e7f346e 100644
--- a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h
index 02f2fa2..2f1e7a0 100644
--- a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h
+++ b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegoliveimage.cpp b/tools/qmeegographicssystemhelper/qmeegoliveimage.cpp
index 83a1e28..5ebe4dc 100644
--- a/tools/qmeegographicssystemhelper/qmeegoliveimage.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegoliveimage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegoliveimage.h b/tools/qmeegographicssystemhelper/qmeegoliveimage.h
index 1e21e7b..39b9858 100644
--- a/tools/qmeegographicssystemhelper/qmeegoliveimage.h
+++ b/tools/qmeegographicssystemhelper/qmeegoliveimage.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegoliveimage_p.h b/tools/qmeegographicssystemhelper/qmeegoliveimage_p.h
index 085fed4..b345e83 100644
--- a/tools/qmeegographicssystemhelper/qmeegoliveimage_p.h
+++ b/tools/qmeegographicssystemhelper/qmeegoliveimage_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
index 2a1c04b..94d9fd2 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
index 2fa9db2..317e3be 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h b/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h
index c2591dc..e6f0fb61 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
index f9f14ae..1793125 100644
--- a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.h b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.h
index c2c08b4..bad4de6 100644
--- a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.h
+++ b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
index 70b5dc1..a538962 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.h b/tools/qmeegographicssystemhelper/qmeegoruntime.h
index 82fdb52..b3a004d 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.h
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.h
@@ -7,11 +7,11 @@
 ** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/browser/Browser.qml b/tools/qml/browser/Browser.qml
index 45fe84c..2232bc2 100644
--- a/tools/qml/browser/Browser.qml
+++ b/tools/qml/browser/Browser.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/deviceorientation.cpp b/tools/qml/deviceorientation.cpp
index d3014ad..7e39d74 100644
--- a/tools/qml/deviceorientation.cpp
+++ b/tools/qml/deviceorientation.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/deviceorientation.h b/tools/qml/deviceorientation.h
index 487ebd4..ddc95f6 100644
--- a/tools/qml/deviceorientation.h
+++ b/tools/qml/deviceorientation.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/deviceorientation_harmattan.cpp b/tools/qml/deviceorientation_harmattan.cpp
index 22f9f4c..f9ab446 100644
--- a/tools/qml/deviceorientation_harmattan.cpp
+++ b/tools/qml/deviceorientation_harmattan.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/deviceorientation_maemo5.cpp b/tools/qml/deviceorientation_maemo5.cpp
index a324820..c93443a 100644
--- a/tools/qml/deviceorientation_maemo5.cpp
+++ b/tools/qml/deviceorientation_maemo5.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/deviceorientation_symbian.cpp b/tools/qml/deviceorientation_symbian.cpp
index 7710cf9..3277aeb 100644
--- a/tools/qml/deviceorientation_symbian.cpp
+++ b/tools/qml/deviceorientation_symbian.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/loggerwidget.cpp b/tools/qml/loggerwidget.cpp
index 8aa029f..41f5da3 100644
--- a/tools/qml/loggerwidget.cpp
+++ b/tools/qml/loggerwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/loggerwidget.h b/tools/qml/loggerwidget.h
index 13c319f..1047b7e 100644
--- a/tools/qml/loggerwidget.h
+++ b/tools/qml/loggerwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 78cd64d..c2843ab 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/proxysettings.cpp b/tools/qml/proxysettings.cpp
index ffaa4c0..3e9abf8 100644
--- a/tools/qml/proxysettings.cpp
+++ b/tools/qml/proxysettings.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/proxysettings.h b/tools/qml/proxysettings.h
index 5d4d137..fd76916 100644
--- a/tools/qml/proxysettings.h
+++ b/tools/qml/proxysettings.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index 9864df6..5eaba1d 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/qdeclarativetester.h b/tools/qml/qdeclarativetester.h
index 021869d..a083a4d 100644
--- a/tools/qml/qdeclarativetester.h
+++ b/tools/qml/qdeclarativetester.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 5e169d8..cacfefd 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index d1ec26d..0b3f7a3 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/startup/Logo.qml b/tools/qml/startup/Logo.qml
index aa5648f..2fbe48f 100644
--- a/tools/qml/startup/Logo.qml
+++ b/tools/qml/startup/Logo.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml
index 9ca50a3..dd787a8 100644
--- a/tools/qml/startup/startup.qml
+++ b/tools/qml/startup/startup.qml
@@ -7,11 +7,11 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qml/texteditautoresizer_maemo5.h b/tools/qml/texteditautoresizer_maemo5.h
index bb5567a..95380dd 100644
--- a/tools/qml/texteditautoresizer_maemo5.h
+++ b/tools/qml/texteditautoresizer_maemo5.h
@@ -7,11 +7,11 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconcurrent/codegenerator/example/main.cpp b/tools/qtconcurrent/codegenerator/example/main.cpp
index 148bb93..d67a698 100644
--- a/tools/qtconcurrent/codegenerator/example/main.cpp
+++ b/tools/qtconcurrent/codegenerator/example/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
index 31902ae..6211051 100644
--- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
+++ b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.h b/tools/qtconcurrent/codegenerator/src/codegenerator.h
index c1aefe9..b7b72d6 100644
--- a/tools/qtconcurrent/codegenerator/src/codegenerator.h
+++ b/tools/qtconcurrent/codegenerator/src/codegenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconcurrent/generaterun/main.cpp b/tools/qtconcurrent/generaterun/main.cpp
index 8a7ebe9..18d5c89 100644
--- a/tools/qtconcurrent/generaterun/main.cpp
+++ b/tools/qtconcurrent/generaterun/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/colorbutton.cpp b/tools/qtconfig/colorbutton.cpp
index 30617e4..f0f291e 100644
--- a/tools/qtconfig/colorbutton.cpp
+++ b/tools/qtconfig/colorbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/colorbutton.h b/tools/qtconfig/colorbutton.h
index ea2b91c..0e55ea4 100644
--- a/tools/qtconfig/colorbutton.h
+++ b/tools/qtconfig/colorbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/main.cpp b/tools/qtconfig/main.cpp
index 928cf01..b0445ab 100644
--- a/tools/qtconfig/main.cpp
+++ b/tools/qtconfig/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 9675f99..c46f070 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/mainwindow.h b/tools/qtconfig/mainwindow.h
index 9bc8068..9cce6f1 100644
--- a/tools/qtconfig/mainwindow.h
+++ b/tools/qtconfig/mainwindow.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/mainwindowbase.cpp b/tools/qtconfig/mainwindowbase.cpp
index 2460bca..ac623c8 100644
--- a/tools/qtconfig/mainwindowbase.cpp
+++ b/tools/qtconfig/mainwindowbase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/mainwindowbase.h b/tools/qtconfig/mainwindowbase.h
index 1e1dabf..3f92ef0 100644
--- a/tools/qtconfig/mainwindowbase.h
+++ b/tools/qtconfig/mainwindowbase.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/mainwindowbase.ui b/tools/qtconfig/mainwindowbase.ui
index b09abd0..959252e 100644
--- a/tools/qtconfig/mainwindowbase.ui
+++ b/tools/qtconfig/mainwindowbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 2728557..32d0ec0 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/paletteeditoradvanced.h b/tools/qtconfig/paletteeditoradvanced.h
index a1eb8e7..3338cc6 100644
--- a/tools/qtconfig/paletteeditoradvanced.h
+++ b/tools/qtconfig/paletteeditoradvanced.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/paletteeditoradvancedbase.cpp b/tools/qtconfig/paletteeditoradvancedbase.cpp
index 708c834..bcee108 100644
--- a/tools/qtconfig/paletteeditoradvancedbase.cpp
+++ b/tools/qtconfig/paletteeditoradvancedbase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/paletteeditoradvancedbase.h b/tools/qtconfig/paletteeditoradvancedbase.h
index ee14a26..aae7e3b 100644
--- a/tools/qtconfig/paletteeditoradvancedbase.h
+++ b/tools/qtconfig/paletteeditoradvancedbase.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/paletteeditoradvancedbase.ui b/tools/qtconfig/paletteeditoradvancedbase.ui
index 12c5a7d..2cbd7c8 100644
--- a/tools/qtconfig/paletteeditoradvancedbase.ui
+++ b/tools/qtconfig/paletteeditoradvancedbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/qtconfig/previewframe.cpp b/tools/qtconfig/previewframe.cpp
index 3b46e8d..b3f58ab 100644
--- a/tools/qtconfig/previewframe.cpp
+++ b/tools/qtconfig/previewframe.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/previewframe.h b/tools/qtconfig/previewframe.h
index de364e4..d93ef44 100644
--- a/tools/qtconfig/previewframe.h
+++ b/tools/qtconfig/previewframe.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/previewwidget.cpp b/tools/qtconfig/previewwidget.cpp
index 757b448..09a5dc3 100644
--- a/tools/qtconfig/previewwidget.cpp
+++ b/tools/qtconfig/previewwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/previewwidget.h b/tools/qtconfig/previewwidget.h
index 37e9cba..f4b9a80 100644
--- a/tools/qtconfig/previewwidget.h
+++ b/tools/qtconfig/previewwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/previewwidgetbase.cpp b/tools/qtconfig/previewwidgetbase.cpp
index 9234b6f..6f09d73 100644
--- a/tools/qtconfig/previewwidgetbase.cpp
+++ b/tools/qtconfig/previewwidgetbase.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/previewwidgetbase.h b/tools/qtconfig/previewwidgetbase.h
index 829415e..06540e7 100644
--- a/tools/qtconfig/previewwidgetbase.h
+++ b/tools/qtconfig/previewwidgetbase.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtconfig/previewwidgetbase.ui b/tools/qtconfig/previewwidgetbase.ui
index 701bf84..00bb756 100644
--- a/tools/qtconfig/previewwidgetbase.ui
+++ b/tools/qtconfig/previewwidgetbase.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/qtestlib/updater/main.cpp b/tools/qtestlib/updater/main.cpp
index 04da552..f94d33a 100644
--- a/tools/qtestlib/updater/main.cpp
+++ b/tools/qtestlib/updater/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsync/main.cpp b/tools/qtestlib/wince/cetcpsync/main.cpp
index c3d19a2..34a74d8 100644
--- a/tools/qtestlib/wince/cetcpsync/main.cpp
+++ b/tools/qtestlib/wince/cetcpsync/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsync/qtcesterconnection.cpp b/tools/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
index 0c20a50..aed2204 100644
--- a/tools/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
+++ b/tools/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsync/qtcesterconnection.h b/tools/qtestlib/wince/cetcpsync/qtcesterconnection.h
index 3a602d9..08870a4 100644
--- a/tools/qtestlib/wince/cetcpsync/qtcesterconnection.h
+++ b/tools/qtestlib/wince/cetcpsync/qtcesterconnection.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsync/remoteconnection.cpp b/tools/qtestlib/wince/cetcpsync/remoteconnection.cpp
index 6373f01..6878b55 100644
--- a/tools/qtestlib/wince/cetcpsync/remoteconnection.cpp
+++ b/tools/qtestlib/wince/cetcpsync/remoteconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsync/remoteconnection.h b/tools/qtestlib/wince/cetcpsync/remoteconnection.h
index 941eb87..e4b94a0 100644
--- a/tools/qtestlib/wince/cetcpsync/remoteconnection.h
+++ b/tools/qtestlib/wince/cetcpsync/remoteconnection.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsyncserver/commands.cpp b/tools/qtestlib/wince/cetcpsyncserver/commands.cpp
index 3d45f66..5f590fd 100644
--- a/tools/qtestlib/wince/cetcpsyncserver/commands.cpp
+++ b/tools/qtestlib/wince/cetcpsyncserver/commands.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsyncserver/commands.h b/tools/qtestlib/wince/cetcpsyncserver/commands.h
index a989e39..1dad5a7 100644
--- a/tools/qtestlib/wince/cetcpsyncserver/commands.h
+++ b/tools/qtestlib/wince/cetcpsyncserver/commands.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp b/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp
index 9c75484..0bf4411 100644
--- a/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp
+++ b/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.h b/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.h
index 3d266b2..b413d5f 100644
--- a/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.h
+++ b/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsyncserver/main.cpp b/tools/qtestlib/wince/cetcpsyncserver/main.cpp
index 450b282..04dc014 100644
--- a/tools/qtestlib/wince/cetcpsyncserver/main.cpp
+++ b/tools/qtestlib/wince/cetcpsyncserver/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetcpsyncserver/transfer_global.h b/tools/qtestlib/wince/cetcpsyncserver/transfer_global.h
index b9df703..226a97d 100644
--- a/tools/qtestlib/wince/cetcpsyncserver/transfer_global.h
+++ b/tools/qtestlib/wince/cetcpsyncserver/transfer_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/activesyncconnection.cpp b/tools/qtestlib/wince/cetest/activesyncconnection.cpp
index 98062ed..d343539 100644
--- a/tools/qtestlib/wince/cetest/activesyncconnection.cpp
+++ b/tools/qtestlib/wince/cetest/activesyncconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/activesyncconnection.h b/tools/qtestlib/wince/cetest/activesyncconnection.h
index 4502fc7..74b0606 100644
--- a/tools/qtestlib/wince/cetest/activesyncconnection.h
+++ b/tools/qtestlib/wince/cetest/activesyncconnection.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/cetcpsyncconnection.cpp b/tools/qtestlib/wince/cetest/cetcpsyncconnection.cpp
index 5494194..eff8c6d 100644
--- a/tools/qtestlib/wince/cetest/cetcpsyncconnection.cpp
+++ b/tools/qtestlib/wince/cetest/cetcpsyncconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/cetcpsyncconnection.h b/tools/qtestlib/wince/cetest/cetcpsyncconnection.h
index e603efc..92c7221 100644
--- a/tools/qtestlib/wince/cetest/cetcpsyncconnection.h
+++ b/tools/qtestlib/wince/cetest/cetcpsyncconnection.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/deployment.cpp b/tools/qtestlib/wince/cetest/deployment.cpp
index 95768f9..6d12cfd 100644
--- a/tools/qtestlib/wince/cetest/deployment.cpp
+++ b/tools/qtestlib/wince/cetest/deployment.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/deployment.h b/tools/qtestlib/wince/cetest/deployment.h
index dddab77..f52ef6e 100644
--- a/tools/qtestlib/wince/cetest/deployment.h
+++ b/tools/qtestlib/wince/cetest/deployment.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp
index 4272a83..c9699f2 100644
--- a/tools/qtestlib/wince/cetest/main.cpp
+++ b/tools/qtestlib/wince/cetest/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/remoteconnection.cpp b/tools/qtestlib/wince/cetest/remoteconnection.cpp
index 4be7db7..78ce7a3 100644
--- a/tools/qtestlib/wince/cetest/remoteconnection.cpp
+++ b/tools/qtestlib/wince/cetest/remoteconnection.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/cetest/remoteconnection.h b/tools/qtestlib/wince/cetest/remoteconnection.h
index 71167d8..9473584d 100644
--- a/tools/qtestlib/wince/cetest/remoteconnection.h
+++ b/tools/qtestlib/wince/cetest/remoteconnection.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/remotelib/commands.cpp b/tools/qtestlib/wince/remotelib/commands.cpp
index 88bf9e6..ce22551 100644
--- a/tools/qtestlib/wince/remotelib/commands.cpp
+++ b/tools/qtestlib/wince/remotelib/commands.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qtestlib/wince/remotelib/commands.h b/tools/qtestlib/wince/remotelib/commands.h
index 8f202c8..f3caa2d 100644
--- a/tools/qtestlib/wince/remotelib/commands.h
+++ b/tools/qtestlib/wince/remotelib/commands.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qttracereplay/main.cpp b/tools/qttracereplay/main.cpp
index 101d512..6f1c219 100644
--- a/tools/qttracereplay/main.cpp
+++ b/tools/qttracereplay/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui
index 179e12e..2c51437 100644
--- a/tools/qvfb/config.ui
+++ b/tools/qvfb/config.ui
@@ -9,11 +9,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/qvfb/gammaview.h b/tools/qvfb/gammaview.h
index 31e98ee..c9ea11c 100644
--- a/tools/qvfb/gammaview.h
+++ b/tools/qvfb/gammaview.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp
index 28aa7d4..036a29a 100644
--- a/tools/qvfb/main.cpp
+++ b/tools/qvfb/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp
index 5ff02a2..842ded3 100644
--- a/tools/qvfb/qanimationwriter.cpp
+++ b/tools/qvfb/qanimationwriter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qanimationwriter.h b/tools/qvfb/qanimationwriter.h
index b41da68..261f27a 100644
--- a/tools/qvfb/qanimationwriter.h
+++ b/tools/qvfb/qanimationwriter.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qtopiakeysym.h b/tools/qvfb/qtopiakeysym.h
index 73ba881..e860c2a 100644
--- a/tools/qvfb/qtopiakeysym.h
+++ b/tools/qvfb/qtopiakeysym.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index b4ccebc..6595394 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfb.h b/tools/qvfb/qvfb.h
index 37a20f7..22b4409 100644
--- a/tools/qvfb/qvfb.h
+++ b/tools/qvfb/qvfb.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbmmap.cpp b/tools/qvfb/qvfbmmap.cpp
index 9f001b1..d93ca7a 100644
--- a/tools/qvfb/qvfbmmap.cpp
+++ b/tools/qvfb/qvfbmmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbmmap.h b/tools/qvfb/qvfbmmap.h
index b03471e..05047e3 100644
--- a/tools/qvfb/qvfbmmap.h
+++ b/tools/qvfb/qvfbmmap.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbprotocol.cpp b/tools/qvfb/qvfbprotocol.cpp
index 4b253f1..a1d7d11 100644
--- a/tools/qvfb/qvfbprotocol.cpp
+++ b/tools/qvfb/qvfbprotocol.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbprotocol.h b/tools/qvfb/qvfbprotocol.h
index 2f9d262..ec05d7d 100644
--- a/tools/qvfb/qvfbprotocol.h
+++ b/tools/qvfb/qvfbprotocol.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbratedlg.cpp b/tools/qvfb/qvfbratedlg.cpp
index a0cbb2f..b4eac76 100644
--- a/tools/qvfb/qvfbratedlg.cpp
+++ b/tools/qvfb/qvfbratedlg.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbratedlg.h b/tools/qvfb/qvfbratedlg.h
index 75a7817..54136dc 100644
--- a/tools/qvfb/qvfbratedlg.h
+++ b/tools/qvfb/qvfbratedlg.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp
index ef765b0..70e2338 100644
--- a/tools/qvfb/qvfbshmem.cpp
+++ b/tools/qvfb/qvfbshmem.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbshmem.h b/tools/qvfb/qvfbshmem.h
index 5036cb9..6592288 100644
--- a/tools/qvfb/qvfbshmem.h
+++ b/tools/qvfb/qvfbshmem.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 129e7fb..fe20caf 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h
index 944ce79..55af6b4 100644
--- a/tools/qvfb/qvfbview.h
+++ b/tools/qvfb/qvfbview.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbx11view.cpp b/tools/qvfb/qvfbx11view.cpp
index fdd9c86..782455e 100644
--- a/tools/qvfb/qvfbx11view.cpp
+++ b/tools/qvfb/qvfbx11view.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/qvfbx11view.h b/tools/qvfb/qvfbx11view.h
index f01e948..d5fcbb0 100644
--- a/tools/qvfb/qvfbx11view.h
+++ b/tools/qvfb/qvfbx11view.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/x11keyfaker.cpp b/tools/qvfb/x11keyfaker.cpp
index 0be9f00..4f3e18f 100644
--- a/tools/qvfb/x11keyfaker.cpp
+++ b/tools/qvfb/x11keyfaker.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/qvfb/x11keyfaker.h b/tools/qvfb/x11keyfaker.h
index 41c6eea..9c45469 100644
--- a/tools/qvfb/x11keyfaker.h
+++ b/tools/qvfb/x11keyfaker.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp
index 93b087b..9faa046 100644
--- a/tools/runonphone/main.cpp
+++ b/tools/runonphone/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/ossignalconverter.cpp b/tools/runonphone/ossignalconverter.cpp
index 8566458..59e5f4d 100644
--- a/tools/runonphone/ossignalconverter.cpp
+++ b/tools/runonphone/ossignalconverter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/ossignalconverter.h b/tools/runonphone/ossignalconverter.h
index 398d0f6..1ba8ca8 100644
--- a/tools/runonphone/ossignalconverter.h
+++ b/tools/runonphone/ossignalconverter.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/ossignalconverter_p.h b/tools/runonphone/ossignalconverter_p.h
index dddc9ca..8279344 100644
--- a/tools/runonphone/ossignalconverter_p.h
+++ b/tools/runonphone/ossignalconverter_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/serenum.h b/tools/runonphone/serenum.h
index a65c8cb..a026a11 100644
--- a/tools/runonphone/serenum.h
+++ b/tools/runonphone/serenum.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/serenum_stub.cpp b/tools/runonphone/serenum_stub.cpp
index 6f0e1ef..44d5472 100644
--- a/tools/runonphone/serenum_stub.cpp
+++ b/tools/runonphone/serenum_stub.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/serenum_unix.cpp b/tools/runonphone/serenum_unix.cpp
index db6375e..1715479 100644
--- a/tools/runonphone/serenum_unix.cpp
+++ b/tools/runonphone/serenum_unix.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/serenum_win.cpp b/tools/runonphone/serenum_win.cpp
index 070cac2..e3ac13a 100644
--- a/tools/runonphone/serenum_win.cpp
+++ b/tools/runonphone/serenum_win.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/bluetoothlistener.cpp b/tools/runonphone/symbianutils/bluetoothlistener.cpp
index df04288..759ebc1 100644
--- a/tools/runonphone/symbianutils/bluetoothlistener.cpp
+++ b/tools/runonphone/symbianutils/bluetoothlistener.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/bluetoothlistener.h b/tools/runonphone/symbianutils/bluetoothlistener.h
index 36894e7..37c40b2 100644
--- a/tools/runonphone/symbianutils/bluetoothlistener.h
+++ b/tools/runonphone/symbianutils/bluetoothlistener.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/bluetoothlistener_gui.cpp b/tools/runonphone/symbianutils/bluetoothlistener_gui.cpp
index 5994eb5..d01e405 100644
--- a/tools/runonphone/symbianutils/bluetoothlistener_gui.cpp
+++ b/tools/runonphone/symbianutils/bluetoothlistener_gui.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/bluetoothlistener_gui.h b/tools/runonphone/symbianutils/bluetoothlistener_gui.h
index 10e7145..6a9a92b 100644
--- a/tools/runonphone/symbianutils/bluetoothlistener_gui.h
+++ b/tools/runonphone/symbianutils/bluetoothlistener_gui.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/callback.h b/tools/runonphone/symbianutils/callback.h
index 3996d73..b9c02c2 100644
--- a/tools/runonphone/symbianutils/callback.h
+++ b/tools/runonphone/symbianutils/callback.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/communicationstarter.cpp b/tools/runonphone/symbianutils/communicationstarter.cpp
index cdee49f..3d7127b 100644
--- a/tools/runonphone/symbianutils/communicationstarter.cpp
+++ b/tools/runonphone/symbianutils/communicationstarter.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/communicationstarter.h b/tools/runonphone/symbianutils/communicationstarter.h
index 0a060ee..207e0f4 100644
--- a/tools/runonphone/symbianutils/communicationstarter.h
+++ b/tools/runonphone/symbianutils/communicationstarter.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/json.cpp b/tools/runonphone/symbianutils/json.cpp
index 2d58824..a4f4727 100644
--- a/tools/runonphone/symbianutils/json.cpp
+++ b/tools/runonphone/symbianutils/json.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/json.h b/tools/runonphone/symbianutils/json.h
index ffcb7ab..964e126 100644
--- a/tools/runonphone/symbianutils/json.h
+++ b/tools/runonphone/symbianutils/json.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/launcher.cpp b/tools/runonphone/symbianutils/launcher.cpp
index ee87480..63764c5 100644
--- a/tools/runonphone/symbianutils/launcher.cpp
+++ b/tools/runonphone/symbianutils/launcher.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/launcher.h b/tools/runonphone/symbianutils/launcher.h
index 230a122..5491826 100644
--- a/tools/runonphone/symbianutils/launcher.h
+++ b/tools/runonphone/symbianutils/launcher.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/symbiandevicemanager.cpp b/tools/runonphone/symbianutils/symbiandevicemanager.cpp
index 8877ea1..9d68c0c 100644
--- a/tools/runonphone/symbianutils/symbiandevicemanager.cpp
+++ b/tools/runonphone/symbianutils/symbiandevicemanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/symbiandevicemanager.h b/tools/runonphone/symbianutils/symbiandevicemanager.h
index 180173d..e994d8d 100644
--- a/tools/runonphone/symbianutils/symbiandevicemanager.h
+++ b/tools/runonphone/symbianutils/symbiandevicemanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/symbianutils_global.h b/tools/runonphone/symbianutils/symbianutils_global.h
index a6ffbe7..589eb1b 100644
--- a/tools/runonphone/symbianutils/symbianutils_global.h
+++ b/tools/runonphone/symbianutils/symbianutils_global.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/tcftrkdevice.cpp b/tools/runonphone/symbianutils/tcftrkdevice.cpp
index 50e3937..e3c2c14 100644
--- a/tools/runonphone/symbianutils/tcftrkdevice.cpp
+++ b/tools/runonphone/symbianutils/tcftrkdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/tcftrkdevice.h b/tools/runonphone/symbianutils/tcftrkdevice.h
index 67955e5..93cc9b0 100644
--- a/tools/runonphone/symbianutils/tcftrkdevice.h
+++ b/tools/runonphone/symbianutils/tcftrkdevice.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/tcftrkmessage.cpp b/tools/runonphone/symbianutils/tcftrkmessage.cpp
index 06035ab..02a2419 100644
--- a/tools/runonphone/symbianutils/tcftrkmessage.cpp
+++ b/tools/runonphone/symbianutils/tcftrkmessage.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/tcftrkmessage.h b/tools/runonphone/symbianutils/tcftrkmessage.h
index 510b485..33e50d0 100644
--- a/tools/runonphone/symbianutils/tcftrkmessage.h
+++ b/tools/runonphone/symbianutils/tcftrkmessage.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/trkdevice.cpp b/tools/runonphone/symbianutils/trkdevice.cpp
index 9039184..8aa7c98 100644
--- a/tools/runonphone/symbianutils/trkdevice.cpp
+++ b/tools/runonphone/symbianutils/trkdevice.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/trkdevice.h b/tools/runonphone/symbianutils/trkdevice.h
index 1021a7d..3cbd70a 100644
--- a/tools/runonphone/symbianutils/trkdevice.h
+++ b/tools/runonphone/symbianutils/trkdevice.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/trkutils.cpp b/tools/runonphone/symbianutils/trkutils.cpp
index d89da20..e2b69df 100644
--- a/tools/runonphone/symbianutils/trkutils.cpp
+++ b/tools/runonphone/symbianutils/trkutils.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/trkutils.h b/tools/runonphone/symbianutils/trkutils.h
index d365f0d..f37be67 100644
--- a/tools/runonphone/symbianutils/trkutils.h
+++ b/tools/runonphone/symbianutils/trkutils.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/symbianutils/trkutils_p.h b/tools/runonphone/symbianutils/trkutils_p.h
index 05df83a..3d37dbe 100644
--- a/tools/runonphone/symbianutils/trkutils_p.h
+++ b/tools/runonphone/symbianutils/trkutils_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/trksignalhandler.cpp b/tools/runonphone/trksignalhandler.cpp
index 898692a..1329fba 100644
--- a/tools/runonphone/trksignalhandler.cpp
+++ b/tools/runonphone/trksignalhandler.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/runonphone/trksignalhandler.h b/tools/runonphone/trksignalhandler.h
index bfe2c3e..fb91c8b 100644
--- a/tools/runonphone/trksignalhandler.h
+++ b/tools/runonphone/trksignalhandler.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/deviceskin/deviceskin.cpp b/tools/shared/deviceskin/deviceskin.cpp
index d8849fd..5c855ee 100644
--- a/tools/shared/deviceskin/deviceskin.cpp
+++ b/tools/shared/deviceskin/deviceskin.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/deviceskin/deviceskin.h b/tools/shared/deviceskin/deviceskin.h
index db38538..e4db208 100644
--- a/tools/shared/deviceskin/deviceskin.h
+++ b/tools/shared/deviceskin/deviceskin.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/findwidget/abstractfindwidget.cpp b/tools/shared/findwidget/abstractfindwidget.cpp
index 9641ca7..317125b 100644
--- a/tools/shared/findwidget/abstractfindwidget.cpp
+++ b/tools/shared/findwidget/abstractfindwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/findwidget/abstractfindwidget.h b/tools/shared/findwidget/abstractfindwidget.h
index 089947d..250df70 100644
--- a/tools/shared/findwidget/abstractfindwidget.h
+++ b/tools/shared/findwidget/abstractfindwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/findwidget/itemviewfindwidget.cpp b/tools/shared/findwidget/itemviewfindwidget.cpp
index 40ef209..ba6998d 100644
--- a/tools/shared/findwidget/itemviewfindwidget.cpp
+++ b/tools/shared/findwidget/itemviewfindwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/findwidget/itemviewfindwidget.h b/tools/shared/findwidget/itemviewfindwidget.h
index 2d06df8..54cc52a 100644
--- a/tools/shared/findwidget/itemviewfindwidget.h
+++ b/tools/shared/findwidget/itemviewfindwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/findwidget/texteditfindwidget.cpp b/tools/shared/findwidget/texteditfindwidget.cpp
index 1eb063a..58908b3 100644
--- a/tools/shared/findwidget/texteditfindwidget.cpp
+++ b/tools/shared/findwidget/texteditfindwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/findwidget/texteditfindwidget.h b/tools/shared/findwidget/texteditfindwidget.h
index a051f0e..7d24d18 100644
--- a/tools/shared/findwidget/texteditfindwidget.h
+++ b/tools/shared/findwidget/texteditfindwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/fontpanel/fontpanel.cpp b/tools/shared/fontpanel/fontpanel.cpp
index fe221fd..b564451 100644
--- a/tools/shared/fontpanel/fontpanel.cpp
+++ b/tools/shared/fontpanel/fontpanel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/fontpanel/fontpanel.h b/tools/shared/fontpanel/fontpanel.h
index 8737c3a..3d94ae6 100644
--- a/tools/shared/fontpanel/fontpanel.h
+++ b/tools/shared/fontpanel/fontpanel.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.cpp b/tools/shared/qtgradienteditor/qtcolorbutton.cpp
index 13b13e3..56f86fc 100644
--- a/tools/shared/qtgradienteditor/qtcolorbutton.cpp
+++ b/tools/shared/qtgradienteditor/qtcolorbutton.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.h b/tools/shared/qtgradienteditor/qtcolorbutton.h
index 6a2d209..d53d2bc 100644
--- a/tools/shared/qtgradienteditor/qtcolorbutton.h
+++ b/tools/shared/qtgradienteditor/qtcolorbutton.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtcolorline.cpp b/tools/shared/qtgradienteditor/qtcolorline.cpp
index a35374f..459bac3 100644
--- a/tools/shared/qtgradienteditor/qtcolorline.cpp
+++ b/tools/shared/qtgradienteditor/qtcolorline.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtcolorline.h b/tools/shared/qtgradienteditor/qtcolorline.h
index 00cce43..cf67a2a 100644
--- a/tools/shared/qtgradienteditor/qtcolorline.h
+++ b/tools/shared/qtgradienteditor/qtcolorline.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.cpp b/tools/shared/qtgradienteditor/qtgradientdialog.cpp
index 093290f..0d485cc 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.h b/tools/shared/qtgradienteditor/qtgradientdialog.h
index 7be1e33..8ac26af 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.h
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.ui b/tools/shared/qtgradienteditor/qtgradientdialog.ui
index a9a2551..d8289aa 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.ui
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.cpp b/tools/shared/qtgradienteditor/qtgradienteditor.cpp
index bee2dc5..5220ab8 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.cpp
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.h b/tools/shared/qtgradienteditor/qtgradienteditor.h
index 4892a20..c586252 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.h
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.ui b/tools/shared/qtgradienteditor/qtgradienteditor.ui
index b826546..8ff56ca 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.ui
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.ui
@@ -8,11 +8,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/shared/qtgradienteditor/qtgradientmanager.cpp b/tools/shared/qtgradienteditor/qtgradientmanager.cpp
index eeecf58..b2cb8ad 100644
--- a/tools/shared/qtgradienteditor/qtgradientmanager.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientmanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientmanager.h b/tools/shared/qtgradienteditor/qtgradientmanager.h
index f5c8e91..c7048d9 100644
--- a/tools/shared/qtgradienteditor/qtgradientmanager.h
+++ b/tools/shared/qtgradienteditor/qtgradientmanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
index c6eb3a0..df28d12 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
index bf1b9d1..a3135a5 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp b/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp
index 252f82c..9d98bd1 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
index e9d87a9..4baabcd 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
index 74448c3..5515c3d 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.h b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
index 85dc507..01fcf14 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopswidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientutils.cpp b/tools/shared/qtgradienteditor/qtgradientutils.cpp
index 083ba89..bffa3ea 100644
--- a/tools/shared/qtgradienteditor/qtgradientutils.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientutils.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientutils.h b/tools/shared/qtgradienteditor/qtgradientutils.h
index 3bcd354..63b9ab0 100644
--- a/tools/shared/qtgradienteditor/qtgradientutils.h
+++ b/tools/shared/qtgradienteditor/qtgradientutils.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientview.cpp b/tools/shared/qtgradienteditor/qtgradientview.cpp
index 0d73c33..078edff 100644
--- a/tools/shared/qtgradienteditor/qtgradientview.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientview.h b/tools/shared/qtgradienteditor/qtgradientview.h
index 5bce4c6..bb5459c 100644
--- a/tools/shared/qtgradienteditor/qtgradientview.h
+++ b/tools/shared/qtgradienteditor/qtgradientview.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
index dfe0503..23b55ba 100644
--- a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.h b/tools/shared/qtgradienteditor/qtgradientviewdialog.h
index acafa53..1f544e6 100644
--- a/tools/shared/qtgradienteditor/qtgradientviewdialog.h
+++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.ui b/tools/shared/qtgradienteditor/qtgradientviewdialog.ui
index d1376dc..4d37c3c 100644
--- a/tools/shared/qtgradienteditor/qtgradientviewdialog.ui
+++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.ui
@@ -8,11 +8,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.cpp b/tools/shared/qtgradienteditor/qtgradientwidget.cpp
index 50e0992..8c14678 100644
--- a/tools/shared/qtgradienteditor/qtgradientwidget.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientwidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.h b/tools/shared/qtgradienteditor/qtgradientwidget.h
index 8d20fa5..b6362f7 100644
--- a/tools/shared/qtgradienteditor/qtgradientwidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientwidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
index 989d763..2874ee2 100644
--- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
index 9709590..ef8600f 100644
--- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.cpp b/tools/shared/qtpropertybrowser/qteditorfactory.cpp
index c66e398..0245b39 100644
--- a/tools/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/tools/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h
index 92d1f10..a2c880f 100644
--- a/tools/shared/qtpropertybrowser/qteditorfactory.h
+++ b/tools/shared/qtpropertybrowser/qteditorfactory.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
index 842ffa5..578d0af 100644
--- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
index bcdbee9..bd13027 100644
--- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp
index 9ae693b..8c7d0a8 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
index 0563caa..8aa6d46 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
index 0b14292..0b05351 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
index baa7a4a..6f17cb4 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
index 8c7835c..da20804 100644
--- a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
+++ b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.h b/tools/shared/qtpropertybrowser/qtpropertymanager.h
index 4c2c88e..80bb8ab 100644
--- a/tools/shared/qtpropertybrowser/qtpropertymanager.h
+++ b/tools/shared/qtpropertybrowser/qtpropertymanager.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp
index f578cc3..a1d56fb 100644
--- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
index 0030725..a1f9ea9 100644
--- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp
index b16fac3..3b54d1d 100644
--- a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp
+++ b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.h b/tools/shared/qtpropertybrowser/qtvariantproperty.h
index 624d5e9..7f56cbb 100644
--- a/tools/shared/qtpropertybrowser/qtvariantproperty.h
+++ b/tools/shared/qtpropertybrowser/qtvariantproperty.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.cpp b/tools/shared/qttoolbardialog/qttoolbardialog.cpp
index 8eb178f..b418d56 100644
--- a/tools/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/tools/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.h b/tools/shared/qttoolbardialog/qttoolbardialog.h
index e182368..ce14777 100644
--- a/tools/shared/qttoolbardialog/qttoolbardialog.h
+++ b/tools/shared/qttoolbardialog/qttoolbardialog.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/symbian/epocroot.cpp b/tools/shared/symbian/epocroot.cpp
index ae1dcb1..b41df61 100644
--- a/tools/shared/symbian/epocroot.cpp
+++ b/tools/shared/symbian/epocroot.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/symbian/epocroot.h b/tools/shared/symbian/epocroot.h
index 9846485..11f8d31 100644
--- a/tools/shared/symbian/epocroot.h
+++ b/tools/shared/symbian/epocroot.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/windows/registry.cpp b/tools/shared/windows/registry.cpp
index 67d9b56..628ddb9 100644
--- a/tools/shared/windows/registry.cpp
+++ b/tools/shared/windows/registry.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/shared/windows/registry.h b/tools/shared/windows/registry.h
index 3896527..4cec1f5 100644
--- a/tools/shared/windows/registry.h
+++ b/tools/shared/windows/registry.h
@@ -7,11 +7,11 @@
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp
index b0e9e67..d368146 100644
--- a/tools/xmlpatterns/main.cpp
+++ b/tools/xmlpatterns/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatterns/main.h b/tools/xmlpatterns/main.h
index a1ef27e..5391c44 100644
--- a/tools/xmlpatterns/main.h
+++ b/tools/xmlpatterns/main.h
@@ -7,11 +7,11 @@
 ** This file is part of the XMLPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatterns/qapplicationargument.cpp b/tools/xmlpatterns/qapplicationargument.cpp
index 9c5bd4b..eb1e7e1 100644
--- a/tools/xmlpatterns/qapplicationargument.cpp
+++ b/tools/xmlpatterns/qapplicationargument.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatterns/qapplicationargument_p.h b/tools/xmlpatterns/qapplicationargument_p.h
index c35d648..39d4d1d 100644
--- a/tools/xmlpatterns/qapplicationargument_p.h
+++ b/tools/xmlpatterns/qapplicationargument_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp
index bd37389..faa8574 100644
--- a/tools/xmlpatterns/qapplicationargumentparser.cpp
+++ b/tools/xmlpatterns/qapplicationargumentparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h
index bafc8a7..01e4324 100644
--- a/tools/xmlpatterns/qapplicationargumentparser_p.h
+++ b/tools/xmlpatterns/qapplicationargumentparser_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatternsvalidator/main.cpp b/tools/xmlpatternsvalidator/main.cpp
index 614a4c8..39ec09b 100644
--- a/tools/xmlpatternsvalidator/main.cpp
+++ b/tools/xmlpatternsvalidator/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tools/xmlpatternsvalidator/main.h b/tools/xmlpatternsvalidator/main.h
index 99ef38c..9ee658d 100644
--- a/tools/xmlpatternsvalidator/main.h
+++ b/tools/xmlpatternsvalidator/main.h
@@ -7,11 +7,11 @@
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/translations/check-ts.pl b/translations/check-ts.pl
index 067cad8..bbd19e8 100755
--- a/translations/check-ts.pl
+++ b/translations/check-ts.pl
@@ -8,11 +8,11 @@
 ## This file is part of the translations module of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/fixnonlatin1/main.cpp b/util/fixnonlatin1/main.cpp
index c7ea3aa..1217b6a 100644
--- a/util/fixnonlatin1/main.cpp
+++ b/util/fixnonlatin1/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/gencmap/gencmap.cpp b/util/gencmap/gencmap.cpp
index 2682674..5e3b779 100644
--- a/util/gencmap/gencmap.cpp
+++ b/util/gencmap/gencmap.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/configfile.cpp b/util/lexgen/configfile.cpp
index 7056df5..6e5baf6 100644
--- a/util/lexgen/configfile.cpp
+++ b/util/lexgen/configfile.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/configfile.h b/util/lexgen/configfile.h
index 246b070..f3fb977 100644
--- a/util/lexgen/configfile.h
+++ b/util/lexgen/configfile.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/generator.cpp b/util/lexgen/generator.cpp
index 59b46d0..58f0dbd 100644
--- a/util/lexgen/generator.cpp
+++ b/util/lexgen/generator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/generator.h b/util/lexgen/generator.h
index 9068020..ae86e2e 100644
--- a/util/lexgen/generator.h
+++ b/util/lexgen/generator.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/global.h b/util/lexgen/global.h
index 64bede5..c27d3ab 100644
--- a/util/lexgen/global.h
+++ b/util/lexgen/global.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/main.cpp b/util/lexgen/main.cpp
index 4d18542..f27f28c 100644
--- a/util/lexgen/main.cpp
+++ b/util/lexgen/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/nfa.cpp b/util/lexgen/nfa.cpp
index 82ae9c7..95dd83b 100644
--- a/util/lexgen/nfa.cpp
+++ b/util/lexgen/nfa.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/nfa.h b/util/lexgen/nfa.h
index 7a50ce8..7f76137 100644
--- a/util/lexgen/nfa.h
+++ b/util/lexgen/nfa.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/re2nfa.cpp b/util/lexgen/re2nfa.cpp
index 18b4e16..cc25618 100644
--- a/util/lexgen/re2nfa.cpp
+++ b/util/lexgen/re2nfa.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/re2nfa.h b/util/lexgen/re2nfa.h
index f8ee69f..e2ebef8 100644
--- a/util/lexgen/re2nfa.h
+++ b/util/lexgen/re2nfa.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/tests/tst_lexgen.cpp b/util/lexgen/tests/tst_lexgen.cpp
index bb6b900..69ee5f0 100644
--- a/util/lexgen/tests/tst_lexgen.cpp
+++ b/util/lexgen/tests/tst_lexgen.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/lexgen/tokenizer.cpp b/util/lexgen/tokenizer.cpp
index f0ef4ff..376865d 100644
--- a/util/lexgen/tokenizer.cpp
+++ b/util/lexgen/tokenizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py
index 1d9ccda..503b467 100755
--- a/util/local_database/cldr2qlocalexml.py
+++ b/util/local_database/cldr2qlocalexml.py
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/local_database/dateconverter.py b/util/local_database/dateconverter.py
index 3fe94a2..ad55559 100755
--- a/util/local_database/dateconverter.py
+++ b/util/local_database/dateconverter.py
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py
index f6b145d..8917cd9 100644
--- a/util/local_database/enumdata.py
+++ b/util/local_database/enumdata.py
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/local_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py
index b6523af..63bb1f1 100755
--- a/util/local_database/qlocalexml2cpp.py
+++ b/util/local_database/qlocalexml2cpp.py
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/local_database/testlocales/localemodel.cpp b/util/local_database/testlocales/localemodel.cpp
index caf6600..46fe9b3 100644
--- a/util/local_database/testlocales/localemodel.cpp
+++ b/util/local_database/testlocales/localemodel.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/local_database/testlocales/localemodel.h b/util/local_database/testlocales/localemodel.h
index 0ab159e..ff3acd5 100644
--- a/util/local_database/testlocales/localemodel.h
+++ b/util/local_database/testlocales/localemodel.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/local_database/testlocales/localewidget.cpp b/util/local_database/testlocales/localewidget.cpp
index 9fa6b83..7c17da0 100644
--- a/util/local_database/testlocales/localewidget.cpp
+++ b/util/local_database/testlocales/localewidget.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/local_database/testlocales/localewidget.h b/util/local_database/testlocales/localewidget.h
index 1ac8e0b..8e9a51f 100644
--- a/util/local_database/testlocales/localewidget.h
+++ b/util/local_database/testlocales/localewidget.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/local_database/testlocales/main.cpp b/util/local_database/testlocales/main.cpp
index 1585ed4..b68c9da 100644
--- a/util/local_database/testlocales/main.cpp
+++ b/util/local_database/testlocales/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/local_database/xpathlite.py b/util/local_database/xpathlite.py
index 7d569f3..cff7ee4 100644
--- a/util/local_database/xpathlite.py
+++ b/util/local_database/xpathlite.py
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/normalize/main.cpp b/util/normalize/main.cpp
index 4658b5e..6275861 100644
--- a/util/normalize/main.cpp
+++ b/util/normalize/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/plugintest/main.cpp b/util/plugintest/main.cpp
index 438c51f..4e2c89d 100644
--- a/util/plugintest/main.cpp
+++ b/util/plugintest/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp
index 6e9d055..626ca53 100644
--- a/util/qlalr/compress.cpp
+++ b/util/qlalr/compress.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the test suite module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h
index 97790c7..bd0004d 100644
--- a/util/qlalr/compress.h
+++ b/util/qlalr/compress.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index 45de51c..1c7ea35 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -58,11 +58,11 @@ QString CppGenerator::copyrightHeader() const
     "** This file is part of the QtCore module of the Qt Toolkit.\n"
     "**\n"
     "** $QT_BEGIN_LICENSE:LGPL$\n"
-    "** No Commercial Usage\n"
-    "** This file contains pre-release code and may not be distributed.\n"
-    "** You may use this file in accordance with the terms and conditions\n"
-    "** contained in the Technology Preview License Agreement accompanying\n"
-    "** this package.\n"
+    "** Commercial Usage\n"
+    "** Licensees holding valid Qt Commercial licenses may use this file in\n"
+    "** accordance with the Qt Commercial License Agreement provided with the\n"
+    "** Software or, alternatively, in accordance with the terms contained in\n"
+    "** a written agreement between you and Nokia.\n"
     "**\n"
     "** GNU Lesser General Public License Usage\n"
     "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
@@ -76,16 +76,16 @@ QString CppGenerator::copyrightHeader() const
     "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
     "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
     "**\n"
+    "** GNU General Public License Usage\n"
+    "** Alternatively, this file may be used under the terms of the GNU\n"
+    "** General Public License version 3.0 as published by the Free Software\n"
+    "** Foundation and appearing in the file LICENSE.GPL included in the\n"
+    "** packaging of this file.  Please review the following information to\n"
+    "** ensure the GNU General Public License version 3.0 requirements will be\n"
+    "** met: http://www.gnu.org/copyleft/gpl.html.\n"
+    "**\n"
     "** If you have questions regarding the use of this file, please contact\n"
     "** Nokia at qt-info@nokia.com.\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
     "** $QT_END_LICENSE$\n"
     "**\n"
     "****************************************************************************/\n"
diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h
index 11cd76d..a1eb8e3 100644
--- a/util/qlalr/cppgenerator.h
+++ b/util/qlalr/cppgenerator.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp
index bde2e96..58f9f2e 100644
--- a/util/qlalr/dotgraph.cpp
+++ b/util/qlalr/dotgraph.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h
index 301042b..05878ac 100644
--- a/util/qlalr/dotgraph.h
+++ b/util/qlalr/dotgraph.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp b/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
index 943e302..b1f47a1 100644
--- a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
+++ b/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QLALR module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/examples/dummy-xml/xml.g b/util/qlalr/examples/dummy-xml/xml.g
index 5de30a1..f2295d1 100644
--- a/util/qlalr/examples/dummy-xml/xml.g
+++ b/util/qlalr/examples/dummy-xml/xml.g
@@ -7,11 +7,11 @@
 -- This file is part of the QtCore module of the Qt Toolkit.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the Technology Preview License Agreement accompanying
--- this package.
+-- Commercial Usage
+-- Licensees holding valid Qt Commercial licenses may use this file in
+-- accordance with the Qt Commercial License Agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Nokia.
 --
 -- GNU Lesser General Public License Usage
 -- Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 -- rights.  These rights are described in the Nokia 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.
+--
 -- If you have questions regarding the use of this file, please contact
 -- Nokia at qt-info@nokia.com.
---
---
---
---
---
---
---
---
 -- $QT_END_LICENSE$
 --
 ----------------------------------------------------------------------------
diff --git a/util/qlalr/examples/glsl/build.sh b/util/qlalr/examples/glsl/build.sh
index 9896815..4bb522d 100644
--- a/util/qlalr/examples/glsl/build.sh
+++ b/util/qlalr/examples/glsl/build.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/qlalr/examples/glsl/glsl-lex.l b/util/qlalr/examples/glsl/glsl-lex.l
index 1258b80..a76cb28 100644
--- a/util/qlalr/examples/glsl/glsl-lex.l
+++ b/util/qlalr/examples/glsl/glsl-lex.l
@@ -9,11 +9,11 @@
 ** This file is part of the QLALR tool of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -27,16 +27,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/examples/glsl/glsl.g b/util/qlalr/examples/glsl/glsl.g
index 669f334..c245faf 100644
--- a/util/qlalr/examples/glsl/glsl.g
+++ b/util/qlalr/examples/glsl/glsl.g
@@ -7,11 +7,11 @@
 -- This file is part of the QtCore module of the Qt Toolkit.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the Technology Preview License Agreement accompanying
--- this package.
+-- Commercial Usage
+-- Licensees holding valid Qt Commercial licenses may use this file in
+-- accordance with the Qt Commercial License Agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Nokia.
 --
 -- GNU Lesser General Public License Usage
 -- Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 -- rights.  These rights are described in the Nokia 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.
+--
 -- If you have questions regarding the use of this file, please contact
 -- Nokia at qt-info@nokia.com.
---
---
---
---
---
---
---
---
 -- $QT_END_LICENSE$
 --
 ----------------------------------------------------------------------------
diff --git a/util/qlalr/examples/lambda/lambda.g b/util/qlalr/examples/lambda/lambda.g
index 79be927..942a8b9 100644
--- a/util/qlalr/examples/lambda/lambda.g
+++ b/util/qlalr/examples/lambda/lambda.g
@@ -7,11 +7,11 @@
 -- This file is part of the QtCore module of the Qt Toolkit.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the Technology Preview License Agreement accompanying
--- this package.
+-- Commercial Usage
+-- Licensees holding valid Qt Commercial licenses may use this file in
+-- accordance with the Qt Commercial License Agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Nokia.
 --
 -- GNU Lesser General Public License Usage
 -- Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 -- rights.  These rights are described in the Nokia 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.
+--
 -- If you have questions regarding the use of this file, please contact
 -- Nokia at qt-info@nokia.com.
---
---
---
---
---
---
---
---
 -- $QT_END_LICENSE$
 --
 ----------------------------------------------------------------------------
diff --git a/util/qlalr/examples/lambda/main.cpp b/util/qlalr/examples/lambda/main.cpp
index fe43bb6..d4c0492 100644
--- a/util/qlalr/examples/lambda/main.cpp
+++ b/util/qlalr/examples/lambda/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QLALR module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/examples/qparser/calc.g b/util/qlalr/examples/qparser/calc.g
index 8fcd4dd..b952800 100644
--- a/util/qlalr/examples/qparser/calc.g
+++ b/util/qlalr/examples/qparser/calc.g
@@ -7,11 +7,11 @@
 -- This file is part of the QtCore module of the Qt Toolkit.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the Technology Preview License Agreement accompanying
--- this package.
+-- Commercial Usage
+-- Licensees holding valid Qt Commercial licenses may use this file in
+-- accordance with the Qt Commercial License Agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Nokia.
 --
 -- GNU Lesser General Public License Usage
 -- Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 -- rights.  These rights are described in the Nokia 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.
+--
 -- If you have questions regarding the use of this file, please contact
 -- Nokia at qt-info@nokia.com.
---
---
---
---
---
---
---
---
 -- $QT_END_LICENSE$
 --
 ----------------------------------------------------------------------------
diff --git a/util/qlalr/examples/qparser/calc.l b/util/qlalr/examples/qparser/calc.l
index cd40b1a..539d131 100644
--- a/util/qlalr/examples/qparser/calc.l
+++ b/util/qlalr/examples/qparser/calc.l
@@ -11,11 +11,11 @@
 ** This file is part of the QLALR tool of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -29,16 +29,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/examples/qparser/qparser.cpp b/util/qlalr/examples/qparser/qparser.cpp
index 5fe2571..cbf6b39 100644
--- a/util/qlalr/examples/qparser/qparser.cpp
+++ b/util/qlalr/examples/qparser/qparser.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the QLALR module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/examples/qparser/qparser.h b/util/qlalr/examples/qparser/qparser.h
index 3fb11dc..8f4ad7e 100644
--- a/util/qlalr/examples/qparser/qparser.h
+++ b/util/qlalr/examples/qparser/qparser.h
@@ -7,11 +7,11 @@
 ** This file is part of the QLALR module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/grammar.cpp b/util/qlalr/grammar.cpp
index a056908..0796ab3 100644
--- a/util/qlalr/grammar.cpp
+++ b/util/qlalr/grammar.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h
index ccdcfc9..73d2506 100644
--- a/util/qlalr/grammar_p.h
+++ b/util/qlalr/grammar_p.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp
index c68d8b6..ac6217b 100644
--- a/util/qlalr/lalr.cpp
+++ b/util/qlalr/lalr.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g
index 67e373c..385b57f 100644
--- a/util/qlalr/lalr.g
+++ b/util/qlalr/lalr.g
@@ -7,11 +7,11 @@
 -- This file is part of the QLALR project on Qt Labs.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the Technology Preview License Agreement accompanying
--- this package.
+-- Commercial Usage
+-- Licensees holding valid Qt Commercial licenses may use this file in
+-- accordance with the Qt Commercial License Agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Nokia.
 --
 -- GNU Lesser General Public License Usage
 -- Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 -- rights.  These rights are described in the Nokia 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.
+--
 -- If you have questions regarding the use of this file, please contact
 -- Nokia at qt-info@nokia.com.
---
---
---
---
---
---
---
---
 -- $QT_END_LICENSE$
 --
 -----------------------------------------------------------------------------
@@ -84,11 +84,11 @@
 ** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -102,16 +102,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -198,11 +198,11 @@ protected:
 ** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -216,16 +216,16 @@ protected:
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h
index 7d19589..a642b60 100644
--- a/util/qlalr/lalr.h
+++ b/util/qlalr/lalr.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp
index 01854ed..ffcd5bd 100644
--- a/util/qlalr/main.cpp
+++ b/util/qlalr/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp
index d25a045..0ec468d 100644
--- a/util/qlalr/parsetable.cpp
+++ b/util/qlalr/parsetable.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h
index b58fa90..4d74590 100644
--- a/util/qlalr/parsetable.h
+++ b/util/qlalr/parsetable.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp
index 89ec3e2..c6ed61f 100644
--- a/util/qlalr/recognizer.cpp
+++ b/util/qlalr/recognizer.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h
index 68ce9f1..eb348ab 100644
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/bld.inf b/util/s60pixelmetrics/bld.inf
index 1e5de55..b7702bd 100644
--- a/util/s60pixelmetrics/bld.inf
+++ b/util/s60pixelmetrics/bld.inf
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp
index 42ae850..9efd048 100644
--- a/util/s60pixelmetrics/pixel_metrics.cpp
+++ b/util/s60pixelmetrics/pixel_metrics.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pixel_metrics.h b/util/s60pixelmetrics/pixel_metrics.h
index 4b0f57e..5505409 100644
--- a/util/s60pixelmetrics/pixel_metrics.h
+++ b/util/s60pixelmetrics/pixel_metrics.h
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapper.hrh b/util/s60pixelmetrics/pm_mapper.hrh
index b194cbb..31a9381 100644
--- a/util/s60pixelmetrics/pm_mapper.hrh
+++ b/util/s60pixelmetrics/pm_mapper.hrh
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapper.mmp b/util/s60pixelmetrics/pm_mapper.mmp
index f54f387..42afdb7 100644
--- a/util/s60pixelmetrics/pm_mapper.mmp
+++ b/util/s60pixelmetrics/pm_mapper.mmp
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapper.rss b/util/s60pixelmetrics/pm_mapper.rss
index d1983af..ddd8529 100644
--- a/util/s60pixelmetrics/pm_mapper.rss
+++ b/util/s60pixelmetrics/pm_mapper.rss
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapper_reg.rss b/util/s60pixelmetrics/pm_mapper_reg.rss
index 99721fb..e7b3f96 100644
--- a/util/s60pixelmetrics/pm_mapper_reg.rss
+++ b/util/s60pixelmetrics/pm_mapper_reg.rss
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index a88499d..1c88768 100644
--- a/util/s60pixelmetrics/pm_mapperapp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapperapp.h b/util/s60pixelmetrics/pm_mapperapp.h
index 4800992..ae0f15b 100644
--- a/util/s60pixelmetrics/pm_mapperapp.h
+++ b/util/s60pixelmetrics/pm_mapperapp.h
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapperview.cpp b/util/s60pixelmetrics/pm_mapperview.cpp
index 0f75314..a8d9742 100644
--- a/util/s60pixelmetrics/pm_mapperview.cpp
+++ b/util/s60pixelmetrics/pm_mapperview.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60pixelmetrics/pm_mapperview.h b/util/s60pixelmetrics/pm_mapperview.h
index 6b1e657..ea259dd 100644
--- a/util/s60pixelmetrics/pm_mapperview.h
+++ b/util/s60pixelmetrics/pm_mapperview.h
@@ -7,11 +7,11 @@
 ** This file is part of the utility applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60theme/main.cpp b/util/s60theme/main.cpp
index 1234fd2..98393dc 100644
--- a/util/s60theme/main.cpp
+++ b/util/s60theme/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60theme/s60themeconvert.cpp b/util/s60theme/s60themeconvert.cpp
index b1e8022..17c4752 100644
--- a/util/s60theme/s60themeconvert.cpp
+++ b/util/s60theme/s60themeconvert.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/s60theme/s60themeconvert.h b/util/s60theme/s60themeconvert.h
index 4512446..c413cb4 100644
--- a/util/s60theme/s60themeconvert.h
+++ b/util/s60theme/s60themeconvert.h
@@ -7,11 +7,11 @@
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index c1b30ce..d7de328 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -8,11 +8,11 @@
 ## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
@@ -139,11 +139,11 @@ print OUT
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -157,16 +157,16 @@ print OUT
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/unicode/codecs/big5/main.cpp b/util/unicode/codecs/big5/main.cpp
index 3e0ef12..dd2af98 100644
--- a/util/unicode/codecs/big5/main.cpp
+++ b/util/unicode/codecs/big5/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp
index f2ebe7c..847a268 100644
--- a/util/unicode/main.cpp
+++ b/util/unicode/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -2574,11 +2574,11 @@ int main(int, char **)
         "** This file is part of the QtCore module of the Qt Toolkit.\n"
         "**\n"
         "** $QT_BEGIN_LICENSE:LGPL$\n"
-        "** No Commercial Usage\n"
-        "** This file contains pre-release code and may not be distributed.\n"
-        "** You may use this file in accordance with the terms and conditions\n"
-        "** contained in the Technology Preview License Agreement accompanying\n"
-        "** this package.\n"
+        "** Commercial Usage\n"
+        "** Licensees holding valid Qt Commercial licenses may use this file in\n"
+        "** accordance with the Qt Commercial License Agreement provided with the\n"
+        "** Software or, alternatively, in accordance with the terms contained in\n"
+        "** a written agreement between you and Nokia.\n"
         "**\n"
         "** GNU Lesser General Public License Usage\n"
         "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
@@ -2592,16 +2592,16 @@ int main(int, char **)
         "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
         "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
         "**\n"
+        "** GNU General Public License Usage\n"
+        "** Alternatively, this file may be used under the terms of the GNU\n"
+        "** General Public License version 3.0 as published by the Free Software\n"
+        "** Foundation and appearing in the file LICENSE.GPL included in the\n"
+        "** packaging of this file.  Please review the following information to\n"
+        "** ensure the GNU General Public License version 3.0 requirements will be\n"
+        "** met: http://www.gnu.org/copyleft/gpl.html.\n"
+        "**\n"
         "** If you have questions regarding the use of this file, please contact\n"
         "** Nokia at qt-info@nokia.com.\n"
-        "**\n"
-        "**\n"
-        "**\n"
-        "**\n"
-        "**\n"
-        "**\n"
-        "**\n"
-        "**\n"
         "** $QT_END_LICENSE$\n"
         "**\n"
         "****************************************************************************/\n\n";
diff --git a/util/unicode/writingSystems.sh b/util/unicode/writingSystems.sh
index f675aba..a199191 100755
--- a/util/unicode/writingSystems.sh
+++ b/util/unicode/writingSystems.sh
@@ -8,11 +8,11 @@
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
+## Commercial Usage
+## Licensees holding valid Qt Commercial licenses may use this file in
+## accordance with the Qt Commercial License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Nokia.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -26,16 +26,16 @@
 ## rights.  These rights are described in the Nokia 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.
+##
 ## If you have questions regarding the use of this file, please contact
 ## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
 ## $QT_END_LICENSE$
 ##
 #############################################################################
diff --git a/util/xkbdatagen/main.cpp b/util/xkbdatagen/main.cpp
index 5418fec..ff925b1 100644
--- a/util/xkbdatagen/main.cpp
+++ b/util/xkbdatagen/main.cpp
@@ -7,11 +7,11 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -423,11 +423,11 @@ int main(int argc, char **argv)
            "** This file is part of the QtGui module of the Qt Toolkit.\n"
            "**\n"
            "** $QT_BEGIN_LICENSE:LGPL$\n"
-           "** No Commercial Usage\n"
-           "** This file contains pre-release code and may not be distributed.\n"
-           "** You may use this file in accordance with the terms and conditions\n"
-           "** contained in the Technology Preview License Agreement accompanying\n"
-           "** this package.\n"
+           "** Commercial Usage\n"
+           "** Licensees holding valid Qt Commercial licenses may use this file in\n"
+           "** accordance with the Qt Commercial License Agreement provided with the\n"
+           "** Software or, alternatively, in accordance with the terms contained in\n"
+           "** a written agreement between you and Nokia.\n"
            "**\n"
            "** GNU Lesser General Public License Usage\n"
            "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
@@ -441,16 +441,16 @@ int main(int argc, char **argv)
            "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
            "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
            "**\n"
+           "** GNU General Public License Usage\n"
+           "** Alternatively, this file may be used under the terms of the GNU\n"
+           "** General Public License version 3.0 as published by the Free Software\n"
+           "** Foundation and appearing in the file LICENSE.GPL included in the\n"
+           "** packaging of this file.  Please review the following information to\n"
+           "** ensure the GNU General Public License version 3.0 requirements will be\n"
+           "** met: http://www.gnu.org/copyleft/gpl.html.\n"
+           "**\n"
            "** If you have questions regarding the use of this file, please contact\n"
            "** Nokia at qt-info@nokia.com.\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
-           "**\n"
            "** $QT_END_LICENSE$\n"
            "**\n"
            "****************************************************************************/\n"
-- 
cgit v0.12


From 726a8b16c52fe4608c89d740b47361a2b073ce01 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 21 Oct 2010 18:18:37 +0200
Subject: Doc: Corrected the name property as it was incorrectly declared.

---
 src/declarative/util/qdeclarativestateoperations.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 8cb813c..d1d7822 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -648,7 +648,7 @@ void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s)
 }
 
 /*!
-    \qmlproperty script StateChangeScript::script
+    \qmlproperty string StateChangeScript::name
     This property holds the name of the script. This name can be used by a
     ScriptAction to target a specific script.
 
-- 
cgit v0.12


From 2a17ec1b2ef7164a9a5f4bd9b7e5854ed5884376 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 21 Oct 2010 18:22:09 +0200
Subject: Doc: Moved QFileSystemModel example code to the class documentation.

Previously, the code showed how to use QDirModel and was included in
the QDirModel class documentation, but it has since been changed to use
QFileSystemModel instead.
---
 src/gui/dialogs/qfilesystemmodel.cpp | 45 +++++++++++++++++++++++++++---------
 src/gui/itemviews/qdirmodel.cpp      | 19 ---------------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 8a6190f..8a9f8ae 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -80,11 +80,43 @@ QT_BEGIN_NAMESPACE
     directories. In the simplest case, it can be used with a suitable display
     widget as part of a browser or filter.
 
-    QFileSystemModel will not fetch any files or directories until setRootPath
+    QFileSystemModel can be accessed using the standard interface provided by
+    QAbstractItemModel, but it also provides some convenience functions that are
+    specific to a directory model.
+    The fileInfo(), isDir(), name(), and path() functions provide information
+    about the underlying files and directories related to items in the model.
+    Directories can be created and removed using mkdir(), rmdir().
+
+    \note QFileSystemModel requires an instance of a GUI application.
+
+    \section1 Example Usage
+
+    A directory model that displays the contents of a default directory
+    is usually constructed with a parent object:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 2
+
+    A tree view can be used to display the contents of the model
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 4
+
+    and the contents of a particular directory can be displayed by
+    setting the tree view's root index:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 7
+
+    The view's root index can be used to control how much of a
+    hierarchical model is displayed. QDirModel provides a convenience
+    function that returns a suitable model index for a path to a
+    directory within the model.
+
+    \section1 Caching and Performance
+
+    QFileSystemModel will not fetch any files or directories until setRootPath()
     is called.  This will prevent any unnecessary querying on the file system
     until that point such as listing the drives on Windows.
 
-    Unlike the QDirModel, QFileSystemModel uses a separate thread to populate
+    Unlike QDirModel, QFileSystemModel uses a separate thread to populate
     itself so it will not cause the main thread to hang as the file system
     is being queried.  Calls to rowCount() will return 0 until the model
     populates a directory.
@@ -92,15 +124,6 @@ QT_BEGIN_NAMESPACE
     QFileSystemModel keeps a cache with file information. The cache is
     automatically kept up to date using the QFileSystemWatcher.
 
-    QFileSystemModel can be accessed using the standard interface provided by
-    QAbstractItemModel, but it also provides some convenience functions that are
-    specific to a directory model.
-    The fileInfo(), isDir(), name(), and path() functions provide information
-    about the underlying files and directories related to items in the model.
-    Directories can be created and removed using mkdir(), rmdir().
-
-    \note QFileSystemModel requires an instance of a GUI application.
-
     \sa {Model Classes}
 */
 
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp
index 48599bc..cb6f81e 100644
--- a/src/gui/itemviews/qdirmodel.cpp
+++ b/src/gui/itemviews/qdirmodel.cpp
@@ -201,25 +201,6 @@ void QDirModelPrivate::invalidate()
     QDirModel keeps a cache with file information. The cache needs to be
     updated with refresh().
 
-    A directory model that displays the contents of a default directory
-    is usually constructed with a parent object:
-
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 2
-
-    A tree view can be used to display the contents of the model
-
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 4
-
-    and the contents of a particular directory can be displayed by
-    setting the tree view's root index:
-
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 7
-
-    The view's root index can be used to control how much of a
-    hierarchical model is displayed. QDirModel provides a convenience
-    function that returns a suitable model index for a path to a
-    directory within the model.
-
     QDirModel can be accessed using the standard interface provided by
     QAbstractItemModel, but it also provides some convenience functions
     that are specific to a directory model. The fileInfo() and isDir()
-- 
cgit v0.12


From c29bc376c957867b57a6dd32549db6ae67be4f60 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Fri, 22 Oct 2010 15:56:23 +0200
Subject: Doc: Updated the Java trademark information.

Checked with Legal.
---
 doc/src/legal/trademarks.qdoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index 42cb7a9..e69d57c 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -33,13 +33,13 @@
     \brief Information about trademarks owned by Nokia and other organisations.
 
     Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
-    Corporation and/or its subsidiaries in Finland and other countries.
+    Corporation and/or its subsidiaries in Finland and other countries.
 
     \list
     \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
        Intel Corporation in the United States, other countries, or both.
-    \o Java and all Java-based trademarks are trademarks of Sun Microsystems,
-       Inc. in the United States, other countries, or both.
+    \o Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+       Other names may be trademarks of their respective owners.
     \o Linux is a \reg trademark of Linus Torvalds in the United States, other
        countries or both. 
     \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
-- 
cgit v0.12


From 928387618011af72e0011287e1002a9b51a6e51f Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Fri, 22 Oct 2010 15:57:36 +0200
Subject: Doc: Added Windows Vista to the trademark list.

---
 doc/src/legal/trademarks.qdoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index e69d57c..3bf783f 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -44,9 +44,9 @@
        countries or both. 
     \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
        registered in the U.S. and other countries. 
-    \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo
-       are \reg trademarks of Microsoft Corporation in the United States, other
-       countries, or both. 
+    \o Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio and the
+       Windows logo are \reg trademarks of Microsoft Corporation in the United
+       States, other countries, or both.
     \o Motif is a registered trademark of The Open Group in the United States,
        other countries, or both. 
     \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
-- 
cgit v0.12


From e8123e3392ecc36177d9a8537c2dd32a258ab3cb Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 26 Oct 2010 13:50:28 +0300
Subject: Fix patch_capabilities.pl script for explicit set of capabilities

Elftran command never got executed when explicit set of capabilities
was defined. No warning or error was printed either, making it rather
confusing for user.

Task-number: QTBUG-14730
Reviewed-by: Janne Koskinen
(cherry picked from commit f603ce9a960ee387ab10be1916da8ffd09305045)
---
 bin/patch_capabilities.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 76ba24b..430cbcb 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -269,6 +269,9 @@ if (@ARGV)
             if (@capabilitiesSpecified)
             {
                 $commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesSpecified));
+                $executeNeeded = 1;
+                my $capString = join(" ", @capabilitiesSpecified);
+                print ("Patching: Patching the the Vendor ID to 0 and the capabilities used to: \"$capString\" in \"$binaryBaseName\".\n");
             } else {
                 # Test which capabilities are present and then restrict them to the allowed set.
                 # This avoid raising the capabilities of apps that already have none.
-- 
cgit v0.12


From a87dbf0d08d58b829ca2fa036d589ad4fd48949f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Tue, 26 Oct 2010 15:46:11 +0200
Subject: Fixed race condition in raster paint engine.

We need to protect the gradient cache accesses with a mutex.

Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
---
 src/gui/painting/qpaintengine_raster.cpp |  2 ++
 tests/auto/qpainter/tst_qpainter.cpp     | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 975ebb0..c03f82b 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -4811,6 +4811,7 @@ public:
         for (int i = 0; i < stops.size() && i <= 2; i++)
             hash_val += stops[i].second.rgba();
 
+        QMutexLocker lock(&mutex);
         QGradientColorTableHash::const_iterator it = cache.constFind(hash_val);
 
         if (it == cache.constEnd())
@@ -4844,6 +4845,7 @@ protected:
     }
 
     QGradientColorTableHash cache;
+    QMutex mutex;
 };
 
 void QGradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, int opacity) const
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index beb83a1..4146c5e 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -251,6 +251,8 @@ private slots:
 
     void QTBUG5939_attachPainterPrivate();
 
+    void QTBUG14614_gradientCacheRaceCondition();
+
 private:
     void fillData();
     void setPenColor(QPainter& p);
@@ -4458,6 +4460,36 @@ void tst_QPainter::QTBUG5939_attachPainterPrivate()
     QCOMPARE(widget->deviceTransform, proxy->deviceTransform);
 }
 
+class GradientProducer : public QThread
+{
+protected:
+    void run();
+};
+
+void GradientProducer::run()
+{
+    QImage image(1, 1, QImage::Format_RGB32);
+    QPainter p(&image);
+
+    for (int i = 0; i < 1000; ++i) {
+        QLinearGradient g;
+        g.setColorAt(0, QColor(i % 256, 0, 0));
+        g.setColorAt(1, Qt::white);
+
+        p.fillRect(image.rect(), g);
+    }
+}
+
+void tst_QPainter::QTBUG14614_gradientCacheRaceCondition()
+{
+    const int threadCount = 16;
+    GradientProducer producers[threadCount];
+    for (int i = 0; i < threadCount; ++i)
+        producers[i].start();
+    for (int i = 0; i < threadCount; ++i)
+        producers[i].wait();
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"
-- 
cgit v0.12


From 4d0571667463997f5f1145408a2ba73ba293637a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Wed, 27 Oct 2010 12:57:42 +0200
Subject: Fix Windows compilation.

Don't take for granted that these are included...

Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
---
 src/gui/painting/qpaintengine_raster.cpp | 1 +
 tests/auto/qpainter/tst_qpainter.cpp     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index c03f82b..d1c4cab 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qmutex.h>
 
 #define QT_FT_BEGIN_HEADER
 #define QT_FT_END_HEADER
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 4146c5e..0a4de99 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -49,6 +49,7 @@
 #include <qfontmetrics.h>
 #include <qbitmap.h>
 #include <qimage.h>
+#include <qthread.h>
 #include <limits.h>
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 #include <qprinter.h>
-- 
cgit v0.12


From b6b276495b0d02e3bcfa62b793c83f5adcf178c7 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Mon, 18 Oct 2010 16:10:15 +0200
Subject: Sockets: Private function for pausing/resuming notifiers

This will be used by QNAM to prevent event loop recursion while
emitting signals that often spin an event loop, e.g.
authenticationRequired() displaying a dialog for the user.

Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/socket/qabstractsocket.cpp | 30 ++++++++++++++++++++++++++++++
 src/network/socket/qabstractsocket_p.h |  7 +++++++
 src/network/ssl/qsslsocket.cpp         | 14 ++++++++++++++
 src/network/ssl/qsslsocket_p.h         |  2 ++
 4 files changed, 53 insertions(+)

diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 505db71..f03d102 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1212,6 +1212,36 @@ void QAbstractSocketPrivate::fetchConnectionParameters()
 #endif
 }
 
+
+void QAbstractSocketPrivate::pauseSocketNotifiers(QAbstractSocket *socket)
+{
+    QAbstractSocketEngine *socketEngine = socket->d_func()->socketEngine;
+    if (!socketEngine)
+        return;
+    socket->d_func()->prePauseReadSocketNotifierState = socketEngine->isReadNotificationEnabled();
+    socket->d_func()->prePauseWriteSocketNotifierState = socketEngine->isWriteNotificationEnabled();
+    socket->d_func()->prePauseExceptionSocketNotifierState = socketEngine->isExceptionNotificationEnabled();
+    socketEngine->setReadNotificationEnabled(false);
+    socketEngine->setWriteNotificationEnabled(false);
+    socketEngine->setExceptionNotificationEnabled(false);
+}
+
+void QAbstractSocketPrivate::resumeSocketNotifiers(QAbstractSocket *socket)
+{
+    QAbstractSocketEngine *socketEngine = socket->d_func()->socketEngine;
+    if (!socketEngine)
+        return;
+    socketEngine->setReadNotificationEnabled(socket->d_func()->prePauseReadSocketNotifierState);
+    socketEngine->setWriteNotificationEnabled(socket->d_func()->prePauseWriteSocketNotifierState);
+    socketEngine->setExceptionNotificationEnabled(socket->d_func()->prePauseExceptionSocketNotifierState);
+}
+
+QAbstractSocketEngine* QAbstractSocketPrivate::getSocketEngine(QAbstractSocket *socket)
+{
+    return socket->d_func()->socketEngine;
+}
+
+
 /*! \internal
 
     Constructs a new abstract socket of type \a socketType. The \a
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index b51c301..7fba0fe 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -158,6 +158,13 @@ public:
     QAbstractSocket::SocketState state;
 
     QAbstractSocket::SocketError socketError;
+
+    bool prePauseReadSocketNotifierState;
+    bool prePauseWriteSocketNotifierState;
+    bool prePauseExceptionSocketNotifierState;
+    static void pauseSocketNotifiers(QAbstractSocket*);
+    static void resumeSocketNotifiers(QAbstractSocket*);
+    static QAbstractSocketEngine* getSocketEngine(QAbstractSocket*);
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index c9f421f..a752720 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -2035,6 +2035,20 @@ void QSslSocketPrivate::createPlainSocket(QIODevice::OpenMode openMode)
     q->setReadBufferSize(readBufferMaxSize);
 }
 
+void QSslSocketPrivate::pauseSocketNotifiers(QSslSocket *socket)
+{
+    if (!socket->d_func()->plainSocket)
+        return;
+    QAbstractSocketPrivate::pauseSocketNotifiers(socket->d_func()->plainSocket);
+}
+
+void QSslSocketPrivate::resumeSocketNotifiers(QSslSocket *socket)
+{
+    if (!socket->d_func()->plainSocket)
+        return;
+    QAbstractSocketPrivate::resumeSocketNotifiers(socket->d_func()->plainSocket);
+}
+
 /*!
     \internal
 */
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
index 72b3ef7..94f5f39 100644
--- a/src/network/ssl/qsslsocket_p.h
+++ b/src/network/ssl/qsslsocket_p.h
@@ -142,6 +142,8 @@ public:
     // The socket itself, including private slots.
     QTcpSocket *plainSocket;
     void createPlainSocket(QIODevice::OpenMode openMode);
+    static void pauseSocketNotifiers(QSslSocket*);
+    static void resumeSocketNotifiers(QSslSocket*);
     void _q_connectedSlot();
     void _q_hostFoundSlot();
     void _q_disconnectedSlot();
-- 
cgit v0.12


From 4c29a590cbdd68006906cb8ce3250f8d19caa3d6 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Mon, 18 Oct 2010 16:21:47 +0200
Subject: QAuthenticator: Fix NTLMv2 credential caching of QNAM

QNetworkAccessManager used the user() function for caching
the credentials when doing HTTP authentication with NTLMv2. For that
to work it needs to return the same value as was put in with setUser().

Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/kernel/qauthenticator.cpp | 14 ++++++++------
 src/network/kernel/qauthenticator_p.h |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index f97d833..220f7da 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -232,19 +232,21 @@ void QAuthenticator::setUser(const QString &user)
             //domain name is present
             d->realm.clear();
             d->userDomain = user.left(separatorPosn);
-            d->user = user.mid(separatorPosn + 1);
+            d->extractedUser = user.mid(separatorPosn + 1);
+            d->user = user;
         } else if((separatorPosn = user.indexOf(QLatin1String("@"))) != -1) {
             //domain name is present
             d->realm.clear();
             d->userDomain = user.left(separatorPosn);
-            d->user = user.left(separatorPosn);
+            d->extractedUser = user.left(separatorPosn);
+            d->user = user;
         } else {
+            d->extractedUser = user;
             d->user = user;
 	    d->realm.clear();
             d->userDomain.clear();
         }
         break;
-    // For other auth mechanisms, domain name will be part of username
     default:
         d->user = user;
         break;
@@ -1196,7 +1198,7 @@ static QByteArray qCreatev2Hash(const QAuthenticatorPrivate *ctx,
         Q_ASSERT(hashKey.size() == 16);
         // Assuming the user and domain is always unicode in challenge
         QByteArray message =
-                qStringAsUcs2Le(ctx->user.toUpper()) +
+                qStringAsUcs2Le(ctx->extractedUser.toUpper()) +
                 qStringAsUcs2Le(phase3->domainStr);
 
         phase3->v2Hash = qEncodeHmacMd5(hashKey, message);
@@ -1401,8 +1403,8 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
         pb.domainStr = ctx->userDomain;
     }
 
-    offset = qEncodeNtlmString(pb.user, offset, ctx->user, unicode);
-    pb.userStr = ctx->user;
+    offset = qEncodeNtlmString(pb.user, offset, ctx->extractedUser, unicode);
+    pb.userStr = ctx->extractedUser;
 
     offset = qEncodeNtlmString(pb.workstation, offset, ctx->workstation, unicode);
     pb.workstationStr = ctx->workstation;
diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h
index 4e09360..9f2e607 100644
--- a/src/network/kernel/qauthenticator_p.h
+++ b/src/network/kernel/qauthenticator_p.h
@@ -71,6 +71,7 @@ public:
 
     QAtomicInt ref;
     QString user;
+    QString extractedUser;
     QString password;
     QVariantHash options;
     Method method;
-- 
cgit v0.12


From d18292563cc6bfee3876b830420b1f29c0a6c260 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 16:01:01 +0200
Subject: QNAM: Do not load credentials from cache prematurely

The credentials shall only be loaded on demand, e.g. after the HTTP
code emits authenticationRequired()

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qnetworkaccessmanager.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 12fe094..0d33a46 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -1025,16 +1025,8 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
     priv->manager = this;
 
     // second step: fetch cached credentials
-    if (static_cast<QNetworkRequest::LoadControl>
-        (request.attribute(QNetworkRequest::AuthenticationReuseAttribute,
-                           QNetworkRequest::Automatic).toInt()) == QNetworkRequest::Automatic) {
-        QNetworkAuthenticationCredential *cred = d->fetchCachedCredentials(url);
-        if (cred) {
-            url.setUserName(cred->user);
-            url.setPassword(cred->password);
-            priv->urlForLastAuthentication = url;
-        }
-    }
+    // This is not done for the time being, we should use signal emissions to request
+    // the credentials from cache.
 
     // third step: find a backend
     priv->backend = d->findBackend(op, request);
@@ -1116,7 +1108,9 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QNetworkAccessBackend
 
     // don't try the cache for the same URL twice in a row
     // being called twice for the same URL means the authentication failed
-    if (url != backend->reply->urlForLastAuthentication) {
+    // also called when last URL is empty, e.g. on first call
+    if (backend->reply->urlForLastAuthentication.isEmpty()
+            || url != backend->reply->urlForLastAuthentication) {
         QNetworkAuthenticationCredential *cred = fetchCachedCredentials(url, authenticator);
         if (cred) {
             authenticator->setUser(cred->user);
-- 
cgit v0.12


From 9bc5a32b875b812c3a706034c8c27614f86bd138 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 16:05:21 +0200
Subject: QNAM HTTP: Move caching of credentials from URL

The credentials are now cached when the request gets sent.

Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp        | 11 +++++------
 src/network/access/qhttpnetworkconnectionchannel.cpp |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index ccdbb20..54a7548 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -338,13 +338,9 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
                 copyCredentials(i,  auth, isProxy);
                 QMetaObject::invokeMethod(q, "_q_restartAuthPendingRequests", Qt::QueuedConnection);
             }
-        } else if (priv->phase == QAuthenticatorPrivate::Start) {
-            // If the url's authenticator has a 'user' set we will end up here (phase is only set to 'Done' by
-            // parseHttpResponse above if 'user' is empty). So if credentials were supplied with the request,
-            // such as in the case of an XMLHttpRequest, this is our only opportunity to cache them.
-            emit q->cacheCredentials(reply->request(), auth, q);
         }
-        // - Changing values in QAuthenticator will reset the 'phase'.
+        // - Changing values in QAuthenticator will reset the 'phase'. Therefore if it is still "Done"
+        //   then nothing was filled in by the user or the cache
         // - If withCredentials has been set to false (e.g. by QtWebKit for a cross-origin XMLHttpRequest) then
         //   we need to bail out if authentication is required.
         if (priv->phase == QAuthenticatorPrivate::Done || !reply->request().withCredentials()) {
@@ -380,6 +376,7 @@ void QHttpNetworkConnectionPrivate::createAuthorization(QAbstractSocket *socket,
 
     int i = indexOf(socket);
 
+    // Send "Authorization" header, but not if it's NTLM and the socket is already authenticated.
     if (channels[i].authMehtod != QAuthenticatorPrivate::None) {
         if (!(channels[i].authMehtod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 401)) {
             QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[i].authenticator);
@@ -389,6 +386,8 @@ void QHttpNetworkConnectionPrivate::createAuthorization(QAbstractSocket *socket,
             }
         }
     }
+
+    // Send "Proxy-Authorization" header, but not if it's NTLM and the socket is already authenticated.
     if (channels[i].proxyAuthMehtod != QAuthenticatorPrivate::None) {
         if (!(channels[i].proxyAuthMehtod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 407)) {
             QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[i].proxyAuthenticator);
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index d10f951..f83e7c1 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -190,6 +190,7 @@ bool QHttpNetworkConnectionChannel::sendRequest()
                 || (!url.password().isEmpty() && url.password() != auth.password())) {
                 auth.setUser(url.userName());
                 auth.setPassword(url.password());
+                emit connection->cacheCredentials(request, &auth, connection);
                 connection->d_func()->copyCredentials(connection->d_func()->indexOf(socket), &auth, false);
             }
             // clear the userinfo,  since we use the same request for resending
-- 
cgit v0.12


From f706263856085df62507414ff0bcbadeca6dcfe5 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 16:07:21 +0200
Subject: QNAM HTTP: Do not copy around credentials when using NTLM

Copying the username and password messes up the state inside
the QAuthenticator. Do not do it.

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 54a7548..32881b2 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -257,6 +257,13 @@ void QHttpNetworkConnectionPrivate::copyCredentials(int fromChannel, QAuthentica
 {
     Q_ASSERT(auth);
 
+    // NTLM is a multi phase authentication. Copying credentials between authenticators would mess things up.
+    if (!isProxy && channels[fromChannel].authMehtod == QAuthenticatorPrivate::Ntlm)
+        return;
+    if (isProxy && channels[fromChannel].proxyAuthMehtod == QAuthenticatorPrivate::Ntlm)
+        return;
+
+
     // select another channel
     QAuthenticator* otherAuth = 0;
     for (int i = 0; i < channelCount; ++i) {
-- 
cgit v0.12


From 07fd031d29198cc5a0d6f1da6bb8fea29274fa06 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 16:16:38 +0200
Subject: QNAM HTTP: Pause sockets while emitting to user code.

This is needed because user code might display a dialog which
spins an event loop and could make the sockets readyRead() fire.
This event loop recursion is not desired as it can lead to nasty
bugs when the state is messed up.

Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp | 82 +++++++++++++++------------
 src/network/access/qhttpnetworkconnection_p.h | 15 +++--
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 32881b2..f8f7620 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -45,6 +45,7 @@
 #include <private/qnetworkrequest_p.h>
 #include <private/qobject_p.h>
 #include <private/qauthenticator_p.h>
+#include <private/qabstractsocket_p.h>
 #include <qnetworkproxy.h>
 #include <qauthenticator.h>
 
@@ -56,6 +57,7 @@
 #ifndef QT_NO_HTTP
 
 #ifndef QT_NO_OPENSSL
+#    include <private/qsslsocket_p.h>
 #    include <QtNetwork/qsslkey.h>
 #    include <QtNetwork/qsslcipher.h>
 #    include <QtNetwork/qsslconfiguration.h>
@@ -79,9 +81,9 @@ const int QHttpNetworkConnectionPrivate::defaultRePipelineLength = 2;
 
 
 QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt)
-: hostName(hostName), port(port), encrypt(encrypt),
-  channelCount(defaultChannelCount),
-  pendingAuthSignal(false), pendingProxyAuthSignal(false)
+: state(RunningState),
+  hostName(hostName), port(port), encrypt(encrypt),
+  channelCount(defaultChannelCount)
 #ifndef QT_NO_NETWORKPROXY
   , networkProxy(QNetworkProxy::NoProxy)
 #endif
@@ -90,9 +92,9 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host
 }
 
 QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt)
-: hostName(hostName), port(port), encrypt(encrypt),
-  channelCount(channelCount),
-  pendingAuthSignal(false), pendingProxyAuthSignal(false)
+: state(RunningState),
+  hostName(hostName), port(port), encrypt(encrypt),
+  channelCount(channelCount)
 #ifndef QT_NO_NETWORKPROXY
   , networkProxy(QNetworkProxy::NoProxy)
 #endif
@@ -121,6 +123,37 @@ void QHttpNetworkConnectionPrivate::init()
     }
 }
 
+void QHttpNetworkConnectionPrivate::pauseConnection()
+{
+    state = PausedState;
+
+    // Disable all socket notifiers
+    for (int i = 0; i < channelCount; i++) {
+        if (encrypt)
+            QSslSocketPrivate::pauseSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket));
+        else
+            QAbstractSocketPrivate::pauseSocketNotifiers(channels[i].socket);
+    }
+}
+
+void QHttpNetworkConnectionPrivate::resumeConnection()
+{
+    state = RunningState;
+    // Enable all socket notifiers
+    for (int i = 0; i < channelCount; i++) {
+        if (encrypt)
+            QSslSocketPrivate::resumeSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket));
+        else
+            QAbstractSocketPrivate::resumeSocketNotifiers(channels[i].socket);
+    }
+
+    // Resume uploads
+    // FIXME
+
+    // queue _q_startNextRequest
+    QMetaObject::invokeMethod(this->q_func(), "_q_startNextRequest", Qt::QueuedConnection);
+}
+
 int QHttpNetworkConnectionPrivate::indexOf(QAbstractSocket *socket) const
 {
     for (int i = 0; i < channelCount; ++i)
@@ -315,35 +348,19 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         priv->parseHttpResponse(fields, isProxy);
 
         if (priv->phase == QAuthenticatorPrivate::Done) {
-            if ((isProxy && pendingProxyAuthSignal) ||(!isProxy && pendingAuthSignal)) {
-                // drop the request
-                reply->d_func()->eraseData();
-                channels[i].close();
-                channels[i].lastStatus = 0;
-                channels[i].state =  QHttpNetworkConnectionChannel::Wait4AuthState;
-                return false;
-            }
-            // cannot use this socket until the slot returns
-            channels[i].state = QHttpNetworkConnectionChannel::WaitingState;
-            socket->blockSignals(true);
+            pauseConnection();
             if (!isProxy) {
-                pendingAuthSignal = true;
                 emit q->authenticationRequired(reply->request(), auth, q);
-                pendingAuthSignal = false;
 #ifndef QT_NO_NETWORKPROXY
             } else {
-                pendingProxyAuthSignal = true;
                 emit q->proxyAuthenticationRequired(networkProxy, auth, q);
-                pendingProxyAuthSignal = false;
 #endif
             }
-            socket->blockSignals(false);
-            // socket free to use
-            channels[i].state = QHttpNetworkConnectionChannel::IdleState;
+            resumeConnection();
+
             if (priv->phase != QAuthenticatorPrivate::Done) {
                 // send any pending requests
                 copyCredentials(i,  auth, isProxy);
-                QMetaObject::invokeMethod(q, "_q_restartAuthPendingRequests", Qt::QueuedConnection);
             }
         }
         // - Changing values in QAuthenticator will reset the 'phase'. Therefore if it is still "Done"
@@ -729,6 +746,10 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply)
 // although it is called _q_startNextRequest, it will actually start multiple requests when possible
 void QHttpNetworkConnectionPrivate::_q_startNextRequest()
 {
+    // If the QHttpNetworkConnection is currently paused then bail out immediatly
+    if (state == PausedState)
+        return;
+
     //resend the necessary ones.
     for (int i = 0; i < channelCount; ++i) {
         if (channels[i].resendCurrent) {
@@ -779,17 +800,6 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
             fillPipeline(channels[i].socket);
 }
 
-void QHttpNetworkConnectionPrivate::_q_restartAuthPendingRequests()
-{
-    // send the request using the idle socket
-    for (int i = 0 ; i < channelCount; ++i) {
-        if (channels[i].state ==  QHttpNetworkConnectionChannel::Wait4AuthState) {
-            channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-            if (channels[i].reply)
-                channels[i].sendRequest();
-        }
-    }
-}
 
 void QHttpNetworkConnectionPrivate::readMoreLater(QHttpNetworkReply *reply)
 {
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 51666d6..f2e0b1c 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -141,10 +141,10 @@ private:
     Q_DECLARE_PRIVATE(QHttpNetworkConnection)
     Q_DISABLE_COPY(QHttpNetworkConnection)
     friend class QHttpNetworkReply;
+    friend class QHttpNetworkReplyPrivate;
     friend class QHttpNetworkConnectionChannel;
 
     Q_PRIVATE_SLOT(d_func(), void _q_startNextRequest())
-    Q_PRIVATE_SLOT(d_func(), void _q_restartAuthPendingRequests())
 };
 
 
@@ -160,11 +160,20 @@ public:
     static const int defaultPipelineLength;
     static const int defaultRePipelineLength;
 
+    enum ConnectionState {
+        RunningState = 0,
+        PausedState = 1,
+    };
+
     QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt);
     QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt);
     ~QHttpNetworkConnectionPrivate();
     void init();
 
+    void pauseConnection();
+    void resumeConnection();
+    ConnectionState state;
+
     enum { ChunkSize = 4096 };
 
     int indexOf(QAbstractSocket *socket) const;
@@ -184,7 +193,6 @@ public:
 
     // private slots
     void _q_startNextRequest(); // send the next request from the queue
-    void _q_restartAuthPendingRequests(); // send the currently blocked request
 
     void createAuthorization(QAbstractSocket *socket, QHttpNetworkRequest &request);
 
@@ -203,9 +211,6 @@ public:
     const int channelCount;
     QHttpNetworkConnectionChannel *channels; // parallel connections to the server
 
-    bool pendingAuthSignal; // there is an incomplete authentication signal
-    bool pendingProxyAuthSignal; // there is an incomplete proxy authentication signal
-
     qint64 uncompressedBytesAvailable(const QHttpNetworkReply &reply) const;
     qint64 uncompressedBytesAvailableNextBlock(const QHttpNetworkReply &reply) const;
 
-- 
cgit v0.12


From 04cc5144a8d1d1eb51fb627327e155649ba2ce45 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 16:19:29 +0200
Subject: QNAM HTTP: Process authenticationRequired() from HTTP properly

Fixes a bug where a different QNetworkReply(Impl) handles an
authentication request.

Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp                 |  2 +-
 src/network/access/qhttpnetworkconnection_p.h                 |  2 +-
 src/network/access/qnetworkaccesshttpbackend.cpp              | 11 +++++++----
 src/network/access/qnetworkaccesshttpbackend_p.h              |  2 +-
 .../qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp     |  8 ++++----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index f8f7620..f6cb530 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -350,7 +350,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         if (priv->phase == QAuthenticatorPrivate::Done) {
             pauseConnection();
             if (!isProxy) {
-                emit q->authenticationRequired(reply->request(), auth, q);
+                emit q->authenticationRequired(reply, reply->request(), auth, q);
 #ifndef QT_NO_NETWORKPROXY
             } else {
                 emit q->proxyAuthenticationRequired(networkProxy, auth, q);
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index f2e0b1c..875c978 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -131,7 +131,7 @@ Q_SIGNALS:
     void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator,
                                      const QHttpNetworkConnection *connection = 0);
 #endif
-    void authenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *authenticator,
+    void authenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *authenticator,
                                 const QHttpNetworkConnection *connection = 0);
     void cacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *authenticator,
                                 const QHttpNetworkConnection *connection = 0);
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index f617244..2af4987 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -344,8 +344,8 @@ void QNetworkAccessHttpBackend::setupConnection()
     connect(http, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
             SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 #endif
-    connect(http, SIGNAL(authenticationRequired(QHttpNetworkRequest,QAuthenticator*)),
-            SLOT(httpAuthenticationRequired(QHttpNetworkRequest,QAuthenticator*)));
+    connect(http, SIGNAL(authenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*,const QHttpNetworkConnection*)),
+                SLOT(httpAuthenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*)));
     connect(http, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)),
             SLOT(httpCacheCredentials(QHttpNetworkRequest,QAuthenticator*)));
     connect(http, SIGNAL(error(QNetworkReply::NetworkError,QString)),
@@ -862,10 +862,13 @@ void QNetworkAccessHttpBackend::replyHeaderChanged()
     metaDataChanged();
 }
 
-void QNetworkAccessHttpBackend::httpAuthenticationRequired(const QHttpNetworkRequest &,
+void QNetworkAccessHttpBackend::httpAuthenticationRequired(const QHttpNetworkReply *reply,
+                                                           const QHttpNetworkRequest &,
                                                            QAuthenticator *auth)
 {
-    authenticationRequired(auth);
+    // Only process this signal when it is for the QHttpNetworkReply that we actually have
+    if (reply == this->httpReply)
+        authenticationRequired(auth);
 }
 
 void QNetworkAccessHttpBackend::httpCacheCredentials(const QHttpNetworkRequest &,
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index c4c88ae..f06f364 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -104,7 +104,7 @@ private slots:
     void replyReadyRead();
     void replyFinished();
     void replyHeaderChanged();
-    void httpAuthenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *auth);
+    void httpAuthenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *auth);
     void httpCacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *auth);
     void httpError(QNetworkReply::NetworkError error, const QString &errorString);
     bool sendCacheContents(const QNetworkCacheMetaData &metaData);
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index 89f608e..c0f503b 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -57,7 +57,7 @@ public:
 public Q_SLOTS:
     void finishedReply();
     void finishedWithError(QNetworkReply::NetworkError errorCode, const QString &detail);
-    void challenge401(const QHttpNetworkRequest &request, QAuthenticator *authenticator, const QHttpNetworkConnection *connection);
+    void challenge401(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *authenticator, const QHttpNetworkConnection *connection);
 #ifndef QT_NO_OPENSSL
     void sslErrors(const QList<QSslError> &errors);
 #endif
@@ -495,7 +495,7 @@ void tst_QHttpNetworkConnection::_connect()
     QVERIFY(false);
 }
 
-void tst_QHttpNetworkConnection::challenge401(const QHttpNetworkRequest &request,
+void tst_QHttpNetworkConnection::challenge401(const QHttpNetworkReply*, const QHttpNetworkRequest &request,
                                                         QAuthenticator *authenticator,
                                                         const QHttpNetworkConnection *connection)
 {
@@ -552,8 +552,8 @@ void tst_QHttpNetworkConnection::get401()
     if (encrypt)
         connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
-    connect(&connection, SIGNAL(authenticationRequired(const QHttpNetworkRequest&, QAuthenticator *, const QHttpNetworkConnection*)),
-                SLOT(challenge401(const QHttpNetworkRequest&, QAuthenticator *, const QHttpNetworkConnection*)));
+    connect(&connection, SIGNAL(authenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest&, QAuthenticator *, const QHttpNetworkConnection*)),
+                           SLOT(challenge401(const QHttpNetworkReply*, const QHttpNetworkRequest&, QAuthenticator *, const QHttpNetworkConnection*)));
     connection.setProperty("setCredentials", setCredentials);
     connection.setProperty("username", username);
     connection.setProperty("password", password);
-- 
cgit v0.12


From a8818493d4c782527dec7c30e9688d0e45a21351 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 16:38:48 +0200
Subject: QNAM HTTP: Also resume uploads after connection pause

Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index f6cb530..8e8c34d 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -145,10 +145,11 @@ void QHttpNetworkConnectionPrivate::resumeConnection()
             QSslSocketPrivate::resumeSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket));
         else
             QAbstractSocketPrivate::resumeSocketNotifiers(channels[i].socket);
-    }
 
-    // Resume uploads
-    // FIXME
+        // Resume pending upload if needed
+        if (channels[i].state == QHttpNetworkConnectionChannel::WritingState)
+            QMetaObject::invokeMethod(&channels[i], "_q_uploadDataReadyRead", Qt::QueuedConnection);
+    }
 
     // queue _q_startNextRequest
     QMetaObject::invokeMethod(this->q_func(), "_q_startNextRequest", Qt::QueuedConnection);
-- 
cgit v0.12


From 0284bd11c8062108f8cff85175341bc9823b8ab4 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 17:20:31 +0200
Subject: QNAM HTTP: Also pause connection when emitting sslErrors()

Pause the socket notifiers because the user could be displaying a
dialog which makes the event loop run and could make our socket
notifiers fire.

Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnectionchannel.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index f83e7c1..d6b3f94 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -1035,7 +1035,11 @@ void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
     if (!socket)
         return;
     //QNetworkReply::NetworkError errorCode = QNetworkReply::ProtocolFailure;
+    // Also pause the connection because socket notifiers may fire while an user
+    // dialog is displaying
+    connection->d_func()->pauseConnection();
     emit connection->sslErrors(errors);
+    connection->d_func()->resumeConnection();
 }
 
 void QHttpNetworkConnectionChannel::_q_encryptedBytesWritten(qint64 bytes)
-- 
cgit v0.12


From 32da94f1e58cf8591610bd3676ba448b5d7e55c0 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 17:25:38 +0200
Subject: QNAM HTTP: Pause connection when emitting proxy auth signal

Pause the socket notifiers because the user could be displaying a
dialog which makes the event loop run and could make our socket
notifiers fire.

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 8e8c34d..d861cc1 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -969,7 +969,11 @@ void QHttpNetworkConnection::ignoreSslErrors(const QList<QSslError> &errors, int
 void QHttpNetworkConnectionPrivate::emitProxyAuthenticationRequired(const QHttpNetworkConnectionChannel *chan, const QNetworkProxy &proxy, QAuthenticator* auth)
 {
     Q_Q(QHttpNetworkConnection);
+    // Also pause the connection because socket notifiers may fire while an user
+    // dialog is displaying
+    pauseConnection();
     emit q->proxyAuthenticationRequired(proxy, auth, q);
+    resumeConnection();
     int i = indexOf(chan->socket);
     copyCredentials(i, auth, true);
 }
-- 
cgit v0.12


From cbe5481271ff5470db047d7f133073ec37cf487c Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 19 Oct 2010 17:32:47 +0200
Subject: QNAM HTTP: Internal variable spelling mistakes

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp        | 16 ++++++++--------
 src/network/access/qhttpnetworkconnectionchannel.cpp |  4 ++--
 src/network/access/qhttpnetworkconnectionchannel_p.h |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index d861cc1..b7380b5 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -292,9 +292,9 @@ void QHttpNetworkConnectionPrivate::copyCredentials(int fromChannel, QAuthentica
     Q_ASSERT(auth);
 
     // NTLM is a multi phase authentication. Copying credentials between authenticators would mess things up.
-    if (!isProxy && channels[fromChannel].authMehtod == QAuthenticatorPrivate::Ntlm)
+    if (!isProxy && channels[fromChannel].authMethod == QAuthenticatorPrivate::Ntlm)
         return;
-    if (isProxy && channels[fromChannel].proxyAuthMehtod == QAuthenticatorPrivate::Ntlm)
+    if (isProxy && channels[fromChannel].proxyAuthMethod == QAuthenticatorPrivate::Ntlm)
         return;
 
 
@@ -337,10 +337,10 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         QAuthenticator* auth = 0;
         if (isProxy) {
             auth = &channels[i].proxyAuthenticator;
-            channels[i].proxyAuthMehtod = authMethod;
+            channels[i].proxyAuthMethod = authMethod;
         } else {
             auth = &channels[i].authenticator;
-            channels[i].authMehtod = authMethod;
+            channels[i].authMethod = authMethod;
         }
         //proceed with the authentication.
         if (auth->isNull())
@@ -402,8 +402,8 @@ void QHttpNetworkConnectionPrivate::createAuthorization(QAbstractSocket *socket,
     int i = indexOf(socket);
 
     // Send "Authorization" header, but not if it's NTLM and the socket is already authenticated.
-    if (channels[i].authMehtod != QAuthenticatorPrivate::None) {
-        if (!(channels[i].authMehtod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 401)) {
+    if (channels[i].authMethod != QAuthenticatorPrivate::None) {
+        if (!(channels[i].authMethod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 401)) {
             QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[i].authenticator);
             if (priv && priv->method != QAuthenticatorPrivate::None) {
                 QByteArray response = priv->calculateResponse(request.d->methodName(), request.d->uri(false));
@@ -413,8 +413,8 @@ void QHttpNetworkConnectionPrivate::createAuthorization(QAbstractSocket *socket,
     }
 
     // Send "Proxy-Authorization" header, but not if it's NTLM and the socket is already authenticated.
-    if (channels[i].proxyAuthMehtod != QAuthenticatorPrivate::None) {
-        if (!(channels[i].proxyAuthMehtod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 407)) {
+    if (channels[i].proxyAuthMethod != QAuthenticatorPrivate::None) {
+        if (!(channels[i].proxyAuthMethod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 407)) {
             QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[i].proxyAuthenticator);
             if (priv && priv->method != QAuthenticatorPrivate::None) {
                 QByteArray response = priv->calculateResponse(request.d->methodName(), request.d->uri(false));
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index d6b3f94..58e2b2f 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -68,8 +68,8 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
     , lastStatus(0)
     , pendingEncrypt(false)
     , reconnectAttempts(2)
-    , authMehtod(QAuthenticatorPrivate::None)
-    , proxyAuthMehtod(QAuthenticatorPrivate::None)
+    , authMethod(QAuthenticatorPrivate::None)
+    , proxyAuthMethod(QAuthenticatorPrivate::None)
 #ifndef QT_NO_OPENSSL
     , ignoreAllSslErrors(false)
 #endif
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 41a896d..2b1be2c 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -108,8 +108,8 @@ public:
     int lastStatus; // last status received on this channel
     bool pendingEncrypt; // for https (send after encrypted)
     int reconnectAttempts; // maximum 2 reconnection attempts
-    QAuthenticatorPrivate::Method authMehtod;
-    QAuthenticatorPrivate::Method proxyAuthMehtod;
+    QAuthenticatorPrivate::Method authMethod;
+    QAuthenticatorPrivate::Method proxyAuthMethod;
     QAuthenticator authenticator;
     QAuthenticator proxyAuthenticator;
 #ifndef QT_NO_OPENSSL
-- 
cgit v0.12


From 7647fdaf9a4b526581e02fbd0e87c41a96cbfebb Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Mon, 25 Oct 2010 12:00:58 +0200
Subject: QNAM: Internal function renaming

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qnetworkaccessbackend.cpp |  2 +-
 src/network/access/qnetworkaccessmanager.cpp | 12 ++++++------
 src/network/access/qnetworkaccessmanager_p.h |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index 60f7dc6..0a0987a 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -329,7 +329,7 @@ void QNetworkAccessBackend::authenticationRequired(QAuthenticator *authenticator
 
 void QNetworkAccessBackend::cacheCredentials(QAuthenticator *authenticator)
 {
-    manager->addCredentials(this->reply->url, authenticator);
+    manager->cacheCredentials(this->reply->url, authenticator);
 }
 
 void QNetworkAccessBackend::metaDataChanged()
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 0d33a46..e5f4d5a 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -1122,7 +1122,7 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QNetworkAccessBackend
 
     backend->reply->urlForLastAuthentication = url;
     emit q->authenticationRequired(backend->reply->q_func(), authenticator);
-    addCredentials(url, authenticator);
+    cacheCredentials(url, authenticator);
 }
 
 #ifndef QT_NO_NETWORKPROXY
@@ -1139,7 +1139,7 @@ void QNetworkAccessManagerPrivate::proxyAuthenticationRequired(QNetworkAccessBac
     // possible solution: some tracking inside the authenticator
     //      or a new function proxyAuthenticationSucceeded(true|false)
     if (proxy != backend->reply->lastProxyAuthentication) {
-        QNetworkAuthenticationCredential *cred = fetchCachedCredentials(proxy);
+        QNetworkAuthenticationCredential *cred = fetchCachedProxyCredentials(proxy);
         if (cred) {
             authenticator->setUser(cred->user);
             authenticator->setPassword(cred->password);
@@ -1149,10 +1149,10 @@ void QNetworkAccessManagerPrivate::proxyAuthenticationRequired(QNetworkAccessBac
 
     backend->reply->lastProxyAuthentication = proxy;
     emit q->proxyAuthenticationRequired(proxy, authenticator);
-    addCredentials(proxy, authenticator);
+    cacheProxyCredentials(proxy, authenticator);
 }
 
-void QNetworkAccessManagerPrivate::addCredentials(const QNetworkProxy &p,
+void QNetworkAccessManagerPrivate::cacheProxyCredentials(const QNetworkProxy &p,
                                                   const QAuthenticator *authenticator)
 {
     Q_ASSERT(authenticator);
@@ -1189,7 +1189,7 @@ void QNetworkAccessManagerPrivate::addCredentials(const QNetworkProxy &p,
 }
 
 QNetworkAuthenticationCredential *
-QNetworkAccessManagerPrivate::fetchCachedCredentials(const QNetworkProxy &p,
+QNetworkAccessManagerPrivate::fetchCachedProxyCredentials(const QNetworkProxy &p,
                                                      const QAuthenticator *authenticator)
 {
     QNetworkProxy proxy = p;
@@ -1241,7 +1241,7 @@ QList<QNetworkProxy> QNetworkAccessManagerPrivate::queryProxy(const QNetworkProx
 }
 #endif
 
-void QNetworkAccessManagerPrivate::addCredentials(const QUrl &url,
+void QNetworkAccessManagerPrivate::cacheCredentials(const QUrl &url,
                                                   const QAuthenticator *authenticator)
 {
     Q_ASSERT(authenticator);
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
index 695842c..2c6ee10 100644
--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
@@ -91,15 +91,15 @@ public:
     void createCookieJar() const;
 
     void authenticationRequired(QNetworkAccessBackend *backend, QAuthenticator *authenticator);
-    void addCredentials(const QUrl &url, const QAuthenticator *auth);
+    void cacheCredentials(const QUrl &url, const QAuthenticator *auth);
     QNetworkAuthenticationCredential *fetchCachedCredentials(const QUrl &url,
                                                              const QAuthenticator *auth = 0);
 
 #ifndef QT_NO_NETWORKPROXY
     void proxyAuthenticationRequired(QNetworkAccessBackend *backend, const QNetworkProxy &proxy,
                                      QAuthenticator *authenticator);
-    void addCredentials(const QNetworkProxy &proxy, const QAuthenticator *auth);
-    QNetworkAuthenticationCredential *fetchCachedCredentials(const QNetworkProxy &proxy,
+    void cacheProxyCredentials(const QNetworkProxy &proxy, const QAuthenticator *auth);
+    QNetworkAuthenticationCredential *fetchCachedProxyCredentials(const QNetworkProxy &proxy,
                                                              const QAuthenticator *auth = 0);
     QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query);
 #endif
-- 
cgit v0.12


From 6765569901a12fc70be2c1921d79b377898df9ae Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 26 Oct 2010 14:19:18 +0200
Subject: QNAM HTTP: Remove Wait4AuthState

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp        | 5 -----
 src/network/access/qhttpnetworkconnectionchannel.cpp | 1 -
 src/network/access/qhttpnetworkconnectionchannel_p.h | 3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index b7380b5..1166a9a 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -381,11 +381,6 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
             emit channels[i].reply->finished();
             // ### at this point the reply could be deleted
             socket->close();
-            // remove pending request on the other channels
-            for (int j = 0; j < channelCount; ++j) {
-                if (j != i && channels[j].state ==  QHttpNetworkConnectionChannel::Wait4AuthState)
-                    channels[j].state = QHttpNetworkConnectionChannel::IdleState;
-            }
             return true;
         }
         //resend the request
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 58e2b2f..329b0b2 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -310,7 +310,6 @@ bool QHttpNetworkConnectionChannel::sendRequest()
         break;
     }
     case QHttpNetworkConnectionChannel::ReadingState:
-    case QHttpNetworkConnectionChannel::Wait4AuthState:
         // ignore _q_bytesWritten in these states
         // fall through
     default:
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 2b1be2c..442086a 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -95,8 +95,7 @@ public:
         WritingState = 2,       // writing the data
         WaitingState = 4,       // waiting for reply
         ReadingState = 8,       // reading the reply
-        Wait4AuthState = 0x10,  // blocked for send till the current authentication slot is done
-        BusyState = (ConnectingState|WritingState|WaitingState|ReadingState|Wait4AuthState)
+        BusyState = (ConnectingState|WritingState|WaitingState|ReadingState)
     };
     QAbstractSocket *socket;
     ChannelState state;
-- 
cgit v0.12


From 300523dfba881e5464da24cf6106890f3c803cd0 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 26 Oct 2010 15:29:44 +0200
Subject: QNAM HTTP: Use sslErrors() from QHttpNetworkReply

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection_p.h                  |  3 ---
 src/network/access/qhttpnetworkconnectionchannel.cpp           |  2 +-
 src/network/access/qhttpnetworkreply.cpp                       |  5 +++++
 src/network/access/qhttpnetworkreply_p.h                       |  2 ++
 src/network/access/qnetworkaccesshttpbackend.cpp               |  6 ++----
 .../auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp | 10 ++++++----
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 875c978..e20c795 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -120,9 +120,6 @@ public:
     void setSslConfiguration(const QSslConfiguration &config);
     void ignoreSslErrors(int channel = -1);
     void ignoreSslErrors(const QList<QSslError> &errors, int channel = -1);
-
-Q_SIGNALS:
-    void sslErrors(const QList<QSslError> &errors);
 #endif
 
 Q_SIGNALS:
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 329b0b2..9c504ba 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -1037,7 +1037,7 @@ void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
     // Also pause the connection because socket notifiers may fire while an user
     // dialog is displaying
     connection->d_func()->pauseConnection();
-    emit connection->sslErrors(errors);
+    emit reply->sslErrors(errors);
     connection->d_func()->resumeConnection();
 }
 
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 108ba8a..e4eb7c4 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -205,6 +205,11 @@ bool QHttpNetworkReply::isPipeliningUsed() const
     return d_func()->pipeliningUsed;
 }
 
+QHttpNetworkConnection* QHttpNetworkReply::connection()
+{
+    return d_func()->connection;
+}
+
 
 QHttpNetworkReplyPrivate::QHttpNetworkReplyPrivate(const QUrl &newUrl)
     : QHttpNetworkHeaderPrivate(newUrl), state(NothingDoneState), statusCode(100),
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 4011c78..7cfd8b2 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -132,6 +132,8 @@ public:
 
     bool isPipeliningUsed() const;
 
+    QHttpNetworkConnection* connection();
+
 #ifndef QT_NO_OPENSSL
     QSslConfiguration sslConfiguration() const;
     void setSslConfiguration(const QSslConfiguration &config);
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 2af4987..c425600 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -350,10 +350,6 @@ void QNetworkAccessHttpBackend::setupConnection()
             SLOT(httpCacheCredentials(QHttpNetworkRequest,QAuthenticator*)));
     connect(http, SIGNAL(error(QNetworkReply::NetworkError,QString)),
             SLOT(httpError(QNetworkReply::NetworkError,QString)));
-#ifndef QT_NO_OPENSSL
-    connect(http, SIGNAL(sslErrors(QList<QSslError>)),
-            SLOT(sslErrors(QList<QSslError>)));
-#endif
 }
 
 /*
@@ -593,6 +589,8 @@ void QNetworkAccessHttpBackend::postRequest()
     if (pendingIgnoreAllSslErrors)
         httpReply->ignoreSslErrors();
     httpReply->ignoreSslErrors(pendingIgnoreSslErrorsList);
+    connect(httpReply, SIGNAL(sslErrors(QList<QSslError>)),
+            SLOT(sslErrors(QList<QSslError>)));
 #endif
 
     connect(httpReply, SIGNAL(readyRead()), SLOT(replyReadyRead()));
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index c0f503b..ecfd462 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -668,8 +668,10 @@ void tst_QHttpNetworkConnection::sslErrors(const QList<QSslError> &errors)
 {
     Q_UNUSED(errors)
 
-    QHttpNetworkConnection *connection = qobject_cast<QHttpNetworkConnection*>(sender());
-    if (connection) {
+    QHttpNetworkReply *reply = qobject_cast<QHttpNetworkReply*>(sender());
+    if (reply) {
+        QHttpNetworkConnection *connection = reply->connection();
+
         QVariant val = connection->property("ignoreFromSignal");
         if (val.toBool())
             connection->ignoreSslErrors();
@@ -716,12 +718,12 @@ void tst_QHttpNetworkConnection::ignoresslerror()
     if (ignoreInit)
         connection.ignoreSslErrors();
     QCOMPARE(connection.isEncrypted(), encrypt);
-    connect(&connection, SIGNAL(sslErrors(const QList<QSslError>&)),
-        SLOT(sslErrors(const QList<QSslError>&)));
     connection.setProperty("ignoreFromSignal", ignoreFromSignal);
 
     QHttpNetworkRequest request(protocol + host + path);
     QHttpNetworkReply *reply = connection.sendRequest(request);
+    connect(reply, SIGNAL(sslErrors(const QList<QSslError>&)),
+        SLOT(sslErrors(const QList<QSslError>&)));
 
     finishedWithErrorCalled = false;
 
-- 
cgit v0.12


From 3b87e4639edb2c7050c5ae74fa8280fd120b8de1 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 26 Oct 2010 15:35:10 +0200
Subject: QNAM HTTP: Move cacheCredentials() to QHttpNetworkReply

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection_p.h        | 2 --
 src/network/access/qhttpnetworkconnectionchannel.cpp | 2 +-
 src/network/access/qhttpnetworkreply_p.h             | 1 +
 src/network/access/qnetworkaccesshttpbackend.cpp     | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index e20c795..f8c4bb4 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -130,8 +130,6 @@ Q_SIGNALS:
 #endif
     void authenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *authenticator,
                                 const QHttpNetworkConnection *connection = 0);
-    void cacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *authenticator,
-                                const QHttpNetworkConnection *connection = 0);
     void error(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
 
 private:
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 9c504ba..52a8e72 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -190,7 +190,7 @@ bool QHttpNetworkConnectionChannel::sendRequest()
                 || (!url.password().isEmpty() && url.password() != auth.password())) {
                 auth.setUser(url.userName());
                 auth.setPassword(url.password());
-                emit connection->cacheCredentials(request, &auth, connection);
+                emit reply->cacheCredentials(request, &auth);
                 connection->d_func()->copyCredentials(connection->d_func()->indexOf(socket), &auth, false);
             }
             // clear the userinfo,  since we use the same request for resending
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 7cfd8b2..79966fd 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -151,6 +151,7 @@ Q_SIGNALS:
     void headerChanged();
     void dataReadProgress(int done, int total);
     void dataSendProgress(qint64 done, qint64 total);
+    void cacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *authenticator);
 
 private:
     Q_DECLARE_PRIVATE(QHttpNetworkReply)
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index c425600..3bad2fe 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -346,8 +346,6 @@ void QNetworkAccessHttpBackend::setupConnection()
 #endif
     connect(http, SIGNAL(authenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*,const QHttpNetworkConnection*)),
                 SLOT(httpAuthenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*)));
-    connect(http, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)),
-            SLOT(httpCacheCredentials(QHttpNetworkRequest,QAuthenticator*)));
     connect(http, SIGNAL(error(QNetworkReply::NetworkError,QString)),
             SLOT(httpError(QNetworkReply::NetworkError,QString)));
 }
@@ -598,6 +596,8 @@ void QNetworkAccessHttpBackend::postRequest()
     connect(httpReply, SIGNAL(finishedWithError(QNetworkReply::NetworkError,QString)),
             SLOT(httpError(QNetworkReply::NetworkError,QString)));
     connect(httpReply, SIGNAL(headerChanged()), SLOT(replyHeaderChanged()));
+    connect(httpReply, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)),
+            SLOT(httpCacheCredentials(QHttpNetworkRequest,QAuthenticator*)));
 }
 
 void QNetworkAccessHttpBackend::invalidateCache()
-- 
cgit v0.12


From fb404765a5af559598dc5b3906e45d8c5e48884b Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 26 Oct 2010 15:48:42 +0200
Subject: QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReply

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp    | 5 ++---
 src/network/access/qhttpnetworkconnection_p.h    | 5 -----
 src/network/access/qhttpnetworkreply_p.h         | 4 +++-
 src/network/access/qnetworkaccesshttpbackend.cpp | 8 ++++----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 1166a9a..f266322 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -354,7 +354,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
                 emit q->authenticationRequired(reply, reply->request(), auth, q);
 #ifndef QT_NO_NETWORKPROXY
             } else {
-                emit q->proxyAuthenticationRequired(networkProxy, auth, q);
+                emit reply->proxyAuthenticationRequired(networkProxy, auth);
 #endif
             }
             resumeConnection();
@@ -963,11 +963,10 @@ void QHttpNetworkConnection::ignoreSslErrors(const QList<QSslError> &errors, int
 // e.g. it is for SOCKS proxies which require authentication.
 void QHttpNetworkConnectionPrivate::emitProxyAuthenticationRequired(const QHttpNetworkConnectionChannel *chan, const QNetworkProxy &proxy, QAuthenticator* auth)
 {
-    Q_Q(QHttpNetworkConnection);
     // Also pause the connection because socket notifiers may fire while an user
     // dialog is displaying
     pauseConnection();
-    emit q->proxyAuthenticationRequired(proxy, auth, q);
+    emit chan->reply->proxyAuthenticationRequired(proxy, auth);
     resumeConnection();
     int i = indexOf(chan->socket);
     copyCredentials(i, auth, true);
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index f8c4bb4..af33bf9 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -123,11 +123,6 @@ public:
 #endif
 
 Q_SIGNALS:
-#ifndef QT_NO_NETWORKPROXY
-    //cannot be used with queued connection.
-    void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator,
-                                     const QHttpNetworkConnection *connection = 0);
-#endif
     void authenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *authenticator,
                                 const QHttpNetworkConnection *connection = 0);
     void error(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 79966fd..b4a14f9 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -152,7 +152,9 @@ Q_SIGNALS:
     void dataReadProgress(int done, int total);
     void dataSendProgress(qint64 done, qint64 total);
     void cacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *authenticator);
-
+#ifndef QT_NO_NETWORKPROXY
+    void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);
+#endif
 private:
     Q_DECLARE_PRIVATE(QHttpNetworkReply)
     friend class QHttpNetworkConnection;
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 3bad2fe..3611e77 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -340,10 +340,6 @@ void QNetworkAccessHttpBackend::finished()
 
 void QNetworkAccessHttpBackend::setupConnection()
 {
-#ifndef QT_NO_NETWORKPROXY
-    connect(http, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
-            SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
-#endif
     connect(http, SIGNAL(authenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*,const QHttpNetworkConnection*)),
                 SLOT(httpAuthenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*)));
     connect(http, SIGNAL(error(QNetworkReply::NetworkError,QString)),
@@ -598,6 +594,10 @@ void QNetworkAccessHttpBackend::postRequest()
     connect(httpReply, SIGNAL(headerChanged()), SLOT(replyHeaderChanged()));
     connect(httpReply, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)),
             SLOT(httpCacheCredentials(QHttpNetworkRequest,QAuthenticator*)));
+#ifndef QT_NO_NETWORKPROXY
+    connect(httpReply, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+            SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
+#endif
 }
 
 void QNetworkAccessHttpBackend::invalidateCache()
-- 
cgit v0.12


From 3d7e7b4595059c69428022e52b63b10edbe81b0f Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 26 Oct 2010 17:47:43 +0200
Subject: QNAM HTTP: Move authenticationRequired() to QHttpNetworkReply

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp          |  2 +-
 src/network/access/qhttpnetworkconnection_p.h          |  2 --
 src/network/access/qhttpnetworkreply_p.h               |  1 +
 src/network/access/qnetworkaccesshttpbackend.cpp       | 11 ++++-------
 src/network/access/qnetworkaccesshttpbackend_p.h       |  2 +-
 .../tst_qhttpnetworkconnection.cpp                     | 18 +++++++++---------
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index f266322..1afca0b 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -351,7 +351,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         if (priv->phase == QAuthenticatorPrivate::Done) {
             pauseConnection();
             if (!isProxy) {
-                emit q->authenticationRequired(reply, reply->request(), auth, q);
+                emit reply->authenticationRequired(reply->request(), auth);
 #ifndef QT_NO_NETWORKPROXY
             } else {
                 emit reply->proxyAuthenticationRequired(networkProxy, auth);
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index af33bf9..8d18a7c 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -123,8 +123,6 @@ public:
 #endif
 
 Q_SIGNALS:
-    void authenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *authenticator,
-                                const QHttpNetworkConnection *connection = 0);
     void error(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
 
 private:
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index b4a14f9..3f79d81 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -155,6 +155,7 @@ Q_SIGNALS:
 #ifndef QT_NO_NETWORKPROXY
     void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);
 #endif
+    void authenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *authenticator);
 private:
     Q_DECLARE_PRIVATE(QHttpNetworkReply)
     friend class QHttpNetworkConnection;
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 3611e77..3a854fe 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -340,8 +340,6 @@ void QNetworkAccessHttpBackend::finished()
 
 void QNetworkAccessHttpBackend::setupConnection()
 {
-    connect(http, SIGNAL(authenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*,const QHttpNetworkConnection*)),
-                SLOT(httpAuthenticationRequired(const QHttpNetworkReply*, QHttpNetworkRequest,QAuthenticator*)));
     connect(http, SIGNAL(error(QNetworkReply::NetworkError,QString)),
             SLOT(httpError(QNetworkReply::NetworkError,QString)));
 }
@@ -598,6 +596,8 @@ void QNetworkAccessHttpBackend::postRequest()
     connect(httpReply, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
             SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 #endif
+    connect(httpReply, SIGNAL(authenticationRequired(const QHttpNetworkRequest,QAuthenticator*)),
+                SLOT(httpAuthenticationRequired(const QHttpNetworkRequest,QAuthenticator*)));
 }
 
 void QNetworkAccessHttpBackend::invalidateCache()
@@ -860,13 +860,10 @@ void QNetworkAccessHttpBackend::replyHeaderChanged()
     metaDataChanged();
 }
 
-void QNetworkAccessHttpBackend::httpAuthenticationRequired(const QHttpNetworkReply *reply,
-                                                           const QHttpNetworkRequest &,
+void QNetworkAccessHttpBackend::httpAuthenticationRequired(const QHttpNetworkRequest &,
                                                            QAuthenticator *auth)
 {
-    // Only process this signal when it is for the QHttpNetworkReply that we actually have
-    if (reply == this->httpReply)
-        authenticationRequired(auth);
+    authenticationRequired(auth);
 }
 
 void QNetworkAccessHttpBackend::httpCacheCredentials(const QHttpNetworkRequest &,
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index f06f364..c4c88ae 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -104,7 +104,7 @@ private slots:
     void replyReadyRead();
     void replyFinished();
     void replyHeaderChanged();
-    void httpAuthenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *auth);
+    void httpAuthenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *auth);
     void httpCacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *auth);
     void httpError(QNetworkReply::NetworkError error, const QString &errorString);
     bool sendCacheContents(const QNetworkCacheMetaData &metaData);
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index ecfd462..0956b57 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -57,7 +57,7 @@ public:
 public Q_SLOTS:
     void finishedReply();
     void finishedWithError(QNetworkReply::NetworkError errorCode, const QString &detail);
-    void challenge401(const QHttpNetworkReply*, const QHttpNetworkRequest &request, QAuthenticator *authenticator, const QHttpNetworkConnection *connection);
+    void challenge401(const QHttpNetworkRequest &request, QAuthenticator *authenticator);
 #ifndef QT_NO_OPENSSL
     void sslErrors(const QList<QSslError> &errors);
 #endif
@@ -495,15 +495,15 @@ void tst_QHttpNetworkConnection::_connect()
     QVERIFY(false);
 }
 
-void tst_QHttpNetworkConnection::challenge401(const QHttpNetworkReply*, const QHttpNetworkRequest &request,
-                                                        QAuthenticator *authenticator,
-                                                        const QHttpNetworkConnection *connection)
+void tst_QHttpNetworkConnection::challenge401(const QHttpNetworkRequest &request,
+                                                        QAuthenticator *authenticator)
 {
     Q_UNUSED(request)
-    Q_UNUSED(connection)
 
-    QHttpNetworkConnection *c = qobject_cast<QHttpNetworkConnection*>(sender());
-    if (connection) {
+    QHttpNetworkReply *reply = qobject_cast<QHttpNetworkReply*>(sender());
+    if (reply) {
+        QHttpNetworkConnection *c = reply->connection();
+
         QVariant val = c->property("setCredentials");
         if (val.toBool()) {
             QVariant user = c->property("username");
@@ -552,14 +552,14 @@ void tst_QHttpNetworkConnection::get401()
     if (encrypt)
         connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
-    connect(&connection, SIGNAL(authenticationRequired(const QHttpNetworkReply*, const QHttpNetworkRequest&, QAuthenticator *, const QHttpNetworkConnection*)),
-                           SLOT(challenge401(const QHttpNetworkReply*, const QHttpNetworkRequest&, QAuthenticator *, const QHttpNetworkConnection*)));
     connection.setProperty("setCredentials", setCredentials);
     connection.setProperty("username", username);
     connection.setProperty("password", password);
 
     QHttpNetworkRequest request(protocol + host + path);
     QHttpNetworkReply *reply = connection.sendRequest(request);
+    connect(reply, SIGNAL(authenticationRequired(const QHttpNetworkRequest&, QAuthenticator *)),
+                           SLOT(challenge401(const QHttpNetworkRequest&, QAuthenticator *)));
 
     finishedCalled = false;
     finishedWithErrorCalled = false;
-- 
cgit v0.12


From a754c657db2d812911f278299c64001f37c2aae8 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 26 Oct 2010 17:53:43 +0200
Subject: QNAM HTTP: Remove unused code

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp    | 15 ---------------
 src/network/access/qhttpnetworkconnection_p.h    |  4 ----
 src/network/access/qnetworkaccesshttpbackend.cpp | 23 -----------------------
 3 files changed, 42 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 1afca0b..bf02543 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -856,21 +856,6 @@ bool QHttpNetworkConnection::isEncrypted() const
     return d->encrypt;
 }
 
-void QHttpNetworkConnection::setProxyAuthentication(QAuthenticator *authenticator)
-{
-    Q_D(QHttpNetworkConnection);
-    for (int i = 0; i < d->channelCount; ++i)
-        d->channels[i].proxyAuthenticator = *authenticator;
-}
-
-void QHttpNetworkConnection::setAuthentication(const QString &domain, QAuthenticator *authenticator)
-{
-    Q_UNUSED(domain); // ### domain ?
-    Q_D(QHttpNetworkConnection);
-    for (int i = 0; i < d->channelCount; ++i)
-        d->channels[i].authenticator = *authenticator;
-}
-
 #ifndef QT_NO_NETWORKPROXY
 void QHttpNetworkConnection::setCacheProxy(const QNetworkProxy &networkProxy)
 {
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 8d18a7c..f55937d 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -112,10 +112,6 @@ public:
     void enableEncryption();
     bool isEncrypted() const;
 
-    //authentication parameters
-    void setProxyAuthentication(QAuthenticator *authenticator);
-    void setAuthentication(const QString &domain, QAuthenticator *authenticator);
-
 #ifndef QT_NO_OPENSSL
     void setSslConfiguration(const QSslConfiguration &config);
     void ignoreSslErrors(int channel = -1);
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 3a854fe..ec10d34 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -878,29 +878,6 @@ void QNetworkAccessHttpBackend::httpError(QNetworkReply::NetworkError errorCode,
 #if defined(QNETWORKACCESSHTTPBACKEND_DEBUG)
     qDebug() << "http error!" << errorCode << errorString;
 #endif
-#if 0
-    static const QNetworkReply::NetworkError conversionTable[] = {
-        QNetworkReply::ConnectionRefusedError,
-        QNetworkReply::RemoteHostClosedError,
-        QNetworkReply::HostNotFoundError,
-        QNetworkReply::UnknownNetworkError, // SocketAccessError
-        QNetworkReply::UnknownNetworkError, // SocketResourceError
-        QNetworkReply::TimeoutError,        // SocketTimeoutError
-        QNetworkReply::UnknownNetworkError, // DatagramTooLargeError
-        QNetworkReply::UnknownNetworkError, // NetworkError
-        QNetworkReply::UnknownNetworkError, // AddressInUseError
-        QNetworkReply::UnknownNetworkError, // SocketAddressNotAvailableError
-        QNetworkReply::UnknownNetworkError, // UnsupportedSocketOperationError
-        QNetworkReply::UnknownNetworkError, // UnfinishedSocketOperationError
-        QNetworkReply::ProxyAuthenticationRequiredError
-    };
-    QNetworkReply::NetworkError code;
-    if (int(errorCode) >= 0 &&
-        uint(errorCode) < (sizeof conversionTable / sizeof conversionTable[0]))
-        code = conversionTable[errorCode];
-    else
-        code = QNetworkReply::UnknownNetworkError;
-#endif
     error(errorCode, errorString);
     finished();
 }
-- 
cgit v0.12


From be18016694c57fef508aa4715f5b8f9bbf21e5ac Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 26 Oct 2010 18:02:10 +0200
Subject: QNAM HTTP: Remove enableEncryption()

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp      |  6 -----
 src/network/access/qhttpnetworkconnection_p.h      |  2 --
 .../tst_qhttpnetworkconnection.cpp                 | 26 +++++-----------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index bf02543..3acaaff 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -844,12 +844,6 @@ QHttpNetworkReply* QHttpNetworkConnection::sendRequest(const QHttpNetworkRequest
     return d->queueRequest(request);
 }
 
-void QHttpNetworkConnection::enableEncryption()
-{
-    Q_D(QHttpNetworkConnection);
-    d->encrypt = true;
-}
-
 bool QHttpNetworkConnection::isEncrypted() const
 {
     Q_D(const QHttpNetworkConnection);
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index f55937d..5d5caa6 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -108,8 +108,6 @@ public:
     QNetworkProxy transparentProxy() const;
 #endif
 
-    //enable encryption
-    void enableEncryption();
     bool isEncrypted() const;
 
 #ifndef QT_NO_OPENSSL
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index 0956b57..29fe2fb 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -175,11 +175,9 @@ void tst_QHttpNetworkConnection::head()
     QFETCH(QString, statusString);
     QFETCH(int, contentLength);
 
-    QHttpNetworkConnection connection(host);
+    QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path, QHttpNetworkRequest::Head);
@@ -235,11 +233,9 @@ void tst_QHttpNetworkConnection::get()
     QFETCH(int, contentLength);
     QFETCH(int, downloadSize);
 
-    QHttpNetworkConnection connection(host);
+    QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path);
@@ -315,11 +311,9 @@ void tst_QHttpNetworkConnection::put()
     QFETCH(QString, data);
     QFETCH(bool, succeed);
 
-    QHttpNetworkConnection connection(host);
+    QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path, QHttpNetworkRequest::Put);
@@ -407,11 +401,9 @@ void tst_QHttpNetworkConnection::post()
     QFETCH(int, contentLength);
     QFETCH(int, downloadSize);
 
-    QHttpNetworkConnection connection(host);
+    QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path, QHttpNetworkRequest::Post);
@@ -549,8 +541,6 @@ void tst_QHttpNetworkConnection::get401()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
     connection.setProperty("setCredentials", setCredentials);
     connection.setProperty("username", username);
@@ -618,11 +608,9 @@ void tst_QHttpNetworkConnection::compression()
     QFETCH(bool, autoCompress);
     QFETCH(QString, contentCoding);
 
-    QHttpNetworkConnection connection(host);
+    QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
     QCOMPARE(connection.isEncrypted(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path);
@@ -713,8 +701,6 @@ void tst_QHttpNetworkConnection::ignoresslerror()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
     if (ignoreInit)
         connection.ignoreSslErrors();
     QCOMPARE(connection.isEncrypted(), encrypt);
@@ -771,8 +757,6 @@ void tst_QHttpNetworkConnection::nossl()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    if (encrypt)
-        connection.enableEncryption();
 
     QHttpNetworkRequest request(protocol + host + path);
     QHttpNetworkReply *reply = connection.sendRequest(request);
-- 
cgit v0.12


From b5d9dbf28b78aa17bfb70aa2e5fd3da99fe53ff0 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 27 Oct 2010 14:06:28 +0200
Subject: QNAM HTTP: Remove the error() of QHttpNetworkConnection

Removed the distinction between reply error and connection error.
The QNetworkAccessManager was treating them the same way anyway.

Reviewed-by: Prasanth
Task-Number: QTBUG-13234
---
 src/network/access/qhttpnetworkconnection.cpp      |  3 +--
 src/network/access/qhttpnetworkconnection_p.h      |  3 ---
 .../access/qhttpnetworkconnectionchannel.cpp       | 24 ++++++++--------------
 src/network/access/qnetworkaccesshttpbackend.cpp   |  7 -------
 src/network/access/qnetworkaccesshttpbackend_p.h   |  1 -
 .../tst_qhttpnetworkconnection.cpp                 |  2 --
 6 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 3acaaff..92f8af7 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -377,8 +377,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
                 ? QNetworkReply::ProxyAuthenticationRequiredError
                 : QNetworkReply::AuthenticationRequiredError;
             reply->d_func()->errorString = errorDetail(errorCode, socket);
-            emit q->error(errorCode, reply->d_func()->errorString);
-            emit channels[i].reply->finished();
+            emit reply->finishedWithError(errorCode, reply->d_func()->errorString);
             // ### at this point the reply could be deleted
             socket->close();
             return true;
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 5d5caa6..8461426c 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -116,9 +116,6 @@ public:
     void ignoreSslErrors(const QList<QSslError> &errors, int channel = -1);
 #endif
 
-Q_SIGNALS:
-    void error(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
-
 private:
     Q_DECLARE_PRIVATE(QHttpNetworkConnection)
     Q_DISABLE_COPY(QHttpNetworkConnection)
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 52a8e72..4e5de53 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -797,8 +797,7 @@ void QHttpNetworkConnectionChannel::handleStatus()
                 ? QNetworkReply::ProxyAuthenticationRequiredError
                 : QNetworkReply::AuthenticationRequiredError;
             reply->d_func()->errorString = connection->d_func()->errorDetail(errorCode, socket);
-            emit connection->error(errorCode, reply->d_func()->errorString);
-            emit reply->finished();
+            emit reply->finishedWithError(errorCode, reply->d_func()->errorString);
         }
         break;
     default:
@@ -945,7 +944,6 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
 {
     if (!socket)
         return;
-    bool send2Reply = false;
     QNetworkReply::NetworkError errorCode = QNetworkReply::UnknownNetworkError;
 
     switch (socketError) {
@@ -963,7 +961,6 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
                 closeAndResendCurrentRequest();
                 return;
             } else {
-                send2Reply = true;
                 errorCode = QNetworkReply::RemoteHostClosedError;
             }
         } else {
@@ -976,7 +973,6 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
             closeAndResendCurrentRequest();
             return;
         }
-        send2Reply = true;
         errorCode = QNetworkReply::TimeoutError;
         break;
     case QAbstractSocket::ProxyAuthenticationRequiredError:
@@ -992,18 +988,14 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
     }
     QPointer<QHttpNetworkConnection> that = connection;
     QString errorString = connection->d_func()->errorDetail(errorCode, socket, socket->errorString());
-    if (send2Reply) {
-        if (reply) {
-            reply->d_func()->errorString = errorString;
-            // this error matters only to this reply
-            emit reply->finishedWithError(errorCode, errorString);
-        }
-        // send the next request
-        QMetaObject::invokeMethod(that, "_q_startNextRequest", Qt::QueuedConnection);
-    } else {
-        // the failure affects all requests.
-        emit connection->error(errorCode, errorString);
+
+    if (reply) {
+        reply->d_func()->errorString = errorString;
+        emit reply->finishedWithError(errorCode, errorString);
     }
+    // send the next request
+    QMetaObject::invokeMethod(that, "_q_startNextRequest", Qt::QueuedConnection);
+
     if (that) //signal emission triggered event loop
         close();
 }
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index ec10d34..2a0daf8 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -338,12 +338,6 @@ void QNetworkAccessHttpBackend::finished()
     QNetworkAccessBackend::finished();
 }
 
-void QNetworkAccessHttpBackend::setupConnection()
-{
-    connect(http, SIGNAL(error(QNetworkReply::NetworkError,QString)),
-            SLOT(httpError(QNetworkReply::NetworkError,QString)));
-}
-
 /*
     For a given httpRequest
     1) If AlwaysNetwork, return
@@ -672,7 +666,6 @@ void QNetworkAccessHttpBackend::open()
         cache->addEntry(cacheKey, http);
     }
 
-    setupConnection();
     postRequest();
 }
 
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index c4c88ae..568b2ee 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -125,7 +125,6 @@ private:
     quint64 resumeOffset;
 
     void disconnectFromHttp();
-    void setupConnection();
     void validateCache(QHttpNetworkRequest &httpRequest, bool &loadedFromCache);
     void invalidateCache();
     void postRequest();
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index 29fe2fb..4a32a5a 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -330,8 +330,6 @@ void tst_QHttpNetworkConnection::put()
     connect(reply, SIGNAL(finished()), SLOT(finishedReply()));
     connect(reply, SIGNAL(finishedWithError(QNetworkReply::NetworkError, const QString &)),
         SLOT(finishedWithError(QNetworkReply::NetworkError, const QString &)));
-    connect(&connection, SIGNAL(error(QNetworkReply::NetworkError, const QString &)),
-        SLOT(finishedWithError(QNetworkReply::NetworkError, const QString &)));
 
     QTime stopWatch;
     stopWatch.start();
-- 
cgit v0.12


From f964de82d506a379b9d80b18025491aa3521a2c9 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Wed, 27 Oct 2010 17:14:03 +0200
Subject: QNAM: fix build

* winsock2.h conflicts with qplatformdefs.h
* ifndef QT_NO_OPENSSL was missing

Reviewed-by: Prasanth
Reviewed-by: Markus Goetz
---
 src/network/access/qhttpnetworkconnection.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 92f8af7..c335cd4 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
+#include <private/qabstractsocket_p.h>
 #include "qhttpnetworkconnection_p.h"
 #include "qhttpnetworkconnectionchannel_p.h"
 #include "private/qnoncontiguousbytedevice_p.h"
 #include <private/qnetworkrequest_p.h>
 #include <private/qobject_p.h>
 #include <private/qauthenticator_p.h>
-#include <private/qabstractsocket_p.h>
 #include <qnetworkproxy.h>
 #include <qauthenticator.h>
 
@@ -129,9 +129,11 @@ void QHttpNetworkConnectionPrivate::pauseConnection()
 
     // Disable all socket notifiers
     for (int i = 0; i < channelCount; i++) {
+#ifndef QT_NO_OPENSSL
         if (encrypt)
             QSslSocketPrivate::pauseSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket));
         else
+#endif
             QAbstractSocketPrivate::pauseSocketNotifiers(channels[i].socket);
     }
 }
@@ -141,9 +143,11 @@ void QHttpNetworkConnectionPrivate::resumeConnection()
     state = RunningState;
     // Enable all socket notifiers
     for (int i = 0; i < channelCount; i++) {
+#ifndef QT_NO_OPENSSL
         if (encrypt)
             QSslSocketPrivate::resumeSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket));
         else
+#endif
             QAbstractSocketPrivate::resumeSocketNotifiers(channels[i].socket);
 
         // Resume pending upload if needed
-- 
cgit v0.12


From a4fa6efc81d65039c556c1c0147f8c9300b43c4e Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Wed, 27 Oct 2010 14:40:37 +1000
Subject: Export private QtDeclarative classes needed by Qt3d on Symbian

Task-number: QTBUG-14789
Reviewed-by: Rhys Weatherley

*  QDeclarativeState
*  QDeclarativeStateGroup
*  QDeclarativeStateOperation
*  QDeclarativeTransition
---
 src/declarative/util/qdeclarativestate_p.h      |   4 +-
 src/declarative/util/qdeclarativestategroup_p.h |   2 +-
 src/declarative/util/qdeclarativetransition_p.h |   2 +-
 src/s60installs/bwins/QtDeclarativeu.def        | 222 ++++++++++++------------
 src/s60installs/eabi/QtDeclarativeu.def         | 206 +++++++++++-----------
 5 files changed, 218 insertions(+), 218 deletions(-)

diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index d01af4e..fc7c940 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -114,7 +114,7 @@ public:
 class QDeclarativeStateGroup;
 class QDeclarativeState;
 class QDeclarativeStateOperationPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeStateOperation : public QObject
+class Q_DECLARATIVE_EXPORT QDeclarativeStateOperation : public QObject
 {
     Q_OBJECT
 public:
@@ -139,7 +139,7 @@ typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions;
 
 class QDeclarativeTransition;
 class QDeclarativeStatePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeState : public QObject
+class Q_DECLARATIVE_EXPORT QDeclarativeState : public QObject
 {
     Q_OBJECT
 
diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h
index 0222cf2..cac23f4 100644
--- a/src/declarative/util/qdeclarativestategroup_p.h
+++ b/src/declarative/util/qdeclarativestategroup_p.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeStateGroupPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus
+class Q_DECLARATIVE_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeParserStatus)
diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h
index 5b20cb2..fc7a577 100644
--- a/src/declarative/util/qdeclarativetransition_p.h
+++ b/src/declarative/util/qdeclarativetransition_p.h
@@ -57,7 +57,7 @@ QT_MODULE(Declarative)
 class QDeclarativeAbstractAnimation;
 class QDeclarativeTransitionPrivate;
 class QDeclarativeTransitionManager;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeTransition : public QObject
+class Q_DECLARATIVE_EXPORT QDeclarativeTransition : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeTransition)
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index 6e27577..db4012c 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -26,7 +26,7 @@ EXPORTS
 	?setReadable@QMetaPropertyBuilder@@QAEX_N@Z @ 25 NONAME ABSENT ; void QMetaPropertyBuilder::setReadable(bool)
 	?d_func@QDeclarativeExpression@@AAEPAVQDeclarativeExpressionPrivate@@XZ @ 26 NONAME ; class QDeclarativeExpressionPrivate * QDeclarativeExpression::d_func(void)
 	??1QDeclarativeDomValueValueSource@@QAE@XZ @ 27 NONAME ABSENT ; QDeclarativeDomValueValueSource::~QDeclarativeDomValueValueSource(void)
-	??_EQDeclarativeStateGroup@@UAE@I@Z @ 28 NONAME ABSENT ; QDeclarativeStateGroup::~QDeclarativeStateGroup(unsigned int)
+	??_EQDeclarativeStateGroup@@UAE@I@Z @ 28 NONAME ; QDeclarativeStateGroup::~QDeclarativeStateGroup(unsigned int)
 	?property@QDeclarativeDomObject@@QBE?AVQDeclarativeDomProperty@@ABVQByteArray@@@Z @ 29 NONAME ABSENT ; class QDeclarativeDomProperty QDeclarativeDomObject::property(class QByteArray const &) const
 	?tr@QDeclarativeAnchors@@SA?AVQString@@PBD0H@Z @ 30 NONAME ABSENT ; class QString QDeclarativeAnchors::tr(char const *, char const *, int)
 	?location@QDeclarativeCustomParserNode@@QBE?AULocation@QDeclarativeParser@@XZ @ 31 NONAME ; struct QDeclarativeParser::Location QDeclarativeCustomParserNode::location(void) const
@@ -39,7 +39,7 @@ EXPORTS
 	??0QDeclarativeEngine@@QAE@PAVQObject@@@Z @ 38 NONAME ; QDeclarativeEngine::QDeclarativeEngine(class QObject *)
 	??0QDeclarativeDebugObjectReference@@QAE@ABV0@@Z @ 39 NONAME ABSENT ; QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(class QDeclarativeDebugObjectReference const &)
 	?set@QDeclarativeListModel@@QAEXHABVQScriptValue@@@Z @ 40 NONAME ABSENT ; void QDeclarativeListModel::set(int, class QScriptValue const &)
-	?tr@QDeclarativeState@@SA?AVQString@@PBD0H@Z @ 41 NONAME ABSENT ; class QString QDeclarativeState::tr(char const *, char const *, int)
+	?tr@QDeclarativeState@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString QDeclarativeState::tr(char const *, char const *, int)
 	?metaObject@QDeclarativeBinding@@UBEPBUQMetaObject@@XZ @ 42 NONAME ABSENT ; struct QMetaObject const * QDeclarativeBinding::metaObject(void) const
 	?setUser@QMetaPropertyBuilder@@QAEX_N@Z @ 43 NONAME ABSENT ; void QMetaPropertyBuilder::setUser(bool)
 	?tr@QDeclarativeDebugRootContextQuery@@SA?AVQString@@PBD0@Z @ 44 NONAME ABSENT ; class QString QDeclarativeDebugRootContextQuery::tr(char const *, char const *)
@@ -50,7 +50,7 @@ EXPORTS
 	??1QDeclarativeText@@UAE@XZ @ 49 NONAME ABSENT ; QDeclarativeText::~QDeclarativeText(void)
 	?getStaticMetaObject@QDeclarativeText@@SAABUQMetaObject@@XZ @ 50 NONAME ABSENT ; struct QMetaObject const & QDeclarativeText::getStaticMetaObject(void)
 	?isDesignable@QMetaPropertyBuilder@@QBE_NXZ @ 51 NONAME ABSENT ; bool QMetaPropertyBuilder::isDesignable(void) const
-	?tr@QDeclarativeStateGroup@@SA?AVQString@@PBD0H@Z @ 52 NONAME ABSENT ; class QString QDeclarativeStateGroup::tr(char const *, char const *, int)
+	?tr@QDeclarativeStateGroup@@SA?AVQString@@PBD0H@Z @ 52 NONAME ; class QString QDeclarativeStateGroup::tr(char const *, char const *, int)
 	?errors@QDeclarativeView@@QBE?AV?$QList@VQDeclarativeError@@@@XZ @ 53 NONAME ; class QList<class QDeclarativeError> QDeclarativeView::errors(void) const
 	??0QPacket@@QAE@ABV0@@Z @ 54 NONAME ABSENT ; QPacket::QPacket(class QPacket const &)
 	??1QDeclarativeDebugObjectExpressionWatch@@UAE@XZ @ 55 NONAME ABSENT ; QDeclarativeDebugObjectExpressionWatch::~QDeclarativeDebugObjectExpressionWatch(void)
@@ -59,7 +59,7 @@ EXPORTS
 	??_EQDeclarativeDebugObjectQuery@@UAE@I@Z @ 58 NONAME ABSENT ; QDeclarativeDebugObjectQuery::~QDeclarativeDebugObjectQuery(unsigned int)
 	??0QDeclarativeDomObject@@QAE@XZ @ 59 NONAME ABSENT ; QDeclarativeDomObject::QDeclarativeDomObject(void)
 	?errors@QDeclarativeDomDocument@@QBE?AV?$QList@VQDeclarativeError@@@@XZ @ 60 NONAME ABSENT ; class QList<class QDeclarativeError> QDeclarativeDomDocument::errors(void) const
-	?toChanged@QDeclarativeTransition@@IAEXXZ @ 61 NONAME ABSENT ; void QDeclarativeTransition::toChanged(void)
+	?toChanged@QDeclarativeTransition@@IAEXXZ @ 61 NONAME ; void QDeclarativeTransition::toChanged(void)
 	?objectOwnership@QDeclarativeEngine@@SA?AW4ObjectOwnership@1@PAVQObject@@@Z @ 62 NONAME ; enum QDeclarativeEngine::ObjectOwnership QDeclarativeEngine::objectOwnership(class QObject *)
 	??0QDeclarativeDebugWatch@@QAE@PAVQObject@@@Z @ 63 NONAME ABSENT ; QDeclarativeDebugWatch::QDeclarativeDebugWatch(class QObject *)
 	?value@QDeclarativePropertyMap@@QBE?AVQVariant@@ABVQString@@@Z @ 64 NONAME ; class QVariant QDeclarativePropertyMap::value(class QString const &) const
@@ -71,9 +71,9 @@ EXPORTS
 	??1QDeclarativeDebugClient@@UAE@XZ @ 70 NONAME ABSENT ; QDeclarativeDebugClient::~QDeclarativeDebugClient(void)
 	?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0@Z @ 71 NONAME ABSENT ; class QString QPacketProtocol::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeListModel@@SA?AVQString@@PBD0@Z @ 72 NONAME ABSENT ; class QString QDeclarativeListModel::trUtf8(char const *, char const *)
-	?qt_metacast@QDeclarativeState@@UAEPAXPBD@Z @ 73 NONAME ABSENT ; void * QDeclarativeState::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeState@@UAEPAXPBD@Z @ 73 NONAME ; void * QDeclarativeState::qt_metacast(char const *)
 	??1QDeclarativeDebugContextReference@@QAE@XZ @ 74 NONAME ABSENT ; QDeclarativeDebugContextReference::~QDeclarativeDebugContextReference(void)
-	?getStaticMetaObject@QDeclarativeStateOperation@@SAABUQMetaObject@@XZ @ 75 NONAME ABSENT ; struct QMetaObject const & QDeclarativeStateOperation::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeStateOperation@@SAABUQMetaObject@@XZ @ 75 NONAME ; struct QMetaObject const & QDeclarativeStateOperation::getStaticMetaObject(void)
 	?isInvalid@QDeclarativeDomValue@@QBE_NXZ @ 76 NONAME ABSENT ; bool QDeclarativeDomValue::isInvalid(void) const
 	?trUtf8@QDeclarativeText@@SA?AVQString@@PBD0H@Z @ 77 NONAME ABSENT ; class QString QDeclarativeText::trUtf8(char const *, char const *, int)
 	??0QDeclarativeListReference@@QAE@ABV0@@Z @ 78 NONAME ; QDeclarativeListReference::QDeclarativeListReference(class QDeclarativeListReference const &)
@@ -84,7 +84,7 @@ EXPORTS
 	?imageType@QDeclarativeImageProvider@@QBE?AW4ImageType@1@XZ @ 83 NONAME ; enum QDeclarativeImageProvider::ImageType QDeclarativeImageProvider::imageType(void) const
 	??_EQDeclarativeDebugObjectReference@@QAE@I@Z @ 84 NONAME ABSENT ; QDeclarativeDebugObjectReference::~QDeclarativeDebugObjectReference(unsigned int)
 	?qt_metacall@QDeclarativeDebugQuery@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 85 NONAME ABSENT ; int QDeclarativeDebugQuery::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?findState@QDeclarativeStateGroup@@QBEPAVQDeclarativeState@@ABVQString@@@Z @ 86 NONAME ABSENT ; class QDeclarativeState * QDeclarativeStateGroup::findState(class QString const &) const
+	?findState@QDeclarativeStateGroup@@QBEPAVQDeclarativeState@@ABVQString@@@Z @ 86 NONAME ; class QDeclarativeState * QDeclarativeStateGroup::findState(class QString const &) const
 	?asScript@Variant@QDeclarativeParser@@QBE?AVQString@@XZ @ 87 NONAME ; class QString QDeclarativeParser::Variant::asScript(void) const
 	?qt_metacast@QDeclarativeExtensionPlugin@@UAEPAXPBD@Z @ 88 NONAME ; void * QDeclarativeExtensionPlugin::qt_metacast(char const *)
 	?objectId@QDeclarativeDomObject@@QBE?AVQString@@XZ @ 89 NONAME ABSENT ; class QString QDeclarativeDomObject::objectId(void) const
@@ -130,7 +130,7 @@ EXPORTS
 	?top@QDeclarativeScaleGrid@@QBEHXZ @ 129 NONAME ABSENT ; int QDeclarativeScaleGrid::top(void) const
 	?setExpression@QDeclarativeExpression@@QAEXABVQString@@@Z @ 130 NONAME ; void QDeclarativeExpression::setExpression(class QString const &)
 	??1QDeclarativeDebugEngineReference@@QAE@XZ @ 131 NONAME ABSENT ; QDeclarativeDebugEngineReference::~QDeclarativeDebugEngineReference(void)
-	??0QDeclarativeStateOperation@@QAE@PAVQObject@@@Z @ 132 NONAME ABSENT ; QDeclarativeStateOperation::QDeclarativeStateOperation(class QObject *)
+	??0QDeclarativeStateOperation@@QAE@PAVQObject@@@Z @ 132 NONAME ; QDeclarativeStateOperation::QDeclarativeStateOperation(class QObject *)
 	?transform_clear@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsTransform@@@@@Z @ 133 NONAME ; void QDeclarativeItemPrivate::transform_clear(class QDeclarativeListProperty<class QGraphicsTransform> *)
 	?staticMetaObject@QDeclarativeValueType@@2UQMetaObject@@B @ 134 NONAME ABSENT ; struct QMetaObject const QDeclarativeValueType::staticMetaObject
 	?propertyName@QDeclarativeDomDynamicProperty@@QBE?AVQByteArray@@XZ @ 135 NONAME ABSENT ; class QByteArray QDeclarativeDomDynamicProperty::propertyName(void) const
@@ -165,7 +165,7 @@ EXPORTS
 	?subFocusItemChange@QDeclarativeItemPrivate@@UAEXXZ @ 164 NONAME ; void QDeclarativeItemPrivate::subFocusItemChange(void)
 	?hasNotifySignal@QDeclarativeDebugPropertyReference@@QBE_NXZ @ 165 NONAME ABSENT ; bool QDeclarativeDebugPropertyReference::hasNotifySignal(void) const
 	?addSlot@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQByteArray@@@Z @ 166 NONAME ABSENT ; class QMetaMethodBuilder QMetaObjectBuilder::addSlot(class QByteArray const &)
-	?trUtf8@QDeclarativeStateOperation@@SA?AVQString@@PBD0@Z @ 167 NONAME ABSENT ; class QString QDeclarativeStateOperation::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeStateOperation@@SA?AVQString@@PBD0@Z @ 167 NONAME ; class QString QDeclarativeStateOperation::trUtf8(char const *, char const *)
 	?propertyCreated@QDeclarativeOpenMetaObjectType@@MAEXHAAVQMetaPropertyBuilder@@@Z @ 168 NONAME ABSENT ; void QDeclarativeOpenMetaObjectType::propertyCreated(int, class QMetaPropertyBuilder &)
 	??1QDeclarativeItemPrivate@@UAE@XZ @ 169 NONAME ; QDeclarativeItemPrivate::~QDeclarativeItemPrivate(void)
 	?clear@QDeclarativePropertyMap@@QAEXABVQString@@@Z @ 170 NONAME ; void QDeclarativePropertyMap::clear(class QString const &)
@@ -173,7 +173,7 @@ EXPORTS
 	?read@QDeclarativeProperty@@SA?AVQVariant@@PAVQObject@@ABVQString@@PAVQDeclarativeEngine@@@Z @ 172 NONAME ; class QVariant QDeclarativeProperty::read(class QObject *, class QString const &, class QDeclarativeEngine *)
 	?insert@QDeclarativePropertyMap@@QAEXABVQString@@ABVQVariant@@@Z @ 173 NONAME ; void QDeclarativePropertyMap::insert(class QString const &, class QVariant const &)
 	??1QDeclarativeContext@@UAE@XZ @ 174 NONAME ; QDeclarativeContext::~QDeclarativeContext(void)
-	?operationCount@QDeclarativeState@@QBEHXZ @ 175 NONAME ABSENT ; int QDeclarativeState::operationCount(void) const
+	?operationCount@QDeclarativeState@@QBEHXZ @ 175 NONAME ; int QDeclarativeState::operationCount(void) const
 	?getStaticMetaObject@QDeclarativeItem@@SAABUQMetaObject@@XZ @ 176 NONAME ; struct QMetaObject const & QDeclarativeItem::getStaticMetaObject(void)
 	?qtAnimationStateChanged@QDeclarativeBehavior@@AAEXW4State@QAbstractAnimation@@0@Z @ 177 NONAME ABSENT ; void QDeclarativeBehavior::qtAnimationStateChanged(enum QAbstractAnimation::State, enum QAbstractAnimation::State)
 	?trUtf8@QDeclarativeBehavior@@SA?AVQString@@PBD0H@Z @ 178 NONAME ABSENT ; class QString QDeclarativeBehavior::trUtf8(char const *, char const *, int)
@@ -188,7 +188,7 @@ EXPORTS
 	?metaObject@QDeclarativeDebugObjectExpressionWatch@@UBEPBUQMetaObject@@XZ @ 187 NONAME ABSENT ; struct QMetaObject const * QDeclarativeDebugObjectExpressionWatch::metaObject(void) const
 	??0QDeclarativeComponent@@QAE@PAVQObject@@@Z @ 188 NONAME ; QDeclarativeComponent::QDeclarativeComponent(class QObject *)
 	?qt_metacast@QDeclarativeItem@@UAEPAXPBD@Z @ 189 NONAME ; void * QDeclarativeItem::qt_metacast(char const *)
-	?changes@QDeclarativeState@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeStateOperation@@@@XZ @ 190 NONAME ABSENT ; class QDeclarativeListProperty<class QDeclarativeStateOperation> QDeclarativeState::changes(void)
+	?changes@QDeclarativeState@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeStateOperation@@@@XZ @ 190 NONAME ; class QDeclarativeListProperty<class QDeclarativeStateOperation> QDeclarativeState::changes(void)
 	?resizeEvent@QDeclarativeView@@MAEXPAVQResizeEvent@@@Z @ 191 NONAME ; void QDeclarativeView::resizeEvent(class QResizeEvent *)
 	?d_func@QDeclarativeBinding@@ABEPBVQDeclarativeBindingPrivate@@XZ @ 192 NONAME ABSENT ; class QDeclarativeBindingPrivate const * QDeclarativeBinding::d_func(void) const
 	?wrapMode@QDeclarativeText@@QBE?AW4WrapMode@1@XZ @ 193 NONAME ABSENT ; enum QDeclarativeText::WrapMode QDeclarativeText::wrapMode(void) const
@@ -216,7 +216,7 @@ EXPORTS
 	?parentChanged@QDeclarativeItem@@IAEXPAV1@@Z @ 215 NONAME ; void QDeclarativeItem::parentChanged(class QDeclarativeItem *)
 	?columnNumber@QDeclarativeDebugFileReference@@QBEHXZ @ 216 NONAME ABSENT ; int QDeclarativeDebugFileReference::columnNumber(void) const
 	??0QDeclarativeListModel@@AAE@_NPAVQObject@@@Z @ 217 NONAME ABSENT ; QDeclarativeListModel::QDeclarativeListModel(bool, class QObject *)
-	?apply@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@PAVQDeclarativeTransition@@PAV1@@Z @ 218 NONAME ABSENT ; void QDeclarativeState::apply(class QDeclarativeStateGroup *, class QDeclarativeTransition *, class QDeclarativeState *)
+	?apply@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@PAVQDeclarativeTransition@@PAV1@@Z @ 218 NONAME ; void QDeclarativeState::apply(class QDeclarativeStateGroup *, class QDeclarativeTransition *, class QDeclarativeState *)
 	?isValid@QDeclarativeDomProperty@@QBE_NXZ @ 219 NONAME ABSENT ; bool QDeclarativeDomProperty::isValid(void) const
 	?trUtf8@QDeclarativeDebugExpressionQuery@@SA?AVQString@@PBD0@Z @ 220 NONAME ABSENT ; class QString QDeclarativeDebugExpressionQuery::trUtf8(char const *, char const *)
 	?statusChanged@QDeclarativeView@@IAEXW4Status@1@@Z @ 221 NONAME ; void QDeclarativeView::statusChanged(enum QDeclarativeView::Status)
@@ -241,7 +241,7 @@ EXPORTS
 	??1QDeclarativeScaleGrid@@UAE@XZ @ 240 NONAME ABSENT ; QDeclarativeScaleGrid::~QDeclarativeScaleGrid(void)
 	?idString@QDeclarativeDebugObjectReference@@QBE?AVQString@@XZ @ 241 NONAME ABSENT ; class QString QDeclarativeDebugObjectReference::idString(void) const
 	?customTypeData@QDeclarativeDomObject@@QBE?AVQByteArray@@XZ @ 242 NONAME ABSENT ; class QByteArray QDeclarativeDomObject::customTypeData(void) const
-	?stop@QDeclarativeTransition@@QAEXXZ @ 243 NONAME ABSENT ; void QDeclarativeTransition::stop(void)
+	?stop@QDeclarativeTransition@@QAEXXZ @ 243 NONAME ; void QDeclarativeTransition::stop(void)
 	?data@QDeclarativeListModel@@UBE?AV?$QHash@HVQVariant@@@@HABV?$QList@H@@@Z @ 244 NONAME ABSENT ; class QHash<int, class QVariant> QDeclarativeListModel::data(int, class QList<int> const &) const
 	?verticalCenterOffset@QDeclarativeAnchors@@QBEMXZ @ 245 NONAME ABSENT ; float QDeclarativeAnchors::verticalCenterOffset(void) const
 	?metaObject@QDeclarativeText@@UBEPBUQMetaObject@@XZ @ 246 NONAME ABSENT ; struct QMetaObject const * QDeclarativeText::metaObject(void) const
@@ -288,19 +288,19 @@ EXPORTS
 	?queryId@QDeclarativeDebugWatch@@QBEHXZ @ 287 NONAME ABSENT ; int QDeclarativeDebugWatch::queryId(void) const
 	?trUtf8@QDeclarativeExtensionPlugin@@SA?AVQString@@PBD0H@Z @ 288 NONAME ; class QString QDeclarativeExtensionPlugin::trUtf8(char const *, char const *, int)
 	?staticMetaObject@QDeclarativeComponent@@2UQMetaObject@@B @ 289 NONAME ; struct QMetaObject const QDeclarativeComponent::staticMetaObject
-	?setStateGroup@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@@Z @ 290 NONAME ABSENT ; void QDeclarativeState::setStateGroup(class QDeclarativeStateGroup *)
+	?setStateGroup@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@@Z @ 290 NONAME ; void QDeclarativeState::setStateGroup(class QDeclarativeStateGroup *)
 	?access@QMetaMethodBuilder@@QBE?AW4Access@QMetaMethod@@XZ @ 291 NONAME ABSENT ; enum QMetaMethod::Access QMetaMethodBuilder::access(void) const
 	?tr@QDeclarativeDebugQuery@@SA?AVQString@@PBD0@Z @ 292 NONAME ABSENT ; class QString QDeclarativeDebugQuery::tr(char const *, char const *)
 	?attachedPropertiesType@QDeclarativeType@@QBEPBUQMetaObject@@XZ @ 293 NONAME ABSENT ; struct QMetaObject const * QDeclarativeType::attachedPropertiesType(void) const
-	?setName@QDeclarativeState@@QAEXABVQString@@@Z @ 294 NONAME ABSENT ; void QDeclarativeState::setName(class QString const &)
-	?setReversed@QDeclarativeTransition@@QAEX_N@Z @ 295 NONAME ABSENT ; void QDeclarativeTransition::setReversed(bool)
+	?setName@QDeclarativeState@@QAEXABVQString@@@Z @ 294 NONAME ; void QDeclarativeState::setName(class QString const &)
+	?setReversed@QDeclarativeTransition@@QAEX_N@Z @ 295 NONAME ; void QDeclarativeTransition::setReversed(bool)
 	?idForObject@QDeclarativeDebugService@@SAHPAVQObject@@@Z @ 296 NONAME ABSENT ; int QDeclarativeDebugService::idForObject(class QObject *)
 	?qt_metacall@QDeclarativeDebugWatch@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 297 NONAME ABSENT ; int QDeclarativeDebugWatch::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?fromState@QDeclarativeTransition@@QBE?AVQString@@XZ @ 298 NONAME ABSENT ; class QString QDeclarativeTransition::fromState(void) const
+	?fromState@QDeclarativeTransition@@QBE?AVQString@@XZ @ 298 NONAME ; class QString QDeclarativeTransition::fromState(void) const
 	??1QDeclarativeExpression@@UAE@XZ @ 299 NONAME ; QDeclarativeExpression::~QDeclarativeExpression(void)
 	?binding@QDeclarativePropertyPrivate@@SAPAVQDeclarativeAbstractBinding@@ABVQDeclarativeProperty@@@Z @ 300 NONAME ABSENT ; class QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::binding(class QDeclarativeProperty const &)
 	?removeMethod@QMetaObjectBuilder@@QAEXH@Z @ 301 NONAME ABSENT ; void QMetaObjectBuilder::removeMethod(int)
-	?operationAt@QDeclarativeState@@QBEPAVQDeclarativeStateOperation@@H@Z @ 302 NONAME ABSENT ; class QDeclarativeStateOperation * QDeclarativeState::operationAt(int) const
+	?operationAt@QDeclarativeState@@QBEPAVQDeclarativeStateOperation@@H@Z @ 302 NONAME ; class QDeclarativeStateOperation * QDeclarativeState::operationAt(int) const
 	?methodCount@QMetaObjectBuilder@@QBEHXZ @ 303 NONAME ABSENT ; int QMetaObjectBuilder::methodCount(void) const
 	?font@QDeclarativeText@@QBE?AVQFont@@XZ @ 304 NONAME ABSENT ; class QFont QDeclarativeText::font(void) const
 	?completeCreate@QDeclarativeComponent@@UAEXXZ @ 305 NONAME ; void QDeclarativeComponent::completeCreate(void)
@@ -320,7 +320,7 @@ EXPORTS
 	?tr@QDeclarativeValueType@@SA?AVQString@@PBD0H@Z @ 319 NONAME ABSENT ; class QString QDeclarativeValueType::tr(char const *, char const *, int)
 	?parent@QDeclarativeOpenMetaObject@@IBEPAUQAbstractDynamicMetaObject@@XZ @ 320 NONAME ABSENT ; struct QAbstractDynamicMetaObject * QDeclarativeOpenMetaObject::parent(void) const
 	??0QDeclarativeDebugClient@@QAE@ABVQString@@PAVQDeclarativeDebugConnection@@@Z @ 321 NONAME ABSENT ; QDeclarativeDebugClient::QDeclarativeDebugClient(class QString const &, class QDeclarativeDebugConnection *)
-	?qt_metacall@QDeclarativeStateOperation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 322 NONAME ABSENT ; int QDeclarativeStateOperation::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeStateOperation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 322 NONAME ; int QDeclarativeStateOperation::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?type@Variant@QDeclarativeParser@@QBE?AW4Type@12@XZ @ 323 NONAME ; enum QDeclarativeParser::Variant::Type QDeclarativeParser::Variant::type(void) const
 	??6QDeclarativeInfo@@QAEAAV0@_N@Z @ 324 NONAME ; class QDeclarativeInfo & QDeclarativeInfo::operator<<(bool)
 	?value@QDeclarativeDomProperty@@QBE?AVQDeclarativeDomValue@@XZ @ 325 NONAME ABSENT ; class QDeclarativeDomValue QDeclarativeDomProperty::value(void) const
@@ -357,8 +357,8 @@ EXPORTS
 	??1QDeclarativePropertyPrivate@@QAE@XZ @ 356 NONAME ABSENT ; QDeclarativePropertyPrivate::~QDeclarativePropertyPrivate(void)
 	?setBaselineOffset@QDeclarativeItem@@QAEXM@Z @ 357 NONAME ; void QDeclarativeItem::setBaselineOffset(float)
 	??0QDeclarativeDebugPropertyReference@@QAE@XZ @ 358 NONAME ABSENT ; QDeclarativeDebugPropertyReference::QDeclarativeDebugPropertyReference(void)
-	?tr@QDeclarativeStateOperation@@SA?AVQString@@PBD0H@Z @ 359 NONAME ABSENT ; class QString QDeclarativeStateOperation::tr(char const *, char const *, int)
-	?setState@QDeclarativeStateGroup@@QAEXABVQString@@@Z @ 360 NONAME ABSENT ; void QDeclarativeStateGroup::setState(class QString const &)
+	?tr@QDeclarativeStateOperation@@SA?AVQString@@PBD0H@Z @ 359 NONAME ; class QString QDeclarativeStateOperation::tr(char const *, char const *, int)
+	?setState@QDeclarativeStateGroup@@QAEXABVQString@@@Z @ 360 NONAME ; void QDeclarativeStateGroup::setState(class QString const &)
 	??_EQDeclarativeImageProvider@@UAE@I@Z @ 361 NONAME ; QDeclarativeImageProvider::~QDeclarativeImageProvider(unsigned int)
 	?trUtf8@QDeclarativeComponent@@SA?AVQString@@PBD0@Z @ 362 NONAME ; class QString QDeclarativeComponent::trUtf8(char const *, char const *)
 	?isLoading@QDeclarativeComponent@@QBE_NXZ @ 363 NONAME ; bool QDeclarativeComponent::isLoading(void) const
@@ -413,11 +413,11 @@ EXPORTS
 	??0QDeclarativeComponent@@AAE@PAVQDeclarativeEngine@@PAVQDeclarativeCompiledData@@HHPAVQObject@@@Z @ 412 NONAME ; QDeclarativeComponent::QDeclarativeComponent(class QDeclarativeEngine *, class QDeclarativeCompiledData *, int, int, class QObject *)
 	?resources_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 413 NONAME ; int QDeclarativeItemPrivate::resources_count(class QDeclarativeListProperty<class QObject> *)
 	?timerEvent@QDeclarativeView@@MAEXPAVQTimerEvent@@@Z @ 414 NONAME ; void QDeclarativeView::timerEvent(class QTimerEvent *)
-	?setToState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 415 NONAME ABSENT ; void QDeclarativeTransition::setToState(class QString const &)
+	?setToState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 415 NONAME ; void QDeclarativeTransition::setToState(class QString const &)
 	?requestPixmap@QDeclarativeImageProvider@@UAE?AVQPixmap@@ABVQString@@PAVQSize@@ABV4@@Z @ 416 NONAME ; class QPixmap QDeclarativeImageProvider::requestPixmap(class QString const &, class QSize *, class QSize const &)
 	?methodType@QMetaMethodBuilder@@QBE?AW4MethodType@QMetaMethod@@XZ @ 417 NONAME ABSENT ; enum QMetaMethod::MethodType QMetaMethodBuilder::methodType(void) const
 	?getStaticMetaObject@QDeclarativeView@@SAABUQMetaObject@@XZ @ 418 NONAME ; struct QMetaObject const & QDeclarativeView::getStaticMetaObject(void)
-	?metaObject@QDeclarativeStateOperation@@UBEPBUQMetaObject@@XZ @ 419 NONAME ABSENT ; struct QMetaObject const * QDeclarativeStateOperation::metaObject(void) const
+	?metaObject@QDeclarativeStateOperation@@UBEPBUQMetaObject@@XZ @ 419 NONAME ; struct QMetaObject const * QDeclarativeStateOperation::metaObject(void) const
 	?keyReleasePreHandler@QDeclarativeItem@@IAEXPAVQKeyEvent@@@Z @ 420 NONAME ; void QDeclarativeItem::keyReleasePreHandler(class QKeyEvent *)
 	?append@QDeclarativeListModel@@QAEXABVQScriptValue@@@Z @ 421 NONAME ABSENT ; void QDeclarativeListModel::append(class QScriptValue const &)
 	??1QDeclarativeDebugObjectReference@@QAE@XZ @ 422 NONAME ABSENT ; QDeclarativeDebugObjectReference::~QDeclarativeDebugObjectReference(void)
@@ -437,10 +437,10 @@ EXPORTS
 	?tr@QDeclarativeDebugExpressionQuery@@SA?AVQString@@PBD0@Z @ 436 NONAME ABSENT ; class QString QDeclarativeDebugExpressionQuery::tr(char const *, char const *)
 	?styleColorChanged@QDeclarativeText@@IAEXABVQColor@@@Z @ 437 NONAME ABSENT ; void QDeclarativeText::styleColorChanged(class QColor const &)
 	?getStaticMetaObject@QDeclarativeDebugExpressionQuery@@SAABUQMetaObject@@XZ @ 438 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugExpressionQuery::getStaticMetaObject(void)
-	?trUtf8@QDeclarativeTransition@@SA?AVQString@@PBD0H@Z @ 439 NONAME ABSENT ; class QString QDeclarativeTransition::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeTransition@@SA?AVQString@@PBD0H@Z @ 439 NONAME ; class QString QDeclarativeTransition::trUtf8(char const *, char const *, int)
 	?writeValueProperty@QDeclarativePropertyPrivate@@QAE_NABVQVariant@@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 440 NONAME ABSENT ; bool QDeclarativePropertyPrivate::writeValueProperty(class QVariant const &, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?errors@QDeclarativeCustomParser@@QBE?AV?$QList@VQDeclarativeError@@@@XZ @ 441 NONAME ; class QList<class QDeclarativeError> QDeclarativeCustomParser::errors(void) const
-	?statesProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 442 NONAME ABSENT ; class QDeclarativeListProperty<class QDeclarativeState> QDeclarativeStateGroup::statesProperty(void)
+	?statesProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 442 NONAME ; class QDeclarativeListProperty<class QDeclarativeState> QDeclarativeStateGroup::statesProperty(void)
 	?roles@QDeclarativeListModel@@UBE?AV?$QList@H@@XZ @ 443 NONAME ABSENT ; class QList<int> QDeclarativeListModel::roles(void) const
 	?name@QMetaEnumBuilder@@QBE?AVQByteArray@@XZ @ 444 NONAME ABSENT ; class QByteArray QMetaEnumBuilder::name(void) const
 	??_EQDeclarativeDebugRootContextQuery@@UAE@I@Z @ 445 NONAME ABSENT ; QDeclarativeDebugRootContextQuery::~QDeclarativeDebugRootContextQuery(unsigned int)
@@ -456,11 +456,11 @@ EXPORTS
 	?interfaceIId@QDeclarativeMetaType@@SAPBDH@Z @ 455 NONAME ABSENT ; char const * QDeclarativeMetaType::interfaceIId(int)
 	?isValid@QDeclarativeDomDynamicProperty@@QBE_NXZ @ 456 NONAME ABSENT ; bool QDeclarativeDomDynamicProperty::isValid(void) const
 	?baselineChanged@QDeclarativeAnchors@@IAEXXZ @ 457 NONAME ABSENT ; void QDeclarativeAnchors::baselineChanged(void)
-	?name@QDeclarativeState@@QBE?AVQString@@XZ @ 458 NONAME ABSENT ; class QString QDeclarativeState::name(void) const
+	?name@QDeclarativeState@@QBE?AVQString@@XZ @ 458 NONAME ; class QString QDeclarativeState::name(void) const
 	??4QDeclarativeDomObject@@QAEAAV0@ABV0@@Z @ 459 NONAME ABSENT ; class QDeclarativeDomObject & QDeclarativeDomObject::operator=(class QDeclarativeDomObject const &)
 	?qt_metacall@QDeclarativeContext@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 460 NONAME ; int QDeclarativeContext::qt_metacall(enum QMetaObject::Call, int, void * *)
 	??_EQDeclarativeValueType@@UAE@I@Z @ 461 NONAME ABSENT ; QDeclarativeValueType::~QDeclarativeValueType(unsigned int)
-	?qt_metacall@QDeclarativeState@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 462 NONAME ABSENT ; int QDeclarativeState::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeState@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 462 NONAME ; int QDeclarativeState::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?isEnabled@QDeclarativeDebugService@@QBE_NXZ @ 463 NONAME ABSENT ; bool QDeclarativeDebugService::isEnabled(void) const
 	?stateChanged@QDeclarativeDebugWatch@@IAEXW4State@1@@Z @ 464 NONAME ABSENT ; void QDeclarativeDebugWatch::stateChanged(enum QDeclarativeDebugWatch::State)
 	??0QMetaMethodBuilder@@AAE@PBVQMetaObjectBuilder@@H@Z @ 465 NONAME ABSENT ; QMetaMethodBuilder::QMetaMethodBuilder(class QMetaObjectBuilder const *, int)
@@ -504,7 +504,7 @@ EXPORTS
 	??4QDeclarativeDomComponent@@QAEAAV0@ABV0@@Z @ 503 NONAME ABSENT ; class QDeclarativeDomComponent & QDeclarativeDomComponent::operator=(class QDeclarativeDomComponent const &)
 	?tr@QPacketProtocol@@SA?AVQString@@PBD0@Z @ 504 NONAME ABSENT ; class QString QPacketProtocol::tr(char const *, char const *)
 	?setFont@QDeclarativeText@@QAEXABVQFont@@@Z @ 505 NONAME ABSENT ; void QDeclarativeText::setFont(class QFont const &)
-	?fromChanged@QDeclarativeTransition@@IAEXXZ @ 506 NONAME ABSENT ; void QDeclarativeTransition::fromChanged(void)
+	?fromChanged@QDeclarativeTransition@@IAEXXZ @ 506 NONAME ; void QDeclarativeTransition::fromChanged(void)
 	?addMethod@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQMetaMethod@@@Z @ 507 NONAME ABSENT ; class QMetaMethodBuilder QMetaObjectBuilder::addMethod(class QMetaMethod const &)
 	?setHeight@QDeclarativeItemPrivate@@UAEXM@Z @ 508 NONAME ; void QDeclarativeItemPrivate::setHeight(float)
 	??0Variant@QDeclarativeParser@@QAE@ABV01@@Z @ 509 NONAME ; QDeclarativeParser::Variant::Variant(class QDeclarativeParser::Variant const &)
@@ -527,7 +527,7 @@ EXPORTS
 	??0QDeclarativeDomValue@@QAE@XZ @ 526 NONAME ABSENT ; QDeclarativeDomValue::QDeclarativeDomValue(void)
 	?init@QDeclarativeItemPrivate@@QAEXPAVQDeclarativeItem@@@Z @ 527 NONAME ; void QDeclarativeItemPrivate::init(class QDeclarativeItem *)
 	?addProperty@QMetaObjectBuilder@@QAE?AVQMetaPropertyBuilder@@ABVQByteArray@@0H@Z @ 528 NONAME ABSENT ; class QMetaPropertyBuilder QMetaObjectBuilder::addProperty(class QByteArray const &, class QByteArray const &, int)
-	?getStaticMetaObject@QDeclarativeState@@SAABUQMetaObject@@XZ @ 529 NONAME ABSENT ; struct QMetaObject const & QDeclarativeState::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeState@@SAABUQMetaObject@@XZ @ 529 NONAME ; struct QMetaObject const & QDeclarativeState::getStaticMetaObject(void)
 	?isResettable@QMetaPropertyBuilder@@QBE_NXZ @ 530 NONAME ABSENT ; bool QMetaPropertyBuilder::isResettable(void) const
 	?focusScopeItemChange@QDeclarativeItemPrivate@@UAEX_N@Z @ 531 NONAME ; void QDeclarativeItemPrivate::focusScopeItemChange(bool)
 	?bottomMarginChanged@QDeclarativeAnchors@@IAEXXZ @ 532 NONAME ABSENT ; void QDeclarativeAnchors::bottomMarginChanged(void)
@@ -551,7 +551,7 @@ EXPORTS
 	??0QDeclarativeListModel@@QAE@PAVQObject@@@Z @ 550 NONAME ABSENT ; QDeclarativeListModel::QDeclarativeListModel(class QObject *)
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugWatch@@ABVQDeclarativeDebugContextReference@@ABVQString@@PAVQObject@@@Z @ 551 NONAME ABSENT ; class QDeclarativeDebugWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugContextReference const &, class QString const &, class QObject *)
 	?setColumn@QDeclarativeError@@QAEXH@Z @ 552 NONAME ; void QDeclarativeError::setColumn(int)
-	??1QDeclarativeTransition@@UAE@XZ @ 553 NONAME ABSENT ; QDeclarativeTransition::~QDeclarativeTransition(void)
+	??1QDeclarativeTransition@@UAE@XZ @ 553 NONAME ; QDeclarativeTransition::~QDeclarativeTransition(void)
 	??AQDeclarativePropertyMap@@QBE?AVQVariant@@ABVQString@@@Z @ 554 NONAME ; class QVariant QDeclarativePropertyMap::operator[](class QString const &) const
 	?qt_metacall@QDeclarativeListModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 555 NONAME ABSENT ; int QDeclarativeListModel::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qdeclarativeelement_destructor@QDeclarativePrivate@@YAXPAVQObject@@@Z @ 556 NONAME ; void QDeclarativePrivate::qdeclarativeelement_destructor(class QObject *)
@@ -589,8 +589,8 @@ EXPORTS
 	?variantFromString@QDeclarativeStringConverters@@YA?AVQVariant@@ABVQString@@@Z @ 588 NONAME ABSENT ; class QVariant QDeclarativeStringConverters::variantFromString(class QString const &)
 	?qt_metacall@QDeclarativeScaleGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 589 NONAME ABSENT ; int QDeclarativeScaleGrid::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?size@QDeclarativePropertyMap@@QBEHXZ @ 590 NONAME ; int QDeclarativePropertyMap::size(void) const
-	?cancel@QDeclarativeState@@QAEXXZ @ 591 NONAME ABSENT ; void QDeclarativeState::cancel(void)
-	?qt_metacall@QDeclarativeStateGroup@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 592 NONAME ABSENT ; int QDeclarativeStateGroup::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?cancel@QDeclarativeState@@QAEXXZ @ 591 NONAME ; void QDeclarativeState::cancel(void)
+	?qt_metacall@QDeclarativeStateGroup@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 592 NONAME ; int QDeclarativeStateGroup::qt_metacall(enum QMetaObject::Call, int, void * *)
 	??0QDeclarativePropertyPrivate@@QAE@XZ @ 593 NONAME ABSENT ; QDeclarativePropertyPrivate::QDeclarativePropertyPrivate(void)
 	?getStaticMetaObject@QDeclarativeDebugPropertyWatch@@SAABUQMetaObject@@XZ @ 594 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugPropertyWatch::getStaticMetaObject(void)
 	?trUtf8@QDeclarativeDebugWatch@@SA?AVQString@@PBD0H@Z @ 595 NONAME ABSENT ; class QString QDeclarativeDebugWatch::trUtf8(char const *, char const *, int)
@@ -599,7 +599,7 @@ EXPORTS
 	?evaluateEnum@QDeclarativeCustomParser@@IBEHABVQByteArray@@@Z @ 598 NONAME ; int QDeclarativeCustomParser::evaluateEnum(class QByteArray const &) const
 	?setState@QDeclarativeDebugQuery@@AAEXW4State@1@@Z @ 599 NONAME ABSENT ; void QDeclarativeDebugQuery::setState(enum QDeclarativeDebugQuery::State)
 	?d_func@QDeclarativeText@@ABEPBVQDeclarativeTextPrivate@@XZ @ 600 NONAME ABSENT ; class QDeclarativeTextPrivate const * QDeclarativeText::d_func(void) const
-	?transitionsProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 601 NONAME ABSENT ; class QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty(void)
+	?transitionsProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 601 NONAME ; class QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty(void)
 	?typeName@QDeclarativeType@@QBE?AVQByteArray@@XZ @ 602 NONAME ABSENT ; class QByteArray QDeclarativeType::typeName(void) const
 	?asStringList@Variant@QDeclarativeParser@@QBE?AVQStringList@@XZ @ 603 NONAME ; class QStringList QDeclarativeParser::Variant::asStringList(void) const
 	?removeKey@QMetaEnumBuilder@@QAEXH@Z @ 604 NONAME ABSENT ; void QMetaEnumBuilder::removeKey(int)
@@ -612,7 +612,7 @@ EXPORTS
 	??0QDeclarativePen@@QAE@PAVQObject@@@Z @ 611 NONAME ABSENT ; QDeclarativePen::QDeclarativePen(class QObject *)
 	?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 612 NONAME ABSENT ; class QString QPacketProtocol::trUtf8(char const *, char const *, int)
 	?setContextObject@QDeclarativeContext@@QAEXPAVQObject@@@Z @ 613 NONAME ; void QDeclarativeContext::setContextObject(class QObject *)
-	??_EQDeclarativeState@@UAE@I@Z @ 614 NONAME ABSENT ; QDeclarativeState::~QDeclarativeState(unsigned int)
+	??_EQDeclarativeState@@UAE@I@Z @ 614 NONAME ; QDeclarativeState::~QDeclarativeState(unsigned int)
 	?expression@QDeclarativeExpression@@QBE?AVQString@@XZ @ 615 NONAME ; class QString QDeclarativeExpression::expression(void) const
 	??1QDeclarativeDomDocument@@QAE@XZ @ 616 NONAME ABSENT ; QDeclarativeDomDocument::~QDeclarativeDomDocument(void)
 	?trUtf8@QDeclarativeListModel@@SA?AVQString@@PBD0H@Z @ 617 NONAME ABSENT ; class QString QDeclarativeListModel::trUtf8(char const *, char const *, int)
@@ -621,15 +621,15 @@ EXPORTS
 	?sceneEvent@QDeclarativeItem@@MAE_NPAVQEvent@@@Z @ 620 NONAME ; bool QDeclarativeItem::sceneEvent(class QEvent *)
 	??0QDeclarativeDebugRootContextQuery@@AAE@PAVQObject@@@Z @ 621 NONAME ABSENT ; QDeclarativeDebugRootContextQuery::QDeclarativeDebugRootContextQuery(class QObject *)
 	?name@QDeclarativeDebugEngineReference@@QBE?AVQString@@XZ @ 622 NONAME ABSENT ; class QString QDeclarativeDebugEngineReference::name(void) const
-	??_EQDeclarativeTransition@@UAE@I@Z @ 623 NONAME ABSENT ; QDeclarativeTransition::~QDeclarativeTransition(unsigned int)
+	??_EQDeclarativeTransition@@UAE@I@Z @ 623 NONAME ; QDeclarativeTransition::~QDeclarativeTransition(unsigned int)
 	??0QDeclarativeAction@@QAE@ABV0@@Z @ 624 NONAME ABSENT ; QDeclarativeAction::QDeclarativeAction(class QDeclarativeAction const &)
-	?extends@QDeclarativeState@@QBE?AVQString@@XZ @ 625 NONAME ABSENT ; class QString QDeclarativeState::extends(void) const
+	?extends@QDeclarativeState@@QBE?AVQString@@XZ @ 625 NONAME ; class QString QDeclarativeState::extends(void) const
 	?error@QDeclarativeCustomParser@@IAEXABVQDeclarativeCustomParserProperty@@ABVQString@@@Z @ 626 NONAME ; void QDeclarativeCustomParser::error(class QDeclarativeCustomParserProperty const &, class QString const &)
 	??0QDeclarativeCustomParserNode@@QAE@XZ @ 627 NONAME ; QDeclarativeCustomParserNode::QDeclarativeCustomParserNode(void)
 	?version@QDeclarativeDomImport@@QBE?AVQString@@XZ @ 628 NONAME ABSENT ; class QString QDeclarativeDomImport::version(void) const
 	?smooth@QDeclarativeItem@@QBE_NXZ @ 629 NONAME ; bool QDeclarativeItem::smooth(void) const
 	??1QDeclarativeInfo@@QAE@XZ @ 630 NONAME ; QDeclarativeInfo::~QDeclarativeInfo(void)
-	?qt_metacast@QDeclarativeStateOperation@@UAEPAXPBD@Z @ 631 NONAME ABSENT ; void * QDeclarativeStateOperation::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeStateOperation@@UAEPAXPBD@Z @ 631 NONAME ; void * QDeclarativeStateOperation::qt_metacast(char const *)
 	??4QDeclarativeDebugEngineReference@@QAEAAV0@ABV0@@Z @ 632 NONAME ABSENT ; class QDeclarativeDebugEngineReference & QDeclarativeDebugEngineReference::operator=(class QDeclarativeDebugEngineReference const &)
 	?isValueType@QDeclarativePropertyPrivate@@QBE_NXZ @ 633 NONAME ABSENT ; bool QDeclarativePropertyPrivate::isValueType(void) const
 	??0QDeclarativeDomValueValueSource@@QAE@ABV0@@Z @ 634 NONAME ABSENT ; QDeclarativeDomValueValueSource::QDeclarativeDomValueValueSource(class QDeclarativeDomValueValueSource const &)
@@ -640,7 +640,7 @@ EXPORTS
 	?qt_metacall@QDeclarativeDebugObjectExpressionWatch@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 639 NONAME ABSENT ; int QDeclarativeDebugObjectExpressionWatch::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?d_func@QDeclarativeItem@@AAEPAVQDeclarativeItemPrivate@@XZ @ 640 NONAME ; class QDeclarativeItemPrivate * QDeclarativeItem::d_func(void)
 	?binding@QDeclarativeDomValueBinding@@QBE?AVQString@@XZ @ 641 NONAME ABSENT ; class QString QDeclarativeDomValueBinding::binding(void) const
-	?updateAutoState@QDeclarativeStateGroup@@AAE_NXZ @ 642 NONAME ABSENT ; bool QDeclarativeStateGroup::updateAutoState(void)
+	?updateAutoState@QDeclarativeStateGroup@@AAE_NXZ @ 642 NONAME ; bool QDeclarativeStateGroup::updateAutoState(void)
 	?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 643 NONAME ABSENT ; class QString QDeclarativeDebugService::tr(char const *, char const *)
 	?tr@QDeclarativeComponent@@SA?AVQString@@PBD0H@Z @ 644 NONAME ; class QString QDeclarativeComponent::tr(char const *, char const *, int)
 	??1QDeclarativeProperty@@QAE@XZ @ 645 NONAME ; QDeclarativeProperty::~QDeclarativeProperty(void)
@@ -678,11 +678,11 @@ EXPORTS
 	?elideMode@QDeclarativeText@@QBE?AW4TextElideMode@1@XZ @ 677 NONAME ABSENT ; enum QDeclarativeText::TextElideMode QDeclarativeText::elideMode(void) const
 	?baseUrl@QDeclarativeContext@@QBE?AVQUrl@@XZ @ 678 NONAME ; class QUrl QDeclarativeContext::baseUrl(void) const
 	?qt_metacall@QDeclarativeDebugRootContextQuery@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 679 NONAME ABSENT ; int QDeclarativeDebugRootContextQuery::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?isNamed@QDeclarativeState@@QBE_NXZ @ 680 NONAME ABSENT ; bool QDeclarativeState::isNamed(void) const
+	?isNamed@QDeclarativeState@@QBE_NXZ @ 680 NONAME ; bool QDeclarativeState::isNamed(void) const
 	?isString@Variant@QDeclarativeParser@@QBE_NXZ @ 681 NONAME ; bool QDeclarativeParser::Variant::isString(void) const
 	?restart@QDeclarativeItemPrivate@@SA_JAAVQElapsedTimer@@@Z @ 682 NONAME ; long long QDeclarativeItemPrivate::restart(class QElapsedTimer &)
 	?trUtf8@QDeclarativeDebugClient@@SA?AVQString@@PBD0H@Z @ 683 NONAME ABSENT ; class QString QDeclarativeDebugClient::trUtf8(char const *, char const *, int)
-	?qt_metacast@QDeclarativeTransition@@UAEPAXPBD@Z @ 684 NONAME ABSENT ; void * QDeclarativeTransition::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeTransition@@UAEPAXPBD@Z @ 684 NONAME ; void * QDeclarativeTransition::qt_metacast(char const *)
 	??1QDeclarativePixmap@@QAE@XZ @ 685 NONAME ; QDeclarativePixmap::~QDeclarativePixmap(void)
 	?timeFromString@QDeclarativeStringConverters@@YA?AVQTime@@ABVQString@@PA_N@Z @ 686 NONAME ABSENT ; class QTime QDeclarativeStringConverters::timeFromString(class QString const &, bool *)
 	?d_func@QDeclarativeDebugClient@@AAEPAVQDeclarativeDebugClientPrivate@@XZ @ 687 NONAME ABSENT ; class QDeclarativeDebugClientPrivate * QDeclarativeDebugClient::d_func(void)
@@ -694,7 +694,7 @@ EXPORTS
 	??0QDeclarativeDebugObjectReference@@QAE@XZ @ 693 NONAME ABSENT ; QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(void)
 	?staticMetaObject@QDeclarativeExtensionPlugin@@2UQMetaObject@@B @ 694 NONAME ; struct QMetaObject const QDeclarativeExtensionPlugin::staticMetaObject
 	?isNull@QDeclarativeScaleGrid@@QBE_NXZ @ 695 NONAME ABSENT ; bool QDeclarativeScaleGrid::isNull(void) const
-	??_EQDeclarativeStateOperation@@UAE@I@Z @ 696 NONAME ABSENT ; QDeclarativeStateOperation::~QDeclarativeStateOperation(unsigned int)
+	??_EQDeclarativeStateOperation@@UAE@I@Z @ 696 NONAME ; QDeclarativeStateOperation::~QDeclarativeStateOperation(unsigned int)
 	??6QDeclarativeInfo@@QAEAAV0@H@Z @ 697 NONAME ; class QDeclarativeInfo & QDeclarativeInfo::operator<<(int)
 	??0QDeclarativeDomDynamicProperty@@QAE@XZ @ 698 NONAME ABSENT ; QDeclarativeDomDynamicProperty::QDeclarativeDomDynamicProperty(void)
 	?tr@QDeclarativeRectangle@@SA?AVQString@@PBD0H@Z @ 699 NONAME ABSENT ; class QString QDeclarativeRectangle::tr(char const *, char const *, int)
@@ -718,7 +718,7 @@ EXPORTS
 	?qt_metacast@QDeclarativeView@@UAEPAXPBD@Z @ 717 NONAME ; void * QDeclarativeView::qt_metacast(char const *)
 	?mapToItem@QDeclarativeItem@@QBE?AVQScriptValue@@ABV2@MM@Z @ 718 NONAME ; class QScriptValue QDeclarativeItem::mapToItem(class QScriptValue const &, float, float) const
 	?setPluginPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 719 NONAME ; void QDeclarativeEngine::setPluginPathList(class QStringList const &)
-	?metaObject@QDeclarativeState@@UBEPBUQMetaObject@@XZ @ 720 NONAME ABSENT ; struct QMetaObject const * QDeclarativeState::metaObject(void) const
+	?metaObject@QDeclarativeState@@UBEPBUQMetaObject@@XZ @ 720 NONAME ; struct QMetaObject const * QDeclarativeState::metaObject(void) const
 	?boundingRect@QDeclarativeRectangle@@UBE?AVQRectF@@XZ @ 721 NONAME ABSENT ; class QRectF QDeclarativeRectangle::boundingRect(void) const
 	?uri@QDeclarativeDomImport@@QBE?AVQString@@XZ @ 722 NONAME ABSENT ; class QString QDeclarativeDomImport::uri(void) const
 	?setContextProperty@QDeclarativeContext@@QAEXABVQString@@PAVQObject@@@Z @ 723 NONAME ; void QDeclarativeContext::setContextProperty(class QString const &, class QObject *)
@@ -769,13 +769,13 @@ EXPORTS
 	?setSuperClass@QMetaObjectBuilder@@QAEXPBUQMetaObject@@@Z @ 768 NONAME ABSENT ; void QMetaObjectBuilder::setSuperClass(struct QMetaObject const *)
 	?contains@QDeclarativePropertyMap@@QBE_NABVQString@@@Z @ 769 NONAME ; bool QDeclarativePropertyMap::contains(class QString const &) const
 	?setGradient@QDeclarativeRectangle@@QAEXPAVQDeclarativeGradient@@@Z @ 770 NONAME ABSENT ; void QDeclarativeRectangle::setGradient(class QDeclarativeGradient *)
-	?metaObject@QDeclarativeTransition@@UBEPBUQMetaObject@@XZ @ 771 NONAME ABSENT ; struct QMetaObject const * QDeclarativeTransition::metaObject(void) const
+	?metaObject@QDeclarativeTransition@@UBEPBUQMetaObject@@XZ @ 771 NONAME ; struct QMetaObject const * QDeclarativeTransition::metaObject(void) const
 	?defaultMethod@QDeclarativeMetaType@@SA?AVQMetaMethod@@PBUQMetaObject@@@Z @ 772 NONAME ABSENT ; class QMetaMethod QDeclarativeMetaType::defaultMethod(struct QMetaObject const *)
 	?tr@QDeclarativeExtensionPlugin@@SA?AVQString@@PBD0H@Z @ 773 NONAME ; class QString QDeclarativeExtensionPlugin::tr(char const *, char const *, int)
 	?metaObject@QDeclarativeValueType@@UBEPBUQMetaObject@@XZ @ 774 NONAME ABSENT ; struct QMetaObject const * QDeclarativeValueType::metaObject(void) const
 	?hasNotifySignal@QDeclarativeProperty@@QBE_NXZ @ 775 NONAME ; bool QDeclarativeProperty::hasNotifySignal(void) const
 	?create@QDeclarativeType@@QBEXPAPAVQObject@@PAPAXI@Z @ 776 NONAME ABSENT ; void QDeclarativeType::create(class QObject * *, void * *, unsigned int) const
-	?reversible@QDeclarativeTransition@@QBE_NXZ @ 777 NONAME ABSENT ; bool QDeclarativeTransition::reversible(void) const
+	?reversible@QDeclarativeTransition@@QBE_NXZ @ 777 NONAME ; bool QDeclarativeTransition::reversible(void) const
 	?invalidPacket@QPacketProtocol@@IAEXXZ @ 778 NONAME ABSENT ; void QPacketProtocol::invalidPacket(void)
 	??0QDeclarativeDebugObjectReference@@QAE@H@Z @ 779 NONAME ABSENT ; QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(int)
 	?superClass@QMetaObjectBuilder@@QBEPBUQMetaObject@@XZ @ 780 NONAME ABSENT ; struct QMetaObject const * QMetaObjectBuilder::superClass(void) const
@@ -809,7 +809,7 @@ EXPORTS
 	?defaultProperty@QDeclarativeMetaType@@SA?AVQMetaProperty@@PAVQObject@@@Z @ 808 NONAME ABSENT ; class QMetaProperty QDeclarativeMetaType::defaultProperty(class QObject *)
 	?resetHeight@QDeclarativeItemPrivate@@UAEXXZ @ 809 NONAME ; void QDeclarativeItemPrivate::resetHeight(void)
 	?qt_metacast@QDeclarativeDebugPropertyWatch@@UAEPAXPBD@Z @ 810 NONAME ABSENT ; void * QDeclarativeDebugPropertyWatch::qt_metacast(char const *)
-	??1QDeclarativeStateOperation@@UAE@XZ @ 811 NONAME ABSENT ; QDeclarativeStateOperation::~QDeclarativeStateOperation(void)
+	??1QDeclarativeStateOperation@@UAE@XZ @ 811 NONAME ; QDeclarativeStateOperation::~QDeclarativeStateOperation(void)
 	??_EQDeclarativeDebugQuery@@UAE@I@Z @ 812 NONAME ABSENT ; QDeclarativeDebugQuery::~QDeclarativeDebugQuery(unsigned int)
 	?update@QDeclarativeAbstractBinding@@QAEXXZ @ 813 NONAME ABSENT ; void QDeclarativeAbstractBinding::update(void)
 	?tr@QDeclarativeBehavior@@SA?AVQString@@PBD0H@Z @ 814 NONAME ABSENT ; class QString QDeclarativeBehavior::tr(char const *, char const *, int)
@@ -819,12 +819,12 @@ EXPORTS
 	??0QDeclarativeView@@QAE@ABVQUrl@@PAVQWidget@@@Z @ 818 NONAME ; QDeclarativeView::QDeclarativeView(class QUrl const &, class QWidget *)
 	?valueChanged@QDeclarativeExpression@@IAEXXZ @ 819 NONAME ; void QDeclarativeExpression::valueChanged(void)
 	??_EQDeclarativeView@@UAE@I@Z @ 820 NONAME ; QDeclarativeView::~QDeclarativeView(unsigned int)
-	?trUtf8@QDeclarativeStateGroup@@SA?AVQString@@PBD0H@Z @ 821 NONAME ABSENT ; class QString QDeclarativeStateGroup::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeStateGroup@@SA?AVQString@@PBD0H@Z @ 821 NONAME ; class QString QDeclarativeStateGroup::trUtf8(char const *, char const *, int)
 	?tag@QMetaMethodBuilder@@QBE?AVQByteArray@@XZ @ 822 NONAME ABSENT ; class QByteArray QMetaMethodBuilder::tag(void) const
 	?getStaticMetaObject@QPacketProtocol@@SAABUQMetaObject@@XZ @ 823 NONAME ABSENT ; struct QMetaObject const & QPacketProtocol::getStaticMetaObject(void)
 	?setContext@QDeclarativeScriptString@@QAEXPAVQDeclarativeContext@@@Z @ 824 NONAME ; void QDeclarativeScriptString::setContext(class QDeclarativeContext *)
 	?addImageProvider@QDeclarativeEngine@@QAEXABVQString@@PAVQDeclarativeImageProvider@@@Z @ 825 NONAME ; void QDeclarativeEngine::addImageProvider(class QString const &, class QDeclarativeImageProvider *)
-	?d_func@QDeclarativeStateGroup@@ABEPBVQDeclarativeStateGroupPrivate@@XZ @ 826 NONAME ABSENT ; class QDeclarativeStateGroupPrivate const * QDeclarativeStateGroup::d_func(void) const
+	?d_func@QDeclarativeStateGroup@@ABEPBVQDeclarativeStateGroupPrivate@@XZ @ 826 NONAME ; class QDeclarativeStateGroupPrivate const * QDeclarativeStateGroup::d_func(void) const
 	?stateChanged@QDeclarativeItem@@IAEXABVQString@@@Z @ 827 NONAME ; void QDeclarativeItem::stateChanged(class QString const &)
 	?horizontalAlignmentChanged@QDeclarativeText@@IAEXW4HAlignment@1@@Z @ 828 NONAME ABSENT ; void QDeclarativeText::horizontalAlignmentChanged(enum QDeclarativeText::HAlignment)
 	??5@YAAAVQDataStream@@AAV0@AAUQDeclarativeObjectData@QDeclarativeEngineDebugServer@@@Z @ 829 NONAME ABSENT ; class QDataStream & operator>>(class QDataStream &, struct QDeclarativeEngineDebugServer::QDeclarativeObjectData &)
@@ -852,7 +852,7 @@ EXPORTS
 	?d_func@QDeclarativeDebugService@@ABEPBVQDeclarativeDebugServicePrivate@@XZ @ 851 NONAME ABSENT ; class QDeclarativeDebugServicePrivate const * QDeclarativeDebugService::d_func(void) const
 	??1QDeclarativeDebugQuery@@UAE@XZ @ 852 NONAME ABSENT ; QDeclarativeDebugQuery::~QDeclarativeDebugQuery(void)
 	?data_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 853 NONAME ; void QDeclarativeItemPrivate::data_append(class QDeclarativeListProperty<class QObject> *, class QObject *)
-	?tr@QDeclarativeState@@SA?AVQString@@PBD0@Z @ 854 NONAME ABSENT ; class QString QDeclarativeState::tr(char const *, char const *)
+	?tr@QDeclarativeState@@SA?AVQString@@PBD0@Z @ 854 NONAME ; class QString QDeclarativeState::tr(char const *, char const *)
 	?trUtf8@QDeclarativeEngineDebug@@SA?AVQString@@PBD0H@Z @ 855 NONAME ABSENT ; class QString QDeclarativeEngineDebug::trUtf8(char const *, char const *, int)
 	?createProperty@QDeclarativeOpenMetaObject@@MAEHPBD0@Z @ 856 NONAME ABSENT ; int QDeclarativeOpenMetaObject::createProperty(char const *, char const *)
 	?bottomMargin@QDeclarativeAnchors@@QBEMXZ @ 857 NONAME ABSENT ; float QDeclarativeAnchors::bottomMargin(void) const
@@ -887,7 +887,7 @@ EXPORTS
 	?setHeight@QDeclarativeItem@@QAEXM@Z @ 886 NONAME ; void QDeclarativeItem::setHeight(float)
 	??0QDeclarativeDomDocument@@QAE@ABV0@@Z @ 887 NONAME ABSENT ; QDeclarativeDomDocument::QDeclarativeDomDocument(class QDeclarativeDomDocument const &)
 	?position@QDeclarativeDomDynamicProperty@@QBEHXZ @ 888 NONAME ABSENT ; int QDeclarativeDomDynamicProperty::position(void) const
-	?animations@QDeclarativeTransition@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeAbstractAnimation@@@@XZ @ 889 NONAME ABSENT ; class QDeclarativeListProperty<class QDeclarativeAbstractAnimation> QDeclarativeTransition::animations(void)
+	?animations@QDeclarativeTransition@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeAbstractAnimation@@@@XZ @ 889 NONAME ; class QDeclarativeListProperty<class QDeclarativeAbstractAnimation> QDeclarativeTransition::animations(void)
 	?tr@QDeclarativeExpression@@SA?AVQString@@PBD0H@Z @ 890 NONAME ; class QString QDeclarativeExpression::tr(char const *, char const *, int)
 	??_EQMetaObjectBuilder@@UAE@I@Z @ 891 NONAME ABSENT ; QMetaObjectBuilder::~QMetaObjectBuilder(unsigned int)
 	?propertyName@QDeclarativeDomProperty@@QBE?AVQByteArray@@XZ @ 892 NONAME ABSENT ; class QByteArray QDeclarativeDomProperty::propertyName(void) const
@@ -906,7 +906,7 @@ EXPORTS
 	?d_func@QDeclarativeRectangle@@ABEPBVQDeclarativeRectanglePrivate@@XZ @ 905 NONAME ABSENT ; class QDeclarativeRectanglePrivate const * QDeclarativeRectangle::d_func(void) const
 	?setRightMargin@QDeclarativeAnchors@@QAEXM@Z @ 906 NONAME ABSENT ; void QDeclarativeAnchors::setRightMargin(float)
 	?className@QMetaObjectBuilder@@QBE?AVQByteArray@@XZ @ 907 NONAME ABSENT ; class QByteArray QMetaObjectBuilder::className(void) const
-	??0QDeclarativeState@@QAE@PAVQObject@@@Z @ 908 NONAME ABSENT ; QDeclarativeState::QDeclarativeState(class QObject *)
+	??0QDeclarativeState@@QAE@PAVQObject@@@Z @ 908 NONAME ; QDeclarativeState::QDeclarativeState(class QObject *)
 	?contexts@QDeclarativeDebugContextReference@@QBE?AV?$QList@VQDeclarativeDebugContextReference@@@@XZ @ 909 NONAME ABSENT ; class QList<class QDeclarativeDebugContextReference> QDeclarativeDebugContextReference::contexts(void) const
 	?keyReleaseEvent@QDeclarativeItem@@MAEXPAVQKeyEvent@@@Z @ 910 NONAME ; void QDeclarativeItem::keyReleaseEvent(class QKeyEvent *)
 	?qt_metacall@QDeclarativeAnchors@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 911 NONAME ABSENT ; int QDeclarativeAnchors::qt_metacall(enum QMetaObject::Call, int, void * *)
@@ -950,7 +950,7 @@ EXPORTS
 	?value@QMetaEnumBuilder@@QBEHH@Z @ 949 NONAME ABSENT ; int QMetaEnumBuilder::value(int) const
 	??_EQDeclarativeExpression@@UAE@I@Z @ 950 NONAME ; QDeclarativeExpression::~QDeclarativeExpression(unsigned int)
 	?load@QDeclarativeDomDocument@@QAE_NPAVQDeclarativeEngine@@ABVQByteArray@@ABVQUrl@@@Z @ 951 NONAME ABSENT ; bool QDeclarativeDomDocument::load(class QDeclarativeEngine *, class QByteArray const &, class QUrl const &)
-	?staticMetaObject@QDeclarativeStateGroup@@2UQMetaObject@@B @ 952 NONAME ABSENT ; struct QMetaObject const QDeclarativeStateGroup::staticMetaObject
+	?staticMetaObject@QDeclarativeStateGroup@@2UQMetaObject@@B @ 952 NONAME ; struct QMetaObject const QDeclarativeStateGroup::staticMetaObject
 	?tr@QDeclarativePropertyMap@@SA?AVQString@@PBD0@Z @ 953 NONAME ; class QString QDeclarativePropertyMap::tr(char const *, char const *)
 	?verticalCenterChanged@QDeclarativeAnchors@@IAEXXZ @ 954 NONAME ABSENT ; void QDeclarativeAnchors::verticalCenterChanged(void)
 	?isScriptable@QMetaPropertyBuilder@@QBE_NXZ @ 955 NONAME ABSENT ; bool QMetaPropertyBuilder::isScriptable(void) const
@@ -967,11 +967,11 @@ EXPORTS
 	?d_func@QDeclarativeEngineDebug@@AAEPAVQDeclarativeEngineDebugPrivate@@XZ @ 966 NONAME ABSENT ; class QDeclarativeEngineDebugPrivate * QDeclarativeEngineDebug::d_func(void)
 	??1QDeclarativeNetworkAccessManagerFactory@@UAE@XZ @ 967 NONAME ; QDeclarativeNetworkAccessManagerFactory::~QDeclarativeNetworkAccessManagerFactory(void)
 	?textFormatChanged@QDeclarativeText@@IAEXW4TextFormat@1@@Z @ 968 NONAME ABSENT ; void QDeclarativeText::textFormatChanged(enum QDeclarativeText::TextFormat)
-	?removeState@QDeclarativeStateGroup@@AAEXPAVQDeclarativeState@@@Z @ 969 NONAME ABSENT ; void QDeclarativeStateGroup::removeState(class QDeclarativeState *)
+	?removeState@QDeclarativeStateGroup@@AAEXPAVQDeclarativeState@@@Z @ 969 NONAME ; void QDeclarativeStateGroup::removeState(class QDeclarativeState *)
 	?qmlTypeName@QDeclarativeType@@QBE?AVQByteArray@@XZ @ 970 NONAME ABSENT ; class QByteArray QDeclarativeType::qmlTypeName(void) const
 	?tr@QDeclarativeComponent@@SA?AVQString@@PBD0@Z @ 971 NONAME ; class QString QDeclarativeComponent::tr(char const *, char const *)
 	?isProperty@QDeclarativeProperty@@QBE_NXZ @ 972 NONAME ; bool QDeclarativeProperty::isProperty(void) const
-	?states@QDeclarativeStateGroup@@QBE?AV?$QList@PAVQDeclarativeState@@@@XZ @ 973 NONAME ABSENT ; class QList<class QDeclarativeState *> QDeclarativeStateGroup::states(void) const
+	?states@QDeclarativeStateGroup@@QBE?AV?$QList@PAVQDeclarativeState@@@@XZ @ 973 NONAME ; class QList<class QDeclarativeState *> QDeclarativeStateGroup::states(void) const
 	??1QDeclarativeDebugExpressionQuery@@UAE@XZ @ 974 NONAME ABSENT ; QDeclarativeDebugExpressionQuery::~QDeclarativeDebugExpressionQuery(void)
 	?isValid@QDeclarativeDomObject@@QBE_NXZ @ 975 NONAME ABSENT ; bool QDeclarativeDomObject::isValid(void) const
 	?staticMetaObject@QDeclarativeAnchors@@2UQMetaObject@@B @ 976 NONAME ABSENT ; struct QMetaObject const QDeclarativeAnchors::staticMetaObject
@@ -1001,15 +1001,15 @@ EXPORTS
 	?setDescription@QDeclarativeError@@QAEXABVQString@@@Z @ 1000 NONAME ; void QDeclarativeError::setDescription(class QString const &)
 	??0QDeclarativeExpression@@AAE@PAVQDeclarativeContextData@@PAVQObject@@ABVQString@@@Z @ 1001 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QObject *, class QString const &)
 	??1QDeclarativeOpenMetaObjectType@@UAE@XZ @ 1002 NONAME ABSENT ; QDeclarativeOpenMetaObjectType::~QDeclarativeOpenMetaObjectType(void)
-	?setReversible@QDeclarativeTransition@@QAEX_N@Z @ 1003 NONAME ABSENT ; void QDeclarativeTransition::setReversible(bool)
+	?setReversible@QDeclarativeTransition@@QAEX_N@Z @ 1003 NONAME ; void QDeclarativeTransition::setReversible(bool)
 	?notifySignal@QMetaPropertyBuilder@@QBE?AVQMetaMethodBuilder@@XZ @ 1004 NONAME ABSENT ; class QMetaMethodBuilder QMetaPropertyBuilder::notifySignal(void) const
 	??0QDeclarativeDomList@@QAE@XZ @ 1005 NONAME ABSENT ; QDeclarativeDomList::QDeclarativeDomList(void)
 	?hasActiveFocus@QDeclarativeItem@@QBE_NXZ @ 1006 NONAME ; bool QDeclarativeItem::hasActiveFocus(void) const
 	?indexOfSignal@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1007 NONAME ABSENT ; int QMetaObjectBuilder::indexOfSignal(class QByteArray const &)
-	?toState@QDeclarativeTransition@@QBE?AVQString@@XZ @ 1008 NONAME ABSENT ; class QString QDeclarativeTransition::toState(void) const
+	?toState@QDeclarativeTransition@@QBE?AVQString@@XZ @ 1008 NONAME ; class QString QDeclarativeTransition::toState(void) const
 	??0QDeclarativeDomDocument@@QAE@XZ @ 1009 NONAME ABSENT ; QDeclarativeDomDocument::QDeclarativeDomDocument(void)
-	?setWhen@QDeclarativeState@@QAEXPAVQDeclarativeBinding@@@Z @ 1010 NONAME ABSENT ; void QDeclarativeState::setWhen(class QDeclarativeBinding *)
-	?isWhenKnown@QDeclarativeState@@QBE_NXZ @ 1011 NONAME ABSENT ; bool QDeclarativeState::isWhenKnown(void) const
+	?setWhen@QDeclarativeState@@QAEXPAVQDeclarativeBinding@@@Z @ 1010 NONAME ; void QDeclarativeState::setWhen(class QDeclarativeBinding *)
+	?isWhenKnown@QDeclarativeState@@QBE_NXZ @ 1011 NONAME ; bool QDeclarativeState::isWhenKnown(void) const
 	?agent@QDeclarativeListModel@@QAEPAVQDeclarativeListModelWorkerAgent@@XZ @ 1012 NONAME ABSENT ; class QDeclarativeListModelWorkerAgent * QDeclarativeListModel::agent(void)
 	?engine@QDeclarativeExpression@@QBEPAVQDeclarativeEngine@@XZ @ 1013 NONAME ; class QDeclarativeEngine * QDeclarativeExpression::engine(void) const
 	??_EQDeclarativeDebugWatch@@UAE@I@Z @ 1014 NONAME ABSENT ; QDeclarativeDebugWatch::~QDeclarativeDebugWatch(unsigned int)
@@ -1018,10 +1018,10 @@ EXPORTS
 	?setFill@QDeclarativeAnchors@@QAEXPAVQGraphicsObject@@@Z @ 1017 NONAME ABSENT ; void QDeclarativeAnchors::setFill(class QGraphicsObject *)
 	?setHAlign@QDeclarativeText@@QAEXW4HAlignment@1@@Z @ 1018 NONAME ABSENT ; void QDeclarativeText::setHAlign(enum QDeclarativeText::HAlignment)
 	??0QDeclarativeScriptString@@QAE@ABV0@@Z @ 1019 NONAME ; QDeclarativeScriptString::QDeclarativeScriptString(class QDeclarativeScriptString const &)
-	?trUtf8@QDeclarativeTransition@@SA?AVQString@@PBD0@Z @ 1020 NONAME ABSENT ; class QString QDeclarativeTransition::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeTransition@@SA?AVQString@@PBD0@Z @ 1020 NONAME ; class QString QDeclarativeTransition::trUtf8(char const *, char const *)
 	?metaObject@QDeclarativeDebugRootContextQuery@@UBEPBUQMetaObject@@XZ @ 1021 NONAME ABSENT ; struct QMetaObject const * QDeclarativeDebugRootContextQuery::metaObject(void) const
 	?setSignalExpression@QDeclarativePropertyPrivate@@SAPAVQDeclarativeExpression@@ABVQDeclarativeProperty@@PAV2@@Z @ 1022 NONAME ABSENT ; class QDeclarativeExpression * QDeclarativePropertyPrivate::setSignalExpression(class QDeclarativeProperty const &, class QDeclarativeExpression *)
-	?reversibleChanged@QDeclarativeTransition@@IAEXXZ @ 1023 NONAME ABSENT ; void QDeclarativeTransition::reversibleChanged(void)
+	?reversibleChanged@QDeclarativeTransition@@IAEXXZ @ 1023 NONAME ; void QDeclarativeTransition::reversibleChanged(void)
 	??4QDeclarativeDomValueValueSource@@QAEAAV0@ABV0@@Z @ 1024 NONAME ABSENT ; class QDeclarativeDomValueValueSource & QDeclarativeDomValueValueSource::operator=(class QDeclarativeDomValueValueSource const &)
 	?name@QDeclarativeDebugObjectReference@@QBE?AVQString@@XZ @ 1025 NONAME ABSENT ; class QString QDeclarativeDebugObjectReference::name(void) const
 	?anchorLines@QDeclarativeItemPrivate@@QBEPAUAnchorLines@1@XZ @ 1026 NONAME ; struct QDeclarativeItemPrivate::AnchorLines * QDeclarativeItemPrivate::anchorLines(void) const
@@ -1089,7 +1089,7 @@ EXPORTS
 	??AQDeclarativeOpenMetaObject@@QAEAAVQVariant@@ABVQByteArray@@@Z @ 1088 NONAME ABSENT ; class QVariant & QDeclarativeOpenMetaObject::operator[](class QByteArray const &)
 	?bottom@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1089 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::bottom(void) const
 	?device@QPacketProtocol@@QAEPAVQIODevice@@XZ @ 1090 NONAME ABSENT ; class QIODevice * QPacketProtocol::device(void)
-	?trUtf8@QDeclarativeStateGroup@@SA?AVQString@@PBD0@Z @ 1091 NONAME ABSENT ; class QString QDeclarativeStateGroup::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeStateGroup@@SA?AVQString@@PBD0@Z @ 1091 NONAME ; class QString QDeclarativeStateGroup::trUtf8(char const *, char const *)
 	?variantFromString@QDeclarativeStringConverters@@YA?AVQVariant@@ABVQString@@HPA_N@Z @ 1092 NONAME ABSENT ; class QVariant QDeclarativeStringConverters::variantFromString(class QString const &, int, bool *)
 	?metaObject@QDeclarativeComponent@@UBEPBUQMetaObject@@XZ @ 1093 NONAME ; struct QMetaObject const * QDeclarativeComponent::metaObject(void) const
 	?qmlInfo@@YA?AVQDeclarativeInfo@@PBVQObject@@ABV?$QList@VQDeclarativeError@@@@@Z @ 1094 NONAME ; class QDeclarativeInfo qmlInfo(class QObject const *, class QList<class QDeclarativeError> const &)
@@ -1109,7 +1109,7 @@ EXPORTS
 	?addMethod@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQByteArray@@@Z @ 1108 NONAME ABSENT ; class QMetaMethodBuilder QMetaObjectBuilder::addMethod(class QByteArray const &)
 	??0QDeclarativeDebugFileReference@@QAE@XZ @ 1109 NONAME ABSENT ; QDeclarativeDebugFileReference::QDeclarativeDebugFileReference(void)
 	?mapFromItem@QDeclarativeItem@@QBE?AVQScriptValue@@ABV2@MM@Z @ 1110 NONAME ; class QScriptValue QDeclarativeItem::mapFromItem(class QScriptValue const &, float, float) const
-	?trUtf8@QDeclarativeStateOperation@@SA?AVQString@@PBD0H@Z @ 1111 NONAME ABSENT ; class QString QDeclarativeStateOperation::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeStateOperation@@SA?AVQString@@PBD0H@Z @ 1111 NONAME ; class QString QDeclarativeStateOperation::trUtf8(char const *, char const *, int)
 	?tr@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 1112 NONAME ABSENT ; class QString QPacketProtocol::tr(char const *, char const *, int)
 	?d_func@QDeclarativeAnchors@@ABEPBVQDeclarativeAnchorsPrivate@@XZ @ 1113 NONAME ABSENT ; class QDeclarativeAnchorsPrivate const * QDeclarativeAnchors::d_func(void) const
 	?setNotifySignal@QMetaPropertyBuilder@@QAEXABVQMetaMethodBuilder@@@Z @ 1114 NONAME ABSENT ; void QMetaPropertyBuilder::setNotifySignal(class QMetaMethodBuilder const &)
@@ -1122,8 +1122,8 @@ EXPORTS
 	?qt_metacall@QDeclarativeComponent@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1121 NONAME ; int QDeclarativeComponent::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 1122 NONAME ABSENT ; class QString QDeclarativeDebugService::tr(char const *, char const *, int)
 	?staticMetaObject@QDeclarativeEngine@@2UQMetaObject@@B @ 1123 NONAME ; struct QMetaObject const QDeclarativeEngine::staticMetaObject
-	?staticMetaObject@QDeclarativeStateOperation@@2UQMetaObject@@B @ 1124 NONAME ABSENT ; struct QMetaObject const QDeclarativeStateOperation::staticMetaObject
-	?actions@QDeclarativeStateOperation@@UAE?AV?$QList@VQDeclarativeAction@@@@XZ @ 1125 NONAME ABSENT ; class QList<class QDeclarativeAction> QDeclarativeStateOperation::actions(void)
+	?staticMetaObject@QDeclarativeStateOperation@@2UQMetaObject@@B @ 1124 NONAME ; struct QMetaObject const QDeclarativeStateOperation::staticMetaObject
+	?actions@QDeclarativeStateOperation@@UAE?AV?$QList@VQDeclarativeAction@@@@XZ @ 1125 NONAME ; class QList<class QDeclarativeAction> QDeclarativeStateOperation::actions(void)
 	?objectClassName@QDeclarativeDomObject@@QBE?AVQByteArray@@XZ @ 1126 NONAME ABSENT ; class QByteArray QDeclarativeDomObject::objectClassName(void) const
 	??8QDeclarativeProperty@@QBE_NABV0@@Z @ 1127 NONAME ; bool QDeclarativeProperty::operator==(class QDeclarativeProperty const &) const
 	??1QDeclarativeDomValue@@QAE@XZ @ 1128 NONAME ABSENT ; QDeclarativeDomValue::~QDeclarativeDomValue(void)
@@ -1141,7 +1141,7 @@ EXPORTS
 	??1QDeclarativeItem@@UAE@XZ @ 1140 NONAME ; QDeclarativeItem::~QDeclarativeItem(void)
 	?setEnabled@QDeclarativeAbstractBinding@@UAEX_NV?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 1141 NONAME ABSENT ; void QDeclarativeAbstractBinding::setEnabled(bool, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?staticMetaObject@QListModelInterface@@2UQMetaObject@@B @ 1142 NONAME ABSENT ; struct QMetaObject const QListModelInterface::staticMetaObject
-	?d_func@QDeclarativeTransition@@ABEPBVQDeclarativeTransitionPrivate@@XZ @ 1143 NONAME ABSENT ; class QDeclarativeTransitionPrivate const * QDeclarativeTransition::d_func(void) const
+	?d_func@QDeclarativeTransition@@ABEPBVQDeclarativeTransitionPrivate@@XZ @ 1143 NONAME ; class QDeclarativeTransitionPrivate const * QDeclarativeTransition::d_func(void) const
 	?sourceFile@QDeclarativeExpression@@QBE?AVQString@@XZ @ 1144 NONAME ; class QString QDeclarativeExpression::sourceFile(void) const
 	??_EQDeclarativeAnchors@@UAE@I@Z @ 1145 NONAME ABSENT ; QDeclarativeAnchors::~QDeclarativeAnchors(unsigned int)
 	?removeNotifySignal@QMetaPropertyBuilder@@QAEXXZ @ 1146 NONAME ABSENT ; void QMetaPropertyBuilder::removeNotifySignal(void)
@@ -1153,7 +1153,7 @@ EXPORTS
 	?indexOfClassInfo@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1152 NONAME ABSENT ; int QMetaObjectBuilder::indexOfClassInfo(class QByteArray const &)
 	??0QDeclarativeDomImport@@QAE@ABV0@@Z @ 1153 NONAME ABSENT ; QDeclarativeDomImport::QDeclarativeDomImport(class QDeclarativeDomImport const &)
 	?width@QDeclarativePen@@QBEHXZ @ 1154 NONAME ABSENT ; int QDeclarativePen::width(void) const
-	?d_func@QDeclarativeStateGroup@@AAEPAVQDeclarativeStateGroupPrivate@@XZ @ 1155 NONAME ABSENT ; class QDeclarativeStateGroupPrivate * QDeclarativeStateGroup::d_func(void)
+	?d_func@QDeclarativeStateGroup@@AAEPAVQDeclarativeStateGroupPrivate@@XZ @ 1155 NONAME ; class QDeclarativeStateGroupPrivate * QDeclarativeStateGroup::d_func(void)
 	??6QDeclarativeInfo@@QAEAAV0@P6AAAVQTextStream@@AAV1@@Z@Z @ 1156 NONAME ; class QDeclarativeInfo & QDeclarativeInfo::operator<<(class QTextStream & (*)(class QTextStream &))
 	?trUtf8@QDeclarativeEngineDebug@@SA?AVQString@@PBD0@Z @ 1157 NONAME ABSENT ; class QString QDeclarativeEngineDebug::trUtf8(char const *, char const *)
 	?type@QDeclarativeOpenMetaObject@@QBEPAVQDeclarativeOpenMetaObjectType@@XZ @ 1158 NONAME ABSENT ; class QDeclarativeOpenMetaObjectType * QDeclarativeOpenMetaObject::type(void) const
@@ -1168,13 +1168,13 @@ EXPORTS
 	??0QDeclarativeError@@QAE@XZ @ 1167 NONAME ; QDeclarativeError::QDeclarativeError(void)
 	?hasValue@QDeclarativeOpenMetaObject@@QBE_NH@Z @ 1168 NONAME ABSENT ; bool QDeclarativeOpenMetaObject::hasValue(int) const
 	?object@QDeclarativeProperty@@QBEPAVQObject@@XZ @ 1169 NONAME ; class QObject * QDeclarativeProperty::object(void) const
-	?stateGroup@QDeclarativeState@@QBEPAVQDeclarativeStateGroup@@XZ @ 1170 NONAME ABSENT ; class QDeclarativeStateGroup * QDeclarativeState::stateGroup(void) const
+	?stateGroup@QDeclarativeState@@QBEPAVQDeclarativeStateGroup@@XZ @ 1170 NONAME ; class QDeclarativeStateGroup * QDeclarativeState::stateGroup(void) const
 	?connectNotifySignal@QDeclarativeProperty@@QBE_NPAVQObject@@H@Z @ 1171 NONAME ; bool QDeclarativeProperty::connectNotifySignal(class QObject *, int) const
 	?focusChanged@QDeclarativeItemPrivate@@UAEX_N@Z @ 1172 NONAME ; void QDeclarativeItemPrivate::focusChanged(bool)
 	?contextDebugId@QDeclarativeDebugObjectReference@@QBEHXZ @ 1173 NONAME ABSENT ; int QDeclarativeDebugObjectReference::contextDebugId(void) const
 	?url@QDeclarativeDebugFileReference@@QBE?AVQUrl@@XZ @ 1174 NONAME ABSENT ; class QUrl QDeclarativeDebugFileReference::url(void) const
 	?paint@QDeclarativeRectangle@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1175 NONAME ABSENT ; void QDeclarativeRectangle::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
-	??6QDeclarativeState@@QAEAAV0@PAVQDeclarativeStateOperation@@@Z @ 1176 NONAME ABSENT ; class QDeclarativeState & QDeclarativeState::operator<<(class QDeclarativeStateOperation *)
+	??6QDeclarativeState@@QAEAAV0@PAVQDeclarativeStateOperation@@@Z @ 1176 NONAME ; class QDeclarativeState & QDeclarativeState::operator<<(class QDeclarativeStateOperation *)
 	?destroy@QDeclarativeAbstractBinding@@UAEXXZ @ 1177 NONAME ABSENT ; void QDeclarativeAbstractBinding::destroy(void)
 	?qt_metacast@QDeclarativeDebugService@@UAEPAXPBD@Z @ 1178 NONAME ABSENT ; void * QDeclarativeDebugService::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeValueType@@UAEPAXPBD@Z @ 1179 NONAME ABSENT ; void * QDeclarativeValueType::qt_metacast(char const *)
@@ -1190,14 +1190,14 @@ EXPORTS
 	?d_func@QDeclarativePropertyMap@@AAEPAVQDeclarativePropertyMapPrivate@@XZ @ 1189 NONAME ; class QDeclarativePropertyMapPrivate * QDeclarativePropertyMap::d_func(void)
 	?trUtf8@QDeclarativeView@@SA?AVQString@@PBD0@Z @ 1190 NONAME ; class QString QDeclarativeView::trUtf8(char const *, char const *)
 	?rect@QDeclarativePixmap@@QBE?AVQRect@@XZ @ 1191 NONAME ; class QRect QDeclarativePixmap::rect(void) const
-	??0QDeclarativeTransition@@QAE@PAVQObject@@@Z @ 1192 NONAME ABSENT ; QDeclarativeTransition::QDeclarativeTransition(class QObject *)
+	??0QDeclarativeTransition@@QAE@PAVQObject@@@Z @ 1192 NONAME ; QDeclarativeTransition::QDeclarativeTransition(class QObject *)
 	?horizontalCenter@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1193 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter(void) const
 	?setObjectOwnership@QDeclarativeEngine@@SAXPAVQObject@@W4ObjectOwnership@1@@Z @ 1194 NONAME ; void QDeclarativeEngine::setObjectOwnership(class QObject *, enum QDeclarativeEngine::ObjectOwnership)
 	?tr@QDeclarativeContext@@SA?AVQString@@PBD0H@Z @ 1195 NONAME ; class QString QDeclarativeContext::tr(char const *, char const *, int)
 	?metaCall@QDeclarativeOpenMetaObject@@MAEHW4Call@QMetaObject@@HPAPAX@Z @ 1196 NONAME ABSENT ; int QDeclarativeOpenMetaObject::metaCall(enum QMetaObject::Call, int, void * *)
 	??_EQDeclarativeText@@UAE@I@Z @ 1197 NONAME ABSENT ; QDeclarativeText::~QDeclarativeText(unsigned int)
 	?setLeftMargin@QDeclarativeAnchors@@QAEXM@Z @ 1198 NONAME ABSENT ; void QDeclarativeAnchors::setLeftMargin(float)
-	?metaObject@QDeclarativeStateGroup@@UBEPBUQMetaObject@@XZ @ 1199 NONAME ABSENT ; struct QMetaObject const * QDeclarativeStateGroup::metaObject(void) const
+	?metaObject@QDeclarativeStateGroup@@UBEPBUQMetaObject@@XZ @ 1199 NONAME ; struct QMetaObject const * QDeclarativeStateGroup::metaObject(void) const
 	?expression@QDeclarativeAbstractBinding@@UBE?AVQString@@XZ @ 1200 NONAME ABSENT ; class QString QDeclarativeAbstractBinding::expression(void) const
 	??6QDeclarativeInfo@@QAEAAV0@N@Z @ 1201 NONAME ; class QDeclarativeInfo & QDeclarativeInfo::operator<<(double)
 	?setAnimation@QDeclarativeBehavior@@QAEXPAVQDeclarativeAbstractAnimation@@@Z @ 1202 NONAME ABSENT ; void QDeclarativeBehavior::setAnimation(class QDeclarativeAbstractAnimation *)
@@ -1210,12 +1210,12 @@ EXPORTS
 	??0QDeclarativePropertyValueInterceptor@@QAE@XZ @ 1209 NONAME ; QDeclarativePropertyValueInterceptor::QDeclarativePropertyValueInterceptor(void)
 	?isValid@QDeclarativeError@@QBE_NXZ @ 1210 NONAME ; bool QDeclarativeError::isValid(void) const
 	??0QMetaMethodBuilder@@QAE@XZ @ 1211 NONAME ABSENT ; QMetaMethodBuilder::QMetaMethodBuilder(void)
-	?completed@QDeclarativeState@@IAEXXZ @ 1212 NONAME ABSENT ; void QDeclarativeState::completed(void)
+	?completed@QDeclarativeState@@IAEXXZ @ 1212 NONAME ; void QDeclarativeState::completed(void)
 	?radiusChanged@QDeclarativeRectangle@@IAEXXZ @ 1213 NONAME ABSENT ; void QDeclarativeRectangle::radiusChanged(void)
 	?getStaticMetaObject@QDeclarativeExpression@@SAABUQMetaObject@@XZ @ 1214 NONAME ; struct QMetaObject const & QDeclarativeExpression::getStaticMetaObject(void)
 	?gridLeft@QDeclarativeGridScaledImage@@QBEHXZ @ 1215 NONAME ABSENT ; int QDeclarativeGridScaledImage::gridLeft(void) const
 	?setWritable@QMetaPropertyBuilder@@QAEX_N@Z @ 1216 NONAME ABSENT ; void QMetaPropertyBuilder::setWritable(bool)
-	?qt_metacast@QDeclarativeStateGroup@@UAEPAXPBD@Z @ 1217 NONAME ABSENT ; void * QDeclarativeStateGroup::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeStateGroup@@UAEPAXPBD@Z @ 1217 NONAME ; void * QDeclarativeStateGroup::qt_metacast(char const *)
 	?defaultMethod@QDeclarativeMetaType@@SA?AVQMetaMethod@@PAVQObject@@@Z @ 1218 NONAME ABSENT ; class QMetaMethod QDeclarativeMetaType::defaultMethod(class QObject *)
 	?qt_metacast@QDeclarativeEngineDebug@@UAEPAXPBD@Z @ 1219 NONAME ABSENT ; void * QDeclarativeEngineDebug::qt_metacast(char const *)
 	?staticMetaObject@QDeclarativeExpression@@2UQMetaObject@@B @ 1220 NONAME ; struct QMetaObject const QDeclarativeExpression::staticMetaObject
@@ -1260,10 +1260,10 @@ EXPORTS
 	?toLiteral@QDeclarativeDomValue@@QBE?AVQDeclarativeDomValueLiteral@@XZ @ 1259 NONAME ABSENT ; class QDeclarativeDomValueLiteral QDeclarativeDomValue::toLiteral(void) const
 	??0QDeclarativeOpenMetaObject@@QAE@PAVQObject@@_N@Z @ 1260 NONAME ABSENT ; QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(class QObject *, bool)
 	?url@QDeclarativeComponent@@QBE?AVQUrl@@XZ @ 1261 NONAME ; class QUrl QDeclarativeComponent::url(void) const
-	?componentComplete@QDeclarativeStateGroup@@UAEXXZ @ 1262 NONAME ABSENT ; void QDeclarativeStateGroup::componentComplete(void)
+	?componentComplete@QDeclarativeStateGroup@@UAEXXZ @ 1262 NONAME ; void QDeclarativeStateGroup::componentComplete(void)
 	?setMargins@QDeclarativeAnchors@@QAEXM@Z @ 1263 NONAME ABSENT ; void QDeclarativeAnchors::setMargins(float)
 	?qt_metacall@QDeclarativeView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1264 NONAME ; int QDeclarativeView::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?state@QDeclarativeStateGroup@@QBE?AVQString@@XZ @ 1265 NONAME ABSENT ; class QString QDeclarativeStateGroup::state(void) const
+	?state@QDeclarativeStateGroup@@QBE?AVQString@@XZ @ 1265 NONAME ; class QString QDeclarativeStateGroup::state(void) const
 	??0QDeclarativeDomComponent@@QAE@ABV0@@Z @ 1266 NONAME ABSENT ; QDeclarativeDomComponent::QDeclarativeDomComponent(class QDeclarativeDomComponent const &)
 	?queryAvailableEngines@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugEnginesQuery@@PAVQObject@@@Z @ 1267 NONAME ABSENT ; class QDeclarativeDebugEnginesQuery * QDeclarativeEngineDebug::queryAvailableEngines(class QObject *)
 	??_EQDeclarativeItemPrivate@@UAE@I@Z @ 1268 NONAME ; QDeclarativeItemPrivate::~QDeclarativeItemPrivate(unsigned int)
@@ -1291,12 +1291,12 @@ EXPORTS
 	?staticMetaObject@QDeclarativeDebugEnginesQuery@@2UQMetaObject@@B @ 1290 NONAME ABSENT ; struct QMetaObject const QDeclarativeDebugEnginesQuery::staticMetaObject
 	?tr@QDeclarativePixmap@@SA?AVQString@@PBD0@Z @ 1291 NONAME ; class QString QDeclarativePixmap::tr(char const *, char const *)
 	?isError@QDeclarativeComponent@@QBE_NXZ @ 1292 NONAME ; bool QDeclarativeComponent::isError(void) const
-	?qt_metacall@QDeclarativeTransition@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1293 NONAME ABSENT ; int QDeclarativeTransition::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeTransition@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1293 NONAME ; int QDeclarativeTransition::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?type@QDeclarativeDomImport@@QBE?AW4Type@1@XZ @ 1294 NONAME ABSENT ; enum QDeclarativeDomImport::Type QDeclarativeDomImport::type(void) const
 	??1QDeclarativeDebugConnection@@UAE@XZ @ 1295 NONAME ABSENT ; QDeclarativeDebugConnection::~QDeclarativeDebugConnection(void)
 	?value@QDeclarativeOpenMetaObject@@QBE?AVQVariant@@H@Z @ 1296 NONAME ABSENT ; class QVariant QDeclarativeOpenMetaObject::value(int) const
 	?tr@QDeclarativeDebugRootContextQuery@@SA?AVQString@@PBD0H@Z @ 1297 NONAME ABSENT ; class QString QDeclarativeDebugRootContextQuery::tr(char const *, char const *, int)
-	?setFromState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 1298 NONAME ABSENT ; void QDeclarativeTransition::setFromState(class QString const &)
+	?setFromState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 1298 NONAME ; void QDeclarativeTransition::setFromState(class QString const &)
 	?metaObject@QDeclarativeDebugService@@UBEPBUQMetaObject@@XZ @ 1299 NONAME ABSENT ; struct QMetaObject const * QDeclarativeDebugService::metaObject(void) const
 	?state@QDeclarativeDebugQuery@@QBE?AW4State@1@XZ @ 1300 NONAME ABSENT ; enum QDeclarativeDebugQuery::State QDeclarativeDebugQuery::state(void) const
 	?setBottom@QDeclarativeScaleGrid@@QAEXH@Z @ 1301 NONAME ABSENT ; void QDeclarativeScaleGrid::setBottom(int)
@@ -1312,7 +1312,7 @@ EXPORTS
 	?width@QDeclarativeItemPrivate@@UBEMXZ @ 1311 NONAME ; float QDeclarativeItemPrivate::width(void) const
 	?d_func@QMetaMethodBuilder@@ABEPAVQMetaMethodBuilderPrivate@@XZ @ 1312 NONAME ABSENT ; class QMetaMethodBuilderPrivate * QMetaMethodBuilder::d_func(void) const
 	?isScript@Variant@QDeclarativeParser@@QBE_NXZ @ 1313 NONAME ; bool QDeclarativeParser::Variant::isScript(void) const
-	?classBegin@QDeclarativeStateGroup@@UAEXXZ @ 1314 NONAME ABSENT ; void QDeclarativeStateGroup::classBegin(void)
+	?classBegin@QDeclarativeStateGroup@@UAEXXZ @ 1314 NONAME ; void QDeclarativeStateGroup::classBegin(void)
 	?qt_metacast@QDeclarativeRectangle@@UAEPAXPBD@Z @ 1315 NONAME ABSENT ; void * QDeclarativeRectangle::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeExpression@@UAEPAXPBD@Z @ 1316 NONAME ; void * QDeclarativeExpression::qt_metacast(char const *)
 	?indexOfProperty@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1317 NONAME ABSENT ; int QMetaObjectBuilder::indexOfProperty(class QByteArray const &)
@@ -1332,11 +1332,11 @@ EXPORTS
 	?qt_metacall@QDeclarativeEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1331 NONAME ; int QDeclarativeEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?getStaticMetaObject@QDeclarativeAnchors@@SAABUQMetaObject@@XZ @ 1332 NONAME ABSENT ; struct QMetaObject const & QDeclarativeAnchors::getStaticMetaObject(void)
 	??0QDeclarativeProperty@@QAE@PAVQObject@@ABVQString@@@Z @ 1333 NONAME ; QDeclarativeProperty::QDeclarativeProperty(class QObject *, class QString const &)
-	?trUtf8@QDeclarativeState@@SA?AVQString@@PBD0@Z @ 1334 NONAME ABSENT ; class QString QDeclarativeState::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeState@@SA?AVQString@@PBD0@Z @ 1334 NONAME ; class QString QDeclarativeState::trUtf8(char const *, char const *)
 	?setStaticMetacallFunction@QMetaObjectBuilder@@QAEXP6AHW4Call@QMetaObject@@HPAPAX@Z@Z @ 1335 NONAME ABSENT ; void QMetaObjectBuilder::setStaticMetacallFunction(int (*)(enum QMetaObject::Call, int, void * *))
 	?properties@QDeclarativeDomObject@@QBE?AV?$QList@VQDeclarativeDomProperty@@@@XZ @ 1336 NONAME ABSENT ; class QList<class QDeclarativeDomProperty> QDeclarativeDomObject::properties(void) const
 	??0QDeclarativeExpression@@QAE@PAVQDeclarativeContext@@PAVQObject@@ABVQString@@1@Z @ 1337 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QObject *, class QString const &, class QObject *)
-	?tr@QDeclarativeTransition@@SA?AVQString@@PBD0H@Z @ 1338 NONAME ABSENT ; class QString QDeclarativeTransition::tr(char const *, char const *, int)
+	?tr@QDeclarativeTransition@@SA?AVQString@@PBD0H@Z @ 1338 NONAME ; class QString QDeclarativeTransition::tr(char const *, char const *, int)
 	?dateTimeFromString@QDeclarativeStringConverters@@YA?AVQDateTime@@ABVQString@@PA_N@Z @ 1339 NONAME ABSENT ; class QDateTime QDeclarativeStringConverters::dateTimeFromString(class QString const &, bool *)
 	?implicitWidth@QDeclarativeItem@@QBEMXZ @ 1340 NONAME ; float QDeclarativeItem::implicitWidth(void) const
 	?metaObject@QDeclarativeContext@@UBEPBUQMetaObject@@XZ @ 1341 NONAME ; struct QMetaObject const * QDeclarativeContext::metaObject(void) const
@@ -1365,7 +1365,7 @@ EXPORTS
 	?qt_metacast@QDeclarativeDebugEnginesQuery@@UAEPAXPBD@Z @ 1364 NONAME ABSENT ; void * QDeclarativeDebugEnginesQuery::qt_metacast(char const *)
 	?d_func@QDeclarativeView@@AAEPAVQDeclarativeViewPrivate@@XZ @ 1365 NONAME ; class QDeclarativeViewPrivate * QDeclarativeView::d_func(void)
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugPropertyWatch@@ABVQDeclarativeDebugPropertyReference@@PAVQObject@@@Z @ 1366 NONAME ABSENT ; class QDeclarativeDebugPropertyWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugPropertyReference const &, class QObject *)
-	?stateChanged@QDeclarativeStateGroup@@IAEXABVQString@@@Z @ 1367 NONAME ABSENT ; void QDeclarativeStateGroup::stateChanged(class QString const &)
+	?stateChanged@QDeclarativeStateGroup@@IAEXABVQString@@@Z @ 1367 NONAME ; void QDeclarativeStateGroup::stateChanged(class QString const &)
 	??0QDeclarativeDomValueValueSource@@QAE@XZ @ 1368 NONAME ABSENT ; QDeclarativeDomValueValueSource::QDeclarativeDomValueValueSource(void)
 	?customStringConverter@QDeclarativeMetaType@@SAP6A?AVQVariant@@ABVQString@@@ZH@Z @ 1369 NONAME ABSENT ; class QVariant (*)(class QString const &) QDeclarativeMetaType::customStringConverter(int)
 	?baselineOffsetChanged@QDeclarativeAnchors@@IAEXXZ @ 1370 NONAME ABSENT ; void QDeclarativeAnchors::baselineOffsetChanged(void)
@@ -1388,7 +1388,7 @@ EXPORTS
 	?writeEnumProperty@QDeclarativePropertyPrivate@@SA_NABVQMetaProperty@@HPAVQObject@@ABVQVariant@@H@Z @ 1387 NONAME ABSENT ; bool QDeclarativePropertyPrivate::writeEnumProperty(class QMetaProperty const &, int, class QObject *, class QVariant const &, int)
 	?setEnabled@QDeclarativeDebugClient@@QAEX_N@Z @ 1388 NONAME ABSENT ; void QDeclarativeDebugClient::setEnabled(bool)
 	??1QMetaObjectBuilder@@UAE@XZ @ 1389 NONAME ABSENT ; QMetaObjectBuilder::~QMetaObjectBuilder(void)
-	?tr@QDeclarativeStateOperation@@SA?AVQString@@PBD0@Z @ 1390 NONAME ABSENT ; class QString QDeclarativeStateOperation::tr(char const *, char const *)
+	?tr@QDeclarativeStateOperation@@SA?AVQString@@PBD0@Z @ 1390 NONAME ; class QString QDeclarativeStateOperation::tr(char const *, char const *)
 	?clear@QPacket@@QAEXXZ @ 1391 NONAME ABSENT ; void QPacket::clear(void)
 	?getStaticMetaObject@QDeclarativeDebugClient@@SAABUQMetaObject@@XZ @ 1392 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugClient::getStaticMetaObject(void)
 	??0QDeclarativeDomList@@QAE@ABV0@@Z @ 1393 NONAME ABSENT ; QDeclarativeDomList::QDeclarativeDomList(class QDeclarativeDomList const &)
@@ -1399,7 +1399,7 @@ EXPORTS
 	?trUtf8@QDeclarativeDebugWatch@@SA?AVQString@@PBD0@Z @ 1398 NONAME ABSENT ; class QString QDeclarativeDebugWatch::trUtf8(char const *, char const *)
 	?read@QDeclarativeProperty@@SA?AVQVariant@@PAVQObject@@ABVQString@@@Z @ 1399 NONAME ; class QVariant QDeclarativeProperty::read(class QObject *, class QString const &)
 	?widthValid@QDeclarativeItem@@IBE_NXZ @ 1400 NONAME ; bool QDeclarativeItem::widthValid(void) const
-	?staticMetaObject@QDeclarativeState@@2UQMetaObject@@B @ 1401 NONAME ABSENT ; struct QMetaObject const QDeclarativeState::staticMetaObject
+	?staticMetaObject@QDeclarativeState@@2UQMetaObject@@B @ 1401 NONAME ; struct QMetaObject const QDeclarativeState::staticMetaObject
 	?setAccess@QMetaMethodBuilder@@QAEXW4Access@QMetaMethod@@@Z @ 1402 NONAME ABSENT ; void QMetaMethodBuilder::setAccess(enum QMetaMethod::Access)
 	??0QDeclarativeAction@@QAE@PAVQObject@@ABVQString@@PAVQDeclarativeContext@@ABVQVariant@@@Z @ 1403 NONAME ABSENT ; QDeclarativeAction::QDeclarativeAction(class QObject *, class QString const &, class QDeclarativeContext *, class QVariant const &)
 	?staticMetaObject@QDeclarativeDebugClient@@2UQMetaObject@@B @ 1404 NONAME ABSENT ; struct QMetaObject const QDeclarativeDebugClient::staticMetaObject
@@ -1433,16 +1433,16 @@ EXPORTS
 	?key@QMetaEnumBuilder@@QBE?AVQByteArray@@H@Z @ 1432 NONAME ABSENT ; class QByteArray QMetaEnumBuilder::key(int) const
 	?d_func@QMetaEnumBuilder@@ABEPAVQMetaEnumBuilderPrivate@@XZ @ 1433 NONAME ABSENT ; class QMetaEnumBuilderPrivate * QMetaEnumBuilder::d_func(void) const
 	??6QDeclarativeInfo@@QAEAAV0@PBD@Z @ 1434 NONAME ; class QDeclarativeInfo & QDeclarativeInfo::operator<<(char const *)
-	?d_func@QDeclarativeState@@AAEPAVQDeclarativeStatePrivate@@XZ @ 1435 NONAME ABSENT ; class QDeclarativeStatePrivate * QDeclarativeState::d_func(void)
+	?d_func@QDeclarativeState@@AAEPAVQDeclarativeStatePrivate@@XZ @ 1435 NONAME ; class QDeclarativeStatePrivate * QDeclarativeState::d_func(void)
 	??0QDeclarativeDebugEnginesQuery@@AAE@PAVQObject@@@Z @ 1436 NONAME ABSENT ; QDeclarativeDebugEnginesQuery::QDeclarativeDebugEnginesQuery(class QObject *)
 	?bottomChanged@QDeclarativeAnchors@@IAEXXZ @ 1437 NONAME ABSENT ; void QDeclarativeAnchors::bottomChanged(void)
 	?qListTypeId@QDeclarativeType@@QBEHXZ @ 1438 NONAME ABSENT ; int QDeclarativeType::qListTypeId(void) const
 	?setSelectedState@QDeclarativeDebuggerStatus@@UAEX_N@Z @ 1439 NONAME ABSENT ; void QDeclarativeDebuggerStatus::setSelectedState(bool)
 	?staticMetaObject@QDeclarativeEngineDebug@@2UQMetaObject@@B @ 1440 NONAME ABSENT ; struct QMetaObject const QDeclarativeEngineDebug::staticMetaObject
-	?setExtends@QDeclarativeState@@QAEXABVQString@@@Z @ 1441 NONAME ABSENT ; void QDeclarativeState::setExtends(class QString const &)
+	?setExtends@QDeclarativeState@@QAEXABVQString@@@Z @ 1441 NONAME ; void QDeclarativeState::setExtends(class QString const &)
 	??4QDeclarativeError@@QAEAAV0@ABV0@@Z @ 1442 NONAME ; class QDeclarativeError & QDeclarativeError::operator=(class QDeclarativeError const &)
 	?tr@QDeclarativeDebugEnginesQuery@@SA?AVQString@@PBD0H@Z @ 1443 NONAME ABSENT ; class QString QDeclarativeDebugEnginesQuery::tr(char const *, char const *, int)
-	?d_func@QDeclarativeTransition@@AAEPAVQDeclarativeTransitionPrivate@@XZ @ 1444 NONAME ABSENT ; class QDeclarativeTransitionPrivate * QDeclarativeTransition::d_func(void)
+	?d_func@QDeclarativeTransition@@AAEPAVQDeclarativeTransitionPrivate@@XZ @ 1444 NONAME ; class QDeclarativeTransitionPrivate * QDeclarativeTransition::d_func(void)
 	?propertyWritten@QDeclarativeOpenMetaObject@@MAEXH@Z @ 1445 NONAME ABSENT ; void QDeclarativeOpenMetaObject::propertyWritten(int)
 	?trUtf8@QListModelInterface@@SA?AVQString@@PBD0@Z @ 1446 NONAME ABSENT ; class QString QListModelInterface::trUtf8(char const *, char const *)
 	?setColumnNumber@QDeclarativeDebugFileReference@@QAEXH@Z @ 1447 NONAME ABSENT ; void QDeclarativeDebugFileReference::setColumnNumber(int)
@@ -1454,13 +1454,13 @@ EXPORTS
 	??0QDeclarativeBinding@@QAE@ABVQString@@PAVQObject@@PAVQDeclarativeContext@@1@Z @ 1453 NONAME ABSENT ; QDeclarativeBinding::QDeclarativeBinding(class QString const &, class QObject *, class QDeclarativeContext *, class QObject *)
 	?tr@QDeclarativeItem@@SA?AVQString@@PBD0@Z @ 1454 NONAME ; class QString QDeclarativeItem::tr(char const *, char const *)
 	??6QDeclarativeInfo@@QAEAAV0@G@Z @ 1455 NONAME ; class QDeclarativeInfo & QDeclarativeInfo::operator<<(unsigned short)
-	??0QDeclarativeStateOperation@@IAE@AAVQObjectPrivate@@PAVQObject@@@Z @ 1456 NONAME ABSENT ; QDeclarativeStateOperation::QDeclarativeStateOperation(class QObjectPrivate &, class QObject *)
+	??0QDeclarativeStateOperation@@IAE@AAVQObjectPrivate@@PAVQObject@@@Z @ 1456 NONAME ; QDeclarativeStateOperation::QDeclarativeStateOperation(class QObjectPrivate &, class QObject *)
 	?notifyOnValueChanged@QDeclarativeExpression@@QBE_NXZ @ 1457 NONAME ; bool QDeclarativeExpression::notifyOnValueChanged(void) const
 	?keyPressPreHandler@QDeclarativeItem@@IAEXPAVQKeyEvent@@@Z @ 1458 NONAME ; void QDeclarativeItem::keyPressPreHandler(class QKeyEvent *)
 	?trUtf8@QDeclarativeItem@@SA?AVQString@@PBD0H@Z @ 1459 NONAME ; class QString QDeclarativeItem::trUtf8(char const *, char const *, int)
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugWatch@@ABVQDeclarativeDebugFileReference@@PAVQObject@@@Z @ 1460 NONAME ABSENT ; class QDeclarativeDebugWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugFileReference const &, class QObject *)
 	?paintedHeight@QDeclarativeText@@QBEMXZ @ 1461 NONAME ABSENT ; float QDeclarativeText::paintedHeight(void) const
-	?tr@QDeclarativeTransition@@SA?AVQString@@PBD0@Z @ 1462 NONAME ABSENT ; class QString QDeclarativeTransition::tr(char const *, char const *)
+	?tr@QDeclarativeTransition@@SA?AVQString@@PBD0@Z @ 1462 NONAME ; class QString QDeclarativeTransition::tr(char const *, char const *)
 	?transform@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQGraphicsTransform@@@@XZ @ 1463 NONAME ; class QDeclarativeListProperty<class QGraphicsTransform> QDeclarativeItem::transform(void)
 	?leftChanged@QDeclarativeAnchors@@IAEXXZ @ 1464 NONAME ABSENT ; void QDeclarativeAnchors::leftChanged(void)
 	?topChanged@QDeclarativeAnchors@@IAEXXZ @ 1465 NONAME ABSENT ; void QDeclarativeAnchors::topChanged(void)
@@ -1480,7 +1480,7 @@ EXPORTS
 	?componentComplete@QDeclarativeItem@@MAEXXZ @ 1479 NONAME ; void QDeclarativeItem::componentComplete(void)
 	?creationContext@QDeclarativeComponent@@QBEPAVQDeclarativeContext@@XZ @ 1480 NONAME ; class QDeclarativeContext * QDeclarativeComponent::creationContext(void) const
 	?enabledChanged@QDeclarativeBehavior@@IAEXXZ @ 1481 NONAME ABSENT ; void QDeclarativeBehavior::enabledChanged(void)
-	?staticMetaObject@QDeclarativeTransition@@2UQMetaObject@@B @ 1482 NONAME ABSENT ; struct QMetaObject const QDeclarativeTransition::staticMetaObject
+	?staticMetaObject@QDeclarativeTransition@@2UQMetaObject@@B @ 1482 NONAME ; struct QMetaObject const QDeclarativeTransition::staticMetaObject
 	??0QDeclarativeInfo@@AAE@PAVQDeclarativeInfoPrivate@@@Z @ 1483 NONAME ; QDeclarativeInfo::QDeclarativeInfo(class QDeclarativeInfoPrivate *)
 	?name@QDeclarativeDebugContextReference@@QBE?AVQString@@XZ @ 1484 NONAME ABSENT ; class QString QDeclarativeDebugContextReference::name(void) const
 	?propertyIndex@QDeclarativeBinding@@UAEHXZ @ 1485 NONAME ABSENT ; int QDeclarativeBinding::propertyIndex(void)
@@ -1507,7 +1507,7 @@ EXPORTS
 	??0QDeclarativeContext@@QAE@PAV0@PAVQObject@@@Z @ 1506 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeContext *, class QObject *)
 	?trUtf8@QDeclarativeDebugConnection@@SA?AVQString@@PBD0@Z @ 1507 NONAME ABSENT ; class QString QDeclarativeDebugConnection::trUtf8(char const *, char const *)
 	??1QDeclarativeDebugEnginesQuery@@UAE@XZ @ 1508 NONAME ABSENT ; QDeclarativeDebugEnginesQuery::~QDeclarativeDebugEnginesQuery(void)
-	?getStaticMetaObject@QDeclarativeTransition@@SAABUQMetaObject@@XZ @ 1509 NONAME ABSENT ; struct QMetaObject const & QDeclarativeTransition::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeTransition@@SAABUQMetaObject@@XZ @ 1509 NONAME ; struct QMetaObject const & QDeclarativeTransition::getStaticMetaObject(void)
 	?trUtf8@QDeclarativeDebugObjectExpressionWatch@@SA?AVQString@@PBD0H@Z @ 1510 NONAME ABSENT ; class QString QDeclarativeDebugObjectExpressionWatch::trUtf8(char const *, char const *, int)
 	?metaObject@QDeclarativePropertyMap@@UBEPBUQMetaObject@@XZ @ 1511 NONAME ; struct QMetaObject const * QDeclarativePropertyMap::metaObject(void) const
 	?componentRoot@QDeclarativeDomComponent@@QBE?AVQDeclarativeDomObject@@XZ @ 1512 NONAME ABSENT ; class QDeclarativeDomObject QDeclarativeDomComponent::componentRoot(void) const
@@ -1515,7 +1515,7 @@ EXPORTS
 	?setTag@QMetaMethodBuilder@@QAEXABVQByteArray@@@Z @ 1514 NONAME ABSENT ; void QMetaMethodBuilder::setTag(class QByteArray const &)
 	?objects@QDeclarativeDebugContextReference@@QBE?AV?$QList@VQDeclarativeDebugObjectReference@@@@XZ @ 1515 NONAME ABSENT ; class QList<class QDeclarativeDebugObjectReference> QDeclarativeDebugContextReference::objects(void) const
 	??4Variant@QDeclarativeParser@@QAEAAV01@ABV01@@Z @ 1516 NONAME ; class QDeclarativeParser::Variant & QDeclarativeParser::Variant::operator=(class QDeclarativeParser::Variant const &)
-	?tr@QDeclarativeStateGroup@@SA?AVQString@@PBD0@Z @ 1517 NONAME ABSENT ; class QString QDeclarativeStateGroup::tr(char const *, char const *)
+	?tr@QDeclarativeStateGroup@@SA?AVQString@@PBD0@Z @ 1517 NONAME ; class QString QDeclarativeStateGroup::tr(char const *, char const *)
 	?setScopeObject@QDeclarativeScriptString@@QAEXPAVQObject@@@Z @ 1518 NONAME ; void QDeclarativeScriptString::setScopeObject(class QObject *)
 	??1QDeclarativeBinding@@MAE@XZ @ 1519 NONAME ABSENT ; QDeclarativeBinding::~QDeclarativeBinding(void)
 	?importPlugin@QDeclarativeEngine@@QAE_NABVQString@@0PAV2@@Z @ 1520 NONAME ; bool QDeclarativeEngine::importPlugin(class QString const &, class QString const &, class QString *)
@@ -1523,7 +1523,7 @@ EXPORTS
 	?geometryChanged@QDeclarativeItem@@MAEXABVQRectF@@0@Z @ 1522 NONAME ; void QDeclarativeItem::geometryChanged(class QRectF const &, class QRectF const &)
 	?toValueSource@QDeclarativeDomValue@@QBE?AVQDeclarativeDomValueValueSource@@XZ @ 1523 NONAME ABSENT ; class QDeclarativeDomValueValueSource QDeclarativeDomValue::toValueSource(void) const
 	?hAlign@QDeclarativeText@@QBE?AW4HAlignment@1@XZ @ 1524 NONAME ABSENT ; enum QDeclarativeText::HAlignment QDeclarativeText::hAlign(void) const
-	?when@QDeclarativeState@@QBEPAVQDeclarativeBinding@@XZ @ 1525 NONAME ABSENT ; class QDeclarativeBinding * QDeclarativeState::when(void) const
+	?when@QDeclarativeState@@QBEPAVQDeclarativeBinding@@XZ @ 1525 NONAME ; class QDeclarativeBinding * QDeclarativeState::when(void) const
 	?setRootObject@QDeclarativeView@@MAEXPAVQObject@@@Z @ 1526 NONAME ; void QDeclarativeView::setRootObject(class QObject *)
 	?resetBottom@QDeclarativeAnchors@@QAEXXZ @ 1527 NONAME ABSENT ; void QDeclarativeAnchors::resetBottom(void)
 	?qt_metacall@QDeclarativePropertyMap@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1528 NONAME ; int QDeclarativePropertyMap::qt_metacall(enum QMetaObject::Call, int, void * *)
@@ -1532,15 +1532,15 @@ EXPORTS
 	?trUtf8@QDeclarativeDebugQuery@@SA?AVQString@@PBD0@Z @ 1531 NONAME ABSENT ; class QString QDeclarativeDebugQuery::trUtf8(char const *, char const *)
 	??AQDeclarativeValueTypeFactory@@QBEPAVQDeclarativeValueType@@H@Z @ 1532 NONAME ABSENT ; class QDeclarativeValueType * QDeclarativeValueTypeFactory::operator[](int) const
 	?siblingOrderChange@QDeclarativeItemPrivate@@UAEXXZ @ 1533 NONAME ; void QDeclarativeItemPrivate::siblingOrderChange(void)
-	??1QDeclarativeState@@UAE@XZ @ 1534 NONAME ABSENT ; QDeclarativeState::~QDeclarativeState(void)
+	??1QDeclarativeState@@UAE@XZ @ 1534 NONAME ; QDeclarativeState::~QDeclarativeState(void)
 	?paint@QDeclarativeText@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1535 NONAME ABSENT ; void QDeclarativeText::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
-	??1QDeclarativeStateGroup@@UAE@XZ @ 1536 NONAME ABSENT ; QDeclarativeStateGroup::~QDeclarativeStateGroup(void)
+	??1QDeclarativeStateGroup@@UAE@XZ @ 1536 NONAME ; QDeclarativeStateGroup::~QDeclarativeStateGroup(void)
 	?setEditable@QMetaPropertyBuilder@@QAEX_N@Z @ 1537 NONAME ABSENT ; void QMetaPropertyBuilder::setEditable(bool)
 	?setBinding@QDeclarativePropertyPrivate@@SAPAVQDeclarativeAbstractBinding@@ABVQDeclarativeProperty@@PAV2@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 1538 NONAME ABSENT ; class QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(class QDeclarativeProperty const &, class QDeclarativeAbstractBinding *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?trUtf8@QDeclarativeBinding@@SA?AVQString@@PBD0@Z @ 1539 NONAME ABSENT ; class QString QDeclarativeBinding::trUtf8(char const *, char const *)
 	?requestSize@QDeclarativePixmap@@QBEABVQSize@@XZ @ 1540 NONAME ; class QSize const & QDeclarativePixmap::requestSize(void) const
 	?progress@QDeclarativeComponent@@QBEMXZ @ 1541 NONAME ; float QDeclarativeComponent::progress(void) const
-	?d_func@QDeclarativeState@@ABEPBVQDeclarativeStatePrivate@@XZ @ 1542 NONAME ABSENT ; class QDeclarativeStatePrivate const * QDeclarativeState::d_func(void) const
+	?d_func@QDeclarativeState@@ABEPBVQDeclarativeStatePrivate@@XZ @ 1542 NONAME ; class QDeclarativeStatePrivate const * QDeclarativeState::d_func(void) const
 	??0QListModelInterface@@QAE@PAVQObject@@@Z @ 1543 NONAME ABSENT ; QListModelInterface::QListModelInterface(class QObject *)
 	?pointFFromString@QDeclarativeStringConverters@@YA?AVQPointF@@ABVQString@@PA_N@Z @ 1544 NONAME ABSENT ; class QPointF QDeclarativeStringConverters::pointFFromString(class QString const &, bool *)
 	?propertyCreated@QDeclarativeOpenMetaObject@@MAEXHAAVQMetaPropertyBuilder@@@Z @ 1545 NONAME ABSENT ; void QDeclarativeOpenMetaObject::propertyCreated(int, class QMetaPropertyBuilder &)
@@ -1548,7 +1548,7 @@ EXPORTS
 	?rootObject@QDeclarativeView@@QBEPAVQGraphicsObject@@XZ @ 1547 NONAME ; class QGraphicsObject * QDeclarativeView::rootObject(void) const
 	?tr@QDeclarativeBinding@@SA?AVQString@@PBD0H@Z @ 1548 NONAME ABSENT ; class QString QDeclarativeBinding::tr(char const *, char const *, int)
 	?queryObjectRecursive@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugObjectQuery@@ABVQDeclarativeDebugObjectReference@@PAVQObject@@@Z @ 1549 NONAME ABSENT ; class QDeclarativeDebugObjectQuery * QDeclarativeEngineDebug::queryObjectRecursive(class QDeclarativeDebugObjectReference const &, class QObject *)
-	?prepare@QDeclarativeTransition@@QAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@PAVQDeclarativeTransitionManager@@@Z @ 1550 NONAME ABSENT ; void QDeclarativeTransition::prepare(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, class QDeclarativeTransitionManager *)
+	?prepare@QDeclarativeTransition@@QAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@PAVQDeclarativeTransitionManager@@@Z @ 1550 NONAME ; void QDeclarativeTransition::prepare(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, class QDeclarativeTransitionManager *)
 	??6QDeclarativeInfo@@QAEAAV0@ABVQUrl@@@Z @ 1551 NONAME ; class QDeclarativeInfo & QDeclarativeInfo::operator<<(class QUrl const &)
 	?scopeObject@QDeclarativeExpression@@QBEPAVQObject@@XZ @ 1552 NONAME ; class QObject * QDeclarativeExpression::scopeObject(void) const
 	?isValid@QDeclarativeContext@@QBE_NXZ @ 1553 NONAME ; bool QDeclarativeContext::isValid(void) const
@@ -1562,7 +1562,7 @@ EXPORTS
 	?d_func@QDeclarativeEngine@@AAEPAVQDeclarativeEnginePrivate@@XZ @ 1561 NONAME ; class QDeclarativeEnginePrivate * QDeclarativeEngine::d_func(void)
 	?staticMetaObject@QDeclarativeRectangle@@2UQMetaObject@@B @ 1562 NONAME ABSENT ; struct QMetaObject const QDeclarativeRectangle::staticMetaObject
 	?addSignal@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQByteArray@@@Z @ 1563 NONAME ABSENT ; class QMetaMethodBuilder QMetaObjectBuilder::addSignal(class QByteArray const &)
-	?getStaticMetaObject@QDeclarativeStateGroup@@SAABUQMetaObject@@XZ @ 1564 NONAME ABSENT ; struct QMetaObject const & QDeclarativeStateGroup::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeStateGroup@@SAABUQMetaObject@@XZ @ 1564 NONAME ; struct QMetaObject const & QDeclarativeStateGroup::getStaticMetaObject(void)
 	?childrenRectChanged@QDeclarativeItem@@IAEXABVQRectF@@@Z @ 1565 NONAME ; void QDeclarativeItem::childrenRectChanged(class QRectF const &)
 	?isDesignable@QDeclarativeProperty@@QBE_NXZ @ 1566 NONAME ; bool QDeclarativeProperty::isDesignable(void) const
 	?propertyTypeCategory@QDeclarativePropertyPrivate@@QBE?AW4PropertyTypeCategory@QDeclarativeProperty@@XZ @ 1567 NONAME ABSENT ; enum QDeclarativeProperty::PropertyTypeCategory QDeclarativePropertyPrivate::propertyTypeCategory(void) const
@@ -1593,8 +1593,8 @@ EXPORTS
 	?tr@QDeclarativeDebugQuery@@SA?AVQString@@PBD0H@Z @ 1592 NONAME ABSENT ; class QString QDeclarativeDebugQuery::tr(char const *, char const *, int)
 	??AQDeclarativePropertyMap@@QAEAAVQVariant@@ABVQString@@@Z @ 1593 NONAME ; class QVariant & QDeclarativePropertyMap::operator[](class QString const &)
 	??0Variant@QDeclarativeParser@@QAE@_N@Z @ 1594 NONAME ; QDeclarativeParser::Variant::Variant(bool)
-	?trUtf8@QDeclarativeState@@SA?AVQString@@PBD0H@Z @ 1595 NONAME ABSENT ; class QString QDeclarativeState::trUtf8(char const *, char const *, int)
-	??0QDeclarativeStateGroup@@QAE@PAVQObject@@@Z @ 1596 NONAME ABSENT ; QDeclarativeStateGroup::QDeclarativeStateGroup(class QObject *)
+	?trUtf8@QDeclarativeState@@SA?AVQString@@PBD0H@Z @ 1595 NONAME ; class QString QDeclarativeState::trUtf8(char const *, char const *, int)
+	??0QDeclarativeStateGroup@@QAE@PAVQObject@@@Z @ 1596 NONAME ; QDeclarativeStateGroup::QDeclarativeStateGroup(class QObject *)
 	?count@QDeclarativeListReference@@QBEHXZ @ 1597 NONAME ; int QDeclarativeListReference::count(void) const
 	?location@QDeclarativeCustomParserProperty@@QBE?AULocation@QDeclarativeParser@@XZ @ 1598 NONAME ; struct QDeclarativeParser::Location QDeclarativeCustomParserProperty::location(void) const
 	?metaObject@QDeclarativePen@@UBEPBUQMetaObject@@XZ @ 1599 NONAME ABSENT ; struct QMetaObject const * QDeclarativePen::metaObject(void) const
@@ -1645,49 +1645,49 @@ EXPORTS
 	??_EQDeclarativePropertyChanges@@UAE@I@Z @ 1644 NONAME ABSENT ; QDeclarativePropertyChanges::~QDeclarativePropertyChanges(unsigned int)
 	?setObject@QDeclarativePropertyChanges@@QAEXPAVQObject@@@Z @ 1645 NONAME ABSENT ; void QDeclarativePropertyChanges::setObject(class QObject *)
 	?staticMetaObject@QDeclarativePropertyChanges@@2UQMetaObject@@B @ 1646 NONAME ABSENT ; struct QMetaObject const QDeclarativePropertyChanges::staticMetaObject
-	?removeEntryFromRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@@Z @ 1647 NONAME ABSENT ; bool QDeclarativeState::removeEntryFromRevertList(class QObject *, class QByteArray const &)
+	?removeEntryFromRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@@Z @ 1647 NONAME ; bool QDeclarativeState::removeEntryFromRevertList(class QObject *, class QByteArray const &)
 	?restoreEntryValues@QDeclarativePropertyChanges@@QBE_NXZ @ 1648 NONAME ABSENT ; bool QDeclarativePropertyChanges::restoreEntryValues(void) const
 	?setRestoreEntryValues@QDeclarativePropertyChanges@@QAEX_N@Z @ 1649 NONAME ABSENT ; void QDeclarativePropertyChanges::setRestoreEntryValues(bool)
 	?changeValue@QDeclarativePropertyChanges@@QAEXABVQByteArray@@ABVQVariant@@@Z @ 1650 NONAME ABSENT ; void QDeclarativePropertyChanges::changeValue(class QByteArray const &, class QVariant const &)
 	?metaObject@QDeclarativePropertyChanges@@UBEPBUQMetaObject@@XZ @ 1651 NONAME ABSENT ; struct QMetaObject const * QDeclarativePropertyChanges::metaObject(void) const
 	?data_clear@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 1652 NONAME ; void QDeclarativeItemPrivate::data_clear(class QDeclarativeListProperty<class QObject> *)
-	?containsPropertyInRevertList@QDeclarativeState@@QBE_NPAVQObject@@ABVQByteArray@@@Z @ 1653 NONAME ABSENT ; bool QDeclarativeState::containsPropertyInRevertList(class QObject *, class QByteArray const &) const
+	?containsPropertyInRevertList@QDeclarativeState@@QBE_NPAVQObject@@ABVQByteArray@@@Z @ 1653 NONAME ; bool QDeclarativeState::containsPropertyInRevertList(class QObject *, class QByteArray const &) const
 	?containsValue@QDeclarativePropertyChanges@@QBE_NABVQByteArray@@@Z @ 1654 NONAME ABSENT ; bool QDeclarativePropertyChanges::containsValue(class QByteArray const &) const
-	?bindingInRevertList@QDeclarativeState@@QBEPAVQDeclarativeAbstractBinding@@PAVQObject@@ABVQByteArray@@@Z @ 1655 NONAME ABSENT ; class QDeclarativeAbstractBinding * QDeclarativeState::bindingInRevertList(class QObject *, class QByteArray const &) const
+	?bindingInRevertList@QDeclarativeState@@QBEPAVQDeclarativeAbstractBinding@@PAVQObject@@ABVQByteArray@@@Z @ 1655 NONAME ; class QDeclarativeAbstractBinding * QDeclarativeState::bindingInRevertList(class QObject *, class QByteArray const &) const
 	?d_func@QDeclarativePropertyChanges@@ABEPBVQDeclarativePropertyChangesPrivate@@XZ @ 1656 NONAME ABSENT ; class QDeclarativePropertyChangesPrivate const * QDeclarativePropertyChanges::d_func(void) const
 	?containsProperty@QDeclarativePropertyChanges@@QBE_NABVQByteArray@@@Z @ 1657 NONAME ABSENT ; bool QDeclarativePropertyChanges::containsProperty(class QByteArray const &) const
 	?trUtf8@QDeclarativePropertyChanges@@SA?AVQString@@PBD0H@Z @ 1658 NONAME ABSENT ; class QString QDeclarativePropertyChanges::trUtf8(char const *, char const *, int)
 	?property@QDeclarativePropertyChanges@@QBE?AVQVariant@@ABVQByteArray@@@Z @ 1659 NONAME ABSENT ; class QVariant QDeclarativePropertyChanges::property(class QByteArray const &) const
 	?containsExpression@QDeclarativePropertyChanges@@QBE_NABVQByteArray@@@Z @ 1660 NONAME ABSENT ; bool QDeclarativePropertyChanges::containsExpression(class QByteArray const &) const
-	?d_func@QDeclarativeStateOperation@@ABEPBVQDeclarativeStateOperationPrivate@@XZ @ 1661 NONAME ABSENT ; class QDeclarativeStateOperationPrivate const * QDeclarativeStateOperation::d_func(void) const
+	?d_func@QDeclarativeStateOperation@@ABEPBVQDeclarativeStateOperationPrivate@@XZ @ 1661 NONAME ; class QDeclarativeStateOperationPrivate const * QDeclarativeStateOperation::d_func(void) const
 	?d_func@QDeclarativePropertyChanges@@AAEPAVQDeclarativePropertyChangesPrivate@@XZ @ 1662 NONAME ABSENT ; class QDeclarativePropertyChangesPrivate * QDeclarativePropertyChanges::d_func(void)
-	?state@QDeclarativeStateOperation@@QBEPAVQDeclarativeState@@XZ @ 1663 NONAME ABSENT ; class QDeclarativeState * QDeclarativeStateOperation::state(void) const
+	?state@QDeclarativeStateOperation@@QBEPAVQDeclarativeState@@XZ @ 1663 NONAME ; class QDeclarativeState * QDeclarativeStateOperation::state(void) const
 	?value@QDeclarativePropertyChanges@@QBE?AVQVariant@@ABVQByteArray@@@Z @ 1664 NONAME ABSENT ; class QVariant QDeclarativePropertyChanges::value(class QByteArray const &) const
 	?qt_metacall@QDeclarativePropertyChanges@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1665 NONAME ABSENT ; int QDeclarativePropertyChanges::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?trUtf8@QDeclarativePropertyChanges@@SA?AVQString@@PBD0@Z @ 1666 NONAME ABSENT ; class QString QDeclarativePropertyChanges::trUtf8(char const *, char const *)
 	?attachToState@QDeclarativePropertyChanges@@QAEXXZ @ 1667 NONAME ABSENT ; void QDeclarativePropertyChanges::attachToState(void)
 	?changeExpression@QDeclarativePropertyChanges@@QAEXABVQByteArray@@ABVQString@@@Z @ 1668 NONAME ABSENT ; void QDeclarativePropertyChanges::changeExpression(class QByteArray const &, class QString const &)
-	?addEntryToRevertList@QDeclarativeState@@QAEXABVQDeclarativeAction@@@Z @ 1669 NONAME ABSENT ; void QDeclarativeState::addEntryToRevertList(class QDeclarativeAction const &)
+	?addEntryToRevertList@QDeclarativeState@@QAEXABVQDeclarativeAction@@@Z @ 1669 NONAME ; void QDeclarativeState::addEntryToRevertList(class QDeclarativeAction const &)
 	??0QDeclarativePropertyChanges@@QAE@XZ @ 1670 NONAME ABSENT ; QDeclarativePropertyChanges::QDeclarativePropertyChanges(void)
 	?resources_clear@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 1671 NONAME ; void QDeclarativeItemPrivate::resources_clear(class QDeclarativeListProperty<class QObject> *)
 	?isExplicit@QDeclarativePropertyChanges@@QBE_NXZ @ 1672 NONAME ABSENT ; bool QDeclarativePropertyChanges::isExplicit(void) const
-	?setState@QDeclarativeStateOperation@@QAEXPAVQDeclarativeState@@@Z @ 1673 NONAME ABSENT ; void QDeclarativeStateOperation::setState(class QDeclarativeState *)
+	?setState@QDeclarativeStateOperation@@QAEXPAVQDeclarativeState@@@Z @ 1673 NONAME ; void QDeclarativeStateOperation::setState(class QDeclarativeState *)
 	?detachFromState@QDeclarativePropertyChanges@@QAEXXZ @ 1674 NONAME ABSENT ; void QDeclarativePropertyChanges::detachFromState(void)
 	?tr@QDeclarativePropertyChanges@@SA?AVQString@@PBD0H@Z @ 1675 NONAME ABSENT ; class QString QDeclarativePropertyChanges::tr(char const *, char const *, int)
-	?addEntriesToRevertList@QDeclarativeState@@QAEXABV?$QList@VQDeclarativeAction@@@@@Z @ 1676 NONAME ABSENT ; void QDeclarativeState::addEntriesToRevertList(class QList<class QDeclarativeAction> const &)
+	?addEntriesToRevertList@QDeclarativeState@@QAEXABV?$QList@VQDeclarativeAction@@@@@Z @ 1676 NONAME ; void QDeclarativeState::addEntriesToRevertList(class QList<class QDeclarativeAction> const &)
 	?expression@QDeclarativePropertyChanges@@QBE?AVQString@@ABVQByteArray@@@Z @ 1677 NONAME ABSENT ; class QString QDeclarativePropertyChanges::expression(class QByteArray const &) const
 	?object@QDeclarativePropertyChanges@@QBEPAVQObject@@XZ @ 1678 NONAME ABSENT ; class QObject * QDeclarativePropertyChanges::object(void) const
-	?valueInRevertList@QDeclarativeState@@QBE?AVQVariant@@PAVQObject@@ABVQByteArray@@@Z @ 1679 NONAME ABSENT ; class QVariant QDeclarativeState::valueInRevertList(class QObject *, class QByteArray const &) const
-	?removeAllEntriesFromRevertList@QDeclarativeState@@QAEXPAVQObject@@@Z @ 1680 NONAME ABSENT ; void QDeclarativeState::removeAllEntriesFromRevertList(class QObject *)
-	?d_func@QDeclarativeStateOperation@@AAEPAVQDeclarativeStateOperationPrivate@@XZ @ 1681 NONAME ABSENT ; class QDeclarativeStateOperationPrivate * QDeclarativeStateOperation::d_func(void)
-	?changeValueInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@ABVQVariant@@@Z @ 1682 NONAME ABSENT ; bool QDeclarativeState::changeValueInRevertList(class QObject *, class QByteArray const &, class QVariant const &)
+	?valueInRevertList@QDeclarativeState@@QBE?AVQVariant@@PAVQObject@@ABVQByteArray@@@Z @ 1679 NONAME ; class QVariant QDeclarativeState::valueInRevertList(class QObject *, class QByteArray const &) const
+	?removeAllEntriesFromRevertList@QDeclarativeState@@QAEXPAVQObject@@@Z @ 1680 NONAME ; void QDeclarativeState::removeAllEntriesFromRevertList(class QObject *)
+	?d_func@QDeclarativeStateOperation@@AAEPAVQDeclarativeStateOperationPrivate@@XZ @ 1681 NONAME ; class QDeclarativeStateOperationPrivate * QDeclarativeStateOperation::d_func(void)
+	?changeValueInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@ABVQVariant@@@Z @ 1682 NONAME ; bool QDeclarativeState::changeValueInRevertList(class QObject *, class QByteArray const &, class QVariant const &)
 	?setIsExplicit@QDeclarativePropertyChanges@@QAEX_N@Z @ 1683 NONAME ABSENT ; void QDeclarativePropertyChanges::setIsExplicit(bool)
-	?isStateActive@QDeclarativeState@@QBE_NXZ @ 1684 NONAME ABSENT ; bool QDeclarativeState::isStateActive(void) const
+	?isStateActive@QDeclarativeState@@QBE_NXZ @ 1684 NONAME ; bool QDeclarativeState::isStateActive(void) const
 	?data_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 1685 NONAME ; int QDeclarativeItemPrivate::data_count(class QDeclarativeListProperty<class QObject> *)
 	?removeProperty@QDeclarativePropertyChanges@@QAEXABVQByteArray@@@Z @ 1686 NONAME ABSENT ; void QDeclarativePropertyChanges::removeProperty(class QByteArray const &)
 	?data_at@QDeclarativeItemPrivate@@SAPAVQObject@@PAV?$QDeclarativeListProperty@VQObject@@@@H@Z @ 1687 NONAME ; class QObject * QDeclarativeItemPrivate::data_at(class QDeclarativeListProperty<class QObject> *, int)
 	?tr@QDeclarativePropertyChanges@@SA?AVQString@@PBD0@Z @ 1688 NONAME ABSENT ; class QString QDeclarativePropertyChanges::tr(char const *, char const *)
-	?changeBindingInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@PAVQDeclarativeAbstractBinding@@@Z @ 1689 NONAME ABSENT ; bool QDeclarativeState::changeBindingInRevertList(class QObject *, class QByteArray const &, class QDeclarativeAbstractBinding *)
+	?changeBindingInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@PAVQDeclarativeAbstractBinding@@@Z @ 1689 NONAME ; bool QDeclarativeState::changeBindingInRevertList(class QObject *, class QByteArray const &, class QDeclarativeAbstractBinding *)
 	?getStaticMetaObject@QDeclarativePropertyChanges@@SAABUQMetaObject@@XZ @ 1690 NONAME ABSENT ; struct QMetaObject const & QDeclarativePropertyChanges::getStaticMetaObject(void)
 	?weakPointer@QDeclarativeAbstractBinding@@QAE?AV?$QWeakPointer@VQDeclarativeAbstractBinding@@@@XZ @ 1691 NONAME ABSENT ; class QWeakPointer<class QDeclarativeAbstractBinding> QDeclarativeAbstractBinding::weakPointer(void)
 	?getStaticMetaObject@QDeclarativeScriptAction@@SAABUQMetaObject@@XZ @ 1692 NONAME ABSENT ; struct QMetaObject const & QDeclarativeScriptAction::getStaticMetaObject(void)
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 33c3d53..849ca6a 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -170,24 +170,24 @@ EXPORTS
 	_ZN17QDeclarativeErrorD1Ev @ 169 NONAME
 	_ZN17QDeclarativeErrorD2Ev @ 170 NONAME
 	_ZN17QDeclarativeErroraSERKS_ @ 171 NONAME
-	_ZN17QDeclarativeState10setExtendsERK7QString @ 172 NONAME ABSENT
-	_ZN17QDeclarativeState11qt_metacallEN11QMetaObject4CallEiPPv @ 173 NONAME ABSENT
-	_ZN17QDeclarativeState11qt_metacastEPKc @ 174 NONAME ABSENT
-	_ZN17QDeclarativeState13setStateGroupEP22QDeclarativeStateGroup @ 175 NONAME ABSENT
-	_ZN17QDeclarativeState16staticMetaObjectE @ 176 NONAME DATA 16 ABSENT
-	_ZN17QDeclarativeState19getStaticMetaObjectEv @ 177 NONAME ABSENT
-	_ZN17QDeclarativeState5applyEP22QDeclarativeStateGroupP22QDeclarativeTransitionPS_ @ 178 NONAME ABSENT
-	_ZN17QDeclarativeState6cancelEv @ 179 NONAME ABSENT
-	_ZN17QDeclarativeState7changesEv @ 180 NONAME ABSENT
-	_ZN17QDeclarativeState7setNameERK7QString @ 181 NONAME ABSENT
-	_ZN17QDeclarativeState7setWhenEP19QDeclarativeBinding @ 182 NONAME ABSENT
-	_ZN17QDeclarativeState9completedEv @ 183 NONAME ABSENT
-	_ZN17QDeclarativeStateC1EP7QObject @ 184 NONAME ABSENT
-	_ZN17QDeclarativeStateC2EP7QObject @ 185 NONAME ABSENT
-	_ZN17QDeclarativeStateD0Ev @ 186 NONAME ABSENT
-	_ZN17QDeclarativeStateD1Ev @ 187 NONAME ABSENT
-	_ZN17QDeclarativeStateD2Ev @ 188 NONAME ABSENT
-	_ZN17QDeclarativeStatelsEP26QDeclarativeStateOperation @ 189 NONAME ABSENT
+	_ZN17QDeclarativeState10setExtendsERK7QString @ 172 NONAME
+	_ZN17QDeclarativeState11qt_metacallEN11QMetaObject4CallEiPPv @ 173 NONAME
+	_ZN17QDeclarativeState11qt_metacastEPKc @ 174 NONAME
+	_ZN17QDeclarativeState13setStateGroupEP22QDeclarativeStateGroup @ 175 NONAME
+	_ZN17QDeclarativeState16staticMetaObjectE @ 176 NONAME DATA 16
+	_ZN17QDeclarativeState19getStaticMetaObjectEv @ 177 NONAME
+	_ZN17QDeclarativeState5applyEP22QDeclarativeStateGroupP22QDeclarativeTransitionPS_ @ 178 NONAME
+	_ZN17QDeclarativeState6cancelEv @ 179 NONAME
+	_ZN17QDeclarativeState7changesEv @ 180 NONAME
+	_ZN17QDeclarativeState7setNameERK7QString @ 181 NONAME
+	_ZN17QDeclarativeState7setWhenEP19QDeclarativeBinding @ 182 NONAME
+	_ZN17QDeclarativeState9completedEv @ 183 NONAME
+	_ZN17QDeclarativeStateC1EP7QObject @ 184 NONAME
+	_ZN17QDeclarativeStateC2EP7QObject @ 185 NONAME
+	_ZN17QDeclarativeStateD0Ev @ 186 NONAME
+	_ZN17QDeclarativeStateD1Ev @ 187 NONAME
+	_ZN17QDeclarativeStateD2Ev @ 188 NONAME
+	_ZN17QDeclarativeStatelsEP26QDeclarativeStateOperation @ 189 NONAME
 	_ZN18QDeclarativeAction17deleteFromBindingEv @ 190 NONAME ABSENT
 	_ZN18QDeclarativeActionC1EP7QObjectRK7QStringP19QDeclarativeContextRK8QVariant @ 191 NONAME ABSENT
 	_ZN18QDeclarativeActionC1EP7QObjectRK7QStringRK8QVariant @ 192 NONAME ABSENT
@@ -637,42 +637,42 @@ EXPORTS
 	_ZN22QDeclarativeExpressionD0Ev @ 636 NONAME
 	_ZN22QDeclarativeExpressionD1Ev @ 637 NONAME
 	_ZN22QDeclarativeExpressionD2Ev @ 638 NONAME
-	_ZN22QDeclarativeStateGroup10classBeginEv @ 639 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup11qt_metacallEN11QMetaObject4CallEiPPv @ 640 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup11qt_metacastEPKc @ 641 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup11removeStateEP17QDeclarativeState @ 642 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup12stateChangedERK7QString @ 643 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup14statesPropertyEv @ 644 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup15updateAutoStateEv @ 645 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup16staticMetaObjectE @ 646 NONAME DATA 16 ABSENT
-	_ZN22QDeclarativeStateGroup17componentCompleteEv @ 647 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup19getStaticMetaObjectEv @ 648 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup19transitionsPropertyEv @ 649 NONAME ABSENT
-	_ZN22QDeclarativeStateGroup8setStateERK7QString @ 650 NONAME ABSENT
-	_ZN22QDeclarativeStateGroupC1EP7QObject @ 651 NONAME ABSENT
-	_ZN22QDeclarativeStateGroupC2EP7QObject @ 652 NONAME ABSENT
-	_ZN22QDeclarativeStateGroupD0Ev @ 653 NONAME ABSENT
-	_ZN22QDeclarativeStateGroupD1Ev @ 654 NONAME ABSENT
-	_ZN22QDeclarativeStateGroupD2Ev @ 655 NONAME ABSENT
-	_ZN22QDeclarativeTransition10animationsEv @ 656 NONAME ABSENT
-	_ZN22QDeclarativeTransition10setToStateERK7QString @ 657 NONAME ABSENT
-	_ZN22QDeclarativeTransition11fromChangedEv @ 658 NONAME ABSENT
-	_ZN22QDeclarativeTransition11qt_metacallEN11QMetaObject4CallEiPPv @ 659 NONAME ABSENT
-	_ZN22QDeclarativeTransition11qt_metacastEPKc @ 660 NONAME ABSENT
-	_ZN22QDeclarativeTransition11setReversedEb @ 661 NONAME ABSENT
-	_ZN22QDeclarativeTransition12setFromStateERK7QString @ 662 NONAME ABSENT
-	_ZN22QDeclarativeTransition13setReversibleEb @ 663 NONAME ABSENT
-	_ZN22QDeclarativeTransition16staticMetaObjectE @ 664 NONAME DATA 16 ABSENT
-	_ZN22QDeclarativeTransition17reversibleChangedEv @ 665 NONAME ABSENT
-	_ZN22QDeclarativeTransition19getStaticMetaObjectEv @ 666 NONAME ABSENT
-	_ZN22QDeclarativeTransition4stopEv @ 667 NONAME ABSENT
-	_ZN22QDeclarativeTransition7prepareER5QListI18QDeclarativeActionERS0_I20QDeclarativePropertyEP29QDeclarativeTransitionManager @ 668 NONAME ABSENT
-	_ZN22QDeclarativeTransition9toChangedEv @ 669 NONAME ABSENT
-	_ZN22QDeclarativeTransitionC1EP7QObject @ 670 NONAME ABSENT
-	_ZN22QDeclarativeTransitionC2EP7QObject @ 671 NONAME ABSENT
-	_ZN22QDeclarativeTransitionD0Ev @ 672 NONAME ABSENT
-	_ZN22QDeclarativeTransitionD1Ev @ 673 NONAME ABSENT
-	_ZN22QDeclarativeTransitionD2Ev @ 674 NONAME ABSENT
+	_ZN22QDeclarativeStateGroup10classBeginEv @ 639 NONAME
+	_ZN22QDeclarativeStateGroup11qt_metacallEN11QMetaObject4CallEiPPv @ 640 NONAME
+	_ZN22QDeclarativeStateGroup11qt_metacastEPKc @ 641 NONAME
+	_ZN22QDeclarativeStateGroup11removeStateEP17QDeclarativeState @ 642 NONAME
+	_ZN22QDeclarativeStateGroup12stateChangedERK7QString @ 643 NONAME
+	_ZN22QDeclarativeStateGroup14statesPropertyEv @ 644 NONAME
+	_ZN22QDeclarativeStateGroup15updateAutoStateEv @ 645 NONAME
+	_ZN22QDeclarativeStateGroup16staticMetaObjectE @ 646 NONAME DATA 16
+	_ZN22QDeclarativeStateGroup17componentCompleteEv @ 647 NONAME
+	_ZN22QDeclarativeStateGroup19getStaticMetaObjectEv @ 648 NONAME
+	_ZN22QDeclarativeStateGroup19transitionsPropertyEv @ 649 NONAME
+	_ZN22QDeclarativeStateGroup8setStateERK7QString @ 650 NONAME
+	_ZN22QDeclarativeStateGroupC1EP7QObject @ 651 NONAME
+	_ZN22QDeclarativeStateGroupC2EP7QObject @ 652 NONAME
+	_ZN22QDeclarativeStateGroupD0Ev @ 653 NONAME
+	_ZN22QDeclarativeStateGroupD1Ev @ 654 NONAME
+	_ZN22QDeclarativeStateGroupD2Ev @ 655 NONAME
+	_ZN22QDeclarativeTransition10animationsEv @ 656 NONAME
+	_ZN22QDeclarativeTransition10setToStateERK7QString @ 657 NONAME
+	_ZN22QDeclarativeTransition11fromChangedEv @ 658 NONAME
+	_ZN22QDeclarativeTransition11qt_metacallEN11QMetaObject4CallEiPPv @ 659 NONAME
+	_ZN22QDeclarativeTransition11qt_metacastEPKc @ 660 NONAME
+	_ZN22QDeclarativeTransition11setReversedEb @ 661 NONAME
+	_ZN22QDeclarativeTransition12setFromStateERK7QString @ 662 NONAME
+	_ZN22QDeclarativeTransition13setReversibleEb @ 663 NONAME
+	_ZN22QDeclarativeTransition16staticMetaObjectE @ 664 NONAME DATA 16
+	_ZN22QDeclarativeTransition17reversibleChangedEv @ 665 NONAME
+	_ZN22QDeclarativeTransition19getStaticMetaObjectEv @ 666 NONAME
+	_ZN22QDeclarativeTransition4stopEv @ 667 NONAME
+	_ZN22QDeclarativeTransition7prepareER5QListI18QDeclarativeActionERS0_I20QDeclarativePropertyEP29QDeclarativeTransitionManager @ 668 NONAME
+	_ZN22QDeclarativeTransition9toChangedEv @ 669 NONAME
+	_ZN22QDeclarativeTransitionC1EP7QObject @ 670 NONAME
+	_ZN22QDeclarativeTransitionC2EP7QObject @ 671 NONAME
+	_ZN22QDeclarativeTransitionD0Ev @ 672 NONAME
+	_ZN22QDeclarativeTransitionD1Ev @ 673 NONAME
+	_ZN22QDeclarativeTransitionD2Ev @ 674 NONAME
 	_ZN23QDeclarativeDebugClient10setEnabledEb @ 675 NONAME ABSENT
 	_ZN23QDeclarativeDebugClient11qt_metacallEN11QMetaObject4CallEiPPv @ 676 NONAME ABSENT
 	_ZN23QDeclarativeDebugClient11qt_metacastEPKc @ 677 NONAME ABSENT
@@ -835,13 +835,13 @@ EXPORTS
 	_ZN26QDeclarativeOpenMetaObjectD2Ev @ 834 NONAME ABSENT
 	_ZN26QDeclarativeOpenMetaObjectixERK10QByteArray @ 835 NONAME ABSENT
 	_ZN26QDeclarativeOpenMetaObjectixEi @ 836 NONAME ABSENT
-	_ZN26QDeclarativeStateOperation11qt_metacallEN11QMetaObject4CallEiPPv @ 837 NONAME ABSENT
-	_ZN26QDeclarativeStateOperation11qt_metacastEPKc @ 838 NONAME ABSENT
-	_ZN26QDeclarativeStateOperation16staticMetaObjectE @ 839 NONAME DATA 16 ABSENT
-	_ZN26QDeclarativeStateOperation19getStaticMetaObjectEv @ 840 NONAME ABSENT
-	_ZN26QDeclarativeStateOperation7actionsEv @ 841 NONAME ABSENT
-	_ZN26QDeclarativeStateOperationC1ER14QObjectPrivateP7QObject @ 842 NONAME ABSENT
-	_ZN26QDeclarativeStateOperationC2ER14QObjectPrivateP7QObject @ 843 NONAME ABSENT
+	_ZN26QDeclarativeStateOperation11qt_metacallEN11QMetaObject4CallEiPPv @ 837 NONAME
+	_ZN26QDeclarativeStateOperation11qt_metacastEPKc @ 838 NONAME
+	_ZN26QDeclarativeStateOperation16staticMetaObjectE @ 839 NONAME DATA 16
+	_ZN26QDeclarativeStateOperation19getStaticMetaObjectEv @ 840 NONAME
+	_ZN26QDeclarativeStateOperation7actionsEv @ 841 NONAME
+	_ZN26QDeclarativeStateOperationC1ER14QObjectPrivateP7QObject @ 842 NONAME
+	_ZN26QDeclarativeStateOperationC2ER14QObjectPrivateP7QObject @ 843 NONAME
 	_ZN27QDeclarativeAbstractBinding10setEnabledEb6QFlagsIN27QDeclarativePropertyPrivate9WriteFlagEE @ 844 NONAME ABSENT
 	_ZN27QDeclarativeAbstractBinding11addToObjectEP7QObject @ 845 NONAME ABSENT
 	_ZN27QDeclarativeAbstractBinding16removeFromObjectEv @ 846 NONAME ABSENT
@@ -1156,15 +1156,15 @@ EXPORTS
 	_ZNK17QDeclarativeError6columnEv @ 1155 NONAME
 	_ZNK17QDeclarativeError7isValidEv @ 1156 NONAME
 	_ZNK17QDeclarativeError8toStringEv @ 1157 NONAME
-	_ZNK17QDeclarativeState10metaObjectEv @ 1158 NONAME ABSENT
-	_ZNK17QDeclarativeState10stateGroupEv @ 1159 NONAME ABSENT
-	_ZNK17QDeclarativeState11isWhenKnownEv @ 1160 NONAME ABSENT
-	_ZNK17QDeclarativeState11operationAtEi @ 1161 NONAME ABSENT
-	_ZNK17QDeclarativeState14operationCountEv @ 1162 NONAME ABSENT
-	_ZNK17QDeclarativeState4nameEv @ 1163 NONAME ABSENT
-	_ZNK17QDeclarativeState4whenEv @ 1164 NONAME ABSENT
-	_ZNK17QDeclarativeState7extendsEv @ 1165 NONAME ABSENT
-	_ZNK17QDeclarativeState7isNamedEv @ 1166 NONAME ABSENT
+	_ZNK17QDeclarativeState10metaObjectEv @ 1158 NONAME
+	_ZNK17QDeclarativeState10stateGroupEv @ 1159 NONAME
+	_ZNK17QDeclarativeState11isWhenKnownEv @ 1160 NONAME
+	_ZNK17QDeclarativeState11operationAtEi @ 1161 NONAME
+	_ZNK17QDeclarativeState14operationCountEv @ 1162 NONAME
+	_ZNK17QDeclarativeState4nameEv @ 1163 NONAME
+	_ZNK17QDeclarativeState4whenEv @ 1164 NONAME
+	_ZNK17QDeclarativeState7extendsEv @ 1165 NONAME
+	_ZNK17QDeclarativeState7isNamedEv @ 1166 NONAME
 	_ZNK18QDeclarativeEngine10metaObjectEv @ 1167 NONAME
 	_ZNK18QDeclarativeEngine11rootContextEv @ 1168 NONAME
 	_ZNK18QDeclarativeEngine13imageProviderERK7QString @ 1169 NONAME
@@ -1381,14 +1381,14 @@ EXPORTS
 	_ZNK22QDeclarativeExpression6engineEv @ 1380 NONAME
 	_ZNK22QDeclarativeExpression7contextEv @ 1381 NONAME
 	_ZNK22QDeclarativeExpression8hasErrorEv @ 1382 NONAME
-	_ZNK22QDeclarativeStateGroup10metaObjectEv @ 1383 NONAME ABSENT
-	_ZNK22QDeclarativeStateGroup5stateEv @ 1384 NONAME ABSENT
-	_ZNK22QDeclarativeStateGroup6statesEv @ 1385 NONAME ABSENT
-	_ZNK22QDeclarativeStateGroup9findStateERK7QString @ 1386 NONAME ABSENT
-	_ZNK22QDeclarativeTransition10metaObjectEv @ 1387 NONAME ABSENT
-	_ZNK22QDeclarativeTransition10reversibleEv @ 1388 NONAME ABSENT
-	_ZNK22QDeclarativeTransition7toStateEv @ 1389 NONAME ABSENT
-	_ZNK22QDeclarativeTransition9fromStateEv @ 1390 NONAME ABSENT
+	_ZNK22QDeclarativeStateGroup10metaObjectEv @ 1383 NONAME
+	_ZNK22QDeclarativeStateGroup5stateEv @ 1384 NONAME
+	_ZNK22QDeclarativeStateGroup6statesEv @ 1385 NONAME
+	_ZNK22QDeclarativeStateGroup9findStateERK7QString @ 1386 NONAME
+	_ZNK22QDeclarativeTransition10metaObjectEv @ 1387 NONAME
+	_ZNK22QDeclarativeTransition10reversibleEv @ 1388 NONAME
+	_ZNK22QDeclarativeTransition7toStateEv @ 1389 NONAME
+	_ZNK22QDeclarativeTransition9fromStateEv @ 1390 NONAME
 	_ZNK23QDeclarativeDebugClient10metaObjectEv @ 1391 NONAME ABSENT
 	_ZNK23QDeclarativeDebugClient11isConnectedEv @ 1392 NONAME ABSENT
 	_ZNK23QDeclarativeDebugClient4nameEv @ 1393 NONAME ABSENT
@@ -1452,7 +1452,7 @@ EXPORTS
 	_ZNK26QDeclarativeOpenMetaObject6objectEv @ 1451 NONAME ABSENT
 	_ZNK26QDeclarativeOpenMetaObject6parentEv @ 1452 NONAME ABSENT
 	_ZNK26QDeclarativeOpenMetaObject8hasValueEi @ 1453 NONAME ABSENT
-	_ZNK26QDeclarativeStateOperation10metaObjectEv @ 1454 NONAME ABSENT
+	_ZNK26QDeclarativeStateOperation10metaObjectEv @ 1454 NONAME
 	_ZNK27QDeclarativeAbstractBinding10expressionEv @ 1455 NONAME ABSENT
 	_ZNK27QDeclarativeDebugConnection10metaObjectEv @ 1456 NONAME ABSENT
 	_ZNK27QDeclarativeDebugConnection11isConnectedEv @ 1457 NONAME ABSENT
@@ -1531,7 +1531,7 @@ EXPORTS
 	_ZTI16QDeclarativeItem @ 1530 NONAME
 	_ZTI16QDeclarativeText @ 1531 NONAME ABSENT
 	_ZTI16QDeclarativeView @ 1532 NONAME
-	_ZTI17QDeclarativeState @ 1533 NONAME ABSENT
+	_ZTI17QDeclarativeState @ 1533 NONAME
 	_ZTI18QDeclarativeEngine @ 1534 NONAME
 	_ZTI18QMetaObjectBuilder @ 1535 NONAME ABSENT
 	_ZTI19QDeclarativeAnchors @ 1536 NONAME ABSENT
@@ -1547,8 +1547,8 @@ EXPORTS
 	_ZTI22QDeclarativeDebugQuery @ 1546 NONAME ABSENT
 	_ZTI22QDeclarativeDebugWatch @ 1547 NONAME ABSENT
 	_ZTI22QDeclarativeExpression @ 1548 NONAME
-	_ZTI22QDeclarativeStateGroup @ 1549 NONAME ABSENT
-	_ZTI22QDeclarativeTransition @ 1550 NONAME ABSENT
+	_ZTI22QDeclarativeStateGroup @ 1549 NONAME
+	_ZTI22QDeclarativeTransition @ 1550 NONAME
 	_ZTI23QDeclarativeDebugClient @ 1551 NONAME ABSENT
 	_ZTI23QDeclarativeEngineDebug @ 1552 NONAME ABSENT
 	_ZTI23QDeclarativeItemPrivate @ 1553 NONAME
@@ -1559,7 +1559,7 @@ EXPORTS
 	_ZTI25QDeclarativeImageProvider @ 1558 NONAME
 	_ZTI26QDeclarativeDebuggerStatus @ 1559 NONAME ABSENT
 	_ZTI26QDeclarativeOpenMetaObject @ 1560 NONAME ABSENT
-	_ZTI26QDeclarativeStateOperation @ 1561 NONAME ABSENT
+	_ZTI26QDeclarativeStateOperation @ 1561 NONAME
 	_ZTI27QDeclarativeAbstractBinding @ 1562 NONAME ABSENT
 	_ZTI27QDeclarativeDebugConnection @ 1563 NONAME ABSENT
 	_ZTI27QDeclarativeExtensionPlugin @ 1564 NONAME
@@ -1581,7 +1581,7 @@ EXPORTS
 	_ZTV16QDeclarativeItem @ 1580 NONAME
 	_ZTV16QDeclarativeText @ 1581 NONAME ABSENT
 	_ZTV16QDeclarativeView @ 1582 NONAME
-	_ZTV17QDeclarativeState @ 1583 NONAME ABSENT
+	_ZTV17QDeclarativeState @ 1583 NONAME
 	_ZTV18QDeclarativeEngine @ 1584 NONAME
 	_ZTV18QMetaObjectBuilder @ 1585 NONAME ABSENT
 	_ZTV19QDeclarativeAnchors @ 1586 NONAME ABSENT
@@ -1597,8 +1597,8 @@ EXPORTS
 	_ZTV22QDeclarativeDebugQuery @ 1596 NONAME ABSENT
 	_ZTV22QDeclarativeDebugWatch @ 1597 NONAME ABSENT
 	_ZTV22QDeclarativeExpression @ 1598 NONAME
-	_ZTV22QDeclarativeStateGroup @ 1599 NONAME ABSENT
-	_ZTV22QDeclarativeTransition @ 1600 NONAME ABSENT
+	_ZTV22QDeclarativeStateGroup @ 1599 NONAME
+	_ZTV22QDeclarativeTransition @ 1600 NONAME
 	_ZTV23QDeclarativeDebugClient @ 1601 NONAME ABSENT
 	_ZTV23QDeclarativeEngineDebug @ 1602 NONAME ABSENT
 	_ZTV23QDeclarativeItemPrivate @ 1603 NONAME
@@ -1609,7 +1609,7 @@ EXPORTS
 	_ZTV25QDeclarativeImageProvider @ 1608 NONAME
 	_ZTV26QDeclarativeDebuggerStatus @ 1609 NONAME ABSENT
 	_ZTV26QDeclarativeOpenMetaObject @ 1610 NONAME ABSENT
-	_ZTV26QDeclarativeStateOperation @ 1611 NONAME ABSENT
+	_ZTV26QDeclarativeStateOperation @ 1611 NONAME
 	_ZTV27QDeclarativeAbstractBinding @ 1612 NONAME ABSENT
 	_ZTV27QDeclarativeDebugConnection @ 1613 NONAME ABSENT
 	_ZTV27QDeclarativeExtensionPlugin @ 1614 NONAME
@@ -1656,10 +1656,10 @@ EXPORTS
 	_ZThn8_N20QDeclarativeBehaviorD0Ev @ 1655 NONAME ABSENT
 	_ZThn8_N20QDeclarativeBehaviorD1Ev @ 1656 NONAME ABSENT
 	_ZThn8_N21QDeclarativeRectangle5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 1657 NONAME ABSENT
-	_ZThn8_N22QDeclarativeStateGroup10classBeginEv @ 1658 NONAME ABSENT
-	_ZThn8_N22QDeclarativeStateGroup17componentCompleteEv @ 1659 NONAME ABSENT
-	_ZThn8_N22QDeclarativeStateGroupD0Ev @ 1660 NONAME ABSENT
-	_ZThn8_N22QDeclarativeStateGroupD1Ev @ 1661 NONAME ABSENT
+	_ZThn8_N22QDeclarativeStateGroup10classBeginEv @ 1658 NONAME
+	_ZThn8_N22QDeclarativeStateGroup17componentCompleteEv @ 1659 NONAME
+	_ZThn8_N22QDeclarativeStateGroupD0Ev @ 1660 NONAME
+	_ZThn8_N22QDeclarativeStateGroupD1Ev @ 1661 NONAME
 	_ZThn8_N27QDeclarativeExtensionPlugin16initializeEngineEP18QDeclarativeEnginePKc @ 1662 NONAME
 	_ZThn8_N27QDeclarativeExtensionPluginD0Ev @ 1663 NONAME
 	_ZThn8_N27QDeclarativeExtensionPluginD1Ev @ 1664 NONAME
@@ -1675,17 +1675,17 @@ EXPORTS
 	_ZrsR11QDataStreamRN29QDeclarativeEngineDebugServer22QDeclarativeObjectDataE @ 1674 NONAME ABSENT
 	_ZrsR11QDataStreamRN29QDeclarativeEngineDebugServer26QDeclarativeObjectPropertyE @ 1675 NONAME ABSENT
 	_ZN23QDeclarativeEngineDebug10newObjectsEv @ 1676 NONAME ABSENT
-	_ZN17QDeclarativeState20addEntryToRevertListERK18QDeclarativeAction @ 1677 NONAME ABSENT
-	_ZN17QDeclarativeState22addEntriesToRevertListERK5QListI18QDeclarativeActionE @ 1678 NONAME ABSENT
-	_ZN17QDeclarativeState23changeValueInRevertListEP7QObjectRK10QByteArrayRK8QVariant @ 1679 NONAME ABSENT
-	_ZN17QDeclarativeState25changeBindingInRevertListEP7QObjectRK10QByteArrayP27QDeclarativeAbstractBinding @ 1680 NONAME ABSENT
-	_ZN17QDeclarativeState25removeEntryFromRevertListEP7QObjectRK10QByteArray @ 1681 NONAME ABSENT
-	_ZN17QDeclarativeState30removeAllEntriesFromRevertListEP7QObject @ 1682 NONAME ABSENT
+	_ZN17QDeclarativeState20addEntryToRevertListERK18QDeclarativeAction @ 1677 NONAME
+	_ZN17QDeclarativeState22addEntriesToRevertListERK5QListI18QDeclarativeActionE @ 1678 NONAME
+	_ZN17QDeclarativeState23changeValueInRevertListEP7QObjectRK10QByteArrayRK8QVariant @ 1679 NONAME
+	_ZN17QDeclarativeState25changeBindingInRevertListEP7QObjectRK10QByteArrayP27QDeclarativeAbstractBinding @ 1680 NONAME
+	_ZN17QDeclarativeState25removeEntryFromRevertListEP7QObjectRK10QByteArray @ 1681 NONAME
+	_ZN17QDeclarativeState30removeAllEntriesFromRevertListEP7QObject @ 1682 NONAME
 	_ZN23QDeclarativeItemPrivate10data_clearEP24QDeclarativeListPropertyI7QObjectE @ 1683 NONAME
 	_ZN23QDeclarativeItemPrivate10data_countEP24QDeclarativeListPropertyI7QObjectE @ 1684 NONAME
 	_ZN23QDeclarativeItemPrivate15resources_clearEP24QDeclarativeListPropertyI7QObjectE @ 1685 NONAME
 	_ZN23QDeclarativeItemPrivate7data_atEP24QDeclarativeListPropertyI7QObjectEi @ 1686 NONAME
-	_ZN26QDeclarativeStateOperation8setStateEP17QDeclarativeState @ 1687 NONAME ABSENT
+	_ZN26QDeclarativeStateOperation8setStateEP17QDeclarativeState @ 1687 NONAME
 	_ZN27QDeclarativeAbstractBinding11weakPointerEv @ 1688 NONAME ABSENT
 	_ZN27QDeclarativePropertyChanges11changeValueERK10QByteArrayRK8QVariant @ 1689 NONAME ABSENT
 	_ZN27QDeclarativePropertyChanges11qt_metacallEN11QMetaObject4CallEiPPv @ 1690 NONAME ABSENT
@@ -1705,11 +1705,11 @@ EXPORTS
 	_ZN27QDeclarativePropertyChangesD0Ev @ 1704 NONAME ABSENT
 	_ZN27QDeclarativePropertyChangesD1Ev @ 1705 NONAME ABSENT
 	_ZN27QDeclarativePropertyChangesD2Ev @ 1706 NONAME ABSENT
-	_ZNK17QDeclarativeState13isStateActiveEv @ 1707 NONAME ABSENT
-	_ZNK17QDeclarativeState17valueInRevertListEP7QObjectRK10QByteArray @ 1708 NONAME ABSENT
-	_ZNK17QDeclarativeState19bindingInRevertListEP7QObjectRK10QByteArray @ 1709 NONAME ABSENT
-	_ZNK17QDeclarativeState28containsPropertyInRevertListEP7QObjectRK10QByteArray @ 1710 NONAME ABSENT
-	_ZNK26QDeclarativeStateOperation5stateEv @ 1711 NONAME ABSENT
+	_ZNK17QDeclarativeState13isStateActiveEv @ 1707 NONAME
+	_ZNK17QDeclarativeState17valueInRevertListEP7QObjectRK10QByteArray @ 1708 NONAME
+	_ZNK17QDeclarativeState19bindingInRevertListEP7QObjectRK10QByteArray @ 1709 NONAME
+	_ZNK17QDeclarativeState28containsPropertyInRevertListEP7QObjectRK10QByteArray @ 1710 NONAME
+	_ZNK26QDeclarativeStateOperation5stateEv @ 1711 NONAME
 	_ZNK27QDeclarativePropertyChanges10expressionERK10QByteArray @ 1712 NONAME ABSENT
 	_ZNK27QDeclarativePropertyChanges10isExplicitEv @ 1713 NONAME ABSENT
 	_ZNK27QDeclarativePropertyChanges10metaObjectEv @ 1714 NONAME ABSENT
-- 
cgit v0.12


From cd55d5da5a5a1f676b85f4976b1b5e99e8a5f9c7 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 17:24:07 +1000
Subject: Missing part of 64a05cfa97b1192ac247558c0601ba0e4ec464c9

Task-number: QT-4200
---
 demos/declarative/snake/snake.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 6eaa976..af86aac 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -105,7 +105,7 @@ Rectangle {
         source: "content/pics/pause.png"
         anchors.centerIn: parent;
         //opacity is deliberately not animated
-        opacity: gameActive && !runtime.isActiveWindow
+        opacity: activeGame && !runtime.isActiveWindow
     }
 
     Image {
-- 
cgit v0.12


From ff40d424d2914b84bef4a7bb41e8ef04229db6c7 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 18:09:46 +1000
Subject: Clean up ListView visual tests

listview.qml is still expected to fail, filing a bug about that soon

Task-number: QTBUG-14792
---
 .../auto/declarative/qmlvisual/ListView/basic1.qml |   11 +-
 .../auto/declarative/qmlvisual/ListView/basic2.qml |   11 +-
 .../auto/declarative/qmlvisual/ListView/basic3.qml |   11 +-
 .../auto/declarative/qmlvisual/ListView/basic4.qml |   11 +-
 .../qmlvisual/ListView/data-MAC/basic1.qml         |  159 -
 .../qmlvisual/ListView/data-MAC/basic2.qml         |  187 --
 .../qmlvisual/ListView/data-MAC/basic3.qml         |  147 -
 .../qmlvisual/ListView/data-MAC/basic4.qml         |  171 --
 .../qmlvisual/ListView/data-MAC/itemlist.0.png     |  Bin 961 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/itemlist.1.png     |  Bin 972 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/itemlist.2.png     |  Bin 962 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/itemlist.3.png     |  Bin 962 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/itemlist.4.png     |  Bin 962 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/itemlist.5.png     |  Bin 970 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/itemlist.6.png     |  Bin 961 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/itemlist.qml       | 2203 --------------
 .../qmlvisual/ListView/data-MAC/listview.0.png     |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.1.png     |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.10.png    |  Bin 1588 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.11.png    |  Bin 1575 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.12.png    |  Bin 1502 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.13.png    |  Bin 1583 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.14.png    |  Bin 1681 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.15.png    |  Bin 1524 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.16.png    |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.17.png    |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.18.png    |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.19.png    |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.2.png     |  Bin 1627 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.3.png     |  Bin 1524 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.4.png     |  Bin 1678 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.5.png     |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.6.png     |  Bin 1573 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.7.png     |  Bin 1670 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.8.png     |  Bin 1658 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.9.png     |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data-MAC/listview.qml       | 3079 --------------------
 .../qmlvisual/ListView/data-X11/basic1.qml         |  159 -
 .../qmlvisual/ListView/data-X11/basic2.qml         |  187 --
 .../qmlvisual/ListView/data-X11/basic3.qml         |  147 -
 .../qmlvisual/ListView/data-X11/basic4.qml         |  171 --
 .../declarative/qmlvisual/ListView/data/basic1.qml |  114 +-
 .../declarative/qmlvisual/ListView/data/basic2.qml |  100 +-
 .../declarative/qmlvisual/ListView/data/basic3.qml |   84 +-
 .../declarative/qmlvisual/ListView/data/basic4.qml |  110 +-
 .../qmlvisual/ListView/data/itemlist.0.png         |  Bin 961 -> 976 bytes
 .../qmlvisual/ListView/data/itemlist.1.png         |  Bin 972 -> 986 bytes
 .../qmlvisual/ListView/data/itemlist.2.png         |  Bin 962 -> 977 bytes
 .../qmlvisual/ListView/data/itemlist.3.png         |  Bin 962 -> 977 bytes
 .../qmlvisual/ListView/data/itemlist.4.png         |  Bin 962 -> 977 bytes
 .../qmlvisual/ListView/data/itemlist.5.png         |  Bin 970 -> 990 bytes
 .../qmlvisual/ListView/data/itemlist.6.png         |  Bin 961 -> 976 bytes
 .../qmlvisual/ListView/data/itemlist.qml           |  350 +--
 .../declarative/qmlvisual/ListView/listview.qml    |    2 +-
 54 files changed, 318 insertions(+), 7096 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/basic1.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/basic2.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/basic3.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/basic4.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.10.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.11.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.12.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.13.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.14.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.15.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.16.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.17.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.18.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.19.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.9.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-X11/basic1.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-X11/basic2.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-X11/basic3.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data-X11/basic4.qml

diff --git a/tests/auto/declarative/qmlvisual/ListView/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/basic1.qml
index d55c997..8c1b56e 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic1.qml
@@ -11,16 +11,19 @@ Rectangle {
             color: "red"
             width: 100
             height: 100
-            Text {
-                text: name
+            Rectangle {
+                anchors.centerIn: parent
+                width: 60
+                height: 60
+                color: name 
             }
         }
         model: ListModel {
             ListElement {
-                name: "January"
+                name: "palegoldenrod"
             }
             ListElement {
-                name: "February"
+                name: "lightsteelblue"
             }
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/basic2.qml
index 31c802d..9d26c73 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic2.qml
@@ -11,8 +11,11 @@ Rectangle {
             color: "red"
             width: 100
             height: 100
-            Text {
-                text: name
+            Rectangle {
+                anchors.centerIn: parent
+                width: 60
+                height: 60
+                color: name 
             }
         }
     }
@@ -21,10 +24,10 @@ Rectangle {
         delegate: delegate
         model: ListModel {
             ListElement {
-                name: "January"
+                name: "palegoldenrod"
             }
             ListElement {
-                name: "February"
+                name: "lightsteelblue"
             }
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/basic3.qml
index be39ca1..982df9a 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic3.qml
@@ -8,10 +8,10 @@ Rectangle {
     ListModel {
         id: model
         ListElement {
-            name: "January"
+            name: "palegoldenrod"
         }
         ListElement {
-            name: "February"
+            name: "lightsteelblue"
         }
     }
     ListView {
@@ -21,8 +21,11 @@ Rectangle {
             color: "red"
             width: 100
             height: 100
-            Text {
-                text: name
+            Rectangle {
+                anchors.centerIn: parent
+                width: 60
+                height: 60
+                color: name 
             }
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/basic4.qml
index 906af63..2c5d1e3 100644
--- a/tests/auto/declarative/qmlvisual/ListView/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic4.qml
@@ -8,10 +8,10 @@ Rectangle {
     ListModel {
         id: model
         ListElement {
-            name: "January"
+            name: "palegoldenrod"
         }
         ListElement {
-            name: "February"
+            name: "lightsteelblue"
         }
     }
     Component {
@@ -20,8 +20,11 @@ Rectangle {
             color: "red"
             width: 100
             height: 100
-            Text {
-                text: name
+            Rectangle {
+                anchors.centerIn: parent
+                width: 60
+                height: 60
+                color: name 
             }
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic1.qml
deleted file mode 100644
index 3373247..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic1.qml
+++ /dev/null
@@ -1,159 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 32
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 48
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 64
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 80
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 96
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 112
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 128
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 144
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 160
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 176
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 192
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 208
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 224
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 240
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 256
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 272
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 288
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 304
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 320
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 336
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 352
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 368
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 384
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 400
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 416
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 432
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 448
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 464
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 480
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 496
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 512
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 528
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 560
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 576
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic2.qml
deleted file mode 100644
index 20b889d..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic2.qml
+++ /dev/null
@@ -1,187 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 32
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 48
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 64
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 80
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 96
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 112
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 128
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 144
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 160
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 176
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 192
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 208
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 224
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 240
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 256
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 272
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 288
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 304
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 320
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 336
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 352
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 368
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 384
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 400
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 416
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 432
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 448
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 464
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 480
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 496
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 512
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 528
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 544
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 560
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 576
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 592
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 608
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 624
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 640
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 656
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 672
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 688
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic3.qml
deleted file mode 100644
index f49de2f..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic3.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 32
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 48
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 64
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 80
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 96
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 112
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 128
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 144
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 160
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 176
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 192
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 208
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 224
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 240
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 256
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 272
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 288
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 304
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 320
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 336
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 352
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 368
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 384
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 400
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 416
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 432
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 448
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 464
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 480
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 496
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 512
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 528
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic4.qml
deleted file mode 100644
index 1ea5547..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic4.qml
+++ /dev/null
@@ -1,171 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 32
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 48
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 64
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 80
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 96
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 112
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 128
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 144
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 160
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 176
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 192
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 208
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 224
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 240
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 256
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 272
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 288
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 304
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 320
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 336
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 352
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 368
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 384
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 400
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 416
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 432
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 448
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 464
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 480
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 496
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 512
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 528
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 560
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 576
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 592
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 608
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-    Frame {
-        msec: 624
-        hash: "895c70434a24da42144e60e6d8dcf323"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.0.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.0.png
deleted file mode 100644
index 13b280c..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.1.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.1.png
deleted file mode 100644
index 402872b..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.2.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.2.png
deleted file mode 100644
index afd0830..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.3.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.3.png
deleted file mode 100644
index 7c15f61..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.4.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.4.png
deleted file mode 100644
index afd0830..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.5.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.5.png
deleted file mode 100644
index fddf1cb..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.6.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.6.png
deleted file mode 100644
index 13b280c..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.qml
deleted file mode 100644
index 829fbb3..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.qml
+++ /dev/null
@@ -1,2203 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 32
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 48
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 64
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 80
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 96
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 112
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 128
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 144
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 160
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 176
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 192
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 208
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 224
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 240
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 256
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 272
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 288
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 304
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 320
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 336
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 352
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 368
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 384
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 400
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 416
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 432
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 448
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 464
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 480
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 496
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 512
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 528
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 544
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 560
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 576
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 592
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 608
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 624
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 640
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 656
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 672
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 688
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 704
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 720
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 736
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 752
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 768
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 784
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 800
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 816
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 832
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 848
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 864
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 880
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 896
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 912
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 928
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 944
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 960
-        image: "itemlist.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 992
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1008
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1024
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1040
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1056
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1072
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1088
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1104
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1120
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1136
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1152
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1168
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1184
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1200
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1216
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1232
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1248
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1264
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1280
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1296
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1312
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1328
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1344
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1360
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1376
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1392
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1408
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1424
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1440
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1456
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1472
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1488
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1504
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1520
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1536
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1552
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1568
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1584
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1600
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1616
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1632
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 1648
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 192; y: 111
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1664
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 111
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1680
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 190; y: 112
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1696
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 184; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 180; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1712
-        hash: "a68b1bc6c2963ee92c3a45f500667b3b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 167; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1728
-        hash: "7cda93e59466b3348e7ffe3895f89e86"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1744
-        hash: "06e0008c78e919f7270402938d9d764b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 132; y: 122
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1760
-        hash: "9d8da9199efebb95f56e5d4ebc9a585e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 114; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 98; y: 132
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1776
-        hash: "54a60a4279911ba4a8a5741bcadfa783"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 91; y: 132
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 91; y: 132
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1792
-        hash: "a1a19370a1a8ed78e475f0d0eb12311c"
-    }
-    Frame {
-        msec: 1808
-        hash: "196a3b127cf7065614c34856bf8d8bca"
-    }
-    Frame {
-        msec: 1824
-        hash: "5fbefbd7c7be4374382cc4c8b86ac78a"
-    }
-    Frame {
-        msec: 1840
-        hash: "d6a544c622e504c1b931e1a8a1310a6e"
-    }
-    Frame {
-        msec: 1856
-        hash: "20e76f0eb4ec5f691999faf8ad313370"
-    }
-    Frame {
-        msec: 1872
-        hash: "7f84a3545907c754ae8a6a30ef61c98d"
-    }
-    Frame {
-        msec: 1888
-        hash: "b544901eae32903ad054e8cdfed715eb"
-    }
-    Frame {
-        msec: 1904
-        hash: "a010ed1e3312f4ca9f429b7e32cdcef9"
-    }
-    Frame {
-        msec: 1920
-        image: "itemlist.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "93a731dc6f71b6ff5400bf74c87e6c46"
-    }
-    Frame {
-        msec: 1952
-        hash: "c73f63d1a024ba956e693487b3ccc761"
-    }
-    Frame {
-        msec: 1968
-        hash: "539d3d00fce2d0128cd697d86d237fe7"
-    }
-    Frame {
-        msec: 1984
-        hash: "52752d7d6f2d0e085f7132313907b72b"
-    }
-    Frame {
-        msec: 2000
-        hash: "f46dd5803a6075e979e0fc733d503bfb"
-    }
-    Frame {
-        msec: 2016
-        hash: "b8734698a6bad00ecf019f85328c2c21"
-    }
-    Frame {
-        msec: 2032
-        hash: "1cfc499ca756023430cc5b2fa95a599d"
-    }
-    Frame {
-        msec: 2048
-        hash: "63a816548837c19f8f0494c137fc0174"
-    }
-    Frame {
-        msec: 2064
-        hash: "1bce9b85235e9a1a472c079dfec70ec5"
-    }
-    Frame {
-        msec: 2080
-        hash: "6677863e7f74c12648409883f73adbe2"
-    }
-    Frame {
-        msec: 2096
-        hash: "98e707a3e39a5f7bd4a101c2ed83535c"
-    }
-    Frame {
-        msec: 2112
-        hash: "c1f6d8842d14a9394d4b7797314f50e8"
-    }
-    Frame {
-        msec: 2128
-        hash: "579758b477bcd2112b305a5aac7df338"
-    }
-    Frame {
-        msec: 2144
-        hash: "4a7bb81090db246db53e2dbc56f710ea"
-    }
-    Frame {
-        msec: 2160
-        hash: "074995cdd8a70817d1c8a7bb0ad4c542"
-    }
-    Frame {
-        msec: 2176
-        hash: "bd8d7bda4d2e9ad1fba2895d568f36cc"
-    }
-    Frame {
-        msec: 2192
-        hash: "40cce3d2d80ac470af44fc334cec1d5b"
-    }
-    Frame {
-        msec: 2208
-        hash: "15cbc226b032d5a97199735ea7a1408b"
-    }
-    Frame {
-        msec: 2224
-        hash: "12b296aea9b058a5402d0d0a620f8edc"
-    }
-    Frame {
-        msec: 2240
-        hash: "6ffd2b79cf0e941a59e74bc6f9025bcb"
-    }
-    Frame {
-        msec: 2256
-        hash: "589a58ef76ea709dc8d80390c9044f99"
-    }
-    Frame {
-        msec: 2272
-        hash: "c009924bfa30153f22ab168b539494e9"
-    }
-    Frame {
-        msec: 2288
-        hash: "4b83674a7c2daa68d735901ad40be2bd"
-    }
-    Frame {
-        msec: 2304
-        hash: "0525908c0302ada989e28990bac3f2ca"
-    }
-    Frame {
-        msec: 2320
-        hash: "89eb13976ba3ba4413cafeb0cc91c01b"
-    }
-    Frame {
-        msec: 2336
-        hash: "75c1295ef99680784b2e11fb88fa1423"
-    }
-    Frame {
-        msec: 2352
-        hash: "93d89165cf6a97c76ae6e7f75678a3cd"
-    }
-    Frame {
-        msec: 2368
-        hash: "53064c1938f08a55603a99b0db225174"
-    }
-    Frame {
-        msec: 2384
-        hash: "31db5684466c0c32128a9a8c7b1835e1"
-    }
-    Frame {
-        msec: 2400
-        hash: "99d9e58697736198e0a00443d237e85b"
-    }
-    Frame {
-        msec: 2416
-        hash: "6c1e860aef983367365d53f5849ad441"
-    }
-    Frame {
-        msec: 2432
-        hash: "6c1e860aef983367365d53f5849ad441"
-    }
-    Frame {
-        msec: 2448
-        hash: "6c1e860aef983367365d53f5849ad441"
-    }
-    Frame {
-        msec: 2464
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2480
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2496
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2512
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2528
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2544
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2560
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2576
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2592
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2608
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2624
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2640
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2656
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2672
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2688
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2704
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2720
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2736
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2752
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2768
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2784
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2800
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2816
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2832
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2848
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 2864
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 181; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2880
-        image: "itemlist.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 179; y: 105
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 106
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2912
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 108
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 110
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2928
-        hash: "5bb06b4e74532ba5bc8c7bc38bf77d7f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 112
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2944
-        hash: "b10a6206830a876017799ef2fcf61b1a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 123
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2960
-        hash: "b2e24759ba10afd6cff90f4b1e04b496"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 124; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 124; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2976
-        hash: "ccbcd6f45cb529c2db71504c0f69d73e"
-    }
-    Frame {
-        msec: 2992
-        hash: "7b31c6d5931677f1aa1e8c7d48a4ff22"
-    }
-    Frame {
-        msec: 3008
-        hash: "c52f691a0a6cf155118bdfea2dfea623"
-    }
-    Frame {
-        msec: 3024
-        hash: "dd639d1df3d4a9b8f06718def63d588f"
-    }
-    Frame {
-        msec: 3040
-        hash: "39d767b09a648ef6295cec2848f9226f"
-    }
-    Frame {
-        msec: 3056
-        hash: "5dd46d5f386431e7b13348ac9a9630ed"
-    }
-    Frame {
-        msec: 3072
-        hash: "0354e5183b0e66e7ba146d292c559df4"
-    }
-    Frame {
-        msec: 3088
-        hash: "984aa6d7075e24de429e05b1b0eda94a"
-    }
-    Frame {
-        msec: 3104
-        hash: "1af58a2f44f1f613712d4df85e38356d"
-    }
-    Frame {
-        msec: 3120
-        hash: "6e4085e7f1fee724d78808753f04b471"
-    }
-    Frame {
-        msec: 3136
-        hash: "73a019ef9057639d631cd99a431b3f3b"
-    }
-    Frame {
-        msec: 3152
-        hash: "c9414a2e655a90dfdcb6fb288b4ba0ca"
-    }
-    Frame {
-        msec: 3168
-        hash: "3f4c24f7ac89da982af22032309637fb"
-    }
-    Frame {
-        msec: 3184
-        hash: "a50e6ada8f73a257657f4348ceaffcfd"
-    }
-    Frame {
-        msec: 3200
-        hash: "a67bf40d09259bbd079c12ae4f49150f"
-    }
-    Frame {
-        msec: 3216
-        hash: "a2fc512b7c234a9d0b2c1a83387a8a46"
-    }
-    Frame {
-        msec: 3232
-        hash: "85090683ce9a3c9833b1cb0b3df076ee"
-    }
-    Frame {
-        msec: 3248
-        hash: "275f3594a0e2cc4b6717f9f336e7e1b6"
-    }
-    Frame {
-        msec: 3264
-        hash: "2473eb11f7b65a784a2b166114026488"
-    }
-    Frame {
-        msec: 3280
-        hash: "4865c30dc45fbf5ca82047b77eca0912"
-    }
-    Frame {
-        msec: 3296
-        hash: "54de88bca395449fbaea2c090c7a5d91"
-    }
-    Frame {
-        msec: 3312
-        hash: "833f9295cf9a34934f001eac48551b59"
-    }
-    Frame {
-        msec: 3328
-        hash: "5bf565f57ababa7380faeee94add91ca"
-    }
-    Frame {
-        msec: 3344
-        hash: "6325578867f1eb3b2d47ed40b017b571"
-    }
-    Frame {
-        msec: 3360
-        hash: "046a6114176b3a3206b7a2acd6e30b41"
-    }
-    Frame {
-        msec: 3376
-        hash: "f8d4120a17f28c2d1d9c4be959098058"
-    }
-    Frame {
-        msec: 3392
-        hash: "71356d2e48aad2900784ea6bc1a3d908"
-    }
-    Frame {
-        msec: 3408
-        hash: "b84ad460fb81fdc4049abe8f3ff180bb"
-    }
-    Frame {
-        msec: 3424
-        hash: "0354239f5eaea23474d9f81385392a8a"
-    }
-    Frame {
-        msec: 3440
-        hash: "8ef0eef3393e07ae7605c865a95edc30"
-    }
-    Frame {
-        msec: 3456
-        hash: "5b8b384cc8e3faf4310015e19b3eb487"
-    }
-    Frame {
-        msec: 3472
-        hash: "77c18ac7dfff2a4e516915e3e3df0717"
-    }
-    Frame {
-        msec: 3488
-        hash: "c1d3264384c26345eb8100de829309ca"
-    }
-    Frame {
-        msec: 3504
-        hash: "6b21f71d0bedef4bbcb445a13f61e7a3"
-    }
-    Frame {
-        msec: 3520
-        hash: "f619097356671f6eb54d3b1c481e709d"
-    }
-    Frame {
-        msec: 3536
-        hash: "e56e3a90da446e0c482cb93717f6aacc"
-    }
-    Frame {
-        msec: 3552
-        hash: "aa94ebdbb4b8423aff28c95daff0baf5"
-    }
-    Frame {
-        msec: 3568
-        hash: "e1744d9cacd1a2c96af4cfdd5c486995"
-    }
-    Frame {
-        msec: 3584
-        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
-    }
-    Frame {
-        msec: 3600
-        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
-    }
-    Frame {
-        msec: 3616
-        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
-    }
-    Frame {
-        msec: 3632
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3648
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3664
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3680
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3696
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3712
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3728
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3744
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3760
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3776
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3792
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3808
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3824
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3840
-        image: "itemlist.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3872
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3888
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3904
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3920
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3936
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3952
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3968
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 3984
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 4000
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 4016
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 4032
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 4048
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 4064
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 4080
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Frame {
-        msec: 4096
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 31; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4112
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 32; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4128
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 33; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 36; y: 135
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4144
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 40; y: 134
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 132
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4160
-        hash: "c2c9c284b185a89faf4ddb5a7867f449"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 64; y: 130
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4176
-        hash: "de1c18aeda5d2fbd6dad4554c78617bd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 86; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 110; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4192
-        hash: "a67bf40d09259bbd079c12ae4f49150f"
-    }
-    Frame {
-        msec: 4208
-        hash: "94514668dafbe41c5890a578efd6dea4"
-    }
-    Frame {
-        msec: 4224
-        hash: "2e97a74eb9ddb1c9613c89e2d78db018"
-    }
-    Frame {
-        msec: 4240
-        hash: "4b5368f0d86bffeb6bd31b58aec88650"
-    }
-    Frame {
-        msec: 4256
-        hash: "b459bde7bb4ce51e6ecdab58f64fcbb9"
-    }
-    Frame {
-        msec: 4272
-        hash: "7bac8cc3ec64c9ad1c0da282e38c953e"
-    }
-    Frame {
-        msec: 4288
-        hash: "a73a58c3d7a757547740a2a161f4c756"
-    }
-    Frame {
-        msec: 4304
-        hash: "b35edcb1fa3568a3e770ab2364b82e75"
-    }
-    Frame {
-        msec: 4320
-        hash: "d6c863ef57c5e5cb04cdac72f920db0b"
-    }
-    Frame {
-        msec: 4336
-        hash: "0db5e4588ff851918b07796f0cf07382"
-    }
-    Frame {
-        msec: 4352
-        hash: "71ec8c363ca6a6f7556afb70faccffe6"
-    }
-    Frame {
-        msec: 4368
-        hash: "18d026e9c965ada1db67c643576d2a80"
-    }
-    Frame {
-        msec: 4384
-        hash: "69f71c22dff981a4da8ec1edcf90e79f"
-    }
-    Frame {
-        msec: 4400
-        hash: "680460f5e4d9e649931601041af046b2"
-    }
-    Frame {
-        msec: 4416
-        hash: "3028763fd15de2607b20b1331b904a4a"
-    }
-    Frame {
-        msec: 4432
-        hash: "333eb60e217fe1ea7469eab52ac461f1"
-    }
-    Frame {
-        msec: 4448
-        hash: "ccbcd6f45cb529c2db71504c0f69d73e"
-    }
-    Frame {
-        msec: 4464
-        hash: "3445df9b41a0a3e74738cbf328ab7d5c"
-    }
-    Frame {
-        msec: 4480
-        hash: "bd2c072558479e9de7a97207e58cc57f"
-    }
-    Frame {
-        msec: 4496
-        hash: "3d34b0b24a30eda93377dcb4585afed8"
-    }
-    Frame {
-        msec: 4512
-        hash: "d3045703863b0c5a327b9355c23d69f2"
-    }
-    Frame {
-        msec: 4528
-        hash: "2f2eb55f693415b840a317211b250e9f"
-    }
-    Frame {
-        msec: 4544
-        hash: "791b9ca7d47a3343474c30a35e336d4b"
-    }
-    Frame {
-        msec: 4560
-        hash: "73a0c02ebad6d3d5f939d9a00dd898bf"
-    }
-    Frame {
-        msec: 4576
-        hash: "d5c11135d586711b12f236430a2c2795"
-    }
-    Frame {
-        msec: 4592
-        hash: "34f9ea214fe714ff4e994f715ea6ea39"
-    }
-    Frame {
-        msec: 4608
-        hash: "8e49afa00983b156b818533923fb6edd"
-    }
-    Frame {
-        msec: 4624
-        hash: "e7e7bef17cee92eca9191fd734d7a577"
-    }
-    Frame {
-        msec: 4640
-        hash: "e407f6ed7cb3c130365ab5515d6308c0"
-    }
-    Frame {
-        msec: 4656
-        hash: "5bb06b4e74532ba5bc8c7bc38bf77d7f"
-    }
-    Frame {
-        msec: 4672
-        hash: "0ad7411316031e22034c14e81ca3a806"
-    }
-    Frame {
-        msec: 4688
-        hash: "dd81d7a9b48c922b4c42cba1b5f2b9d7"
-    }
-    Frame {
-        msec: 4704
-        hash: "32bef6f5005ad94e29ff59165958fbdc"
-    }
-    Frame {
-        msec: 4720
-        hash: "87758dd311f91193bf1e3536c2f58525"
-    }
-    Frame {
-        msec: 4736
-        hash: "015be92a4ff4e735fcc3cbc7a8b9d763"
-    }
-    Frame {
-        msec: 4752
-        hash: "d4c34ed49317c6692d71681fcd9842b6"
-    }
-    Frame {
-        msec: 4768
-        hash: "abaa235bb946a8abaddd52981d632c2d"
-    }
-    Frame {
-        msec: 4784
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4800
-        image: "itemlist.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4832
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4848
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4864
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4880
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4896
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4912
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4928
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4944
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4960
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4976
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 4992
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5008
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5024
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5040
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5056
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5072
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5088
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5104
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5120
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5136
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5152
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5168
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5184
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5200
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5216
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Frame {
-        msec: 5232
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 17; y: 120
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5248
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 19; y: 120
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 21; y: 120
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5264
-        hash: "99f9988040a389576cb6420b5391f768"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 24; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 28; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5280
-        hash: "95b380c9ab6f8db7b822faf023d94546"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 35; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 44; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "bb79e53556698c62ec30c75be9f6b7d7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 70; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 96; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 96; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "285cc2f0df1f59f25a0135560ab6edf2"
-    }
-    Frame {
-        msec: 5328
-        hash: "93a731dc6f71b6ff5400bf74c87e6c46"
-    }
-    Frame {
-        msec: 5344
-        hash: "eb555741ab128a50de5a18a454f2e639"
-    }
-    Frame {
-        msec: 5360
-        hash: "5dbe6cf898c1e37fcaacecfcf57b2194"
-    }
-    Frame {
-        msec: 5376
-        hash: "e7795610115593e78bb32f7bcc0ae2eb"
-    }
-    Frame {
-        msec: 5392
-        hash: "20e76f0eb4ec5f691999faf8ad313370"
-    }
-    Frame {
-        msec: 5408
-        hash: "d6a544c622e504c1b931e1a8a1310a6e"
-    }
-    Frame {
-        msec: 5424
-        hash: "e7a3a21feed244c5b1c710a9254c15f0"
-    }
-    Frame {
-        msec: 5440
-        hash: "5a4b1aca24f121d1373646e9d80b86fd"
-    }
-    Frame {
-        msec: 5456
-        hash: "331d2ec7021655c86aa64e47718a1088"
-    }
-    Frame {
-        msec: 5472
-        hash: "92096bc872e7395aa5b75c44646a0b60"
-    }
-    Frame {
-        msec: 5488
-        hash: "0d9aa6cee4d21488cbb5153f8f3ed593"
-    }
-    Frame {
-        msec: 5504
-        hash: "c1b943d43701605563fffffcb75f9fa7"
-    }
-    Frame {
-        msec: 5520
-        hash: "1b680025d5ad1ddd8f8d5f570ba73e71"
-    }
-    Frame {
-        msec: 5536
-        hash: "5539a3b9f60ea747c10ed8328b467cbf"
-    }
-    Frame {
-        msec: 5552
-        hash: "0a1317bcb606cd3488c5b14ee5d96585"
-    }
-    Frame {
-        msec: 5568
-        hash: "8844af68b11db7d92c69804c7371a746"
-    }
-    Frame {
-        msec: 5584
-        hash: "28d7fd127739c6e3b8488651b725c802"
-    }
-    Frame {
-        msec: 5600
-        hash: "0cf1a7d958a96aa2768995dddc5ccc09"
-    }
-    Frame {
-        msec: 5616
-        hash: "64b902fe7ab4d89ef0c7b760974e3488"
-    }
-    Frame {
-        msec: 5632
-        hash: "aba11c597eba550fc1eaddbf554057f6"
-    }
-    Frame {
-        msec: 5648
-        hash: "1bacaa3bb9dc3cac9ffc7491cb4dc1a5"
-    }
-    Frame {
-        msec: 5664
-        hash: "0ba8b582234d9f0c198c0c9e18e1cb02"
-    }
-    Frame {
-        msec: 5680
-        hash: "f66eaf2b5c3529987c0d9d005351ed73"
-    }
-    Frame {
-        msec: 5696
-        hash: "75b0bb720fa4c77da3783b3ff31c2fae"
-    }
-    Frame {
-        msec: 5712
-        hash: "345b235bb7f13409378e5c0c370f2a41"
-    }
-    Frame {
-        msec: 5728
-        hash: "83b7e902dce4e0fdc4ef5d629188c23c"
-    }
-    Frame {
-        msec: 5744
-        hash: "04b9041c6f10969889d92e94785c7e88"
-    }
-    Frame {
-        msec: 5760
-        image: "itemlist.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "4f3a902addc34ecdaf390e2427cc52e7"
-    }
-    Frame {
-        msec: 5792
-        hash: "68d443f16c16821ffc9ca68b17c76034"
-    }
-    Frame {
-        msec: 5808
-        hash: "9d25adc77befa761ee376a9b43595b5e"
-    }
-    Frame {
-        msec: 5824
-        hash: "a68b1bc6c2963ee92c3a45f500667b3b"
-    }
-    Frame {
-        msec: 5840
-        hash: "d5268cd58c222451d48038e715e83802"
-    }
-    Frame {
-        msec: 5856
-        hash: "f37d461541a8ec7a4161b18748de6aea"
-    }
-    Frame {
-        msec: 5872
-        hash: "805319ac7ca842feb3649e92f8b5b72f"
-    }
-    Frame {
-        msec: 5888
-        hash: "73124472a05080891d4948d8ca273f8c"
-    }
-    Frame {
-        msec: 5904
-        hash: "b6e433a23282a50db2e165a2447ba3f6"
-    }
-    Frame {
-        msec: 5920
-        hash: "fd8d3f5688b1806998c6087e18c6c730"
-    }
-    Frame {
-        msec: 5936
-        hash: "f132dd459950ef2d18aa93ca950d0692"
-    }
-    Frame {
-        msec: 5952
-        hash: "ade5beb259b5277c333ca806fc9bdbec"
-    }
-    Frame {
-        msec: 5968
-        hash: "ade5beb259b5277c333ca806fc9bdbec"
-    }
-    Frame {
-        msec: 5984
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6000
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6016
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6032
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6048
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6064
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6080
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6096
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6112
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6128
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6144
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6160
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6176
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6192
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6208
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6224
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6240
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6256
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6272
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6288
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6304
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6320
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6336
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6352
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6368
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6384
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6400
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6416
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6432
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6448
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6464
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6480
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6496
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6512
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6528
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6544
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6560
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6576
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6592
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6608
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6624
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6640
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6656
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6672
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6688
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6704
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6720
-        image: "itemlist.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6752
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6768
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6784
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6800
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6816
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6832
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6848
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6864
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6880
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6896
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6912
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6928
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6944
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6960
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6976
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 6992
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7008
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7024
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7040
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7056
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7072
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7088
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7104
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7120
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7136
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7152
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7168
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7184
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7200
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7216
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7232
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7248
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7264
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7280
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7296
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-    Frame {
-        msec: 7312
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.0.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.0.png
deleted file mode 100644
index a1ab987..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.1.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.1.png
deleted file mode 100644
index a1ab987..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.10.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.10.png
deleted file mode 100644
index dcfca3f..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.10.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.11.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.11.png
deleted file mode 100644
index 7cc4047..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.11.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.12.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.12.png
deleted file mode 100644
index a97f4ad..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.12.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.13.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.13.png
deleted file mode 100644
index 7a8c6bd..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.13.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.14.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.14.png
deleted file mode 100644
index ae47356..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.14.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.15.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.15.png
deleted file mode 100644
index b3a7260..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.15.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.16.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.16.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.16.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.17.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.17.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.17.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.18.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.18.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.18.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.19.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.19.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.19.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.2.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.2.png
deleted file mode 100644
index 9877b92..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.3.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.3.png
deleted file mode 100644
index 603bd24..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.4.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.4.png
deleted file mode 100644
index 5fdfbb8..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.5.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.5.png
deleted file mode 100644
index a1ab987..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.6.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.6.png
deleted file mode 100644
index 9ccf9b0..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.7.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.7.png
deleted file mode 100644
index 6b40e1b..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.8.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.8.png
deleted file mode 100644
index 2fda36d..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.9.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.9.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.qml
deleted file mode 100644
index f47179d..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.qml
+++ /dev/null
@@ -1,3079 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 32
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 48
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 64
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 80
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 96
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 112
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 128
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 144
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 160
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 176
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 192
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 208
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 224
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 240
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 256
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 272
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 288
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 304
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 320
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 336
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 352
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 368
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 384
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 400
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 416
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 432
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 448
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 464
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 480
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 496
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 512
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 528
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 544
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 560
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 576
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 592
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 608
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 624
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 640
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 656
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 672
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 688
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 704
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 720
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 736
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 752
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 768
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 784
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 800
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 816
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 832
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 848
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 864
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 880
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 896
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 912
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 928
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 944
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 960
-        image: "listview.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 992
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1008
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1024
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1040
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1056
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1072
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1088
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1104
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1120
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1136
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1152
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1168
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1184
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1200
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1216
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1232
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1248
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1264
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1280
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1296
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1312
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1328
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1344
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1360
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1376
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1392
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1408
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1424
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1440
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1456
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1472
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1488
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1504
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1520
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1536
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1552
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1568
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1584
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1600
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1616
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1632
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1648
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1664
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1680
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1696
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1712
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1728
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1744
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1760
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1776
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1792
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1808
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1824
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1840
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1856
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1872
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1888
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1904
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1920
-        image: "listview.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1952
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1968
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1984
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2000
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2016
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2032
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2048
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2064
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2080
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2096
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2112
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2128
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2144
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2160
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2176
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2192
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2208
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2224
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2240
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2256
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2272
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2288
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2304
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2320
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2336
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2352
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2368
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2384
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2400
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2416
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2432
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2448
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2464
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2480
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2496
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2512
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2528
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2544
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2560
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2576
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2592
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 553; y: 267
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2608
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2624
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 554; y: 267
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 555; y: 266
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2640
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 556; y: 265
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 558; y: 260
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2656
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 560; y: 256
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2672
-        hash: "c315e184c4dcb11d7e9fd4509a8b6a1f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 562; y: 250
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 566; y: 234
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2688
-        hash: "aeef1cacca9518408519b670443e396f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 568; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2704
-        hash: "621626927f83bf7b36b78f5ca7ed4ed0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 572; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 572; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2720
-        hash: "b2aca965b745e98365195c52b9dd9a2c"
-    }
-    Frame {
-        msec: 2736
-        hash: "4cc8c162afcc45c79afd8230893d4ddd"
-    }
-    Frame {
-        msec: 2752
-        hash: "b9c0815086393878ad00566db7a3c577"
-    }
-    Frame {
-        msec: 2768
-        hash: "23cbc15fce97f966c24e3ec626e01960"
-    }
-    Frame {
-        msec: 2784
-        hash: "3a7ce897b47ba39e63be31a020de6f3d"
-    }
-    Frame {
-        msec: 2800
-        hash: "2a8a32cd27fad2c57c9eb518c7b3b3ca"
-    }
-    Frame {
-        msec: 2816
-        hash: "96d676ad58119430b440a5f0a2215f26"
-    }
-    Frame {
-        msec: 2832
-        hash: "5f9cd251615ee6a98470a7b6098f7890"
-    }
-    Frame {
-        msec: 2848
-        hash: "c9b1c073cbfbf1c353685b3f38baa675"
-    }
-    Frame {
-        msec: 2864
-        hash: "cf5bfbfe8904ea40b796d2b33d5cc363"
-    }
-    Frame {
-        msec: 2880
-        image: "listview.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "c75c3342b476f75fc0c5f56a374da13e"
-    }
-    Frame {
-        msec: 2912
-        hash: "0dfcd15d21b7e949b56bc69d881c52f5"
-    }
-    Frame {
-        msec: 2928
-        hash: "73b7352bb11d29cbf64b6b594e761e42"
-    }
-    Frame {
-        msec: 2944
-        hash: "876361c2fc18c2236c1dffd36f517f44"
-    }
-    Frame {
-        msec: 2960
-        hash: "0dfaf61e3a86ee056a5d76cf6f7994b2"
-    }
-    Frame {
-        msec: 2976
-        hash: "391995cfc5d8d3808b30d74ba5ea3188"
-    }
-    Frame {
-        msec: 2992
-        hash: "6fd4f14c16a8870355fa190c94e4be2d"
-    }
-    Frame {
-        msec: 3008
-        hash: "0aac04c8092505d934220e61c7959512"
-    }
-    Frame {
-        msec: 3024
-        hash: "6cb0fbe22fcd60b5ed6385e49522b32e"
-    }
-    Frame {
-        msec: 3040
-        hash: "2eb7fd1a773e32ae94284cf57efaaff2"
-    }
-    Frame {
-        msec: 3056
-        hash: "e143ed5eeb94b35ef97e965f34d45e4d"
-    }
-    Frame {
-        msec: 3072
-        hash: "529e85f2cd48c1f0d056682b8350445b"
-    }
-    Frame {
-        msec: 3088
-        hash: "d74bded985c00ecd192ff8fdce708450"
-    }
-    Frame {
-        msec: 3104
-        hash: "f71568b2173f72c4433a019775923c02"
-    }
-    Frame {
-        msec: 3120
-        hash: "1185a1c936ac08633c14d39ca9c4f5e9"
-    }
-    Frame {
-        msec: 3136
-        hash: "e641720bf75f1e4f0a8471f3a8b35094"
-    }
-    Frame {
-        msec: 3152
-        hash: "cecc41fb42abb95505c094829fd415bf"
-    }
-    Frame {
-        msec: 3168
-        hash: "7ad89090beb9de3cd7c5a5a03fca900d"
-    }
-    Frame {
-        msec: 3184
-        hash: "2a98fe4406367d4e286d8932d6a21318"
-    }
-    Frame {
-        msec: 3200
-        hash: "9aad024b2fc25ce886ccaa4ac106b1d8"
-    }
-    Frame {
-        msec: 3216
-        hash: "3c4a787a4d590efd2e72706e40df7b6d"
-    }
-    Frame {
-        msec: 3232
-        hash: "1135e06c2981bdaed13c13400e178dc3"
-    }
-    Frame {
-        msec: 3248
-        hash: "1fbceedf1c20f2aa3f05be36126280e2"
-    }
-    Frame {
-        msec: 3264
-        hash: "5d1ec83f43b649c732cc3f7815100428"
-    }
-    Frame {
-        msec: 3280
-        hash: "27501f6b6adccfdb77a5228611e2a95a"
-    }
-    Frame {
-        msec: 3296
-        hash: "218dc244352c14467f2b2a39d78a1bc7"
-    }
-    Frame {
-        msec: 3312
-        hash: "33a998563d2c053e375f619b7a75a224"
-    }
-    Frame {
-        msec: 3328
-        hash: "02d34b79e25367e6d0dc1765cab12353"
-    }
-    Frame {
-        msec: 3344
-        hash: "2698cf68138aa7d292167bcc85f60b74"
-    }
-    Frame {
-        msec: 3360
-        hash: "0b33e929b420596ff1dce2eeef8480db"
-    }
-    Frame {
-        msec: 3376
-        hash: "d8ec307a85cecaacaa908ceb34d5db5b"
-    }
-    Frame {
-        msec: 3392
-        hash: "4afe1df3e802b41d1b89b5fab4e35190"
-    }
-    Frame {
-        msec: 3408
-        hash: "e8f484ed8d2a6745ee87ac9544281d55"
-    }
-    Frame {
-        msec: 3424
-        hash: "6df053920e87d7e6e3ec0368b4b14c25"
-    }
-    Frame {
-        msec: 3440
-        hash: "6e94791acce321417a37132821c0260d"
-    }
-    Frame {
-        msec: 3456
-        hash: "fea3e31cbf3078615f57c934197dac35"
-    }
-    Frame {
-        msec: 3472
-        hash: "e8d15890a8bd95db39889d19f046901b"
-    }
-    Frame {
-        msec: 3488
-        hash: "038b422b154dfef2d955b833892c581e"
-    }
-    Frame {
-        msec: 3504
-        hash: "01180b3d9b504ca2814382eadaf3a4e0"
-    }
-    Frame {
-        msec: 3520
-        hash: "869a0aa0d67043822c65383e0f3264d4"
-    }
-    Frame {
-        msec: 3536
-        hash: "43785b1214510c10b65018a9d68a93b1"
-    }
-    Frame {
-        msec: 3552
-        hash: "95e6ebc35c2fb128b6e6ac0743268523"
-    }
-    Frame {
-        msec: 3568
-        hash: "f8c22a6ca3169de4d29b3b0e2908f581"
-    }
-    Frame {
-        msec: 3584
-        hash: "6baf16c321847d269718bcb3468aeeb2"
-    }
-    Frame {
-        msec: 3600
-        hash: "30804b5eb2a6d99116475cbdc1a9c043"
-    }
-    Frame {
-        msec: 3616
-        hash: "c892c17ec947a910b74f5b8704405e9f"
-    }
-    Frame {
-        msec: 3632
-        hash: "696029b77512943001c9eba64191e633"
-    }
-    Frame {
-        msec: 3648
-        hash: "4c26bb0ca28d74a2bb79d0bfc8127361"
-    }
-    Frame {
-        msec: 3664
-        hash: "6e8c50cc14c9afe73b4baf09a6a8f1a4"
-    }
-    Frame {
-        msec: 3680
-        hash: "fd20e4259b44357c93f22f35c698fe1b"
-    }
-    Frame {
-        msec: 3696
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3712
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3728
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3744
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3760
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3776
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3792
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3808
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3824
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3840
-        image: "listview.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3872
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3888
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3904
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3920
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3936
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3952
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3968
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3984
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4000
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4016
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4032
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4048
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4064
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4080
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4096
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4112
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4128
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4144
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 521; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4160
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4176
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 37
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4192
-        hash: "a5df688148c264de1d376c9b87ddfa6b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4208
-        hash: "a4e2c1878b0afce0ee1eebd63e9c951a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 66
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4224
-        hash: "2f9a79278d492790ef86a09c77e95ff4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 531; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 531; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4240
-        hash: "5b5ce7206b26528157c426f4e1e3e0a8"
-    }
-    Frame {
-        msec: 4256
-        hash: "65a1e5f81ab89b163aed46b984cca45e"
-    }
-    Frame {
-        msec: 4272
-        hash: "e28253ad5a2415251b68bcda1d7d4bd0"
-    }
-    Frame {
-        msec: 4288
-        hash: "71aae5abb4a9e9077053ea21dd3ec315"
-    }
-    Frame {
-        msec: 4304
-        hash: "33fcea38fc3b328b3294f9ac2a26aa1a"
-    }
-    Frame {
-        msec: 4320
-        hash: "6299eb1d87f371966307668b92de6a0b"
-    }
-    Frame {
-        msec: 4336
-        hash: "4f66d8c7cb6971d0fc24089d123c547b"
-    }
-    Frame {
-        msec: 4352
-        hash: "d9906d61b31fabf968290ebcd6688f34"
-    }
-    Frame {
-        msec: 4368
-        hash: "5a1945993ff8096ba6b933d45586044a"
-    }
-    Frame {
-        msec: 4384
-        hash: "331535e54da9bbdbc2fbf2b244ad0199"
-    }
-    Frame {
-        msec: 4400
-        hash: "4dc39de0c54f6e0b77f94f6ae6c345ec"
-    }
-    Frame {
-        msec: 4416
-        hash: "ec309a298ce246c13eb666488eb75016"
-    }
-    Frame {
-        msec: 4432
-        hash: "a133819f8adc6265eb0e438261c869e3"
-    }
-    Frame {
-        msec: 4448
-        hash: "da4d64fd6b3ae7d49ee5c5c8d0117a37"
-    }
-    Frame {
-        msec: 4464
-        hash: "620dd1c3fc41ce657eac9d1a5b765fd4"
-    }
-    Frame {
-        msec: 4480
-        hash: "ff1c370bd1bf75a98ae7125e7dd5a9db"
-    }
-    Frame {
-        msec: 4496
-        hash: "59c6e4297109b5cc7c197749867dddae"
-    }
-    Frame {
-        msec: 4512
-        hash: "91b1719e86529d0c35a53a2d0a095dd6"
-    }
-    Frame {
-        msec: 4528
-        hash: "2994663d35c9eb453a27c1a1fa9aeeb8"
-    }
-    Frame {
-        msec: 4544
-        hash: "ae4ec37b9f6a00b3c9139e5cfe13d32e"
-    }
-    Frame {
-        msec: 4560
-        hash: "a98340236d1b65f47e88684168c1429d"
-    }
-    Frame {
-        msec: 4576
-        hash: "34848b483ea6a2bd412e29d26beb3ab0"
-    }
-    Frame {
-        msec: 4592
-        hash: "dd9bae0e2fca84b265d8cb59686ff88d"
-    }
-    Frame {
-        msec: 4608
-        hash: "18b6ef6f5913b0612b76e7b2e25073dd"
-    }
-    Frame {
-        msec: 4624
-        hash: "9398aab9478279aed1bc40c9378f8da4"
-    }
-    Frame {
-        msec: 4640
-        hash: "a297a304c12102f23bd1e0f0207e0df9"
-    }
-    Frame {
-        msec: 4656
-        hash: "091db9138cd6ae801ad857105a83c8f9"
-    }
-    Frame {
-        msec: 4672
-        hash: "253938ca4a4f13433ddd502eb94cb7cd"
-    }
-    Frame {
-        msec: 4688
-        hash: "6002df1793d290e4e31ee0c91c37bbe6"
-    }
-    Frame {
-        msec: 4704
-        hash: "212476fa1c3a52fb8eba03ec3aecdcd8"
-    }
-    Frame {
-        msec: 4720
-        hash: "80d4d8434d4e96a2bc23f5ed060d6ddc"
-    }
-    Frame {
-        msec: 4736
-        hash: "2d4add725f31a04558635ce4b73a758a"
-    }
-    Frame {
-        msec: 4752
-        hash: "57c06022ec1e502c4f49f43063c433e7"
-    }
-    Frame {
-        msec: 4768
-        hash: "8393e97990993f9d5f68ea65f8e4a2db"
-    }
-    Frame {
-        msec: 4784
-        hash: "9a1fcd96dffaf5c79ecc7f9427e02499"
-    }
-    Frame {
-        msec: 4800
-        image: "listview.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "5ae722cf541e3453e73bbee57dc379e9"
-    }
-    Frame {
-        msec: 4832
-        hash: "fc7326c2e2e56d9c3036e8dfc2ea77a8"
-    }
-    Frame {
-        msec: 4848
-        hash: "f22a2a68cea158f333b0457025d75490"
-    }
-    Frame {
-        msec: 4864
-        hash: "d684c8aa9b835779080f170cafead40f"
-    }
-    Frame {
-        msec: 4880
-        hash: "dd451e5e421f929d015981bc7aeb8c66"
-    }
-    Frame {
-        msec: 4896
-        hash: "d066f228295db7f46520495167d3e946"
-    }
-    Frame {
-        msec: 4912
-        hash: "ebf640a457e3498bade3220aafa70331"
-    }
-    Frame {
-        msec: 4928
-        hash: "190f5b1f3ce9d200790c34c50bcc62c5"
-    }
-    Frame {
-        msec: 4944
-        hash: "9d4ad865246eb008afa40740b5c9a208"
-    }
-    Frame {
-        msec: 4960
-        hash: "81c8b2c0b4f9e74f24d328a1d9b40a9f"
-    }
-    Frame {
-        msec: 4976
-        hash: "24acc300307e71bee79bce8de76f56cb"
-    }
-    Frame {
-        msec: 4992
-        hash: "1f9d31f94cfce6f868bfcc8a104d2465"
-    }
-    Frame {
-        msec: 5008
-        hash: "7a3cab008dcb7a893ae30797b33df6f2"
-    }
-    Frame {
-        msec: 5024
-        hash: "38d561a2950434e59513439c7f1120ea"
-    }
-    Frame {
-        msec: 5040
-        hash: "8d34131faa15bc126bd4d9ef3be39ef5"
-    }
-    Frame {
-        msec: 5056
-        hash: "85d57ef15791b56deb537795dd87911e"
-    }
-    Frame {
-        msec: 5072
-        hash: "71e932169915a6c8c2cef0b22febf316"
-    }
-    Frame {
-        msec: 5088
-        hash: "8b3452981963aeebadc9ac2013150263"
-    }
-    Frame {
-        msec: 5104
-        hash: "a3fb8abecfeb48ba1cd1fd8f40896fa0"
-    }
-    Frame {
-        msec: 5120
-        hash: "f53ab533f6a58ae45139f3da4bf8ab4e"
-    }
-    Frame {
-        msec: 5136
-        hash: "9ec7012404f3c1c7795810dcee5acc3b"
-    }
-    Frame {
-        msec: 5152
-        hash: "99ca43bab532dd5d7566e596c65053ce"
-    }
-    Frame {
-        msec: 5168
-        hash: "0af83ad2416821cc230cd2856d1a3e39"
-    }
-    Frame {
-        msec: 5184
-        hash: "86fa23ddf2005bbf35238ae04ae554ac"
-    }
-    Frame {
-        msec: 5200
-        hash: "bb52a748f1d85dde410cfa4f24e3ed20"
-    }
-    Frame {
-        msec: 5216
-        hash: "898b96bc5ee9a3ac61764e5cd9af8cfb"
-    }
-    Frame {
-        msec: 5232
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5248
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5264
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5280
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5296
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5312
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5328
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5344
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5360
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5376
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5392
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5408
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5424
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5440
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5456
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5472
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5488
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5504
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5520
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5536
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5552
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5568
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5584
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5600
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5616
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5632
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5648
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5664
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5680
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5696
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5712
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5728
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5744
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5760
-        image: "listview.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5792
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5808
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5824
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5840
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5856
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5872
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5888
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5904
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5920
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5936
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5952
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5968
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 111; y: 230
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 227
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 223
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "0076b55d3da4ca365688b6a2c984103f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 112; y: 205
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "db846ad8e3200ca1fce36a38dc7beab8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 112; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "3cb6b25725b4285f9c096d595224c5ca"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 180
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "1832e12fdf3b464b02b296e727b33694"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 173
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "6d18d2b5f65cbba4915d0725d24b40f3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 109; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 140
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "79bc7afc6b1aa5f8904b3e6d5d4a9389"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "4436f2d15304c839aacec486c1fd6d96"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 111
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "c3bffc7c95893cf9bbd8596208b7f657"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 105
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "04231c2fdc02729aa34ed4e403dd373b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "392d75c4b372825e78366eb63a618170"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 83
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "7f91f7bdb0cb62d600ac4aa573681fe3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 79
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "69207181a382650c5e33145555f0d9ba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 72
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6208
-        hash: "65a184b5c49b02e08114e437483f928d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 64
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6224
-        hash: "c22da9ce54d04f51fb55da755753a509"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 61
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6240
-        hash: "59dbd5216847a62f60a1d0701a15bb62"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 57
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 53
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6256
-        hash: "bbfc902db6e6ca253afb1c90306b2a63"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 47
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 106; y: 47
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6272
-        hash: "5c41f194afec5f7e3db9d98673d03d5c"
-    }
-    Frame {
-        msec: 6288
-        hash: "deb06d0f915d5f6ec39b1820d57b6af6"
-    }
-    Frame {
-        msec: 6304
-        hash: "deb06d0f915d5f6ec39b1820d57b6af6"
-    }
-    Frame {
-        msec: 6320
-        hash: "2a1a1f9239a6ccb308e51796f9b0bb89"
-    }
-    Frame {
-        msec: 6336
-        hash: "3c1b44201616b8271023bf05a3f3f0f7"
-    }
-    Frame {
-        msec: 6352
-        hash: "87afcef49db8b2b547e85e834f8ec304"
-    }
-    Frame {
-        msec: 6368
-        hash: "290081b4b1272ef09ec9964c128e61b5"
-    }
-    Frame {
-        msec: 6384
-        hash: "19bb3b23ee4b14a5f0a313106ef7c8c1"
-    }
-    Frame {
-        msec: 6400
-        hash: "65a184b5c49b02e08114e437483f928d"
-    }
-    Frame {
-        msec: 6416
-        hash: "832d2aefbcaf776f35039be527d367c5"
-    }
-    Frame {
-        msec: 6432
-        hash: "69207181a382650c5e33145555f0d9ba"
-    }
-    Frame {
-        msec: 6448
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6464
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6480
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6496
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6512
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6528
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6544
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6560
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6576
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6592
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6608
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6624
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6640
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6656
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6672
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6688
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6704
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6720
-        image: "listview.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6752
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6768
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6784
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6800
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6816
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6832
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6848
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6864
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6880
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6896
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6912
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6928
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6944
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6960
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6976
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6992
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7008
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7024
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7040
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7056
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7072
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7088
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7104
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7120
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7136
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7152
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7168
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7184
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7200
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7216
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7232
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7248
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7264
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7280
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7296
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 519; y: 276
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 519; y: 275
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 519; y: 274
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 273
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 272
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 271
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 268
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7392
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 266
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 265
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7408
-        hash: "9047f597b9e59ca652c172338bed6ef9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 262
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "87476f78daecd6bb49e8d6e673d28100"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 260
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7440
-        hash: "6bfd895c6b7d97e4102eb26608cdfeca"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 254
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "e4c2b75beaee54a5781a5acbeb37ea64"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 249
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "d5e816768e9c3db0631416bd86b1b461"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 243
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7488
-        hash: "df6c7252ebb51e7447396b640e1c6ead"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 237
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7504
-        hash: "5f4db5386dc76b9f2dac47618c733dee"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 231
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "534d1d16d8321996969b54875ec5f1e0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 225
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7536
-        hash: "5263016e53327df1972498b55a60c0ed"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 219
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7552
-        hash: "6787a5a16d2a61643bb1435f6488ada6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7568
-        hash: "1feabcd683590c3d28d899167e6278b3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 519; y: 208
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7584
-        hash: "c0495d6083b2e4ddd2b1dca2f231529c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 520; y: 202
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7600
-        hash: "cb302493a17c1806dfcdf002c44e7acd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 196
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7616
-        hash: "f3822b79b678532ce7f826952636be90"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7632
-        hash: "6e30eed182c38be110ba9c7e95b223be"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 185
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7648
-        hash: "9e3ad0331c0c041b9a5747a1d44a43fe"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7664
-        hash: "791e6abf9dae670770c2429ee9f1ad71"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 169
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7680
-        image: "listview.7.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 160
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7696
-        hash: "d3ae366fb8212cb987e23150802c88e3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7712
-        hash: "b87708e19d7e8b64fe1ab50ec1723975"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 147
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7728
-        hash: "512678e45cdd8d48e10b08ee020afe8e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 144
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "211aa70e813819d476996b3396e9e5a0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7760
-        hash: "f16eaa360604be84ce61364ad9733b52"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 130
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7776
-        hash: "d3af36dfb187d08abe1458f186a935a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7792
-        hash: "9d0a0ba1deb7c4a4a8838e5e6a27f2f6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 122
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7808
-        hash: "69aac14f4c137e66724ca33f00a86676"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7824
-        hash: "893d56e2a2ca257fae9f0c6c0629903d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 111
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7840
-        hash: "b9f734e57a72e33973740a59776948d9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 106
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7856
-        hash: "e4b0f3f6a6785d7a183e4a36c5803301"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7872
-        hash: "99ee1e8803c05e546a721b0c9ee39499"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "96e7da2f895500a786ed36cb295e9003"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "cd369fc5dc31814208e56cf7cd0decea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "5fee72994b65a45b4900a3073f86a3e1"
-    }
-    Frame {
-        msec: 7936
-        hash: "9a2f8a65d842b8f92998e6411f7cd53c"
-    }
-    Frame {
-        msec: 7952
-        hash: "2848d69017ce71ae101ccdfa7c67f933"
-    }
-    Frame {
-        msec: 7968
-        hash: "6568aa88e81f988f65da435df7166167"
-    }
-    Frame {
-        msec: 7984
-        hash: "d5f15ee08a2d7667786757a378a7a7f4"
-    }
-    Frame {
-        msec: 8000
-        hash: "9b566bd02a561b32d1a4c1ec99c2e2c3"
-    }
-    Frame {
-        msec: 8016
-        hash: "580419e1c9e91046547d913f6b8790a4"
-    }
-    Frame {
-        msec: 8032
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8048
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8064
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 521; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8080
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8096
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8112
-        hash: "83b91a371d682a501bc3a3fceabe4f8c"
-    }
-    Frame {
-        msec: 8128
-        hash: "798b1dbfa0cce362213f426e2c60ac0e"
-    }
-    Frame {
-        msec: 8144
-        hash: "d71b6a693c430a618c23413cb65bb320"
-    }
-    Frame {
-        msec: 8160
-        hash: "2baae394390da39447a67151bc503d65"
-    }
-    Frame {
-        msec: 8176
-        hash: "06688b05c61a7b862d39534207a8adab"
-    }
-    Frame {
-        msec: 8192
-        hash: "a1d3042e16709817906dcdc673ee52c7"
-    }
-    Frame {
-        msec: 8208
-        hash: "236dd41feac1b1a8a4bd7911bb184da2"
-    }
-    Frame {
-        msec: 8224
-        hash: "f3ec821bba1d32e90bdab0e85c07d7d8"
-    }
-    Frame {
-        msec: 8240
-        hash: "e328c35adf7ffc3d7e3af97e798ec8a5"
-    }
-    Frame {
-        msec: 8256
-        hash: "651101db68fd3ed1dc5f441c126dc31b"
-    }
-    Frame {
-        msec: 8272
-        hash: "651101db68fd3ed1dc5f441c126dc31b"
-    }
-    Frame {
-        msec: 8288
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8304
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8320
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8336
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8352
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8368
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8384
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8400
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8416
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8432
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8448
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8464
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8480
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8496
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8512
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8528
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8544
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8560
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8576
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8592
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8608
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8624
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8640
-        image: "listview.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8672
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8688
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8704
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8720
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8736
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8752
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8768
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8784
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8800
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8816
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8832
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8848
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8864
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8880
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8896
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8912
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8928
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8944
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8960
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8976
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8992
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9008
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9024
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9040
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9056
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9072
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9088
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9104
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9120
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9136
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9152
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9168
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9184
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9200
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9216
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9232
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9248
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9264
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9280
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9296
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9312
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9328
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9344
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9360
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9376
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9392
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9408
-        hash: "1171be123a361d72859c25434573482c"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic1.qml
deleted file mode 100644
index b291ea4..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic1.qml
+++ /dev/null
@@ -1,159 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 32
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 48
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 64
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 80
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 96
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 112
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 128
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 144
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 160
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 176
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 192
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 208
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 224
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 240
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 256
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 272
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 288
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 304
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 320
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 336
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 352
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 368
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 384
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 400
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 416
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 432
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 448
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 464
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 480
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 496
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 512
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 528
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 560
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 576
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic2.qml
deleted file mode 100644
index e32e9e6..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic2.qml
+++ /dev/null
@@ -1,187 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 32
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 48
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 64
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 80
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 96
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 112
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 128
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 144
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 160
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 176
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 192
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 208
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 224
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 240
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 256
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 272
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 288
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 304
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 320
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 336
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 352
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 368
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 384
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 400
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 416
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 432
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 448
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 464
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 480
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 496
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 512
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 528
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 544
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 560
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 576
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 592
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 608
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 624
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 640
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 656
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 672
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 688
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic3.qml
deleted file mode 100644
index ed0c53b..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic3.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 32
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 48
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 64
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 80
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 96
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 112
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 128
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 144
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 160
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 176
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 192
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 208
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 224
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 240
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 256
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 272
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 288
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 304
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 320
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 336
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 352
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 368
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 384
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 400
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 416
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 432
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 448
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 464
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 480
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 496
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 512
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 528
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic4.qml
deleted file mode 100644
index a70b741..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data-X11/basic4.qml
+++ /dev/null
@@ -1,171 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 32
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 48
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 64
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 80
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 96
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 112
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 128
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 144
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 160
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 176
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 192
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 208
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 224
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 240
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 256
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 272
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 288
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 304
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 320
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 336
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 352
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 368
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 384
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 400
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 416
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 432
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 448
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 464
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 480
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 496
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 512
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 528
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 560
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 576
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 592
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 608
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-    Frame {
-        msec: 624
-        hash: "c0dc2737283d8dfa62631e0cbb948b99"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic1.qml
index 7aadf36..6670ae5 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic1.qml
@@ -6,154 +6,78 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 32
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 48
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 64
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 80
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 96
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 112
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 128
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 144
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 160
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 176
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 192
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 208
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 224
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 240
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 256
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 272
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 288
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 304
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 320
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 336
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 352
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 368
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 384
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 400
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 416
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 432
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 448
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 464
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 480
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 496
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 512
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 528
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 560
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 576
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic2.qml
index 5624d6b..283b443 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic2.qml
@@ -6,182 +6,162 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 32
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 48
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 64
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 80
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 96
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 112
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 128
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 144
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 160
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 176
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 192
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 208
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 224
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 240
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 256
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 272
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 288
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 304
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 320
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 336
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 352
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 368
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 384
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 400
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 416
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 432
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 448
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 464
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 480
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 496
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 512
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 528
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 544
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 560
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 576
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 592
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 608
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 624
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 640
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 656
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 672
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 688
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic3.qml
index 16a8329..2ee835a 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic3.qml
@@ -6,142 +6,114 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 32
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 48
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 64
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 80
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 96
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 112
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 128
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 144
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 160
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 176
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 192
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 208
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 224
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 240
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 256
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 272
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 288
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 304
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 320
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 336
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 352
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 368
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 384
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 400
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 416
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 432
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 448
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 464
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 480
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 496
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 512
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 528
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic4.qml
index 23cc255..3bbf836 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic4.qml
@@ -6,166 +6,110 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 32
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 48
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 64
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 80
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 96
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 112
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 128
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 144
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 160
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 176
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 192
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 208
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 224
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 240
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 256
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 272
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 288
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 304
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 320
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 336
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 352
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 368
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 384
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 400
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 416
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
     Frame {
         msec: 432
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 448
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 464
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 480
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 496
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 512
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 528
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 560
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 576
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 592
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 608
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
-    }
-    Frame {
-        msec: 624
-        hash: "c0ec1bac5550efaa1f8ce7b46c2fed94"
+        hash: "7b874555d744b10ed666dcb6fad79a19"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png
index a1947ca..75d2089 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png
index d27b7fa..578b7d1 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png
index fdab8c6..def378f 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png
index dc321a8..e23b903 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png
index fdab8c6..def378f 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png
index 15b51cb..b81e713 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png
index a1947ca..75d2089 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
index 829fbb3..b23594b 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
@@ -478,7 +478,7 @@ VisualTest {
     }
     Frame {
         msec: 1712
-        hash: "a68b1bc6c2963ee92c3a45f500667b3b"
+        hash: "b6e433a23282a50db2e165a2447ba3f6"
     }
     Mouse {
         type: 5
@@ -498,7 +498,7 @@ VisualTest {
     }
     Frame {
         msec: 1728
-        hash: "7cda93e59466b3348e7ffe3895f89e86"
+        hash: "68d443f16c16821ffc9ca68b17c76034"
     }
     Mouse {
         type: 5
@@ -510,7 +510,7 @@ VisualTest {
     }
     Frame {
         msec: 1744
-        hash: "06e0008c78e919f7270402938d9d764b"
+        hash: "04b9041c6f10969889d92e94785c7e88"
     }
     Mouse {
         type: 5
@@ -530,7 +530,7 @@ VisualTest {
     }
     Frame {
         msec: 1760
-        hash: "9d8da9199efebb95f56e5d4ebc9a585e"
+        hash: "64b902fe7ab4d89ef0c7b760974e3488"
     }
     Mouse {
         type: 5
@@ -550,7 +550,7 @@ VisualTest {
     }
     Frame {
         msec: 1776
-        hash: "54a60a4279911ba4a8a5741bcadfa783"
+        hash: "c2125b59e00f1a1c189c778c44fe39b0"
     }
     Mouse {
         type: 5
@@ -570,35 +570,35 @@ VisualTest {
     }
     Frame {
         msec: 1792
-        hash: "a1a19370a1a8ed78e475f0d0eb12311c"
+        hash: "c78175071f2e95649d529b9e1cf045b2"
     }
     Frame {
         msec: 1808
-        hash: "196a3b127cf7065614c34856bf8d8bca"
+        hash: "ca8ef2c2a7b06e55899b1b63208e257d"
     }
     Frame {
         msec: 1824
-        hash: "5fbefbd7c7be4374382cc4c8b86ac78a"
+        hash: "b54957726e6257956b63e1d7ebbc96e4"
     }
     Frame {
         msec: 1840
-        hash: "d6a544c622e504c1b931e1a8a1310a6e"
+        hash: "48847db78ddde75bb96edf01c52c3400"
     }
     Frame {
         msec: 1856
-        hash: "20e76f0eb4ec5f691999faf8ad313370"
+        hash: "48dab5cd1feedf1b5dd67390d6f40fda"
     }
     Frame {
         msec: 1872
-        hash: "7f84a3545907c754ae8a6a30ef61c98d"
+        hash: "fe32013c245091b577d0e38eea05705d"
     }
     Frame {
         msec: 1888
-        hash: "b544901eae32903ad054e8cdfed715eb"
+        hash: "e4b6e31029c1ea26405537c6d2304b72"
     }
     Frame {
         msec: 1904
-        hash: "a010ed1e3312f4ca9f429b7e32cdcef9"
+        hash: "b5fc9ab0a96ef526e6eb1c022f26c6a7"
     }
     Frame {
         msec: 1920
@@ -606,135 +606,135 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "93a731dc6f71b6ff5400bf74c87e6c46"
+        hash: "c23846634417c3e8dbbef5175036c071"
     }
     Frame {
         msec: 1952
-        hash: "c73f63d1a024ba956e693487b3ccc761"
+        hash: "1bce9b85235e9a1a472c079dfec70ec5"
     }
     Frame {
         msec: 1968
-        hash: "539d3d00fce2d0128cd697d86d237fe7"
+        hash: "98e707a3e39a5f7bd4a101c2ed83535c"
     }
     Frame {
         msec: 1984
-        hash: "52752d7d6f2d0e085f7132313907b72b"
+        hash: "f73470027601a0c1a2382d5ded9e5fa6"
     }
     Frame {
         msec: 2000
-        hash: "f46dd5803a6075e979e0fc733d503bfb"
+        hash: "d917b18a47b4e90821cba8987492cd1f"
     }
     Frame {
         msec: 2016
-        hash: "b8734698a6bad00ecf019f85328c2c21"
+        hash: "fa526c5ef57eaa210fb4d03b72c35b69"
     }
     Frame {
         msec: 2032
-        hash: "1cfc499ca756023430cc5b2fa95a599d"
+        hash: "15cbc226b032d5a97199735ea7a1408b"
     }
     Frame {
         msec: 2048
-        hash: "63a816548837c19f8f0494c137fc0174"
+        hash: "6ffd2b79cf0e941a59e74bc6f9025bcb"
     }
     Frame {
         msec: 2064
-        hash: "1bce9b85235e9a1a472c079dfec70ec5"
+        hash: "c009924bfa30153f22ab168b539494e9"
     }
     Frame {
         msec: 2080
-        hash: "6677863e7f74c12648409883f73adbe2"
+        hash: "0525908c0302ada989e28990bac3f2ca"
     }
     Frame {
         msec: 2096
-        hash: "98e707a3e39a5f7bd4a101c2ed83535c"
+        hash: "75c1295ef99680784b2e11fb88fa1423"
     }
     Frame {
         msec: 2112
-        hash: "c1f6d8842d14a9394d4b7797314f50e8"
+        hash: "53064c1938f08a55603a99b0db225174"
     }
     Frame {
         msec: 2128
-        hash: "579758b477bcd2112b305a5aac7df338"
+        hash: "99d9e58697736198e0a00443d237e85b"
     }
     Frame {
         msec: 2144
-        hash: "4a7bb81090db246db53e2dbc56f710ea"
+        hash: "6c1e860aef983367365d53f5849ad441"
     }
     Frame {
         msec: 2160
-        hash: "074995cdd8a70817d1c8a7bb0ad4c542"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2176
-        hash: "bd8d7bda4d2e9ad1fba2895d568f36cc"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2192
-        hash: "40cce3d2d80ac470af44fc334cec1d5b"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2208
-        hash: "15cbc226b032d5a97199735ea7a1408b"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2224
-        hash: "12b296aea9b058a5402d0d0a620f8edc"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2240
-        hash: "6ffd2b79cf0e941a59e74bc6f9025bcb"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2256
-        hash: "589a58ef76ea709dc8d80390c9044f99"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2272
-        hash: "c009924bfa30153f22ab168b539494e9"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2288
-        hash: "4b83674a7c2daa68d735901ad40be2bd"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2304
-        hash: "0525908c0302ada989e28990bac3f2ca"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2320
-        hash: "89eb13976ba3ba4413cafeb0cc91c01b"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2336
-        hash: "75c1295ef99680784b2e11fb88fa1423"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2352
-        hash: "93d89165cf6a97c76ae6e7f75678a3cd"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2368
-        hash: "53064c1938f08a55603a99b0db225174"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2384
-        hash: "31db5684466c0c32128a9a8c7b1835e1"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2400
-        hash: "99d9e58697736198e0a00443d237e85b"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2416
-        hash: "6c1e860aef983367365d53f5849ad441"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2432
-        hash: "6c1e860aef983367365d53f5849ad441"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2448
-        hash: "6c1e860aef983367365d53f5849ad441"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 2464
@@ -894,7 +894,7 @@ VisualTest {
     }
     Frame {
         msec: 2928
-        hash: "5bb06b4e74532ba5bc8c7bc38bf77d7f"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Mouse {
         type: 5
@@ -914,7 +914,7 @@ VisualTest {
     }
     Frame {
         msec: 2944
-        hash: "b10a6206830a876017799ef2fcf61b1a"
+        hash: "52af1b81022e8572b9123461d123197f"
     }
     Mouse {
         type: 5
@@ -934,7 +934,7 @@ VisualTest {
     }
     Frame {
         msec: 2960
-        hash: "b2e24759ba10afd6cff90f4b1e04b496"
+        hash: "e1390ad02ae7a6e757df4a7af9032167"
     }
     Mouse {
         type: 5
@@ -954,11 +954,11 @@ VisualTest {
     }
     Frame {
         msec: 2976
-        hash: "ccbcd6f45cb529c2db71504c0f69d73e"
+        hash: "bf57f309378c956dfd70aa79a7dd97c5"
     }
     Frame {
         msec: 2992
-        hash: "7b31c6d5931677f1aa1e8c7d48a4ff22"
+        hash: "408b59b96ecad0541ecbb97262c2567b"
     }
     Frame {
         msec: 3008
@@ -966,171 +966,171 @@ VisualTest {
     }
     Frame {
         msec: 3024
-        hash: "dd639d1df3d4a9b8f06718def63d588f"
+        hash: "9aabf0500b1272375f5f6db1bd1d7b04"
     }
     Frame {
         msec: 3040
-        hash: "39d767b09a648ef6295cec2848f9226f"
+        hash: "2e92065ca9425d1645d69c1734804518"
     }
     Frame {
         msec: 3056
-        hash: "5dd46d5f386431e7b13348ac9a9630ed"
+        hash: "c73b2e430a0e96a660aa4447697e5adf"
     }
     Frame {
         msec: 3072
-        hash: "0354e5183b0e66e7ba146d292c559df4"
+        hash: "875560b509215a869d1cad8a05f38850"
     }
     Frame {
         msec: 3088
-        hash: "984aa6d7075e24de429e05b1b0eda94a"
+        hash: "4b5368f0d86bffeb6bd31b58aec88650"
     }
     Frame {
         msec: 3104
-        hash: "1af58a2f44f1f613712d4df85e38356d"
+        hash: "3f4c24f7ac89da982af22032309637fb"
     }
     Frame {
         msec: 3120
-        hash: "6e4085e7f1fee724d78808753f04b471"
+        hash: "8cacde33b70fc62b9b0c753091168b97"
     }
     Frame {
         msec: 3136
-        hash: "73a019ef9057639d631cd99a431b3f3b"
+        hash: "7b8c1bb2a3ab9ba23ac17dc5422adac8"
     }
     Frame {
         msec: 3152
-        hash: "c9414a2e655a90dfdcb6fb288b4ba0ca"
+        hash: "5aa34dccdd406b7e93dfdf756bbca5f0"
     }
     Frame {
         msec: 3168
-        hash: "3f4c24f7ac89da982af22032309637fb"
+        hash: "4865c30dc45fbf5ca82047b77eca0912"
     }
     Frame {
         msec: 3184
-        hash: "a50e6ada8f73a257657f4348ceaffcfd"
+        hash: "1dcecc3a899b060a1469ef91e0d21765"
     }
     Frame {
         msec: 3200
-        hash: "a67bf40d09259bbd079c12ae4f49150f"
+        hash: "31422699bdbbbf827f7bb1f1ef78823e"
     }
     Frame {
         msec: 3216
-        hash: "a2fc512b7c234a9d0b2c1a83387a8a46"
+        hash: "5859920a625ef94a644fda85d14e92fb"
     }
     Frame {
         msec: 3232
-        hash: "85090683ce9a3c9833b1cb0b3df076ee"
+        hash: "37f1f7aaeaed28807f51fd9ad8c414ac"
     }
     Frame {
         msec: 3248
-        hash: "275f3594a0e2cc4b6717f9f336e7e1b6"
+        hash: "14592a6c86f211c20abab5cf34a406b4"
     }
     Frame {
         msec: 3264
-        hash: "2473eb11f7b65a784a2b166114026488"
+        hash: "77c18ac7dfff2a4e516915e3e3df0717"
     }
     Frame {
         msec: 3280
-        hash: "4865c30dc45fbf5ca82047b77eca0912"
+        hash: "f619097356671f6eb54d3b1c481e709d"
     }
     Frame {
         msec: 3296
-        hash: "54de88bca395449fbaea2c090c7a5d91"
+        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
     }
     Frame {
         msec: 3312
-        hash: "833f9295cf9a34934f001eac48551b59"
+        hash: "17deb6b26fc9d27d5194995c102da4ac"
     }
     Frame {
         msec: 3328
-        hash: "5bf565f57ababa7380faeee94add91ca"
+        hash: "29c52328b54f02cc9042f676d710b9b2"
     }
     Frame {
         msec: 3344
-        hash: "6325578867f1eb3b2d47ed40b017b571"
+        hash: "c3b219bdd7710427d134402a8d3e6429"
     }
     Frame {
         msec: 3360
-        hash: "046a6114176b3a3206b7a2acd6e30b41"
+        hash: "40204fdb7a84b86f1380224908092354"
     }
     Frame {
         msec: 3376
-        hash: "f8d4120a17f28c2d1d9c4be959098058"
+        hash: "de7f3c83f37cc89c87009626c72e7642"
     }
     Frame {
         msec: 3392
-        hash: "71356d2e48aad2900784ea6bc1a3d908"
+        hash: "e4dacafba5ab5f8db53f08cef458cf42"
     }
     Frame {
         msec: 3408
-        hash: "b84ad460fb81fdc4049abe8f3ff180bb"
+        hash: "b554512bac0766063870c5b3acb1d24f"
     }
     Frame {
         msec: 3424
-        hash: "0354239f5eaea23474d9f81385392a8a"
+        hash: "bb5ea2a238920a8486263bc7450edfb4"
     }
     Frame {
         msec: 3440
-        hash: "8ef0eef3393e07ae7605c865a95edc30"
+        hash: "bb5ea2a238920a8486263bc7450edfb4"
     }
     Frame {
         msec: 3456
-        hash: "5b8b384cc8e3faf4310015e19b3eb487"
+        hash: "b554512bac0766063870c5b3acb1d24f"
     }
     Frame {
         msec: 3472
-        hash: "77c18ac7dfff2a4e516915e3e3df0717"
+        hash: "b554512bac0766063870c5b3acb1d24f"
     }
     Frame {
         msec: 3488
-        hash: "c1d3264384c26345eb8100de829309ca"
+        hash: "e4dacafba5ab5f8db53f08cef458cf42"
     }
     Frame {
         msec: 3504
-        hash: "6b21f71d0bedef4bbcb445a13f61e7a3"
+        hash: "e4dacafba5ab5f8db53f08cef458cf42"
     }
     Frame {
         msec: 3520
-        hash: "f619097356671f6eb54d3b1c481e709d"
+        hash: "de7f3c83f37cc89c87009626c72e7642"
     }
     Frame {
         msec: 3536
-        hash: "e56e3a90da446e0c482cb93717f6aacc"
+        hash: "40204fdb7a84b86f1380224908092354"
     }
     Frame {
         msec: 3552
-        hash: "aa94ebdbb4b8423aff28c95daff0baf5"
+        hash: "3b2e2d957585fb44a7165186a146892c"
     }
     Frame {
         msec: 3568
-        hash: "e1744d9cacd1a2c96af4cfdd5c486995"
+        hash: "c3b219bdd7710427d134402a8d3e6429"
     }
     Frame {
         msec: 3584
-        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
+        hash: "8d424f37bb6af879129e57661d30a162"
     }
     Frame {
         msec: 3600
-        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
+        hash: "29c52328b54f02cc9042f676d710b9b2"
     }
     Frame {
         msec: 3616
-        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
+        hash: "8ef246d322446e7f0848b99495f89e2b"
     }
     Frame {
         msec: 3632
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
+        hash: "17deb6b26fc9d27d5194995c102da4ac"
     }
     Frame {
         msec: 3648
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
+        hash: "5f6708f615654c459f5749676fc09016"
     }
     Frame {
         msec: 3664
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
+        hash: "1734205ea5e7539b47d80c5a93ec74aa"
     }
     Frame {
         msec: 3680
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
+        hash: "1734205ea5e7539b47d80c5a93ec74aa"
     }
     Frame {
         msec: 3696
@@ -1298,7 +1298,7 @@ VisualTest {
     }
     Frame {
         msec: 4160
-        hash: "c2c9c284b185a89faf4ddb5a7867f449"
+        hash: "f619097356671f6eb54d3b1c481e709d"
     }
     Mouse {
         type: 5
@@ -1310,7 +1310,7 @@ VisualTest {
     }
     Frame {
         msec: 4176
-        hash: "de1c18aeda5d2fbd6dad4554c78617bd"
+        hash: "240081760f0cf2f02be4d6d2600d2bbc"
     }
     Mouse {
         type: 5
@@ -1338,11 +1338,11 @@ VisualTest {
     }
     Frame {
         msec: 4192
-        hash: "a67bf40d09259bbd079c12ae4f49150f"
+        hash: "3b85c1739fdf3933d8cb0b2eaf22e6e3"
     }
     Frame {
         msec: 4208
-        hash: "94514668dafbe41c5890a578efd6dea4"
+        hash: "f811f3c6b022730dd68ebd7b1659ea40"
     }
     Frame {
         msec: 4224
@@ -1350,139 +1350,139 @@ VisualTest {
     }
     Frame {
         msec: 4240
-        hash: "4b5368f0d86bffeb6bd31b58aec88650"
+        hash: "7b7f5daf5eaf047e69d04b5bcb73240c"
     }
     Frame {
         msec: 4256
-        hash: "b459bde7bb4ce51e6ecdab58f64fcbb9"
+        hash: "1af58a2f44f1f613712d4df85e38356d"
     }
     Frame {
         msec: 4272
-        hash: "7bac8cc3ec64c9ad1c0da282e38c953e"
+        hash: "1bbdda445cec7f95a189c15d7e3c77b8"
     }
     Frame {
         msec: 4288
-        hash: "a73a58c3d7a757547740a2a161f4c756"
+        hash: "91d8bcfebff29d2caf526b4012daaf46"
     }
     Frame {
         msec: 4304
-        hash: "b35edcb1fa3568a3e770ab2364b82e75"
+        hash: "71ec8c363ca6a6f7556afb70faccffe6"
     }
     Frame {
         msec: 4320
-        hash: "d6c863ef57c5e5cb04cdac72f920db0b"
+        hash: "303ebc28d09a49de52cb1adaa03872dd"
     }
     Frame {
         msec: 4336
-        hash: "0db5e4588ff851918b07796f0cf07382"
+        hash: "9402e86bf4ffa62c60b02531a3735275"
     }
     Frame {
         msec: 4352
-        hash: "71ec8c363ca6a6f7556afb70faccffe6"
+        hash: "5652de6fb2e107d41c0c5aeacf5a3055"
     }
     Frame {
         msec: 4368
-        hash: "18d026e9c965ada1db67c643576d2a80"
+        hash: "b6a2ade6565a86b1f8e369b02e0b93f9"
     }
     Frame {
         msec: 4384
-        hash: "69f71c22dff981a4da8ec1edcf90e79f"
+        hash: "30dd35e0b9ffa846f3cfc39edcbae511"
     }
     Frame {
         msec: 4400
-        hash: "680460f5e4d9e649931601041af046b2"
+        hash: "401975fb4c9a48953aec25adb593eec4"
     }
     Frame {
         msec: 4416
-        hash: "3028763fd15de2607b20b1331b904a4a"
+        hash: "71f9039c7aa9c8dc6d1de4561b1d5537"
     }
     Frame {
         msec: 4432
-        hash: "333eb60e217fe1ea7469eab52ac461f1"
+        hash: "e1390ad02ae7a6e757df4a7af9032167"
     }
     Frame {
         msec: 4448
-        hash: "ccbcd6f45cb529c2db71504c0f69d73e"
+        hash: "53a26f00bd49b8a9c065be99f9402d9c"
     }
     Frame {
         msec: 4464
-        hash: "3445df9b41a0a3e74738cbf328ab7d5c"
+        hash: "b6e515e9a27af23b895f5024a41ce7b3"
     }
     Frame {
         msec: 4480
-        hash: "bd2c072558479e9de7a97207e58cc57f"
+        hash: "85d143505d56f53c629358b37ad11581"
     }
     Frame {
         msec: 4496
-        hash: "3d34b0b24a30eda93377dcb4585afed8"
+        hash: "de5cbdd848a07b78f9c5eb510cca2d3e"
     }
     Frame {
         msec: 4512
-        hash: "d3045703863b0c5a327b9355c23d69f2"
+        hash: "0ad7411316031e22034c14e81ca3a806"
     }
     Frame {
         msec: 4528
-        hash: "2f2eb55f693415b840a317211b250e9f"
+        hash: "32bef6f5005ad94e29ff59165958fbdc"
     }
     Frame {
         msec: 4544
-        hash: "791b9ca7d47a3343474c30a35e336d4b"
+        hash: "87758dd311f91193bf1e3536c2f58525"
     }
     Frame {
         msec: 4560
-        hash: "73a0c02ebad6d3d5f939d9a00dd898bf"
+        hash: "d4c34ed49317c6692d71681fcd9842b6"
     }
     Frame {
         msec: 4576
-        hash: "d5c11135d586711b12f236430a2c2795"
+        hash: "abaa235bb946a8abaddd52981d632c2d"
     }
     Frame {
         msec: 4592
-        hash: "34f9ea214fe714ff4e994f715ea6ea39"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4608
-        hash: "8e49afa00983b156b818533923fb6edd"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4624
-        hash: "e7e7bef17cee92eca9191fd734d7a577"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4640
-        hash: "e407f6ed7cb3c130365ab5515d6308c0"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4656
-        hash: "5bb06b4e74532ba5bc8c7bc38bf77d7f"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4672
-        hash: "0ad7411316031e22034c14e81ca3a806"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4688
-        hash: "dd81d7a9b48c922b4c42cba1b5f2b9d7"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4704
-        hash: "32bef6f5005ad94e29ff59165958fbdc"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4720
-        hash: "87758dd311f91193bf1e3536c2f58525"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4736
-        hash: "015be92a4ff4e735fcc3cbc7a8b9d763"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4752
-        hash: "d4c34ed49317c6692d71681fcd9842b6"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4768
-        hash: "abaa235bb946a8abaddd52981d632c2d"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Frame {
         msec: 4784
@@ -1650,7 +1650,7 @@ VisualTest {
     }
     Frame {
         msec: 5280
-        hash: "95b380c9ab6f8db7b822faf023d94546"
+        hash: "99f9988040a389576cb6420b5391f768"
     }
     Mouse {
         type: 5
@@ -1670,7 +1670,7 @@ VisualTest {
     }
     Frame {
         msec: 5296
-        hash: "bb79e53556698c62ec30c75be9f6b7d7"
+        hash: "6ffd2b79cf0e941a59e74bc6f9025bcb"
     }
     Mouse {
         type: 5
@@ -1698,115 +1698,115 @@ VisualTest {
     }
     Frame {
         msec: 5312
-        hash: "285cc2f0df1f59f25a0135560ab6edf2"
+        hash: "4aa05d978267325ae00cb45e310a2f01"
     }
     Frame {
         msec: 5328
-        hash: "93a731dc6f71b6ff5400bf74c87e6c46"
+        hash: "b5717b311259c77a0210e26ab99dd401"
     }
     Frame {
         msec: 5344
-        hash: "eb555741ab128a50de5a18a454f2e639"
+        hash: "9b3fde82278fa2f0caaf64cf23bb6530"
     }
     Frame {
         msec: 5360
-        hash: "5dbe6cf898c1e37fcaacecfcf57b2194"
+        hash: "e7795610115593e78bb32f7bcc0ae2eb"
     }
     Frame {
         msec: 5376
-        hash: "e7795610115593e78bb32f7bcc0ae2eb"
+        hash: "0dc7c4c161e0b3c3d176e5e6bc08a805"
     }
     Frame {
         msec: 5392
-        hash: "20e76f0eb4ec5f691999faf8ad313370"
+        hash: "7c2b0307c4040d8d9e88425b3bf3fb70"
     }
     Frame {
         msec: 5408
-        hash: "d6a544c622e504c1b931e1a8a1310a6e"
+        hash: "cf2acc805e9707327b01eb979f2b67a3"
     }
     Frame {
         msec: 5424
-        hash: "e7a3a21feed244c5b1c710a9254c15f0"
+        hash: "7aeec517e845c1c5012ed63be6bbd006"
     }
     Frame {
         msec: 5440
-        hash: "5a4b1aca24f121d1373646e9d80b86fd"
+        hash: "a978890b419f9503e53d4d3f4f9b8c9b"
     }
     Frame {
         msec: 5456
-        hash: "331d2ec7021655c86aa64e47718a1088"
+        hash: "73339b67e49210b4760b8e06fa4067b7"
     }
     Frame {
         msec: 5472
-        hash: "92096bc872e7395aa5b75c44646a0b60"
+        hash: "d09a245890e813c248050132a76465f3"
     }
     Frame {
         msec: 5488
-        hash: "0d9aa6cee4d21488cbb5153f8f3ed593"
+        hash: "35b874b3b4d7d1e59852233fce192b0b"
     }
     Frame {
         msec: 5504
-        hash: "c1b943d43701605563fffffcb75f9fa7"
+        hash: "4f80a0da1941e9c208036f22df93bed8"
     }
     Frame {
         msec: 5520
-        hash: "1b680025d5ad1ddd8f8d5f570ba73e71"
+        hash: "7bbdc4ce95bc12e505f24cb8b137a0f1"
     }
     Frame {
         msec: 5536
-        hash: "5539a3b9f60ea747c10ed8328b467cbf"
+        hash: "e68b5fb604a45d4e7ee21f6e06460b47"
     }
     Frame {
         msec: 5552
-        hash: "0a1317bcb606cd3488c5b14ee5d96585"
+        hash: "903059d468bed1ac8395e38a19c9dd38"
     }
     Frame {
         msec: 5568
-        hash: "8844af68b11db7d92c69804c7371a746"
+        hash: "d7430ebf26f2de6f648471c19455cf0f"
     }
     Frame {
         msec: 5584
-        hash: "28d7fd127739c6e3b8488651b725c802"
+        hash: "d5268cd58c222451d48038e715e83802"
     }
     Frame {
         msec: 5600
-        hash: "0cf1a7d958a96aa2768995dddc5ccc09"
+        hash: "99b4534b0bf58dc8e28c1118a5baec33"
     }
     Frame {
         msec: 5616
-        hash: "64b902fe7ab4d89ef0c7b760974e3488"
+        hash: "ade5beb259b5277c333ca806fc9bdbec"
     }
     Frame {
         msec: 5632
-        hash: "aba11c597eba550fc1eaddbf554057f6"
+        hash: "f34d2248999f5f51210064315d631f60"
     }
     Frame {
         msec: 5648
-        hash: "1bacaa3bb9dc3cac9ffc7491cb4dc1a5"
+        hash: "40382f644935dc4e99353fa29c3e0b21"
     }
     Frame {
         msec: 5664
-        hash: "0ba8b582234d9f0c198c0c9e18e1cb02"
+        hash: "65af7a4a4aea5a983ea3fb9324e74256"
     }
     Frame {
         msec: 5680
-        hash: "f66eaf2b5c3529987c0d9d005351ed73"
+        hash: "b8db9180b4ad15fdbd25a4e974512f92"
     }
     Frame {
         msec: 5696
-        hash: "75b0bb720fa4c77da3783b3ff31c2fae"
+        hash: "2311ce1a83a43619ab7ce537a2b948e1"
     }
     Frame {
         msec: 5712
-        hash: "345b235bb7f13409378e5c0c370f2a41"
+        hash: "35fe67a91e50f8ebc896451b39cb8f1c"
     }
     Frame {
         msec: 5728
-        hash: "83b7e902dce4e0fdc4ef5d629188c23c"
+        hash: "35fe67a91e50f8ebc896451b39cb8f1c"
     }
     Frame {
         msec: 5744
-        hash: "04b9041c6f10969889d92e94785c7e88"
+        hash: "0b7fc796f818bddcada99e9981f1cce0"
     }
     Frame {
         msec: 5760
@@ -1814,59 +1814,59 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "4f3a902addc34ecdaf390e2427cc52e7"
+        hash: "35fe67a91e50f8ebc896451b39cb8f1c"
     }
     Frame {
         msec: 5792
-        hash: "68d443f16c16821ffc9ca68b17c76034"
+        hash: "35fe67a91e50f8ebc896451b39cb8f1c"
     }
     Frame {
         msec: 5808
-        hash: "9d25adc77befa761ee376a9b43595b5e"
+        hash: "2311ce1a83a43619ab7ce537a2b948e1"
     }
     Frame {
         msec: 5824
-        hash: "a68b1bc6c2963ee92c3a45f500667b3b"
+        hash: "127871a98123b7bd44f4c38f27cbc836"
     }
     Frame {
         msec: 5840
-        hash: "d5268cd58c222451d48038e715e83802"
+        hash: "b8db9180b4ad15fdbd25a4e974512f92"
     }
     Frame {
         msec: 5856
-        hash: "f37d461541a8ec7a4161b18748de6aea"
+        hash: "0974df6a7277bba11a3d3f400c68f4f1"
     }
     Frame {
         msec: 5872
-        hash: "805319ac7ca842feb3649e92f8b5b72f"
+        hash: "65af7a4a4aea5a983ea3fb9324e74256"
     }
     Frame {
         msec: 5888
-        hash: "73124472a05080891d4948d8ca273f8c"
+        hash: "b3e92eb4cfe548b92ac526066dfc7d23"
     }
     Frame {
         msec: 5904
-        hash: "b6e433a23282a50db2e165a2447ba3f6"
+        hash: "40382f644935dc4e99353fa29c3e0b21"
     }
     Frame {
         msec: 5920
-        hash: "fd8d3f5688b1806998c6087e18c6c730"
+        hash: "39fcad34db24d591e24c8ae1c7094d5b"
     }
     Frame {
         msec: 5936
-        hash: "f132dd459950ef2d18aa93ca950d0692"
+        hash: "165b91b850bcb8dd1d9b1eaa6f81be57"
     }
     Frame {
         msec: 5952
-        hash: "ade5beb259b5277c333ca806fc9bdbec"
+        hash: "f34d2248999f5f51210064315d631f60"
     }
     Frame {
         msec: 5968
-        hash: "ade5beb259b5277c333ca806fc9bdbec"
+        hash: "b135c8c9975f4d45d2054cf31d0b1fe1"
     }
     Frame {
         msec: 5984
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
+        hash: "b135c8c9975f4d45d2054cf31d0b1fe1"
     }
     Frame {
         msec: 6000
diff --git a/tests/auto/declarative/qmlvisual/ListView/listview.qml b/tests/auto/declarative/qmlvisual/ListView/listview.qml
index 341311d..7e7af59 100644
--- a/tests/auto/declarative/qmlvisual/ListView/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/listview.qml
@@ -49,7 +49,7 @@ Rectangle {
 
     Component {
         id: myHighlight
-        Rectangle { color: "black" }
+        Rectangle { width: 200; height: 50; color: "black" }
     }
 
     ListView {
-- 
cgit v0.12


From 82159dbbfe7e36bc8f67ad1637a2285fb002eb11 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Thu, 28 Oct 2010 18:18:41 +1000
Subject: Remove unnecessary layouting code from QDeclarativeText

Task-number: QTBUG-14795
Reviewed-by: Michael Brasser
---
 src/declarative/graphicsitems/qdeclarativetext.cpp | 51 ++++------------------
 1 file changed, 8 insertions(+), 43 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 0717b78..c8e3615 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -287,8 +287,7 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
     Q_Q(QDeclarativeText);
     layout.setCacheEnabled(true);
 
-    int height = 0;
-    qreal widthUsed = 0;
+    qreal height = 0;
     qreal lineWidth = 0;
 
     //set manual width
@@ -297,6 +296,7 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
 
     QTextOption textOption = layout.textOption();
     textOption.setWrapMode(QTextOption::WrapMode(wrapMode));
+    textOption.setAlignment((Qt::Alignment)hAlign);
     layout.setTextOption(textOption);
 
     layout.beginLayout();
@@ -305,37 +305,15 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
         if (!line.isValid())
             break;
 
-        if ((wrapMode != QDeclarativeText::NoWrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid()) 
+        if ((wrapMode != QDeclarativeText::NoWrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid()) {
             line.setLineWidth(lineWidth);
-    }
-    layout.endLayout();
-
-    for (int i = 0; i < layout.lineCount(); ++i) {
-        QTextLine line = layout.lineAt(i);
-        widthUsed = qMax(widthUsed, line.naturalTextWidth());
-    }
-
-    qreal layoutWidth = q->widthValid()?q->width():widthUsed;
-
-    int x = 0;
-    for (int i = 0; i < layout.lineCount(); ++i) {
-        QTextLine line = layout.lineAt(i);
-        line.setPosition(QPointF(0, height));
-        height += int(line.height());
-
-        if (!cacheAllTextAsImage) {
-            if (hAlign == QDeclarativeText::AlignLeft) {
-                x = 0;
-            } else if (hAlign == QDeclarativeText::AlignRight) {
-                x = layoutWidth - (int)line.naturalTextWidth();
-            } else if (hAlign == QDeclarativeText::AlignHCenter) {
-                x = (layoutWidth - (int)line.naturalTextWidth()) / 2;
-            }
-            line.setPosition(QPoint(x, (int)line.y()));
+            line.setPosition(QPointF(0, height));
+            height += line.height();
         }
     }
+    layout.endLayout();
 
-    return QSize(qCeil(widthUsed), height);
+    return QSize(qCeil(layout.boundingRect().width()), layout.boundingRect().height());
 }
 
 /*!
@@ -347,19 +325,6 @@ QPixmap QDeclarativeTextPrivate::textLayoutImage(bool drawStyle)
     //do layout
     QSize size = layedOutTextSize;
 
-    int x = 0;
-    for (int i = 0; i < layout.lineCount(); ++i) {
-        QTextLine line = layout.lineAt(i);
-        if (hAlign == QDeclarativeText::AlignLeft) {
-            x = 0;
-        } else if (hAlign == QDeclarativeText::AlignRight) {
-            x = size.width() - (int)line.naturalTextWidth();
-        } else if (hAlign == QDeclarativeText::AlignHCenter) {
-            x = (size.width() - (int)line.naturalTextWidth()) / 2;
-        }
-        line.setPosition(QPoint(x, (int)line.y()));
-    }
-
     //paint text
     QPixmap img(size);
     if (!size.isEmpty()) {
@@ -1147,7 +1112,7 @@ void QDeclarativeText::geometryChanged(const QRectF &newGeometry, const QRectF &
     if ((!d->internalWidthUpdate && newGeometry.width() != oldGeometry.width())
             && (d->wrapMode != QDeclarativeText::NoWrap
                 || d->elideMode != QDeclarativeText::ElideNone
-                || d->hAlign != Qt::AlignLeft)) {
+                || d->hAlign != QDeclarativeText::AlignLeft)) {
         if (d->singleline && d->elideMode != QDeclarativeText::ElideNone && widthValid()) {
             // We need to re-elide
             d->updateLayout();
-- 
cgit v0.12


From 7537554040827dbaae327d27c77319e6b7e7c618 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Thu, 28 Oct 2010 10:24:48 +0200
Subject: Network code: Fix code comment spellchecking errors.

Me no speak americano.

Reviewed-by: Peter Hartmann
---
 src/network/access/qhttp.cpp                   | 2 +-
 src/network/access/qhttpnetworkconnection.cpp  | 2 +-
 src/network/socket/qlocalserver_unix.cpp       | 2 +-
 src/network/socket/qnativesocketengine_win.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 13375f8..9c2f79a 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -2442,7 +2442,7 @@ void QHttpPrivate::_q_slotSendRequest()
         if (proxy.hostName().isEmpty()) {
             proxy.setType(QNetworkProxy::NoProxy);
         } else if (sslInUse) {
-            // Disallow use of cacheing proxy with HTTPS; instead fall back to
+            // Disallow use of caching proxy with HTTPS; instead fall back to
             // transparent HTTP CONNECT proxying.
             transparentProxyInUse = true;
         } else {
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index c335cd4..89f9b03 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -745,7 +745,7 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply)
 // although it is called _q_startNextRequest, it will actually start multiple requests when possible
 void QHttpNetworkConnectionPrivate::_q_startNextRequest()
 {
-    // If the QHttpNetworkConnection is currently paused then bail out immediatly
+    // If the QHttpNetworkConnection is currently paused then bail out immediately
     if (state == PausedState)
         return;
 
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 560f5f6..c218d89 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -119,7 +119,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
     // subsequent call to accept will not block in any case
     //
     // This change can be removed once more generic fix to select thread
-    // syncronization problem is implemented.
+    // synchronization problem is implemented.
     int flags = fcntl(listenSocket, F_GETFL, 0);
     if (-1 == flags
         || -1 == (fcntl(listenSocket, F_SETFL, flags | O_NONBLOCK))) {
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index 477ef45..c1a4cfc 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -733,7 +733,7 @@ int QNativeSocketEnginePrivate::nativeAccept()
 {
     int acceptedDescriptor = WSAAccept(socketDescriptor, 0,0,0,0);
 	if (acceptedDescriptor != -1 && QAbstractEventDispatcher::instance()) {
-		// Becuase of WSAAsyncSelect() WSAAccept returns a non blocking socket
+		// Because of WSAAsyncSelect() WSAAccept returns a non blocking socket
 		// with the same attributes as the listening socket including the current
 		// WSAAsyncSelect(). To be able to change the socket to blocking mode the
 		// WSAAsyncSelect() call must be cancled.
-- 
cgit v0.12


From 5a2a17ab60f8393f5e0bf47ff281eeb3e3fc3dc6 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 18:32:52 +1000
Subject: Clean up qmlvisual/animation visual tests

Add platform specific colorAnimation Visuals
remove color animation from propertyAction
remove gradient from qtbug10586
shrink scriptAction-visual.qml

Task-number: QTUBG-14792
---
 .../data-X11/colorAnimation-visual.0.png           | Bin 0 -> 627 bytes
 .../data-X11/colorAnimation-visual.1.png           | Bin 0 -> 626 bytes
 .../data-X11/colorAnimation-visual.2.png           | Bin 0 -> 625 bytes
 .../data-X11/colorAnimation-visual.qml             | 951 +++++++++++++++++++++
 .../data/propertyAction-visual.0.png               | Bin 1418 -> 335 bytes
 .../data/propertyAction-visual.1.png               | Bin 1430 -> 345 bytes
 .../data/propertyAction-visual.2.png               | Bin 1431 -> 336 bytes
 .../propertyAction/data/propertyAction-visual.qml  | 546 +++++-------
 .../propertyAction/propertyAction-visual.qml       |  13 +-
 .../animation/qtbug10586/data/qtbug10586.0.png     | Bin 1149 -> 1135 bytes
 .../animation/qtbug10586/data/qtbug10586.1.png     | Bin 1177 -> 1141 bytes
 .../animation/qtbug10586/data/qtbug10586.2.png     | Bin 1173 -> 1150 bytes
 .../animation/qtbug10586/data/qtbug10586.3.png     | Bin 1149 -> 1141 bytes
 .../animation/qtbug10586/data/qtbug10586.4.png     | Bin 0 -> 1132 bytes
 .../animation/qtbug10586/data/qtbug10586.qml       | 864 +++++++++----------
 .../qmlvisual/animation/qtbug10586/qtbug10586.qml  |   6 +-
 .../scriptAction/data/scriptAction-visual.0.png    | Bin 0 -> 335 bytes
 .../scriptAction/data/scriptAction-visual.1.png    | Bin 0 -> 335 bytes
 .../scriptAction/data/scriptAction-visual.qml      | 298 +++----
 .../animation/scriptAction/data/scriptAction.0.png | Bin 1418 -> 0 bytes
 .../animation/scriptAction/data/scriptAction.1.png | Bin 1431 -> 0 bytes
 .../animation/scriptAction/scriptAction-visual.qml |   4 +-
 22 files changed, 1720 insertions(+), 962 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.qml
 create mode 100644 tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.1.png

diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.0.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.0.png
new file mode 100644
index 0000000..c5e8029
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.1.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.1.png
new file mode 100644
index 0000000..b0f69c2
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.2.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.2.png
new file mode 100644
index 0000000..1317eef
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.qml
new file mode 100644
index 0000000..eb4564c
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data-X11/colorAnimation-visual.qml
@@ -0,0 +1,951 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 32
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 48
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 64
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 80
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 96
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 112
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 128
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 144
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 160
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 176
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 192
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 208
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 224
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 240
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 256
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 272
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 288
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 304
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 320
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 336
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 352
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 368
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 384
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 400
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 416
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 432
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 448
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 464
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 480
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 496
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 512
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 93; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 528
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 544
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 560
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 576
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 592
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 93; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 608
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
+    }
+    Frame {
+        msec: 624
+        hash: "e5bda0daf98288ce18db6ce06eda3ba0"
+    }
+    Frame {
+        msec: 640
+        hash: "d35008f75b8c992f80fb16ba7203649d"
+    }
+    Frame {
+        msec: 656
+        hash: "14f43e0784ddf42ea8550db88c501bf1"
+    }
+    Frame {
+        msec: 672
+        hash: "02276e158b5391480b1bdeaadf1fb903"
+    }
+    Frame {
+        msec: 688
+        hash: "35d9513eb97a2c482b7cd197de910934"
+    }
+    Frame {
+        msec: 704
+        hash: "faf0fd681e60bb2489099f5df772b6cd"
+    }
+    Frame {
+        msec: 720
+        hash: "a863d3e346f94785a3a392fdc91526eb"
+    }
+    Frame {
+        msec: 736
+        hash: "fdf328d3f6eb8410da59a91345e41a44"
+    }
+    Frame {
+        msec: 752
+        hash: "83514a3b10d5be8f6c3b128d0f3e0b1c"
+    }
+    Frame {
+        msec: 768
+        hash: "ead0eae76cd00189075964671effbaea"
+    }
+    Frame {
+        msec: 784
+        hash: "24d2457fcd51490fda23071bf9929d12"
+    }
+    Frame {
+        msec: 800
+        hash: "1478683446cf543dacbe31d0b76a98a6"
+    }
+    Frame {
+        msec: 816
+        hash: "99f7da1f31fe920f6c02add4042ae925"
+    }
+    Frame {
+        msec: 832
+        hash: "22def892006cf66667770b0f17baf6c0"
+    }
+    Frame {
+        msec: 848
+        hash: "6a36d5a77099bfd58baf285478ff04e4"
+    }
+    Frame {
+        msec: 864
+        hash: "6258150666b59b20ab476724c07fc20c"
+    }
+    Frame {
+        msec: 880
+        hash: "f1636315bc950a6dd400d9c7ed263b88"
+    }
+    Frame {
+        msec: 896
+        hash: "18447ea8dc2e8da956788e5b3cf3790a"
+    }
+    Frame {
+        msec: 912
+        hash: "1d2a6e65997a73e9e670356c8e8b63b2"
+    }
+    Frame {
+        msec: 928
+        hash: "bed0242c0f9ef229d1392835286d5782"
+    }
+    Frame {
+        msec: 944
+        hash: "88923c190e9e5beadef8a409c06df9d6"
+    }
+    Frame {
+        msec: 960
+        image: "colorAnimation-visual.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "85b1821cc50f2a9f3ed6944f792b7a2f"
+    }
+    Frame {
+        msec: 992
+        hash: "395195716d76bc0be7b2033ed37a7a1c"
+    }
+    Frame {
+        msec: 1008
+        hash: "243dbffcf416926242bbcb7348974c4c"
+    }
+    Frame {
+        msec: 1024
+        hash: "a755068679616d8ac65c2aa7431f2a19"
+    }
+    Frame {
+        msec: 1040
+        hash: "e8249b35a47eb492cbdf2d91cc8426f0"
+    }
+    Frame {
+        msec: 1056
+        hash: "15f3da1c0e6f0779b96859d51171dd27"
+    }
+    Frame {
+        msec: 1072
+        hash: "258c0c756aac3de743b43051f2aace6b"
+    }
+    Frame {
+        msec: 1088
+        hash: "a58b9fdf301d72b2cc5c93934cc8927b"
+    }
+    Frame {
+        msec: 1104
+        hash: "a9181d30870d472521f8904818ce520f"
+    }
+    Frame {
+        msec: 1120
+        hash: "7f9e94069ccf3897c26a71bd7becd903"
+    }
+    Frame {
+        msec: 1136
+        hash: "bdf305c2f46cdb86dbf57b1e0cc5a65b"
+    }
+    Frame {
+        msec: 1152
+        hash: "fe5b6865d7e4fc7d1d42c1e74f8666f7"
+    }
+    Frame {
+        msec: 1168
+        hash: "734f0de45a6e34c9eab7ef606196f96a"
+    }
+    Frame {
+        msec: 1184
+        hash: "02a361c4534fdf7f286dc3e6dc23275c"
+    }
+    Frame {
+        msec: 1200
+        hash: "e649155ad69999c14b92f6561e4d1185"
+    }
+    Frame {
+        msec: 1216
+        hash: "01af177084fab755d622973f64b92018"
+    }
+    Frame {
+        msec: 1232
+        hash: "097cc4a082dfab995d213a3a73883c97"
+    }
+    Frame {
+        msec: 1248
+        hash: "d7b4239a3280b1eb8e885e3f422df8e9"
+    }
+    Frame {
+        msec: 1264
+        hash: "59893977994e34e83f91e7ce3ad65d6d"
+    }
+    Frame {
+        msec: 1280
+        hash: "b68e3fbb5cdcd6bd96df7dec558db42b"
+    }
+    Frame {
+        msec: 1296
+        hash: "94ad0580648f36a1e18a9ea7e249b04d"
+    }
+    Frame {
+        msec: 1312
+        hash: "750a4c01d2f5806a89a1c6cc6a9b9a68"
+    }
+    Frame {
+        msec: 1328
+        hash: "4f109f50f388f1bfa4bc6b03b3e6e514"
+    }
+    Frame {
+        msec: 1344
+        hash: "c6168d5cf27a533e8ee636637667be47"
+    }
+    Frame {
+        msec: 1360
+        hash: "f8120547bed987aa34c00da5a01a4d1e"
+    }
+    Frame {
+        msec: 1376
+        hash: "cbff526136fa2c128c8b898fbbef9e5c"
+    }
+    Frame {
+        msec: 1392
+        hash: "f29e52398fab1a239a63df4c32f2fc69"
+    }
+    Frame {
+        msec: 1408
+        hash: "7178bfe86fd2fd513218b33760460f8d"
+    }
+    Frame {
+        msec: 1424
+        hash: "ca83285bc8ac633403896fe976896eb0"
+    }
+    Frame {
+        msec: 1440
+        hash: "96ba486c09cc69d5aa38c46c00df1181"
+    }
+    Frame {
+        msec: 1456
+        hash: "b88eab335842787869f4a14824c19dd8"
+    }
+    Frame {
+        msec: 1472
+        hash: "065aa59012729e1e1a246a2083142690"
+    }
+    Frame {
+        msec: 1488
+        hash: "dd0e98c8398861002c5f178c5f9f612d"
+    }
+    Frame {
+        msec: 1504
+        hash: "04192c2b545948048eccf4d81bbde198"
+    }
+    Frame {
+        msec: 1520
+        hash: "bb7502c7208281ef9fd41714ab88a1a8"
+    }
+    Frame {
+        msec: 1536
+        hash: "5397195471890d08b703dca101e5bc7c"
+    }
+    Frame {
+        msec: 1552
+        hash: "4c678cdbebb2ffd2cbf012ca77800cde"
+    }
+    Frame {
+        msec: 1568
+        hash: "0d7a34ecd0c7f52b2c015037bf1902c6"
+    }
+    Frame {
+        msec: 1584
+        hash: "fd9d5048be749ac4369fda2d018b43ae"
+    }
+    Frame {
+        msec: 1600
+        hash: "93ee03795cd57ae6f7fe3a020b039ad4"
+    }
+    Frame {
+        msec: 1616
+        hash: "5e1118963f219c39761ca7fbf564a9ca"
+    }
+    Frame {
+        msec: 1632
+        hash: "8f40038741903150136170503649d941"
+    }
+    Frame {
+        msec: 1648
+        hash: "b087b7d0aa6224821f8e18718ff5e77d"
+    }
+    Frame {
+        msec: 1664
+        hash: "aa46b04a3c67dc772265ed2901955565"
+    }
+    Frame {
+        msec: 1680
+        hash: "ac024bf2aeb4becdf31a09fe0a6db8f3"
+    }
+    Frame {
+        msec: 1696
+        hash: "13745a174e4d06e2108a5bf125ba50cc"
+    }
+    Frame {
+        msec: 1712
+        hash: "bd972f0d8e230eca0b3fea1b8c960c08"
+    }
+    Frame {
+        msec: 1728
+        hash: "cbdbec802a58e7ced0cf45b3ab0bc0ba"
+    }
+    Frame {
+        msec: 1744
+        hash: "5128584c50305c7d218b81b8367fa3d5"
+    }
+    Frame {
+        msec: 1760
+        hash: "a71461d3593f3685620668916de870bd"
+    }
+    Frame {
+        msec: 1776
+        hash: "74ebac8f32cf044b58d9883dbcd9a722"
+    }
+    Frame {
+        msec: 1792
+        hash: "fedc5b638f339b90fe59b478721e65b7"
+    }
+    Frame {
+        msec: 1808
+        hash: "8593a81be812edf54ec94da8ae9c1314"
+    }
+    Frame {
+        msec: 1824
+        hash: "4e9b083075bc5e9287a8abc982778b56"
+    }
+    Frame {
+        msec: 1840
+        hash: "1d6f02aa99afa47d77fc49ab894b365a"
+    }
+    Frame {
+        msec: 1856
+        hash: "a204feec783b3b05de4c209c21745826"
+    }
+    Frame {
+        msec: 1872
+        hash: "665a2a8ff00b9663157802767f504754"
+    }
+    Frame {
+        msec: 1888
+        hash: "624fb09ebe60cb87d767faf8d2420b1e"
+    }
+    Frame {
+        msec: 1904
+        hash: "e5af0cdc33f3275a25abb09e9165f310"
+    }
+    Frame {
+        msec: 1920
+        image: "colorAnimation-visual.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "e7aa6374c73832e57ceb2427a1e258aa"
+    }
+    Frame {
+        msec: 1952
+        hash: "b5abd0dff1ab076faac7cc226e83f5d0"
+    }
+    Frame {
+        msec: 1968
+        hash: "b759acc35bccff8efc2e6fe276ddc0f7"
+    }
+    Frame {
+        msec: 1984
+        hash: "ce52e18c1f7732768779863b45314ff5"
+    }
+    Frame {
+        msec: 2000
+        hash: "99d30652559dd6931e0c95543eeaa149"
+    }
+    Frame {
+        msec: 2016
+        hash: "ffbd9a00e05e085b89296d19d5caec57"
+    }
+    Frame {
+        msec: 2032
+        hash: "9c9d658b9c25602816b8066bf19105db"
+    }
+    Frame {
+        msec: 2048
+        hash: "2b7fd058e6601e22a30bb7106b1c683b"
+    }
+    Frame {
+        msec: 2064
+        hash: "f4c7e26b19ee0a3e7c9688685eb7bd05"
+    }
+    Frame {
+        msec: 2080
+        hash: "0dc6d593bceff56b7f81f2a49d37fefb"
+    }
+    Frame {
+        msec: 2096
+        hash: "9bfd7ad5091ccbdde43c593e133a7b10"
+    }
+    Frame {
+        msec: 2112
+        hash: "2703b617937914a90ea42ebf249d79ee"
+    }
+    Frame {
+        msec: 2128
+        hash: "b77e2983138254016c4cca53100f46fa"
+    }
+    Frame {
+        msec: 2144
+        hash: "60c4dd24187d1281081479e586f02b37"
+    }
+    Frame {
+        msec: 2160
+        hash: "62f2511abd99ef1231c9fa4b91d4abfe"
+    }
+    Frame {
+        msec: 2176
+        hash: "e309b3353fd174e883d309571caddc98"
+    }
+    Frame {
+        msec: 2192
+        hash: "1e2d6a134c7b12dde551b148ef4f088c"
+    }
+    Frame {
+        msec: 2208
+        hash: "e5dc5450604a491cc24a0dcf5c278b58"
+    }
+    Frame {
+        msec: 2224
+        hash: "c8dae97c10e1962c1e6a51ab3ab8579e"
+    }
+    Frame {
+        msec: 2240
+        hash: "4e1b7e06f55fb084080689b474f1fe1d"
+    }
+    Frame {
+        msec: 2256
+        hash: "b4639c907fa937bf15fac62421170cd8"
+    }
+    Frame {
+        msec: 2272
+        hash: "c250208a0caeb5f6cb4d3aac3d7d350b"
+    }
+    Frame {
+        msec: 2288
+        hash: "a73351eabecf0d71149efe31f197413e"
+    }
+    Frame {
+        msec: 2304
+        hash: "479425f1b7aff79e4dfb7fca534af018"
+    }
+    Frame {
+        msec: 2320
+        hash: "046d0f0040a52d1f26ba9f7c5de06ef4"
+    }
+    Frame {
+        msec: 2336
+        hash: "655778bf13c6080903150b0eb43a7edc"
+    }
+    Frame {
+        msec: 2352
+        hash: "72da0bbe81514870655fdd3354adac60"
+    }
+    Frame {
+        msec: 2368
+        hash: "defe0bdf675c65fff55aaaced1e4dae7"
+    }
+    Frame {
+        msec: 2384
+        hash: "c988628b6c3d3780e9a865c7694926cd"
+    }
+    Frame {
+        msec: 2400
+        hash: "5ab17563655231089edd986ff13d6012"
+    }
+    Frame {
+        msec: 2416
+        hash: "c1adff1d2e5800ed466d1691d3b17382"
+    }
+    Frame {
+        msec: 2432
+        hash: "70129ba01fbb19592b9dc0d0a3b3e7df"
+    }
+    Frame {
+        msec: 2448
+        hash: "0000829ef7ed908bf430d42904d59cc2"
+    }
+    Frame {
+        msec: 2464
+        hash: "843d2927f50ab87b4a86b7a6aaeed91f"
+    }
+    Frame {
+        msec: 2480
+        hash: "da86d21756025e7de8050586d5e2a1f8"
+    }
+    Frame {
+        msec: 2496
+        hash: "48dd1bd6580133b0793fee327ea4f1e6"
+    }
+    Frame {
+        msec: 2512
+        hash: "f0618193dcd0ba2837249515a1898b1c"
+    }
+    Frame {
+        msec: 2528
+        hash: "a530184e57251065286c0cbba7301e9c"
+    }
+    Frame {
+        msec: 2544
+        hash: "64a1d7203973d65dd342793007a61c58"
+    }
+    Frame {
+        msec: 2560
+        hash: "5b830dfc6ba442772de87d75d5a578de"
+    }
+    Frame {
+        msec: 2576
+        hash: "5563b056b0409b65f60dd16dd0dd890e"
+    }
+    Frame {
+        msec: 2592
+        hash: "b8bcf9ad2ca8720c11563a23d8280804"
+    }
+    Frame {
+        msec: 2608
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2624
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2640
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2656
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2672
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2688
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2704
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2720
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2736
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2752
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2768
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2784
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2800
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2816
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2832
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2848
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2864
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2880
+        image: "colorAnimation-visual.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2912
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2928
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2944
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2960
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2976
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 2992
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3008
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3024
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3040
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3056
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3072
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3088
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3104
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3120
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3136
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3152
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3168
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3184
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3200
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3216
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3232
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3248
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3264
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3280
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3296
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3312
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3328
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3344
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3360
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3376
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3392
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3408
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3424
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3440
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3456
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3472
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3488
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3504
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3520
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3536
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3552
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3568
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3584
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3600
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3616
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3632
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3648
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3664
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+    Frame {
+        msec: 3680
+        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png
index 64d6b06..a02c063 100644
Binary files a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png and b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png
index f7fce15..0714b4a 100644
Binary files a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png and b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png
index 3080df5..7d2b66e 100644
Binary files a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png and b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
index 36b39fa..09febd7 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
@@ -6,239 +6,247 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 32
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 48
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 64
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 80
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 96
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 112
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 128
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 144
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 160
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 176
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 192
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 208
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 224
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 240
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 256
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 272
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 288
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 304
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 320
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 336
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 352
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 368
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 384
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 400
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 416
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 432
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 448
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 464
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 480
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 496
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 512
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 528
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 544
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 560
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 576
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 592
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 608
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 624
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 640
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 656
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 672
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 688
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 704
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 720
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 736
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 27; y: 19
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 752
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 768
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "a858eee4b2753915ec84d2ffa098260c"
     }
     Frame {
         msec: 784
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "a858eee4b2753915ec84d2ffa098260c"
     }
     Frame {
         msec: 800
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "a858eee4b2753915ec84d2ffa098260c"
     }
     Frame {
         msec: 816
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "e8e6b7d7f81895ae556936ba5e0848a5"
     }
     Frame {
         msec: 832
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "b6ee5f74a5e91bcf6b9aad3cbb5d683f"
     }
     Frame {
         msec: 848
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "b6ee5f74a5e91bcf6b9aad3cbb5d683f"
     }
     Frame {
         msec: 864
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "02e3d071d5fc0832041688950d3610b8"
     }
     Frame {
         msec: 880
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "aad38d9678bdeeed750f381a40e22a61"
     }
     Frame {
         msec: 896
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "a8753ac7d026d94224c488fa16d5774a"
     }
     Frame {
         msec: 912
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "9de26e2d70bd285116df820ca87c2e4d"
     }
     Frame {
         msec: 928
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "985c6ee9cb5f259135a4eeb3c2f1d271"
     }
     Frame {
         msec: 944
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "985c6ee9cb5f259135a4eeb3c2f1d271"
     }
     Frame {
         msec: 960
@@ -246,247 +254,247 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "4ba1bf769de9bc45630485d06642dc30"
     }
     Frame {
         msec: 992
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "4ba1bf769de9bc45630485d06642dc30"
     }
     Frame {
         msec: 1008
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "9dbe8b62ec467f5b95b4bb8ab9fbab68"
     }
     Frame {
         msec: 1024
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "9dbe8b62ec467f5b95b4bb8ab9fbab68"
     }
     Frame {
         msec: 1040
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "81c157daf3086b21ea2ba39277a31f3d"
     }
     Frame {
         msec: 1056
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "a19d2e389a71472929fed6691dbe40ec"
     }
     Frame {
         msec: 1072
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "0fc67582f36db63dc3df1027bf7ad90b"
     }
     Frame {
         msec: 1088
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c53f1a42113fdc2e525c43460ed40f81"
     }
     Frame {
         msec: 1104
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c8968753e599419bc2d70adb95b643f2"
     }
     Frame {
         msec: 1120
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "449fbda0dc3e45d022832f9d15203466"
     }
     Frame {
         msec: 1136
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "7778e32071419dd53920536bac1eb21a"
     }
     Frame {
         msec: 1152
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "279510c6ca5429a22855a08e88a1b4b5"
     }
     Frame {
         msec: 1168
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "ac86ca53dc52c7c54bd993faa2daf0b9"
     }
     Frame {
         msec: 1184
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "7e20361da8a49f9699e290673bdd60ee"
     }
     Frame {
         msec: 1200
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "aa5f6e188212cee2dbf8d1e52692ac88"
     }
     Frame {
         msec: 1216
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "14018d9d2370c46b5f0c280cb169225e"
     }
     Frame {
         msec: 1232
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1248
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1264
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1280
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1296
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1312
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1328
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1344
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1360
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1376
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1392
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1408
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1424
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1440
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1456
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1472
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1488
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1504
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1520
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1536
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1552
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1568
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1584
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1600
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 109; y: 247
-        modifiers: 0
-        sendToViewport: true
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1616
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1632
-        hash: "c91921dba899d7a86de3cd013773889f"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1648
-        hash: "888c0fc86155e10b5fc577ef6ec5755a"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1664
-        hash: "7fd61a8910bf7b0d2bf57653a268c5d8"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1680
-        hash: "f42f5073f90a423adf011d0e168c8a9b"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1696
-        hash: "a3d89deb6cfa2bbbaa1d7d5b5e5b48d5"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 27; y: 19
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1712
-        hash: "f10e997d7a17c18251a32d58b018105a"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1728
-        hash: "09ffb57d5f67edfa34d6aad36a002554"
+        hash: "29ad10997d8045ccfd69fe78475dd2f3"
     }
     Frame {
         msec: 1744
-        hash: "01f3a2f5b9815f1397a907b099339360"
+        hash: "7b99c5dd3750291043f62479314ccb2f"
     }
     Frame {
         msec: 1760
-        hash: "58c0910c49748edd2ef8472960179472"
+        hash: "d3409cf579db724440f3f59cfc902974"
     }
     Frame {
         msec: 1776
-        hash: "cc82c5f7f93c5bc1af1c6c509268566a"
+        hash: "2ad2a4b3f933e3a27acb232adf06eb7f"
     }
     Frame {
         msec: 1792
-        hash: "3ef272c6439b85fbc166375d1b98403c"
+        hash: "35074cf4f2753c77e112092e92630c71"
     }
     Frame {
         msec: 1808
-        hash: "98c576f0900e4b8752d1f951bb6bf391"
+        hash: "f7038f7e6d7b6498ff1a4098c79f9d2a"
     }
     Frame {
         msec: 1824
-        hash: "4d66dd64d8736ef50163e08723873478"
+        hash: "fec23135661d2368cf3cf64f7d62af73"
     }
     Frame {
         msec: 1840
-        hash: "9a5d8455b6763456185625811253e0b1"
+        hash: "4143603bf203319f423d21f204fac3b0"
     }
     Frame {
         msec: 1856
-        hash: "77e85731efa786a2492aae19a87523c6"
+        hash: "f3d41bdc8ae60f6fbf109206ac9023de"
     }
     Frame {
         msec: 1872
-        hash: "f3199d0c860f1236e0b9472bef8785bc"
+        hash: "41064ea276aabfba45966130d2ec4b06"
     }
     Frame {
         msec: 1888
-        hash: "f3199d0c860f1236e0b9472bef8785bc"
+        hash: "dfbe242fc8bc3c70207be901ac2db139"
     }
     Frame {
         msec: 1904
-        hash: "32ccdab249268b01d9f1658a736052f1"
+        hash: "a8a9f435774def4255ae433646cc5263"
     }
     Frame {
         msec: 1920
@@ -494,247 +502,239 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "db3010ef552146df938c237f6c92bff5"
+        hash: "895ad99b422c5c6637f6569f391b4011"
     }
     Frame {
         msec: 1952
-        hash: "101e8595d0301e88376ec52ba9361f84"
+        hash: "9dbe8b62ec467f5b95b4bb8ab9fbab68"
     }
     Frame {
         msec: 1968
-        hash: "119d548c59baa7e47266d2ceca663288"
+        hash: "4ba1bf769de9bc45630485d06642dc30"
     }
     Frame {
         msec: 1984
-        hash: "f141fafe102a0b9a2bf33e8c3fc800ff"
+        hash: "4ba1bf769de9bc45630485d06642dc30"
     }
     Frame {
         msec: 2000
-        hash: "b01f9ca8d4fbff17b3d48c70898a044d"
+        hash: "4ba1bf769de9bc45630485d06642dc30"
     }
     Frame {
         msec: 2016
-        hash: "cf67954a2d1b22e8d2cfdc26419bafb8"
+        hash: "4ba1bf769de9bc45630485d06642dc30"
     }
     Frame {
         msec: 2032
-        hash: "7680b2b5a63dea13d733947297e01355"
+        hash: "985c6ee9cb5f259135a4eeb3c2f1d271"
     }
     Frame {
         msec: 2048
-        hash: "af1c017acf6b3c8cff86c9ceb60db3cb"
+        hash: "9de26e2d70bd285116df820ca87c2e4d"
     }
     Frame {
         msec: 2064
-        hash: "0b23ec51f71fddae5e2238ab5754f1db"
+        hash: "a8753ac7d026d94224c488fa16d5774a"
     }
     Frame {
         msec: 2080
-        hash: "976643961ecbdc86335180ba812b874e"
+        hash: "aad38d9678bdeeed750f381a40e22a61"
     }
     Frame {
         msec: 2096
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "abddb88af9b07e782f6c2103479abe3d"
     }
     Frame {
         msec: 2112
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "02e3d071d5fc0832041688950d3610b8"
     }
     Frame {
         msec: 2128
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "b6ee5f74a5e91bcf6b9aad3cbb5d683f"
     }
     Frame {
         msec: 2144
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "e8e6b7d7f81895ae556936ba5e0848a5"
     }
     Frame {
         msec: 2160
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "a858eee4b2753915ec84d2ffa098260c"
     }
     Frame {
         msec: 2176
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "a858eee4b2753915ec84d2ffa098260c"
     }
     Frame {
         msec: 2192
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "a858eee4b2753915ec84d2ffa098260c"
     }
     Frame {
         msec: 2208
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2224
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2240
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2256
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2272
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2288
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2304
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2320
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2336
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2352
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2368
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2384
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2400
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2416
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2432
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2448
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2464
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2480
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2496
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2512
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2528
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2544
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2560
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2576
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2592
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2608
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2624
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2640
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2656
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2672
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2688
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2704
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2720
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2736
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2752
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 109; y: 247
-        modifiers: 0
-        sendToViewport: true
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2768
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2784
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2800
-        hash: "ab924ae435262e76381c2e4af5d64342"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2816
-        hash: "d60758fc12471a19d31c85f058f2ded7"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2832
-        hash: "c62e2956f8eb5d2c8cd76ba05c5929d5"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2848
-        hash: "f2967ee7e035a9ff258116a2706529f8"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2864
-        hash: "885c4705c6c29f69c56c44abc1251d75"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2880
@@ -742,198 +742,74 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "f4af6871e522511f95bc4c5abfc2a562"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2912
-        hash: "b27e1e7e0d90468525309528ccfe2823"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2928
-        hash: "78e7d84a4466258b40315fe61b7ca15c"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2944
-        hash: "471013d921d8d6e7468fd6aba0b75c71"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2960
-        hash: "856048da893c9136ac5740bc89b64128"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2976
-        hash: "32ccdab249268b01d9f1658a736052f1"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 2992
-        hash: "2264fa3acd979f104633c1301a0efd8f"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3008
-        hash: "f3199d0c860f1236e0b9472bef8785bc"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3024
-        hash: "ad899d1ecaa43a5541be7b70413caee5"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3040
-        hash: "4e652524c992f5ee1b987275ca509728"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3056
-        hash: "a44b3dec2a016694bc8553a51b29d46c"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3072
-        hash: "7fbe20346bc3c28c345e0797b55599f3"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3088
-        hash: "bcff18ad433bb4f08126ee66efb037d1"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3104
-        hash: "836666c64f73c38e87de95944ff2fe72"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3120
-        hash: "4379982d23db239b1741b5d72c53e160"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3136
-        hash: "0ed9476337214e1493c1510b8a4c90f8"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3152
-        hash: "dab637406577a1924c7dbb30680e1af3"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
     Frame {
         msec: 3168
-        hash: "38b7e5894cf49a19ac055264d6447b9f"
-    }
-    Frame {
-        msec: 3184
-        hash: "5f207d1dfad4907f200d76104881bf56"
-    }
-    Frame {
-        msec: 3200
-        hash: "3434fc7f81e859722585dae97c557864"
-    }
-    Frame {
-        msec: 3216
-        hash: "7c775b9be8c5293d4962324574267c22"
-    }
-    Frame {
-        msec: 3232
-        hash: "da0ff6955c2e4cd86421bdb9053f56e6"
-    }
-    Frame {
-        msec: 3248
-        hash: "a1297d525a3ad41abbbb7c2f15efd4fb"
-    }
-    Frame {
-        msec: 3264
-        hash: "5326b220995b2a1eaa308ad10fd353fa"
-    }
-    Frame {
-        msec: 3280
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3296
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3312
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3328
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3344
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3360
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3376
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3392
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3408
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3424
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3440
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3456
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3472
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3488
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3504
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3520
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3536
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3552
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3568
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3584
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3600
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3616
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Frame {
-        msec: 3632
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e5ac43e0f553886bcb2b4016f7e3414"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml
index 6c3e52d..3ff4214 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction-visual.qml
@@ -1,17 +1,17 @@
 import QtQuick 1.0
 
 /*
-This test starts with a red rectangle at 0,0. It should animate a color change to blue,
+This test starts with a 30x40 rectangle at 0,0. It should animate a width change to 40,
 then jump 50 pixels right, and then animate moving 50 pixels down. Afer this it should
 do an exact visual reversal (animate up 50 pixels, jump left 50 pixels, and then animate
-a change back to red).
+a change back to 30px wide).
 */
 
 Rectangle {
-    width: 400; height: 400
+    width: 100; height: 100
     Rectangle {
         id: myRect
-        width: 100; height: 100
+        width: 30; height: 40
         color: "red"
     }
     MouseArea {
@@ -24,8 +24,7 @@ Rectangle {
         when: clickable.pressed
         PropertyChanges {
             target: myRect
-            x: 50; y: 50
-            color: "blue"
+            x: 50; y: 50; width: 40
         }
     }
 
@@ -33,7 +32,7 @@ Rectangle {
         to: "state1"
         reversible: true
         SequentialAnimation {
-            ColorAnimation {}
+            NumberAnimation { properties: "width"; easing.type: "InOutQuad" }
             PropertyAction { properties: "x" }
             NumberAnimation { properties: "y"; easing.type: "InOutQuad" }
         }
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png
index d8be67b..3545e5a 100644
Binary files a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png
index e5494aa..c7da359 100644
Binary files a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png
index fbb03de..d51e8e4 100644
Binary files a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png
index d8be67b..c7da359 100644
Binary files a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.4.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.4.png
new file mode 100644
index 0000000..8552406
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml
index 13ba289..774cc13 100644
--- a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml
@@ -6,239 +6,335 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 32
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 48
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 64
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 80
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 96
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 112
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 128
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 144
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 160
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 176
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 192
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 208
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 224
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 240
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 256
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 272
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 288
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 304
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 320
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 336
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 352
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 368
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 384
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 400
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 416
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 432
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 448
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 464
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 480
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 496
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 512
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 528
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 544
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 560
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 576
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 592
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 608
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 624
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 640
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 656
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 672
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 688
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 704
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 155; y: 261
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 260
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 720
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 260
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 258
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 736
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 126; y: 254
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 249
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 752
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "3e70a9fcacf40284c4bbf6a8376edfec"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 76; y: 247
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: 245
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 768
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "3b65fbe0980fabd4bcba5757323c8fcf"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 20; y: 243
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -25; y: 241
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 784
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0a79d810c2ff479fcc42d40125f6ccda"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -68; y: 238
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: -68; y: 238
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 800
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "9e5b85c715a2a573f0dd3bc7e342625f"
     }
     Frame {
         msec: 816
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "371faa0d3bb3815470ef48713f0363b6"
     }
     Frame {
         msec: 832
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "2f948f765ec2d861841439f03e402bcf"
     }
     Frame {
         msec: 848
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "74dbda8d6d005fb8fb307fc4cf146e1e"
     }
     Frame {
         msec: 864
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "bdf1f0db0411a3456ddc0efff0584e9c"
     }
     Frame {
         msec: 880
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "cb5c7c9fc7e4707f1d8b7bbb9f19065d"
     }
     Frame {
         msec: 896
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "f60df4e47f5b9d16b576ab4107a0c11c"
     }
     Frame {
         msec: 912
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "6fcc1b9d2d1829c48cdfefba632c6a91"
     }
     Frame {
         msec: 928
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "e53272919fa23f7023ce66d3b15c2f05"
     }
     Frame {
         msec: 944
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "dc043143bf35a808fcdf2b692753dc86"
     }
     Frame {
         msec: 960
@@ -246,279 +342,327 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "8a5247a3847809f56a2fdce0f4ac9c99"
     }
     Frame {
         msec: 992
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d4122caf5fc8cfd59e6048b830acc3fb"
     }
     Frame {
         msec: 1008
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1024
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1040
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1056
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1072
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1088
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1104
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1120
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1136
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1152
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1168
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1184
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1200
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1216
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1232
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1248
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1264
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1280
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1296
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1312
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 174; y: 204
-        modifiers: 0
-        sendToViewport: true
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1328
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1344
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1360
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1376
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "be218d7ebfb01cf288b284cf40337913"
     }
     Frame {
         msec: 1392
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 204
-        modifiers: 0
-        sendToViewport: true
+        hash: "bd1af1e9187a58841b33862047ad4ae3"
     }
     Frame {
         msec: 1408
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 204
-        modifiers: 0
-        sendToViewport: true
+        hash: "6154c00e9290393daaf1e7a0618874c7"
     }
     Frame {
         msec: 1424
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "6ed42be04df8a4cc15d9d885e4b157f5"
     }
     Frame {
         msec: 1440
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 130; y: 204
-        modifiers: 0
-        sendToViewport: true
+        hash: "2187c8e798b2b60567284af6923a9418"
     }
     Frame {
         msec: 1456
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "39ef8ac3108be3c5b8c85aaa06539952"
     }
     Frame {
         msec: 1472
-        hash: "09d6255a3fc628c52a386a878bdecb4e"
+        hash: "a30c2d3bbebdf3ae84c8148dfff53abf"
     }
     Frame {
         msec: 1488
-        hash: "6d5e292fecfc2ec45a5695fa9e5173f3"
+        hash: "f9b5ef6675c326a3c6462f8ad173c875"
     }
     Frame {
         msec: 1504
-        hash: "848051f677a2172d8cbe75a451026459"
+        hash: "eab82ad570e59a68c41450df5146aea6"
     }
     Frame {
         msec: 1520
-        hash: "95b1a914c1d33866cd728ad1ad612884"
+        hash: "2caf2dae27a5603de6665c1cafbe6576"
     }
     Frame {
         msec: 1536
-        hash: "780a03cd9aec2f0f7f61a51629261385"
+        hash: "601b397404250d01ec9e483683c32776"
     }
     Frame {
         msec: 1552
-        hash: "c7ea3a54cfb618bb02d93f6e17e2a74d"
+        hash: "06dd6ec2e0f016fc0cb6bbce27e3dcd3"
     }
     Frame {
         msec: 1568
-        hash: "85ea65c275c6217c44038c1bc87f2356"
+        hash: "9ebba3740bb33db00ebb62706e1d27a5"
     }
     Frame {
         msec: 1584
-        hash: "af77f08c99d41295ef6c99089c322f61"
+        hash: "9ebba3740bb33db00ebb62706e1d27a5"
     }
     Frame {
         msec: 1600
-        hash: "1427c98bee08b57e94cea220b7c017e4"
+        hash: "06dd6ec2e0f016fc0cb6bbce27e3dcd3"
     }
     Frame {
         msec: 1616
-        hash: "fa1062676e7f2e429e3f5f3babbccc5f"
+        hash: "601b397404250d01ec9e483683c32776"
     }
     Frame {
         msec: 1632
-        hash: "016c51ef6ad6729db5328b199c18c830"
+        hash: "a80dcdc8ce2c4e2653e01423ea053eba"
     }
     Frame {
         msec: 1648
-        hash: "94a3647a5c98770d60a2b5f17281e87e"
+        hash: "8fe7230266084f07f8fd9c6991461163"
     }
     Frame {
         msec: 1664
-        hash: "fc075081b0b7d8bc2556250962e52327"
+        hash: "5d9ed702af5c520f4b268077b957586a"
     }
     Frame {
         msec: 1680
-        hash: "0ef1d28912378939e0f82387164ace07"
+        hash: "6cccabc3a6ac3eef95794e6712404234"
     }
     Frame {
         msec: 1696
-        hash: "d55312d705b8ed5d188caf4f41820e0f"
+        hash: "8bfc492064d6c93727b59fd3ca2a8dc8"
     }
     Frame {
         msec: 1712
-        hash: "41c9c187b208ec1cef4e9ffe976c38ce"
+        hash: "e506cf18d730f4ab1e8e803b7663238a"
     }
     Frame {
         msec: 1728
-        hash: "6166be5f86adfc6b4c9438358529e5ce"
+        hash: "2187c8e798b2b60567284af6923a9418"
     }
     Frame {
         msec: 1744
-        hash: "aaa81e964b5c5ef2ebf2c200e7a47c26"
+        hash: "6ed42be04df8a4cc15d9d885e4b157f5"
     }
     Frame {
         msec: 1760
-        hash: "65dbdd2495e12b7dd7bbc31e1b2fa5b1"
+        hash: "b887f64a8e44a243f11e37692d54d2d1"
     }
     Frame {
         msec: 1776
-        hash: "b2d10e7cbccb0fdf3286fef81999d37e"
+        hash: "d5f157d073cd8de8cc58124455a38675"
     }
     Frame {
         msec: 1792
-        hash: "e239d20ee23a6ff680ded67182066430"
+        hash: "d39f213d4b91229bd76d48589a067623"
     }
     Frame {
         msec: 1808
-        hash: "d4f2df7f9c7a7a9e98975e44393a2e37"
+        hash: "7b2413f4fd12fd4d38fc40ebbbd893f3"
     }
     Frame {
         msec: 1824
-        hash: "9c1ce93161e16704feb7d37cd01acbe9"
+        hash: "bd1af1e9187a58841b33862047ad4ae3"
     }
     Frame {
         msec: 1840
-        hash: "94e148b49b53cab2491a974eb85ab489"
+        hash: "1e54f1b5ef6bb7085a36d433af94a9b3"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 145; y: 286
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 286
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 195; y: 288
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1856
-        hash: "9a1dfb6b09218c83c89f9a2d32f92ef6"
+        hash: "d84bf962449716cc64cb34b285926c48"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 290
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 253; y: 290
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1872
-        hash: "7cb78e2e5f6d35d456c95f2bd8652eb5"
+        hash: "d84bf962449716cc64cb34b285926c48"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 286; y: 292
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 315; y: 292
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1888
-        hash: "e3a3be52fda460050db6d2d9947d3cf8"
+        hash: "d84bf962449716cc64cb34b285926c48"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 346; y: 294
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 385; y: 294
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1904
-        hash: "6651ca6a31f281676a5ba312c306ee91"
+        hash: "d84bf962449716cc64cb34b285926c48"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 420; y: 294
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 420; y: 294
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1920
@@ -526,287 +670,239 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "feddbf269adfc8bb1b1a3656b5b5736d"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1952
-        hash: "4710e2abb2d907686a5ef58c3d22b391"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1968
-        hash: "2a479b302b425df282502e71b4ad7fbf"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 1984
-        hash: "a912a2993c3a2a280e83caee932ff707"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2000
-        hash: "022504443e57ee5593e5054961265a15"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2016
-        hash: "a47ccf22b66f7d62c017aa1da19904d2"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2032
-        hash: "133c29b49f3a98fb5eca71fff217252d"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2048
-        hash: "058c2a759a415d548fec309bfb255a70"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2064
-        hash: "662be553c32b0145b3f4fee9bb0d659d"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2080
-        hash: "7c7460ff21e7c27af2326b399b5b9791"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2096
-        hash: "e6b9049949a0ee4ff8a0fcaf5464f479"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2112
-        hash: "39db5e52253948ca5059d9c102bedea0"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2128
-        hash: "eb1939458851780b7bb51ee50f0a3bd7"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2144
-        hash: "feaaa4fab78c73321dd9ab820ec2b746"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2160
-        hash: "221c8afbedcfb8ca7e87e279e5406103"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2176
-        hash: "41c8d2686ddb882981a7d3a5c8c69005"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2192
-        hash: "abb2d6a76af5114b191a4373f95cdb6f"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2208
-        hash: "7d3b1fc34082a160cbea4409af85fc9c"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2224
-        hash: "55e07e33b231e3c7925c7b3cfada4839"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2240
-        hash: "55e07e33b231e3c7925c7b3cfada4839"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2256
-        hash: "3a616453adf2b16e23654f515d797e99"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2272
-        hash: "b3461a3c55b9603905ad208c7396e1a9"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2288
-        hash: "b3461a3c55b9603905ad208c7396e1a9"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2304
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2320
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2336
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2352
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2368
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2384
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2400
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2416
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2432
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2448
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2464
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2480
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2496
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d84bf962449716cc64cb34b285926c48"
     }
     Frame {
         msec: 2512
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "4c6ff9097308cb3840ef39a081bdc94f"
     }
     Frame {
         msec: 2528
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "93a2b229f21b76354a8cf94f150c69e2"
     }
     Frame {
         msec: 2544
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "e65350b411affe4274499fd577ccf842"
     }
     Frame {
         msec: 2560
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "499968d33068c7e08898a19cce691766"
     }
     Frame {
         msec: 2576
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "fe884e410a8c7b2167f814ebdf7700af"
     }
     Frame {
         msec: 2592
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "c0225009d42b670f5f1ce0871be90db6"
     }
     Frame {
         msec: 2608
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "320d205e147fa6470d71538d686ff458"
     }
     Frame {
         msec: 2624
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "ec0a1fa273e6568d041ee2497a715704"
     }
     Frame {
         msec: 2640
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "159c558e0d1b59db8e9459c4203d56f3"
     }
     Frame {
         msec: 2656
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "00d237cd7ad6df807b4f9281bbc72992"
     }
     Frame {
         msec: 2672
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "c472991635460a93f744538328cd89f4"
     }
     Frame {
         msec: 2688
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "318ba06f590d4e3a1dea6affcc60243b"
     }
     Frame {
         msec: 2704
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "d344b62df42e88e14d45def62565791a"
     }
     Frame {
         msec: 2720
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "5c2658568080a663440e09acbcf2fa8d"
     }
     Frame {
         msec: 2736
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 29; y: 239
-        modifiers: 0
-        sendToViewport: true
+        hash: "8e64867dabeaeae51149362c5f42545b"
     }
     Frame {
         msec: 2752
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "abd81e11370469803bad5de9a9c77f63"
     }
     Frame {
         msec: 2768
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "1cce356ebd61d7c88edb84c58a564def"
     }
     Frame {
         msec: 2784
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "0ab027423651612ceba2b35e57d75d91"
     }
     Frame {
         msec: 2800
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
+        hash: "515b6375cf0fefc8580d62cd5b2680f7"
     }
     Frame {
         msec: 2816
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 35; y: 241
-        modifiers: 0
-        sendToViewport: true
+        hash: "f44c12b701e73a7e4d35fd10ea0f5003"
     }
     Frame {
         msec: 2832
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 63; y: 243
-        modifiers: 0
-        sendToViewport: true
+        hash: "76bee658c9915fda03967fcb2e595683"
     }
     Frame {
         msec: 2848
-        hash: "fbd9a45fc6b5a96b4e521dc5c68dbf7e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 244
-        modifiers: 0
-        sendToViewport: true
+        hash: "064d5525e1fa7c8ec5f571a56e666754"
     }
     Frame {
         msec: 2864
-        hash: "6f1a516cde59f142f5ac8b4e824a2bab"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 243
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 158; y: 243
-        modifiers: 0
-        sendToViewport: true
+        hash: "ffd23fa2b1281cd120d6b11912bb8641"
     }
     Frame {
         msec: 2880
@@ -814,338 +910,198 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "3f6d74079d8ec38eb1f12ddde18f864a"
+        hash: "c6d306961e1e574d8c57fd849029121c"
     }
     Frame {
         msec: 2912
-        hash: "b58ac3c0ab5e556be249bfdc3fb85c56"
+        hash: "1fcf6b150607c0ea807026f8f9e28f61"
     }
     Frame {
         msec: 2928
-        hash: "291dd50b6dd4ee71265631ce338f16d2"
+        hash: "e16a333231b3c65c85ff498e941f8c05"
     }
     Frame {
         msec: 2944
-        hash: "6af30d160a3c1126718c62fcd5e85a89"
+        hash: "3e49589f1b4a6b8212f5c10d234f8ffa"
     }
     Frame {
         msec: 2960
-        hash: "3f09b75f49f53e83d53fdc8cb2a1a2a7"
+        hash: "02ce2b719ddbd977bb933882a40024f5"
     }
     Frame {
         msec: 2976
-        hash: "7c9e03c8bc2691253eb5be656bbcfaa5"
+        hash: "a161119d1f022885db1af71ededa2b8c"
     }
     Frame {
         msec: 2992
-        hash: "95c1ca6b2550f5575c2297acad5bfd0f"
+        hash: "62a006aab9629dc1e8359c52664ee34b"
     }
     Frame {
         msec: 3008
-        hash: "be05537c0b9246b0c4d48ae344275bb9"
+        hash: "62a006aab9629dc1e8359c52664ee34b"
     }
     Frame {
         msec: 3024
-        hash: "59de97652e25f49b1bf016a9b124d324"
+        hash: "b98a2c58933bd4f49ed7a1d72bff7e66"
     }
     Frame {
         msec: 3040
-        hash: "7194bacd56906f83948844224ce6a3e7"
+        hash: "b98a2c58933bd4f49ed7a1d72bff7e66"
     }
     Frame {
         msec: 3056
-        hash: "09fe50cbbcc7432d6fa6bbe875eae5e3"
+        hash: "b98a2c58933bd4f49ed7a1d72bff7e66"
     }
     Frame {
         msec: 3072
-        hash: "a95c1f6ca5a638c4d9229321a84e51a4"
+        hash: "b98a2c58933bd4f49ed7a1d72bff7e66"
     }
     Frame {
         msec: 3088
-        hash: "c439b31b64510ce025ad326364e8f690"
+        hash: "b98a2c58933bd4f49ed7a1d72bff7e66"
     }
     Frame {
         msec: 3104
-        hash: "c28c637ff5f0ae6d4532fba13cfb8ea4"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3120
-        hash: "2e095e9433e1f504163aebc8450be923"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3136
-        hash: "5fb49164c1bad4bb96a13cfbb336312b"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3152
-        hash: "34b7976b3dbf0c5462ddf77153d9d2c9"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3168
-        hash: "d4007272d676a896c99adb66afa0c10b"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3184
-        hash: "07638f1f5eb5786a12cbc74414fe29b5"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3200
-        hash: "1fe90791c573865f425ef0e43faf7a1c"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3216
-        hash: "b149986c7b395106a808b1fcd1d8bcb2"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3232
-        hash: "ecb2b6d44eafb8a0b5493520b64e5e5b"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3248
-        hash: "fc66b2e38d477c16584eee4f541df511"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3264
-        hash: "023152c61ad6cd0b8726e6c8fa6043a4"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3280
-        hash: "b788f8a7e1e42f768fd1fe1198ca0344"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3296
-        hash: "4f7f8b7f5bb78bb9327b6fa8142ce3a2"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3312
-        hash: "30f041278c08174671568a0dfb7cbdf7"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3328
-        hash: "30f041278c08174671568a0dfb7cbdf7"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3344
-        hash: "6ecd90fc89ab9b6c4813fa6a6e9dffdb"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3360
-        hash: "6ecd90fc89ab9b6c4813fa6a6e9dffdb"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3376
-        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3392
-        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3408
-        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3424
-        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3440
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3456
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3472
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3488
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3504
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3520
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3536
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3552
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3568
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3584
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3600
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3616
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3632
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3648
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
     Frame {
         msec: 3664
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3680
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3696
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3712
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3728
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3744
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3760
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3776
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3792
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3808
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3824
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3840
-        image: "qtbug10586.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3872
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3888
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3904
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3920
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3936
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3952
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3968
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 3984
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4000
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4016
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4032
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4048
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4064
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4080
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4096
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4112
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4128
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4144
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4160
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4176
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
-    }
-    Frame {
-        msec: 4192
-        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+        hash: "0755ae54acb6af587bbf7ca509146e0f"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml b/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
index 9ccebfa..65caedd 100644
--- a/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
@@ -1,5 +1,6 @@
 import QtQuick 1.0
 
+/* This test checks that animations do occur while the flickable is flicking */
 Rectangle {
     width: 200
     height: 400
@@ -11,11 +12,6 @@ Rectangle {
             border.color: "black"
             border.width: 10
             width: 1000; height: 1000
-            rotation: 90
-            gradient: Gradient {
-                GradientStop { position: 0; color: "black" }
-                GradientStop { position: 1; color: "white" }
-            }
         }
     }
     Rectangle {
diff --git a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.0.png b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.0.png
new file mode 100644
index 0000000..e7571f2
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.1.png b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.1.png
new file mode 100644
index 0000000..60d09e9
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.qml
index d1de5d0..82303ef 100644
--- a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction-visual.qml
@@ -6,530 +6,510 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 32
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 48
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 64
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 80
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 96
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 112
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 128
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 144
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 160
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 176
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 192
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 208
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 224
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 240
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 256
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 272
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 288
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 304
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 320
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 336
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 352
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 368
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 384
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 400
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 416
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 432
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 448
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 54; y: 52
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 464
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c5d2b291578c11c11452c29dc02bcad9"
     }
     Frame {
         msec: 480
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "650770d62a63031754b3c68f666a5805"
     }
     Frame {
         msec: 496
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "eb28945becabee0dffe618632d4db061"
     }
     Frame {
         msec: 512
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "6c7b66dff531723362418dacd23ea59e"
     }
     Frame {
         msec: 528
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "093bd3dd02a6d9f4dbd75a329bbf63f5"
     }
     Frame {
         msec: 544
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "5328b1f3932c8bf817a5031102e21c25"
     }
     Frame {
         msec: 560
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "ee2b8dc4ebdaaed41ae820385f56db83"
     }
     Frame {
         msec: 576
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "adf71c703dff4514d6ae247fd6b89030"
     }
     Frame {
         msec: 592
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c93d78e604406a3c61c2b34e5e0893a4"
     }
     Frame {
         msec: 608
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "c91dbb897289d2949d08c6381583ad5e"
     }
     Frame {
         msec: 624
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1e3a370e3d390e8d73731d659fae5908"
     }
     Frame {
         msec: 640
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "e6d3505120260677f5f1355abf0f2b1d"
     }
     Frame {
         msec: 656
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "251d68b91b37ef95ff61055f7b2ba0b5"
     }
     Frame {
         msec: 672
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "333a25691bafa88fbc92a153886c3b47"
     }
     Frame {
         msec: 688
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "e63367e5001732975bc4c002c079dbd8"
     }
     Frame {
         msec: 704
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "04e25f2fd913c38ee24558b52fb3ed37"
     }
     Frame {
         msec: 720
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "739f155ad3d703fa0255afed51baf51c"
     }
     Frame {
         msec: 736
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "739f155ad3d703fa0255afed51baf51c"
     }
     Frame {
         msec: 752
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "16de427e26afa1a1d91541fca1537033"
     }
     Frame {
         msec: 768
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "11a874ab1c429e1bcf5498808f3c42f7"
     }
     Frame {
         msec: 784
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "e97f33a71bf889815782c17067bcd736"
     }
     Frame {
         msec: 800
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "9f2f0728689a5ff76f87b13c92e9fd40"
     }
     Frame {
         msec: 816
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "9186cd14c3d9f2ad560be047cc483b50"
     }
     Frame {
         msec: 832
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "af2eb37824ad3567ce9db0329f647d50"
     }
     Frame {
         msec: 848
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "f09d264ed5f44313c19f2f985a26b9cd"
     }
     Frame {
         msec: 864
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "3ed8b3051d0d603bd514783fe04124a7"
     }
     Frame {
         msec: 880
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "38c7f8d39fd9a77400138da4e3ebb963"
     }
     Frame {
         msec: 896
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "6682f53fdda2d8662a31b725d23b08f6"
     }
     Frame {
         msec: 912
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "0f16d2640b51c9ada08c7aa0e8853d86"
     }
     Frame {
         msec: 928
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "22b9025d523dd1adb87f9b4c89295b29"
     }
     Frame {
         msec: 944
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 960
-        image: "scriptAction.0.png"
+        image: "scriptAction-visual.0.png"
     }
     Frame {
         msec: 976
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 992
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1008
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1024
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1040
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1056
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1072
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1088
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 146; y: 259
-        modifiers: 0
-        sendToViewport: true
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1104
-        hash: "55b713dcb7c810bf126e06cc97d26d24"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1120
-        hash: "9850cd8ed4643900409d1a87ef0bc4cf"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1136
-        hash: "1cf03396b01e931e4e7e8e7e57e19c5f"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1152
-        hash: "25fe648b85ec2d82621853dcbdbf695a"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1168
-        hash: "1ca701e56fe387d5849f6933eb53aee9"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1184
-        hash: "b39ecb792659a053a8985e2a849d6d51"
+        hash: "1761f6606bbdf5772594cf96412337ca"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 54; y: 52
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1200
-        hash: "9a783432a054beec81cc5687f75a36dc"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1216
-        hash: "edbd222d7ba6c6f819ded45fe316d461"
+        hash: "1761f6606bbdf5772594cf96412337ca"
     }
     Frame {
         msec: 1232
-        hash: "eaf20159c4b90f90872bbd514d3a0cec"
+        hash: "77ab7b0bad67c80c5f685b02e264d333"
     }
     Frame {
         msec: 1248
-        hash: "964807dd9b91e765577a773ef1ce2593"
+        hash: "27c3099b0e9f0607e9ebc983b2613eb9"
     }
     Frame {
         msec: 1264
-        hash: "16e12026ab14657b0f36b8315684455d"
+        hash: "81bd467b2314fb877825323a6120de4a"
     }
     Frame {
         msec: 1280
-        hash: "d001a6b2fec3c66baaa45d9ff93b3f63"
+        hash: "5cd632ac5399826249137ff2f27ef734"
     }
     Frame {
         msec: 1296
-        hash: "fef11eb5f635bc11cd9679b7213b3b92"
+        hash: "3b6732d7539d7b9b6ac13b6f8291b993"
     }
     Frame {
         msec: 1312
-        hash: "0a0cd5f5004048d88712cfe6943470c0"
+        hash: "6bde822175f1ee22a8bb0528d6170a5a"
     }
     Frame {
         msec: 1328
-        hash: "0d83178afdae5feaa9915d56c24373ad"
+        hash: "a8401f0c19db5c395cf122f3fe6f3be2"
     }
     Frame {
         msec: 1344
-        hash: "0a9e6e0b7b23ce93dc4e1f886cf9c7d1"
+        hash: "10e5126a9f97caf19df3d0ec4485222f"
     }
     Frame {
         msec: 1360
-        hash: "f3199d0c860f1236e0b9472bef8785bc"
+        hash: "f7b0bde6f4c9e9c9aecdbf11f0ec525c"
     }
     Frame {
         msec: 1376
-        hash: "f3199d0c860f1236e0b9472bef8785bc"
+        hash: "7501da757e6b0ba3923635765ef63f5b"
     }
     Frame {
         msec: 1392
-        hash: "32ccdab249268b01d9f1658a736052f1"
+        hash: "c66f5f30f7a545fcf0b52debd68d96c1"
     }
     Frame {
         msec: 1408
-        hash: "dc98f32a1a2d6e74998123b5232107b0"
+        hash: "ea679c31fd51733076716a325d2d4dc1"
     }
     Frame {
         msec: 1424
-        hash: "db3010ef552146df938c237f6c92bff5"
+        hash: "01ffc159e0d0796e4de7cffd46685481"
     }
     Frame {
         msec: 1440
-        hash: "101e8595d0301e88376ec52ba9361f84"
+        hash: "c53b75720a772a43a6c7d046ffb4d39b"
     }
     Frame {
         msec: 1456
-        hash: "119d548c59baa7e47266d2ceca663288"
+        hash: "1338c0458f32869e35163a2dcb950b8e"
     }
     Frame {
         msec: 1472
-        hash: "f141fafe102a0b9a2bf33e8c3fc800ff"
+        hash: "1338c0458f32869e35163a2dcb950b8e"
     }
     Frame {
         msec: 1488
-        hash: "b01f9ca8d4fbff17b3d48c70898a044d"
+        hash: "d894739536bb7033d321f8862264b5e6"
     }
     Frame {
         msec: 1504
-        hash: "cf67954a2d1b22e8d2cfdc26419bafb8"
+        hash: "52d5556f4b2404ae896ae36e0bc866ed"
     }
     Frame {
         msec: 1520
-        hash: "7680b2b5a63dea13d733947297e01355"
+        hash: "5ff9d9ab8099b2b9469df9efe672f46d"
     }
     Frame {
         msec: 1536
-        hash: "af1c017acf6b3c8cff86c9ceb60db3cb"
+        hash: "acadb950bd78c6fade9161f8e53628e7"
     }
     Frame {
         msec: 1552
-        hash: "0b23ec51f71fddae5e2238ab5754f1db"
+        hash: "7583b99a5f3aede70fc10728d77f57cc"
     }
     Frame {
         msec: 1568
-        hash: "976643961ecbdc86335180ba812b874e"
+        hash: "f72881eb92792727985482996bf689f9"
     }
     Frame {
         msec: 1584
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "26e0d64d5afeecdc4d93492f1eaaa54f"
     }
     Frame {
         msec: 1600
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "93206a830cf787d00a6bb2d3c91d40bc"
     }
     Frame {
         msec: 1616
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "af0a99b072a754cd0ecb75a7198849c1"
     }
     Frame {
         msec: 1632
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "84adc92e299feeb494b108a009d1b662"
     }
     Frame {
         msec: 1648
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "4fac6d471517625d4f5ce6ed6aaebe0b"
     }
     Frame {
         msec: 1664
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6952c27025740aca006a13da87379f9f"
     }
     Frame {
         msec: 1680
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "3297ed7bffb48a4f2ca90dd81eaf7c7a"
     }
     Frame {
         msec: 1696
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "3297ed7bffb48a4f2ca90dd81eaf7c7a"
     }
     Frame {
         msec: 1712
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1728
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1744
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1760
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1776
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1792
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1808
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1824
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1840
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1856
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1872
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1888
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1904
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1920
-        image: "scriptAction.1.png"
+        image: "scriptAction-visual.1.png"
     }
     Frame {
         msec: 1936
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1952
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
     Frame {
         msec: 1968
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
-    }
-    Frame {
-        msec: 1984
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
-    }
-    Frame {
-        msec: 2000
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
-    }
-    Frame {
-        msec: 2016
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
-    }
-    Frame {
-        msec: 2032
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
-    }
-    Frame {
-        msec: 2048
-        hash: "aeed60899abb6c486a5b1df81f9a0224"
+        hash: "6741d853f099a5a98fcdf87053b69ec8"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.0.png b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.0.png
deleted file mode 100644
index 64d6b06..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.1.png b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.1.png
deleted file mode 100644
index 1a25c63..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml
index 1427c9d..0a14542 100644
--- a/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction-visual.qml
@@ -6,10 +6,10 @@ then immediately change blue, and then animate moving 50 pixels down.
 */
 
 Rectangle {
-    width: 400; height: 400
+    width: 100; height: 100
     Rectangle {
         id: myRect
-        width: 100; height: 100
+        width: 50; height: 50
         color: "red"
     }
     MouseArea {
-- 
cgit v0.12


From 391e173a8915230205a93b6e0709762f75547772 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Thu, 28 Oct 2010 18:54:25 +1000
Subject: Work around bug causing qml apps to crash on Symbian 5.0 devices.

Disable QML debugging on the devices for now.  A better fix will be
provided in the next release.

Task-number: QTBUG-14670
Reviewed-by: Miikka Heikkinen
---
 configure.exe                    | Bin 1325568 -> 1326080 bytes
 tools/configure/configureapp.cpp |   1 +
 2 files changed, 1 insertion(+)

diff --git a/configure.exe b/configure.exe
index c36256e..14c2b47 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 983416a..93ce162 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1556,6 +1556,7 @@ void Configure::applySpecSpecifics()
         dictionary[ "ARM_FPU_TYPE" ]        = "softvfp";
         dictionary[ "SQL_SQLITE" ]          = "yes";
         dictionary[ "SQL_SQLITE_LIB" ]      = "system";
+        dictionary[ "DECLARATIVE_DEBUG" ]   = "no";
 
         // Disable building docs and translations for now
         disabledBuildParts << "docs" << "translations";
-- 
cgit v0.12


From eb286d008cf651bd0496c35fb3139cc37036882f Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 18:39:35 +1000
Subject: Clean up qmlvisual/focusscope tests

Remove text, to make them less platform specific

Task-number: QTBUG-14792
---
 .../qmlvisual/focusscope/data-MAC/test.0.png       |  Bin 14875 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test.1.png       |  Bin 14875 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test.2.png       |  Bin 14863 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test.3.png       |  Bin 14877 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test.4.png       |  Bin 14877 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test.5.png       |  Bin 14877 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test.qml         | 1599 -----------
 .../qmlvisual/focusscope/data-MAC/test2.0.png      |  Bin 5375 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test2.1.png      |  Bin 5375 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test2.qml        |  607 -----
 .../qmlvisual/focusscope/data-MAC/test3.0.png      |  Bin 12749 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.1.png      |  Bin 12667 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.2.png      |  Bin 12373 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.3.png      |  Bin 12150 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.4.png      |  Bin 11944 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.5.png      |  Bin 12150 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.6.png      |  Bin 12373 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.7.png      |  Bin 12667 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.8.png      |  Bin 12749 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.9.png      |  Bin 12710 -> 0 bytes
 .../qmlvisual/focusscope/data-MAC/test3.qml        | 2879 --------------------
 .../qmlvisual/focusscope/data-X11/test.0.png       |  Bin 11501 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test.1.png       |  Bin 11501 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test.2.png       |  Bin 11486 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test.3.png       |  Bin 11500 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test.4.png       |  Bin 11500 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test.5.png       |  Bin 11500 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test.qml         | 1599 -----------
 .../qmlvisual/focusscope/data-X11/test2.0.png      |  Bin 4656 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test2.1.png      |  Bin 4656 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test2.qml        |  607 -----
 .../qmlvisual/focusscope/data-X11/test3.0.png      |  Bin 10093 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.1.png      |  Bin 10051 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.2.png      |  Bin 9812 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.3.png      |  Bin 9625 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.4.png      |  Bin 9458 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.5.png      |  Bin 9645 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.6.png      |  Bin 9812 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.7.png      |  Bin 10051 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.8.png      |  Bin 10087 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.9.png      |  Bin 10072 -> 0 bytes
 .../qmlvisual/focusscope/data-X11/test3.qml        | 2879 --------------------
 .../qmlvisual/focusscope/data/test.0.png           |  Bin 14836 -> 1968 bytes
 .../qmlvisual/focusscope/data/test.1.png           |  Bin 14836 -> 1968 bytes
 .../qmlvisual/focusscope/data/test.2.png           |  Bin 14821 -> 1974 bytes
 .../qmlvisual/focusscope/data/test.3.png           |  Bin 14833 -> 0 bytes
 .../qmlvisual/focusscope/data/test.4.png           |  Bin 14833 -> 0 bytes
 .../qmlvisual/focusscope/data/test.5.png           |  Bin 14833 -> 0 bytes
 .../declarative/qmlvisual/focusscope/data/test.qml | 1324 +++------
 .../qmlvisual/focusscope/data/test2.0.png          |  Bin 5359 -> 305 bytes
 .../qmlvisual/focusscope/data/test2.1.png          |  Bin 5359 -> 0 bytes
 .../qmlvisual/focusscope/data/test2.qml            |  440 +--
 .../qmlvisual/focusscope/data/test3.0.png          |  Bin 12616 -> 1333 bytes
 .../qmlvisual/focusscope/data/test3.1.png          |  Bin 12538 -> 994 bytes
 .../qmlvisual/focusscope/data/test3.2.png          |  Bin 12257 -> 1156 bytes
 .../qmlvisual/focusscope/data/test3.3.png          |  Bin 12035 -> 1057 bytes
 .../qmlvisual/focusscope/data/test3.4.png          |  Bin 11877 -> 0 bytes
 .../qmlvisual/focusscope/data/test3.5.png          |  Bin 12046 -> 0 bytes
 .../qmlvisual/focusscope/data/test3.6.png          |  Bin 12257 -> 0 bytes
 .../qmlvisual/focusscope/data/test3.7.png          |  Bin 12538 -> 0 bytes
 .../qmlvisual/focusscope/data/test3.8.png          |  Bin 12616 -> 0 bytes
 .../qmlvisual/focusscope/data/test3.9.png          |  Bin 12581 -> 0 bytes
 .../qmlvisual/focusscope/data/test3.qml            | 2558 ++++-------------
 .../auto/declarative/qmlvisual/focusscope/test.qml |   13 +-
 .../declarative/qmlvisual/focusscope/test2.qml     |   26 +-
 .../declarative/qmlvisual/focusscope/test3.qml     |   13 +-
 66 files changed, 933 insertions(+), 13611 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.9.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.9.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test2.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test3.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test3.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test3.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test3.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test3.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/focusscope/data/test3.9.png

diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.0.png
deleted file mode 100644
index 0f33d99..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.1.png
deleted file mode 100644
index 0f33d99..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.2.png
deleted file mode 100644
index 06a3dbd..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.3.png
deleted file mode 100644
index e0d02d6..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.4.png
deleted file mode 100644
index e0d02d6..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.5.png
deleted file mode 100644
index e0d02d6..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.qml b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.qml
deleted file mode 100644
index ee9a550..0000000
--- a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.qml
+++ /dev/null
@@ -1,1599 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 32
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 48
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 64
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 80
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 96
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 112
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 128
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 144
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 160
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 176
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 192
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 208
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 224
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 240
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 256
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 272
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 288
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 304
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 320
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 336
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 352
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 368
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 384
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 400
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 416
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 432
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 448
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 464
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 480
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 496
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 512
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 528
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 544
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 560
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 576
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 592
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 608
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 624
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 640
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 656
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 672
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 688
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 704
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 720
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 736
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 752
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 768
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 784
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 800
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 816
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 832
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 848
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 864
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 880
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 896
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 912
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 928
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 944
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 960
-        image: "test.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 992
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1008
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1024
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1040
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1056
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1072
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1088
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1104
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1120
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1136
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1152
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1168
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1184
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1200
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1216
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1232
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1248
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1264
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1280
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1296
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1312
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1328
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1344
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1360
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1376
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1392
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1408
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1424
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1440
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1456
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1472
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1488
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1504
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1520
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1536
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1552
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1568
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1584
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1600
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1616
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1632
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1648
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1664
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1680
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1696
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1712
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1728
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1744
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1760
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1776
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1792
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 1808
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1824
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1840
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1856
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1872
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1888
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1904
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1920
-        image: "test.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1952
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1968
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 1984
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2000
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2016
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2032
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2048
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2064
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2080
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2096
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2112
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2128
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2144
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2160
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2176
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2192
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2208
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2224
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2240
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2256
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2272
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2288
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2304
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2320
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2336
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 2352
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2368
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2384
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2400
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2416
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2432
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2448
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2464
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2480
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2496
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2512
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2528
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2544
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2560
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2576
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2592
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2608
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2624
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2640
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2656
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2672
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2688
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2704
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2720
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2736
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2752
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2768
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2784
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2800
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2816
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2832
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2848
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2864
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2880
-        image: "test.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2912
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2928
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2944
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2960
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 2976
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2992
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3008
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3024
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3040
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3056
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3072
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3088
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3104
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3120
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3136
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3152
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3168
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3184
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3200
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3216
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3232
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3248
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3264
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3280
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3296
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3312
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3328
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3344
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3360
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3376
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3392
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3408
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3424
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3440
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3456
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3472
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3488
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3504
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3520
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Frame {
-        msec: 3536
-        hash: "70f4ce2881f2340167f314b49716707a"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3552
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3568
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3584
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3600
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3616
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3632
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3648
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3664
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3680
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3696
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3712
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3728
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3744
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3760
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3776
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3792
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3808
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3824
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3840
-        image: "test.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3872
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3888
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3904
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3920
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3936
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3952
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3968
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 3984
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4000
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4016
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4032
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4048
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4064
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4080
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4096
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4112
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4128
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4144
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4160
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4176
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4192
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4208
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4224
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4240
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4256
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4272
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4288
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4304
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4320
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4336
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4352
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4368
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4384
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4400
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4416
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4432
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4448
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4464
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4480
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4496
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4512
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4528
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4544
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4560
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4576
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4592
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4608
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4624
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4640
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4656
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4672
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4688
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4704
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4720
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4736
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4752
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4768
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Frame {
-        msec: 4784
-        hash: "773f573d4b37181f7a784597a30cd73d"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4800
-        image: "test.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4832
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4848
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4864
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4880
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4896
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4912
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4928
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4944
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4960
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4976
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 4992
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5008
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5024
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5040
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5056
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5072
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5088
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5104
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5120
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5136
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5152
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5168
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5184
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5200
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5216
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5232
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5248
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5264
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5280
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5296
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5312
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5328
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5344
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5360
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5376
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5392
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5408
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5424
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5440
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5456
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5472
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5488
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5504
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5520
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5536
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5552
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5568
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5584
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5600
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5616
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5632
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5648
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5664
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5680
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5696
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5712
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5728
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5744
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5760
-        image: "test.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5792
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5808
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5824
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5840
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5856
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5872
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-    Frame {
-        msec: 5888
-        hash: "715a587be7a5803af2827e882236d187"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.0.png
deleted file mode 100644
index fa711c1..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.1.png
deleted file mode 100644
index fa711c1..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.qml
deleted file mode 100644
index 5d84bfe..0000000
--- a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.qml
+++ /dev/null
@@ -1,607 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 32
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 48
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 64
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 80
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 96
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 112
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 128
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 144
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 160
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 176
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 192
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 208
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 224
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 240
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 256
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 272
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 288
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 304
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 320
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 336
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 352
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 368
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 384
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 400
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 416
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 432
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 448
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 464
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 480
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 496
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 512
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 528
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 544
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 560
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 576
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 592
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 608
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 624
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 640
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 656
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 672
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 688
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 704
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 720
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 736
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 752
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 768
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 784
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 800
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 816
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 832
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 848
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 864
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 880
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 896
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 912
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 928
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 944
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 960
-        image: "test2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 992
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1008
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1024
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1040
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1056
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1072
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1088
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1104
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1120
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1136
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1152
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1168
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1184
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1200
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1216
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1232
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1248
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1264
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1280
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1296
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1312
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1328
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1344
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1360
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1376
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1392
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1408
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1424
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1440
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1456
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1472
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1488
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1504
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1520
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1536
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1552
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1568
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1584
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1600
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1616
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1632
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1648
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1664
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1680
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1696
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1712
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1728
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1744
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1760
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1776
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1792
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1808
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1824
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1840
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1856
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1872
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1888
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1904
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1920
-        image: "test2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1952
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1968
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 1984
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2000
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2016
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2032
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2048
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2064
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2080
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2096
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2112
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2128
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2144
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2160
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2176
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2192
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2208
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2224
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2240
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2256
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2288
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2304
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2320
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2336
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2352
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-    Frame {
-        msec: 2368
-        hash: "9ecdd4addcaea53cdca16f3496ceb15c"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png
deleted file mode 100644
index 9309e37..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png
deleted file mode 100644
index 20e6c8e..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png
deleted file mode 100644
index c7559ac..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png
deleted file mode 100644
index bf2844b..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.4.png
deleted file mode 100644
index beef0bf..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.5.png
deleted file mode 100644
index 1847dc7..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.6.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.6.png
deleted file mode 100644
index c7559ac..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.7.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.7.png
deleted file mode 100644
index 20e6c8e..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.8.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.8.png
deleted file mode 100644
index 9309e37..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.9.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.9.png
deleted file mode 100644
index 7ac879b..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
deleted file mode 100644
index cd73a3c..0000000
--- a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
+++ /dev/null
@@ -1,2879 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 32
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 48
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 64
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 80
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 96
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 112
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 128
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 144
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 160
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 176
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 192
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 208
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 224
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 240
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 256
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 272
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 288
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 304
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 320
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 336
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 352
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 368
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 384
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 400
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 416
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 432
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 448
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 464
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 480
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 496
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 512
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 528
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 544
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 560
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 576
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 592
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 608
-        hash: "ce962a38caeb7bf7eef05112fbb52f91"
-    }
-    Frame {
-        msec: 624
-        hash: "779f0660ce5bc2c2fc9f05d8b86158a8"
-    }
-    Frame {
-        msec: 640
-        hash: "615e07a3c83539321befb44aa8fac811"
-    }
-    Frame {
-        msec: 656
-        hash: "8a00b9f66ca7fdb0e4975f547025f873"
-    }
-    Frame {
-        msec: 672
-        hash: "43bbe82799b1d8453f89a7ef928b1e54"
-    }
-    Frame {
-        msec: 688
-        hash: "2cc468d6e14c27ff1c0bd6064ae47509"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 704
-        hash: "1dc9d1b95016ccbeaca5b7a867a5cc3a"
-    }
-    Frame {
-        msec: 720
-        hash: "f36734c91fe41a7947965dac97393ad4"
-    }
-    Frame {
-        msec: 736
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 752
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 768
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 784
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 800
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 816
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 832
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 848
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 864
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 880
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 896
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 912
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 928
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 944
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 960
-        image: "test3.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 992
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 1008
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 1024
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 1040
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 1056
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 1072
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 1088
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1104
-        hash: "1c29b3d1086b261c2a9e94d49567484f"
-    }
-    Frame {
-        msec: 1120
-        hash: "6ab17a210b45dae1ed99fd1689bb3e46"
-    }
-    Frame {
-        msec: 1136
-        hash: "feb504605f7f27ca3a2bf080c1fb1e19"
-    }
-    Frame {
-        msec: 1152
-        hash: "bec2d2e2222587a379af12a30e078886"
-    }
-    Frame {
-        msec: 1168
-        hash: "39cb2bdc44273023b557a0f56df61d85"
-    }
-    Frame {
-        msec: 1184
-        hash: "2cda045b452c4645be1cdb4efd238532"
-    }
-    Frame {
-        msec: 1200
-        hash: "1f3efbfadd22734b5fd656596c11885b"
-    }
-    Frame {
-        msec: 1216
-        hash: "7277c05a06e481a5af13e4fe39e322f8"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1232
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1248
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1264
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1280
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1296
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1312
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1328
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1344
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1360
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1376
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1392
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1408
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1424
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1440
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1456
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1472
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1488
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1504
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 1520
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1536
-        hash: "c5f88e95ead1f4542b766577d80e70fd"
-    }
-    Frame {
-        msec: 1552
-        hash: "d38118f26b9c2b68dc8fdb8d2a959134"
-    }
-    Frame {
-        msec: 1568
-        hash: "44c483c899220f040aa7808f15fac429"
-    }
-    Frame {
-        msec: 1584
-        hash: "02a63967944c8c53a9741318e99a326e"
-    }
-    Frame {
-        msec: 1600
-        hash: "7fc10e91212af979e09c8d3b98625c1b"
-    }
-    Frame {
-        msec: 1616
-        hash: "d14b69d18adc548dfb68dae1559effdb"
-    }
-    Frame {
-        msec: 1632
-        hash: "cb9bce7fa14a367197fa34ad3acc4cdd"
-    }
-    Frame {
-        msec: 1648
-        hash: "105a0e3d36296eba16077c4cf93547ae"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1680
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1696
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1712
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1728
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1744
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1760
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1776
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1792
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1808
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1824
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1840
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1856
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1872
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1888
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1904
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1920
-        image: "test3.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1952
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1968
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 1984
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 2000
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2016
-        hash: "6e4e4321cda32abab394419a9e6494dc"
-    }
-    Frame {
-        msec: 2032
-        hash: "45b79c56379afa7243547fedfa3260db"
-    }
-    Frame {
-        msec: 2048
-        hash: "4635555c632f325a151d340a3eb742b9"
-    }
-    Frame {
-        msec: 2064
-        hash: "0255da44fa95548427139073c994234c"
-    }
-    Frame {
-        msec: 2080
-        hash: "eac0c428ea7b7aa55a469562d2cb3fd6"
-    }
-    Frame {
-        msec: 2096
-        hash: "06ab23a83a5900cfdde98d4563414511"
-    }
-    Frame {
-        msec: 2112
-        hash: "808e4a745c58872d52ec6a3e669aea5c"
-    }
-    Frame {
-        msec: 2128
-        hash: "e6231b43f93fd6ae3e0990def1168c39"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2144
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2160
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2176
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2192
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2208
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2224
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2240
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2256
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2272
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2288
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2304
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2320
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2336
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2352
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2368
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2384
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2400
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2416
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2432
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2448
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2464
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2480
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2496
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 2512
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2528
-        hash: "e1c32968e36cb95be250121187ddf13e"
-    }
-    Frame {
-        msec: 2544
-        hash: "70498453babe3ab5e0fec62bcd0ff332"
-    }
-    Frame {
-        msec: 2560
-        hash: "76fc1b1e6b22771bf08dfdd16b3f24e9"
-    }
-    Frame {
-        msec: 2576
-        hash: "c6be4f26750b8bc1a5b71ff381e462c6"
-    }
-    Frame {
-        msec: 2592
-        hash: "986f738d0f0f70b88f951d9f028ef61b"
-    }
-    Frame {
-        msec: 2608
-        hash: "2201ad4f92bcf24ab62d0ddb8b2a64c1"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2624
-        hash: "27e9a18cb70c8f2ab9e4dd7af321e8e4"
-    }
-    Frame {
-        msec: 2640
-        hash: "3a352127f49f8c589b7b7da1232caf6b"
-    }
-    Frame {
-        msec: 2656
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2672
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2688
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2704
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2720
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2736
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2752
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2768
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2784
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2800
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2816
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2832
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2848
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2864
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2880
-        image: "test3.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2912
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2928
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2944
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2960
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 2976
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2992
-        hash: "20f96d3fbef9d51d8b8a28a6d58fabb2"
-    }
-    Frame {
-        msec: 3008
-        hash: "1e5d888fd4685960b8ae0a79e2287e89"
-    }
-    Frame {
-        msec: 3024
-        hash: "2115c2e6689ce6669abf9f3741eb5df1"
-    }
-    Frame {
-        msec: 3040
-        hash: "c67949eb5f2210c6b2dad4ff352831ed"
-    }
-    Frame {
-        msec: 3056
-        hash: "d982500bee0a6f6fb0861fb3c32319eb"
-    }
-    Frame {
-        msec: 3072
-        hash: "ffb111084712d5ecf072ade52103b985"
-    }
-    Frame {
-        msec: 3088
-        hash: "e5d594c8f08b9d283a3998648a383332"
-    }
-    Frame {
-        msec: 3104
-        hash: "20632ba6a4c14386eb01167059f7b617"
-    }
-    Frame {
-        msec: 3120
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3136
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3152
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3168
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3184
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3200
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3216
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3232
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3248
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3264
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3280
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3296
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3312
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3328
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3344
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3360
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3376
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3392
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3408
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3424
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3440
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3456
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3472
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 3488
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3504
-        hash: "f60a72dd52f6f319706dc97f873a484f"
-    }
-    Frame {
-        msec: 3520
-        hash: "a21fbcbb3c0ede708f2862959b84654f"
-    }
-    Frame {
-        msec: 3536
-        hash: "40e5f7530391e7641498c7870ce986c9"
-    }
-    Frame {
-        msec: 3552
-        hash: "809daf15ad3e9f981f1306da18dd6872"
-    }
-    Frame {
-        msec: 3568
-        hash: "4b053d234c8c9a5afb7800abe28ea96f"
-    }
-    Frame {
-        msec: 3584
-        hash: "e011e3aaf143befc8e207945fdfc9f47"
-    }
-    Frame {
-        msec: 3600
-        hash: "55539d51f833b8a98fc14031a4a70c4c"
-    }
-    Frame {
-        msec: 3616
-        hash: "07c2b526c022d0deae61acba26d7ea24"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3632
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3648
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3664
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3680
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3696
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3712
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3728
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3744
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3760
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3776
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3792
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3808
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3824
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3840
-        image: "test3.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3872
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3888
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3904
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3920
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3936
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3952
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3968
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 3984
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4000
-        hash: "7d2f24d5a68397bedc2f9e3652715126"
-    }
-    Frame {
-        msec: 4016
-        hash: "55ff9205bb36d8f8965fb122a8686203"
-    }
-    Frame {
-        msec: 4032
-        hash: "8968377cbbdf7a46b6f13690826ac711"
-    }
-    Frame {
-        msec: 4048
-        hash: "8ce9afffac571f1a2cc6986d79dd2c8f"
-    }
-    Frame {
-        msec: 4064
-        hash: "f75c375cdf8e1b83398e9b18e7c39852"
-    }
-    Frame {
-        msec: 4080
-        hash: "20c8db7fb344c056465175ed0fa9518a"
-    }
-    Frame {
-        msec: 4096
-        hash: "8135c2cae0dcf8ee6eccbfdd7b711bc0"
-    }
-    Frame {
-        msec: 4112
-        hash: "659fc24d328058eb118be5613ea25257"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4128
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4144
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4160
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4176
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4192
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4208
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4224
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4240
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4256
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4272
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4288
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4304
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4320
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4336
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4352
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4368
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4384
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4400
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4416
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4432
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4448
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4464
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4480
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4496
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4512
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4528
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4544
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4560
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4576
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4592
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4608
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4624
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4640
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4656
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4672
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4688
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4704
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4720
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4736
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4752
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4768
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4784
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4800
-        image: "test3.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4832
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4848
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4864
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4880
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4896
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4912
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4928
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4944
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4960
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4976
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 4992
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 5008
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 5024
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 5040
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 5056
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 5072
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 5088
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Frame {
-        msec: 5104
-        hash: "ef9a34bf49c632be0f88f6658196dfe6"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5120
-        hash: "f01088d95d8409f98ae19b7970ecf3ad"
-    }
-    Frame {
-        msec: 5136
-        hash: "393987a9e22db77233465e3d08cfb244"
-    }
-    Frame {
-        msec: 5152
-        hash: "40e58eac132aa3b5f66f244ab7b189be"
-    }
-    Frame {
-        msec: 5168
-        hash: "d60c98c5fafe6bfa73a3d0c55f8f6716"
-    }
-    Frame {
-        msec: 5184
-        hash: "775733a71bb1d39f51b9fbc7e28d9ffe"
-    }
-    Frame {
-        msec: 5200
-        hash: "a343457f584c6e63aaec36b5db4fb7d0"
-    }
-    Frame {
-        msec: 5216
-        hash: "7c416bd1be54135056b037642026251f"
-    }
-    Frame {
-        msec: 5232
-        hash: "42813b6c3ef437a7b3ea8f03bb8b1894"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5248
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5264
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5280
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5296
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5312
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5328
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5344
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5360
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5376
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5392
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5408
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5424
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5440
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5456
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5472
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5488
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5504
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5520
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5536
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5552
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5568
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5584
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5600
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5616
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5632
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5648
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5664
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5680
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5696
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Frame {
-        msec: 5712
-        hash: "cc0ab553f98262662e52191e0b370486"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5728
-        hash: "b3af171ca40a5f081e2bfc984b8da551"
-    }
-    Frame {
-        msec: 5744
-        hash: "aadbc8c960fbe2e8aac184a99ba818bd"
-    }
-    Frame {
-        msec: 5760
-        image: "test3.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "99fc06589f09cd10cfdf748f032eacbd"
-    }
-    Frame {
-        msec: 5792
-        hash: "f7915b1a8b9f7188263180a97c8b355f"
-    }
-    Frame {
-        msec: 5808
-        hash: "7fb30728fb764b659bad5bb6c4e71e2c"
-    }
-    Frame {
-        msec: 5824
-        hash: "4882459350feffaed89c2296c74b839d"
-    }
-    Frame {
-        msec: 5840
-        hash: "917a368858e431bebcd8f2fda67401f8"
-    }
-    Frame {
-        msec: 5856
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5872
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 5888
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 5904
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 5920
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 5936
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 5952
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 5968
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 5984
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6000
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6016
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6032
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6048
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6064
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6080
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6096
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6112
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6128
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6144
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6160
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6176
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6192
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6208
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6224
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6240
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6256
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Frame {
-        msec: 6272
-        hash: "bfd0497c6505d42aefe6341adb850d89"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6288
-        hash: "ada3c3558261701c705ecf79716df56a"
-    }
-    Frame {
-        msec: 6304
-        hash: "81c73fd3dd69eb767d8899a54c3088bb"
-    }
-    Frame {
-        msec: 6320
-        hash: "d54e7dd1e876666f64b5904240bf8764"
-    }
-    Frame {
-        msec: 6336
-        hash: "32bdeac66a43a967d549ca2ad8c59bbd"
-    }
-    Frame {
-        msec: 6352
-        hash: "04eec62cc40c8b31d989bead64909f9e"
-    }
-    Frame {
-        msec: 6368
-        hash: "cfffdd4edc35303ee260ed32956238b7"
-    }
-    Frame {
-        msec: 6384
-        hash: "fb562c38b9d2360517160f8a8ab29ced"
-    }
-    Frame {
-        msec: 6400
-        hash: "ba8ec8f0663bf1e62ff426b0c7d0d3b2"
-    }
-    Frame {
-        msec: 6416
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6432
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6448
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6464
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6480
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6496
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6512
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6528
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6544
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6560
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6576
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6592
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6608
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6624
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6640
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6656
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6672
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6688
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6704
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6720
-        image: "test3.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6752
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6768
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6784
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6800
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6816
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6832
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Frame {
-        msec: 6848
-        hash: "e3b2de8a4e3229880971d2144e55de1b"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6864
-        hash: "e6292a001405924f6d5f1a4051c3f6cb"
-    }
-    Frame {
-        msec: 6880
-        hash: "0d8a6b740cc7b33659aa0a1cc2bd2aa9"
-    }
-    Frame {
-        msec: 6896
-        hash: "07c4267ff499c46977420d4be7529e04"
-    }
-    Frame {
-        msec: 6912
-        hash: "f69cd14d97de3ca8d21ace1df1d5a523"
-    }
-    Frame {
-        msec: 6928
-        hash: "1572b31fd3ae917d5701d0b8f1d2a2bc"
-    }
-    Frame {
-        msec: 6944
-        hash: "e3953027fe269a5d4c6581717d516c65"
-    }
-    Frame {
-        msec: 6960
-        hash: "e35e8a5dfa7309696fa20c6f5480ac50"
-    }
-    Frame {
-        msec: 6976
-        hash: "77e75e66118f911c8fff084e1a825d77"
-    }
-    Frame {
-        msec: 6992
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7008
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7024
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7040
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7056
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7072
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7088
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7104
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7120
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7136
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7152
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7168
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7184
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7200
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7216
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7232
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7248
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7264
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7280
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7296
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7312
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7328
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7344
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7360
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7376
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7392
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7408
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7424
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Frame {
-        msec: 7440
-        hash: "e97f921f1c34246fc229c48a4b66466c"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7456
-        hash: "8588c30394737cebc5580fe024589b08"
-    }
-    Frame {
-        msec: 7472
-        hash: "ca150a32b22cad95696ecfbad0ed3e67"
-    }
-    Frame {
-        msec: 7488
-        hash: "7f980e0cf67927918b1244456c38c7c0"
-    }
-    Frame {
-        msec: 7504
-        hash: "2bc38fb34a6875aabddce0f460914612"
-    }
-    Frame {
-        msec: 7520
-        hash: "328257a4691f341db39ee5ca677693eb"
-    }
-    Frame {
-        msec: 7536
-        hash: "05e0d8c986ff81e23f253d56ebdef46e"
-    }
-    Frame {
-        msec: 7552
-        hash: "be95d74a42318c52ab73ce694436a58b"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7568
-        hash: "eba8512746494f3602d24dab86fb2559"
-    }
-    Frame {
-        msec: 7584
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7600
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7616
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7632
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7648
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7664
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7680
-        image: "test3.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7712
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7728
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7744
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7760
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7776
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7792
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7808
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7824
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7840
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7856
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7872
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7888
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7904
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7920
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7936
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7952
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Frame {
-        msec: 7968
-        hash: "8f443766efd0f74e96e79ed3c267892c"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7984
-        hash: "7b2b3a84e9649370ce282383a820c39b"
-    }
-    Frame {
-        msec: 8000
-        hash: "08547adce7e02eec593fa636af004257"
-    }
-    Frame {
-        msec: 8016
-        hash: "29789cfbd1b648ce705cf17d03298ffe"
-    }
-    Frame {
-        msec: 8032
-        hash: "9e89ef84c86b1fc0531f0bd5ee530ba5"
-    }
-    Frame {
-        msec: 8048
-        hash: "21b437a318c5ef87c38f9199772eafa6"
-    }
-    Frame {
-        msec: 8064
-        hash: "70c8c8fbcf2d0331ca7ede8641a6068b"
-    }
-    Frame {
-        msec: 8080
-        hash: "c277e9d4f89e99d974d03dcfe41a1755"
-    }
-    Frame {
-        msec: 8096
-        hash: "54c7a72a3f814e707777c16ddd4532b8"
-    }
-    Frame {
-        msec: 8112
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8128
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8144
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8160
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8176
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8192
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8208
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8224
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8240
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8256
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8272
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8288
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8304
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8320
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8336
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8352
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8368
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8384
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8400
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8416
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8432
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8448
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8464
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8480
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Frame {
-        msec: 8496
-        hash: "bdf37518633a43d8dc47245f5b68550b"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8512
-        hash: "7992512c72fe530fdd92866c96de29a0"
-    }
-    Frame {
-        msec: 8528
-        hash: "ad29d3653790efb998ac137538b4ce09"
-    }
-    Frame {
-        msec: 8544
-        hash: "f6daf0ad7f7c970ece3dc1898ab9f092"
-    }
-    Frame {
-        msec: 8560
-        hash: "417143caa8ed86082ea4e40aca7ca26e"
-    }
-    Frame {
-        msec: 8576
-        hash: "5215943d1fbffd5ef7c16d4ca6587628"
-    }
-    Frame {
-        msec: 8592
-        hash: "d143c87d3cf7560f911e98869983efef"
-    }
-    Frame {
-        msec: 8608
-        hash: "1fcb9b3d3b4c888c65334b88e240d79c"
-    }
-    Frame {
-        msec: 8624
-        hash: "61cec1c227eafafe6c03a33591b1825e"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8640
-        image: "test3.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8672
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8688
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8704
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8720
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8736
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8752
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8768
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8784
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8800
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8816
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8832
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8848
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8864
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8880
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8896
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8912
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8928
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8944
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8960
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8976
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 8992
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 9008
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 9024
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 9040
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Frame {
-        msec: 9056
-        hash: "57e009de047c348d3ae14a6271b2e6f2"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9072
-        hash: "fcbb907bcf41602a5c30e2843a4b1fff"
-    }
-    Frame {
-        msec: 9088
-        hash: "5fee95daaa629bbf0cec3e41cd693502"
-    }
-    Frame {
-        msec: 9104
-        hash: "b9d721d2a8b0867bab29817b99b8ec2d"
-    }
-    Frame {
-        msec: 9120
-        hash: "e518e9872a502d3b2ff74d209626c9ee"
-    }
-    Frame {
-        msec: 9136
-        hash: "9c535d7da59ed2f2ce116e70c3e165cf"
-    }
-    Frame {
-        msec: 9152
-        hash: "e54fbcb23e01d5842885b92d4493535b"
-    }
-    Frame {
-        msec: 9168
-        hash: "7ac2467f24cef06c8842460ffe813ee0"
-    }
-    Frame {
-        msec: 9184
-        hash: "276293e289db5c9c7cd9612c73ef7792"
-    }
-    Frame {
-        msec: 9200
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9216
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9232
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9248
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9264
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9280
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9296
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9312
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9328
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9344
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9360
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9376
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9392
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9408
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9424
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9440
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9456
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9472
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9488
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9504
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9520
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9536
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9552
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9568
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9584
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9600
-        image: "test3.9.png"
-    }
-    Frame {
-        msec: 9616
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9632
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9648
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9664
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9680
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9696
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9712
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9728
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9744
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9760
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9776
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9792
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9808
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9824
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9840
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9856
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9872
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9888
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9904
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9920
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9936
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9952
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9968
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 9984
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10000
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10016
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10032
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10048
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10064
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10080
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10096
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10112
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10128
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10144
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10160
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10176
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10192
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10208
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10224
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10240
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10256
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10272
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10288
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10304
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10320
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10336
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10352
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10368
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 10384
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10400
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10416
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-    Frame {
-        msec: 10432
-        hash: "d38da3f61cd2944eec8bdfbef70c928f"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.0.png
deleted file mode 100644
index f68f7dc..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.1.png
deleted file mode 100644
index f68f7dc..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.2.png
deleted file mode 100644
index e26c028..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.3.png
deleted file mode 100644
index 9c4b2f2..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.4.png
deleted file mode 100644
index 9c4b2f2..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.5.png
deleted file mode 100644
index 9c4b2f2..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.qml b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.qml
deleted file mode 100644
index 8d36200..0000000
--- a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.qml
+++ /dev/null
@@ -1,1599 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 32
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 48
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 64
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 80
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 96
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 112
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 128
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 144
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 160
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 176
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 192
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 208
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 224
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 240
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 256
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 272
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 288
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 304
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 320
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 336
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 352
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 368
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 384
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 400
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 416
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 432
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 448
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 464
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 480
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 496
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 512
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 528
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 544
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 560
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 576
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 592
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 608
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 624
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 640
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 656
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 672
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 688
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 704
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 720
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 736
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 752
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 768
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 784
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 800
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 816
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 832
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 848
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 864
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 880
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 896
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 912
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 928
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 944
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 960
-        image: "test.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 992
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1008
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1024
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1040
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1056
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1072
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1088
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1104
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1120
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1136
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1152
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1168
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1184
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1200
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1216
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1232
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1248
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1264
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1280
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1296
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1312
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1328
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1344
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1360
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1376
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1392
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1408
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1424
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1440
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1456
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1472
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1488
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1504
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1520
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1536
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1552
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1568
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1584
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1600
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1616
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1632
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1648
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1664
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1680
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1696
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1712
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1728
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1744
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1760
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1776
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1792
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 1808
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1824
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1840
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1856
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1872
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1888
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1904
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1920
-        image: "test.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1952
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1968
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 1984
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2000
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2016
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2032
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2048
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2064
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2080
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2096
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2112
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2128
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2144
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2160
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2176
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2192
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2208
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2224
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2240
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2256
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2272
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2288
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2304
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2320
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2336
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 2352
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2368
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2384
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2400
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2416
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2432
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2448
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2464
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2480
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2496
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2512
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2528
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2544
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2560
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2576
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2592
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2608
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2624
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2640
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2656
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2672
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2688
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2704
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2720
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2736
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2752
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2768
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2784
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2800
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2816
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2832
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2848
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2864
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2880
-        image: "test.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2912
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2928
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2944
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2960
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 2976
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2992
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3008
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3024
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3040
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3056
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3072
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3088
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3104
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3120
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3136
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3152
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3168
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3184
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3200
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3216
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3232
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3248
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3264
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3280
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3296
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3312
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3328
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3344
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3360
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3376
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3392
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3408
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3424
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3440
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3456
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3472
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3488
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3504
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3520
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Frame {
-        msec: 3536
-        hash: "cd2aced96da9032ddd5e2cacf27d045d"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3552
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3568
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3584
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3600
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3616
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3632
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3648
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3664
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3680
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3696
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3712
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3728
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3744
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3760
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3776
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3792
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3808
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3824
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3840
-        image: "test.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3872
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3888
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3904
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3920
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3936
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3952
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3968
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 3984
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4000
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4016
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4032
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4048
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4064
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4080
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4096
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4112
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4128
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4144
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4160
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4176
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4192
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4208
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4224
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4240
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4256
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4272
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4288
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4304
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4320
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4336
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4352
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4368
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4384
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4400
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4416
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4432
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4448
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4464
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4480
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4496
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4512
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4528
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4544
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4560
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4576
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4592
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4608
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4624
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4640
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4656
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4672
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4688
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4704
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4720
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4736
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4752
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4768
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Frame {
-        msec: 4784
-        hash: "9157e592069482e801a091aa69758d26"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4800
-        image: "test.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4832
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4848
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4864
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4880
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4896
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4912
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4928
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4944
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4960
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4976
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 4992
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5008
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5024
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5040
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5056
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5072
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5088
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5104
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5120
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5136
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5152
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5168
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5184
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5200
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5216
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5232
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5248
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5264
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5280
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5296
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5312
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5328
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5344
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5360
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5376
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5392
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5408
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5424
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5440
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5456
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5472
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5488
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5504
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5520
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5536
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5552
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5568
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5584
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5600
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5616
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5632
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5648
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5664
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5680
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5696
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5712
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5728
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5744
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5760
-        image: "test.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5792
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5808
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5824
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5840
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5856
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5872
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-    Frame {
-        msec: 5888
-        hash: "0de58b2460574baf17912e90ba8a89b2"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.0.png
deleted file mode 100644
index 6be7aef..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.1.png
deleted file mode 100644
index 6be7aef..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.qml
deleted file mode 100644
index 813665d..0000000
--- a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.qml
+++ /dev/null
@@ -1,607 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 32
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 48
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 64
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 80
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 96
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 112
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 128
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 144
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 160
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 176
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 192
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 208
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 224
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 240
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 256
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 272
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 288
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 304
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 320
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 336
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 352
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 368
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 384
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 400
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 416
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 432
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 448
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 464
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 480
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 496
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 512
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 528
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 544
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 560
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 576
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 592
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 608
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 624
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 640
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 656
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 672
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 688
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 704
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 720
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 736
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 752
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 768
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 784
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 800
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 816
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 832
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 848
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 864
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 880
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 896
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 912
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 928
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 944
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 960
-        image: "test2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 992
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1008
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1024
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1040
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1056
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1072
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1088
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1104
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1120
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1136
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1152
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1168
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1184
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1200
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1216
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1232
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1248
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1264
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1280
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1296
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1312
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1328
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1344
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1360
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1376
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1392
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1408
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1424
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1440
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1456
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1472
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1488
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1504
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1520
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1536
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1552
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1568
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1584
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1600
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1616
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1632
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1648
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1664
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1680
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1696
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1712
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1728
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1744
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1760
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1776
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1792
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1808
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1824
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1840
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1856
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1872
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1888
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1904
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1920
-        image: "test2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1952
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1968
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 1984
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2000
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2016
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2032
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2048
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2064
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2080
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2096
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2112
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2128
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2144
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2160
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2176
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2192
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2208
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2224
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2240
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2256
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2288
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2304
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2320
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2336
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2352
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-    Frame {
-        msec: 2368
-        hash: "529409797f67656145ea88544bb8cc9f"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.0.png
deleted file mode 100644
index 5f93c67..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.1.png
deleted file mode 100644
index 3b4e0e6..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.2.png
deleted file mode 100644
index 54a3934..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.3.png
deleted file mode 100644
index 4f08fd2..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.4.png
deleted file mode 100644
index 9aee1f8..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.5.png
deleted file mode 100644
index 04eb05c..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
deleted file mode 100644
index 54a3934..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.7.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.7.png
deleted file mode 100644
index 3b4e0e6..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.8.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.8.png
deleted file mode 100644
index 2df55df..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.9.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.9.png
deleted file mode 100644
index 91816fd..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.qml
deleted file mode 100644
index 0fba451..0000000
--- a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.qml
+++ /dev/null
@@ -1,2879 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 32
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 48
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 64
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 80
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 96
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 112
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 128
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 144
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 160
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 176
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 192
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 208
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 224
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 240
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 256
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 272
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 288
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 304
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 320
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 336
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 352
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 368
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 384
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 400
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 416
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 432
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 448
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 464
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 480
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 496
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 512
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 528
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 544
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 560
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 576
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 592
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 608
-        hash: "ed71dfbe146870d1a0869d60c35ff9d7"
-    }
-    Frame {
-        msec: 624
-        hash: "ed71dfbe146870d1a0869d60c35ff9d7"
-    }
-    Frame {
-        msec: 640
-        hash: "34796cef9feb92f7f0e2e8d837d87d34"
-    }
-    Frame {
-        msec: 656
-        hash: "64fa8f195b57077aa03ca264fec9554a"
-    }
-    Frame {
-        msec: 672
-        hash: "ae33318904415e937363787273ecb566"
-    }
-    Frame {
-        msec: 688
-        hash: "67c3e1c8c728e7677a3554aadd9795c9"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 704
-        hash: "1857db7aa9eefe429d50e5b2ad87064b"
-    }
-    Frame {
-        msec: 720
-        hash: "507883a03bef0bc20755da1474731fdf"
-    }
-    Frame {
-        msec: 736
-        hash: "dafe7464394460e04d482c1f7a1e9ad0"
-    }
-    Frame {
-        msec: 752
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 768
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 784
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 800
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 816
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 832
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 848
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 864
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 880
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 896
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 912
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 928
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 944
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 960
-        image: "test3.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 992
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 1008
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 1024
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 1040
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 1056
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 1072
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 1088
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1104
-        hash: "7fb8cb07b6bca30912706cec43984d92"
-    }
-    Frame {
-        msec: 1120
-        hash: "7fb8cb07b6bca30912706cec43984d92"
-    }
-    Frame {
-        msec: 1136
-        hash: "c1915978cda982f6062790b2a583211b"
-    }
-    Frame {
-        msec: 1152
-        hash: "afdb50d740b3dc7be44021d826be4302"
-    }
-    Frame {
-        msec: 1168
-        hash: "4682717b9375b4b02a70378ddca30885"
-    }
-    Frame {
-        msec: 1184
-        hash: "aede0eebb3948a4a764e255b892b09be"
-    }
-    Frame {
-        msec: 1200
-        hash: "b42a147daec14a3da2548fd4de3a9a44"
-    }
-    Frame {
-        msec: 1216
-        hash: "2ff70f916f78fe3c199eb96ceb44ce4e"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1232
-        hash: "707ac8e58d317b97113903b45a482f6b"
-    }
-    Frame {
-        msec: 1248
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1264
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1280
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1296
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1312
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1328
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1344
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1360
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1376
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1392
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1408
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1424
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1440
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1456
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1472
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1488
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1504
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 1520
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1536
-        hash: "91525556fe23764f58b3a3f38a29cd76"
-    }
-    Frame {
-        msec: 1552
-        hash: "91525556fe23764f58b3a3f38a29cd76"
-    }
-    Frame {
-        msec: 1568
-        hash: "d1dc625bbf46fc51aaf47969ad27a8a4"
-    }
-    Frame {
-        msec: 1584
-        hash: "7d868176c7a8363a79ef8b8f4da56867"
-    }
-    Frame {
-        msec: 1600
-        hash: "d239e0b0e118d351680c6b4b2bc5d3b2"
-    }
-    Frame {
-        msec: 1616
-        hash: "8f6d1640dbc655eb3b326c66fcb97d3c"
-    }
-    Frame {
-        msec: 1632
-        hash: "d52b623b8449d71734f72c7bd661a1c4"
-    }
-    Frame {
-        msec: 1648
-        hash: "f7c0c77f3b5ed71321edd6bc7b605512"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "8b26397ff1a83baa894f82594a12a190"
-    }
-    Frame {
-        msec: 1680
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1696
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1712
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1728
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1744
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1760
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1776
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1792
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1808
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1824
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1840
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1856
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1872
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1888
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1904
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1920
-        image: "test3.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1952
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1968
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 1984
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 2000
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2016
-        hash: "f63308a7cd48a8cb4d413d17120f5a26"
-    }
-    Frame {
-        msec: 2032
-        hash: "f63308a7cd48a8cb4d413d17120f5a26"
-    }
-    Frame {
-        msec: 2048
-        hash: "2e97db8ed93524dc197e76cc2d270999"
-    }
-    Frame {
-        msec: 2064
-        hash: "2b135d90684c0f94b8219c4b835b6da9"
-    }
-    Frame {
-        msec: 2080
-        hash: "c700a76932bb3bf72868b9e95d095db2"
-    }
-    Frame {
-        msec: 2096
-        hash: "08136d3c3de44ddab23d2d136ba1f310"
-    }
-    Frame {
-        msec: 2112
-        hash: "de701d641e004b61a3c0609556f52fe0"
-    }
-    Frame {
-        msec: 2128
-        hash: "4f7acd87f4de119ad88a53d2c9881037"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2144
-        hash: "deaf3c8a4680ef6f52cb4674a97e0767"
-    }
-    Frame {
-        msec: 2160
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2176
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2192
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2208
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2224
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2240
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2256
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2272
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2288
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2304
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2320
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2336
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2352
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2368
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2384
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2400
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2416
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2432
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2448
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2464
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2480
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2496
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 2512
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2528
-        hash: "fe67b3a48a8a074377be64f619d5922a"
-    }
-    Frame {
-        msec: 2544
-        hash: "fe67b3a48a8a074377be64f619d5922a"
-    }
-    Frame {
-        msec: 2560
-        hash: "088691f4f46f7a8c9a3b8ea766d9a437"
-    }
-    Frame {
-        msec: 2576
-        hash: "bd747ea04c3b36378374f8ea1031458f"
-    }
-    Frame {
-        msec: 2592
-        hash: "2ebd0e3373eb75a3ad986e203952f78a"
-    }
-    Frame {
-        msec: 2608
-        hash: "b4d89e4f3aef9f351facd13bd83f3022"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2624
-        hash: "091de1bd1719e1fa6d914cf9708f4ac6"
-    }
-    Frame {
-        msec: 2640
-        hash: "0097d8ed156cb0c78c48dfacc557cba8"
-    }
-    Frame {
-        msec: 2656
-        hash: "faeb379e01283cb21ea695e96727918d"
-    }
-    Frame {
-        msec: 2672
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2688
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2704
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2720
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2736
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2752
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2768
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2784
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2800
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2816
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2832
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2848
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2864
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2880
-        image: "test3.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2912
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2928
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2944
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2960
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 2976
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2992
-        hash: "b00a29d67edc26e75f5298b2836d4e47"
-    }
-    Frame {
-        msec: 3008
-        hash: "b00a29d67edc26e75f5298b2836d4e47"
-    }
-    Frame {
-        msec: 3024
-        hash: "6e47c87b5063877a609e8d23ddf2d314"
-    }
-    Frame {
-        msec: 3040
-        hash: "06f147a69c3e903905376ef1229290bf"
-    }
-    Frame {
-        msec: 3056
-        hash: "5f02ff1a1207f17efd224ccc800b0057"
-    }
-    Frame {
-        msec: 3072
-        hash: "6c0860fdb216bb79fd2da4647792628d"
-    }
-    Frame {
-        msec: 3088
-        hash: "eb579f67620adb762722428d44a1d841"
-    }
-    Frame {
-        msec: 3104
-        hash: "c579017a82e34a471a95f8a116a20b9e"
-    }
-    Frame {
-        msec: 3120
-        hash: "bb5c08ff104b230829579dfb8015bdcc"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3136
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3152
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3168
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3184
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3200
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3216
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3232
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3248
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3264
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3280
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3296
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3312
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3328
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3344
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3360
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3376
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3392
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3408
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3424
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3440
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3456
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3472
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 3488
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3504
-        hash: "5aa664f268433f2724a1ab2cea1d6d25"
-    }
-    Frame {
-        msec: 3520
-        hash: "5aa664f268433f2724a1ab2cea1d6d25"
-    }
-    Frame {
-        msec: 3536
-        hash: "9e4854fd0c533efa75aec7d9a8bc41dd"
-    }
-    Frame {
-        msec: 3552
-        hash: "c4eee4eca804007dca6e6d9379cbfb1b"
-    }
-    Frame {
-        msec: 3568
-        hash: "c59774f00d54c0353b41202a39fc0dbd"
-    }
-    Frame {
-        msec: 3584
-        hash: "910e6b5b05530c60874eee00df0d62cf"
-    }
-    Frame {
-        msec: 3600
-        hash: "5b606a7a697c6d53fbe42e33333f96cc"
-    }
-    Frame {
-        msec: 3616
-        hash: "e1fce42312e8a31d74add4a447dd3df9"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3632
-        hash: "6250cb9ea51309922cf0a6647593bfee"
-    }
-    Frame {
-        msec: 3648
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3664
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3680
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3696
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3712
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3728
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3744
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3760
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3776
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3792
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3808
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3824
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3840
-        image: "test3.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3872
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3888
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3904
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3920
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3936
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3952
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3968
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 3984
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4000
-        hash: "d6eecfb695deacae4bb2fe5adb2d5c3d"
-    }
-    Frame {
-        msec: 4016
-        hash: "d6eecfb695deacae4bb2fe5adb2d5c3d"
-    }
-    Frame {
-        msec: 4032
-        hash: "b48f481a8149c03139e29b619dbb3f3c"
-    }
-    Frame {
-        msec: 4048
-        hash: "994ba7fc208bbf081d54384d82d0fc07"
-    }
-    Frame {
-        msec: 4064
-        hash: "05d30293c12eb6a3e21cebd42bb1f383"
-    }
-    Frame {
-        msec: 4080
-        hash: "f2b4140a5d26f241a27e2a3027785559"
-    }
-    Frame {
-        msec: 4096
-        hash: "1189e519fd1611c5603e598fbcadca44"
-    }
-    Frame {
-        msec: 4112
-        hash: "ee98893d95e55cb76966c0cfe29d237b"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4128
-        hash: "9ff3010efeb8707c864def782405ad4c"
-    }
-    Frame {
-        msec: 4144
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4160
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4176
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4192
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4208
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4224
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4240
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4256
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4272
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4288
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4304
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4320
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4336
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4352
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4368
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4384
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4400
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4416
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4432
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4448
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4464
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4480
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4496
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4512
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4528
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4544
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4560
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4576
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4592
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4608
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4624
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4640
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4656
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4672
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4688
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4704
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4720
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4736
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4752
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4768
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4784
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4800
-        image: "test3.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4832
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4848
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4864
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4880
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4896
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4912
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4928
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4944
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4960
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4976
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 4992
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 5008
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 5024
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 5040
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 5056
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 5072
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 5088
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Frame {
-        msec: 5104
-        hash: "c842d544f87332bc133833e8966240ee"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5120
-        hash: "a857238777462319fcedd4f359ce1a04"
-    }
-    Frame {
-        msec: 5136
-        hash: "a857238777462319fcedd4f359ce1a04"
-    }
-    Frame {
-        msec: 5152
-        hash: "d9248d1257bf0232dcdf29fca7536ad1"
-    }
-    Frame {
-        msec: 5168
-        hash: "0405e029cc4b2fa80761c06fb8898b0d"
-    }
-    Frame {
-        msec: 5184
-        hash: "a36fb7e32e6aafbb84b62ef56be3cf70"
-    }
-    Frame {
-        msec: 5200
-        hash: "9846c73bbe57277bd36bbca1c489e644"
-    }
-    Frame {
-        msec: 5216
-        hash: "8f4840715082c48d520ddb55501cf8eb"
-    }
-    Frame {
-        msec: 5232
-        hash: "478fde3a6fd8cecc222b8c16743d231f"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5248
-        hash: "b2bb760c93d26c6db21ce6beccd36b66"
-    }
-    Frame {
-        msec: 5264
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5280
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5296
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5312
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5328
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5344
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5360
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5376
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5392
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5408
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5424
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5440
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5456
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5472
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5488
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5504
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5520
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5536
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5552
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5568
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5584
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5600
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5616
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5632
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5648
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5664
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5680
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5696
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Frame {
-        msec: 5712
-        hash: "1ef605e1a68ff993f4f971a85a6bee97"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5728
-        hash: "4780d8094833831f27d1aff3e0f9689f"
-    }
-    Frame {
-        msec: 5744
-        hash: "4780d8094833831f27d1aff3e0f9689f"
-    }
-    Frame {
-        msec: 5760
-        image: "test3.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "93c8d7980de378a055b7ca824882ae4e"
-    }
-    Frame {
-        msec: 5792
-        hash: "e0abe402f89c5d84e5a02f0e4bcbd5e3"
-    }
-    Frame {
-        msec: 5808
-        hash: "067ca20bcfab459a28af7e8dc2830032"
-    }
-    Frame {
-        msec: 5824
-        hash: "d27dc1a08c66cf5f4a84efe3be522ec3"
-    }
-    Frame {
-        msec: 5840
-        hash: "639f7555adc7958e807c2e774694fe25"
-    }
-    Frame {
-        msec: 5856
-        hash: "b55f5fcbc2284736695049b2cdc9c8ce"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5872
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 5888
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 5904
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 5920
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 5936
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 5952
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 5968
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 5984
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6000
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6016
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6032
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6048
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6064
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6080
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6096
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6112
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6128
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6144
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6160
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6176
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6192
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6208
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6224
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6240
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6256
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Frame {
-        msec: 6272
-        hash: "f209867bbf74dbe0385655a522e322f1"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6288
-        hash: "48910947dd160b33251c54ff45f6a0db"
-    }
-    Frame {
-        msec: 6304
-        hash: "48910947dd160b33251c54ff45f6a0db"
-    }
-    Frame {
-        msec: 6320
-        hash: "20b0f988a1517d67a0d3c78ae8af4e5a"
-    }
-    Frame {
-        msec: 6336
-        hash: "355b5b161176c31bcbae198b1581f59b"
-    }
-    Frame {
-        msec: 6352
-        hash: "19cbb853a93bd062a53d7908df54bfbd"
-    }
-    Frame {
-        msec: 6368
-        hash: "13fbe723f288cffd09f0a86b71457161"
-    }
-    Frame {
-        msec: 6384
-        hash: "0014ed3b1a868cf75bfffedb52674c5c"
-    }
-    Frame {
-        msec: 6400
-        hash: "a1c444be02b90e69319096b8a508947d"
-    }
-    Frame {
-        msec: 6416
-        hash: "b88a3f2f3290e4262757b1f5741cb5ce"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6432
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6448
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6464
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6480
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6496
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6512
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6528
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6544
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6560
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6576
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6592
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6608
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6624
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6640
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6656
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6672
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6688
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6704
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6720
-        image: "test3.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6752
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6768
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6784
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6800
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6816
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6832
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Frame {
-        msec: 6848
-        hash: "dc708a762ba7f1120eb14105571943f8"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6864
-        hash: "a44bb76233c69780c178dddd79cc1968"
-    }
-    Frame {
-        msec: 6880
-        hash: "a44bb76233c69780c178dddd79cc1968"
-    }
-    Frame {
-        msec: 6896
-        hash: "154b11fd0468aa18d1ef1895f2e2923c"
-    }
-    Frame {
-        msec: 6912
-        hash: "fe7ecb02e63fbb7584405e7162f0ee21"
-    }
-    Frame {
-        msec: 6928
-        hash: "90b6fea69d106c628a9c7ff23a97e6c2"
-    }
-    Frame {
-        msec: 6944
-        hash: "3e233e837e24976d441b6cabc3b74098"
-    }
-    Frame {
-        msec: 6960
-        hash: "7a490f7be5c4c0ae09421f884e9adadb"
-    }
-    Frame {
-        msec: 6976
-        hash: "462d44603dd661ccf126c81197608056"
-    }
-    Frame {
-        msec: 6992
-        hash: "0b7ca73497c37255bccad6787d690236"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7008
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7024
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7040
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7056
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7072
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7088
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7104
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7120
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7136
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7152
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7168
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7184
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7200
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7216
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7232
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7248
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7264
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7280
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7296
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7312
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7328
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7344
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7360
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7376
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7392
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7408
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7424
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Frame {
-        msec: 7440
-        hash: "224ade5c942415100b5418a11d043611"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7456
-        hash: "95ff2a535a13fcdded94229d53848f7c"
-    }
-    Frame {
-        msec: 7472
-        hash: "95ff2a535a13fcdded94229d53848f7c"
-    }
-    Frame {
-        msec: 7488
-        hash: "d2386e4137632f15aa5ba9dd1a138a67"
-    }
-    Frame {
-        msec: 7504
-        hash: "9f2c40191c1a81f37543f5bfcb852bdf"
-    }
-    Frame {
-        msec: 7520
-        hash: "5facdbcc9d7ab0adfcb2ca9d1812a3f5"
-    }
-    Frame {
-        msec: 7536
-        hash: "7bbb08470e4f3eeabe710e0ea327c467"
-    }
-    Frame {
-        msec: 7552
-        hash: "630abf60d09d3a685d79e6da627b3aa2"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7568
-        hash: "d8aed706508814cdbd1ef0984f112b94"
-    }
-    Frame {
-        msec: 7584
-        hash: "d191c2dc3e2edd05bfd649dcfa51029e"
-    }
-    Frame {
-        msec: 7600
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7616
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7632
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7648
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7664
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7680
-        image: "test3.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7712
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7728
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7744
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7760
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7776
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7792
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7808
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7824
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7840
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7856
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7872
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7888
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7904
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7920
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7936
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7952
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Frame {
-        msec: 7968
-        hash: "7ee37281a3f5788305f779bdd33852e5"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7984
-        hash: "fb386abfd73a3feb05b573d16ffa93f9"
-    }
-    Frame {
-        msec: 8000
-        hash: "fb386abfd73a3feb05b573d16ffa93f9"
-    }
-    Frame {
-        msec: 8016
-        hash: "fa1374155fc5427c72bd09ec5a315172"
-    }
-    Frame {
-        msec: 8032
-        hash: "ee35a3edf91865e28b16b9fcab8b4c1c"
-    }
-    Frame {
-        msec: 8048
-        hash: "10f2677f7c8efe9f64e401940dec3ef7"
-    }
-    Frame {
-        msec: 8064
-        hash: "b2c53bb14a8a6643e69cad2bbb4aacf4"
-    }
-    Frame {
-        msec: 8080
-        hash: "7b7c7d167aca55464d1874ed726ec646"
-    }
-    Frame {
-        msec: 8096
-        hash: "19a828ca70133801f1f470f6e348857b"
-    }
-    Frame {
-        msec: 8112
-        hash: "bc829873ea3cf8ca8484d990d4b80aa2"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8128
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8144
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8160
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8176
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8192
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8208
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8224
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8240
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8256
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8272
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8288
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8304
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8320
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8336
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8352
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8368
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8384
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8400
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8416
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8432
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8448
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8464
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8480
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Frame {
-        msec: 8496
-        hash: "201b90bc27073e945bb00c85501f4dc8"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8512
-        hash: "d0d487fd66bcf4177188d4862bd74bc0"
-    }
-    Frame {
-        msec: 8528
-        hash: "d0d487fd66bcf4177188d4862bd74bc0"
-    }
-    Frame {
-        msec: 8544
-        hash: "4a4c2e49e4852748916a4d68710e4ae6"
-    }
-    Frame {
-        msec: 8560
-        hash: "0135092d8a296b7121495cc3994a0f9d"
-    }
-    Frame {
-        msec: 8576
-        hash: "7e004aae70236568d635ba929e085b2b"
-    }
-    Frame {
-        msec: 8592
-        hash: "3e6a4f60a57515a6bfe4d803c7c22da8"
-    }
-    Frame {
-        msec: 8608
-        hash: "142b866861f539837b0bdabaf48028e7"
-    }
-    Frame {
-        msec: 8624
-        hash: "32a4757602c923366566d9005c78f6cf"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8640
-        image: "test3.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8672
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8688
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8704
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8720
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8736
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8752
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8768
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8784
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8800
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8816
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8832
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8848
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8864
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8880
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8896
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8912
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8928
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8944
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8960
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8976
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 8992
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 9008
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 9024
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 9040
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Frame {
-        msec: 9056
-        hash: "358a3fbfa70526a40f2179cb2fd100d4"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9072
-        hash: "b1dc330f31b064f1e3ff4e913773cde8"
-    }
-    Frame {
-        msec: 9088
-        hash: "b1dc330f31b064f1e3ff4e913773cde8"
-    }
-    Frame {
-        msec: 9104
-        hash: "a0419dede71451f36c93960c8ef8c00c"
-    }
-    Frame {
-        msec: 9120
-        hash: "b8141758fc93aa1b286fd60f91e6fa7e"
-    }
-    Frame {
-        msec: 9136
-        hash: "8b0d786f239c545be3f51622c336f1e1"
-    }
-    Frame {
-        msec: 9152
-        hash: "25ec52efac83de4f8cade8f257b93b8e"
-    }
-    Frame {
-        msec: 9168
-        hash: "5a1476841b9aaa0e85c397c0447be352"
-    }
-    Frame {
-        msec: 9184
-        hash: "d648b0911e6ab78e53121fde8b66b50b"
-    }
-    Frame {
-        msec: 9200
-        hash: "f552863ff4b76286d03240409c0a928b"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9216
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9232
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9248
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9264
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9280
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9296
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9312
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9328
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9344
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9360
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9376
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9392
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9408
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9424
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9440
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9456
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9472
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9488
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9504
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9520
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9536
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9552
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9568
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9584
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9600
-        image: "test3.9.png"
-    }
-    Frame {
-        msec: 9616
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9632
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9648
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9664
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9680
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9696
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9712
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9728
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9744
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9760
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9776
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9792
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9808
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9824
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9840
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9856
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9872
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9888
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9904
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9920
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9936
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9952
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9968
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 9984
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10000
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10016
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10032
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10048
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10064
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10080
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10096
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10112
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10128
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10144
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10160
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10176
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10192
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10208
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10224
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10240
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10256
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10272
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10288
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10304
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10320
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10336
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10352
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10368
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 10384
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10400
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10416
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-    Frame {
-        msec: 10432
-        hash: "f3b4cab7975190f756c923f16ce4c298"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test.0.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.0.png
index 67b99e0..986a164 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test.0.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test.1.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.1.png
index 67b99e0..986a164 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test.1.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test.2.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.2.png
index 69f0366..fd28a93 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test.2.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test.3.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.3.png
deleted file mode 100644
index afe0bd9..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test.4.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.4.png
deleted file mode 100644
index afe0bd9..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test.5.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.5.png
deleted file mode 100644
index afe0bd9..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test.qml b/tests/auto/declarative/qmlvisual/focusscope/data/test.qml
index 460ba1a..da99cfd 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/data/test.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.qml
@@ -6,239 +6,287 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 32
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 48
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 64
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 80
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 96
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 112
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 128
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 144
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 160
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 176
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 192
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 208
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 224
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 240
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 256
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 272
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 288
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 304
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 320
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 336
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 352
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 368
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 384
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 400
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 416
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 432
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 448
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 464
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 480
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 496
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 512
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 528
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 544
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 560
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 576
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
     }
     Frame {
         msec: 592
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "7d929804a37a70ffd487e95a3be8ea5f"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 608
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 624
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 640
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 656
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 672
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 688
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 704
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 720
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 736
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 752
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 768
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 784
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 800
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 816
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 832
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 848
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 864
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 880
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 896
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 912
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 928
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 944
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 960
@@ -246,263 +294,303 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 992
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1008
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1024
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1040
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1056
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1072
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1088
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1104
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1120
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1136
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1152
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1168
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1184
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1200
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1216
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1232
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 1248
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Key {
         type: 6
         key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 1264
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1280
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1296
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1312
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1328
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
+    }
+    Frame {
+        msec: 1344
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Key {
         type: 7
         key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 1344
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
         msec: 1360
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1376
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1392
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1408
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1424
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1440
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1456
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1472
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1488
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1504
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1520
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1536
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1552
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1568
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1584
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1600
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1616
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1632
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1648
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1664
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1680
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1696
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1712
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
     }
     Frame {
         msec: 1728
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "0914d1f71cdaf1f1a37b95ea41c57d4f"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1744
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1760
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1776
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1792
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1808
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
+        type: 7
+        key: 16777235
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 1824
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1840
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1856
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1872
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1888
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1904
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1920
@@ -510,263 +598,287 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 1952
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
+    }
+    Frame {
+        msec: 1968
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Key {
-        type: 7
+        type: 6
         key: 16777234
-        modifiers: 536870912
-        text: "1c"
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 1968
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
         msec: 1984
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2000
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2016
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2032
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2048
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2064
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2080
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2096
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2112
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2128
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2144
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2160
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2176
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2192
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2208
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2224
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2240
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2256
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2272
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2288
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2304
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2320
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2336
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Frame {
         msec: 2352
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "f369109744055d30eadf2832a028a104"
+    }
+    Frame {
+        msec: 2368
+        hash: "f369109744055d30eadf2832a028a104"
     }
     Key {
         type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
+        key: 16777234
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 2368
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
         msec: 2384
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2400
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2416
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2432
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2448
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2464
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Key {
         type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
+        key: 16777234
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 2480
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2496
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2512
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2528
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2544
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2560
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2576
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2592
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2608
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2624
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2640
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2656
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2672
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2688
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2704
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2720
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2736
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2752
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2768
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2784
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2800
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2816
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2832
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2848
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2864
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2880
@@ -774,826 +886,38 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2912
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2928
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2944
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2960
-        hash: "7e4814e27214ecbeb55992e319a88102"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2976
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 2992
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 3008
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
     Frame {
         msec: 3024
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3040
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3056
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3072
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3088
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3104
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3120
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3136
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3152
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3168
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3184
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3200
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3216
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3232
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3248
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3264
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3280
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3296
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3312
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3328
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3344
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3360
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3376
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3392
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3408
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3424
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3440
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3456
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3472
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3488
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3504
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3520
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Frame {
-        msec: 3536
-        hash: "e7722f02692fbae81b9ec78547e1e4e9"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3552
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3568
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3584
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3600
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3616
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3632
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3648
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3664
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3680
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3696
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3712
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3728
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3744
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3760
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3776
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3792
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3808
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3824
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3840
-        image: "test.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3872
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3888
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3904
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3920
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3936
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3952
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3968
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 3984
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4000
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4016
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4032
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4048
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4064
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4080
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4096
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4112
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4128
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4144
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4160
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4176
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4192
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4208
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4224
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4240
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4256
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4272
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4288
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4304
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4320
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4336
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4352
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4368
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4384
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4400
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4416
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4432
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4448
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4464
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4480
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4496
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4512
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4528
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4544
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4560
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4576
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4592
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4608
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4624
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4640
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4656
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4672
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4688
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4704
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4720
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4736
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4752
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4768
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Frame {
-        msec: 4784
-        hash: "7e4814e27214ecbeb55992e319a88102"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4800
-        image: "test.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4832
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4848
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4864
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4880
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4896
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4912
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4928
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4944
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4960
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4976
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 4992
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5008
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5024
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5040
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5056
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5072
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5088
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5104
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5120
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5136
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5152
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5168
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5184
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5200
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5216
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5232
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5248
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5264
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5280
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5296
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5312
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5328
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5344
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5360
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5376
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5392
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5408
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5424
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5440
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5456
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5472
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5488
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5504
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5520
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5536
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5552
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5568
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5584
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5600
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5616
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5632
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5648
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5664
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5680
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5696
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5712
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5728
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5744
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5760
-        image: "test.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5792
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5808
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5824
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5840
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5856
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5872
-        hash: "6f85c2226e6e408f4699762f687b83e1"
-    }
-    Frame {
-        msec: 5888
-        hash: "6f85c2226e6e408f4699762f687b83e1"
+        hash: "94675f9c9afb6834b91a69fd0ce35a22"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test2.0.png b/tests/auto/declarative/qmlvisual/focusscope/data/test2.0.png
index 555a968..22d7496 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test2.0.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test2.1.png b/tests/auto/declarative/qmlvisual/focusscope/data/test2.1.png
deleted file mode 100644
index 555a968..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/data/test2.qml
index 03ece10..ff977ac 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/data/test2.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test2.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 32
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 48
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 64
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 80
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 96
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 112
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 128
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 144
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 160
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 176
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 192
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 208
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 224
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 240
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 256
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 272
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 288
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 304
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 320
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 336
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 352
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 368
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 384
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 400
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 416
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 432
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 448
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 464
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 480
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 496
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 512
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 528
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 544
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 560
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 576
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 592
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 608
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 624
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 640
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 656
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 672
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 688
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 704
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 720
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 736
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 752
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 768
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 784
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 800
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 816
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 832
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 848
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 864
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 880
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 896
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 912
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 928
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 944
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 960
@@ -246,362 +246,78 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 992
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1008
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1024
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1040
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1056
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1072
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1088
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1104
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1120
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1136
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1152
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1168
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1184
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1200
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1216
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1232
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1248
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
     Frame {
         msec: 1264
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1280
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1296
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1312
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1328
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1344
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1360
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1376
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1392
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1408
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1424
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1440
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1456
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1472
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1488
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1504
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1520
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1536
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1552
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1568
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1584
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1600
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1616
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1632
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1648
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1664
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1680
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1696
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1712
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1728
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1744
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1760
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1776
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1792
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1808
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1824
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1840
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1856
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1872
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1888
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1904
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1920
-        image: "test2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1952
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1968
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 1984
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2000
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2016
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2032
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2048
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2064
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2080
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2096
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2112
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2128
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2144
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2160
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2176
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2192
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2208
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2224
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2240
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2256
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2288
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2304
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2320
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2336
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2352
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
-    }
-    Frame {
-        msec: 2368
-        hash: "bb4131579c66dc948f2e27e236deb4ab"
+        hash: "4823f4520db0c1f64d887f172b3efa17"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.0.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.0.png
index 374acf5..baac346 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.0.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test3.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.1.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.1.png
index b75cb10..25d3c66 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.1.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test3.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.2.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.2.png
index 9b2f919..fc90552 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.2.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test3.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.3.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.3.png
index bf63032..2f0519e 100644
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.3.png and b/tests/auto/declarative/qmlvisual/focusscope/data/test3.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.4.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.4.png
deleted file mode 100644
index 6981a06..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.5.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.5.png
deleted file mode 100644
index 5856325..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.6.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.6.png
deleted file mode 100644
index 9b2f919..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.7.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.7.png
deleted file mode 100644
index b75cb10..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.8.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.8.png
deleted file mode 100644
index 374acf5..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.9.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.9.png
deleted file mode 100644
index 11a08bd..0000000
Binary files a/tests/auto/declarative/qmlvisual/focusscope/data/test3.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/data/test3.qml
index dd48e39..686fc8d 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/data/test3.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.qml
@@ -6,255 +6,287 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 32
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 48
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 64
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 80
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 96
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 112
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 128
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 144
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 160
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 176
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 192
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 208
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 224
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 240
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 256
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 272
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 288
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 304
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 320
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 336
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 352
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 368
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 384
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 400
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 416
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 432
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 448
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 464
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 480
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 496
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 512
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 528
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 544
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "60101929d88be9177f4988573c35dcdb"
     }
     Frame {
         msec: 560
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "519bbcffcafe96253923994ce7cae971"
     }
     Frame {
         msec: 576
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "e46fd44935f37eadee7520f17ad7cf01"
     }
     Frame {
         msec: 592
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "2a0ed4cb9940ff82d4a56dc3dc94f333"
+    }
+    Frame {
+        msec: 608
+        hash: "a97ff19bb6493b7a026c9c549aafff04"
     }
     Key {
-        type: 6
+        type: 7
         key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 608
-        hash: "c114718c158f107e8a7d06bf49d30855"
-    }
-    Frame {
         msec: 624
-        hash: "c71bf3c6ef7addc3c1f55e3f92c001ac"
+        hash: "52fe44fff5c72e1585e000e73086c2e9"
     }
     Frame {
         msec: 640
-        hash: "b075c33ed606041dfb57a03f92cf5574"
+        hash: "76f62e0619ed15894d7fb6fe9e1a7700"
     }
     Frame {
         msec: 656
-        hash: "1933a060fc0b889082df94054a2d3c7e"
+        hash: "aceb3ae38213d097bd0f50d64779fbda"
     }
     Frame {
         msec: 672
-        hash: "cc4133e796a242493538131c789c392c"
+        hash: "c62f8846e1076adcd7c9a8bc1164c0a8"
     }
     Frame {
         msec: 688
-        hash: "cbc16ad8bcb8dcf73ae101ca4899adac"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "c62f8846e1076adcd7c9a8bc1164c0a8"
     }
     Frame {
         msec: 704
-        hash: "1a5e008ef5640ad85a19b307244a36f7"
+        hash: "c62f8846e1076adcd7c9a8bc1164c0a8"
     }
     Frame {
         msec: 720
-        hash: "6a0c9d0f3ac068d65d590c844dae4ebb"
+        hash: "c62f8846e1076adcd7c9a8bc1164c0a8"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 736
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "9f3ab4856c51ee635b8dbce4778053f0"
     }
     Frame {
         msec: 752
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "4fe79ffc2bb078c8cb8c3cdbb57d3c5e"
     }
     Frame {
         msec: 768
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "9caefb6edbfeadacd54a9f4e06e40ddc"
     }
     Frame {
         msec: 784
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "a8dc7e314b3bd2fb8d16bcf68bfbc7e8"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 800
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "342e75af68d345574c551ff65ac2f2de"
     }
     Frame {
         msec: 816
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "a26927b8cdfa8813c5e0661d154bb36b"
     }
     Frame {
         msec: 832
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "0214f5055daa4a761d2e791d06744ac5"
     }
     Frame {
         msec: 848
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "d2d4296a49de27da45381fa250fb1f38"
     }
     Frame {
         msec: 864
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "a375e3df0b00754fa4208aecbf1b218d"
     }
     Frame {
         msec: 880
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "a375e3df0b00754fa4208aecbf1b218d"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 896
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "0cd7a1cfb7fafdb406b5e3a612dd61b7"
     }
     Frame {
         msec: 912
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "0315c0011c75f254337cb5e557dc6dad"
     }
     Frame {
         msec: 928
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "2633ea851ec228dc1d5149ef65b1c910"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 944
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "cd8870a81860a9926f4d5580dabf3479"
     }
     Frame {
         msec: 960
@@ -262,271 +294,311 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "419ec77dceb052c41e072b9513124794"
     }
     Frame {
         msec: 992
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "68fd88f83bf707fbc3ae29840bfb2110"
     }
     Frame {
         msec: 1008
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "bfb514b9a9c57d6b78149b81f4adb177"
     }
     Frame {
         msec: 1024
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "bfb514b9a9c57d6b78149b81f4adb177"
     }
     Frame {
         msec: 1040
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "bfb514b9a9c57d6b78149b81f4adb177"
     }
     Frame {
         msec: 1056
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "bfb514b9a9c57d6b78149b81f4adb177"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1072
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "e0707db3c9da95ab02be8dec08d1eea9"
     }
     Frame {
         msec: 1088
-        hash: "216a02433edb100e6ff3db4944f6b061"
+        hash: "78d405f63a5ed781ce36ed4844621a26"
     }
     Key {
-        type: 6
+        type: 7
         key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 1104
-        hash: "ac2f6e2f5f379ad8717aa3754f2aab80"
+        hash: "d7dc78c2a3cb4a059322b20622dfa0ed"
     }
     Frame {
         msec: 1120
-        hash: "e896c5b5a4fd121e5c25aba0a17c11f3"
+        hash: "c7bfc322da4a3e112324bd024d271dda"
     }
     Frame {
         msec: 1136
-        hash: "1d1228cf0b205e46a969a0016245bb9e"
+        hash: "a94d4a6f15404f10cad31ad5337f0f10"
     }
     Frame {
         msec: 1152
-        hash: "d07b1d53655e549c503223fddfa62038"
+        hash: "49f03ed7afac886a45268aef990cb176"
     }
     Frame {
         msec: 1168
-        hash: "d774614f13d1a19eff3c451c4abce7e5"
+        hash: "9fbacc43c6a796f81af102e95d05c17e"
     }
     Frame {
         msec: 1184
-        hash: "0e8445283c961a41c22ede2f26ab0d0c"
+        hash: "ec3231a8ba136d2edd5265c51cd82d4f"
     }
     Frame {
         msec: 1200
-        hash: "f85ced79a9d521b70b093d43d1335914"
+        hash: "070bec590f2379198933cf68db678821"
     }
     Frame {
         msec: 1216
-        hash: "3f70531768847686f202336827ed5c51"
+        hash: "070bec590f2379198933cf68db678821"
     }
     Key {
-        type: 7
+        type: 6
         key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 1232
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "b9bb4eee4ea2fe26178ece2be67111e3"
     }
     Frame {
         msec: 1248
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "06fe10dc99a8f28a64942bd76bdd401b"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1264
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "63f4e972f1b8f3273170436c673120ca"
     }
     Frame {
         msec: 1280
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "25a83b96f733add828557775d4aabe21"
     }
     Frame {
         msec: 1296
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "73de2ed5df81559c7a24d9a5b73a2ce9"
     }
     Frame {
         msec: 1312
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "43bdf31d652394c4d2b881ca6ad326ed"
     }
     Frame {
         msec: 1328
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "f5f564fcb39a7e007c30150c1a54283c"
     }
     Frame {
         msec: 1344
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1360
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1376
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1392
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1408
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1424
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1440
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1456
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1472
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 1488
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1504
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "a56bcb200f3ed037bfea052df2910902"
     }
     Frame {
         msec: 1520
-        hash: "30c5f9005238542c83b2d994cb61de16"
+        hash: "2b3561807f9681f6b875e7f4fcd33223"
+    }
+    Frame {
+        msec: 1536
+        hash: "2cee5a4a22f72058a61cd9cb9d39e818"
     }
     Key {
-        type: 6
+        type: 7
         key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 1536
-        hash: "c59557a62fb22756ecae00bf36589f19"
-    }
-    Frame {
         msec: 1552
-        hash: "c2938aac121e121eb138b2cdc485a23c"
+        hash: "cd1f3f9a2bcd0efd4ba252454c51e261"
     }
     Frame {
         msec: 1568
-        hash: "aa582bd07789a0ce000bb014b4924969"
+        hash: "b2d8e52a59d1141cfaf6b22ba9aa74cf"
     }
     Frame {
         msec: 1584
-        hash: "59d7a7fed20a11ecb12de08c77f0f303"
+        hash: "f218a82081c0552d2caccaa840decfbb"
     }
     Frame {
         msec: 1600
-        hash: "9a1d7649e44e2c2436855b92abbae030"
+        hash: "ae20ae49364bddbe3dcd9e09c36b7423"
     }
     Frame {
         msec: 1616
-        hash: "e46c47a221da37bbdffcdf671e84774b"
+        hash: "63d8d2d948e3cab3a50ef4db61ca4c48"
     }
     Frame {
         msec: 1632
-        hash: "85ff7ef61ef08dc97065b0536f9f8766"
+        hash: "f29a9aa2e469e3fb4bedfe11523212c9"
     }
     Frame {
         msec: 1648
-        hash: "1159f274e5c2947875484d04a3ac6694"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "f29a9aa2e469e3fb4bedfe11523212c9"
     }
     Frame {
         msec: 1664
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "f29a9aa2e469e3fb4bedfe11523212c9"
     }
     Frame {
         msec: 1680
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "f29a9aa2e469e3fb4bedfe11523212c9"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1696
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "c46539fd3ef1e01519b43855c0831213"
     }
     Frame {
         msec: 1712
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "40a4666320efaa62904d390add745bb3"
     }
     Frame {
         msec: 1728
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "a490a1904e909f3e2ade5ee8a7e9dbf3"
     }
     Frame {
         msec: 1744
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "2e67ac8bbc37731e590156348563bb98"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1760
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "daab7eba2dbf88b920b1cc61aa114435"
     }
     Frame {
         msec: 1776
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "5e6611b6024be9f48e6356bb46fe91db"
     }
     Frame {
         msec: 1792
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "6329448571671f77102e14f3f05d3a66"
     }
     Frame {
         msec: 1808
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "2a40d32c1c81fb85dab745a05cca500b"
     }
     Frame {
         msec: 1824
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "6579f0cfe1fd762818d69ded26e47c77"
     }
     Frame {
         msec: 1840
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "6579f0cfe1fd762818d69ded26e47c77"
     }
     Frame {
         msec: 1856
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "6579f0cfe1fd762818d69ded26e47c77"
     }
     Frame {
         msec: 1872
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "6579f0cfe1fd762818d69ded26e47c77"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1888
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "899d92a8106e85ff1131c07af3971879"
     }
     Frame {
         msec: 1904
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "8566d59024d7dcf410d4d87e234f477c"
     }
     Frame {
         msec: 1920
@@ -534,271 +606,295 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "ba9b93e9762667c4a7c123933720fb06"
     }
     Frame {
         msec: 1952
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "cffb82799861d551cc208b7fe2922ea2"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1968
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "efe3ec54dfd82b06d6cb8d7813030894"
     }
     Frame {
         msec: 1984
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
+        hash: "80934efe77a8e1d8460b55c0d5831a17"
     }
     Frame {
         msec: 2000
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "5954c3e6ebe78c50776cfa48c152cf46"
     }
     Frame {
         msec: 2016
-        hash: "26e5e7612374c7a4f7ac26a284c735b4"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2032
-        hash: "03c63a8bab380ebcd02f2bf2f588df85"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2048
-        hash: "1a7c4738de4f1123c7e639c935095476"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2064
-        hash: "8362cb8a253dcb2e9ef7fb070579d639"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2080
-        hash: "8fae548ad1f2e16738c14636b905efef"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2096
-        hash: "05fca78fea63817204b2303495baaec7"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2112
-        hash: "5bf7b04177db667f23f1bc4f0066bc44"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2128
-        hash: "aa10d0614604f0563d4fc458b7bb9260"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2144
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2160
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2176
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2192
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2208
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2224
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2240
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2256
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2272
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2288
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2304
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2320
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2336
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2352
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2368
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2384
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2400
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2416
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2432
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2448
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
     }
     Frame {
         msec: 2464
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "588140c8a668842ec06e424692b57918"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2480
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "4ba7e4ed21d496abc7ab4651afb5880b"
     }
     Frame {
         msec: 2496
-        hash: "0461d0e31648d2c155bee0145094c153"
+        hash: "497188bf0ef98eb246399f025b9259bc"
     }
     Frame {
         msec: 2512
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "173049c273e4ea2f63428c0838f029ef"
     }
     Frame {
         msec: 2528
-        hash: "1823a5c00778550c6b46416e6a2b730f"
+        hash: "c8199565d52abb5bdf64b31c2f965038"
     }
     Frame {
         msec: 2544
-        hash: "7ca64f71eee9d3a926335de026be5fe2"
+        hash: "995ca28ee06c376a8527992b1396374a"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2560
-        hash: "5f9e44b8374a490793b479440ce3b701"
+        hash: "62b4b4b4e35cb3594b827a3f0488e016"
     }
     Frame {
         msec: 2576
-        hash: "b0969884a9654d87da9941fb9eb4c99a"
+        hash: "5cd79f2fff8e35c2ce6167d3a3999bc2"
     }
     Frame {
         msec: 2592
-        hash: "aeadf244a67b3c9e5c119b52aa0f15a0"
+        hash: "3c64ff196b49488d48214562849deec7"
     }
     Frame {
         msec: 2608
-        hash: "2d990e5ae8d3660079bdea7f2b5245a7"
+        hash: "6579f0cfe1fd762818d69ded26e47c77"
+    }
+    Frame {
+        msec: 2624
+        hash: "6579f0cfe1fd762818d69ded26e47c77"
     }
     Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 2624
-        hash: "5998faffa17f9ffbf1cb39cdc09cdd54"
-    }
-    Frame {
         msec: 2640
-        hash: "bf8089df5d863f627cd44294f322d796"
+        hash: "3ae9139845494acafc2212843271e80c"
     }
     Frame {
         msec: 2656
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "9bd81bd575c63bbedbcb19452e52f9aa"
     }
     Frame {
         msec: 2672
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "8a8fd3ec0ac02d3e8d37ade92e5b0b28"
     }
     Frame {
         msec: 2688
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "3da79a037c7c8fca1a133c65766cd7a4"
     }
     Frame {
         msec: 2704
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "31f24ec970184bf253ce0a80cca8c15d"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2720
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "8e41287dd7f3d17107336f79ea4a57b5"
     }
     Frame {
         msec: 2736
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "0eced41494be06a4a2d11aee076c0eab"
     }
     Frame {
         msec: 2752
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "f29a9aa2e469e3fb4bedfe11523212c9"
     }
     Frame {
         msec: 2768
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "f29a9aa2e469e3fb4bedfe11523212c9"
     }
     Frame {
         msec: 2784
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "f29a9aa2e469e3fb4bedfe11523212c9"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2800
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "2161ebbc0b1a8326d778657ded7993a8"
     }
     Frame {
         msec: 2816
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "65bdbbcea1cf5629e1c04ff09bd2b867"
     }
     Frame {
         msec: 2832
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "4cfe120b55285efb9484f696146fa297"
     }
     Frame {
         msec: 2848
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "d50ded95cf2418ef2ab3c4d7dd32babe"
     }
     Frame {
         msec: 2864
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "722e3342d833809e2e6c6ecb5774fb86"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2880
@@ -806,271 +902,319 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "0193889d59dc40150eab584dd1665b5e"
     }
     Frame {
         msec: 2912
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "cd39f2cee2cf7507203a340ceaa961f5"
     }
     Frame {
         msec: 2928
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
     }
     Frame {
         msec: 2944
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "270321ae5fe7a0e457d2897480e5bbbc"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2960
-        hash: "f75305426b87e1cdc325ae6668367be9"
+        hash: "d19642853fc07a54711b6afbca4453fd"
     }
     Frame {
         msec: 2976
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "70db31594995fa6c05347ebc5aedd063"
     }
     Frame {
         msec: 2992
-        hash: "d707cb6e2587eecba275d1e7ceb9d020"
+        hash: "8d8ab3076baae893037a1b16880db6b6"
     }
     Frame {
         msec: 3008
-        hash: "fddd144d4d2e475330ff87f4e6febe35"
+        hash: "32c05a581d854a828f2049c5aa588afd"
     }
     Frame {
         msec: 3024
-        hash: "06115e65296d1a77ab956cd3984303ee"
+        hash: "7f8f111aa6e8e802beca3b7fd2a28007"
     }
     Frame {
         msec: 3040
-        hash: "6881ec448625fdc23f1241bd60362460"
+        hash: "c0ae8434516e2f77d78279c8e37a9f0a"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3056
-        hash: "d94fdfd178377328e3b840c32f774958"
+        hash: "7cc66b7432d2c73258e4c7910870d166"
     }
     Frame {
         msec: 3072
-        hash: "d2cba0b3aac8002aa2de51f7b1442985"
+        hash: "070bec590f2379198933cf68db678821"
     }
     Frame {
         msec: 3088
-        hash: "c0ea81cddf6b1f5b4b4157dade6b8ca0"
+        hash: "070bec590f2379198933cf68db678821"
     }
     Frame {
         msec: 3104
-        hash: "964a80740cc7ba474d5d10b76cca1b14"
+        hash: "070bec590f2379198933cf68db678821"
     }
     Frame {
         msec: 3120
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "070bec590f2379198933cf68db678821"
+    }
+    Frame {
+        msec: 3136
+        hash: "070bec590f2379198933cf68db678821"
     }
     Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 3136
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
         msec: 3152
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "f45969e94df0c5ea7c153e6952479ec8"
     }
     Frame {
         msec: 3168
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "55f4733f50b90d723c88ef74d66ee8a9"
     }
     Frame {
         msec: 3184
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "980ea06fe8405ce29514cbc752a581c2"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3200
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "0a5a6d62d13876c9562253645381702a"
     }
     Frame {
         msec: 3216
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "0ade580a20e10d9887d6bc544025770e"
     }
     Frame {
         msec: 3232
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "707524f7b0fad3879d41c8ff5d339b87"
     }
     Frame {
         msec: 3248
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "1786e49beb751b4b8cf4492f63b3db77"
     }
     Frame {
         msec: 3264
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "a44ca7861ccd844eb284ab310751351a"
     }
     Frame {
         msec: 3280
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "bfb514b9a9c57d6b78149b81f4adb177"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3296
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "e36d2476c9954e6a4372ded19efd06a1"
     }
     Frame {
         msec: 3312
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "c324cc45624346f32a776a87ec5fcc7e"
     }
     Frame {
         msec: 3328
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "fcf1629f58a73492f1afa74672013602"
     }
     Frame {
         msec: 3344
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "853e27fd37b764a852a2c4fabbaae6bc"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3360
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "a75d77b15211080e12b397c3cee93568"
     }
     Frame {
         msec: 3376
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "936fb8c2c0909a77a9bdc654d91d13ad"
     }
     Frame {
         msec: 3392
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "f11dde44c028dbd299bc6733218969f7"
     }
     Frame {
         msec: 3408
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "a375e3df0b00754fa4208aecbf1b218d"
     }
     Frame {
         msec: 3424
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "a375e3df0b00754fa4208aecbf1b218d"
     }
     Frame {
         msec: 3440
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "a375e3df0b00754fa4208aecbf1b218d"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3456
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "3ce1288d66836b6224f471903454be37"
     }
     Frame {
         msec: 3472
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 3488
-        hash: "3e44d7064e55c510401b5008a06d9b82"
+        hash: "9bff5f42f23b504ee013df4834ed884c"
     }
     Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 3488
+        hash: "523df7cc8d991695722b521282824627"
+    }
+    Frame {
         msec: 3504
-        hash: "56634199c96e5c4588c2954f0595fcaa"
+        hash: "5c16f8efbab40bcf8016bd7334eb99fa"
     }
     Frame {
         msec: 3520
-        hash: "a51221b77045e51cba2b0913546961cb"
+        hash: "bee74f34ee101f0fef0967801498de75"
     }
     Frame {
         msec: 3536
-        hash: "9910569a15164882056802e5ecfaef42"
+        hash: "a08ee211d870bc3f97f1e698cd887908"
     }
     Frame {
         msec: 3552
-        hash: "17080817e0b23212828d2cee23eff98f"
+        hash: "89ac21176fd4ce1bbbd0b7dd6904c12c"
     }
     Frame {
         msec: 3568
-        hash: "791fee9758645fe21fe52918e5435f7d"
+        hash: "95608d850a3c5cfbded1aafb33885bad"
     }
     Frame {
         msec: 3584
-        hash: "e0fcea2889a4825075322524025a4bdf"
-    }
-    Frame {
-        msec: 3600
-        hash: "825f58093f328182fa32b3cbc573101f"
-    }
-    Frame {
-        msec: 3616
-        hash: "550972282584bd52108728290bd4aa5e"
+        hash: "c62f8846e1076adcd7c9a8bc1164c0a8"
     }
     Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 3600
+        hash: "54705722d344bfbe829211019f2865ba"
+    }
+    Frame {
+        msec: 3616
+        hash: "d63b2ce9e16583671a5e6d266393b11c"
+    }
+    Frame {
         msec: 3632
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "3979df5d0aa1c3610e1d3562e34385c6"
     }
     Frame {
         msec: 3648
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "782d14c3a1baf9a3017ec5b514492860"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3664
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "0d219c97e1278474b74ed16f29fae1a1"
     }
     Frame {
         msec: 3680
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "3df0e87dd3d5f50b9c4bb3db8d73d421"
     }
     Frame {
         msec: 3696
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "1c5e5da874ae95548431677246c80734"
     }
     Frame {
         msec: 3712
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3728
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3744
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3760
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3776
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3792
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3808
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3824
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3840
@@ -1078,1802 +1222,106 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3872
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3888
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3904
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3920
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3936
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3952
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3968
-        hash: "0cf213791ef1263f9dfc867df96e8211"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 3984
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4000
-        hash: "a2386a0135e8ffd9f2ac12345ede3553"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4016
-        hash: "9550cdc0032bc3ea0a611f2584f43cca"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4032
-        hash: "3f39909102a04f0e41a97b10dde4425a"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4048
-        hash: "535d56a4d450cf0222f94573a88bbf80"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4064
-        hash: "c4b782cfb9399689b0cbfc2a97305984"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4080
-        hash: "23604b04198d53e0ba4a0955d8bcf124"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4096
-        hash: "a440962d680f70eb47af38a91390b8c0"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4112
-        hash: "da4b079f00248a073ce49f749ff0cc77"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4128
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4144
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4160
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4176
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4192
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4208
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4224
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4240
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
     Frame {
         msec: 4256
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4272
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4288
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4304
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4320
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4336
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4352
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4368
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4384
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4400
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4416
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4432
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4448
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4464
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4480
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4496
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4512
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4528
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4544
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4560
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4576
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4592
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4608
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4624
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4640
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4656
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4672
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4688
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4704
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4720
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4736
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4752
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4768
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4784
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4800
-        image: "test3.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4832
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4848
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4864
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4880
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4896
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4912
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4928
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4944
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4960
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4976
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 4992
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 5008
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 5024
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 5040
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 5056
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 5072
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 5088
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Frame {
-        msec: 5104
-        hash: "861a8438a60e8a937d96f6b11fa1e3b3"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5120
-        hash: "58be5253b74ac1cecf08714e670e30af"
-    }
-    Frame {
-        msec: 5136
-        hash: "a8e15f6e28a67941730f9cfe8ea7f0ff"
-    }
-    Frame {
-        msec: 5152
-        hash: "f1bfd2e2cd3a3ff08ae36e785d33e626"
-    }
-    Frame {
-        msec: 5168
-        hash: "b61fd5c58ddaf806e72d77bed92e91f3"
-    }
-    Frame {
-        msec: 5184
-        hash: "f192f6b779fa6bdfd4bc9c8671dd3147"
-    }
-    Frame {
-        msec: 5200
-        hash: "1cf034cfdfe3cafa832e28950c90d67b"
-    }
-    Frame {
-        msec: 5216
-        hash: "b0d2223f7f2c302784654f03cb3a5c1c"
-    }
-    Frame {
-        msec: 5232
-        hash: "19d089ac37fd42c1be99facd38a954e3"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5248
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5264
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5280
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5296
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5312
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5328
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5344
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5360
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5376
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5392
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5408
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5424
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5440
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5456
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5472
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5488
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5504
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5520
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5536
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5552
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5568
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5584
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5600
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5616
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5632
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5648
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5664
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5680
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5696
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Frame {
-        msec: 5712
-        hash: "0cf213791ef1263f9dfc867df96e8211"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5728
-        hash: "51db47388acad98d18a8a2aaca279dba"
-    }
-    Frame {
-        msec: 5744
-        hash: "c83747a4356fa12593020452dbf43fe8"
-    }
-    Frame {
-        msec: 5760
-        image: "test3.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "39d476722de92703d0a2259b5c62554e"
-    }
-    Frame {
-        msec: 5792
-        hash: "3f01e465470c3d5ab58b52f3e1517374"
-    }
-    Frame {
-        msec: 5808
-        hash: "63570753ba8c5f1525bf4cee38e8cad8"
-    }
-    Frame {
-        msec: 5824
-        hash: "31beab91ef4cadcf0b379b32786530ac"
-    }
-    Frame {
-        msec: 5840
-        hash: "46cd2e22eb4ef988752e2b3441bdd450"
-    }
-    Frame {
-        msec: 5856
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5872
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 5888
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 5904
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 5920
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 5936
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 5952
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 5968
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 5984
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6000
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6016
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6032
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6048
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6064
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6080
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6096
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6112
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6128
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6144
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6160
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6176
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6192
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6208
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6224
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6240
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6256
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Frame {
-        msec: 6272
-        hash: "3e44d7064e55c510401b5008a06d9b82"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6288
-        hash: "78c4aaf2427e0aa9b6d11ddf95df55f7"
-    }
-    Frame {
-        msec: 6304
-        hash: "d4859df2de6afa90c1997b1b4d6448ab"
-    }
-    Frame {
-        msec: 6320
-        hash: "f885e6a8cc09d06985a83f60e29a0a34"
-    }
-    Frame {
-        msec: 6336
-        hash: "41f27dbf80b0bc00498962162a5fe9db"
-    }
-    Frame {
-        msec: 6352
-        hash: "41800797032deeed5ccc87375b4093cb"
-    }
-    Frame {
-        msec: 6368
-        hash: "253276d23d8a0f195155361a27403496"
-    }
-    Frame {
-        msec: 6384
-        hash: "274bf40aacababde8fde71abf065d1aa"
-    }
-    Frame {
-        msec: 6400
-        hash: "86071a6486d35d3c10f318ab6bac7577"
-    }
-    Frame {
-        msec: 6416
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6432
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6448
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6464
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6480
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6496
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6512
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6528
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6544
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6560
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6576
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6592
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6608
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6624
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6640
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6656
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6672
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6688
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6704
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6720
-        image: "test3.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6752
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6768
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6784
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6800
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6816
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6832
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Frame {
-        msec: 6848
-        hash: "f75305426b87e1cdc325ae6668367be9"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6864
-        hash: "eea514e956369c55f9fe9bfc5b8bbda4"
-    }
-    Frame {
-        msec: 6880
-        hash: "b28436abb5ce17310b63ed96a7034000"
-    }
-    Frame {
-        msec: 6896
-        hash: "40c656f467200785a951dd8f98cf28f5"
-    }
-    Frame {
-        msec: 6912
-        hash: "38c6c6b29c9a7f0eba87a538a336c338"
-    }
-    Frame {
-        msec: 6928
-        hash: "b3f939577616f8ded1e11ee6e6dce882"
-    }
-    Frame {
-        msec: 6944
-        hash: "d72b00208712f039a5d7a06fbfacd4bd"
-    }
-    Frame {
-        msec: 6960
-        hash: "c7a079a37f6bd7a8da706e6ba5d048ee"
-    }
-    Frame {
-        msec: 6976
-        hash: "561cdf098bdc35fc852fbe8fff2471e2"
-    }
-    Frame {
-        msec: 6992
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7008
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7024
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7040
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7056
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7072
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7088
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7104
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7120
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7136
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7152
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7168
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7184
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7200
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7216
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7232
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7248
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7264
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7280
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7296
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7312
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7328
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7344
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7360
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7376
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7392
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7408
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7424
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Frame {
-        msec: 7440
-        hash: "0461d0e31648d2c155bee0145094c153"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7456
-        hash: "096530df53ed21214cf93381ac0d23ea"
-    }
-    Frame {
-        msec: 7472
-        hash: "36e7cee0725fb16c5d7e08875a3b88f7"
-    }
-    Frame {
-        msec: 7488
-        hash: "a2b68c7e9e4ef04c1429190d01a3288b"
-    }
-    Frame {
-        msec: 7504
-        hash: "6ee23f5d2c0ddc21499c8685ae46df64"
-    }
-    Frame {
-        msec: 7520
-        hash: "dc423d32154882b99b7bde596697c83a"
-    }
-    Frame {
-        msec: 7536
-        hash: "e82852d1d2a21f67029870601b00b124"
-    }
-    Frame {
-        msec: 7552
-        hash: "7cd2773c33d7f34feb3b1e4752f63753"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7568
-        hash: "2371f0ddf1b0ddcdb36f24e72b62d3a5"
-    }
-    Frame {
-        msec: 7584
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7600
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7616
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7632
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7648
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7664
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7680
-        image: "test3.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7712
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7728
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7744
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7760
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7776
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7792
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7808
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7824
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7840
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7856
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7872
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7888
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7904
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7920
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7936
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7952
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Frame {
-        msec: 7968
-        hash: "113dd40f9b5c9869ad04a00dda9078c6"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7984
-        hash: "93fd3abe0b99ed76d880f6f059636335"
-    }
-    Frame {
-        msec: 8000
-        hash: "a273ec355c79968013c70aca1b2d5737"
-    }
-    Frame {
-        msec: 8016
-        hash: "6b2df83c0645530ca007cde136838725"
-    }
-    Frame {
-        msec: 8032
-        hash: "47d5ed89f7e9c89df33bab14ca967f77"
-    }
-    Frame {
-        msec: 8048
-        hash: "c777e0d1a1f03e7a1bc16483f98c0622"
-    }
-    Frame {
-        msec: 8064
-        hash: "ac7e693d7dbc8e8ff2318cb611b68b76"
-    }
-    Frame {
-        msec: 8080
-        hash: "593e9711ae94a5b4f49544e0cf26d188"
-    }
-    Frame {
-        msec: 8096
-        hash: "afce51158cb19dd6ae8c72ce19964251"
-    }
-    Frame {
-        msec: 8112
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8128
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8144
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8160
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8176
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8192
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8208
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8224
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8240
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8256
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8272
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8288
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8304
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8320
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8336
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8352
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8368
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8384
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8400
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8416
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8432
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8448
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8464
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8480
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Frame {
-        msec: 8496
-        hash: "30c5f9005238542c83b2d994cb61de16"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8512
-        hash: "136c689aca9aa0cf957035137a926653"
-    }
-    Frame {
-        msec: 8528
-        hash: "b7418e46bca4bc8c953c15b03c23ec89"
-    }
-    Frame {
-        msec: 8544
-        hash: "e99575fe130e741f13329704303b76ca"
-    }
-    Frame {
-        msec: 8560
-        hash: "a2b7d528f9c145c4db0845bc76b3571f"
-    }
-    Frame {
-        msec: 8576
-        hash: "77f8beccd0134b8991ddb2ac92d64ecb"
-    }
-    Frame {
-        msec: 8592
-        hash: "fc359bc56852093020084af44987746a"
-    }
-    Frame {
-        msec: 8608
-        hash: "9f3479a702bc79062fff916678e974f1"
-    }
-    Frame {
-        msec: 8624
-        hash: "55c8c91ff26671f9f3049f1e1aaf5958"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8640
-        image: "test3.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8672
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8688
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8704
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8720
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8736
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8752
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8768
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8784
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8800
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8816
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8832
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8848
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8864
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8880
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8896
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8912
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8928
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8944
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8960
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8976
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 8992
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 9008
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 9024
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 9040
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Frame {
-        msec: 9056
-        hash: "216a02433edb100e6ff3db4944f6b061"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9072
-        hash: "367ee34ab6a6cb0197e064db85638be7"
-    }
-    Frame {
-        msec: 9088
-        hash: "c61db7f2c0402a63efe779bec816a7db"
-    }
-    Frame {
-        msec: 9104
-        hash: "29d4d2679a502a1cb8a21807c43153c2"
-    }
-    Frame {
-        msec: 9120
-        hash: "3f531d4111efbbac256d4281db1fdeba"
-    }
-    Frame {
-        msec: 9136
-        hash: "9f343d8b4dc12cc7ab5ae1ff08067baf"
-    }
-    Frame {
-        msec: 9152
-        hash: "eb29b7d6ef2b5507425b2c30ddb58fa8"
-    }
-    Frame {
-        msec: 9168
-        hash: "883c0d35567deb6de9125441da89a1fe"
-    }
-    Frame {
-        msec: 9184
-        hash: "7c25e95ea2b38288b5ba5737108ef5d1"
-    }
-    Frame {
-        msec: 9200
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9216
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9232
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9248
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9264
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9280
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9296
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9312
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9328
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9344
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9360
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9376
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9392
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9408
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9424
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9440
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9456
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9472
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9488
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9504
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9520
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9536
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9552
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9568
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9584
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9600
-        image: "test3.9.png"
-    }
-    Frame {
-        msec: 9616
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9632
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9648
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9664
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9680
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9696
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9712
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9728
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9744
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9760
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9776
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9792
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9808
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9824
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9840
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9856
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9872
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9888
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9904
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9920
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9936
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9952
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9968
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 9984
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10000
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10016
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10032
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10048
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10064
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10080
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10096
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10112
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10128
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10144
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10160
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10176
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10192
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10208
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10224
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10240
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10256
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10272
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10288
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10304
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10320
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10336
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10352
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10368
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 10384
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10400
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10416
-        hash: "f192b84337784a6d31c309af7e32b5f7"
-    }
-    Frame {
-        msec: 10432
-        hash: "f192b84337784a6d31c309af7e32b5f7"
+        hash: "4a753a2b626eaf8336cd5e5d04d05d5b"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/focusscope/test.qml b/tests/auto/declarative/qmlvisual/focusscope/test.qml
index 6b2ee25..7342e35 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/test.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test.qml
@@ -1,9 +1,16 @@
 import QtQuick 1.0
 
+/*
+    Blue border indicates scoped focus
+    Black border indicates NOT scoped focus
+    Red box indicates active focus
+    Use arrow keys to navigate
+    Press "9" to print currently focused item
+*/
 Rectangle {
     color: "white"
-    width: 800
-    height: 600
+    width: 480
+    height: 480
 
     Keys.onDigit9Pressed: console.log("Error - Root")
 
@@ -55,8 +62,6 @@ Rectangle {
         KeyNavigation.down: item3
     }
 
-    Text { x:100; y:170; text: "Blue border indicates scoped focus\nBlack border indicates NOT scoped focus\nRed box indicates active focus\nUse arrow keys to navigate\nPress \"9\" to print currently focused item" }
-
     Rectangle {
         id: item3
         x: 10; y: 300
diff --git a/tests/auto/declarative/qmlvisual/focusscope/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/test2.qml
index 4df75cf..072eddb 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/test2.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test2.qml
@@ -2,35 +2,33 @@ import QtQuick 1.0
 
 Rectangle {
     color: "white"
-    width: 800
-    height: 600
-
-    Text { text: "All five rectangles should be red" }
+    width: 400
+    height: 50
 
+    //All five rectangles should be red
     FocusScope {
-        y: 100
         focus: true
-        Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
+        Rectangle { width: 40; height: 40; color: parent.activeFocus?"red":"blue" }
 
         FocusScope {
-            y: 100
+            x: 80
             focus: true
-            Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
+            Rectangle { width: 40; height: 40; color: parent.activeFocus?"red":"blue" }
 
             FocusScope {
-                y: 100
+                x: 80
                 focus: true
-                Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
+                Rectangle { width: 40; height: 40; color: parent.activeFocus?"red":"blue" }
 
                 FocusScope {
-                    y: 100
+                    x: 80
                     focus: true
-                    Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
+                    Rectangle { width: 40; height: 40; color: parent.activeFocus?"red":"blue" }
 
                     FocusScope {
-                        y: 100
+                        x: 80
                         focus: true
-                        Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
+                        Rectangle { width: 40; height: 40; color: parent.activeFocus?"red":"blue" }
                     }
                 }
             }
diff --git a/tests/auto/declarative/qmlvisual/focusscope/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/test3.qml
index 184763a..01fb580 100644
--- a/tests/auto/declarative/qmlvisual/focusscope/test3.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test3.qml
@@ -1,9 +1,14 @@
 import QtQuick 1.0
 
+/*
+    Currently selected element should be red
+    Pressing "9" should print the number of the currently selected item
+    Be sure to scroll all the way to the right, pause, and then all the way to the left
+*/
 Rectangle {
     color: "white"
-    width: 800
-    height: 600
+    width: 400
+    height: 100
 
     ListModel {
         id: model
@@ -45,8 +50,4 @@ Rectangle {
     }
 
 
-    Text {
-        y: 100; x: 50
-        text: "Currently selected element should be red\nPressing \"9\" should print the number of the currently selected item\nBe sure to scroll all the way to the right, pause, and then all the way to the left."
-    }
 }
-- 
cgit v0.12


From 8c183dc88d4ba0c14e29433294a6885f29ffc36c Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 28 Oct 2010 11:35:53 +0200
Subject: Use QVarLengthArray to store accumulator data.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/dithering.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/dithering.cpp b/src/plugins/graphicssystems/meego/dithering.cpp
index ba6b99b..b50826c 100644
--- a/src/plugins/graphicssystems/meego/dithering.cpp
+++ b/src/plugins/graphicssystems/meego/dithering.cpp
@@ -54,6 +54,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <QVarLengthArray>
 
 // Gets a component (red = 1, green = 2...) from a RGBA data structure.
 // data is unsigned char. stride is the number of bytes per line.
@@ -95,7 +96,11 @@ unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int h
     int x, y, c; // Pixel we're processing. c is component number (0, 1, 2 for r, b, b)
     short component[3]; // Stores the new components (r, g, b) for pixel produced during conversion
     short diff; // The difference between the converted value and the original one. To be accumulated.
-    short accumulator[3][width * 2]; // Three acumulators for r, g, b. Each accumulator is two lines.
+    QVarLengthArray <short> accumulatorData(3 * width * 2); // Data for three acumulators for r, g, b. Each accumulator is two lines.
+    short *accumulator[3]; // Helper for accessing the accumulator on a per-channel basis more easily.
+    accumulator[0] = accumulatorData.data();
+    accumulator[1] = accumulatorData.data() + width;
+    accumulator[2] = accumulatorData.data() + (width * 2);
 
     // Produce the conversion lookup tables.
     for (i = 0; i < 256; i++) {
@@ -195,7 +200,12 @@ unsigned short* convertARGB32_to_RGBA4444(const unsigned char *in, int width, in
     int x, y, c; // Pixel we're processing. c is component number (0, 1, 2, 3 for r, b, b, a)
     short component[4]; // Stores the new components (r, g, b, a) for pixel produced during conversion
     short diff; // The difference between the converted value and the original one. To be accumulated.
-    short accumulator[4][width * 2]; // Four acumulators for r, g, b, a. Each accumulator is two lines.
+    QVarLengthArray <short> accumulatorData(4 * width * 2); // Data for three acumulators for r, g, b. Each accumulator is two lines.
+    short *accumulator[4]; // Helper for accessing the accumulator on a per-channel basis more easily.
+    accumulator[0] = accumulatorData.data();
+    accumulator[1] = accumulatorData.data() + width;
+    accumulator[2] = accumulatorData.data() + (width * 2);
+    accumulator[3] = accumulatorData.data() + (width * 3);
 
     // Produce the conversion lookup tables.
     for (i = 0; i < 256; i++) {
-- 
cgit v0.12


From 28bd0c6568aefa552c5e37a4e2ef98969c68d0b4 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 28 Oct 2010 11:35:54 +0200
Subject: Do not support QImage::Format_ARGB32 in meego gfx for egl images.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It was a bug/mistake to support that.

Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 96fbd6c..a633e2f 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -151,9 +151,8 @@ void QMeeGoGraphicsSystem::setTranslucent(bool translucent)
 QPixmapData *QMeeGoGraphicsSystem::pixmapDataFromEGLSharedImage(Qt::HANDLE handle, const QImage &softImage)
 {
     if (softImage.format() != QImage::Format_ARGB32_Premultiplied &&
-        softImage.format() != QImage::Format_ARGB32 &&
         softImage.format() != QImage::Format_RGB32) {
-        qFatal("For egl shared images, the soft image has to be ARGB32, ARGB32_Premultiplied or RGB32");
+        qFatal("For egl shared images, the soft image has to be ARGB32_Premultiplied or RGB32");
         return NULL;
     }
     
-- 
cgit v0.12


From 47c12e2a4cf135faf5ac58d54d8fe87068b35d3d Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani.hautakangas@nokia.com>
Date: Thu, 28 Oct 2010 11:27:02 +0300
Subject: Fallback to vgWritePixels in drawPixmap.

Use vgWritePixels, if possible, in case where VGImage
for QPixmap can't be allocated due to low GPU memory
situation. This patch also renames some VG paint engine
internal functions to clarify their purpose.

Task-number: QT-3589
Reviewed-by: Jason Barron
---
 src/openvg/qpaintengine_vg.cpp | 86 +++++++++++++++++++++++++++++++++++++-----
 src/openvg/qpaintengine_vg_p.h |  1 +
 src/openvg/qpixmapdata_vg.cpp  | 45 ++++++++++++++--------
 src/openvg/qpixmapdata_vg_p.h  |  6 ++-
 src/openvg/qvg_symbian.cpp     |  3 +-
 5 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index ce9d11a..9df32d9 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -55,6 +55,8 @@
 #include <QtGui/private/qfontengine_p.h>
 #include <QtGui/private/qpainterpath_p.h>
 #include <QtGui/private/qstatictext_p.h>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
 #include <QtCore/qmath.h>
 #include <QDebug>
 #include <QSet>
@@ -3060,6 +3062,21 @@ void qt_vg_drawVGImageStencil
     vgDrawImage(vgImg);
 }
 
+bool QVGPaintEngine::canVgWritePixels(const QImage &image) const
+{
+    Q_D(const QVGPaintEngine);
+    // vgWritePixels ignores masking, blending and xforms so we can only use it if
+    // ALL of the following conditions are true:
+    // - It is a simple translate, or a scale of -1 on the y-axis (inverted)
+    // - The opacity is totally opaque
+    // - The composition mode is "source" OR "source over" provided the image is opaque
+    return ( d->imageTransform.type() <= QTransform::TxScale
+            && d->imageTransform.m11() == 1.0 && qAbs(d->imageTransform.m22()) == 1.0)
+            && d->opacity == 1.0f
+            && (d->blendMode == VG_BLEND_SRC || (d->blendMode == VG_BLEND_SRC_OVER &&
+                                                !image.hasAlphaChannel()));
+}
+
 void QVGPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr)
 {
     QPixmapData *pd = pm.pixmapData();
@@ -3074,9 +3091,18 @@ void QVGPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF
             drawVGImage(d, r, vgpd->toVGImage(), vgpd->size(), sr);
         else
             drawVGImage(d, r, vgpd->toVGImage(d->opacity), vgpd->size(), sr);
-    } else {
-        drawImage(r, *(pd->buffer()), sr, Qt::AutoColor);
+
+        if(!vgpd->failedToAlloc)
+            return;
+
+        // try to reallocate next time if reasonable small pixmap
+        QSize screenSize = QApplication::desktop()->screenGeometry().size();
+        if (pm.size().width() <= screenSize.width()
+            && pm.size().height() <= screenSize.height())
+            vgpd->failedToAlloc = false;
     }
+
+    drawImage(r, *(pd->buffer()), sr, Qt::AutoColor);
 }
 
 void QVGPaintEngine::drawPixmap(const QPointF &pos, const QPixmap &pm)
@@ -3093,9 +3119,18 @@ void QVGPaintEngine::drawPixmap(const QPointF &pos, const QPixmap &pm)
             drawVGImage(d, pos, vgpd->toVGImage());
         else
             drawVGImage(d, pos, vgpd->toVGImage(d->opacity));
-    } else {
-        drawImage(pos, *(pd->buffer()));
+
+        if (!vgpd->failedToAlloc)
+            return;
+
+        // try to reallocate next time if reasonable small pixmap
+        QSize screenSize = QApplication::desktop()->screenGeometry().size();
+        if (pm.size().width() <= screenSize.width()
+            && pm.size().height() <= screenSize.height())
+            vgpd->failedToAlloc = false;
     }
+
+    drawImage(pos, *(pd->buffer()));
 }
 
 void QVGPaintEngine::drawImage
@@ -3116,9 +3151,31 @@ void QVGPaintEngine::drawImage
                         QRectF(QPointF(0, 0), sr.size()));
         }
     } else {
-        // Monochrome images need to use the vgChildImage() path.
-        vgImg = toVGImage(image, flags);
-        drawVGImage(d, r, vgImg, image.size(), sr);
+        if (canVgWritePixels(image) && (r.size() == sr.size()) && !flags) {
+            // Optimization for straight blits, no blending
+            int x = sr.x();
+            int y = sr.y();
+            int bpp = image.depth() >> 3; // bytes
+            int offset = 0;
+            int bpl = image.bytesPerLine();
+            if (d->imageTransform.m22() < 0) {
+                // inverted
+                offset = ((y + sr.height()) * bpl) - ((image.width() - x) * bpp);
+                bpl = -bpl;
+            } else {
+                offset = (y * bpl) + (x * bpp);
+            }
+            const uchar *bits = image.constBits() + offset;
+
+            QPointF mapped = d->imageTransform.map(r.topLeft());
+            vgWritePixels(bits, bpl, qt_vg_image_to_vg_format(image.format()),
+                        mapped.x(), mapped.y() - sr.height(), r.width(), r.height());
+            return;
+        } else {
+            // Monochrome images need to use the vgChildImage() path.
+            vgImg = toVGImage(image, flags);
+            drawVGImage(d, r, vgImg, image.size(), sr);
+        }
     }
     vgDestroyImage(vgImg);
 }
@@ -3127,10 +3184,21 @@ void QVGPaintEngine::drawImage(const QPointF &pos, const QImage &image)
 {
     Q_D(QVGPaintEngine);
     VGImage vgImg;
-    if (d->simpleTransform || d->opacity == 1.0f)
+    if (canVgWritePixels(image)) {
+        // Optimization for straight blits, no blending
+        bool inverted = (d->imageTransform.m22() < 0);
+        const uchar *bits = inverted ? image.constBits() + image.byteCount() : image.constBits();
+        int bpl = inverted ? -image.bytesPerLine() : image.bytesPerLine();
+
+        QPointF mapped = d->imageTransform.map(pos);
+        vgWritePixels(bits, bpl, qt_vg_image_to_vg_format(image.format()),
+                             mapped.x(), mapped.y() - image.height(), image.width(), image.height());
+        return;
+    } else if (d->simpleTransform || d->opacity == 1.0f) {
         vgImg = toVGImage(image);
-    else
+    } else {
         vgImg = toVGImageWithOpacity(image, d->opacity);
+    }
     drawVGImage(d, pos, vgImg);
     vgDestroyImage(vgImg);
 }
diff --git a/src/openvg/qpaintengine_vg_p.h b/src/openvg/qpaintengine_vg_p.h
index 75cf053..dc98137 100644
--- a/src/openvg/qpaintengine_vg_p.h
+++ b/src/openvg/qpaintengine_vg_p.h
@@ -170,6 +170,7 @@ private:
     bool isDefaultClipRegion(const QRegion& region);
     bool isDefaultClipRect(const QRect& rect);
     bool clearRect(const QRectF &rect, const QColor &color);
+    bool canVgWritePixels(const QImage &image) const;
 };
 
 QT_END_NAMESPACE
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index e8ec333..724d06d 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -65,6 +65,7 @@ QVGPixmapData::QVGPixmapData(PixelType type)
     recreate = true;
     inImagePool = false;
     inLRU = false;
+    failedToAlloc = false;
 #if !defined(QT_NO_EGL)
     context = 0;
     qt_vg_register_pixmap(this);
@@ -74,13 +75,13 @@ QVGPixmapData::QVGPixmapData(PixelType type)
 
 QVGPixmapData::~QVGPixmapData()
 {
-    destroyImageAndContext();
+    destroyVGImageAndVGContext();
 #if !defined(QT_NO_EGL)
     qt_vg_unregister_pixmap(this);
 #endif
 }
 
-void QVGPixmapData::destroyImages()
+void QVGPixmapData::destroyVGImages()
 {
     if (inImagePool) {
         QVGImagePool *pool = QVGImagePool::instance();
@@ -99,23 +100,23 @@ void QVGPixmapData::destroyImages()
     inImagePool = false;
 }
 
-void QVGPixmapData::destroyImageAndContext()
+void QVGPixmapData::destroyVGImageAndVGContext()
 {
     if (vgImage != VG_INVALID_HANDLE) {
         // We need to have a context current to destroy the image.
 #if !defined(QT_NO_EGL)
         if (context->isCurrent()) {
-            destroyImages();
+            destroyVGImages();
         } else {
             // We don't currently have a widget surface active, but we
             // need a surface to make the context current.  So use the
             // shared pbuffer surface instead.
             context->makeCurrent(qt_vg_shared_surface());
-            destroyImages();
+            destroyVGImages();
             context->lazyDoneCurrent();
         }
 #else
-        destroyImages();
+        destroyVGImages();
 #endif
     }
 #if !defined(QT_NO_EGL)
@@ -155,6 +156,9 @@ void QVGPixmapData::resize(int wid, int ht)
 void QVGPixmapData::fromImage
         (const QImage &image, Qt::ImageConversionFlags flags)
 {
+    if(image.isNull())
+        return;
+
     QImage img = image;
     createPixmapForImage(img, flags, false);
 }
@@ -203,10 +207,19 @@ void QVGPixmapData::createPixmapForImage(QImage &image, Qt::ImageConversionFlags
     else
         resize(image.width(), image.height());
 
-    if (inPlace && image.data_ptr()->convertInPlace(sourceFormat(), flags))
+    QImage::Format format = sourceFormat();
+    int d = image.depth();
+    if (d == 1 || d == 16 || d == 24 || (d == 32 && !image.hasAlphaChannel()))
+        format = QImage::Format_RGB32;
+    else if (!(flags & Qt::NoOpaqueDetection) && const_cast<QImage &>(image).data_ptr()->checkForAlphaPixels())
+        format = sourceFormat();
+    else
+        format = QImage::Format_RGB32;
+
+    if (inPlace && image.data_ptr()->convertInPlace(format, flags))
         source = image;
     else
-        source = image.convertToFormat(sourceFormat());
+        source = image.convertToFormat(format);
 
     recreate = true;
 }
@@ -278,7 +291,7 @@ QPaintEngine* QVGPixmapData::paintEngine() const
 
 VGImage QVGPixmapData::toVGImage()
 {
-    if (!isValid())
+    if (!isValid() || failedToAlloc)
         return VG_INVALID_HANDLE;
 
 #if !defined(QT_NO_EGL)
@@ -288,17 +301,19 @@ VGImage QVGPixmapData::toVGImage()
 #endif
 
     if (recreate && prevSize != QSize(w, h))
-        destroyImages();
+        destroyVGImages();
     else if (recreate)
         cachedOpacity = -1.0f;  // Force opacity image to be refreshed later.
 
     if (vgImage == VG_INVALID_HANDLE) {
         vgImage = QVGImagePool::instance()->createImageForPixmap
-            (VG_sARGB_8888_PRE, w, h, VG_IMAGE_QUALITY_FASTER, this);
+            (qt_vg_image_to_vg_format(source.format()), w, h, VG_IMAGE_QUALITY_FASTER, this);
 
         // Bail out if we run out of GPU memory - try again next time.
-        if (vgImage == VG_INVALID_HANDLE)
+        if (vgImage == VG_INVALID_HANDLE) {
+            failedToAlloc = true;
             return VG_INVALID_HANDLE;
+        }
 
         inImagePool = true;
     } else if (inImagePool) {
@@ -309,7 +324,7 @@ VGImage QVGPixmapData::toVGImage()
         vgImageSubData
             (vgImage,
              source.constBits(), source.bytesPerLine(),
-             VG_sARGB_8888_PRE, 0, 0, w, h);
+             qt_vg_image_to_vg_format(source.format()), 0, 0, w, h);
     }
 
     recreate = false;
@@ -378,7 +393,7 @@ void QVGPixmapData::hibernate()
         return;
 
     forceToImage();
-    destroyImageAndContext();
+    destroyVGImageAndVGContext();
 }
 
 void QVGPixmapData::reclaimImages()
@@ -386,7 +401,7 @@ void QVGPixmapData::reclaimImages()
     if (!inImagePool)
         return;
     forceToImage();
-    destroyImages();
+    destroyVGImages();
 }
 
 Q_DECL_IMPORT extern int qt_defaultDpiX();
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index 114d545..b8f01eb 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -143,7 +143,9 @@ private:
     QVGPixmapData *nextLRU;
     QVGPixmapData *prevLRU;
     bool inLRU;
+    bool failedToAlloc;
     friend class QVGImagePool;
+    friend class QVGPaintEngine;
 
 #if !defined(QT_NO_EGL)
     QVGPixmapData *next;
@@ -169,8 +171,8 @@ protected:
     void forceToImage();
     QImage::Format sourceFormat() const;
 
-    void destroyImageAndContext();
-    void destroyImages();
+    void destroyVGImageAndVGContext();
+    void destroyVGImages();
 };
 
 QT_END_NAMESPACE
diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp
index 41b35fc..b6bf858 100644
--- a/src/openvg/qvg_symbian.cpp
+++ b/src/openvg/qvg_symbian.cpp
@@ -144,7 +144,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
     if (type == QPixmapData::SgImage && pixmap) {
 #if defined(QT_SYMBIAN_SUPPORTS_SGIMAGE) && !defined(QT_NO_EGL)
         RSgImage *sgImage = reinterpret_cast<RSgImage*>(pixmap);
-        destroyImages();
+        destroyVGImages();
         prevSize = QSize();
 
         VGImage vgImage = sgImageToVGImage(context, *sgImage);
@@ -164,7 +164,6 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
         CFbsBitmap *bitmap = reinterpret_cast<CFbsBitmap*>(pixmap);
 
         bool deleteSourceBitmap = false;
-
 #ifdef Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
 
         // Rasterize extended bitmaps
-- 
cgit v0.12


From 55497edc83121317078d62083a835f2b794b37e4 Mon Sep 17 00:00:00 2001
From: Titta Heikkala <EXT-Titta.2.Heikkala@nokia.com>
Date: Thu, 28 Oct 2010 10:31:41 +0300
Subject: Fixed crash with QClipboard in Symbian^3

QClipboard now returns copied data outside TRAP to prevent TRAP levels
to get crossed.

Task-number: QTBUG-14790
Reviewed-by: Janne Koskinen

Merge-request: 897
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
---
 src/gui/kernel/qclipboard_s60.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index c9b1d23..73280b2 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -257,18 +257,14 @@ const QMimeData* QClipboard::mimeData(Mode mode) const
                 }
             }
             CleanupStack::PopAndDestroy(cb);
-            if (dataExists) {
-                return d->source();
-            }
-            else {
-                return 0;
-            }
-
         });
         if (err != KErrNone){
             qDebug()<< "clipboard is empty/err: " << err;
         }
 
+        if (dataExists) {
+            return d->source();
+        }
     }
     return 0;
 }
-- 
cgit v0.12


From 746f4b50e9c13c720162f3bcc8795b7ef772fbba Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Thu, 28 Oct 2010 12:27:49 +0200
Subject: QScriptValue::construct(): Don't crash if function throws non-Object

If an exception occurs, we should ignore the result of
JSC::construct() and return the exception value, even if
the exception is not an object.
This makes the behavior match the documentation: "Calling
construct() can cause an exception to occur in the script
engine; in that case, construct() returns the value that
was thrown".

Task-number: QTBUG-14801
Reviewed-by: Jedrzej Nowacki
---
 src/script/api/qscriptvalue.cpp              | 13 ++++++++-----
 tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 25 +++++++++++++++++++++++++
 tests/auto/qscriptvalue/tst_qscriptvalue.h   |  1 +
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index f6390bb..f494106 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1736,10 +1736,12 @@ QScriptValue QScriptValue::construct(const QScriptValueList &args)
 
     JSC::JSValue savedException;
     QScriptEnginePrivate::saveException(exec, &savedException);
-    JSC::JSObject *result = JSC::construct(exec, callee, constructType, constructData, jscArgs);
+    JSC::JSValue result;
+    JSC::JSObject *newObject = JSC::construct(exec, callee, constructType, constructData, jscArgs);
     if (exec->hadException()) {
-        result = JSC::asObject(exec->exception());
+        result = exec->exception();
     } else {
+        result = newObject;
         QScriptEnginePrivate::restoreException(exec, savedException);
     }
     return d->engine->scriptValueFromJSCValue(result);
@@ -1796,11 +1798,12 @@ QScriptValue QScriptValue::construct(const QScriptValue &arguments)
 
     JSC::JSValue savedException;
     QScriptEnginePrivate::saveException(exec, &savedException);
-    JSC::JSObject *result = JSC::construct(exec, callee, constructType, constructData, applyArgs);
+    JSC::JSValue result;
+    JSC::JSObject *newObject = JSC::construct(exec, callee, constructType, constructData, applyArgs);
     if (exec->hadException()) {
-        if (exec->exception().isObject())
-            result = JSC::asObject(exec->exception());
+        result = exec->exception();
     } else {
+        result = newObject;
         QScriptEnginePrivate::restoreException(exec, savedException);
     }
     return d->engine->scriptValueFromJSCValue(result);
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 83a3388..639df36 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -2739,6 +2739,31 @@ void tst_QScriptValue::construct()
     QVERIFY(!QScriptValue(QScriptValue::NullValue).construct().isValid());
 }
 
+void tst_QScriptValue::construct_constructorThrowsPrimitive()
+{
+    QScriptEngine eng;
+    QScriptValue fun = eng.evaluate("(function() { throw 123; })");
+    QVERIFY(fun.isFunction());
+    // construct(QScriptValueList)
+    {
+        QScriptValue ret = fun.construct();
+        QVERIFY(ret.isNumber());
+        QCOMPARE(ret.toNumber(), 123.0);
+        QVERIFY(eng.hasUncaughtException());
+        QVERIFY(ret.strictlyEquals(eng.uncaughtException()));
+        eng.clearExceptions();
+    }
+    // construct(QScriptValue)
+    {
+        QScriptValue ret = fun.construct(eng.newArray());
+        QVERIFY(ret.isNumber());
+        QCOMPARE(ret.toNumber(), 123.0);
+        QVERIFY(eng.hasUncaughtException());
+        QVERIFY(ret.strictlyEquals(eng.uncaughtException()));
+        eng.clearExceptions();
+    }
+}
+
 void tst_QScriptValue::lessThan_old()
 {
     QScriptEngine eng;
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h
index 8bfaa6a..462749a 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h
@@ -219,6 +219,7 @@ private slots:
     void getSetScriptClass();
     void call();
     void construct();
+    void construct_constructorThrowsPrimitive();
     void castToPointer();
     void prettyPrinter_data();
     void prettyPrinter();
-- 
cgit v0.12


From 8d2fcb26e23d498e3e2efd600ad60a20fdba14c7 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 28 Oct 2010 19:48:22 +0200
Subject: Temporarily remove .def file entries for a little stunt

---
 src/s60installs/bwins/QtGuiu.def | 2 --
 src/s60installs/eabi/QtGuiu.def  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 7cc2752..aacc03a 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12894,6 +12894,4 @@ EXPORTS
 	?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const
 	?maxTextureHeight@QTextureGlyphCache@@UBEHXZ @ 12894 NONAME ; int QTextureGlyphCache::maxTextureHeight(void) const
 	?maxTextureWidth@QTextureGlyphCache@@UBEHXZ @ 12895 NONAME ; int QTextureGlyphCache::maxTextureWidth(void) const
-	?convertToPostscriptFontFamilyName@QFontEngine@@SA?AVQByteArray@@ABV2@@Z @ 12896 NONAME ; class QByteArray QFontEngine::convertToPostscriptFontFamilyName(class QByteArray const &)
-	?lastResortFont@QFont@@QBE?AVQString@@XZ @ 12897 NONAME ; class QString QFont::lastResortFont(void) const
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 4e867a3..4442d33 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12097,6 +12097,4 @@ EXPORTS
 	_ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4
 	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFP13QGraphicsItem @ 12097 NONAME
 	_ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME
-	_ZNK5QFont14lastResortFontEv @ 12099 NONAME
-	_ZN11QFontEngine33convertToPostscriptFontFamilyNameERK10QByteArray @ 12100 NONAME
 
-- 
cgit v0.12


From 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 28 Oct 2010 19:49:55 +0200
Subject: Do not crash on Symbian

The qml debugging enabler in QtDeclarative made any Qt app crash
which used QDeclarative. Reason was that QtDeclarative.dll tried
to directly access (private) writable static data from QtGui.dll.

This patch adds an accessor function for the data to QtGui, and
the crash is gone.

Done-by: Kai Koehne
Reviewed-by: Kai Koehne

Conflicts:

	src/declarative/debugger/qdeclarativedebugservice.cpp
---
 src/declarative/debugger/qdeclarativedebugservice.cpp | 12 ++++++------
 src/gui/kernel/qapplication.cpp                       |  9 +++++++--
 src/gui/kernel/qapplication_p.h                       |  3 ++-
 src/s60installs/bwins/QtGuiu.def                      |  4 +++-
 src/s60installs/eabi/QtGuiu.def                       |  4 +++-
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index b98cd5d..c39da3d 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -204,13 +204,13 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
         bool ok = false;
 
         // format: qmljsdebugger=port:3768[,block]
-        if (!appD->qmljsDebugArguments.isEmpty()) {
+        if (!appD->qmljsDebugArgumentsString().isEmpty()) {
 
-            if (appD->qmljsDebugArguments.indexOf(QLatin1String("port:")) == 0) {
-                int separatorIndex = appD->qmljsDebugArguments.indexOf(QLatin1Char(','));
-                port = appD->qmljsDebugArguments.mid(5, separatorIndex - 5).toInt(&ok);
+            if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
+                int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
+                port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok);
             }
-            block = appD->qmljsDebugArguments.contains(QLatin1String("block"));
+            block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block"));
 
             if (ok) {
                 server = new QDeclarativeDebugServer(port);
@@ -221,7 +221,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
             } else {
                 qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
                                             "Format is -qmljsdebugger=port:<port>[,block]").arg(
-                             appD->qmljsDebugArguments).toAscii().constData());
+                             appD->qmljsDebugArgumentsString()).toAscii().constData());
             }
         }
 #endif
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 3323fbc..6c4004e 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -497,7 +497,7 @@ bool QApplicationPrivate::fade_tooltip = false;
 bool QApplicationPrivate::animate_toolbox = false;
 bool QApplicationPrivate::widgetCount = false;
 bool QApplicationPrivate::load_testability = false;
-QString QApplicationPrivate::qmljsDebugArguments;
+QString QApplicationPrivate::qmljs_debug_arguments;
 #ifdef QT_KEYPAD_NAVIGATION
 #  ifdef Q_OS_SYMBIAN
 Qt::NavigationMode QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadDirectional;
@@ -570,7 +570,7 @@ void QApplicationPrivate::process_cmdline()
         if (arg == "-qdevel" || arg == "-qdebug") {
             // obsolete argument
         } else if (arg.indexOf("-qmljsdebugger=", 0) != -1) {
-            qmljsDebugArguments = QString::fromLocal8Bit(arg.right(arg.length() - 15));
+            qmljs_debug_arguments = QString::fromLocal8Bit(arg.right(arg.length() - 15));
         } else if (arg.indexOf("-style=", 0) != -1) {
             s = QString::fromLocal8Bit(arg.right(arg.length() - 7).toLower());
         } else if (arg == "-style" && i < argc-1) {
@@ -6086,6 +6086,11 @@ QPixmap QApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape)
     return QPixmap();
 }
 
+QString QApplicationPrivate::qmljsDebugArgumentsString()
+{
+    return qmljs_debug_arguments;
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qapplication.cpp"
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 9c5095d..a0e1452 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -446,7 +446,8 @@ public:
     static bool animate_toolbox;
     static bool widgetCount; // Coupled with -widgetcount switch
     static bool load_testability; // Coupled with -testability switch
-    static QString qmljsDebugArguments; // a string containing arguments for js/qml debugging.
+    static QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging.
+    static QString qmljsDebugArgumentsString(); // access string from other libraries
 
 #ifdef Q_WS_MAC
     static bool native_modal_dialog_active;
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index aacc03a..afc89ae 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12890,8 +12890,10 @@ EXPORTS
 	?lastRightBearing@QFontEngine@@IAE?AUQFixed@@ABUQGlyphLayout@@_N@Z @ 12889 NONAME ; struct QFixed QFontEngine::lastRightBearing(struct QGlyphLayout const &, bool)
 	?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@PAVQGraphicsItem@@@Z @ 12890 NONAME ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *, class QGraphicsItem *)
 	?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12891 NONAME ; void QTapAndHoldGesture::setTimeout(int)
-	?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ; class QString QApplicationPrivate::qmljsDebugArguments
+	?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ABSENT ; class QString QApplicationPrivate::qmljsDebugArguments
 	?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const
 	?maxTextureHeight@QTextureGlyphCache@@UBEHXZ @ 12894 NONAME ; int QTextureGlyphCache::maxTextureHeight(void) const
 	?maxTextureWidth@QTextureGlyphCache@@UBEHXZ @ 12895 NONAME ; int QTextureGlyphCache::maxTextureWidth(void) const
+	?qmljs_debug_arguments@QApplicationPrivate@@2VQString@@A @ 12896 NONAME ; class QString QApplicationPrivate::qmljs_debug_arguments
+	?qmljsDebugArgumentsString@QApplicationPrivate@@SA?AVQString@@XZ @ 12897 NONAME ; class QString QApplicationPrivate::qmljsDebugArgumentsString(void)
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 4442d33..aa050f9 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12094,7 +12094,9 @@ EXPORTS
 	_ZN18QTapAndHoldGesture7timeoutEv @ 12093 NONAME
 	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12094 NONAME ABSENT
 	_ZN20QGraphicsItemPrivate14children_clearEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 12095 NONAME
-	_ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4
+	_ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4 ABSENT
 	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFP13QGraphicsItem @ 12097 NONAME
 	_ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME
+	_ZN19QApplicationPrivate21qmljs_debug_argumentsE @ 12099 NONAME DATA 4
+	_ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME
 
-- 
cgit v0.12


From 44f6ed77eb3b80b28ebc967b64a1640347a83060 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 28 Oct 2010 19:52:00 +0200
Subject: Readded .def file entries after a little stunt

---
 src/s60installs/bwins/QtGuiu.def | 2 ++
 src/s60installs/eabi/QtGuiu.def  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index afc89ae..c91b22c 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12896,4 +12896,6 @@ EXPORTS
 	?maxTextureWidth@QTextureGlyphCache@@UBEHXZ @ 12895 NONAME ; int QTextureGlyphCache::maxTextureWidth(void) const
 	?qmljs_debug_arguments@QApplicationPrivate@@2VQString@@A @ 12896 NONAME ; class QString QApplicationPrivate::qmljs_debug_arguments
 	?qmljsDebugArgumentsString@QApplicationPrivate@@SA?AVQString@@XZ @ 12897 NONAME ; class QString QApplicationPrivate::qmljsDebugArgumentsString(void)
+	?convertToPostscriptFontFamilyName@QFontEngine@@SA?AVQByteArray@@ABV2@@Z @ 12898 NONAME ; class QByteArray QFontEngine::convertToPostscriptFontFamilyName(class QByteArray const &)
+	?lastResortFont@QFont@@QBE?AVQString@@XZ @ 12899 NONAME ; class QString QFont::lastResortFont(void) const
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index aa050f9..f772bcc 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12099,4 +12099,6 @@ EXPORTS
 	_ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME
 	_ZN19QApplicationPrivate21qmljs_debug_argumentsE @ 12099 NONAME DATA 4
 	_ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME
+	_ZNK5QFont14lastResortFontEv @ 12101 NONAME
+	_ZN11QFontEngine33convertToPostscriptFontFamilyNameERK10QByteArray @ 12102 NONAME
 
-- 
cgit v0.12


From eea4ef7bcbababd1af07c75e6711f34aaa4b69e5 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 28 Oct 2010 22:10:13 +0200
Subject: Making the buttons less finger unfriendly

I did not dare to apply the same fix to the samegame tutorials,
since those are completely diverged from the demo.
---
 demos/declarative/samegame/SamegameCore/Button.qml | 4 ++--
 demos/declarative/samegame/samegame.qml            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml
index 7fb7b65..140b196 100644
--- a/demos/declarative/samegame/SamegameCore/Button.qml
+++ b/demos/declarative/samegame/SamegameCore/Button.qml
@@ -48,7 +48,7 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
+    width: buttonLabel.width + 20; height: buttonLabel.height + 20
     smooth: true
     border { width: 1; color: Qt.darker(activePalette.button) }
     radius: 8
@@ -70,6 +70,6 @@ Rectangle {
     MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
 
     Text {
-        id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
+        id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText; font.pixelSize: 24
     }
 }
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index f66c40e..b66c5a6 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -133,7 +133,7 @@ Rectangle {
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 58
         color: activePalette.window
         anchors.bottom: screen.bottom
 
@@ -156,6 +156,7 @@ Rectangle {
             anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
             text: "Score: " + gameCanvas.score
             font.bold: true
+            font.pixelSize: 24
             color: activePalette.windowText
         }
     }
-- 
cgit v0.12


From 9129a27f733169c9a4baf46b1be1c749dabdfdd8 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Fri, 29 Oct 2010 10:13:28 +1000
Subject: remove the connecting thread, and use async call to dbus instead.

This fixes the case where the connection threads are never stopped until
desctuctor.

Task-number: QTBUG-14836
Reviewed-by: trust me
---
 src/plugins/bearer/connman/qconnmanengine.cpp      | 83 ++++++----------------
 src/plugins/bearer/connman/qconnmanengine.h        | 27 -------
 .../bearer/connman/qconnmanservice_linux.cpp       | 21 +++---
 src/plugins/bearer/connman/qofonoservice_linux.cpp | 12 ++--
 4 files changed, 36 insertions(+), 107 deletions(-)

diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index a8b8911..184ceb4 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -170,13 +170,26 @@ bool QConnmanEngine::hasIdentifier(const QString &id)
 void QConnmanEngine::connectToId(const QString &id)
 {
     QMutexLocker locker(&mutex);
-    QConnmanConnectThread *thread;
-    thread = new QConnmanConnectThread(this);
-    thread->setServicePath(serviceFromId(id));
-    thread->setIdentifier(id);
-    connect(thread,SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)),
-            this,SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)));
-    thread->start();
+    QString servicePath = serviceFromId(id);
+    QConnmanServiceInterface serv(servicePath);
+    if(!serv.isValid()) {
+        emit connectionError(id, QBearerEngineImpl::InterfaceLookupError);
+    } else {
+        if(serv.getType() != "cellular") {
+
+            serv.connect();
+        } else {
+            QOfonoManagerInterface ofonoManager(0);
+            QString modemPath = ofonoManager.currentModem().path();
+            QOfonoDataConnectionManagerInterface dc(modemPath,0);
+            foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) {
+                if(dcPath.path().contains(servicePath.section("_",-1))) {
+                    QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0);
+                    primaryContext.setActive(true);
+                }
+            }
+        }
+    }
 }
 
 void QConnmanEngine::disconnectFromId(const QString &id)
@@ -791,62 +804,6 @@ bool QConnmanEngine::requiresPolling() const
     return false;
 }
 
-
-QConnmanConnectThread::QConnmanConnectThread(QObject *parent)
-    :QThread(parent),
-    servicePath(), identifier()
-{
-}
-
-QConnmanConnectThread::~QConnmanConnectThread()
-{
-}
-
-void QConnmanConnectThread::stop()
-{
-    if(currentThread() != this) {
-        QMetaObject::invokeMethod(this, "quit",
-                                  Qt::QueuedConnection);
-    } else {
-        quit();
-    }
-    wait();
-}
-
-void QConnmanConnectThread::run()
-{
-    QConnmanServiceInterface serv(servicePath);
-    if(!serv.isValid()) {
-        emit connectionError(identifier, QBearerEngineImpl::InterfaceLookupError);
-    } else {
-        if(serv.getType() != "cellular") {
-            serv.connect();
-        } else {
-            QOfonoManagerInterface ofonoManager(0);
-            QString modemPath = ofonoManager.currentModem().path();
-            QOfonoDataConnectionManagerInterface dc(modemPath,0);
-            foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) {
-                if(dcPath.path().contains(servicePath.section("_",-1))) {
-                    QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0);
-                    primaryContext.setActive(true);
-                }
-            }
-        }
-    }
-}
-
-void QConnmanConnectThread::setServicePath(const QString &path)
-{
-    QMutexLocker locker(&mutex);
-    servicePath = path;
-}
-
-void QConnmanConnectThread::setIdentifier(const QString &id)
-{
-    QMutexLocker locker(&mutex);
-    identifier = id;
-}
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_DBUS
diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h
index 569bbc7..2a2308f 100644
--- a/src/plugins/bearer/connman/qconnmanengine.h
+++ b/src/plugins/bearer/connman/qconnmanengine.h
@@ -59,14 +59,12 @@
 
 #include <QMap>
 #include <QVariant>
-#include <QtCore/qthread.h>
 
 #ifndef QT_NO_BEARERMANAGEMENT
 #ifndef QT_NO_DBUS
 
 QT_BEGIN_NAMESPACE
 
-class QConnmanConnectThread;
 class QConnmanEngine : public QBearerEngineImpl
 {
     Q_OBJECT
@@ -141,33 +139,8 @@ private:
     bool isRoamingAllowed(const QString &context);
 protected:
     bool requiresPolling() const;
-    QConnmanConnectThread *connThread;
 };
 
-class QConnmanConnectThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    QConnmanConnectThread(QObject *parent = 0);
-    ~QConnmanConnectThread();
-    bool keepRunning;
-    void stop();
-    void setServicePath(const QString &path);
-    void setIdentifier(const QString &id);
-
-Q_SIGNALS:
-    void connectionError(const QString &id, QBearerEngineImpl::ConnectionError error);
-
-protected:
-    void run();
-    QString servicePath;
-    QString identifier;
-
-private:
-    QMutex mutex;
-
-};
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 549a07a..46b6e80 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -79,7 +79,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
                                QLatin1String(CONNMAN_MANAGER_PATH),
                                QLatin1String(CONNMAN_MANAGER_INTERFACE),
                                QLatin1String("PropertyChanged"),
-                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & ))), Qt::UniqueConnection) {
             qWarning() << "PropertyCHanged not connected";
         }
     }
@@ -89,7 +89,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
                                     QLatin1String(CONNMAN_MANAGER_PATH),
                                     QLatin1String(CONNMAN_MANAGER_INTERFACE),
                                     QLatin1String("StateChanged"),
-                                    this,SIGNAL(stateChanged(const QString&)))) {
+                                    this,SIGNAL(stateChanged(const QString&))), Qt::UniqueConnection) {
             qWarning() << "StateChanged not connected";
 
         }
@@ -106,7 +106,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
 
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -338,7 +338,7 @@ void QConnmanNetworkInterface::connectNotify(const char *signal)
                                this->path(),
                                QLatin1String(CONNMAN_NETWORK_INTERFACE),
                                QLatin1String("PropertyChanged"),
-                               this,SIGNAL(propertyChanged(QString,QDBusVariant))) ) {
+                               this,SIGNAL(propertyChanged(QString,QDBusVariant))), Qt::UniqueConnection) {
             qWarning() << "network properties not connected";
         }
     }
@@ -350,10 +350,10 @@ void QConnmanNetworkInterface::connectNotify(const char *signal)
                                this->path(),
                                QLatin1String(CONNMAN_NETWORK_INTERFACE),
                                QLatin1String("PropertyChanged"),
-                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+                               helper,SLOT(propertyChanged(QString,QDBusVariant))), Qt::UniqueConnection;
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -538,7 +538,7 @@ void QConnmanServiceInterface::connectNotify(const char *signal)
                                helper,SLOT(propertyChanged(QString,QDBusVariant)));
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -569,10 +569,9 @@ QVariant QConnmanServiceInterface::getProperty(const QString &property)
     return var;
 }
 
-// clearProperty
 void QConnmanServiceInterface::connect()
 {
-    QDBusReply<QVariantMap> reply = this->call(QLatin1String("Connect"));
+    this->asyncCall(QLatin1String("Connect"));
 }
 
 void QConnmanServiceInterface::disconnect()
@@ -866,7 +865,7 @@ void QConnmanTechnologyInterface::connectNotify(const char *signal)
                                helper,SLOT(propertyChanged(QString,QDBusVariant)));
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -1031,7 +1030,7 @@ void QConnmanDeviceInterface::connectNotify(const char *signal)
                                helper,SLOT(propertyChanged(QString,QDBusVariant)));
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
diff --git a/src/plugins/bearer/connman/qofonoservice_linux.cpp b/src/plugins/bearer/connman/qofonoservice_linux.cpp
index 955f4b1..52f596b 100644
--- a/src/plugins/bearer/connman/qofonoservice_linux.cpp
+++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp
@@ -262,7 +262,7 @@ void QOfonoModemInterface::connectNotify(const char *signal)
 
 
             QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                    this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                    this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
         }}
 
 void QOfonoModemInterface::disconnectNotify(const char *signal)
@@ -385,7 +385,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
 
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -483,7 +483,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
 
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -586,7 +586,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
 
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -675,7 +675,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
 
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
@@ -794,7 +794,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
 
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
-                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
     }
 }
 
-- 
cgit v0.12


From d1b0b364fc2c944ec5cf67ed9a3282881f4c324c Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 18:45:11 +1000
Subject: Cleanup qmlvisual/qdeclarativetext visual tests

Getting them running again, and smaller. Need to fix a bug before they
pass again though.

Task-number: QTBUG-14792
---
 .../baseline/data-X11/parentanchor.qml             |   62 +-
 .../qdeclarativetext/baseline/parentanchor.qml     |    2 +-
 .../qdeclarativetext/elide/data-X11/elide.0.png    |  Bin 1002 -> 1167 bytes
 .../qdeclarativetext/elide/data-X11/elide.qml      |  132 +--
 .../qdeclarativetext/elide/data-X11/elide2.0.png   |  Bin 0 -> 2795 bytes
 .../qdeclarativetext/elide/data-X11/elide2.1.png   |  Bin 0 -> 2456 bytes
 .../qdeclarativetext/elide/data-X11/elide2.2.png   |  Bin 0 -> 2038 bytes
 .../qdeclarativetext/elide/data-X11/elide2.3.png   |  Bin 0 -> 1317 bytes
 .../qdeclarativetext/elide/data-X11/elide2.qml     |  991 +++++++++++++++++
 .../elide/data-X11/multilength.0.png               |  Bin 596 -> 2285 bytes
 .../elide/data-X11/multilength.1.png               |  Bin 0 -> 2284 bytes
 .../elide/data-X11/multilength.2.png               |  Bin 0 -> 1197 bytes
 .../elide/data-X11/multilength.3.png               |  Bin 0 -> 1197 bytes
 .../elide/data-X11/multilength.4.png               |  Bin 0 -> 556 bytes
 .../elide/data-X11/multilength.qml                 | 1166 ++++++++++++++++++--
 .../qdeclarativetext/elide/data/elide.0.png        |  Bin 1604 -> 0 bytes
 .../qdeclarativetext/elide/data/elide.qml          |  279 -----
 .../qdeclarativetext/elide/data/elide2.0.png       |  Bin 4818 -> 0 bytes
 .../qdeclarativetext/elide/data/elide2.1.png       |  Bin 4089 -> 0 bytes
 .../qdeclarativetext/elide/data/elide2.2.png       |  Bin 3128 -> 0 bytes
 .../qdeclarativetext/elide/data/elide2.3.png       |  Bin 1963 -> 0 bytes
 .../qdeclarativetext/elide/data/elide2.qml         |  991 -----------------
 .../qdeclarativetext/font/data-MAC/plaintext.0.png |  Bin 103018 -> 0 bytes
 .../qdeclarativetext/font/data-MAC/plaintext.qml   |  351 ------
 .../qdeclarativetext/font/data-MAC/richtext.0.png  |  Bin 136492 -> 0 bytes
 .../qdeclarativetext/font/data-MAC/richtext.qml    |  359 ------
 .../qdeclarativetext/font/data/plaintext.0.png     |  Bin 94120 -> 0 bytes
 .../qdeclarativetext/font/data/plaintext.qml       |  351 ------
 .../qdeclarativetext/font/data/richtext.0.png      |  Bin 121122 -> 0 bytes
 .../qdeclarativetext/font/data/richtext.qml        |  359 ------
 30 files changed, 2182 insertions(+), 2861 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
index 880609b..c526f47 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
@@ -6,126 +6,126 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 32
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 48
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 64
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 80
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 96
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 112
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 128
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 144
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 160
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 176
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 192
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 208
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 224
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 240
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 256
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 272
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 288
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 304
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 320
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 336
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 352
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 368
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 384
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 400
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 416
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 432
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 448
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 464
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 480
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
     Frame {
         msec: 496
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "e38b59f2c271def037213e57a966bd95"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
index ec1f8b3..c1920db 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
@@ -1,7 +1,7 @@
 import QtQuick 1.0
 
 Rectangle {
-    id: s; width: 600; height: 100; color: "lightsteelblue"
+    id: s; width: 600; height: 100;
     property string text: "The quick brown fox jumps over the lazy dog."
     Text {
         text: s.text
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png
index 5631a46..b250b38 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
index d460514..f3bc1db 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 32
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 48
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 64
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 80
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 96
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 112
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 128
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 144
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 160
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 176
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 192
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 208
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 224
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 240
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 256
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 272
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 288
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 304
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 320
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 336
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 352
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 368
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 384
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 400
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 416
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 432
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 448
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 464
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 480
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 496
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 512
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 528
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 544
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 560
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 576
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 592
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 608
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 624
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 640
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 656
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 672
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 688
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 704
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 720
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 736
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 752
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 768
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 784
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 800
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 816
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 832
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 848
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 864
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 880
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 896
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 912
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 928
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 944
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 960
@@ -246,34 +246,34 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 67108864
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 992
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 1008
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 1024
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 1040
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
     Frame {
         msec: 1056
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
+        hash: "9992670f23580ce63cdd3ab3fed621a1"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
new file mode 100644
index 0000000..03b6e5d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
new file mode 100644
index 0000000..43565b6
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.2.png
new file mode 100644
index 0000000..f2df9b2
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.3.png
new file mode 100644
index 0000000..11cf86c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.qml
new file mode 100644
index 0000000..1c1d5eb
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.qml
@@ -0,0 +1,991 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 32
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 48
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 64
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 80
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 96
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 112
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 128
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 144
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 160
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 176
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 192
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 208
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 224
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 240
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 256
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 272
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 288
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 304
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 320
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 336
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 352
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 368
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 384
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 400
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 416
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 432
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 448
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 464
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 480
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 496
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 512
+        hash: "26a468619443250a160845a894643eb9"
+    }
+    Frame {
+        msec: 528
+        hash: "250d6cd632ad176aacbb09fa50f6c099"
+    }
+    Frame {
+        msec: 544
+        hash: "250d6cd632ad176aacbb09fa50f6c099"
+    }
+    Frame {
+        msec: 560
+        hash: "250d6cd632ad176aacbb09fa50f6c099"
+    }
+    Frame {
+        msec: 576
+        hash: "92cfcc9ee96124c5a3848f68228b286b"
+    }
+    Frame {
+        msec: 592
+        hash: "92cfcc9ee96124c5a3848f68228b286b"
+    }
+    Frame {
+        msec: 608
+        hash: "92cfcc9ee96124c5a3848f68228b286b"
+    }
+    Frame {
+        msec: 624
+        hash: "92cfcc9ee96124c5a3848f68228b286b"
+    }
+    Frame {
+        msec: 640
+        hash: "92cfcc9ee96124c5a3848f68228b286b"
+    }
+    Frame {
+        msec: 656
+        hash: "235f581c767dc4a4f6133e570126a813"
+    }
+    Frame {
+        msec: 672
+        hash: "235f581c767dc4a4f6133e570126a813"
+    }
+    Frame {
+        msec: 688
+        hash: "235f581c767dc4a4f6133e570126a813"
+    }
+    Frame {
+        msec: 704
+        hash: "235f581c767dc4a4f6133e570126a813"
+    }
+    Frame {
+        msec: 720
+        hash: "235f581c767dc4a4f6133e570126a813"
+    }
+    Frame {
+        msec: 736
+        hash: "c7d6b690224ae554f6200a5d2520ae25"
+    }
+    Frame {
+        msec: 752
+        hash: "c7d6b690224ae554f6200a5d2520ae25"
+    }
+    Frame {
+        msec: 768
+        hash: "23f5fb2275945e89bf856877b82f99de"
+    }
+    Frame {
+        msec: 784
+        hash: "23f5fb2275945e89bf856877b82f99de"
+    }
+    Frame {
+        msec: 800
+        hash: "23f5fb2275945e89bf856877b82f99de"
+    }
+    Frame {
+        msec: 816
+        hash: "23f5fb2275945e89bf856877b82f99de"
+    }
+    Frame {
+        msec: 832
+        hash: "23f5fb2275945e89bf856877b82f99de"
+    }
+    Frame {
+        msec: 848
+        hash: "99e6e3d94bb90939dacadf20f791d415"
+    }
+    Frame {
+        msec: 864
+        hash: "99e6e3d94bb90939dacadf20f791d415"
+    }
+    Frame {
+        msec: 880
+        hash: "99e6e3d94bb90939dacadf20f791d415"
+    }
+    Frame {
+        msec: 896
+        hash: "186db3738dc443d66b5b0352d7753b26"
+    }
+    Frame {
+        msec: 912
+        hash: "186db3738dc443d66b5b0352d7753b26"
+    }
+    Frame {
+        msec: 928
+        hash: "186db3738dc443d66b5b0352d7753b26"
+    }
+    Frame {
+        msec: 944
+        hash: "186db3738dc443d66b5b0352d7753b26"
+    }
+    Frame {
+        msec: 960
+        image: "elide2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "88be0433f060832e8345a43eb681998e"
+    }
+    Frame {
+        msec: 992
+        hash: "88be0433f060832e8345a43eb681998e"
+    }
+    Frame {
+        msec: 1008
+        hash: "88be0433f060832e8345a43eb681998e"
+    }
+    Frame {
+        msec: 1024
+        hash: "88be0433f060832e8345a43eb681998e"
+    }
+    Frame {
+        msec: 1040
+        hash: "88be0433f060832e8345a43eb681998e"
+    }
+    Frame {
+        msec: 1056
+        hash: "89e8da94c1e4e1c031d58f1dd593104a"
+    }
+    Frame {
+        msec: 1072
+        hash: "89e8da94c1e4e1c031d58f1dd593104a"
+    }
+    Frame {
+        msec: 1088
+        hash: "786b7ea2e267ee6d593f18caa95be45d"
+    }
+    Frame {
+        msec: 1104
+        hash: "786b7ea2e267ee6d593f18caa95be45d"
+    }
+    Frame {
+        msec: 1120
+        hash: "786b7ea2e267ee6d593f18caa95be45d"
+    }
+    Frame {
+        msec: 1136
+        hash: "830afd40f8ee9d0c969fbd61eb68ae94"
+    }
+    Frame {
+        msec: 1152
+        hash: "830afd40f8ee9d0c969fbd61eb68ae94"
+    }
+    Frame {
+        msec: 1168
+        hash: "d00b74868c2dbddc2d5ae5ec0469f9a1"
+    }
+    Frame {
+        msec: 1184
+        hash: "d00b74868c2dbddc2d5ae5ec0469f9a1"
+    }
+    Frame {
+        msec: 1200
+        hash: "d00b74868c2dbddc2d5ae5ec0469f9a1"
+    }
+    Frame {
+        msec: 1216
+        hash: "d00b74868c2dbddc2d5ae5ec0469f9a1"
+    }
+    Frame {
+        msec: 1232
+        hash: "1508cbb70b1221ccf169ff6376df4cc9"
+    }
+    Frame {
+        msec: 1248
+        hash: "1508cbb70b1221ccf169ff6376df4cc9"
+    }
+    Frame {
+        msec: 1264
+        hash: "1508cbb70b1221ccf169ff6376df4cc9"
+    }
+    Frame {
+        msec: 1280
+        hash: "490d7425d117ebe23e3e3637fd3e7b09"
+    }
+    Frame {
+        msec: 1296
+        hash: "490d7425d117ebe23e3e3637fd3e7b09"
+    }
+    Frame {
+        msec: 1312
+        hash: "490d7425d117ebe23e3e3637fd3e7b09"
+    }
+    Frame {
+        msec: 1328
+        hash: "490d7425d117ebe23e3e3637fd3e7b09"
+    }
+    Frame {
+        msec: 1344
+        hash: "490d7425d117ebe23e3e3637fd3e7b09"
+    }
+    Frame {
+        msec: 1360
+        hash: "048b3223ca262f5f3271f4ad81fbe41f"
+    }
+    Frame {
+        msec: 1376
+        hash: "048b3223ca262f5f3271f4ad81fbe41f"
+    }
+    Frame {
+        msec: 1392
+        hash: "048b3223ca262f5f3271f4ad81fbe41f"
+    }
+    Frame {
+        msec: 1408
+        hash: "048b3223ca262f5f3271f4ad81fbe41f"
+    }
+    Frame {
+        msec: 1424
+        hash: "048b3223ca262f5f3271f4ad81fbe41f"
+    }
+    Frame {
+        msec: 1440
+        hash: "4e91391c852167a04c6224ef5426b17c"
+    }
+    Frame {
+        msec: 1456
+        hash: "4e91391c852167a04c6224ef5426b17c"
+    }
+    Frame {
+        msec: 1472
+        hash: "4e91391c852167a04c6224ef5426b17c"
+    }
+    Frame {
+        msec: 1488
+        hash: "4e91391c852167a04c6224ef5426b17c"
+    }
+    Frame {
+        msec: 1504
+        hash: "4e91391c852167a04c6224ef5426b17c"
+    }
+    Frame {
+        msec: 1520
+        hash: "08e969be0cd428140cd079f5f6338b4f"
+    }
+    Frame {
+        msec: 1536
+        hash: "08e969be0cd428140cd079f5f6338b4f"
+    }
+    Frame {
+        msec: 1552
+        hash: "08e969be0cd428140cd079f5f6338b4f"
+    }
+    Frame {
+        msec: 1568
+        hash: "08e969be0cd428140cd079f5f6338b4f"
+    }
+    Frame {
+        msec: 1584
+        hash: "08e969be0cd428140cd079f5f6338b4f"
+    }
+    Frame {
+        msec: 1600
+        hash: "458e10bb1d38ef8f1248be959a3ac8bc"
+    }
+    Frame {
+        msec: 1616
+        hash: "458e10bb1d38ef8f1248be959a3ac8bc"
+    }
+    Frame {
+        msec: 1632
+        hash: "458e10bb1d38ef8f1248be959a3ac8bc"
+    }
+    Frame {
+        msec: 1648
+        hash: "fde9eccf9fa722d4321bd26ead3d6c5e"
+    }
+    Frame {
+        msec: 1664
+        hash: "fde9eccf9fa722d4321bd26ead3d6c5e"
+    }
+    Frame {
+        msec: 1680
+        hash: "fde9eccf9fa722d4321bd26ead3d6c5e"
+    }
+    Frame {
+        msec: 1696
+        hash: "fde9eccf9fa722d4321bd26ead3d6c5e"
+    }
+    Frame {
+        msec: 1712
+        hash: "fde9eccf9fa722d4321bd26ead3d6c5e"
+    }
+    Frame {
+        msec: 1728
+        hash: "68ac9747d1b36351ac6677336d4e0bfd"
+    }
+    Frame {
+        msec: 1744
+        hash: "68ac9747d1b36351ac6677336d4e0bfd"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "68ac9747d1b36351ac6677336d4e0bfd"
+    }
+    Frame {
+        msec: 1776
+        hash: "015658eeb53ce6937d0a0b3941cea138"
+    }
+    Frame {
+        msec: 1792
+        hash: "015658eeb53ce6937d0a0b3941cea138"
+    }
+    Frame {
+        msec: 1808
+        hash: "015658eeb53ce6937d0a0b3941cea138"
+    }
+    Frame {
+        msec: 1824
+        hash: "015658eeb53ce6937d0a0b3941cea138"
+    }
+    Frame {
+        msec: 1840
+        hash: "015658eeb53ce6937d0a0b3941cea138"
+    }
+    Frame {
+        msec: 1856
+        hash: "4720bcf54fce0c680a983113dc009104"
+    }
+    Frame {
+        msec: 1872
+        hash: "4720bcf54fce0c680a983113dc009104"
+    }
+    Frame {
+        msec: 1888
+        hash: "4720bcf54fce0c680a983113dc009104"
+    }
+    Frame {
+        msec: 1904
+        hash: "4720bcf54fce0c680a983113dc009104"
+    }
+    Frame {
+        msec: 1920
+        image: "elide2.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "03123bcb0f4ff032257415f713a5873c"
+    }
+    Frame {
+        msec: 1952
+        hash: "03123bcb0f4ff032257415f713a5873c"
+    }
+    Frame {
+        msec: 1968
+        hash: "03123bcb0f4ff032257415f713a5873c"
+    }
+    Frame {
+        msec: 1984
+        hash: "03123bcb0f4ff032257415f713a5873c"
+    }
+    Frame {
+        msec: 2000
+        hash: "e93d314c5a19e771282bf09ff0983917"
+    }
+    Frame {
+        msec: 2016
+        hash: "e93d314c5a19e771282bf09ff0983917"
+    }
+    Frame {
+        msec: 2032
+        hash: "e93d314c5a19e771282bf09ff0983917"
+    }
+    Frame {
+        msec: 2048
+        hash: "e93d314c5a19e771282bf09ff0983917"
+    }
+    Frame {
+        msec: 2064
+        hash: "e93d314c5a19e771282bf09ff0983917"
+    }
+    Frame {
+        msec: 2080
+        hash: "877e76006891001e574b39f60249ec8a"
+    }
+    Frame {
+        msec: 2096
+        hash: "877e76006891001e574b39f60249ec8a"
+    }
+    Frame {
+        msec: 2112
+        hash: "877e76006891001e574b39f60249ec8a"
+    }
+    Frame {
+        msec: 2128
+        hash: "04213ba6fc23600c62c49bdd63725b3d"
+    }
+    Frame {
+        msec: 2144
+        hash: "04213ba6fc23600c62c49bdd63725b3d"
+    }
+    Frame {
+        msec: 2160
+        hash: "04213ba6fc23600c62c49bdd63725b3d"
+    }
+    Frame {
+        msec: 2176
+        hash: "04213ba6fc23600c62c49bdd63725b3d"
+    }
+    Frame {
+        msec: 2192
+        hash: "605fbd44c23d135d809e987fde15caf0"
+    }
+    Frame {
+        msec: 2208
+        hash: "605fbd44c23d135d809e987fde15caf0"
+    }
+    Frame {
+        msec: 2224
+        hash: "138d9fe345628797df8af84b71e76717"
+    }
+    Frame {
+        msec: 2240
+        hash: "138d9fe345628797df8af84b71e76717"
+    }
+    Frame {
+        msec: 2256
+        hash: "138d9fe345628797df8af84b71e76717"
+    }
+    Frame {
+        msec: 2272
+        hash: "138d9fe345628797df8af84b71e76717"
+    }
+    Frame {
+        msec: 2288
+        hash: "138d9fe345628797df8af84b71e76717"
+    }
+    Frame {
+        msec: 2304
+        hash: "1a160138dbed69dd2fc6cdc335c39332"
+    }
+    Frame {
+        msec: 2320
+        hash: "1a160138dbed69dd2fc6cdc335c39332"
+    }
+    Frame {
+        msec: 2336
+        hash: "a40edd45d19a09b7b5b6601c2e4789ba"
+    }
+    Frame {
+        msec: 2352
+        hash: "a40edd45d19a09b7b5b6601c2e4789ba"
+    }
+    Frame {
+        msec: 2368
+        hash: "a40edd45d19a09b7b5b6601c2e4789ba"
+    }
+    Frame {
+        msec: 2384
+        hash: "a40edd45d19a09b7b5b6601c2e4789ba"
+    }
+    Frame {
+        msec: 2400
+        hash: "a40edd45d19a09b7b5b6601c2e4789ba"
+    }
+    Frame {
+        msec: 2416
+        hash: "f8c24070f98d456925ce5fb5519ef20e"
+    }
+    Frame {
+        msec: 2432
+        hash: "f8c24070f98d456925ce5fb5519ef20e"
+    }
+    Frame {
+        msec: 2448
+        hash: "f8c24070f98d456925ce5fb5519ef20e"
+    }
+    Frame {
+        msec: 2464
+        hash: "f8c24070f98d456925ce5fb5519ef20e"
+    }
+    Frame {
+        msec: 2480
+        hash: "f8c24070f98d456925ce5fb5519ef20e"
+    }
+    Frame {
+        msec: 2496
+        hash: "f383c8fc8764f8615937fcbe18a881cb"
+    }
+    Frame {
+        msec: 2512
+        hash: "f383c8fc8764f8615937fcbe18a881cb"
+    }
+    Frame {
+        msec: 2528
+        hash: "f383c8fc8764f8615937fcbe18a881cb"
+    }
+    Frame {
+        msec: 2544
+        hash: "f383c8fc8764f8615937fcbe18a881cb"
+    }
+    Frame {
+        msec: 2560
+        hash: "f383c8fc8764f8615937fcbe18a881cb"
+    }
+    Frame {
+        msec: 2576
+        hash: "98355e4087b07e4bf85bd9dd6b2594e2"
+    }
+    Frame {
+        msec: 2592
+        hash: "98355e4087b07e4bf85bd9dd6b2594e2"
+    }
+    Frame {
+        msec: 2608
+        hash: "98355e4087b07e4bf85bd9dd6b2594e2"
+    }
+    Frame {
+        msec: 2624
+        hash: "98355e4087b07e4bf85bd9dd6b2594e2"
+    }
+    Frame {
+        msec: 2640
+        hash: "098f7051d2bc8b159a3c358c99ade1e5"
+    }
+    Frame {
+        msec: 2656
+        hash: "098f7051d2bc8b159a3c358c99ade1e5"
+    }
+    Frame {
+        msec: 2672
+        hash: "098f7051d2bc8b159a3c358c99ade1e5"
+    }
+    Frame {
+        msec: 2688
+        hash: "fa588455c73bfd3d14ee322580d95015"
+    }
+    Frame {
+        msec: 2704
+        hash: "fa588455c73bfd3d14ee322580d95015"
+    }
+    Frame {
+        msec: 2720
+        hash: "fa588455c73bfd3d14ee322580d95015"
+    }
+    Frame {
+        msec: 2736
+        hash: "fa588455c73bfd3d14ee322580d95015"
+    }
+    Frame {
+        msec: 2752
+        hash: "fa588455c73bfd3d14ee322580d95015"
+    }
+    Frame {
+        msec: 2768
+        hash: "ed69a2ab8e66fa397190b35cb942ec2d"
+    }
+    Frame {
+        msec: 2784
+        hash: "ed69a2ab8e66fa397190b35cb942ec2d"
+    }
+    Frame {
+        msec: 2800
+        hash: "ed69a2ab8e66fa397190b35cb942ec2d"
+    }
+    Frame {
+        msec: 2816
+        hash: "ed69a2ab8e66fa397190b35cb942ec2d"
+    }
+    Frame {
+        msec: 2832
+        hash: "ed69a2ab8e66fa397190b35cb942ec2d"
+    }
+    Frame {
+        msec: 2848
+        hash: "905d42c34198abdc68a3c6f69bfbd293"
+    }
+    Frame {
+        msec: 2864
+        hash: "905d42c34198abdc68a3c6f69bfbd293"
+    }
+    Frame {
+        msec: 2880
+        image: "elide2.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "2e796a963fee85d51be536a00baa0c45"
+    }
+    Frame {
+        msec: 2912
+        hash: "2e796a963fee85d51be536a00baa0c45"
+    }
+    Frame {
+        msec: 2928
+        hash: "2e796a963fee85d51be536a00baa0c45"
+    }
+    Frame {
+        msec: 2944
+        hash: "b73b94832ede92794187b9ed452f96e0"
+    }
+    Frame {
+        msec: 2960
+        hash: "b73b94832ede92794187b9ed452f96e0"
+    }
+    Frame {
+        msec: 2976
+        hash: "b73b94832ede92794187b9ed452f96e0"
+    }
+    Frame {
+        msec: 2992
+        hash: "b73b94832ede92794187b9ed452f96e0"
+    }
+    Frame {
+        msec: 3008
+        hash: "b73b94832ede92794187b9ed452f96e0"
+    }
+    Frame {
+        msec: 3024
+        hash: "4f000e957cd4c7ef4845855088801c2d"
+    }
+    Frame {
+        msec: 3040
+        hash: "4f000e957cd4c7ef4845855088801c2d"
+    }
+    Frame {
+        msec: 3056
+        hash: "4f000e957cd4c7ef4845855088801c2d"
+    }
+    Frame {
+        msec: 3072
+        hash: "4f000e957cd4c7ef4845855088801c2d"
+    }
+    Frame {
+        msec: 3088
+        hash: "4f000e957cd4c7ef4845855088801c2d"
+    }
+    Frame {
+        msec: 3104
+        hash: "a432c8b664352e585f732813df2e861f"
+    }
+    Frame {
+        msec: 3120
+        hash: "a432c8b664352e585f732813df2e861f"
+    }
+    Frame {
+        msec: 3136
+        hash: "a432c8b664352e585f732813df2e861f"
+    }
+    Frame {
+        msec: 3152
+        hash: "e06abd91449d3b5d18582b9da2d20c97"
+    }
+    Frame {
+        msec: 3168
+        hash: "e06abd91449d3b5d18582b9da2d20c97"
+    }
+    Frame {
+        msec: 3184
+        hash: "e06abd91449d3b5d18582b9da2d20c97"
+    }
+    Frame {
+        msec: 3200
+        hash: "c4cecc3832935d59d9808ea70385632d"
+    }
+    Frame {
+        msec: 3216
+        hash: "c4cecc3832935d59d9808ea70385632d"
+    }
+    Frame {
+        msec: 3232
+        hash: "c4cecc3832935d59d9808ea70385632d"
+    }
+    Frame {
+        msec: 3248
+        hash: "56942f99b8b2a6c491b8635ae5619a4f"
+    }
+    Frame {
+        msec: 3264
+        hash: "56942f99b8b2a6c491b8635ae5619a4f"
+    }
+    Frame {
+        msec: 3280
+        hash: "56942f99b8b2a6c491b8635ae5619a4f"
+    }
+    Frame {
+        msec: 3296
+        hash: "56942f99b8b2a6c491b8635ae5619a4f"
+    }
+    Frame {
+        msec: 3312
+        hash: "a3bf780a2ae09fb3fee6215a24b8bb53"
+    }
+    Frame {
+        msec: 3328
+        hash: "a3bf780a2ae09fb3fee6215a24b8bb53"
+    }
+    Frame {
+        msec: 3344
+        hash: "a3bf780a2ae09fb3fee6215a24b8bb53"
+    }
+    Frame {
+        msec: 3360
+        hash: "a3bf780a2ae09fb3fee6215a24b8bb53"
+    }
+    Frame {
+        msec: 3376
+        hash: "822cff91269181ddb5a3b24ca0227583"
+    }
+    Frame {
+        msec: 3392
+        hash: "822cff91269181ddb5a3b24ca0227583"
+    }
+    Frame {
+        msec: 3408
+        hash: "822cff91269181ddb5a3b24ca0227583"
+    }
+    Frame {
+        msec: 3424
+        hash: "822cff91269181ddb5a3b24ca0227583"
+    }
+    Frame {
+        msec: 3440
+        hash: "20f06bbb130e81d6eb2612aa79bb7968"
+    }
+    Frame {
+        msec: 3456
+        hash: "20f06bbb130e81d6eb2612aa79bb7968"
+    }
+    Frame {
+        msec: 3472
+        hash: "fcb03904d0e628f95c9b665c65b10266"
+    }
+    Frame {
+        msec: 3488
+        hash: "fcb03904d0e628f95c9b665c65b10266"
+    }
+    Frame {
+        msec: 3504
+        hash: "fcb03904d0e628f95c9b665c65b10266"
+    }
+    Frame {
+        msec: 3520
+        hash: "fcb03904d0e628f95c9b665c65b10266"
+    }
+    Frame {
+        msec: 3536
+        hash: "fcb03904d0e628f95c9b665c65b10266"
+    }
+    Frame {
+        msec: 3552
+        hash: "1c17eaf20f5c16fea97a263d2aad1918"
+    }
+    Frame {
+        msec: 3568
+        hash: "1c17eaf20f5c16fea97a263d2aad1918"
+    }
+    Frame {
+        msec: 3584
+        hash: "1c17eaf20f5c16fea97a263d2aad1918"
+    }
+    Frame {
+        msec: 3600
+        hash: "1c17eaf20f5c16fea97a263d2aad1918"
+    }
+    Frame {
+        msec: 3616
+        hash: "1c17eaf20f5c16fea97a263d2aad1918"
+    }
+    Frame {
+        msec: 3632
+        hash: "3c91d205312aefc4af746cea413c9344"
+    }
+    Frame {
+        msec: 3648
+        hash: "3c91d205312aefc4af746cea413c9344"
+    }
+    Frame {
+        msec: 3664
+        hash: "3c91d205312aefc4af746cea413c9344"
+    }
+    Frame {
+        msec: 3680
+        hash: "3c91d205312aefc4af746cea413c9344"
+    }
+    Frame {
+        msec: 3696
+        hash: "3c91d205312aefc4af746cea413c9344"
+    }
+    Frame {
+        msec: 3712
+        hash: "6cb467aa12d6ae76edbfa324c0ad26d1"
+    }
+    Frame {
+        msec: 3728
+        hash: "6cb467aa12d6ae76edbfa324c0ad26d1"
+    }
+    Frame {
+        msec: 3744
+        hash: "c8ec3da9c651eadf4aa8a4051d326f91"
+    }
+    Frame {
+        msec: 3760
+        hash: "c8ec3da9c651eadf4aa8a4051d326f91"
+    }
+    Frame {
+        msec: 3776
+        hash: "c8ec3da9c651eadf4aa8a4051d326f91"
+    }
+    Frame {
+        msec: 3792
+        hash: "6cea311c6007463480b71ffd66074557"
+    }
+    Frame {
+        msec: 3808
+        hash: "6cea311c6007463480b71ffd66074557"
+    }
+    Frame {
+        msec: 3824
+        hash: "6cea311c6007463480b71ffd66074557"
+    }
+    Frame {
+        msec: 3840
+        image: "elide2.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "6e800f4aacf0096f34acdf13678cab25"
+    }
+    Frame {
+        msec: 3872
+        hash: "6e800f4aacf0096f34acdf13678cab25"
+    }
+    Frame {
+        msec: 3888
+        hash: "fc336a43eaf9974cd6ad82bfee128ead"
+    }
+    Frame {
+        msec: 3904
+        hash: "fc336a43eaf9974cd6ad82bfee128ead"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.0.png
index 6e2b625..7980f23 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
new file mode 100644
index 0000000..cbfae6e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
new file mode 100644
index 0000000..5e2527e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
new file mode 100644
index 0000000..901551e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
new file mode 100644
index 0000000..32a5ba2
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
index ee06b1a..5d36d48 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "873e914454b7a040b05649ebd1a2f8c5"
+        hash: "a9dc5058e29f9c129087eaa013002185"
     }
     Frame {
         msec: 32
-        hash: "7682a4f1e361ca252da9713734a598e8"
+        hash: "da0d63697414c19f57235c4d133faf63"
     }
     Frame {
         msec: 48
-        hash: "fa8884b550c8df872f96b61557163bcf"
+        hash: "e3992f5512959c061d53fc3899acec14"
     }
     Frame {
         msec: 64
-        hash: "b84ecf9e38f126c3e32defee831d9462"
+        hash: "e225de5dc21fee719ebc43fa8838f841"
     }
     Frame {
         msec: 80
-        hash: "21cc08f22d1f1fcb38b27a3a4259debe"
+        hash: "a5673b8b7ad5a9d67e785beaaa4c0307"
     }
     Frame {
         msec: 96
-        hash: "93bdfeab813e25e85917f49c0d5f1314"
+        hash: "2c126bf2d794039e1380595b9c40ae2e"
     }
     Frame {
         msec: 112
-        hash: "5f03c252602e60fe19879945fa77c203"
+        hash: "f974072b4863b842b520b4c11c427f5d"
     }
     Frame {
         msec: 128
-        hash: "f0b2079f6c512bf80989ebfdbec4cfd8"
+        hash: "bf06ec5a2c1c46e780cdd0d859b2becb"
     }
     Frame {
         msec: 144
-        hash: "9e7bb12d5b7605fc1d78ed9b2a549527"
+        hash: "3a58b1900912a5a6ace72757f3af4d1a"
     }
     Frame {
         msec: 160
-        hash: "242bbbe6da87708c92fd47607ecb789d"
+        hash: "3fa86df29f53e7f6f65fb6e605f5e705"
     }
     Frame {
         msec: 176
-        hash: "f1db5c3a230b4d3e2e1dfefe6bf032a1"
+        hash: "6d29c12395050b049537819cf0a65746"
     }
     Frame {
         msec: 192
-        hash: "a416e820efd8e173cc52372218513e33"
+        hash: "352a390ab4e3e31b645f025e65885cfc"
     }
     Frame {
         msec: 208
-        hash: "df711ab70c6087f8138fded16167f069"
+        hash: "7c3be9d325f023a356b6ed73332bc804"
     }
     Frame {
         msec: 224
-        hash: "fb28eb2eeccfab28299640ef996c1115"
+        hash: "09dd10566eda09e0366b7bf0a8ce9e1b"
     }
     Frame {
         msec: 240
-        hash: "c72c6d79a50dd7147f6b33784880eb36"
+        hash: "6cafcba107e48f7efe2db60a14c3749d"
     }
     Frame {
         msec: 256
-        hash: "4421027e65e95f98499ca53c57220ede"
+        hash: "a4b6df2874ce48ed5a17aab43f32e665"
     }
     Frame {
         msec: 272
-        hash: "b7fbfb90d8cc167809e8e846d9021b4b"
+        hash: "b6a3df4b704fa7e8284572b9c520b03d"
     }
     Frame {
         msec: 288
-        hash: "004614b1bf18e9aa78e78509c4f289aa"
+        hash: "618c53edf13177d433fdcca5b0cedfaa"
     }
     Frame {
         msec: 304
-        hash: "1792bbd8b69bae1d92fed2a6bcfe0187"
+        hash: "ce96d70a89f7701ce069e93c192196ed"
     }
     Frame {
         msec: 320
-        hash: "957a8b95d6e85885d854b8eb1db10b04"
+        hash: "5826b56af5a4670d479c5f8e649d29d4"
     }
     Frame {
         msec: 336
-        hash: "d00c3e4d6d8e8d04b949840c28d73a33"
+        hash: "5aaf7fc6295d4ab6377bd77e91f73ae8"
     }
     Frame {
         msec: 352
-        hash: "2b79feaa62d773d92d8a684685b2004c"
+        hash: "26cb0b5e60de63d582b4c4d1c4120746"
     }
     Frame {
         msec: 368
-        hash: "ef2f11b187028de0c56b23db3168fbc8"
+        hash: "41b6c379d7fb678abbcccde7bca7f243"
     }
     Frame {
         msec: 384
-        hash: "3a489a96aaeca80355313198b935691d"
+        hash: "46668408674d3e94048375152f991427"
     }
     Frame {
         msec: 400
-        hash: "389f1798f900795a8686c38ace755974"
+        hash: "c966370fbbdd8b32cafc06cdc551e020"
     }
     Frame {
         msec: 416
-        hash: "34fc20be52fe3843420819b9adb90b22"
+        hash: "025aab500846dab22713ccada8f93a51"
     }
     Frame {
         msec: 432
-        hash: "fa715c5b6640eafe204bf3b8095c74b9"
+        hash: "a6a68f04ea34fba46025a1415dc46bbb"
     }
     Frame {
         msec: 448
-        hash: "8e8315edcf23167ac58228b8c28b43e6"
+        hash: "1afc5b8b094056695b09088d13ab1612"
     }
     Frame {
         msec: 464
-        hash: "c18e82038f57dd869112cb1be14e4cfe"
+        hash: "efff72e37e0c23e0cd51169d0c06c065"
     }
     Frame {
         msec: 480
-        hash: "3f07e95b09e39f2e5d93216850f4a4d9"
+        hash: "ed425b23ea5340ac5b176b4fbb377fe3"
     }
     Frame {
         msec: 496
-        hash: "20f0e6eaeac04d6f93565adfab485218"
+        hash: "9df20063ec67aa06e44bf292f05469a6"
     }
     Frame {
         msec: 512
-        hash: "e3f66d1dfe88dd868a54a8493828ef5f"
+        hash: "d3400c655403d00df7e202a42b75476d"
     }
     Frame {
         msec: 528
-        hash: "d39d34f63e1b29c187249cb388552b38"
+        hash: "336fd54ae209ba7c28a69939a021341b"
     }
     Frame {
         msec: 544
-        hash: "5d2e8df5003732f3b53fff4aaddea06c"
+        hash: "621c3b64fc6214b8a48c216d46d5615d"
     }
     Frame {
         msec: 560
-        hash: "35c3aa2dae481a8f817d849b3f3151f2"
+        hash: "5f9ac0b6830dbfa4cba83adc0cce232f"
     }
     Frame {
         msec: 576
-        hash: "966b78018879224948b4d85fe73d7985"
+        hash: "2b829253ed85f5ffe5e3867accadd218"
     }
     Frame {
         msec: 592
-        hash: "0db067bf9debc3f36dd539cf83652fb8"
+        hash: "61325a770fb501d88f6bb2700294ca44"
     }
     Frame {
         msec: 608
-        hash: "ea1c3249ffd2439533907ceaeaafbc56"
+        hash: "807dea2954afa902694b1ef98ef5f2c1"
     }
     Frame {
         msec: 624
-        hash: "da85c0e14b95ca9a729984b67ebd52ad"
+        hash: "43edc754d8155c198dd1db6d55d25abf"
     }
     Frame {
         msec: 640
-        hash: "5c26ae844ac52dbe131fed0638787aac"
+        hash: "4c800c2b8ab7b1500e80f50ee925b73b"
     }
     Frame {
         msec: 656
-        hash: "4b09c23ad624db80afcb2a6c1d5ddb96"
+        hash: "17b60d375c02b55923b94b147015bc7d"
     }
     Frame {
         msec: 672
-        hash: "9995deb3d22b418a19093b4b988b3fcc"
+        hash: "591e79b034700b514c84894e0fc27e27"
     }
     Frame {
         msec: 688
-        hash: "77e53358f2d4392d0ba988187e7e272c"
+        hash: "61624e674a0994cedae75b2e56958612"
     }
     Frame {
         msec: 704
-        hash: "3fbbb73e790cf4a0583531fe1580f761"
+        hash: "7f662b3978191ef5812ccad4d1d687b8"
     }
     Frame {
         msec: 720
-        hash: "9d562e141095a258ee61463e644d9889"
+        hash: "d07560950476d08ce51661356ea53753"
     }
     Frame {
         msec: 736
-        hash: "d05633ca49f96bf327bed5c9c0f6ac98"
+        hash: "1cbbf48c54d373bbb3fdfe42fe8396b7"
     }
     Frame {
         msec: 752
-        hash: "34c38e40e831dbede8fa83de31ed76aa"
+        hash: "f95205fb90069a13ab395d7a3e1775ad"
     }
     Frame {
         msec: 768
-        hash: "288e52c8be54f4914f687cef4ce1f24a"
+        hash: "f40a57afb29c1cc161f71a1b134a5d0d"
     }
     Frame {
         msec: 784
-        hash: "0b8b744aaf67e8b17fa459bb0ffb6db5"
+        hash: "3311a6a6197df79e5fcf2a1729368618"
     }
     Frame {
         msec: 800
-        hash: "273dbe3e8c21bfeafa516d07778928c8"
+        hash: "597ae977e27d0cac57b1fc8b0564a15b"
     }
     Frame {
         msec: 816
-        hash: "ef94ee1885287c72fa78038547d98b96"
+        hash: "aca451b1a1e8f727315f8d13d4b21aec"
     }
     Frame {
         msec: 832
-        hash: "965e6387672319ac04fdc42768e581f1"
+        hash: "c0437b88a05a7aa1b7b645b5151773d7"
     }
     Frame {
         msec: 848
-        hash: "95553d8aaece94c7017e57b03cd46c9a"
+        hash: "be8659747f0b6e76acaf17851b599b7b"
     }
     Frame {
         msec: 864
-        hash: "bdaf35b920e5b08b8639d452afd2d51e"
+        hash: "2b0033b95e853368cff2d6032ff707f6"
     }
     Frame {
         msec: 880
-        hash: "0ed16f00e89327dc8679bec42179c4ce"
+        hash: "12a747305311ea86ce681a3ff56f394f"
     }
     Frame {
         msec: 896
-        hash: "8c93e0ac399e09e98e34b90654e0e42a"
+        hash: "00b041e67e3ac3e1678eae72580107f7"
     }
     Frame {
         msec: 912
-        hash: "93798fbb33adb6c813018757cfa34017"
+        hash: "09f69db7a724401388e4b7fefeb3df89"
     }
     Frame {
         msec: 928
-        hash: "db4d7581e9a1f082a2c29ef7482a7893"
+        hash: "15e96d009e101d6869d1cc69e0a9092a"
     }
     Frame {
         msec: 944
-        hash: "67e074c1e083334de84a3549f4ee9ca4"
+        hash: "b1a900f6ca81bf556ef126211afb8b0c"
     }
     Frame {
         msec: 960
@@ -246,58 +246,1078 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "b1122c815a755c9988bcf03a3f7d7d6d"
+        hash: "87ea64b511b6d990f66cd4e3a141caf2"
     }
     Frame {
         msec: 992
-        hash: "31148bae6653bdc3f1827d06de845663"
+        hash: "cc5281bca844570d36ab193ba074dfcb"
     }
     Frame {
         msec: 1008
-        hash: "812428a944086ca46e102891964dac69"
+        hash: "cf430f604050734c455206b974587d76"
     }
     Frame {
         msec: 1024
-        hash: "ee7bb66bd7e8623325200ac994f8b41a"
+        hash: "b10b053a551dda58e626062b6721009f"
     }
     Frame {
         msec: 1040
-        hash: "6bd21a98e5c373a2c78334a0255e7750"
+        hash: "0ab24cb42bf4db645c779a48a060919d"
     }
     Frame {
         msec: 1056
-        hash: "2e8e1eea14068b0e82464ed52ec1ab7a"
+        hash: "0cba8d41e70c3ab23c55d02328954fd3"
     }
     Frame {
         msec: 1072
-        hash: "6dca5756e20eeb778e31d7b602ce77d7"
+        hash: "1f25027c81418c8f511d3d866948ea97"
     }
     Frame {
         msec: 1088
-        hash: "3cbb6700b9e30864a2b1e3d4d71d2a78"
+        hash: "d4ef5c5de73e515ea3eb841d87d3916c"
     }
     Frame {
         msec: 1104
-        hash: "c4d0230d2c4f73191a514e5df4c0b083"
+        hash: "bbdb93e72c966b3801cbc27a42f0e29f"
     }
     Frame {
         msec: 1120
-        hash: "a33df967fe43151dfc503d2ac78f8ca8"
+        hash: "f2b12153d449e6b2476af44272b6d54f"
     }
     Frame {
         msec: 1136
-        hash: "0c7ff101efe60b600cacaf8d04d79053"
+        hash: "5605809550a9c5151d3f6eb04de76587"
     }
     Frame {
         msec: 1152
-        hash: "d246cfb75d89b9666877860aaf45ba60"
+        hash: "c887e88030c58144e6bb253e369b3bac"
     }
     Frame {
         msec: 1168
-        hash: "1130998aa2618a29ec6bc4b9219eedfa"
+        hash: "9d9f4aaea9d55118fac9cf78e6785ef7"
     }
     Frame {
         msec: 1184
-        hash: "741dd83003633bbf8d28c2d4ddd8a2d0"
+        hash: "08dcb6457d8556aec27fdd38095f9058"
+    }
+    Frame {
+        msec: 1200
+        hash: "45052b296f95976b22d5933ced4e259c"
+    }
+    Frame {
+        msec: 1216
+        hash: "3bae979929efc4e3e315f3b00eb8da49"
+    }
+    Frame {
+        msec: 1232
+        hash: "af52455d0e2d8e30a4c27aaa58d61702"
+    }
+    Frame {
+        msec: 1248
+        hash: "760a6b74a31adb04f220e4bb7457bc2b"
+    }
+    Frame {
+        msec: 1264
+        hash: "bfb0d7dab25007c20a45f98f69fa97ff"
+    }
+    Frame {
+        msec: 1280
+        hash: "eac34dc1254c606a7b866e25967796dd"
+    }
+    Frame {
+        msec: 1296
+        hash: "f2577d86f3b90ff49339e9eb208b2b55"
+    }
+    Frame {
+        msec: 1312
+        hash: "11beecfe87619f1c90ab1aa79e5cc0d9"
+    }
+    Frame {
+        msec: 1328
+        hash: "8f721400a444750f11a9f6a5b1f9b1f1"
+    }
+    Frame {
+        msec: 1344
+        hash: "be5082d93788b91f251a174b2889b58f"
+    }
+    Frame {
+        msec: 1360
+        hash: "22527c1c29923577e90f506745230573"
+    }
+    Frame {
+        msec: 1376
+        hash: "a6ab98f02be95359a939a7841123ef17"
+    }
+    Frame {
+        msec: 1392
+        hash: "c23c3352261f3c94e5f329b6a872dda2"
+    }
+    Frame {
+        msec: 1408
+        hash: "0b4987678b416bafd922c47d2b540fe1"
+    }
+    Frame {
+        msec: 1424
+        hash: "8e3335e136e7ff01df146dcba4ae49c2"
+    }
+    Frame {
+        msec: 1440
+        hash: "28d20b81feb20325613d5a5d16238eb3"
+    }
+    Frame {
+        msec: 1456
+        hash: "04405979c68d1354f8b3fff03ad5ff5f"
+    }
+    Frame {
+        msec: 1472
+        hash: "51929671bccb25ec5fd9d6d6df29483b"
+    }
+    Frame {
+        msec: 1488
+        hash: "4bc938a8620242ca07e73adcd0219934"
+    }
+    Frame {
+        msec: 1504
+        hash: "73f5ddd56c836813a2754cefcddcecaa"
+    }
+    Frame {
+        msec: 1520
+        hash: "08ab374f2911207dddddf4cf18d26769"
+    }
+    Frame {
+        msec: 1536
+        hash: "0a91b4c009079159340040067dfc0cc8"
+    }
+    Frame {
+        msec: 1552
+        hash: "bdd54a222ba5bc0deb97e26071732e68"
+    }
+    Frame {
+        msec: 1568
+        hash: "1b75d3b34f7fd74451d22d03dd7e4e65"
+    }
+    Frame {
+        msec: 1584
+        hash: "a34ad1878b0bd1316d4ceb0c22709c6f"
+    }
+    Frame {
+        msec: 1600
+        hash: "8a25b513f0c6371e81065f3f0594ddfe"
+    }
+    Frame {
+        msec: 1616
+        hash: "09063acfe8bf1cbc521cd84ecd718930"
+    }
+    Frame {
+        msec: 1632
+        hash: "6607cab8e4b4b6a1671cdf63582b625b"
+    }
+    Frame {
+        msec: 1648
+        hash: "5662b3252b5dd640ce9055ff11c11e47"
+    }
+    Frame {
+        msec: 1664
+        hash: "2267ff61b2af23a15d6d5263d52c3ecb"
+    }
+    Frame {
+        msec: 1680
+        hash: "99d86069a3ea0c49a8f37f5124f2850b"
+    }
+    Frame {
+        msec: 1696
+        hash: "acfa238bcb12c6197acb990aa4ddc03f"
+    }
+    Frame {
+        msec: 1712
+        hash: "6c4c804f6e0e46fcfe25b04836db80f7"
+    }
+    Frame {
+        msec: 1728
+        hash: "5c1868d36ad767cd9923fab8605220dd"
+    }
+    Frame {
+        msec: 1744
+        hash: "a1279c79d3be6a62b5aebff4c66971e5"
+    }
+    Frame {
+        msec: 1760
+        hash: "f1d9f03f77b224ec355d4b5ae1ef8551"
+    }
+    Frame {
+        msec: 1776
+        hash: "3ad06495838986ef570f1c0f9d9f4a52"
+    }
+    Frame {
+        msec: 1792
+        hash: "e4122ccbc4da03797738a949654fb555"
+    }
+    Frame {
+        msec: 1808
+        hash: "0178b04a0c2e91b5a409c28a2b3c4cca"
+    }
+    Frame {
+        msec: 1824
+        hash: "04b3fdd361985d1f108551dafca851f6"
+    }
+    Frame {
+        msec: 1840
+        hash: "f7e8e73dcb009fc160122b64f2e4857e"
+    }
+    Frame {
+        msec: 1856
+        hash: "e8575db453082b6601107b20ec15fb86"
+    }
+    Frame {
+        msec: 1872
+        hash: "18b8bc3993275a0a1e096084ada871f0"
+    }
+    Frame {
+        msec: 1888
+        hash: "1a1229d6c945cc1a0df7ca4ac61dfff0"
+    }
+    Frame {
+        msec: 1904
+        hash: "bf43232fccfedfca1cac48206cacfaf2"
+    }
+    Frame {
+        msec: 1920
+        image: "multilength.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "c0c2396b5e5dc36853a28d6c5a6274f3"
+    }
+    Frame {
+        msec: 1952
+        hash: "9b49951115444bf17e96ded2837e5eff"
+    }
+    Frame {
+        msec: 1968
+        hash: "422d01a547ce612233bfa5e85bf73c7f"
+    }
+    Frame {
+        msec: 1984
+        hash: "fe2cb2fb4aefb5da1cf27e709a0acd5f"
+    }
+    Frame {
+        msec: 2000
+        hash: "e106fbd81f7a057e3bf5d8a42c92e4f1"
+    }
+    Frame {
+        msec: 2016
+        hash: "b1b60361a929ccb109a9e9e8a10065d0"
+    }
+    Frame {
+        msec: 2032
+        hash: "35858a35e56a48804d3cedda908ca2eb"
+    }
+    Frame {
+        msec: 2048
+        hash: "a8fb42ed2c55d3396133acf28064283c"
+    }
+    Frame {
+        msec: 2064
+        hash: "479291530784175abc7d564ac2319d2a"
+    }
+    Frame {
+        msec: 2080
+        hash: "75e7b2930143d610659cf42a3604374e"
+    }
+    Frame {
+        msec: 2096
+        hash: "3d9438b11c89d76353943e5d2f656e7d"
+    }
+    Frame {
+        msec: 2112
+        hash: "cb23d7c508c8e3169bab39aaa4de01fd"
+    }
+    Frame {
+        msec: 2128
+        hash: "bc7805e391bc272a837c9b1df9cf8f77"
+    }
+    Frame {
+        msec: 2144
+        hash: "020d270f6a93e05dacd70a2b41a3ea8a"
+    }
+    Frame {
+        msec: 2160
+        hash: "8f23f9ea2fa630111f0481b6a6ec09a6"
+    }
+    Frame {
+        msec: 2176
+        hash: "6b42c823da044ae69d9600260d7437e6"
+    }
+    Frame {
+        msec: 2192
+        hash: "d31e1a434a9fcd12e439640776f8c8be"
+    }
+    Frame {
+        msec: 2208
+        hash: "48bb7782d57e195d3f0f3dfb25fed571"
+    }
+    Frame {
+        msec: 2224
+        hash: "76922f380f3c6c83edb5ff2a4208a4d0"
+    }
+    Frame {
+        msec: 2240
+        hash: "9027d61a3b91a9f56230f4ee740b6db8"
+    }
+    Frame {
+        msec: 2256
+        hash: "043455a71c91e3d65f1eed632b152fea"
+    }
+    Frame {
+        msec: 2272
+        hash: "6bfc058bd9f8986d306606f8c7b06ae2"
+    }
+    Frame {
+        msec: 2288
+        hash: "49f1e17d33f1ac690bcac7e85668cb3b"
+    }
+    Frame {
+        msec: 2304
+        hash: "2090befb760a16d73bea960a6e835405"
+    }
+    Frame {
+        msec: 2320
+        hash: "e99382309c4419f38642333386595211"
+    }
+    Frame {
+        msec: 2336
+        hash: "2c7a49bcb6eca031984d7a96b607d402"
+    }
+    Frame {
+        msec: 2352
+        hash: "b55be701b19739713d532f3d6cbd5393"
+    }
+    Frame {
+        msec: 2368
+        hash: "fdad916849eeae7b9b276f57bb022321"
+    }
+    Frame {
+        msec: 2384
+        hash: "e3a8dd9da5c767a60dab121fb3a2811b"
+    }
+    Frame {
+        msec: 2400
+        hash: "73262e2250337b8f02d8e672b66ae273"
+    }
+    Frame {
+        msec: 2416
+        hash: "84dca99c97f837ecfb9b3195db556687"
+    }
+    Frame {
+        msec: 2432
+        hash: "4f82d7a5f3b286a2d8ccc0a07c35a1a0"
+    }
+    Frame {
+        msec: 2448
+        hash: "63f6eec01262783a421040dd44740577"
+    }
+    Frame {
+        msec: 2464
+        hash: "e98f39a3a9379155081014cdf761c055"
+    }
+    Frame {
+        msec: 2480
+        hash: "c084db070c74596551190dd49dfc2ed2"
+    }
+    Frame {
+        msec: 2496
+        hash: "f6866290d95f0d85fcf05de39bcadcc7"
+    }
+    Frame {
+        msec: 2512
+        hash: "d919eb26a2d8874ed1e4051769b525c6"
+    }
+    Frame {
+        msec: 2528
+        hash: "1967d42c7a23b8d11e6accf27de24ce7"
+    }
+    Frame {
+        msec: 2544
+        hash: "2fe4f7fe66f820b2738598e85da9f0b9"
+    }
+    Frame {
+        msec: 2560
+        hash: "4fa2b66d2d4beaa56ed8c387b62f4817"
+    }
+    Frame {
+        msec: 2576
+        hash: "eef73ebb85223a5f99b5f5ec7dfaae94"
+    }
+    Frame {
+        msec: 2592
+        hash: "acb7a8c1939633f16e8b7989b2d598c2"
+    }
+    Frame {
+        msec: 2608
+        hash: "b5e67eb3ace1d1d7f9fa1f1c907bd442"
+    }
+    Frame {
+        msec: 2624
+        hash: "552035a9d76f4dd65d86533535c00a5d"
+    }
+    Frame {
+        msec: 2640
+        hash: "d2e25e33232ec8ddd326818fabf15a65"
+    }
+    Frame {
+        msec: 2656
+        hash: "65c4dfbb48c1c9115c37ed5c294d7bd1"
+    }
+    Frame {
+        msec: 2672
+        hash: "3aceb756fa460a767194f2923871e2d3"
+    }
+    Frame {
+        msec: 2688
+        hash: "759a7bd99c6e630929216eb89f6b27fa"
+    }
+    Frame {
+        msec: 2704
+        hash: "81aa0091d86f745bcddd279473df1f8d"
+    }
+    Frame {
+        msec: 2720
+        hash: "cce5b12ab54251ea6df458d492bc92e9"
+    }
+    Frame {
+        msec: 2736
+        hash: "5637b7aeb8b9d754e0a96b6f5d0dcb03"
+    }
+    Frame {
+        msec: 2752
+        hash: "ad7644a8994888bc562590ff8942eabf"
+    }
+    Frame {
+        msec: 2768
+        hash: "490a3da685f73c45f4be697c3f37ccd1"
+    }
+    Frame {
+        msec: 2784
+        hash: "190cc35ecc32ed8ea6ebd135fb8d7a00"
+    }
+    Frame {
+        msec: 2800
+        hash: "89511367c186947f9173dc30932c4454"
+    }
+    Frame {
+        msec: 2816
+        hash: "880c05184406232db9d3830e46d47bd7"
+    }
+    Frame {
+        msec: 2832
+        hash: "db907e2573c385bc2545cfba4fda4be1"
+    }
+    Frame {
+        msec: 2848
+        hash: "c96ad05fd3ab4cd71d33738448029e0c"
+    }
+    Frame {
+        msec: 2864
+        hash: "112ecf3b2fcd5919402842044d052272"
+    }
+    Frame {
+        msec: 2880
+        image: "multilength.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "dc1aa5563a76f20d8200fbd9794b3249"
+    }
+    Frame {
+        msec: 2912
+        hash: "3f72adedabe9e2896750e2738df71566"
+    }
+    Frame {
+        msec: 2928
+        hash: "3f78a5a9312126e6a6ca699886dd05d0"
+    }
+    Frame {
+        msec: 2944
+        hash: "75a199efbdf119abbc1598137e974e28"
+    }
+    Frame {
+        msec: 2960
+        hash: "e4d068e2ba9c65a0e910faf431e4df7e"
+    }
+    Frame {
+        msec: 2976
+        hash: "817e686a44b4eaced58c251facd5e89d"
+    }
+    Frame {
+        msec: 2992
+        hash: "0c5e7217f5b68e0b2158c512f66177c2"
+    }
+    Frame {
+        msec: 3008
+        hash: "253a765019170fe4f649825b4cd17832"
+    }
+    Frame {
+        msec: 3024
+        hash: "cf3f774316868179f6766e5dbdab2b17"
+    }
+    Frame {
+        msec: 3040
+        hash: "7cf30923200a9b8524909bdfbb20b33c"
+    }
+    Frame {
+        msec: 3056
+        hash: "1dd14bc90dfab3d8864c177e56c25b63"
+    }
+    Frame {
+        msec: 3072
+        hash: "aaa4074319d1656b58f874d6843e66c4"
+    }
+    Frame {
+        msec: 3088
+        hash: "b2a3479eb8087138f20b0dbd539f0592"
+    }
+    Frame {
+        msec: 3104
+        hash: "1ab4358f6008ce87a5b1c6a54d04b343"
+    }
+    Frame {
+        msec: 3120
+        hash: "4425e58b30da6edd1730421e990dd6e7"
+    }
+    Frame {
+        msec: 3136
+        hash: "9b4e62af65c064ca2fe4de5d03255b56"
+    }
+    Frame {
+        msec: 3152
+        hash: "edf9b8b0cc18942b23c03ee1ed837dd6"
+    }
+    Frame {
+        msec: 3168
+        hash: "b05a1bc33ce2e4c2383f7ecc9544020c"
+    }
+    Frame {
+        msec: 3184
+        hash: "73304724e5b4d7c556859da310c31a0a"
+    }
+    Frame {
+        msec: 3200
+        hash: "4cf88e365cd9651e2fb86452ff81e4be"
+    }
+    Frame {
+        msec: 3216
+        hash: "7b42902b17781f98075bfdf50950addd"
+    }
+    Frame {
+        msec: 3232
+        hash: "8806b9cb7e352a67b23085593b61606b"
+    }
+    Frame {
+        msec: 3248
+        hash: "d2fdf78fa3b7261683f2ed4f2dee62c8"
+    }
+    Frame {
+        msec: 3264
+        hash: "dafa72fd7aae2c9bfa5f6aa2694235d2"
+    }
+    Frame {
+        msec: 3280
+        hash: "d784b9b39ab063ab68b85d6485257ce0"
+    }
+    Frame {
+        msec: 3296
+        hash: "991ef068c26b304fb19d03fdfeb2e3f4"
+    }
+    Frame {
+        msec: 3312
+        hash: "c6014d497f4db9121c539a53115a847f"
+    }
+    Frame {
+        msec: 3328
+        hash: "88c778d811febd165e28ae7698f774b8"
+    }
+    Frame {
+        msec: 3344
+        hash: "51fbf553794b8a2303d2e0dff44c80fa"
+    }
+    Frame {
+        msec: 3360
+        hash: "ba1abdcf3a04231ce9439cb6d93e8717"
+    }
+    Frame {
+        msec: 3376
+        hash: "56a5d2fe8af1ef1e08ce545eb65e6ba0"
+    }
+    Frame {
+        msec: 3392
+        hash: "8337eb7d11500676921de0b13812ca02"
+    }
+    Frame {
+        msec: 3408
+        hash: "8f50f53ed00ad9b9bbf9423b3274efa7"
+    }
+    Frame {
+        msec: 3424
+        hash: "bf5ca931d00d3dc4fcfe5e93d08bde2f"
+    }
+    Frame {
+        msec: 3440
+        hash: "f2619492bbb96bd3958f4d61bb23c42e"
+    }
+    Frame {
+        msec: 3456
+        hash: "3b1afefbc7e0990059bd3990f17a7312"
+    }
+    Frame {
+        msec: 3472
+        hash: "30041f2cb8c071e7dc8f9c8ef1e49743"
+    }
+    Frame {
+        msec: 3488
+        hash: "f8bef9f28823fdebec0b39e1044ac03c"
+    }
+    Frame {
+        msec: 3504
+        hash: "4c0282e6a48dbbcdbbffde55457eee12"
+    }
+    Frame {
+        msec: 3520
+        hash: "7956ea76120b9292b2f3c6123187ac0e"
+    }
+    Frame {
+        msec: 3536
+        hash: "dce82656442ff1a0823bac5ded7c0290"
+    }
+    Frame {
+        msec: 3552
+        hash: "96151e49fd0f07817d27583c22afe30f"
+    }
+    Frame {
+        msec: 3568
+        hash: "262a38546540ecb81065cbdbace4fa28"
+    }
+    Frame {
+        msec: 3584
+        hash: "4ea3a1a93be2ef25ca6f05d144b50d3b"
+    }
+    Frame {
+        msec: 3600
+        hash: "77d321f837b720d4e63fb028e885dce7"
+    }
+    Frame {
+        msec: 3616
+        hash: "e0e40d426a13ef3d9caa6ba474a1a460"
+    }
+    Frame {
+        msec: 3632
+        hash: "6bd5645b808206dd9a4e9c0e423db06b"
+    }
+    Frame {
+        msec: 3648
+        hash: "791538cf21cfa32ab4595137a655e0a3"
+    }
+    Frame {
+        msec: 3664
+        hash: "59266a6f73c217f0c68f7dac69d4b25d"
+    }
+    Frame {
+        msec: 3680
+        hash: "ee730ce23e84942c5fe2587ce0ecd3f6"
+    }
+    Frame {
+        msec: 3696
+        hash: "b1353eee7a68d1ab0057ab7a6dd0774c"
+    }
+    Frame {
+        msec: 3712
+        hash: "0ea828127568afa52ecc31e335e69d11"
+    }
+    Frame {
+        msec: 3728
+        hash: "d95fc327253500563d0e05a4b80a7c8a"
+    }
+    Frame {
+        msec: 3744
+        hash: "e3aff011332ccf9cbebbff2803733038"
+    }
+    Frame {
+        msec: 3760
+        hash: "27ee147b62bfa2d1183321bba3ccb8d3"
+    }
+    Frame {
+        msec: 3776
+        hash: "245578d636b5486da0210a0dd7b84a80"
+    }
+    Frame {
+        msec: 3792
+        hash: "87be77d90d9e7a2d282026e63d14ddfd"
+    }
+    Frame {
+        msec: 3808
+        hash: "25cf672e69b7c61eab9f53437b40956e"
+    }
+    Frame {
+        msec: 3824
+        hash: "10606e7b0ecb8ec204fe025aece90004"
+    }
+    Frame {
+        msec: 3840
+        image: "multilength.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "a3c411c8c3da3975205994a7da97320f"
+    }
+    Frame {
+        msec: 3872
+        hash: "1491ce2867ad4f116e705d259b773550"
+    }
+    Frame {
+        msec: 3888
+        hash: "8f2fe6175fa45213d84e4c0b0b7cb4a7"
+    }
+    Frame {
+        msec: 3904
+        hash: "bc77ad13f5015fc1b5bb85dc51b207b3"
+    }
+    Frame {
+        msec: 3920
+        hash: "5fb9a7834a5358077952c20ca025fcf0"
+    }
+    Frame {
+        msec: 3936
+        hash: "09ba094e2cfb1033019e85f66910a593"
+    }
+    Frame {
+        msec: 3952
+        hash: "43db976e63a8fd71da67198942aa7943"
+    }
+    Frame {
+        msec: 3968
+        hash: "6298a0aa4b84ee1722d83897b3553fe1"
+    }
+    Frame {
+        msec: 3984
+        hash: "6b87ba7d3fe468229b29cd28590e17b1"
+    }
+    Frame {
+        msec: 4000
+        hash: "1b4e219629a1f19b135544ac2e961788"
+    }
+    Frame {
+        msec: 4016
+        hash: "087e95cbd0549be1bbe4a32520858514"
+    }
+    Frame {
+        msec: 4032
+        hash: "2c51a434fc3633623e10bedeba4e260d"
+    }
+    Frame {
+        msec: 4048
+        hash: "f29b87d80779a7f4d38e8058d984c386"
+    }
+    Frame {
+        msec: 4064
+        hash: "b8055e4b3c2ee551a7becf176cd173e3"
+    }
+    Frame {
+        msec: 4080
+        hash: "3c35391e1c1d230e0a085cb7f7f0e8ef"
+    }
+    Frame {
+        msec: 4096
+        hash: "dd8a63cdeefc6ce5a35ceb700f7b3755"
+    }
+    Frame {
+        msec: 4112
+        hash: "5b4a322f768d426a56a82d714cf4f705"
+    }
+    Frame {
+        msec: 4128
+        hash: "08830f630c15419d79c459891a8fff64"
+    }
+    Frame {
+        msec: 4144
+        hash: "84c90e454dcdbf00c441ff326760d2cd"
+    }
+    Frame {
+        msec: 4160
+        hash: "17c7311faee569b077f85848f7155319"
+    }
+    Frame {
+        msec: 4176
+        hash: "17b5aeff8f03828c1851a6b984d4e69e"
+    }
+    Frame {
+        msec: 4192
+        hash: "3bcc28ab875d3b5f62df0d5cede3e850"
+    }
+    Frame {
+        msec: 4208
+        hash: "a4c861d766af1378e21a91a6e1bca06d"
+    }
+    Frame {
+        msec: 4224
+        hash: "fa6e17c9c35c41ac5270a55f0cc4dcd2"
+    }
+    Frame {
+        msec: 4240
+        hash: "48d8c7ce0b6f2e9840a2f5cb40e41449"
+    }
+    Frame {
+        msec: 4256
+        hash: "713a391414fffe3cf01248e7c0919d71"
+    }
+    Frame {
+        msec: 4272
+        hash: "472282080ae357f5fb0dac1bf411f6f5"
+    }
+    Frame {
+        msec: 4288
+        hash: "660d37f1b3c5dd6e2de22ad2be818675"
+    }
+    Frame {
+        msec: 4304
+        hash: "334f12d83fdc7bd8f3d97697061a75f8"
+    }
+    Frame {
+        msec: 4320
+        hash: "4bfe83273913bad702290db2b1c81d52"
+    }
+    Frame {
+        msec: 4336
+        hash: "9ddc0238b0fbb42c503da8782d750d81"
+    }
+    Frame {
+        msec: 4352
+        hash: "43081559ed8f1d62baed1ab5dde34c5c"
+    }
+    Frame {
+        msec: 4368
+        hash: "4bf955a94901588cf37a1fe9b82feef3"
+    }
+    Frame {
+        msec: 4384
+        hash: "3a3a987096f2a11f495af4ee20c2452b"
+    }
+    Frame {
+        msec: 4400
+        hash: "290647a4f73c42ea33f841281bf6f3d6"
+    }
+    Frame {
+        msec: 4416
+        hash: "1a18f4f658997710aa7be9409c75a602"
+    }
+    Frame {
+        msec: 4432
+        hash: "1bc52bc68633464654410f59bf97142b"
+    }
+    Frame {
+        msec: 4448
+        hash: "33e3a5e0ec745046f7a7cceffd516a71"
+    }
+    Frame {
+        msec: 4464
+        hash: "7e61c48d2e0e6e195d527d6aeb4ffe8c"
+    }
+    Frame {
+        msec: 4480
+        hash: "42c42f7e02f6cd72afa92cf97494a1eb"
+    }
+    Frame {
+        msec: 4496
+        hash: "d1876d371284e41f4d553a470a9970fb"
+    }
+    Frame {
+        msec: 4512
+        hash: "479960a289b598591a4bf3c66dc6258a"
+    }
+    Frame {
+        msec: 4528
+        hash: "0ea8965e095c73499b5abc4ac44e07ef"
+    }
+    Frame {
+        msec: 4544
+        hash: "cc7fe014a856896ce3871743e552d6f2"
+    }
+    Frame {
+        msec: 4560
+        hash: "5b3cd6bec24ae4a215ec28651e9a3ed0"
+    }
+    Frame {
+        msec: 4576
+        hash: "63d60a2c6d27e30dda001c202446d221"
+    }
+    Frame {
+        msec: 4592
+        hash: "22f30d377fb90c433881d17211a9f9bd"
+    }
+    Frame {
+        msec: 4608
+        hash: "acfbf010e93723185792009ed372ccb9"
+    }
+    Frame {
+        msec: 4624
+        hash: "91f3335706d5037d9c579091e29d1219"
+    }
+    Frame {
+        msec: 4640
+        hash: "83ad6be4ecaa6495b25f9b55bb11796a"
+    }
+    Frame {
+        msec: 4656
+        hash: "39a68ee7f4ddb8059ef42eb9e42b7659"
+    }
+    Frame {
+        msec: 4672
+        hash: "0ad1facc49beaa2c3510fe1612ba3b4f"
+    }
+    Frame {
+        msec: 4688
+        hash: "d780a7f3dc1a313d462084fffda989c7"
+    }
+    Frame {
+        msec: 4704
+        hash: "0f1ad6155d4ed2a11d2fa91c63b62678"
+    }
+    Frame {
+        msec: 4720
+        hash: "26f4bb010704911d87b96a9f31a0a121"
+    }
+    Frame {
+        msec: 4736
+        hash: "7772aaabb6418d71fb7566a0aac4279f"
+    }
+    Frame {
+        msec: 4752
+        hash: "47bf1ec73915b369d653ff71ce7758da"
+    }
+    Frame {
+        msec: 4768
+        hash: "fcc1ed23c1678bf1b11bf59dbaba5186"
+    }
+    Frame {
+        msec: 4784
+        hash: "0d66fbc0b99c35dae53e1026c2041252"
+    }
+    Frame {
+        msec: 4800
+        image: "multilength.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "d1fbba4331fd640a40fe7e07fcfce20b"
+    }
+    Frame {
+        msec: 4832
+        hash: "f79f9ac08c779fd1646450ef4cc21f01"
+    }
+    Frame {
+        msec: 4848
+        hash: "2095da58125d29b815c44ec9a22598d3"
+    }
+    Frame {
+        msec: 4864
+        hash: "01d4805a90443a6c20a5ae2cb83ec151"
+    }
+    Frame {
+        msec: 4880
+        hash: "f329ce7199c2137e8c32a25f96ee5c6b"
+    }
+    Frame {
+        msec: 4896
+        hash: "72c0c2c7660974827acc1fcb54e7ca6c"
+    }
+    Frame {
+        msec: 4912
+        hash: "6902d2a637733171699684baf07bb86e"
+    }
+    Frame {
+        msec: 4928
+        hash: "615683e3bc07792ee38ca8146657a88a"
+    }
+    Frame {
+        msec: 4944
+        hash: "9fe981f60fd1d974f063fccd2ae205ab"
+    }
+    Frame {
+        msec: 4960
+        hash: "b403e21b14646ac0cdaee2027125c0ad"
+    }
+    Frame {
+        msec: 4976
+        hash: "d037545cc68b7582c400c8c9da49ff2a"
+    }
+    Frame {
+        msec: 4992
+        hash: "551435ecb008ff217eb65a5a77a28090"
+    }
+    Frame {
+        msec: 5008
+        hash: "a1684c1c0938386bbfb309969114beee"
+    }
+    Frame {
+        msec: 5024
+        hash: "a9dc5058e29f9c129087eaa013002185"
+    }
+    Frame {
+        msec: 5040
+        hash: "5d06ae83ab9cc218175013042922b908"
+    }
+    Frame {
+        msec: 5056
+        hash: "e225de5dc21fee719ebc43fa8838f841"
+    }
+    Frame {
+        msec: 5072
+        hash: "b89bf31a945cb6c880e95bf2d2a6e944"
+    }
+    Frame {
+        msec: 5088
+        hash: "fa54db3c383bc1da121c0d3b09e942d3"
+    }
+    Frame {
+        msec: 5104
+        hash: "2c126bf2d794039e1380595b9c40ae2e"
+    }
+    Frame {
+        msec: 5120
+        hash: "1e9639693e5ec1edb72e71d126c434bb"
+    }
+    Frame {
+        msec: 5136
+        hash: "3a58b1900912a5a6ace72757f3af4d1a"
+    }
+    Frame {
+        msec: 5152
+        hash: "11a846d93430e622a9750e4e2a7b76fe"
+    }
+    Frame {
+        msec: 5168
+        hash: "801d7707e86b776fe2459c42b26337f5"
+    }
+    Frame {
+        msec: 5184
+        hash: "6d29c12395050b049537819cf0a65746"
+    }
+    Frame {
+        msec: 5200
+        hash: "5a68af870474ffb8a694710b10f52bc7"
+    }
+    Frame {
+        msec: 5216
+        hash: "09dd10566eda09e0366b7bf0a8ce9e1b"
+    }
+    Frame {
+        msec: 5232
+        hash: "f43b377f99f74e2cf07e419887f7ee0b"
+    }
+    Frame {
+        msec: 5248
+        hash: "108287fc253d36a5ebf8582ef2a5fd57"
+    }
+    Frame {
+        msec: 5264
+        hash: "a4b6df2874ce48ed5a17aab43f32e665"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.0.png
deleted file mode 100644
index 1a8c89b..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.qml
deleted file mode 100644
index 3b8ae0c..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.qml
+++ /dev/null
@@ -1,279 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 32
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 48
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 64
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 80
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 96
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 112
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 128
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 144
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 160
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 176
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 192
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 208
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 224
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 240
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 256
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 272
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 288
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 304
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 320
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 336
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 352
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 368
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 384
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 400
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 416
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 432
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 448
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 464
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 480
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 496
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 512
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 528
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 544
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 560
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 576
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 592
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 608
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 624
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 640
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 656
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 672
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 688
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 704
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 720
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 736
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 752
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 768
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 784
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 800
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 816
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 832
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 848
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 864
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 880
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 896
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 912
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 928
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 944
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 960
-        image: "elide.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 992
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1008
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1024
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1040
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1056
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.0.png
deleted file mode 100644
index 3dfade5..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.1.png
deleted file mode 100644
index 1ee2076..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.2.png
deleted file mode 100644
index ae680be..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.3.png
deleted file mode 100644
index c2859be..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.qml
deleted file mode 100644
index 27fbaf4..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.qml
+++ /dev/null
@@ -1,991 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 32
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 48
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 64
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 80
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 96
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 112
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 128
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 144
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 160
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 176
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 192
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 208
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 224
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 240
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 256
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 272
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 288
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 304
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 320
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 336
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 352
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 368
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 384
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 400
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 416
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 432
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 448
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 464
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 480
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 496
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 512
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 528
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 544
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 560
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 576
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 592
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 608
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 624
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 640
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 656
-        hash: "3f362ad550db910f1d9f261557c65913"
-    }
-    Frame {
-        msec: 672
-        hash: "3f362ad550db910f1d9f261557c65913"
-    }
-    Frame {
-        msec: 688
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 704
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 720
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 736
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 752
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 768
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 784
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 800
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 816
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 832
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 848
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 864
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 880
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 896
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 912
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 928
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 944
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 960
-        image: "elide2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 992
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
-    }
-    Frame {
-        msec: 1008
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
-    }
-    Frame {
-        msec: 1024
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1040
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1056
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1072
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1088
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1104
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1120
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1136
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1152
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1168
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1184
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1200
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1216
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1232
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1248
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1264
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1280
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1296
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1312
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1328
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1344
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1360
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1376
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1392
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1408
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1424
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1440
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1456
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1472
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1488
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1504
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1520
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1536
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1552
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1568
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1584
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1600
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1616
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1632
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1648
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1664
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1680
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1696
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1712
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1728
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1744
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1760
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1776
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1792
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1808
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1824
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1840
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1856
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1872
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1888
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1904
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1920
-        image: "elide2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1952
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1968
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 1984
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2000
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2016
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2032
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2048
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2064
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2080
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2096
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2112
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2128
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2144
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2160
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2176
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2192
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2208
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2224
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2240
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2256
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2272
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
-    }
-    Frame {
-        msec: 2288
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
-    }
-    Frame {
-        msec: 2304
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2320
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2336
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2352
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2368
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2384
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2400
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2416
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2432
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2448
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2464
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2480
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2496
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2512
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2528
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2544
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2560
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2576
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2592
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2608
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2624
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2640
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2656
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2672
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2688
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2704
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2720
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2736
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2752
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2768
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2784
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2800
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2816
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2832
-        hash: "f44b88b80219497370b5d2ad380d03bf"
-    }
-    Frame {
-        msec: 2848
-        hash: "f44b88b80219497370b5d2ad380d03bf"
-    }
-    Frame {
-        msec: 2864
-        hash: "a093510751799f3466156f9775988044"
-    }
-    Frame {
-        msec: 2880
-        image: "elide2.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "a093510751799f3466156f9775988044"
-    }
-    Frame {
-        msec: 2912
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2928
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2944
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2960
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2976
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2992
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3008
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3024
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3040
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3056
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3072
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3088
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3104
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3120
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
-    }
-    Frame {
-        msec: 3136
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
-    }
-    Frame {
-        msec: 3152
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3168
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3184
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3200
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3216
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3232
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3248
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3264
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3280
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3296
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3312
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3328
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3344
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3360
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3376
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3392
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3408
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
-    }
-    Frame {
-        msec: 3424
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
-    }
-    Frame {
-        msec: 3440
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3456
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3472
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3488
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3504
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3520
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3536
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3552
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3568
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3584
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3600
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3616
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3632
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3648
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3664
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3680
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3696
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
-    }
-    Frame {
-        msec: 3712
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
-    }
-    Frame {
-        msec: 3728
-        hash: "b6dba4a456cd8d1b62501039cb796625"
-    }
-    Frame {
-        msec: 3744
-        hash: "b6dba4a456cd8d1b62501039cb796625"
-    }
-    Frame {
-        msec: 3760
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3776
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3792
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3808
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3824
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3840
-        image: "elide2.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
-    }
-    Frame {
-        msec: 3872
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
-    }
-    Frame {
-        msec: 3888
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
-    }
-    Frame {
-        msec: 3904
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
deleted file mode 100644
index 67b497f..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
deleted file mode 100644
index a39c340..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
+++ /dev/null
@@ -1,351 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 32
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 48
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 64
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 80
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 96
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 112
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 128
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 144
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 160
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 176
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 192
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 208
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 224
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 240
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 256
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 272
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 288
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 304
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 320
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 336
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 352
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 368
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 384
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 400
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 416
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 432
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 448
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 464
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 480
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 496
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 512
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 528
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 544
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 560
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 576
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 592
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 608
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 624
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 640
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 656
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 672
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 688
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 704
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 720
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 736
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 752
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 768
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 784
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 800
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 816
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 832
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 848
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 864
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 880
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 896
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 912
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 928
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 944
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 960
-        image: "plaintext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 992
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1008
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1024
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1040
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1056
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1072
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1088
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1104
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1120
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1136
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1152
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1168
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1184
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1216
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1232
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1248
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1264
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1280
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1296
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1312
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1328
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1344
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
deleted file mode 100644
index 6379942..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml
deleted file mode 100644
index 8529b92..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml
+++ /dev/null
@@ -1,359 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 32
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 48
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 64
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 80
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 96
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 112
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 128
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 144
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 160
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 176
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 192
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 208
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 224
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 240
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 256
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 272
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 288
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 304
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 320
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 336
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 352
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 368
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 384
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 400
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 416
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 432
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 448
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 464
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 480
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 496
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 512
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 528
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 544
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 560
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 576
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 592
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 608
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 624
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 640
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 656
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 672
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 688
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 704
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 720
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 736
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 752
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 768
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 784
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 800
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 816
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 832
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 848
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 864
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 880
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 896
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 912
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 928
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 944
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 960
-        image: "richtext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 992
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1008
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1024
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1040
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1056
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1072
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1088
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1104
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1120
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1136
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1152
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1168
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1184
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1200
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1216
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1232
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1248
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1264
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1280
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1296
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1312
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1328
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1344
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1360
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1376
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png
deleted file mode 100644
index 50d56dc..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
deleted file mode 100644
index bf3aea6..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
+++ /dev/null
@@ -1,351 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 32
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 48
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 64
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 80
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 96
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 112
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 128
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 144
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 160
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 176
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 192
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 208
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 224
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 240
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 256
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 272
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 288
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 304
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 320
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 336
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 352
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 368
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 384
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 400
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 416
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 432
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 448
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 464
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 480
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 496
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 512
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 528
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 544
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 560
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 576
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 592
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 608
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 624
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 640
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 656
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 672
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 688
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 704
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 720
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 736
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 752
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 768
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 784
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 800
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 816
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 832
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 848
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 864
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 880
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 896
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 912
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 928
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 944
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 960
-        image: "plaintext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 992
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1008
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1024
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1040
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1056
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1072
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1088
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1104
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1120
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1136
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1152
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1168
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1184
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1216
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1232
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1248
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1264
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1280
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1296
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1312
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1328
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1344
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png
deleted file mode 100644
index 2910670..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml
deleted file mode 100644
index 4a87240..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml
+++ /dev/null
@@ -1,359 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 32
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 48
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 64
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 80
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 96
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 112
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 128
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 144
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 160
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 176
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 192
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 208
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 224
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 240
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 256
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 272
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 288
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 304
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 320
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 336
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 352
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 368
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 384
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 400
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 416
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 432
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 448
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 464
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 480
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 496
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 512
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 528
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 544
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 560
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 576
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 592
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 608
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 624
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 640
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 656
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 672
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 688
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 704
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 720
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 736
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 752
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 768
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 784
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 800
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 816
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 832
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 848
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 864
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 880
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 896
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 912
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 928
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 944
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 960
-        image: "richtext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 992
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1008
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1024
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1040
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1056
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1072
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1088
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1104
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1120
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1136
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1152
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1168
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1184
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1200
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1216
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1232
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1248
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1264
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1280
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1296
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1312
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1328
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1344
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1360
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1376
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-}
-- 
cgit v0.12


From 46bcfe78c17e35c378b7788fdd8dcd0f38ade9f0 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 18:57:01 +1000
Subject: Cleanup qmlvisual/qdeclarativetextedit tests

Platform visuals and working again after a long period of neglect

Task-number: QTBUG-14792
---
 .../qdeclarativetextedit/MultilineEdit.qml         |    3 +-
 .../qdeclarativetextedit/cursorDelegate.qml        |   15 +-
 .../data-X11/cursorDelegate.0.png                  |  Bin 0 -> 3171 bytes
 .../data-X11/cursorDelegate.1.png                  |  Bin 0 -> 3603 bytes
 .../data-X11/cursorDelegate.2.png                  |  Bin 0 -> 3152 bytes
 .../data-X11/cursorDelegate.3.png                  |  Bin 0 -> 3147 bytes
 .../data-X11/cursorDelegate.4.png                  |  Bin 0 -> 3145 bytes
 .../data-X11/cursorDelegate.5.png                  |  Bin 0 -> 3147 bytes
 .../data-X11/cursorDelegate.6.png                  |  Bin 0 -> 3145 bytes
 .../data-X11/cursorDelegate.7.png                  |  Bin 0 -> 3146 bytes
 .../data-X11/cursorDelegate.8.png                  |  Bin 0 -> 3144 bytes
 .../data-X11/cursorDelegate.9.png                  |  Bin 0 -> 3135 bytes
 .../data-X11/cursorDelegate.qml                    | 1499 +++++++
 .../qdeclarativetextedit/data-X11/qt-669.0.png     |  Bin 0 -> 2483 bytes
 .../qdeclarativetextedit/data-X11/qt-669.1.png     |  Bin 0 -> 2474 bytes
 .../qdeclarativetextedit/data-X11/qt-669.2.png     |  Bin 0 -> 2480 bytes
 .../qdeclarativetextedit/data-X11/qt-669.3.png     |  Bin 0 -> 2443 bytes
 .../qdeclarativetextedit/data-X11/qt-669.qml       | 1371 ++++++
 .../data-X11/usingMultilineEdit.0.png              |  Bin 0 -> 4006 bytes
 .../data-X11/usingMultilineEdit.1.png              |  Bin 0 -> 4293 bytes
 .../data-X11/usingMultilineEdit.10.png             |  Bin 0 -> 6074 bytes
 .../data-X11/usingMultilineEdit.11.png             |  Bin 0 -> 6074 bytes
 .../data-X11/usingMultilineEdit.2.png              |  Bin 0 -> 4683 bytes
 .../data-X11/usingMultilineEdit.3.png              |  Bin 0 -> 5114 bytes
 .../data-X11/usingMultilineEdit.4.png              |  Bin 0 -> 5270 bytes
 .../data-X11/usingMultilineEdit.5.png              |  Bin 0 -> 5401 bytes
 .../data-X11/usingMultilineEdit.6.png              |  Bin 0 -> 5591 bytes
 .../data-X11/usingMultilineEdit.7.png              |  Bin 0 -> 5261 bytes
 .../data-X11/usingMultilineEdit.8.png              |  Bin 0 -> 6072 bytes
 .../data-X11/usingMultilineEdit.9.png              |  Bin 0 -> 6074 bytes
 .../data-X11/usingMultilineEdit.qml                | 4687 ++++++++++++++++++++
 .../qdeclarativetextedit/data-X11/wrap.0.png       |  Bin 1110 -> 8764 bytes
 .../qdeclarativetextedit/data-X11/wrap.1.png       |  Bin 1110 -> 8922 bytes
 .../qdeclarativetextedit/data-X11/wrap.2.png       |  Bin 1110 -> 9175 bytes
 .../qdeclarativetextedit/data-X11/wrap.3.png       |  Bin 1110 -> 9553 bytes
 .../qdeclarativetextedit/data-X11/wrap.4.png       |  Bin 1110 -> 9975 bytes
 .../qdeclarativetextedit/data-X11/wrap.5.png       |  Bin 1110 -> 9977 bytes
 .../qdeclarativetextedit/data-X11/wrap.6.png       |  Bin 1110 -> 9977 bytes
 .../qdeclarativetextedit/data-X11/wrap.qml         |  844 ++--
 .../qdeclarativetextedit/data/cursorDelegate.0.png |  Bin 3322 -> 3171 bytes
 .../qdeclarativetextedit/data/cursorDelegate.1.png |  Bin 3323 -> 3603 bytes
 .../qdeclarativetextedit/data/cursorDelegate.2.png |  Bin 3325 -> 3152 bytes
 .../qdeclarativetextedit/data/cursorDelegate.3.png |  Bin 3332 -> 3147 bytes
 .../qdeclarativetextedit/data/cursorDelegate.4.png |  Bin 3329 -> 3145 bytes
 .../qdeclarativetextedit/data/cursorDelegate.5.png |  Bin 3818 -> 3147 bytes
 .../qdeclarativetextedit/data/cursorDelegate.6.png |  Bin 3333 -> 3145 bytes
 .../qdeclarativetextedit/data/cursorDelegate.7.png |  Bin 3332 -> 3146 bytes
 .../qdeclarativetextedit/data/cursorDelegate.8.png |  Bin 3347 -> 3144 bytes
 .../qdeclarativetextedit/data/cursorDelegate.9.png |  Bin 0 -> 3135 bytes
 .../qdeclarativetextedit/data/cursorDelegate.qml   | 3050 +++----------
 .../data/usingMultilineEdit.0.png                  |  Bin 0 -> 4006 bytes
 .../data/usingMultilineEdit.1.png                  |  Bin 0 -> 4293 bytes
 .../data/usingMultilineEdit.10.png                 |  Bin 0 -> 6074 bytes
 .../data/usingMultilineEdit.11.png                 |  Bin 0 -> 6074 bytes
 .../data/usingMultilineEdit.2.png                  |  Bin 0 -> 4683 bytes
 .../data/usingMultilineEdit.3.png                  |  Bin 0 -> 5114 bytes
 .../data/usingMultilineEdit.4.png                  |  Bin 0 -> 5270 bytes
 .../data/usingMultilineEdit.5.png                  |  Bin 0 -> 5401 bytes
 .../data/usingMultilineEdit.6.png                  |  Bin 0 -> 5591 bytes
 .../data/usingMultilineEdit.7.png                  |  Bin 0 -> 5261 bytes
 .../data/usingMultilineEdit.8.png                  |  Bin 0 -> 6072 bytes
 .../data/usingMultilineEdit.9.png                  |  Bin 0 -> 6074 bytes
 .../data/usingMultilineEdit.qml                    | 4687 ++++++++++++++++++++
 .../qmlvisual/qdeclarativetextedit/qt-669.qml      |    5 +-
 .../qdeclarativetextedit/usingMultilineEdit.qml    |    5 +-
 65 files changed, 13177 insertions(+), 2989 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.7.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.8.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.10.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.11.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.7.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.8.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
index c987568..fd29eb6 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
@@ -36,9 +36,10 @@ Item {
             if(cursorRectangle.y < topMargin - textEdit.y){//Cursor went off the front
                 textEdit.y = topMargin - Math.max(0, cursorRectangle.y);
             }else if(cursorRectangle.y > parent.height - topMargin - bottomMargin - textEdit.y){//Cursor went off the end
-                textEdit.y = topMargin - Math.max(0, cursorRectangle.y - (parent.height - topMargin - bottomMargin)) - cursorRectangle.height;
+                textEdit.y = topMargin - Math.max(0, cursorRectangle.y - (parent.height - topMargin - bottomMargin) + cursorRectangle.height);
             }
         }
+        onHeightChanged: y=topMargin//reset scroll
 
         text:""
         horizontalAlignment: TextInput.AlignLeft
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
index c0eeb82..8798a5f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
@@ -3,17 +3,16 @@ import QtQuick 1.0
     resources: [
         Component { id: cursorA
             Item { id: cPage;
-                x: Behavior { NumberAnimation { } }
-                y: Behavior { NumberAnimation { } }
-                height: Behavior { NumberAnimation { duration: 200 } }
+                Behavior on x { NumberAnimation { } }
+                Behavior on y { NumberAnimation { } }
+                Behavior on height { NumberAnimation { duration: 200 } }
                 Rectangle { id: cRectangle; color: "black"; y: 1; width: 1; height: parent.height-2;
                     Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0}
                     Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
-                    opacity: 1
-                    opacity: SequentialAnimation { running: cPage.parent.focus == true; loops: Animation.Infinite;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
-                             }
+                }
+                SequentialAnimation on opacity { running: true; loops: Animation.Infinite;
+                    NumberAnimation { to: 0; duration: 500; easing.type: "OutQuad"}
+                    NumberAnimation { to: 1; duration: 500; easing.type: "InQuad"}
                 }
                 width: 1;
             }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.0.png
new file mode 100644
index 0000000..b24344c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.1.png
new file mode 100644
index 0000000..5e29359
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.2.png
new file mode 100644
index 0000000..0ffee64
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.3.png
new file mode 100644
index 0000000..6c56e9c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.4.png
new file mode 100644
index 0000000..276170d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.5.png
new file mode 100644
index 0000000..3d8709f
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.6.png
new file mode 100644
index 0000000..80b960c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.7.png
new file mode 100644
index 0000000..7247277
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.8.png
new file mode 100644
index 0000000..af5a996
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.9.png
new file mode 100644
index 0000000..b254164
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.qml
new file mode 100644
index 0000000..0407aaf
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/cursorDelegate.qml
@@ -0,0 +1,1499 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "6e8324bf913d9df21a59ab4337257c15"
+    }
+    Frame {
+        msec: 32
+        hash: "4e068995d68e8939e6560e35b685e839"
+    }
+    Frame {
+        msec: 48
+        hash: "761b09bce25b3b240093d16ad02268d7"
+    }
+    Frame {
+        msec: 64
+        hash: "1ecb6d7d08d4e4e14db28e24a60eccc4"
+    }
+    Frame {
+        msec: 80
+        hash: "642417a56b3d6b8b35f5aec1bf0a9d2c"
+    }
+    Frame {
+        msec: 96
+        hash: "2e24870a44d3fc6c6d5c920bab29d417"
+    }
+    Frame {
+        msec: 112
+        hash: "9a59d0672f2a752943561af89fd71d7f"
+    }
+    Frame {
+        msec: 128
+        hash: "c359dd36910678a30f935a13c8680ee4"
+    }
+    Frame {
+        msec: 144
+        hash: "245f1e127549e9b28c7574ffb143fcde"
+    }
+    Frame {
+        msec: 160
+        hash: "8df3d3dbce673311d88c055e8dffaeb5"
+    }
+    Frame {
+        msec: 176
+        hash: "590fdeaddb3df033a1908a8a95fcd17a"
+    }
+    Frame {
+        msec: 192
+        hash: "a158891c8d2ee3899463412a3363e48c"
+    }
+    Frame {
+        msec: 208
+        hash: "e9ec2c82f46b36fbd0285ce6795c7cf9"
+    }
+    Frame {
+        msec: 224
+        hash: "0a02598af770dfe1d332f10c9482e770"
+    }
+    Frame {
+        msec: 240
+        hash: "8765475468bccbd0df897a533241f3c5"
+    }
+    Frame {
+        msec: 256
+        hash: "4cd9deed66bfdfadde8f8bf34f0e5513"
+    }
+    Frame {
+        msec: 272
+        hash: "139bf5a1811beb2438df4ecfa3bbaac7"
+    }
+    Frame {
+        msec: 288
+        hash: "9d51555afd71a7035e67a543846dcf7f"
+    }
+    Frame {
+        msec: 304
+        hash: "de187b58fc8dfaad2d62e9463691b0c0"
+    }
+    Frame {
+        msec: 320
+        hash: "9f88ac6d71246b06ca7ce9d8d983c91b"
+    }
+    Frame {
+        msec: 336
+        hash: "a43c12a7d6597d171112dc43085a439e"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 352
+        hash: "ad38f32755f669837ec2243e355ebc85"
+    }
+    Frame {
+        msec: 368
+        hash: "d87bd14345c785cc7e78a5c5462b90ec"
+    }
+    Frame {
+        msec: 384
+        hash: "77850031e012246dd967ac689e353eb3"
+    }
+    Frame {
+        msec: 400
+        hash: "f1bd048cd9167a8f162d1c39aca4f7c1"
+    }
+    Frame {
+        msec: 416
+        hash: "0fa030c5da23f23a0665a535e23b84a2"
+    }
+    Frame {
+        msec: 432
+        hash: "af3a5f1982459164dfec26746172b0eb"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "0de90659472b63dd41a5602197ff502e"
+    }
+    Frame {
+        msec: 464
+        hash: "81e40abf91017614a52e03bb2474549f"
+    }
+    Frame {
+        msec: 480
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 496
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 512
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
+    }
+    Frame {
+        msec: 528
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
+    }
+    Frame {
+        msec: 544
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
+    }
+    Frame {
+        msec: 560
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
+    }
+    Frame {
+        msec: 576
+        hash: "ac98b973e6d12193829139661d3e5847"
+    }
+    Frame {
+        msec: 592
+        hash: "366907376adae4d88d42d1b9e7533ec0"
+    }
+    Frame {
+        msec: 608
+        hash: "5f486d0a21c74f2ba50afcafa8c15453"
+    }
+    Frame {
+        msec: 624
+        hash: "a3bf6dde525e528745272a8e43fc895c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 640
+        hash: "4ffb297d2a98a3d13b848af569b1b5b5"
+    }
+    Frame {
+        msec: 656
+        hash: "3679a17658e417bf08fc86d4bef0d4e9"
+    }
+    Frame {
+        msec: 672
+        hash: "5c6a25284ffd13350425e792fd143421"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 688
+        hash: "09a2c1032d0206e20340ae4267525f98"
+    }
+    Frame {
+        msec: 704
+        hash: "0036070d9a7ee854b3612858af46ab59"
+    }
+    Frame {
+        msec: 720
+        hash: "8774509eaa5fc29385da89214ef77589"
+    }
+    Frame {
+        msec: 736
+        hash: "6d4f8ebf046148e5079f498396c119b4"
+    }
+    Frame {
+        msec: 752
+        hash: "4c7d5d2f77116c96357b0791348af058"
+    }
+    Frame {
+        msec: 768
+        hash: "398c927a3525d5b90a5dd7a05ba9467b"
+    }
+    Frame {
+        msec: 784
+        hash: "d84b45f6acb8cbd399d4ed6bf80ce132"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 800
+        hash: "40c597d9e04e8e0daf62f58b9e7973b3"
+    }
+    Frame {
+        msec: 816
+        hash: "2c7fdd47e29d924e3e008a6840e0e6be"
+    }
+    Frame {
+        msec: 832
+        hash: "2b3229bb1aa220499114f274cf643ce9"
+    }
+    Frame {
+        msec: 848
+        hash: "e55446874c1a343ce3607d679d69d1d4"
+    }
+    Frame {
+        msec: 864
+        hash: "6824708eb176a9cf92f241d4054800dd"
+    }
+    Frame {
+        msec: 880
+        hash: "d386230dd416740625eb4f677ef4531b"
+    }
+    Frame {
+        msec: 896
+        hash: "9b2fbddab890dbe43e84e85bf320e6c1"
+    }
+    Frame {
+        msec: 912
+        hash: "1d1065aca7eb47f0096bc2c8c4320880"
+    }
+    Frame {
+        msec: 928
+        hash: "d97ba6e2bfc021fe993afdb5b28316ba"
+    }
+    Frame {
+        msec: 944
+        hash: "3a3a2f340bf1ccb14eab0562d7ecfe87"
+    }
+    Frame {
+        msec: 960
+        image: "cursorDelegate.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "ea4f4c1de5bfb1be43ab0188afb7189c"
+    }
+    Frame {
+        msec: 992
+        hash: "399ca2d4411d3fb226c94bd32a17d0cd"
+    }
+    Frame {
+        msec: 1008
+        hash: "ca78503396613536c8e4076884354cb1"
+    }
+    Frame {
+        msec: 1024
+        hash: "ca78503396613536c8e4076884354cb1"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1040
+        hash: "399ca2d4411d3fb226c94bd32a17d0cd"
+    }
+    Frame {
+        msec: 1056
+        hash: "ea4f4c1de5bfb1be43ab0188afb7189c"
+    }
+    Frame {
+        msec: 1072
+        hash: "d23d7492b85e4f30994ecd64e8273ff6"
+    }
+    Frame {
+        msec: 1088
+        hash: "3a3a2f340bf1ccb14eab0562d7ecfe87"
+    }
+    Frame {
+        msec: 1104
+        hash: "d97ba6e2bfc021fe993afdb5b28316ba"
+    }
+    Frame {
+        msec: 1120
+        hash: "1d1065aca7eb47f0096bc2c8c4320880"
+    }
+    Frame {
+        msec: 1136
+        hash: "9b2fbddab890dbe43e84e85bf320e6c1"
+    }
+    Frame {
+        msec: 1152
+        hash: "d386230dd416740625eb4f677ef4531b"
+    }
+    Frame {
+        msec: 1168
+        hash: "6824708eb176a9cf92f241d4054800dd"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1184
+        hash: "e8e14dbba33578a36d9c69214333c537"
+    }
+    Frame {
+        msec: 1200
+        hash: "95c6e967f6f445748945c51943cf532f"
+    }
+    Frame {
+        msec: 1216
+        hash: "d145d4cbd0e3a98686b3bac1c5c17093"
+    }
+    Frame {
+        msec: 1232
+        hash: "09348a4108a585dd23c3a252a5c596f6"
+    }
+    Frame {
+        msec: 1248
+        hash: "55126f2c879771e1aa5ced51b54c827a"
+    }
+    Frame {
+        msec: 1264
+        hash: "ebb36a4c2fcb85107033ec2731fc5743"
+    }
+    Frame {
+        msec: 1280
+        hash: "0581a4432d4b3d0c1555a31e772c2575"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1296
+        hash: "b4030774f06935f1b43fc8f1a69e53a5"
+    }
+    Frame {
+        msec: 1312
+        hash: "655e1739c130888ff83a3b69bb0ab7e3"
+    }
+    Frame {
+        msec: 1328
+        hash: "99fc97c572e7c8949693b32910e6eefb"
+    }
+    Frame {
+        msec: 1344
+        hash: "e9c8bb13c2549047c05d671daa378496"
+    }
+    Frame {
+        msec: 1360
+        hash: "cb344e0d39b5b07ca7d094bf30ce9f53"
+    }
+    Frame {
+        msec: 1376
+        hash: "15ba6e62c693f2bf74bdf86668139985"
+    }
+    Frame {
+        msec: 1392
+        hash: "48133ec73eb9723059eb6e6af3139f2b"
+    }
+    Frame {
+        msec: 1408
+        hash: "0b19e777a04f03774f2d5f5398bdb10f"
+    }
+    Frame {
+        msec: 1424
+        hash: "fc41d9a9aedf9274a68b33603ed6ccd0"
+    }
+    Frame {
+        msec: 1440
+        hash: "fa6e65f0c835b12dc10463711bd73350"
+    }
+    Frame {
+        msec: 1456
+        hash: "25a02c3388e52df550a0332efde90fcd"
+    }
+    Frame {
+        msec: 1472
+        hash: "2390443be82acf291856be59fa18fc26"
+    }
+    Frame {
+        msec: 1488
+        hash: "2390443be82acf291856be59fa18fc26"
+    }
+    Frame {
+        msec: 1504
+        hash: "2390443be82acf291856be59fa18fc26"
+    }
+    Frame {
+        msec: 1520
+        hash: "2390443be82acf291856be59fa18fc26"
+    }
+    Frame {
+        msec: 1536
+        hash: "2390443be82acf291856be59fa18fc26"
+    }
+    Frame {
+        msec: 1552
+        hash: "2390443be82acf291856be59fa18fc26"
+    }
+    Frame {
+        msec: 1568
+        hash: "284cd356d551a048d4a000b90217ac72"
+    }
+    Frame {
+        msec: 1584
+        hash: "94fb20c3767e09d1b4254ee6122cf24e"
+    }
+    Frame {
+        msec: 1600
+        hash: "bfac920384425ce9f34505b44eceb523"
+    }
+    Frame {
+        msec: 1616
+        hash: "4a2d434efcb9a57f2013dc6b366e0e4e"
+    }
+    Frame {
+        msec: 1632
+        hash: "d0fbe98dc34c4bb0d1ceb7e4678cc1d5"
+    }
+    Frame {
+        msec: 1648
+        hash: "28ab147983a71e93e5610f53e14bd113"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "2e6ee60fe9ff07fa4558134e6b1d6da8"
+    }
+    Frame {
+        msec: 1680
+        hash: "f181e578e865981d7a2073080b381ec1"
+    }
+    Frame {
+        msec: 1696
+        hash: "d7c0558ea16829b52ea6d09814c301b9"
+    }
+    Frame {
+        msec: 1712
+        hash: "c9304cb66c04566cf4374b46ab85e6e7"
+    }
+    Frame {
+        msec: 1728
+        hash: "024dde64822afc9eea63974851fe57e1"
+    }
+    Frame {
+        msec: 1744
+        hash: "8e4520e95a8acc8f1d4b710c4a14898f"
+    }
+    Frame {
+        msec: 1760
+        hash: "6b271c3f1d9d49bbd80a8ee33f3fc09c"
+    }
+    Frame {
+        msec: 1776
+        hash: "eb76a46632856bf07b005cad2ba2f6ab"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "a29bd83f6b4e877f3c7b89c82dfcab54"
+    }
+    Frame {
+        msec: 1808
+        hash: "dca39b6b6fff5e4a6309e4c0e42811c0"
+    }
+    Frame {
+        msec: 1824
+        hash: "88ad3f9f638a97bed98f00ec7d78dfe4"
+    }
+    Frame {
+        msec: 1840
+        hash: "5697a705f36283213bbe4b5848baa764"
+    }
+    Frame {
+        msec: 1856
+        hash: "8850842afae3060a91d612f7b869fd48"
+    }
+    Frame {
+        msec: 1872
+        hash: "4f08dbd1cab0bfcc8b9f232d46cf42db"
+    }
+    Frame {
+        msec: 1888
+        hash: "f7df5b96d0983a918e3c81aa7bee3950"
+    }
+    Frame {
+        msec: 1904
+        hash: "b28681bcb414d428588acda377fef838"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1920
+        image: "cursorDelegate.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "5c154b54776ed555563d3e5196a8aedd"
+    }
+    Frame {
+        msec: 1952
+        hash: "ee64c0452b325880de3a4fea599c18cc"
+    }
+    Frame {
+        msec: 1968
+        hash: "0776e1557b2d32db1c7c43331c532331"
+    }
+    Frame {
+        msec: 1984
+        hash: "24b68da9a63bbf00ffffeca649f771fa"
+    }
+    Frame {
+        msec: 2000
+        hash: "00d49d91b51f5bd428c07e9be65f551a"
+    }
+    Frame {
+        msec: 2016
+        hash: "874d4b599cb92cd9160960e3b3af74e0"
+    }
+    Frame {
+        msec: 2032
+        hash: "00d49d91b51f5bd428c07e9be65f551a"
+    }
+    Frame {
+        msec: 2048
+        hash: "24b68da9a63bbf00ffffeca649f771fa"
+    }
+    Frame {
+        msec: 2064
+        hash: "0776e1557b2d32db1c7c43331c532331"
+    }
+    Frame {
+        msec: 2080
+        hash: "ee64c0452b325880de3a4fea599c18cc"
+    }
+    Frame {
+        msec: 2096
+        hash: "5c154b54776ed555563d3e5196a8aedd"
+    }
+    Frame {
+        msec: 2112
+        hash: "a5f90da82b51bc866648304a20a1dcd3"
+    }
+    Frame {
+        msec: 2128
+        hash: "b28681bcb414d428588acda377fef838"
+    }
+    Frame {
+        msec: 2144
+        hash: "f7df5b96d0983a918e3c81aa7bee3950"
+    }
+    Frame {
+        msec: 2160
+        hash: "4f08dbd1cab0bfcc8b9f232d46cf42db"
+    }
+    Frame {
+        msec: 2176
+        hash: "8850842afae3060a91d612f7b869fd48"
+    }
+    Frame {
+        msec: 2192
+        hash: "5697a705f36283213bbe4b5848baa764"
+    }
+    Frame {
+        msec: 2208
+        hash: "88ad3f9f638a97bed98f00ec7d78dfe4"
+    }
+    Frame {
+        msec: 2224
+        hash: "dca39b6b6fff5e4a6309e4c0e42811c0"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "a29bd83f6b4e877f3c7b89c82dfcab54"
+    }
+    Frame {
+        msec: 2256
+        hash: "7defd2ecefeb86b457a2ee76d97424ee"
+    }
+    Frame {
+        msec: 2272
+        hash: "ccf6d45e8822d72482d9b585909b612b"
+    }
+    Frame {
+        msec: 2288
+        hash: "996dddf091394513adda1b1f00bf0c68"
+    }
+    Frame {
+        msec: 2304
+        hash: "3cf94e90eddb4b0815762b89f58f8325"
+    }
+    Frame {
+        msec: 2320
+        hash: "ab9f876450526b37774c6c4a5794c7b1"
+    }
+    Frame {
+        msec: 2336
+        hash: "9109880e9201e92eb17ae87a3648dca7"
+    }
+    Frame {
+        msec: 2352
+        hash: "0e759f2f279057c1f4d1147be5b41214"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "d87bd14345c785cc7e78a5c5462b90ec"
+    }
+    Frame {
+        msec: 2384
+        hash: "77850031e012246dd967ac689e353eb3"
+    }
+    Frame {
+        msec: 2400
+        hash: "f1bd048cd9167a8f162d1c39aca4f7c1"
+    }
+    Frame {
+        msec: 2416
+        hash: "0fa030c5da23f23a0665a535e23b84a2"
+    }
+    Frame {
+        msec: 2432
+        hash: "af3a5f1982459164dfec26746172b0eb"
+    }
+    Frame {
+        msec: 2448
+        hash: "0de90659472b63dd41a5602197ff502e"
+    }
+    Frame {
+        msec: 2464
+        hash: "81e40abf91017614a52e03bb2474549f"
+    }
+    Frame {
+        msec: 2480
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2496
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 2512
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 2528
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 2544
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 2560
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 2576
+        hash: "e26dbfb26415b21198add56d5de02cb2"
+    }
+    Frame {
+        msec: 2592
+        hash: "fa2877a963417789b82170b32e0af7a0"
+    }
+    Frame {
+        msec: 2608
+        hash: "860b39f92c412a7d946f882d8f99d837"
+    }
+    Frame {
+        msec: 2624
+        hash: "d7b8c52aef183965a97d82a18b03ed94"
+    }
+    Frame {
+        msec: 2640
+        hash: "b1ce9cf0ebd8e1e783e5bd43bbd72072"
+    }
+    Frame {
+        msec: 2656
+        hash: "d214b419ec5b4cff8f877bdeb1b9ef96"
+    }
+    Frame {
+        msec: 2672
+        hash: "95e7057104508b3919d722d4befde7b7"
+    }
+    Frame {
+        msec: 2688
+        hash: "270489ec5da5bf9a93fa4e52f47a71f5"
+    }
+    Frame {
+        msec: 2704
+        hash: "46646e396ab0c1c20427dadd71d45ba9"
+    }
+    Frame {
+        msec: 2720
+        hash: "65e2fd167565f876310d56fa9203c118"
+    }
+    Frame {
+        msec: 2736
+        hash: "aff0da79bd9bd8c285139d7737a1316f"
+    }
+    Frame {
+        msec: 2752
+        hash: "bf264fe7d774a597a3ff0965d912fa90"
+    }
+    Frame {
+        msec: 2768
+        hash: "f00358343437f6e058848c7237601632"
+    }
+    Frame {
+        msec: 2784
+        hash: "88c9e1d58397a81ed23931c7fdae1e7d"
+    }
+    Frame {
+        msec: 2800
+        hash: "44d46b459f6bb89510e52b0d999fd499"
+    }
+    Frame {
+        msec: 2816
+        hash: "0c196a24c9ca7143d382688db678d855"
+    }
+    Frame {
+        msec: 2832
+        hash: "9df6d3d3b9981cb907ab89e65b743e97"
+    }
+    Frame {
+        msec: 2848
+        hash: "501a644d6cde64ad041b086e00fd3950"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2864
+        hash: "83f297406b1c6311da3a216024836d15"
+    }
+    Frame {
+        msec: 2880
+        image: "cursorDelegate.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "93f79f8717948bde8ee55c668af2d397"
+    }
+    Frame {
+        msec: 2912
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
+    }
+    Frame {
+        msec: 2928
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
+    }
+    Frame {
+        msec: 2944
+        hash: "c83c973fb1253ccab333fb1e604155b8"
+    }
+    Frame {
+        msec: 2960
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
+    }
+    Frame {
+        msec: 2976
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2992
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
+    }
+    Frame {
+        msec: 3008
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
+    }
+    Frame {
+        msec: 3024
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
+    }
+    Frame {
+        msec: 3040
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
+    }
+    Frame {
+        msec: 3056
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
+    }
+    Frame {
+        msec: 3072
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
+    }
+    Frame {
+        msec: 3088
+        hash: "c83c973fb1253ccab333fb1e604155b8"
+    }
+    Frame {
+        msec: 3104
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
+    }
+    Frame {
+        msec: 3120
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
+    }
+    Frame {
+        msec: 3136
+        hash: "93f79f8717948bde8ee55c668af2d397"
+    }
+    Frame {
+        msec: 3152
+        hash: "1bb236db749ef514c00d0a3dd698d24f"
+    }
+    Frame {
+        msec: 3168
+        hash: "83f297406b1c6311da3a216024836d15"
+    }
+    Frame {
+        msec: 3184
+        hash: "3d284b4000d2849ed4af2f7c1b859492"
+    }
+    Frame {
+        msec: 3200
+        hash: "de315e6836334fd0a2da855f5be4ff30"
+    }
+    Frame {
+        msec: 3216
+        hash: "5ca117709284f4a1cbd64cdba4079340"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3232
+        hash: "308a4220f5c74fd56bd218cd695b9822"
+    }
+    Frame {
+        msec: 3248
+        hash: "4ac4e09e987f2ba9661ed52fb1bdf236"
+    }
+    Frame {
+        msec: 3264
+        hash: "9ffd39a8a540ec88ff2b20a16ef083ee"
+    }
+    Frame {
+        msec: 3280
+        hash: "4a36ed8e68811954fef171d5734ccbaf"
+    }
+    Frame {
+        msec: 3296
+        hash: "714a6231aca70cfa8e83ea71b7ae90dc"
+    }
+    Frame {
+        msec: 3312
+        hash: "1fa9e35449ee87c972e3189ad0651a68"
+    }
+    Frame {
+        msec: 3328
+        hash: "d602008fada2f4edb6ad00fe759f9db9"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3344
+        hash: "bf16cc38f109e761b5ac2b0c63a1a2fe"
+    }
+    Frame {
+        msec: 3360
+        hash: "30f26041533455ed92c4984f55e3c6ff"
+    }
+    Frame {
+        msec: 3376
+        hash: "5838d666902bc693de505522dad13254"
+    }
+    Frame {
+        msec: 3392
+        hash: "6c8ada09b627050e4340da6e8ddd646e"
+    }
+    Frame {
+        msec: 3408
+        hash: "b33cd5bbb90d435dd7ea3ab67bef88ee"
+    }
+    Frame {
+        msec: 3424
+        hash: "692d4029938c01044b4210958dd1ee7e"
+    }
+    Frame {
+        msec: 3440
+        hash: "7e2e55555ee2c7e172e61ddb6365355d"
+    }
+    Frame {
+        msec: 3456
+        hash: "87ca0584879b25336a1023ac3252fc9a"
+    }
+    Frame {
+        msec: 3472
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 3488
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 3504
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 3520
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 3536
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 3552
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 3568
+        hash: "8c6052eb4cf03d7742a73874d9f15285"
+    }
+    Frame {
+        msec: 3584
+        hash: "8a1b63c42867f87a1cf4b47944b3860a"
+    }
+    Frame {
+        msec: 3600
+        hash: "90712efd7c17b0ad33d2c2c02e9eaa97"
+    }
+    Frame {
+        msec: 3616
+        hash: "8099972420ffd03e2bfc3ea45918a543"
+    }
+    Frame {
+        msec: 3632
+        hash: "2b78b1179a34319c287a6659406e23c3"
+    }
+    Frame {
+        msec: 3648
+        hash: "ad9458ab4d6376c87350a2356c280f94"
+    }
+    Frame {
+        msec: 3664
+        hash: "a74bc230e310a2826b2fed962db22f7a"
+    }
+    Frame {
+        msec: 3680
+        hash: "bd72e8f4757050c41673a6f0d38f2285"
+    }
+    Frame {
+        msec: 3696
+        hash: "379bad4fa4b605cb6a16434bdb031e2b"
+    }
+    Frame {
+        msec: 3712
+        hash: "e144a8e9586f29f9b2f042b47e7739ae"
+    }
+    Frame {
+        msec: 3728
+        hash: "bd74c9e79bc1a88dd6a17a3aed21e368"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3744
+        hash: "144724168f42372e10ec6c39662a5ed8"
+    }
+    Frame {
+        msec: 3760
+        hash: "d8859888802e7b54e2d2a44cf252eb54"
+    }
+    Frame {
+        msec: 3776
+        hash: "20561e2faf7e8fe1d6337248e6cd5e94"
+    }
+    Frame {
+        msec: 3792
+        hash: "184cff262d1004ce702c117a6b5b9699"
+    }
+    Frame {
+        msec: 3808
+        hash: "61b156acacefa6e4f4ddd8adaca90d08"
+    }
+    Frame {
+        msec: 3824
+        hash: "0906852b1e62a936694a22d6ffa4f5dd"
+    }
+    Frame {
+        msec: 3840
+        image: "cursorDelegate.3.png"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3856
+        hash: "cc0fb2ae2dd1ccad94c453bc4c4b6d32"
+    }
+    Frame {
+        msec: 3872
+        hash: "6a6baee5ca76d331c47fca4d0f7168e5"
+    }
+    Frame {
+        msec: 3888
+        hash: "32032d7ce55af41c97ac5bf33aca40bb"
+    }
+    Frame {
+        msec: 3904
+        hash: "a8781226e5e494324a34e120aa446cd1"
+    }
+    Frame {
+        msec: 3920
+        hash: "0dd5df088fcc0228a97ffe715c95e2b6"
+    }
+    Frame {
+        msec: 3936
+        hash: "774b161fe9645bc69b89e580b3e41f71"
+    }
+    Frame {
+        msec: 3952
+        hash: "5756d7ffd8ff656db54f4329ea909553"
+    }
+    Frame {
+        msec: 3968
+        hash: "2b4a5c97ff4d8792a7706bb78385ec35"
+    }
+    Frame {
+        msec: 3984
+        hash: "f9765e4def564b64861402e1a873b169"
+    }
+    Frame {
+        msec: 4000
+        hash: "287b07ef6288dcea13fffd2b95aafd54"
+    }
+    Frame {
+        msec: 4016
+        hash: "7abcb9d6cf223c1655f6265f780a321a"
+    }
+    Frame {
+        msec: 4032
+        hash: "287b07ef6288dcea13fffd2b95aafd54"
+    }
+    Frame {
+        msec: 4048
+        hash: "f9765e4def564b64861402e1a873b169"
+    }
+    Frame {
+        msec: 4064
+        hash: "2b4a5c97ff4d8792a7706bb78385ec35"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "5756d7ffd8ff656db54f4329ea909553"
+    }
+    Frame {
+        msec: 4096
+        hash: "774b161fe9645bc69b89e580b3e41f71"
+    }
+    Frame {
+        msec: 4112
+        hash: "0dd5df088fcc0228a97ffe715c95e2b6"
+    }
+    Frame {
+        msec: 4128
+        hash: "a8781226e5e494324a34e120aa446cd1"
+    }
+    Frame {
+        msec: 4144
+        hash: "32032d7ce55af41c97ac5bf33aca40bb"
+    }
+    Frame {
+        msec: 4160
+        hash: "6a6baee5ca76d331c47fca4d0f7168e5"
+    }
+    Frame {
+        msec: 4176
+        hash: "cc0fb2ae2dd1ccad94c453bc4c4b6d32"
+    }
+    Frame {
+        msec: 4192
+        hash: "2d1b406be294727a278ba6bbc97be62a"
+    }
+    Frame {
+        msec: 4208
+        hash: "0906852b1e62a936694a22d6ffa4f5dd"
+    }
+    Frame {
+        msec: 4224
+        hash: "61b156acacefa6e4f4ddd8adaca90d08"
+    }
+    Frame {
+        msec: 4240
+        hash: "184cff262d1004ce702c117a6b5b9699"
+    }
+    Frame {
+        msec: 4256
+        hash: "20561e2faf7e8fe1d6337248e6cd5e94"
+    }
+    Frame {
+        msec: 4272
+        hash: "d8859888802e7b54e2d2a44cf252eb54"
+    }
+    Frame {
+        msec: 4288
+        hash: "144724168f42372e10ec6c39662a5ed8"
+    }
+    Frame {
+        msec: 4304
+        hash: "d2da36fbf73289f545133bd608af66a2"
+    }
+    Frame {
+        msec: 4320
+        hash: "b1d7da6b42a31bba91148ab37b111945"
+    }
+    Frame {
+        msec: 4336
+        hash: "6f226a3b20d95e17df69e2c4e5aff3d1"
+    }
+    Frame {
+        msec: 4352
+        hash: "1109da0f043a9418661fc05e53fe3b45"
+    }
+    Frame {
+        msec: 4368
+        hash: "f3e901db9efd1d9fadf1cb6858040d51"
+    }
+    Frame {
+        msec: 4384
+        hash: "c8e50c0e924b11a3f1943abb9a4008a4"
+    }
+    Frame {
+        msec: 4400
+        hash: "431226a27488ed1dba237de3d43f94c5"
+    }
+    Frame {
+        msec: 4416
+        hash: "420d316430c84f10d7cd24d29b918149"
+    }
+    Frame {
+        msec: 4432
+        hash: "ccbd4d1e4865ebd9b0fe923e6ab05e5c"
+    }
+    Frame {
+        msec: 4448
+        hash: "231bff73758a1c6f7c7c0365159ba3e6"
+    }
+    Frame {
+        msec: 4464
+        hash: "d1ac7ceda7303bbf3392d33f47037ed6"
+    }
+    Frame {
+        msec: 4480
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4496
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4512
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4528
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4544
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4560
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4576
+        hash: "a2ad07326fafcb3012cdb869f39af466"
+    }
+    Frame {
+        msec: 4592
+        hash: "8622eb25a6da44926b5161bce213a483"
+    }
+    Frame {
+        msec: 4608
+        hash: "fe563aa9dae9655871f82a779063cdbd"
+    }
+    Frame {
+        msec: 4624
+        hash: "775cd79b012f79b773449a0ad8457149"
+    }
+    Frame {
+        msec: 4640
+        hash: "01e9fab344a148a0877a7332d561be5a"
+    }
+    Frame {
+        msec: 4656
+        hash: "935566d139599a30197850774fb059ba"
+    }
+    Frame {
+        msec: 4672
+        hash: "4aae1ac532624417decddd978f516b6e"
+    }
+    Frame {
+        msec: 4688
+        hash: "34dc78df6e9941988712c1f8f79c3db0"
+    }
+    Frame {
+        msec: 4704
+        hash: "23a96c11d5917c44bd48239ed2b5777f"
+    }
+    Frame {
+        msec: 4720
+        hash: "f8f13e097eae3152db3ccebff1343fe0"
+    }
+    Frame {
+        msec: 4736
+        hash: "02f8fca7c4ab80ecf425e4b39e966b86"
+    }
+    Frame {
+        msec: 4752
+        hash: "c3356367750e797ff81bc4102f948134"
+    }
+    Frame {
+        msec: 4768
+        hash: "7b5de3772b8bcb4b10f3d265d5603afb"
+    }
+    Frame {
+        msec: 4784
+        hash: "ed3c741639232377f61867fd353ce58a"
+    }
+    Frame {
+        msec: 4800
+        image: "cursorDelegate.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "5ca117709284f4a1cbd64cdba4079340"
+    }
+    Frame {
+        msec: 4832
+        hash: "de315e6836334fd0a2da855f5be4ff30"
+    }
+    Frame {
+        msec: 4848
+        hash: "3d284b4000d2849ed4af2f7c1b859492"
+    }
+    Frame {
+        msec: 4864
+        hash: "83f297406b1c6311da3a216024836d15"
+    }
+    Frame {
+        msec: 4880
+        hash: "1bb236db749ef514c00d0a3dd698d24f"
+    }
+    Frame {
+        msec: 4896
+        hash: "93f79f8717948bde8ee55c668af2d397"
+    }
+    Frame {
+        msec: 4912
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
+    }
+    Frame {
+        msec: 4928
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
+    }
+    Frame {
+        msec: 4944
+        hash: "c83c973fb1253ccab333fb1e604155b8"
+    }
+    Frame {
+        msec: 4960
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
+    }
+    Frame {
+        msec: 4976
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
+    }
+    Frame {
+        msec: 4992
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
+    }
+    Frame {
+        msec: 5008
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
+    }
+    Frame {
+        msec: 5024
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
+    }
+    Frame {
+        msec: 5040
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
+    }
+    Frame {
+        msec: 5056
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
+    }
+    Frame {
+        msec: 5072
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
+    }
+    Frame {
+        msec: 5088
+        hash: "c83c973fb1253ccab333fb1e604155b8"
+    }
+    Frame {
+        msec: 5104
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
+    }
+    Frame {
+        msec: 5120
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
+    }
+    Frame {
+        msec: 5136
+        hash: "93f79f8717948bde8ee55c668af2d397"
+    }
+    Frame {
+        msec: 5152
+        hash: "1bb236db749ef514c00d0a3dd698d24f"
+    }
+    Frame {
+        msec: 5168
+        hash: "83f297406b1c6311da3a216024836d15"
+    }
+    Frame {
+        msec: 5184
+        hash: "3d284b4000d2849ed4af2f7c1b859492"
+    }
+    Frame {
+        msec: 5200
+        hash: "de315e6836334fd0a2da855f5be4ff30"
+    }
+    Frame {
+        msec: 5216
+        hash: "5ca117709284f4a1cbd64cdba4079340"
+    }
+    Frame {
+        msec: 5232
+        hash: "4f0d49aff27a1c83287d38e760c10f16"
+    }
+    Frame {
+        msec: 5248
+        hash: "ed3c741639232377f61867fd353ce58a"
+    }
+    Frame {
+        msec: 5264
+        hash: "7b5de3772b8bcb4b10f3d265d5603afb"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
new file mode 100644
index 0000000..7c68d9c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
new file mode 100644
index 0000000..96afa8d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
new file mode 100644
index 0000000..58b168d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
new file mode 100644
index 0000000..95f0c98
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.qml
new file mode 100644
index 0000000..7b00cdd
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.qml
@@ -0,0 +1,1371 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 32
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 48
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 64
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 80
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 96
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 112
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 128
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 144
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 160
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 176
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 192
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 208
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 224
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 240
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 256
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 272
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 288
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 304
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 320
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 336
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 352
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 368
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 384
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 400
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 416
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 432
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 464
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 480
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 496
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 512
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 528
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 560
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 576
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 592
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 608
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 624
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 640
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 656
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 672
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 688
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 704
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 720
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 736
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 752
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 768
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 784
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 800
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 816
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 832
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 848
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 864
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 880
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 896
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 912
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 928
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 944
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 960
+        image: "qt-669.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 992
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 1008
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1024
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 1040
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 1056
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 1072
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 1088
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1104
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 1120
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 1136
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1152
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 1168
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 1184
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 1200
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 1216
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1232
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 1248
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 1264
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 1280
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1296
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 1312
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 1328
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 1344
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1360
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1376
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1392
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1408
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1424
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1440
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1456
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1472
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1488
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1520
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1536
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1552
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1568
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1584
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1600
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1616
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1632
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1648
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1664
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1680
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1696
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1712
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1728
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1744
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1760
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1776
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1792
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1808
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1824
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Frame {
+        msec: 1840
+        hash: "6a76601730228708049c79b414b3cbe2"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1856
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1872
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1888
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1904
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1920
+        image: "qt-669.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1952
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1968
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 1984
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2000
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 2016
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 2032
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 2048
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Frame {
+        msec: 2064
+        hash: "2dc196a65cb13214901e0189c2b1984b"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2080
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2096
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2112
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2128
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2144
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2176
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2192
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2208
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Frame {
+        msec: 2224
+        hash: "2da2b87d285f27ee4cdd82c2c03cdf08"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 2256
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 2288
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 2304
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 2320
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Frame {
+        msec: 2336
+        hash: "5e8b89638494bceaed69ce3d75245458"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2368
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2384
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2400
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2416
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2432
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2448
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2464
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2480
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2496
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2512
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2528
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2544
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2560
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2576
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Frame {
+        msec: 2592
+        hash: "0c7162e2bf228c76c7b9247e7ee1cf63"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2608
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2624
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2640
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2656
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2672
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2688
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2704
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2720
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2736
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Frame {
+        msec: 2752
+        hash: "ad3b0560a1e896c39acff9a7cf53b043"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 2784
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 2800
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2816
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 2832
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 2848
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Frame {
+        msec: 2864
+        hash: "40504095d8877e37cd24ac694ca94758"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2880
+        image: "qt-669.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 2912
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 2928
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 2960
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 2976
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 2992
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Frame {
+        msec: 3008
+        hash: "b6f3847d394c87873e34814e332e205a"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3024
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3040
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3056
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3072
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3088
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3104
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3120
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3136
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3152
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3168
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3184
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3200
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3216
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3232
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3248
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3264
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3280
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3296
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3312
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3328
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3344
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3360
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3376
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3392
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3408
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3424
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3440
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3456
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3472
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3488
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3504
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3520
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3536
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3552
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3568
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3584
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3600
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3616
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3632
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3648
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3664
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3680
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Frame {
+        msec: 3696
+        hash: "3f5f573f37883dc025e21a1fd99eef63"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3712
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3728
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3744
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3760
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3776
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3792
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3808
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3824
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3840
+        image: "qt-669.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3872
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3888
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3904
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3920
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3936
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3952
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3968
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 3984
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4000
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4016
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4032
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4048
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4064
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4080
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4096
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4112
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4128
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4144
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4160
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4176
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4192
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4208
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4224
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4240
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4256
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4272
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4288
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+    Frame {
+        msec: 4304
+        hash: "8d8671fb6c3413f38308a0dd15026eae"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.0.png
new file mode 100644
index 0000000..e69860e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.1.png
new file mode 100644
index 0000000..1db3c26
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
new file mode 100644
index 0000000..9c72d52
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
new file mode 100644
index 0000000..9c72d52
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.2.png
new file mode 100644
index 0000000..fbef805
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.3.png
new file mode 100644
index 0000000..dc56c7e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.4.png
new file mode 100644
index 0000000..04ea496
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.5.png
new file mode 100644
index 0000000..98bf7de
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.6.png
new file mode 100644
index 0000000..d95b895
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
new file mode 100644
index 0000000..9954344
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png
new file mode 100644
index 0000000..d49c2ff
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
new file mode 100644
index 0000000..9c72d52
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml
new file mode 100644
index 0000000..c12094e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml
@@ -0,0 +1,4687 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 32
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 48
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 64
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 80
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 96
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 112
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 128
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 144
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 160
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 176
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 192
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 208
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 224
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 240
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 256
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 272
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 288
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 304
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 320
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 118; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 336
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 352
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 368
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 384
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 400
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 118; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 416
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 432
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 448
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 464
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 480
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 496
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 512
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 528
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 544
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 560
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 576
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 592
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 608
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 624
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 640
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 117; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 656
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 672
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 117; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 688
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 704
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 720
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 736
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 752
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 768
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 784
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 800
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 816
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 832
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 848
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 864
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 880
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 896
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 912
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 928
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 944
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 960
+        image: "usingMultilineEdit.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 992
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1008
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1024
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1040
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1056
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1072
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1088
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1104
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1120
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1136
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1152
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1168
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1184
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1200
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1216
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1232
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1248
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1264
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1280
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1296
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Key {
+        type: 6
+        key: 44
+        modifiers: 0
+        text: "2c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1312
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1328
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1344
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1360
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1376
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Key {
+        type: 7
+        key: 44
+        modifiers: 0
+        text: "2c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1408
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1424
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1440
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1456
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1472
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1488
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1504
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1520
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1536
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1552
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Frame {
+        msec: 1584
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Frame {
+        msec: 1600
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1616
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1632
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1648
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1664
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1680
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1696
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1712
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1728
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1760
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1776
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1808
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1824
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1840
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1856
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1872
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1888
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1904
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1920
+        image: "usingMultilineEdit.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "1d5b3f8dc6e0701c0c11a330e055ba5d"
+    }
+    Frame {
+        msec: 1952
+        hash: "1d5b3f8dc6e0701c0c11a330e055ba5d"
+    }
+    Frame {
+        msec: 1968
+        hash: "1d5b3f8dc6e0701c0c11a330e055ba5d"
+    }
+    Key {
+        type: 6
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1984
+        hash: "067182091936c99dfa5c29b226bd4351"
+    }
+    Frame {
+        msec: 2000
+        hash: "067182091936c99dfa5c29b226bd4351"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2016
+        hash: "067182091936c99dfa5c29b226bd4351"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2048
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Key {
+        type: 7
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2080
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2096
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2112
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2144
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2176
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2192
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2208
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2224
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2240
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2256
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2272
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2288
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2304
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2320
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2336
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2352
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Frame {
+        msec: 2384
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Frame {
+        msec: 2400
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Frame {
+        msec: 2416
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2432
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Key {
+        type: 6
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2464
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2480
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2496
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2512
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2528
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Key {
+        type: 7
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2544
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2576
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2592
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2608
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2624
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2640
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2656
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2672
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2688
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2704
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2720
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2736
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2752
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2768
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2784
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2816
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2832
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2848
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2864
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2880
+        image: "usingMultilineEdit.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2912
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2928
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Key {
+        type: 6
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "d90cbfbec0e5a73781664eec63ba7081"
+    }
+    Frame {
+        msec: 2960
+        hash: "d90cbfbec0e5a73781664eec63ba7081"
+    }
+    Frame {
+        msec: 2976
+        hash: "d90cbfbec0e5a73781664eec63ba7081"
+    }
+    Key {
+        type: 7
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2992
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Frame {
+        msec: 3008
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Frame {
+        msec: 3024
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Frame {
+        msec: 3040
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3056
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3072
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Frame {
+        msec: 3088
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Frame {
+        msec: 3104
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3120
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 33554432
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3136
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Frame {
+        msec: 3152
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 33554432
+        text: "49"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3168
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Frame {
+        msec: 3184
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Frame {
+        msec: 3200
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Frame {
+        msec: 3216
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 33554432
+        text: "49"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3232
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3248
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Frame {
+        msec: 3264
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Frame {
+        msec: 3280
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Frame {
+        msec: 3296
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3312
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3328
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3344
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3360
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3376
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3392
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3408
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3424
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3440
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3456
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3472
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3488
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 78
+        modifiers: 0
+        text: "6e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3504
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3520
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3536
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3552
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3568
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3584
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Key {
+        type: 7
+        key: 78
+        modifiers: 0
+        text: "6e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3600
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3616
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Frame {
+        msec: 3632
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Frame {
+        msec: 3648
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Frame {
+        msec: 3664
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3680
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3696
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3712
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3728
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3744
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3760
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3776
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3792
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3808
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3824
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3840
+        image: "usingMultilineEdit.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3872
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3888
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3904
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3920
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3936
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3952
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3968
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3984
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4000
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4016
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4032
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4048
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4064
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Frame {
+        msec: 4096
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Frame {
+        msec: 4112
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Frame {
+        msec: 4128
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Key {
+        type: 6
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4144
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Frame {
+        msec: 4160
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4176
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Frame {
+        msec: 4192
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Frame {
+        msec: 4208
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4224
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4240
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Key {
+        type: 7
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4256
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4272
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4288
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4304
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4320
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4336
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4352
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4368
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4384
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4400
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4416
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4432
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4448
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4464
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4480
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4496
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4512
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4528
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4544
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4560
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4576
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4592
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4608
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4624
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4640
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4656
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4672
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4688
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4704
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4720
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4736
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4752
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4768
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4784
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4800
+        image: "usingMultilineEdit.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4832
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Key {
+        type: 6
+        key: 63
+        modifiers: 33554432
+        text: "3f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4848
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4864
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4880
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4896
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4912
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4928
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4944
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Key {
+        type: 7
+        key: 63
+        modifiers: 33554432
+        text: "3f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4960
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4976
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4992
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5008
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5024
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5040
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5056
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5072
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5088
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5104
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5120
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5136
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5152
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5168
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5184
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5200
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5216
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5232
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5248
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5264
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5280
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5296
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5312
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5328
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5344
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5360
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5376
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5392
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5408
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5424
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5440
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5456
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5472
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5488
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5504
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5520
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5536
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5552
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5568
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5584
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5600
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5616
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5632
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5648
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5664
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5680
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5696
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5712
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5728
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5744
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5760
+        image: "usingMultilineEdit.5.png"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 48; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5776
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Frame {
+        msec: 5792
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Frame {
+        msec: 5808
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Frame {
+        msec: 5824
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "3ee2836c3a2ff4c71d82dd261941883b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "3ee2836c3a2ff4c71d82dd261941883b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 56; y: 41
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "3ee2836c3a2ff4c71d82dd261941883b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 56; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "4e620c1b847274f691e80a384eac5320"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 58; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 58
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5920
+        hash: "1a246aa1be0878c38da2eaac6befb738"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 69
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5936
+        hash: "7d6d4a33aacd1d2f530834af31069793"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 62; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5952
+        hash: "eba517141a4dc94025801fabc8c5e813"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5968
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 105
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 111
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 122
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 130
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 132
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 134
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 140
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 153
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6208
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6224
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6240
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6256
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6272
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 152
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6288
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6304
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6320
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 63; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6336
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6352
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6368
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 58
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 51
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6384
+        hash: "b6589493e0225846be0af57024e25d98"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 37
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6400
+        hash: "b6589493e0225846be0af57024e25d98"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6416
+        hash: "d8a1bee2a0e57944d8268a2ce7e6c3c1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 16
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6432
+        hash: "a609d3c9cb375240e66dd316af27543c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6448
+        hash: "0d376060ba0f9843ed814a8d8150d047"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 48; y: -23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6464
+        hash: "9ad787bf41f0ab66beffff056a115c23"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6480
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6496
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6512
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6528
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6544
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6560
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6576
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6592
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6608
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6624
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6640
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6656
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6672
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -47
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 44; y: -42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 44; y: -39
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6720
+        image: "usingMultilineEdit.6.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 46; y: -28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6752
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 48; y: -18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: -14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6768
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: -10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6784
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: -3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6800
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: -1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 0
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6816
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6832
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6848
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6864
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6912
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6928
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6944
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6960
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6976
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6992
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7008
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7024
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7040
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7056
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7072
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7088
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 59; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7104
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7120
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7136
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7152
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7168
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 59; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7184
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7200
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7216
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7232
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7248
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7264
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7280
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7296
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7312
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7328
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7344
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7360
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7376
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7392
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7408
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7424
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7440
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7456
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7472
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7488
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7504
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7520
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7536
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7552
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7568
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7584
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7600
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7616
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7632
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7648
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7664
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7680
+        image: "usingMultilineEdit.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7712
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7728
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7744
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7760
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7776
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7792
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7808
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7824
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7840
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7856
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7872
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7888
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7904
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7920
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7936
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7952
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 7968
+        hash: "1553d42725394fa4d4c9b97dc12a78b9"
+    }
+    Frame {
+        msec: 7984
+        hash: "1553d42725394fa4d4c9b97dc12a78b9"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8000
+        hash: "a62df700f3209668a813e765a79e7859"
+    }
+    Frame {
+        msec: 8016
+        hash: "a62df700f3209668a813e765a79e7859"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8032
+        hash: "e8928770969b82523e828e3036bbe106"
+    }
+    Frame {
+        msec: 8048
+        hash: "e8928770969b82523e828e3036bbe106"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8064
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8080
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8096
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8112
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8128
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8144
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8160
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8176
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8192
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8208
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8224
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8240
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8256
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8272
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8288
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8304
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8320
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8336
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8352
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8368
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8384
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8400
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8416
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8432
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8448
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8464
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8480
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8496
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8512
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8528
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8544
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8560
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8576
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8592
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8608
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8624
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8640
+        image: "usingMultilineEdit.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8672
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8688
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8704
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8720
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8736
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8752
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8768
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8784
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8800
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8816
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8832
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8848
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8864
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8880
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8896
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8912
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8928
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8944
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8960
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8976
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8992
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9008
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9024
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9040
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9056
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9072
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9088
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9104
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9120
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9136
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9152
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9168
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9184
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9200
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 70; y: 73
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9216
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9232
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9248
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9264
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9280
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 70; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9296
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9312
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9328
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9344
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9360
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9376
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9392
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9408
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9424
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9440
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 71; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9456
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9472
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9488
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9504
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9520
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9536
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 71; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9552
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9568
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9584
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9600
+        image: "usingMultilineEdit.9.png"
+    }
+    Frame {
+        msec: 9616
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9632
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9648
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9664
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9680
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9696
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9712
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9728
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9744
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9760
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9776
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9792
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9808
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9824
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9840
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9856
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9872
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9888
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9904
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9920
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9936
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9952
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9968
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9984
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10000
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10016
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10032
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10048
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10064
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10080
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10096
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10112
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10128
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10144
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10160
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10176
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10192
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10208
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10224
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10240
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10256
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10272
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10288
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10304
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10320
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10336
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10352
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10368
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10384
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10400
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10416
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10432
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10448
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10464
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10480
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10496
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10512
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10528
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10544
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10560
+        image: "usingMultilineEdit.10.png"
+    }
+    Frame {
+        msec: 10576
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10592
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10608
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10624
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10640
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10656
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10672
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10688
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10704
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10720
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10736
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10752
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10768
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10784
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10800
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10816
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10832
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10848
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10864
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10880
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10896
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10912
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10928
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10944
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10960
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10976
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10992
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11008
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11024
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11040
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11056
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11072
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11088
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11104
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11120
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11136
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11152
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11168
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11184
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11200
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11216
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11232
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11248
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11264
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11280
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11296
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11312
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11328
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11344
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11360
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11376
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11392
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11408
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11424
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11440
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11456
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11472
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11488
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11504
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11520
+        image: "usingMultilineEdit.11.png"
+    }
+    Frame {
+        msec: 11536
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11552
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11568
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11584
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11600
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11616
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.0.png
index ec65f49..4f51246 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.1.png
index ec65f49..a27067f 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png
index ec65f49..e33a8b0 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.3.png
index ec65f49..fb35f56 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.4.png
index ec65f49..9eab398 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.5.png
index ec65f49..66edb6b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.6.png
index ec65f49..66edb6b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
index 1f5b365..defaf78 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
@@ -6,7 +6,7 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "d9acaa85ca366aac5a63f59b8913039a"
     }
     Key {
         type: 6
@@ -18,7 +18,7 @@ VisualTest {
     }
     Frame {
         msec: 32
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "81b7e0be317f0ca4425fa75ac5a73be9"
     }
     Key {
         type: 7
@@ -30,11 +30,11 @@ VisualTest {
     }
     Frame {
         msec: 48
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "81b7e0be317f0ca4425fa75ac5a73be9"
     }
     Frame {
         msec: 64
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "81b7e0be317f0ca4425fa75ac5a73be9"
     }
     Key {
         type: 7
@@ -46,11 +46,11 @@ VisualTest {
     }
     Frame {
         msec: 80
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "81b7e0be317f0ca4425fa75ac5a73be9"
     }
     Frame {
         msec: 96
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "81b7e0be317f0ca4425fa75ac5a73be9"
     }
     Key {
         type: 6
@@ -62,15 +62,15 @@ VisualTest {
     }
     Frame {
         msec: 112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ad65e3fe3973343e9b6feb1c28ee40f4"
     }
     Frame {
         msec: 128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ad65e3fe3973343e9b6feb1c28ee40f4"
     }
     Frame {
         msec: 144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ad65e3fe3973343e9b6feb1c28ee40f4"
     }
     Key {
         type: 6
@@ -82,15 +82,15 @@ VisualTest {
     }
     Frame {
         msec: 160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "187c3d689a5b217d8e886464303840aa"
     }
     Frame {
         msec: 176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "187c3d689a5b217d8e886464303840aa"
     }
     Frame {
         msec: 192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "187c3d689a5b217d8e886464303840aa"
     }
     Key {
         type: 7
@@ -102,11 +102,11 @@ VisualTest {
     }
     Frame {
         msec: 208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "187c3d689a5b217d8e886464303840aa"
     }
     Frame {
         msec: 224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "187c3d689a5b217d8e886464303840aa"
     }
     Key {
         type: 6
@@ -118,7 +118,7 @@ VisualTest {
     }
     Frame {
         msec: 240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "572954512211be45ec468ca0c541f87b"
     }
     Key {
         type: 7
@@ -130,19 +130,19 @@ VisualTest {
     }
     Frame {
         msec: 256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "572954512211be45ec468ca0c541f87b"
     }
     Frame {
         msec: 272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "572954512211be45ec468ca0c541f87b"
     }
     Frame {
         msec: 288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "572954512211be45ec468ca0c541f87b"
     }
     Frame {
         msec: 304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "572954512211be45ec468ca0c541f87b"
     }
     Key {
         type: 7
@@ -154,11 +154,11 @@ VisualTest {
     }
     Frame {
         msec: 320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "572954512211be45ec468ca0c541f87b"
     }
     Frame {
         msec: 336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "572954512211be45ec468ca0c541f87b"
     }
     Key {
         type: 6
@@ -170,19 +170,19 @@ VisualTest {
     }
     Frame {
         msec: 352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Frame {
         msec: 368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Frame {
         msec: 384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Frame {
         msec: 400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Key {
         type: 7
@@ -194,19 +194,19 @@ VisualTest {
     }
     Frame {
         msec: 416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Frame {
         msec: 432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Frame {
         msec: 448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Frame {
         msec: 464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a3ea4d6ebf0b267a01e18d4d7139cace"
     }
     Key {
         type: 6
@@ -218,19 +218,19 @@ VisualTest {
     }
     Frame {
         msec: 480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "36fb24a55e2cda02c3001adaa67e82a7"
     }
     Frame {
         msec: 496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "36fb24a55e2cda02c3001adaa67e82a7"
     }
     Frame {
         msec: 512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "36fb24a55e2cda02c3001adaa67e82a7"
     }
     Frame {
         msec: 528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41fc29e728daf52d54a3acacceabab39"
     }
     Key {
         type: 6
@@ -250,23 +250,23 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "cc3eb1d7263556949e5f7ad3862d9959"
     }
     Frame {
         msec: 560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "cc3eb1d7263556949e5f7ad3862d9959"
     }
     Frame {
         msec: 576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "cc3eb1d7263556949e5f7ad3862d9959"
     }
     Frame {
         msec: 592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "cc3eb1d7263556949e5f7ad3862d9959"
     }
     Frame {
         msec: 608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "cc3eb1d7263556949e5f7ad3862d9959"
     }
     Key {
         type: 7
@@ -286,19 +286,19 @@ VisualTest {
     }
     Frame {
         msec: 624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1ebd7df1875dc93984c9b663791c058e"
     }
     Frame {
         msec: 640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1ebd7df1875dc93984c9b663791c058e"
     }
     Frame {
         msec: 656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1ebd7df1875dc93984c9b663791c058e"
     }
     Frame {
         msec: 672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1ebd7df1875dc93984c9b663791c058e"
     }
     Key {
         type: 7
@@ -310,11 +310,11 @@ VisualTest {
     }
     Frame {
         msec: 688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1ebd7df1875dc93984c9b663791c058e"
     }
     Frame {
         msec: 704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1ebd7df1875dc93984c9b663791c058e"
     }
     Key {
         type: 6
@@ -326,23 +326,23 @@ VisualTest {
     }
     Frame {
         msec: 720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "35ad49d6517b35bd410db9770818918d"
     }
     Frame {
         msec: 736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "35ad49d6517b35bd410db9770818918d"
     }
     Frame {
         msec: 752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "35ad49d6517b35bd410db9770818918d"
     }
     Frame {
         msec: 768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "35ad49d6517b35bd410db9770818918d"
     }
     Frame {
         msec: 784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "35ad49d6517b35bd410db9770818918d"
     }
     Key {
         type: 7
@@ -354,7 +354,7 @@ VisualTest {
     }
     Frame {
         msec: 800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "35ad49d6517b35bd410db9770818918d"
     }
     Key {
         type: 6
@@ -366,15 +366,15 @@ VisualTest {
     }
     Frame {
         msec: 816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "af5ec042c8a5e5b1942cb3e14a646b3a"
     }
     Frame {
         msec: 832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "af5ec042c8a5e5b1942cb3e14a646b3a"
     }
     Frame {
         msec: 848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "af5ec042c8a5e5b1942cb3e14a646b3a"
     }
     Key {
         type: 7
@@ -386,15 +386,15 @@ VisualTest {
     }
     Frame {
         msec: 864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "af5ec042c8a5e5b1942cb3e14a646b3a"
     }
     Frame {
         msec: 880
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "af5ec042c8a5e5b1942cb3e14a646b3a"
     }
     Frame {
         msec: 896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "af5ec042c8a5e5b1942cb3e14a646b3a"
     }
     Key {
         type: 6
@@ -406,15 +406,15 @@ VisualTest {
     }
     Frame {
         msec: 912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3e21db7face603e4a41010e10fdc35eb"
     }
     Frame {
         msec: 928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3e21db7face603e4a41010e10fdc35eb"
     }
     Frame {
         msec: 944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3e21db7face603e4a41010e10fdc35eb"
     }
     Frame {
         msec: 960
@@ -422,11 +422,11 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3e21db7face603e4a41010e10fdc35eb"
     }
     Frame {
         msec: 992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3e21db7face603e4a41010e10fdc35eb"
     }
     Key {
         type: 6
@@ -446,23 +446,23 @@ VisualTest {
     }
     Frame {
         msec: 1008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Key {
         type: 7
@@ -474,31 +474,31 @@ VisualTest {
     }
     Frame {
         msec: 1088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Frame {
         msec: 1184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6d8069ea1f16634ebcf94ba45041984f"
     }
     Key {
         type: 6
@@ -510,23 +510,23 @@ VisualTest {
     }
     Frame {
         msec: 1200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4058b4a448b3836e980e2167628d5d45"
     }
     Frame {
         msec: 1216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4058b4a448b3836e980e2167628d5d45"
     }
     Frame {
         msec: 1232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4058b4a448b3836e980e2167628d5d45"
     }
     Frame {
         msec: 1248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4058b4a448b3836e980e2167628d5d45"
     }
     Frame {
         msec: 1264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4058b4a448b3836e980e2167628d5d45"
     }
     Key {
         type: 7
@@ -546,11 +546,11 @@ VisualTest {
     }
     Frame {
         msec: 1280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9546e50697fd316e17b990d3ab235b8c"
     }
     Frame {
         msec: 1296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9546e50697fd316e17b990d3ab235b8c"
     }
     Key {
         type: 6
@@ -562,15 +562,15 @@ VisualTest {
     }
     Frame {
         msec: 1312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Frame {
         msec: 1328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Frame {
         msec: 1344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Key {
         type: 7
@@ -582,11 +582,11 @@ VisualTest {
     }
     Frame {
         msec: 1360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Frame {
         msec: 1376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Key {
         type: 7
@@ -598,19 +598,19 @@ VisualTest {
     }
     Frame {
         msec: 1392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Frame {
         msec: 1408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Frame {
         msec: 1424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Frame {
         msec: 1440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4f7a3795af41fc641483b6de3829a9b5"
     }
     Key {
         type: 6
@@ -622,23 +622,23 @@ VisualTest {
     }
     Frame {
         msec: 1456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a086058fa845a399a222c2571ef25442"
     }
     Frame {
         msec: 1472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a086058fa845a399a222c2571ef25442"
     }
     Frame {
         msec: 1488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a086058fa845a399a222c2571ef25442"
     }
     Frame {
         msec: 1504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a086058fa845a399a222c2571ef25442"
     }
     Frame {
         msec: 1520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "7e63c2f83280eee33bb3c954d769e297"
     }
     Key {
         type: 7
@@ -650,11 +650,11 @@ VisualTest {
     }
     Frame {
         msec: 1536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "7e63c2f83280eee33bb3c954d769e297"
     }
     Frame {
         msec: 1552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "7e63c2f83280eee33bb3c954d769e297"
     }
     Key {
         type: 6
@@ -666,23 +666,23 @@ VisualTest {
     }
     Frame {
         msec: 1568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a4a912ce9cee7ba833e70df683668d8e"
     }
     Frame {
         msec: 1584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a4a912ce9cee7ba833e70df683668d8e"
     }
     Frame {
         msec: 1600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a4a912ce9cee7ba833e70df683668d8e"
     }
     Frame {
         msec: 1616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a4a912ce9cee7ba833e70df683668d8e"
     }
     Frame {
         msec: 1632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a4a912ce9cee7ba833e70df683668d8e"
     }
     Key {
         type: 6
@@ -702,23 +702,23 @@ VisualTest {
     }
     Frame {
         msec: 1648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0ca0b36e56019968875c059bf95e133"
     }
     Frame {
         msec: 1664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0ca0b36e56019968875c059bf95e133"
     }
     Frame {
         msec: 1680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0ca0b36e56019968875c059bf95e133"
     }
     Frame {
         msec: 1696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0ca0b36e56019968875c059bf95e133"
     }
     Frame {
         msec: 1712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0ca0b36e56019968875c059bf95e133"
     }
     Key {
         type: 6
@@ -730,15 +730,15 @@ VisualTest {
     }
     Frame {
         msec: 1728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3c06f171b86ed55a425fdb316591a4f4"
     }
     Frame {
         msec: 1744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3c06f171b86ed55a425fdb316591a4f4"
     }
     Frame {
         msec: 1760
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3c06f171b86ed55a425fdb316591a4f4"
     }
     Key {
         type: 7
@@ -750,7 +750,7 @@ VisualTest {
     }
     Frame {
         msec: 1776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "3c06f171b86ed55a425fdb316591a4f4"
     }
     Key {
         type: 6
@@ -762,11 +762,11 @@ VisualTest {
     }
     Frame {
         msec: 1792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Frame {
         msec: 1808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Key {
         type: 7
@@ -778,19 +778,19 @@ VisualTest {
     }
     Frame {
         msec: 1824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Frame {
         msec: 1840
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Frame {
         msec: 1856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Frame {
         msec: 1872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Key {
         type: 7
@@ -802,11 +802,11 @@ VisualTest {
     }
     Frame {
         msec: 1888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Frame {
         msec: 1904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Frame {
         msec: 1920
@@ -814,11 +814,11 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Frame {
         msec: 1952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "e5100e36d546b8af34bfc7a68317fa74"
     }
     Key {
         type: 6
@@ -830,27 +830,27 @@ VisualTest {
     }
     Frame {
         msec: 1968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "2ddf4c1b9ec2d5540c456e10c2af775e"
     }
     Frame {
         msec: 1984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "2ddf4c1b9ec2d5540c456e10c2af775e"
     }
     Frame {
         msec: 2000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "2ddf4c1b9ec2d5540c456e10c2af775e"
     }
     Frame {
         msec: 2016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6e626464dfc68af86649589a23fe5368"
     }
     Frame {
         msec: 2032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6e626464dfc68af86649589a23fe5368"
     }
     Frame {
         msec: 2048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6e626464dfc68af86649589a23fe5368"
     }
     Key {
         type: 6
@@ -862,7 +862,7 @@ VisualTest {
     }
     Frame {
         msec: 2064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Key {
         type: 7
@@ -874,15 +874,15 @@ VisualTest {
     }
     Frame {
         msec: 2080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Frame {
         msec: 2096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Frame {
         msec: 2112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Key {
         type: 7
@@ -894,27 +894,27 @@ VisualTest {
     }
     Frame {
         msec: 2128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Frame {
         msec: 2144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Frame {
         msec: 2160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Frame {
         msec: 2176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Frame {
         msec: 2192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Frame {
         msec: 2208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e3a9ddf097022722e9e7ebb5e0bbeed"
     }
     Key {
         type: 6
@@ -926,23 +926,23 @@ VisualTest {
     }
     Frame {
         msec: 2224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "d715ce5ca080ba5045c16f88211ca2a7"
     }
     Frame {
         msec: 2240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "d715ce5ca080ba5045c16f88211ca2a7"
     }
     Frame {
         msec: 2256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "d715ce5ca080ba5045c16f88211ca2a7"
     }
     Frame {
         msec: 2272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "d715ce5ca080ba5045c16f88211ca2a7"
     }
     Frame {
         msec: 2288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "d715ce5ca080ba5045c16f88211ca2a7"
     }
     Key {
         type: 6
@@ -954,7 +954,7 @@ VisualTest {
     }
     Frame {
         msec: 2304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "11f9035d665a6eed88ea9e3030b111c7"
     }
     Key {
         type: 7
@@ -966,15 +966,15 @@ VisualTest {
     }
     Frame {
         msec: 2320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "11f9035d665a6eed88ea9e3030b111c7"
     }
     Frame {
         msec: 2336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "11f9035d665a6eed88ea9e3030b111c7"
     }
     Frame {
         msec: 2352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "11f9035d665a6eed88ea9e3030b111c7"
     }
     Key {
         type: 6
@@ -986,11 +986,11 @@ VisualTest {
     }
     Frame {
         msec: 2368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Frame {
         msec: 2384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Key {
         type: 7
@@ -1002,15 +1002,15 @@ VisualTest {
     }
     Frame {
         msec: 2400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Frame {
         msec: 2416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Frame {
         msec: 2432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Key {
         type: 7
@@ -1022,15 +1022,15 @@ VisualTest {
     }
     Frame {
         msec: 2448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Frame {
         msec: 2464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Frame {
         msec: 2480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8277b43c48def7e966bbb96309042fe6"
     }
     Key {
         type: 6
@@ -1042,19 +1042,19 @@ VisualTest {
     }
     Frame {
         msec: 2496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Frame {
         msec: 2544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Key {
         type: 7
@@ -1066,27 +1066,27 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Frame {
         msec: 2576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Frame {
         msec: 2592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Frame {
         msec: 2608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Frame {
         msec: 2624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Frame {
         msec: 2640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0a5589c5877c807b8d9540a1dd86e265"
     }
     Key {
         type: 6
@@ -1098,19 +1098,19 @@ VisualTest {
     }
     Frame {
         msec: 2656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "eff9abb425dbd30a0eb8ee940c2a0fdc"
     }
     Frame {
         msec: 2672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "eff9abb425dbd30a0eb8ee940c2a0fdc"
     }
     Frame {
         msec: 2688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "eff9abb425dbd30a0eb8ee940c2a0fdc"
     }
     Frame {
         msec: 2704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "eff9abb425dbd30a0eb8ee940c2a0fdc"
     }
     Key {
         type: 7
@@ -1122,15 +1122,15 @@ VisualTest {
     }
     Frame {
         msec: 2720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "eff9abb425dbd30a0eb8ee940c2a0fdc"
     }
     Frame {
         msec: 2736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "eff9abb425dbd30a0eb8ee940c2a0fdc"
     }
     Frame {
         msec: 2752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "eff9abb425dbd30a0eb8ee940c2a0fdc"
     }
     Key {
         type: 6
@@ -1142,23 +1142,23 @@ VisualTest {
     }
     Frame {
         msec: 2768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "dbc4c1e9f452575a2b543f3cc9ed53eb"
     }
     Frame {
         msec: 2784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "dbc4c1e9f452575a2b543f3cc9ed53eb"
     }
     Frame {
         msec: 2800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "dbc4c1e9f452575a2b543f3cc9ed53eb"
     }
     Frame {
         msec: 2816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "dbc4c1e9f452575a2b543f3cc9ed53eb"
     }
     Frame {
         msec: 2832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "dbc4c1e9f452575a2b543f3cc9ed53eb"
     }
     Key {
         type: 6
@@ -1178,11 +1178,11 @@ VisualTest {
     }
     Frame {
         msec: 2848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8ea955780d76128c025cf1a51c995075"
     }
     Frame {
         msec: 2864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8ea955780d76128c025cf1a51c995075"
     }
     Frame {
         msec: 2880
@@ -1190,7 +1190,7 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8ea955780d76128c025cf1a51c995075"
     }
     Key {
         type: 6
@@ -1202,11 +1202,11 @@ VisualTest {
     }
     Frame {
         msec: 2912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 2928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Key {
         type: 7
@@ -1218,11 +1218,11 @@ VisualTest {
     }
     Frame {
         msec: 2944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 2960
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Key {
         type: 7
@@ -1234,35 +1234,35 @@ VisualTest {
     }
     Frame {
         msec: 2976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 2992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 3008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 3024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "718894676b3feeff1924b9b315838551"
     }
     Frame {
         msec: 3040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "718894676b3feeff1924b9b315838551"
     }
     Frame {
         msec: 3056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "718894676b3feeff1924b9b315838551"
     }
     Frame {
         msec: 3072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "718894676b3feeff1924b9b315838551"
     }
     Frame {
         msec: 3088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "718894676b3feeff1924b9b315838551"
     }
     Key {
         type: 6
@@ -1274,23 +1274,23 @@ VisualTest {
     }
     Frame {
         msec: 3104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Key {
         type: 7
@@ -1302,23 +1302,23 @@ VisualTest {
     }
     Frame {
         msec: 3184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Frame {
         msec: 3248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "32ee9af5d9f714bbcc32206be600f309"
     }
     Key {
         type: 6
@@ -1330,15 +1330,15 @@ VisualTest {
     }
     Frame {
         msec: 3264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0e5a0e32f40d3e02758a394797cb3947"
     }
     Frame {
         msec: 3280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0e5a0e32f40d3e02758a394797cb3947"
     }
     Frame {
         msec: 3296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0e5a0e32f40d3e02758a394797cb3947"
     }
     Key {
         type: 7
@@ -1350,15 +1350,15 @@ VisualTest {
     }
     Frame {
         msec: 3312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0e5a0e32f40d3e02758a394797cb3947"
     }
     Frame {
         msec: 3328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0e5a0e32f40d3e02758a394797cb3947"
     }
     Frame {
         msec: 3344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0e5a0e32f40d3e02758a394797cb3947"
     }
     Key {
         type: 6
@@ -1370,23 +1370,23 @@ VisualTest {
     }
     Frame {
         msec: 3360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Frame {
         msec: 3376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Frame {
         msec: 3392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Frame {
         msec: 3408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Frame {
         msec: 3424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Key {
         type: 7
@@ -1398,15 +1398,15 @@ VisualTest {
     }
     Frame {
         msec: 3440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Frame {
         msec: 3456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Frame {
         msec: 3472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "31079d862bb5b41e36e146201f8c34d2"
     }
     Key {
         type: 6
@@ -1418,19 +1418,19 @@ VisualTest {
     }
     Frame {
         msec: 3488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1e5e9ab44b9c703637e58bb248026b51"
     }
     Frame {
         msec: 3504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1e5e9ab44b9c703637e58bb248026b51"
     }
     Frame {
         msec: 3520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1e5e9ab44b9c703637e58bb248026b51"
     }
     Frame {
         msec: 3536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1e5e9ab44b9c703637e58bb248026b51"
     }
     Key {
         type: 7
@@ -1442,11 +1442,11 @@ VisualTest {
     }
     Frame {
         msec: 3552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1e5e9ab44b9c703637e58bb248026b51"
     }
     Frame {
         msec: 3568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "1e5e9ab44b9c703637e58bb248026b51"
     }
     Key {
         type: 6
@@ -1458,27 +1458,27 @@ VisualTest {
     }
     Frame {
         msec: 3584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "18f5f77a48858fb5584d55ba3f3a94d3"
     }
     Frame {
         msec: 3600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "18f5f77a48858fb5584d55ba3f3a94d3"
     }
     Frame {
         msec: 3616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "18f5f77a48858fb5584d55ba3f3a94d3"
     }
     Frame {
         msec: 3632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "18f5f77a48858fb5584d55ba3f3a94d3"
     }
     Frame {
         msec: 3648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "18f5f77a48858fb5584d55ba3f3a94d3"
     }
     Frame {
         msec: 3664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "18f5f77a48858fb5584d55ba3f3a94d3"
     }
     Key {
         type: 6
@@ -1490,7 +1490,7 @@ VisualTest {
     }
     Frame {
         msec: 3680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Key {
         type: 7
@@ -1502,23 +1502,23 @@ VisualTest {
     }
     Frame {
         msec: 3696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3760
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Key {
         type: 7
@@ -1530,19 +1530,19 @@ VisualTest {
     }
     Frame {
         msec: 3776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3840
@@ -1550,19 +1550,19 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Frame {
         msec: 3904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "63d557c9ea24a9e63d6bdfc6259c8bf9"
     }
     Key {
         type: 6
@@ -1574,23 +1574,23 @@ VisualTest {
     }
     Frame {
         msec: 3920
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "67b49fc16da9390bff9814b34659baca"
     }
     Frame {
         msec: 3936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "67b49fc16da9390bff9814b34659baca"
     }
     Frame {
         msec: 3952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "67b49fc16da9390bff9814b34659baca"
     }
     Frame {
         msec: 3968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "67b49fc16da9390bff9814b34659baca"
     }
     Frame {
         msec: 3984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "67b49fc16da9390bff9814b34659baca"
     }
     Key {
         type: 7
@@ -1602,11 +1602,11 @@ VisualTest {
     }
     Frame {
         msec: 4000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "67b49fc16da9390bff9814b34659baca"
     }
     Frame {
         msec: 4016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8c949a494d7bd5f9b6e5ac5bf3baec59"
     }
     Key {
         type: 6
@@ -1618,15 +1618,15 @@ VisualTest {
     }
     Frame {
         msec: 4032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a06c039bc65f399f7dcb1a484e557f34"
     }
     Frame {
         msec: 4048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a06c039bc65f399f7dcb1a484e557f34"
     }
     Frame {
         msec: 4064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a06c039bc65f399f7dcb1a484e557f34"
     }
     Key {
         type: 7
@@ -1638,7 +1638,7 @@ VisualTest {
     }
     Frame {
         msec: 4080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a06c039bc65f399f7dcb1a484e557f34"
     }
     Key {
         type: 6
@@ -1650,19 +1650,19 @@ VisualTest {
     }
     Frame {
         msec: 4096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6471c3319fbe937080bd40d91770898f"
     }
     Frame {
         msec: 4112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6471c3319fbe937080bd40d91770898f"
     }
     Frame {
         msec: 4128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6471c3319fbe937080bd40d91770898f"
     }
     Frame {
         msec: 4144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6471c3319fbe937080bd40d91770898f"
     }
     Key {
         type: 7
@@ -1674,15 +1674,15 @@ VisualTest {
     }
     Frame {
         msec: 4160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6471c3319fbe937080bd40d91770898f"
     }
     Frame {
         msec: 4176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6471c3319fbe937080bd40d91770898f"
     }
     Frame {
         msec: 4192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6471c3319fbe937080bd40d91770898f"
     }
     Key {
         type: 6
@@ -1694,23 +1694,23 @@ VisualTest {
     }
     Frame {
         msec: 4208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "124451f5a072f626642a85ebc36c0914"
     }
     Frame {
         msec: 4224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "124451f5a072f626642a85ebc36c0914"
     }
     Frame {
         msec: 4240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "124451f5a072f626642a85ebc36c0914"
     }
     Frame {
         msec: 4256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "124451f5a072f626642a85ebc36c0914"
     }
     Frame {
         msec: 4272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "124451f5a072f626642a85ebc36c0914"
     }
     Key {
         type: 6
@@ -1722,7 +1722,7 @@ VisualTest {
     }
     Frame {
         msec: 4288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Key {
         type: 7
@@ -1734,15 +1734,15 @@ VisualTest {
     }
     Frame {
         msec: 4304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Frame {
         msec: 4320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Frame {
         msec: 4336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Key {
         type: 7
@@ -1754,23 +1754,23 @@ VisualTest {
     }
     Frame {
         msec: 4352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Frame {
         msec: 4368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Frame {
         msec: 4384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Frame {
         msec: 4400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Frame {
         msec: 4416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "963ee26238b20cd414e69b50ffa5a186"
     }
     Key {
         type: 6
@@ -1782,15 +1782,15 @@ VisualTest {
     }
     Frame {
         msec: 4432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Frame {
         msec: 4448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Frame {
         msec: 4464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Key {
         type: 7
@@ -1802,23 +1802,23 @@ VisualTest {
     }
     Frame {
         msec: 4480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Frame {
         msec: 4496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Frame {
         msec: 4512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Frame {
         msec: 4528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "55e236c3b51b7104cf3254a44b0f1c92"
     }
     Frame {
         msec: 4544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "55e236c3b51b7104cf3254a44b0f1c92"
     }
     Key {
         type: 6
@@ -1830,19 +1830,19 @@ VisualTest {
     }
     Frame {
         msec: 4560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Frame {
         msec: 4576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Frame {
         msec: 4592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Frame {
         msec: 4608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Key {
         type: 7
@@ -1854,19 +1854,19 @@ VisualTest {
     }
     Frame {
         msec: 4624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Frame {
         msec: 4640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Frame {
         msec: 4656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Frame {
         msec: 4672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "57bcfc2fbc8e5993f0908980bdef2e79"
     }
     Key {
         type: 6
@@ -1878,19 +1878,19 @@ VisualTest {
     }
     Frame {
         msec: 4688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "60b5ec304c447a3bf54da75f964e9fff"
     }
     Frame {
         msec: 4704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "60b5ec304c447a3bf54da75f964e9fff"
     }
     Frame {
         msec: 4720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "60b5ec304c447a3bf54da75f964e9fff"
     }
     Frame {
         msec: 4736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "60b5ec304c447a3bf54da75f964e9fff"
     }
     Key {
         type: 7
@@ -1902,15 +1902,15 @@ VisualTest {
     }
     Frame {
         msec: 4752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "60b5ec304c447a3bf54da75f964e9fff"
     }
     Frame {
         msec: 4768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "60b5ec304c447a3bf54da75f964e9fff"
     }
     Frame {
         msec: 4784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "60b5ec304c447a3bf54da75f964e9fff"
     }
     Key {
         type: 6
@@ -1926,7 +1926,7 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6ae6a9c38541546561db9049a300bce6"
     }
     Key {
         type: 7
@@ -1938,19 +1938,19 @@ VisualTest {
     }
     Frame {
         msec: 4832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6ae6a9c38541546561db9049a300bce6"
     }
     Frame {
         msec: 4848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6ae6a9c38541546561db9049a300bce6"
     }
     Frame {
         msec: 4864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6ae6a9c38541546561db9049a300bce6"
     }
     Frame {
         msec: 4880
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "6ae6a9c38541546561db9049a300bce6"
     }
     Key {
         type: 6
@@ -1962,19 +1962,19 @@ VisualTest {
     }
     Frame {
         msec: 4896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 4912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 4928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 4944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Key {
         type: 7
@@ -1986,203 +1986,203 @@ VisualTest {
     }
     Frame {
         msec: 4960
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 4976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 4992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 5520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5760
@@ -2190,239 +2190,239 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5840
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5920
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "a0208b5276f3f26500f40535017563a6"
     }
     Frame {
         msec: 6528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6720
@@ -2430,38 +2430,38 @@ VisualTest {
     }
     Frame {
         msec: 6736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.0.png
index 555996a..b24344c 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.1.png
index b705bad..5e29359 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.2.png
index 094cd2a..0ffee64 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.3.png
index 9c519c7..6c56e9c 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.4.png
index 3ec77b5..276170d 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.5.png
index 579a66e..3d8709f 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.6.png
index 9e5ac90..80b960c 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.7.png
index 9f3acfc..7247277 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.8.png
index f27518a..af5a996 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.9.png
new file mode 100644
index 0000000..b254164
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.qml
index ef9ba33..3819043 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.qml
@@ -6,239 +6,287 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "6e8324bf913d9df21a59ab4337257c15"
     }
     Frame {
         msec: 32
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "4e068995d68e8939e6560e35b685e839"
     }
     Frame {
         msec: 48
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "761b09bce25b3b240093d16ad02268d7"
     }
     Frame {
         msec: 64
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "1ecb6d7d08d4e4e14db28e24a60eccc4"
     }
     Frame {
         msec: 80
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "642417a56b3d6b8b35f5aec1bf0a9d2c"
     }
     Frame {
         msec: 96
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "2e24870a44d3fc6c6d5c920bab29d417"
     }
     Frame {
         msec: 112
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "9a59d0672f2a752943561af89fd71d7f"
     }
     Frame {
         msec: 128
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "c359dd36910678a30f935a13c8680ee4"
     }
     Frame {
         msec: 144
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "245f1e127549e9b28c7574ffb143fcde"
     }
     Frame {
         msec: 160
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "8df3d3dbce673311d88c055e8dffaeb5"
     }
     Frame {
         msec: 176
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "590fdeaddb3df033a1908a8a95fcd17a"
     }
     Frame {
         msec: 192
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "a158891c8d2ee3899463412a3363e48c"
     }
     Frame {
         msec: 208
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "e9ec2c82f46b36fbd0285ce6795c7cf9"
     }
     Frame {
         msec: 224
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "0a02598af770dfe1d332f10c9482e770"
     }
     Frame {
         msec: 240
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "8765475468bccbd0df897a533241f3c5"
     }
     Frame {
         msec: 256
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "4cd9deed66bfdfadde8f8bf34f0e5513"
     }
     Frame {
         msec: 272
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "139bf5a1811beb2438df4ecfa3bbaac7"
     }
     Frame {
         msec: 288
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "9d51555afd71a7035e67a543846dcf7f"
     }
     Frame {
         msec: 304
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "de187b58fc8dfaad2d62e9463691b0c0"
     }
     Frame {
         msec: 320
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "9f88ac6d71246b06ca7ce9d8d983c91b"
     }
     Frame {
         msec: 336
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "a43c12a7d6597d171112dc43085a439e"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 352
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "ad38f32755f669837ec2243e355ebc85"
     }
     Frame {
         msec: 368
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "d87bd14345c785cc7e78a5c5462b90ec"
     }
     Frame {
         msec: 384
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "77850031e012246dd967ac689e353eb3"
     }
     Frame {
         msec: 400
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "f1bd048cd9167a8f162d1c39aca4f7c1"
     }
     Frame {
         msec: 416
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "0fa030c5da23f23a0665a535e23b84a2"
     }
     Frame {
         msec: 432
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "af3a5f1982459164dfec26746172b0eb"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 448
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "0de90659472b63dd41a5602197ff502e"
     }
     Frame {
         msec: 464
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "81e40abf91017614a52e03bb2474549f"
     }
     Frame {
         msec: 480
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 496
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 512
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
     }
     Frame {
         msec: 528
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
     }
     Frame {
         msec: 544
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
     }
     Frame {
         msec: 560
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+        hash: "0416581d32ab84680dfc26b6f546d2c5"
     }
     Frame {
         msec: 576
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
+        hash: "ac98b973e6d12193829139661d3e5847"
     }
     Frame {
         msec: 592
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+        hash: "366907376adae4d88d42d1b9e7533ec0"
     }
     Frame {
         msec: 608
-        hash: "60a60e06237318bf005f87bbba386fef"
+        hash: "5f486d0a21c74f2ba50afcafa8c15453"
     }
     Frame {
         msec: 624
-        hash: "97549f388c02adb8884c2e79510adc7e"
+        hash: "a3bf6dde525e528745272a8e43fc895c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 640
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
+        hash: "4ffb297d2a98a3d13b848af569b1b5b5"
     }
     Frame {
         msec: 656
-        hash: "6310b65572e39256122c7620f7e87442"
+        hash: "3679a17658e417bf08fc86d4bef0d4e9"
     }
     Frame {
         msec: 672
-        hash: "4e7374a683050ff440056b6e7c971d2b"
+        hash: "5c6a25284ffd13350425e792fd143421"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 688
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
+        hash: "09a2c1032d0206e20340ae4267525f98"
     }
     Frame {
         msec: 704
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+        hash: "0036070d9a7ee854b3612858af46ab59"
     }
     Frame {
         msec: 720
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
+        hash: "8774509eaa5fc29385da89214ef77589"
     }
     Frame {
         msec: 736
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
+        hash: "6d4f8ebf046148e5079f498396c119b4"
     }
     Frame {
         msec: 752
-        hash: "70c827f1b34b44cbd775b666913556d6"
+        hash: "4c7d5d2f77116c96357b0791348af058"
     }
     Frame {
         msec: 768
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+        hash: "398c927a3525d5b90a5dd7a05ba9467b"
     }
     Frame {
         msec: 784
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
+        hash: "d84b45f6acb8cbd399d4ed6bf80ce132"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 800
-        hash: "59865194eb63465dd0f3925c7a500340"
+        hash: "40c597d9e04e8e0daf62f58b9e7973b3"
     }
     Frame {
         msec: 816
-        hash: "7bed5747d6b771db0fe5802153e54f2f"
+        hash: "2c7fdd47e29d924e3e008a6840e0e6be"
     }
     Frame {
         msec: 832
-        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
+        hash: "2b3229bb1aa220499114f274cf643ce9"
     }
     Frame {
         msec: 848
-        hash: "64ea5cb46782d250c46a7a2c8cceea20"
+        hash: "e55446874c1a343ce3607d679d69d1d4"
     }
     Frame {
         msec: 864
-        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
+        hash: "6824708eb176a9cf92f241d4054800dd"
     }
     Frame {
         msec: 880
-        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
+        hash: "d386230dd416740625eb4f677ef4531b"
     }
     Frame {
         msec: 896
-        hash: "96422f9bfbc11775cd7d1fae2ba357bd"
+        hash: "9b2fbddab890dbe43e84e85bf320e6c1"
     }
     Frame {
         msec: 912
-        hash: "0d247385059a6f68b37bc34f6b2214b1"
+        hash: "1d1065aca7eb47f0096bc2c8c4320880"
     }
     Frame {
         msec: 928
-        hash: "7c513361e13a90eef229b42e68ffaa18"
+        hash: "d97ba6e2bfc021fe993afdb5b28316ba"
     }
     Frame {
         msec: 944
-        hash: "510b8441c613f0637dfc46e03c278112"
+        hash: "3a3a2f340bf1ccb14eab0562d7ecfe87"
     }
     Frame {
         msec: 960
@@ -246,271 +294,287 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "8d90112e2e1c6f226a1a5f4f75785939"
+        hash: "ea4f4c1de5bfb1be43ab0188afb7189c"
     }
     Frame {
         msec: 992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "399ca2d4411d3fb226c94bd32a17d0cd"
     }
     Frame {
         msec: 1008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "ca78503396613536c8e4076884354cb1"
     }
     Frame {
         msec: 1024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "ca78503396613536c8e4076884354cb1"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "399ca2d4411d3fb226c94bd32a17d0cd"
     }
     Frame {
         msec: 1056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "ea4f4c1de5bfb1be43ab0188afb7189c"
     }
     Frame {
         msec: 1072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "d23d7492b85e4f30994ecd64e8273ff6"
     }
     Frame {
         msec: 1088
-        hash: "8d90112e2e1c6f226a1a5f4f75785939"
+        hash: "3a3a2f340bf1ccb14eab0562d7ecfe87"
     }
     Frame {
         msec: 1104
-        hash: "85e6af1f5fd15338a15f984e24d5ec9d"
+        hash: "d97ba6e2bfc021fe993afdb5b28316ba"
     }
     Frame {
         msec: 1120
-        hash: "510b8441c613f0637dfc46e03c278112"
+        hash: "1d1065aca7eb47f0096bc2c8c4320880"
     }
     Frame {
         msec: 1136
-        hash: "7c513361e13a90eef229b42e68ffaa18"
+        hash: "9b2fbddab890dbe43e84e85bf320e6c1"
     }
     Frame {
         msec: 1152
-        hash: "0d247385059a6f68b37bc34f6b2214b1"
+        hash: "d386230dd416740625eb4f677ef4531b"
     }
     Frame {
         msec: 1168
-        hash: "96422f9bfbc11775cd7d1fae2ba357bd"
+        hash: "6824708eb176a9cf92f241d4054800dd"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1184
-        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
+        hash: "e8e14dbba33578a36d9c69214333c537"
     }
     Frame {
         msec: 1200
-        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
+        hash: "95c6e967f6f445748945c51943cf532f"
     }
     Frame {
         msec: 1216
-        hash: "64ea5cb46782d250c46a7a2c8cceea20"
+        hash: "d145d4cbd0e3a98686b3bac1c5c17093"
     }
     Frame {
         msec: 1232
-        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
+        hash: "09348a4108a585dd23c3a252a5c596f6"
     }
     Frame {
         msec: 1248
-        hash: "7bed5747d6b771db0fe5802153e54f2f"
+        hash: "55126f2c879771e1aa5ced51b54c827a"
     }
     Frame {
         msec: 1264
-        hash: "59865194eb63465dd0f3925c7a500340"
+        hash: "ebb36a4c2fcb85107033ec2731fc5743"
     }
     Frame {
         msec: 1280
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
+        hash: "0581a4432d4b3d0c1555a31e772c2575"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1296
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+        hash: "b4030774f06935f1b43fc8f1a69e53a5"
     }
     Frame {
         msec: 1312
-        hash: "70c827f1b34b44cbd775b666913556d6"
+        hash: "655e1739c130888ff83a3b69bb0ab7e3"
     }
     Frame {
         msec: 1328
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
+        hash: "99fc97c572e7c8949693b32910e6eefb"
     }
     Frame {
         msec: 1344
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
+        hash: "e9c8bb13c2549047c05d671daa378496"
     }
     Frame {
         msec: 1360
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+        hash: "cb344e0d39b5b07ca7d094bf30ce9f53"
     }
     Frame {
         msec: 1376
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "15ba6e62c693f2bf74bdf86668139985"
     }
     Frame {
         msec: 1392
-        hash: "4e7374a683050ff440056b6e7c971d2b"
+        hash: "48133ec73eb9723059eb6e6af3139f2b"
     }
     Frame {
         msec: 1408
-        hash: "6310b65572e39256122c7620f7e87442"
+        hash: "0b19e777a04f03774f2d5f5398bdb10f"
     }
     Frame {
         msec: 1424
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
+        hash: "fc41d9a9aedf9274a68b33603ed6ccd0"
     }
     Frame {
         msec: 1440
-        hash: "97549f388c02adb8884c2e79510adc7e"
+        hash: "fa6e65f0c835b12dc10463711bd73350"
     }
     Frame {
         msec: 1456
-        hash: "60a60e06237318bf005f87bbba386fef"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "25a02c3388e52df550a0332efde90fcd"
     }
     Frame {
         msec: 1472
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+        hash: "2390443be82acf291856be59fa18fc26"
     }
     Frame {
         msec: 1488
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
+        hash: "2390443be82acf291856be59fa18fc26"
     }
     Frame {
         msec: 1504
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+        hash: "2390443be82acf291856be59fa18fc26"
     }
     Frame {
         msec: 1520
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+        hash: "2390443be82acf291856be59fa18fc26"
     }
     Frame {
         msec: 1536
-        hash: "c0e72cdf776b0c62742aa9c3683cd523"
+        hash: "2390443be82acf291856be59fa18fc26"
     }
     Frame {
         msec: 1552
-        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
+        hash: "2390443be82acf291856be59fa18fc26"
     }
     Frame {
         msec: 1568
-        hash: "de924155855e76d0591217448f79bdb6"
+        hash: "284cd356d551a048d4a000b90217ac72"
     }
     Frame {
         msec: 1584
-        hash: "51da770a75102de9ad1920f1f6c44146"
+        hash: "94fb20c3767e09d1b4254ee6122cf24e"
     }
     Frame {
         msec: 1600
-        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
+        hash: "bfac920384425ce9f34505b44eceb523"
     }
     Frame {
         msec: 1616
-        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
+        hash: "4a2d434efcb9a57f2013dc6b366e0e4e"
     }
     Frame {
         msec: 1632
-        hash: "2ee111386bd646c4ee577405e490a2f7"
+        hash: "d0fbe98dc34c4bb0d1ceb7e4678cc1d5"
+    }
+    Frame {
+        msec: 1648
+        hash: "28ab147983a71e93e5610f53e14bd113"
     }
     Key {
         type: 6
-        key: 16777233
-        modifiers: 0
+        key: 16777249
+        modifiers: 100663296
         text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 1648
-        hash: "24c376d5a2b3555126b156c8bc7a7a0c"
-    }
-    Frame {
         msec: 1664
-        hash: "d9c35de8b02f11db321d9bdcdcd65403"
+        hash: "2e6ee60fe9ff07fa4558134e6b1d6da8"
     }
     Frame {
         msec: 1680
-        hash: "0b32a66497ec3cdd05dc27c0ef9c5718"
+        hash: "f181e578e865981d7a2073080b381ec1"
     }
     Frame {
         msec: 1696
-        hash: "9626f80ef170af2db135792337203265"
+        hash: "d7c0558ea16829b52ea6d09814c301b9"
     }
     Frame {
         msec: 1712
-        hash: "6e4ce7599da579f764ff10e982888889"
+        hash: "c9304cb66c04566cf4374b46ab85e6e7"
     }
     Frame {
         msec: 1728
-        hash: "5ad4dd681be780c0068734ca5c722507"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "024dde64822afc9eea63974851fe57e1"
     }
     Frame {
         msec: 1744
-        hash: "7d620ef53049f9195cc832d6f9dfd52b"
+        hash: "8e4520e95a8acc8f1d4b710c4a14898f"
     }
     Frame {
         msec: 1760
-        hash: "0f54144c574af01958505eedd69162f6"
+        hash: "6b271c3f1d9d49bbd80a8ee33f3fc09c"
     }
     Frame {
         msec: 1776
-        hash: "50f168354e3901283708a4ae9088783d"
+        hash: "eb76a46632856bf07b005cad2ba2f6ab"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1792
-        hash: "c55fdf2fd0a4eeb9ca0e3072aa3e60c4"
+        hash: "a29bd83f6b4e877f3c7b89c82dfcab54"
     }
     Frame {
         msec: 1808
-        hash: "d351de13e7bb5b273ec3aebb88dffbd5"
+        hash: "dca39b6b6fff5e4a6309e4c0e42811c0"
     }
     Frame {
         msec: 1824
-        hash: "977d44194d1ef05801167157714891af"
+        hash: "88ad3f9f638a97bed98f00ec7d78dfe4"
     }
     Frame {
         msec: 1840
-        hash: "ef3694ca78764709abbe2f8781578fb4"
+        hash: "5697a705f36283213bbe4b5848baa764"
     }
     Frame {
         msec: 1856
-        hash: "77afbc0e0b828d03148ed7fe342dfbda"
+        hash: "8850842afae3060a91d612f7b869fd48"
     }
     Frame {
         msec: 1872
-        hash: "0d94e37430d8b835e65750a6af525ef7"
+        hash: "4f08dbd1cab0bfcc8b9f232d46cf42db"
     }
     Frame {
         msec: 1888
-        hash: "e009a8d2cb7c7f1200055666cf2efd9c"
+        hash: "f7df5b96d0983a918e3c81aa7bee3950"
     }
     Frame {
         msec: 1904
-        hash: "096a2742962d7b22dba768577373e656"
+        hash: "b28681bcb414d428588acda377fef838"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1920
@@ -518,271 +582,271 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "905b6c7ab24fd1a12f17494fc1935e98"
+        hash: "5c154b54776ed555563d3e5196a8aedd"
     }
     Frame {
         msec: 1952
-        hash: "9bc98b4a32ea933fcc3a40eaae9b3516"
+        hash: "ee64c0452b325880de3a4fea599c18cc"
     }
     Frame {
         msec: 1968
-        hash: "70f0313540b3517f3b6d403c3ab1199c"
+        hash: "0776e1557b2d32db1c7c43331c532331"
     }
     Frame {
         msec: 1984
-        hash: "309ae1af1ef7dbaf0b892ad60fd3eb93"
+        hash: "24b68da9a63bbf00ffffeca649f771fa"
     }
     Frame {
         msec: 2000
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "00d49d91b51f5bd428c07e9be65f551a"
     }
     Frame {
         msec: 2016
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "874d4b599cb92cd9160960e3b3af74e0"
     }
     Frame {
         msec: 2032
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "00d49d91b51f5bd428c07e9be65f551a"
     }
     Frame {
         msec: 2048
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "24b68da9a63bbf00ffffeca649f771fa"
     }
     Frame {
         msec: 2064
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "0776e1557b2d32db1c7c43331c532331"
     }
     Frame {
         msec: 2080
-        hash: "309ae1af1ef7dbaf0b892ad60fd3eb93"
+        hash: "ee64c0452b325880de3a4fea599c18cc"
     }
     Frame {
         msec: 2096
-        hash: "70f0313540b3517f3b6d403c3ab1199c"
+        hash: "5c154b54776ed555563d3e5196a8aedd"
     }
     Frame {
         msec: 2112
-        hash: "9bc98b4a32ea933fcc3a40eaae9b3516"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+        hash: "a5f90da82b51bc866648304a20a1dcd3"
     }
     Frame {
         msec: 2128
-        hash: "905b6c7ab24fd1a12f17494fc1935e98"
+        hash: "b28681bcb414d428588acda377fef838"
     }
     Frame {
         msec: 2144
-        hash: "31adf3a3bfbd1083c50cae7ed5d64334"
+        hash: "f7df5b96d0983a918e3c81aa7bee3950"
     }
     Frame {
         msec: 2160
-        hash: "096a2742962d7b22dba768577373e656"
+        hash: "4f08dbd1cab0bfcc8b9f232d46cf42db"
     }
     Frame {
         msec: 2176
-        hash: "e009a8d2cb7c7f1200055666cf2efd9c"
+        hash: "8850842afae3060a91d612f7b869fd48"
     }
     Frame {
         msec: 2192
-        hash: "0d94e37430d8b835e65750a6af525ef7"
+        hash: "5697a705f36283213bbe4b5848baa764"
     }
     Frame {
         msec: 2208
-        hash: "77afbc0e0b828d03148ed7fe342dfbda"
+        hash: "88ad3f9f638a97bed98f00ec7d78dfe4"
     }
     Frame {
         msec: 2224
-        hash: "ef3694ca78764709abbe2f8781578fb4"
+        hash: "dca39b6b6fff5e4a6309e4c0e42811c0"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2240
-        hash: "977d44194d1ef05801167157714891af"
+        hash: "a29bd83f6b4e877f3c7b89c82dfcab54"
     }
     Frame {
         msec: 2256
-        hash: "d351de13e7bb5b273ec3aebb88dffbd5"
+        hash: "7defd2ecefeb86b457a2ee76d97424ee"
     }
     Frame {
         msec: 2272
-        hash: "c55fdf2fd0a4eeb9ca0e3072aa3e60c4"
+        hash: "ccf6d45e8822d72482d9b585909b612b"
     }
     Frame {
         msec: 2288
-        hash: "50f168354e3901283708a4ae9088783d"
+        hash: "996dddf091394513adda1b1f00bf0c68"
     }
     Frame {
         msec: 2304
-        hash: "0f54144c574af01958505eedd69162f6"
+        hash: "3cf94e90eddb4b0815762b89f58f8325"
     }
     Frame {
         msec: 2320
-        hash: "7d620ef53049f9195cc832d6f9dfd52b"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+        hash: "ab9f876450526b37774c6c4a5794c7b1"
     }
     Frame {
         msec: 2336
-        hash: "03e906dfb3bf98f521d805331d3b5b9c"
+        hash: "9109880e9201e92eb17ae87a3648dca7"
     }
     Frame {
         msec: 2352
-        hash: "c2376393ea9541b909b6b4fe188fa03e"
+        hash: "0e759f2f279057c1f4d1147be5b41214"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2368
-        hash: "9b3935370412c75acdf6e91100cf2f53"
+        hash: "d87bd14345c785cc7e78a5c5462b90ec"
     }
     Frame {
         msec: 2384
-        hash: "30ab7913bdfc51d2df5ab9f3863d28c7"
+        hash: "77850031e012246dd967ac689e353eb3"
     }
     Frame {
         msec: 2400
-        hash: "593656e93d6e01419002dbb581aa6cbd"
+        hash: "f1bd048cd9167a8f162d1c39aca4f7c1"
     }
     Frame {
         msec: 2416
-        hash: "33800dd560e44ce39d6325bbdee689de"
+        hash: "0fa030c5da23f23a0665a535e23b84a2"
     }
     Frame {
         msec: 2432
-        hash: "c41a9c4f08053d5d18fb2d530ed8b5ad"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+        hash: "af3a5f1982459164dfec26746172b0eb"
     }
     Frame {
         msec: 2448
-        hash: "b3f2d4a2cb9a9d1304a2a2d07ad41ff2"
+        hash: "0de90659472b63dd41a5602197ff502e"
     }
     Frame {
         msec: 2464
-        hash: "93cf7fe53bc1fd749c523d40b27d17b4"
+        hash: "81e40abf91017614a52e03bb2474549f"
     }
     Frame {
         msec: 2480
-        hash: "6e9226d01dd93cff763e851148da8dfd"
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2496
-        hash: "79fdbda495bbc6c9ae8be03e1467de92"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 2512
-        hash: "c30fc0fa9351dbcdbe4f2a297cba9a52"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 2528
-        hash: "eaf26162fd5ce42262ea08ef39a7123d"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 2544
-        hash: "7bf0d6a5753a60eefae6d3c3819fabe4"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 2560
-        hash: "a2ee3a3b9cd22d7c0e54524cad32e647"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 2576
-        hash: "822298cfc4e2d64db1bf3e442dd891e6"
+        hash: "e26dbfb26415b21198add56d5de02cb2"
     }
     Frame {
         msec: 2592
-        hash: "d075c64000b045eae1b42dce701787b7"
+        hash: "fa2877a963417789b82170b32e0af7a0"
     }
     Frame {
         msec: 2608
-        hash: "5ca7f15af781f896c83c81077f6b072e"
+        hash: "860b39f92c412a7d946f882d8f99d837"
     }
     Frame {
         msec: 2624
-        hash: "7d0f14896e67c56ed5238472dc127cb1"
+        hash: "d7b8c52aef183965a97d82a18b03ed94"
     }
     Frame {
         msec: 2640
-        hash: "dca161e8a9d786ba9d50aa655ccbecd3"
+        hash: "b1ce9cf0ebd8e1e783e5bd43bbd72072"
     }
     Frame {
         msec: 2656
-        hash: "73bfcb0f5104efd056f25f7d73126369"
+        hash: "d214b419ec5b4cff8f877bdeb1b9ef96"
     }
     Frame {
         msec: 2672
-        hash: "0090459043b05bf9504434f36230b32b"
+        hash: "95e7057104508b3919d722d4befde7b7"
     }
     Frame {
         msec: 2688
-        hash: "f64315858f375c6ded480b2017fc18a5"
+        hash: "270489ec5da5bf9a93fa4e52f47a71f5"
     }
     Frame {
         msec: 2704
-        hash: "fe4c0ecfa9779c9fe052d4ffc9386d46"
+        hash: "46646e396ab0c1c20427dadd71d45ba9"
     }
     Frame {
         msec: 2720
-        hash: "849ad15f0ca893881165e956e8a26174"
+        hash: "65e2fd167565f876310d56fa9203c118"
     }
     Frame {
         msec: 2736
-        hash: "c4373fa63ed00832c70a6b94cb729397"
+        hash: "aff0da79bd9bd8c285139d7737a1316f"
     }
     Frame {
         msec: 2752
-        hash: "0c7e08fb7f0dd954b0f171a37ef2a310"
+        hash: "bf264fe7d774a597a3ff0965d912fa90"
     }
     Frame {
         msec: 2768
-        hash: "505071572df7aa300a675f8a808bc7f4"
+        hash: "f00358343437f6e058848c7237601632"
     }
     Frame {
         msec: 2784
-        hash: "52839867e81d52746196f299a8371453"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "88c9e1d58397a81ed23931c7fdae1e7d"
     }
     Frame {
         msec: 2800
-        hash: "c4d214a7e0fc52c2a45fc6e3df12550a"
+        hash: "44d46b459f6bb89510e52b0d999fd499"
     }
     Frame {
         msec: 2816
-        hash: "f1fa48d796667bd053fff4af7ec1d8ce"
+        hash: "0c196a24c9ca7143d382688db678d855"
     }
     Frame {
         msec: 2832
-        hash: "081e46decc8aba911f018acfd761cda1"
+        hash: "9df6d3d3b9981cb907ab89e65b743e97"
     }
     Frame {
         msec: 2848
-        hash: "fa417c9bfda1da66320a8e59fbaeb5b6"
+        hash: "501a644d6cde64ad041b086e00fd3950"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2864
-        hash: "83dfa353fd20f3bf7caa8e6ca9a9933c"
+        hash: "83f297406b1c6311da3a216024836d15"
     }
     Frame {
         msec: 2880
@@ -790,511 +854,527 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "c11459b1d3e51f3d2f5bd30049bcca42"
+        hash: "93f79f8717948bde8ee55c668af2d397"
     }
     Frame {
         msec: 2912
-        hash: "997ff3fa82ba2fb27a9c41ed9abe8991"
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
     }
     Frame {
         msec: 2928
-        hash: "f8baaadde147266416c9ab3f9d9106ce"
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
     }
     Frame {
         msec: 2944
-        hash: "79d1d34fd343d8de631aa3259167fe26"
+        hash: "c83c973fb1253ccab333fb1e604155b8"
     }
     Frame {
         msec: 2960
-        hash: "8b1445ca6131a0fc4377ded24a60186a"
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
     }
     Frame {
         msec: 2976
-        hash: "784cc01604ecadf74a45164f73f0336d"
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2992
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
     }
     Frame {
         msec: 3008
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
     }
     Frame {
         msec: 3024
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
     }
     Frame {
         msec: 3040
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
     }
     Frame {
         msec: 3056
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
     }
     Frame {
         msec: 3072
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
     }
     Frame {
         msec: 3088
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
+        hash: "c83c973fb1253ccab333fb1e604155b8"
     }
     Frame {
         msec: 3104
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
     }
     Frame {
         msec: 3120
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
     }
     Frame {
         msec: 3136
-        hash: "75e854ccaad087bfe776a843f0bd7284"
+        hash: "93f79f8717948bde8ee55c668af2d397"
     }
     Frame {
         msec: 3152
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
+        hash: "1bb236db749ef514c00d0a3dd698d24f"
     }
     Frame {
         msec: 3168
-        hash: "3d78320cb021944d7c6cee1a42056663"
+        hash: "83f297406b1c6311da3a216024836d15"
     }
     Frame {
         msec: 3184
-        hash: "fca865f762c1a6cc3e487e0e908eef73"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "3d284b4000d2849ed4af2f7c1b859492"
     }
     Frame {
         msec: 3200
-        hash: "fb7ad9156658f3866d19e43f006cf013"
+        hash: "de315e6836334fd0a2da855f5be4ff30"
     }
     Frame {
         msec: 3216
-        hash: "6f7411363c66d0959ea5a16a9b610e61"
-    }
-    Frame {
-        msec: 3232
-        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
-    }
-    Frame {
-        msec: 3248
-        hash: "56b81435dc4ce193bb98c3d02c781242"
+        hash: "5ca117709284f4a1cbd64cdba4079340"
     }
     Key {
         type: 6
-        key: 16777234
-        modifiers: 0
+        key: 16777236
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 3232
+        hash: "308a4220f5c74fd56bd218cd695b9822"
+    }
+    Frame {
+        msec: 3248
+        hash: "4ac4e09e987f2ba9661ed52fb1bdf236"
+    }
+    Frame {
         msec: 3264
-        hash: "59865194eb63465dd0f3925c7a500340"
+        hash: "9ffd39a8a540ec88ff2b20a16ef083ee"
     }
     Frame {
         msec: 3280
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
+        hash: "4a36ed8e68811954fef171d5734ccbaf"
     }
     Frame {
         msec: 3296
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+        hash: "714a6231aca70cfa8e83ea71b7ae90dc"
     }
     Frame {
         msec: 3312
-        hash: "70c827f1b34b44cbd775b666913556d6"
+        hash: "1fa9e35449ee87c972e3189ad0651a68"
     }
     Frame {
         msec: 3328
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
-    }
-    Frame {
-        msec: 3344
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
-    }
-    Frame {
-        msec: 3360
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+        hash: "d602008fada2f4edb6ad00fe759f9db9"
     }
     Key {
         type: 7
-        key: 16777234
-        modifiers: 0
+        key: 16777236
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 3344
+        hash: "bf16cc38f109e761b5ac2b0c63a1a2fe"
+    }
+    Frame {
+        msec: 3360
+        hash: "30f26041533455ed92c4984f55e3c6ff"
+    }
+    Frame {
         msec: 3376
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
+        hash: "5838d666902bc693de505522dad13254"
     }
     Frame {
         msec: 3392
-        hash: "4e7374a683050ff440056b6e7c971d2b"
+        hash: "6c8ada09b627050e4340da6e8ddd646e"
     }
     Frame {
         msec: 3408
-        hash: "6310b65572e39256122c7620f7e87442"
+        hash: "b33cd5bbb90d435dd7ea3ab67bef88ee"
     }
     Frame {
         msec: 3424
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
+        hash: "692d4029938c01044b4210958dd1ee7e"
     }
     Frame {
         msec: 3440
-        hash: "97549f388c02adb8884c2e79510adc7e"
+        hash: "7e2e55555ee2c7e172e61ddb6365355d"
     }
     Frame {
         msec: 3456
-        hash: "60a60e06237318bf005f87bbba386fef"
+        hash: "87ca0584879b25336a1023ac3252fc9a"
     }
     Frame {
         msec: 3472
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 3488
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 3504
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 3520
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 3536
-        hash: "c0e72cdf776b0c62742aa9c3683cd523"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 3552
-        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 3568
-        hash: "de924155855e76d0591217448f79bdb6"
+        hash: "8c6052eb4cf03d7742a73874d9f15285"
     }
     Frame {
         msec: 3584
-        hash: "51da770a75102de9ad1920f1f6c44146"
+        hash: "8a1b63c42867f87a1cf4b47944b3860a"
     }
     Frame {
         msec: 3600
-        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
+        hash: "90712efd7c17b0ad33d2c2c02e9eaa97"
     }
     Frame {
         msec: 3616
-        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
+        hash: "8099972420ffd03e2bfc3ea45918a543"
     }
     Frame {
         msec: 3632
-        hash: "2ee111386bd646c4ee577405e490a2f7"
+        hash: "2b78b1179a34319c287a6659406e23c3"
     }
     Frame {
         msec: 3648
-        hash: "fe95122352effcf1815bc237fc6ce6ab"
+        hash: "ad9458ab4d6376c87350a2356c280f94"
     }
     Frame {
         msec: 3664
-        hash: "e3bb1ec3b84df25712f06e0d6963efdd"
+        hash: "a74bc230e310a2826b2fed962db22f7a"
     }
     Frame {
         msec: 3680
-        hash: "a10d3184acc85c46e171fe4cf82e1c23"
+        hash: "bd72e8f4757050c41673a6f0d38f2285"
     }
     Frame {
         msec: 3696
-        hash: "d566b2763312e5e823593806acd9e809"
+        hash: "379bad4fa4b605cb6a16434bdb031e2b"
     }
     Frame {
         msec: 3712
-        hash: "7db073b7487ddea48e7c9df8b9bfdc00"
+        hash: "e144a8e9586f29f9b2f042b47e7739ae"
     }
     Frame {
         msec: 3728
-        hash: "85c663b943f67d158367dba0508980a5"
+        hash: "bd74c9e79bc1a88dd6a17a3aed21e368"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3744
-        hash: "6336ce0d912ee63773475c4c6c5d59be"
+        hash: "144724168f42372e10ec6c39662a5ed8"
     }
     Frame {
         msec: 3760
-        hash: "c75ba80484af36633b6a4d17b666b1c9"
+        hash: "d8859888802e7b54e2d2a44cf252eb54"
     }
     Frame {
         msec: 3776
-        hash: "08b7d4eef2d15bc717ff1a981a11f275"
+        hash: "20561e2faf7e8fe1d6337248e6cd5e94"
     }
     Frame {
         msec: 3792
-        hash: "0ab8bebb0e43786a7e51ea780745080c"
+        hash: "184cff262d1004ce702c117a6b5b9699"
     }
     Frame {
         msec: 3808
-        hash: "6fa1811f520eff9893b3c7b00e53fa7d"
+        hash: "61b156acacefa6e4f4ddd8adaca90d08"
     }
     Frame {
         msec: 3824
-        hash: "6feb44655bfbec651cc2902676bd08b4"
+        hash: "0906852b1e62a936694a22d6ffa4f5dd"
     }
     Frame {
         msec: 3840
         image: "cursorDelegate.3.png"
     }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
     Frame {
         msec: 3856
-        hash: "00b7714df163d8055514e0dbd8a83bac"
+        hash: "cc0fb2ae2dd1ccad94c453bc4c4b6d32"
     }
     Frame {
         msec: 3872
-        hash: "6ef2a330d70a7e0ce343bb352c46f126"
+        hash: "6a6baee5ca76d331c47fca4d0f7168e5"
     }
     Frame {
         msec: 3888
-        hash: "f4e26309fa3b8a6d55f44bf146544101"
+        hash: "32032d7ce55af41c97ac5bf33aca40bb"
     }
     Frame {
         msec: 3904
-        hash: "dfa1e24149f2662a4a552da3bb64348c"
+        hash: "a8781226e5e494324a34e120aa446cd1"
     }
     Frame {
         msec: 3920
-        hash: "9ab9d6ef4aeb5863401a9e251f684e2d"
+        hash: "0dd5df088fcc0228a97ffe715c95e2b6"
     }
     Frame {
         msec: 3936
-        hash: "c9f7591a37a3743b3b48de5337fd2fa0"
+        hash: "774b161fe9645bc69b89e580b3e41f71"
     }
     Frame {
         msec: 3952
-        hash: "2d38f17db530050574d9192c805c142d"
+        hash: "5756d7ffd8ff656db54f4329ea909553"
     }
     Frame {
         msec: 3968
-        hash: "38a4ad2cf9fa3015eff67014900a44cc"
+        hash: "2b4a5c97ff4d8792a7706bb78385ec35"
     }
     Frame {
         msec: 3984
-        hash: "9d9ce4ac0de6caa2f0bb78eac414ba65"
+        hash: "f9765e4def564b64861402e1a873b169"
     }
     Frame {
         msec: 4000
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "287b07ef6288dcea13fffd2b95aafd54"
     }
     Frame {
         msec: 4016
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "7abcb9d6cf223c1655f6265f780a321a"
     }
     Frame {
         msec: 4032
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "287b07ef6288dcea13fffd2b95aafd54"
     }
     Frame {
         msec: 4048
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "f9765e4def564b64861402e1a873b169"
     }
     Frame {
         msec: 4064
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+        hash: "2b4a5c97ff4d8792a7706bb78385ec35"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 4080
-        hash: "9d9ce4ac0de6caa2f0bb78eac414ba65"
+        hash: "5756d7ffd8ff656db54f4329ea909553"
     }
     Frame {
         msec: 4096
-        hash: "38a4ad2cf9fa3015eff67014900a44cc"
+        hash: "774b161fe9645bc69b89e580b3e41f71"
     }
     Frame {
         msec: 4112
-        hash: "2d38f17db530050574d9192c805c142d"
+        hash: "0dd5df088fcc0228a97ffe715c95e2b6"
     }
     Frame {
         msec: 4128
-        hash: "c9f7591a37a3743b3b48de5337fd2fa0"
+        hash: "a8781226e5e494324a34e120aa446cd1"
     }
     Frame {
         msec: 4144
-        hash: "9ab9d6ef4aeb5863401a9e251f684e2d"
+        hash: "32032d7ce55af41c97ac5bf33aca40bb"
     }
     Frame {
         msec: 4160
-        hash: "dfa1e24149f2662a4a552da3bb64348c"
+        hash: "6a6baee5ca76d331c47fca4d0f7168e5"
     }
     Frame {
         msec: 4176
-        hash: "f4e26309fa3b8a6d55f44bf146544101"
+        hash: "cc0fb2ae2dd1ccad94c453bc4c4b6d32"
     }
     Frame {
         msec: 4192
-        hash: "6ef2a330d70a7e0ce343bb352c46f126"
+        hash: "2d1b406be294727a278ba6bbc97be62a"
     }
     Frame {
         msec: 4208
-        hash: "00b7714df163d8055514e0dbd8a83bac"
+        hash: "0906852b1e62a936694a22d6ffa4f5dd"
     }
     Frame {
         msec: 4224
-        hash: "ae46d672649a4b0fc5171f776af93a2c"
+        hash: "61b156acacefa6e4f4ddd8adaca90d08"
     }
     Frame {
         msec: 4240
-        hash: "6feb44655bfbec651cc2902676bd08b4"
+        hash: "184cff262d1004ce702c117a6b5b9699"
     }
     Frame {
         msec: 4256
-        hash: "6fa1811f520eff9893b3c7b00e53fa7d"
+        hash: "20561e2faf7e8fe1d6337248e6cd5e94"
     }
     Frame {
         msec: 4272
-        hash: "0ab8bebb0e43786a7e51ea780745080c"
+        hash: "d8859888802e7b54e2d2a44cf252eb54"
     }
     Frame {
         msec: 4288
-        hash: "08b7d4eef2d15bc717ff1a981a11f275"
+        hash: "144724168f42372e10ec6c39662a5ed8"
     }
     Frame {
         msec: 4304
-        hash: "c75ba80484af36633b6a4d17b666b1c9"
+        hash: "d2da36fbf73289f545133bd608af66a2"
     }
     Frame {
         msec: 4320
-        hash: "6336ce0d912ee63773475c4c6c5d59be"
+        hash: "b1d7da6b42a31bba91148ab37b111945"
     }
     Frame {
         msec: 4336
-        hash: "85c663b943f67d158367dba0508980a5"
+        hash: "6f226a3b20d95e17df69e2c4e5aff3d1"
     }
     Frame {
         msec: 4352
-        hash: "7db073b7487ddea48e7c9df8b9bfdc00"
+        hash: "1109da0f043a9418661fc05e53fe3b45"
     }
     Frame {
         msec: 4368
-        hash: "d566b2763312e5e823593806acd9e809"
+        hash: "f3e901db9efd1d9fadf1cb6858040d51"
     }
     Frame {
         msec: 4384
-        hash: "a10d3184acc85c46e171fe4cf82e1c23"
+        hash: "c8e50c0e924b11a3f1943abb9a4008a4"
     }
     Frame {
         msec: 4400
-        hash: "e3bb1ec3b84df25712f06e0d6963efdd"
+        hash: "431226a27488ed1dba237de3d43f94c5"
     }
     Frame {
         msec: 4416
-        hash: "fe95122352effcf1815bc237fc6ce6ab"
+        hash: "420d316430c84f10d7cd24d29b918149"
     }
     Frame {
         msec: 4432
-        hash: "2ee111386bd646c4ee577405e490a2f7"
+        hash: "ccbd4d1e4865ebd9b0fe923e6ab05e5c"
     }
     Frame {
         msec: 4448
-        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
+        hash: "231bff73758a1c6f7c7c0365159ba3e6"
     }
     Frame {
         msec: 4464
-        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
+        hash: "d1ac7ceda7303bbf3392d33f47037ed6"
     }
     Frame {
         msec: 4480
-        hash: "51da770a75102de9ad1920f1f6c44146"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4496
-        hash: "de924155855e76d0591217448f79bdb6"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4512
-        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4528
-        hash: "c0e72cdf776b0c62742aa9c3683cd523"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4544
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4560
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4576
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
+        hash: "a2ad07326fafcb3012cdb869f39af466"
     }
     Frame {
         msec: 4592
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+        hash: "8622eb25a6da44926b5161bce213a483"
     }
     Frame {
         msec: 4608
-        hash: "60a60e06237318bf005f87bbba386fef"
+        hash: "fe563aa9dae9655871f82a779063cdbd"
     }
     Frame {
         msec: 4624
-        hash: "97549f388c02adb8884c2e79510adc7e"
+        hash: "775cd79b012f79b773449a0ad8457149"
     }
     Frame {
         msec: 4640
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
+        hash: "01e9fab344a148a0877a7332d561be5a"
     }
     Frame {
         msec: 4656
-        hash: "6310b65572e39256122c7620f7e87442"
+        hash: "935566d139599a30197850774fb059ba"
     }
     Frame {
         msec: 4672
-        hash: "4e7374a683050ff440056b6e7c971d2b"
+        hash: "4aae1ac532624417decddd978f516b6e"
     }
     Frame {
         msec: 4688
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
+        hash: "34dc78df6e9941988712c1f8f79c3db0"
     }
     Frame {
         msec: 4704
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+        hash: "23a96c11d5917c44bd48239ed2b5777f"
     }
     Frame {
         msec: 4720
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
+        hash: "f8f13e097eae3152db3ccebff1343fe0"
     }
     Frame {
         msec: 4736
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
+        hash: "02f8fca7c4ab80ecf425e4b39e966b86"
     }
     Frame {
         msec: 4752
-        hash: "70c827f1b34b44cbd775b666913556d6"
+        hash: "c3356367750e797ff81bc4102f948134"
     }
     Frame {
         msec: 4768
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+        hash: "7b5de3772b8bcb4b10f3d265d5603afb"
     }
     Frame {
         msec: 4784
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
+        hash: "ed3c741639232377f61867fd353ce58a"
     }
     Frame {
         msec: 4800
@@ -1302,2254 +1382,118 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "7bed5747d6b771db0fe5802153e54f2f"
+        hash: "5ca117709284f4a1cbd64cdba4079340"
     }
     Frame {
         msec: 4832
-        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
+        hash: "de315e6836334fd0a2da855f5be4ff30"
     }
     Frame {
         msec: 4848
-        hash: "64ea5cb46782d250c46a7a2c8cceea20"
+        hash: "3d284b4000d2849ed4af2f7c1b859492"
     }
     Frame {
         msec: 4864
-        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
+        hash: "83f297406b1c6311da3a216024836d15"
     }
     Frame {
         msec: 4880
-        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 130; y: 101
-        modifiers: 0
-        sendToViewport: true
+        hash: "1bb236db749ef514c00d0a3dd698d24f"
     }
     Frame {
         msec: 4896
-        hash: "3d78320cb021944d7c6cee1a42056663"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 102
-        modifiers: 0
-        sendToViewport: true
+        hash: "93f79f8717948bde8ee55c668af2d397"
     }
     Frame {
         msec: 4912
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 102
-        modifiers: 0
-        sendToViewport: true
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
     }
     Frame {
         msec: 4928
-        hash: "75e854ccaad087bfe776a843f0bd7284"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 132; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
     }
     Frame {
         msec: 4944
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 133; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 134; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "c83c973fb1253ccab333fb1e604155b8"
     }
     Frame {
         msec: 4960
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 135; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
     }
     Frame {
         msec: 4976
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 136; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
     }
     Frame {
         msec: 4992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 137; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 102
-        modifiers: 0
-        sendToViewport: true
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
     }
     Frame {
         msec: 5008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 139; y: 101
-        modifiers: 0
-        sendToViewport: true
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
     }
     Frame {
         msec: 5024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 101
-        modifiers: 0
-        sendToViewport: true
+        hash: "00fa0306d3fdc7e384cfc0660a3a355d"
     }
     Frame {
         msec: 5040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 141; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 143; y: 100
-        modifiers: 0
-        sendToViewport: true
+        hash: "fc8ede705bfe8f339fe47041c502b0d6"
     }
     Frame {
         msec: 5056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 100
-        modifiers: 0
-        sendToViewport: true
+        hash: "fb342743dc5ab9ade2b8a48a2a11dc8f"
     }
     Frame {
         msec: 5072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "dd6072d204812c23e24db1e7a81c6f57"
     }
     Frame {
         msec: 5088
-        hash: "748dc58a3ad83d7b99d7b26ad2f82786"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "c83c973fb1253ccab333fb1e604155b8"
     }
     Frame {
         msec: 5104
-        hash: "242cc0ee7c3bdb44e8933068d3a93b61"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 150; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "be72fe7c27901db62f2dbd9a757e4838"
     }
     Frame {
         msec: 5120
-        hash: "3be6f0a35fb085dcf6c9481cf1c23f9d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "881b5c2ccd0bbdaea4d61abbec600fc5"
     }
     Frame {
         msec: 5136
-        hash: "a6f63267eaba9aefd2c9ab338571ef33"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "93f79f8717948bde8ee55c668af2d397"
     }
     Frame {
         msec: 5152
-        hash: "ba37dd9ba649e294465dc707f6b768ec"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "1bb236db749ef514c00d0a3dd698d24f"
     }
     Frame {
         msec: 5168
-        hash: "35b186609721ec0b8a121d15bc54ce49"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "83f297406b1c6311da3a216024836d15"
     }
     Frame {
         msec: 5184
-        hash: "700ff15e4e48af93362455a149d90363"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "3d284b4000d2849ed4af2f7c1b859492"
     }
     Frame {
         msec: 5200
-        hash: "1c51eb8d4d25d086bda4d595a49c3a86"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "de315e6836334fd0a2da855f5be4ff30"
     }
     Frame {
         msec: 5216
-        hash: "2f085b047d24384d463163df7fac2bd3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "5ca117709284f4a1cbd64cdba4079340"
     }
     Frame {
         msec: 5232
-        hash: "46d7aff6eb47e50e23c061ecb149fbf9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "4f0d49aff27a1c83287d38e760c10f16"
     }
     Frame {
         msec: 5248
-        hash: "48d7a8f749f7501dbaa4599ca41096a5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 97
-        modifiers: 0
-        sendToViewport: true
+        hash: "ed3c741639232377f61867fd353ce58a"
     }
     Frame {
         msec: 5264
-        hash: "4c2a085c69c118fedfa15fe46cdc508b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5280
-        hash: "25f25828a4d22fe85db0de5c562f658e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "e9fb14ec21e9ec1235d2fea6e055b69d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "66417881aeb85778be66566241c45f5a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5328
-        hash: "c8c136690ffd8e5cc3e58f7376693b4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 178; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5344
-        hash: "c58c4fb5b7197cd8bd95742dc8715bbf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 179; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5360
-        hash: "2e0c93380883fcf2d0e56024fecba605"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 180; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5376
-        hash: "5f169f09e3d868eb0425a331d4bc3144"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "ed648742be4b0ded04e713e83ed24b27"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "92131288bb38480469f4578282dedaf8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5424
-        hash: "e16773f750bb0f635552b1eeadb2d625"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 189; y: 93
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5440
-        hash: "6e653cd552d82f38f30b8027d1951534"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 192; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5456
-        hash: "cfc1d6efa8d1b3b86396704f0be031ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5472
-        hash: "5848af73f5ab7c811639a6d01921d502"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5488
-        hash: "3823e7da05678f63e6761a81ed7233e2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5504
-        hash: "d095abe9814a60824914960a11663f12"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5520
-        hash: "18922bb3269d903a36e0b690249b473a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5536
-        hash: "4d8400a3ca2b782e7b054bb2f71d4543"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5552
-        hash: "24ed25d7a767f01fb02f545fc6c6931a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5568
-        hash: "55fb16784e3655ae70f97d6c32853cdc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5584
-        hash: "694e6979f0de62b61324dc4b144a2d5d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5600
-        hash: "e61b8b03251f6312e3de4e0c8af684d5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5616
-        hash: "6203321f87d53692dbb2b2aaf7dd3944"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5632
-        hash: "297b77029475d77cd8e481199b23da30"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5648
-        hash: "414615d772b4c80bf85eabfdca6fd0e0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5664
-        hash: "46d70882552a21267eebb3505da086f3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5680
-        hash: "372acafc63624307bcb384c48a803ab7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5696
-        hash: "1b98094dd4f192af8229b7058b8ce396"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5712
-        hash: "d627fa0ce696e46650225e43134643f5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5728
-        hash: "0410f4b504d768bc00940b20d3d942f9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5744
-        hash: "5f8011b44681d769800af8d205c757cb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5776
-        hash: "99f7a46f841f96445962b5fb3496d996"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5792
-        hash: "ed8bba2823ca2fe7cf138af0fcc52806"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5808
-        hash: "c9007b7ae5038ba59bfc6fac15c80d5f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 226; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5824
-        hash: "2db81c955a99652bcfef958e870054af"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5840
-        hash: "1e3906d7f3ee5a29c3c90b8e1f6c1eb0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5856
-        hash: "fc59738903cc9e6f36ef4d27bfde9496"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5872
-        hash: "768aaf4ef2b13b40b75bdf15787966b6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5888
-        hash: "3085baedc0c58a6757b134bb4f80fa9e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5904
-        hash: "0a1b8cad167bf93801f4d0dd34bf872e"
-    }
-    Frame {
-        msec: 5920
-        hash: "6366e04808ee015feed44d95cc117e1e"
-    }
-    Frame {
-        msec: 5936
-        hash: "dd67a8542a243aac9462e25dc1586e6e"
-    }
-    Frame {
-        msec: 5952
-        hash: "e06c8788b2ef327d005b4048f0807334"
-    }
-    Frame {
-        msec: 5968
-        hash: "dda2beda1253bd477d04cada4ec4df27"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "d659d1724637d90497c8e417764d3477"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 230; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 225; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "bdc53613cad59416ed79287874eb59f8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "54efe0acb07fb69827024a566773a36e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "860530a5ac3d89193f3cf234e21f8f6a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "ade5f8e28159304b22866f688efdbb46"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "7d5f5cf34910527d899e89ea07fb7254"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "c201ed0f2419396a229d8396152aba01"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "b99135e2cb03ab252ff379c8001c26ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "768aaf4ef2b13b40b75bdf15787966b6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6208
-        hash: "71a5bed1a87e16c986b2f4b245e956b8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6224
-        hash: "7155607add8c7254286097cda52b5888"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6240
-        hash: "e516e4d8a4ef0195ae04b3287f536ffd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6256
-        hash: "afa06d10b37d8ad8b57e392142ff50f2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 205; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6272
-        hash: "88c3fe68f7251d87a5bf197b9d59b899"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6288
-        hash: "b2687baf5148539ee2181b18077e0a3d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6304
-        hash: "457aed68cee2b9f3ff3c7d5f0eb2b6aa"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6320
-        hash: "48bb4683718a3b7c34baea29260fbe8c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6336
-        hash: "7c32fbf799bbfc10d0fbdd96bcfa9d95"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6352
-        hash: "68cee3b8213a9d38e2ed431d06eb6756"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6368
-        hash: "596c732c40a86d16bc649f164b919457"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6384
-        hash: "d9cb5bf69d4f8aaebefae6d680a99185"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6400
-        hash: "bb6759f3aff00f027f4f426efb775d2d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6416
-        hash: "a408d88f97c30ab8ab12a222b03571b4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6432
-        hash: "bb2e8994dc014eb6d4e4e33257269c2a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6448
-        hash: "190e9df0b8d20b0f37a198e9f3976416"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6464
-        hash: "aa7be52534c8550948deea6ae174330d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6480
-        hash: "533caac613ea1279a51a5b5b29acdccc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6496
-        hash: "288cc34879d9ed8ed381ba6cc31de3e7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6512
-        hash: "2a57602c47ab788f288daa81b985fc1d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6528
-        hash: "fa3540fafa1a9e3c5e796b598dce8fb1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6544
-        hash: "7e9b17ae7c10cb30153539911ac6eb13"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6560
-        hash: "9e62b16c858e80ff1294ec53e2390498"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6576
-        hash: "287470e6cf9bd4b9acfd1cd1512307e3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6592
-        hash: "4086c7c7a573a1b9f98d22ebf9b46c5f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6608
-        hash: "7d0868f000a1102916720a29a332543f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6624
-        hash: "bda3cfdca81f7cba54514c512eb6b12e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6640
-        hash: "923ff9fac39c3fba2c9cf7b52fc652ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6656
-        hash: "269718e3586affbbdf0b9599e12f5677"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6672
-        hash: "d12e03b5da6ea7b162d7dec6930c1a54"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "96edf1f15c674c5d8c4e4ce9e1d34f1d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "70ce229fae6985dd49de8cca01c031e6"
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "56215b7d24ac382ff1ed256c80d14091"
-    }
-    Frame {
-        msec: 6752
-        hash: "ac132304e072806431803d26e345b264"
-    }
-    Frame {
-        msec: 6768
-        hash: "a8f3e7fbb95ed8fe2b83871eb3d2c151"
-    }
-    Frame {
-        msec: 6784
-        hash: "43906030c2572af0f8f0577dbc86e346"
-    }
-    Frame {
-        msec: 6800
-        hash: "d64b58801430d5063225dceac1603bca"
-    }
-    Frame {
-        msec: 6816
-        hash: "56b81435dc4ce193bb98c3d02c781242"
-    }
-    Frame {
-        msec: 6832
-        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
-    }
-    Frame {
-        msec: 6848
-        hash: "6f7411363c66d0959ea5a16a9b610e61"
-    }
-    Frame {
-        msec: 6864
-        hash: "fb7ad9156658f3866d19e43f006cf013"
-    }
-    Frame {
-        msec: 6880
-        hash: "fca865f762c1a6cc3e487e0e908eef73"
-    }
-    Frame {
-        msec: 6896
-        hash: "3d78320cb021944d7c6cee1a42056663"
-    }
-    Frame {
-        msec: 6912
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
-    }
-    Frame {
-        msec: 6928
-        hash: "75e854ccaad087bfe776a843f0bd7284"
-    }
-    Frame {
-        msec: 6944
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
-    }
-    Frame {
-        msec: 6960
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
-    }
-    Frame {
-        msec: 6976
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
-    }
-    Frame {
-        msec: 6992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7088
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
-    }
-    Frame {
-        msec: 7104
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
-    }
-    Frame {
-        msec: 7120
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
-    }
-    Frame {
-        msec: 7136
-        hash: "75e854ccaad087bfe776a843f0bd7284"
-    }
-    Frame {
-        msec: 7152
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
-    }
-    Frame {
-        msec: 7168
-        hash: "3d78320cb021944d7c6cee1a42056663"
-    }
-    Frame {
-        msec: 7184
-        hash: "fca865f762c1a6cc3e487e0e908eef73"
-    }
-    Frame {
-        msec: 7200
-        hash: "fb7ad9156658f3866d19e43f006cf013"
-    }
-    Frame {
-        msec: 7216
-        hash: "6f7411363c66d0959ea5a16a9b610e61"
-    }
-    Frame {
-        msec: 7232
-        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
-    }
-    Frame {
-        msec: 7248
-        hash: "56b81435dc4ce193bb98c3d02c781242"
-    }
-    Frame {
-        msec: 7264
-        hash: "d64b58801430d5063225dceac1603bca"
-    }
-    Frame {
-        msec: 7280
-        hash: "43906030c2572af0f8f0577dbc86e346"
-    }
-    Frame {
-        msec: 7296
-        hash: "a8f3e7fbb95ed8fe2b83871eb3d2c151"
-    }
-    Frame {
-        msec: 7312
-        hash: "ac132304e072806431803d26e345b264"
-    }
-    Frame {
-        msec: 7328
-        hash: "56215b7d24ac382ff1ed256c80d14091"
-    }
-    Frame {
-        msec: 7344
-        hash: "4d5c97925b21d699f1c3720a3f51ebbb"
-    }
-    Frame {
-        msec: 7360
-        hash: "70ce229fae6985dd49de8cca01c031e6"
-    }
-    Frame {
-        msec: 7376
-        hash: "96edf1f15c674c5d8c4e4ce9e1d34f1d"
-    }
-    Frame {
-        msec: 7392
-        hash: "d12e03b5da6ea7b162d7dec6930c1a54"
-    }
-    Frame {
-        msec: 7408
-        hash: "269718e3586affbbdf0b9599e12f5677"
-    }
-    Frame {
-        msec: 7424
-        hash: "42d19ea6dd328c505da5a4eee23a257d"
-    }
-    Frame {
-        msec: 7440
-        hash: "e4d9d77859759dd95cf3ffee8f142cd8"
-    }
-    Frame {
-        msec: 7456
-        hash: "445e4c6e9872b63a1461e3277dd8185c"
-    }
-    Frame {
-        msec: 7472
-        hash: "d6343c629acd987179eae0d158d2504c"
-    }
-    Frame {
-        msec: 7488
-        hash: "a5340087baa2c3694ed0cc2bbc3e2ad9"
-    }
-    Frame {
-        msec: 7504
-        hash: "205973c30aaca71d1f20e740ce971d82"
-    }
-    Frame {
-        msec: 7520
-        hash: "ed28c7e07755e177222c7e322116bfb4"
-    }
-    Frame {
-        msec: 7536
-        hash: "6cebfc407a985694c803940608ab1303"
-    }
-    Frame {
-        msec: 7552
-        hash: "87f825fc820d3942e4d9b5ece5be3714"
-    }
-    Frame {
-        msec: 7568
-        hash: "9aa56dfe90ed2eba58eee0ff6ff3822c"
-    }
-    Frame {
-        msec: 7584
-        hash: "c93acf87a918f21a55cf39ea255315a3"
-    }
-    Frame {
-        msec: 7600
-        hash: "f8ce1bec5d5016c56fc66d52c28e69d1"
-    }
-    Frame {
-        msec: 7616
-        hash: "a365dba2f7c4be77ea98b727813c2f03"
-    }
-    Frame {
-        msec: 7632
-        hash: "e8d1c35ee9ef74c4070adfce5e4560f1"
-    }
-    Frame {
-        msec: 7648
-        hash: "f5f2dbb041eeb4de1821761f4fbca506"
-    }
-    Frame {
-        msec: 7664
-        hash: "f4ea6e9dff51778e9b5d1321453617ec"
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "f2869791dde1eb4c2ea24e04dc3ac653"
-    }
-    Frame {
-        msec: 7712
-        hash: "9bd70e91b765de22b70fe295adc4f87f"
-    }
-    Frame {
-        msec: 7728
-        hash: "c0338d0a5c72ba63bff666a76ab3242c"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "cb2a643eed9b5658260e04495820cd3d"
-    }
-    Frame {
-        msec: 7760
-        hash: "6dda51f2e611b1f589c75820fd8c7295"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7776
-        hash: "98d8692afd47c61421ddcae62414a72e"
-    }
-    Frame {
-        msec: 7792
-        hash: "2c533bcdd9df45c6f942d47509ebf20e"
-    }
-    Frame {
-        msec: 7808
-        hash: "d28f231fb1e128329e8985689deac882"
-    }
-    Frame {
-        msec: 7824
-        hash: "ea73450baf98a2f629ce1c203cfcd728"
-    }
-    Frame {
-        msec: 7840
-        hash: "959a31d38edc343b5e081fd0cddc81df"
-    }
-    Frame {
-        msec: 7856
-        hash: "9b1ae10ee8e9b3f176357733af9e6735"
-    }
-    Frame {
-        msec: 7872
-        hash: "89b0dd11f456bbb321e0bd2e1614c193"
-    }
-    Frame {
-        msec: 7888
-        hash: "a0a3aa6d8d4c677894e745ee432084e2"
-    }
-    Frame {
-        msec: 7904
-        hash: "f63207b8903085b19de1c9b6a9ff90e0"
-    }
-    Frame {
-        msec: 7920
-        hash: "c8f2126fece8c2b473c6511aa568dddb"
-    }
-    Frame {
-        msec: 7936
-        hash: "6ccd1f30e85dbad74468c228d92a9a3c"
-    }
-    Frame {
-        msec: 7952
-        hash: "bae09fe9f29e0f6ebda298cae753ddab"
-    }
-    Frame {
-        msec: 7968
-        hash: "cde4abae868488345fb124b927f46b45"
-    }
-    Frame {
-        msec: 7984
-        hash: "a88ccf9c8ae34ffcfd15af4e66102040"
-    }
-    Frame {
-        msec: 8000
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8016
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8032
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8048
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8064
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8080
-        hash: "a88ccf9c8ae34ffcfd15af4e66102040"
-    }
-    Frame {
-        msec: 8096
-        hash: "cde4abae868488345fb124b927f46b45"
-    }
-    Frame {
-        msec: 8112
-        hash: "bae09fe9f29e0f6ebda298cae753ddab"
-    }
-    Frame {
-        msec: 8128
-        hash: "6ccd1f30e85dbad74468c228d92a9a3c"
-    }
-    Frame {
-        msec: 8144
-        hash: "c8f2126fece8c2b473c6511aa568dddb"
-    }
-    Frame {
-        msec: 8160
-        hash: "f63207b8903085b19de1c9b6a9ff90e0"
-    }
-    Frame {
-        msec: 8176
-        hash: "a0a3aa6d8d4c677894e745ee432084e2"
-    }
-    Frame {
-        msec: 8192
-        hash: "89b0dd11f456bbb321e0bd2e1614c193"
-    }
-    Frame {
-        msec: 8208
-        hash: "9b1ae10ee8e9b3f176357733af9e6735"
-    }
-    Frame {
-        msec: 8224
-        hash: "959a31d38edc343b5e081fd0cddc81df"
-    }
-    Frame {
-        msec: 8240
-        hash: "ea73450baf98a2f629ce1c203cfcd728"
-    }
-    Frame {
-        msec: 8256
-        hash: "d28f231fb1e128329e8985689deac882"
-    }
-    Frame {
-        msec: 8272
-        hash: "2c533bcdd9df45c6f942d47509ebf20e"
-    }
-    Frame {
-        msec: 8288
-        hash: "98d8692afd47c61421ddcae62414a72e"
-    }
-    Frame {
-        msec: 8304
-        hash: "6dda51f2e611b1f589c75820fd8c7295"
-    }
-    Frame {
-        msec: 8320
-        hash: "cb2a643eed9b5658260e04495820cd3d"
-    }
-    Frame {
-        msec: 8336
-        hash: "88afd2fa1182fbb2aab100d4587a1006"
-    }
-    Frame {
-        msec: 8352
-        hash: "bc657c5181a11a9ff9565f134bdccb8d"
-    }
-    Frame {
-        msec: 8368
-        hash: "a296634d814a6e12f9d09f4d8a9fa097"
-    }
-    Frame {
-        msec: 8384
-        hash: "f05a2deeb12722904c4f31d641dffeb4"
-    }
-    Frame {
-        msec: 8400
-        hash: "75823698247e39dd10a70fe224e13597"
-    }
-    Frame {
-        msec: 8416
-        hash: "244fa06c168f7a7401b8ec7f5ddb0e52"
-    }
-    Frame {
-        msec: 8432
-        hash: "a78e0f88d269290e9086d1d854618f0c"
-    }
-    Frame {
-        msec: 8448
-        hash: "57b1281d29d5c5fdc15d9cf1e3a5545c"
-    }
-    Frame {
-        msec: 8464
-        hash: "a24ac211ef29dcf7f22ac95991f1af3f"
-    }
-    Frame {
-        msec: 8480
-        hash: "361f978ea3597fd518c25c0069c22e8b"
-    }
-    Frame {
-        msec: 8496
-        hash: "ac8e2c01eb58aac0eb4feb6aba9b9628"
-    }
-    Frame {
-        msec: 8512
-        hash: "6099612934b5eb90296f1cc3cb5c1a84"
-    }
-    Frame {
-        msec: 8528
-        hash: "7c3f08291168065fc9c1d62108022d33"
-    }
-    Frame {
-        msec: 8544
-        hash: "8bf57ba445d668af5f3e59276c4f8800"
-    }
-    Frame {
-        msec: 8560
-        hash: "c8ed352cbfbc472ea4802a9e03d40052"
-    }
-    Frame {
-        msec: 8576
-        hash: "11e5546b30e47d2f3067c0364b9f0877"
-    }
-    Frame {
-        msec: 8592
-        hash: "9df0f136fca92d4a05f17ee68f0cd286"
-    }
-    Frame {
-        msec: 8608
-        hash: "39f47838a622ba328548cad57cca9e12"
-    }
-    Frame {
-        msec: 8624
-        hash: "c891d582be4b23c01e29032fe861081f"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "c3820dfd382c4568d9fbd2ee95889eda"
-    }
-    Frame {
-        msec: 8672
-        hash: "528cf8778318bf7216b54f983dadb2b4"
-    }
-    Frame {
-        msec: 8688
-        hash: "419518a3c63aa36f6070e95eb93e58a3"
-    }
-    Frame {
-        msec: 8704
-        hash: "11b22e2853c0a9ea6e4ac764348698c9"
-    }
-    Frame {
-        msec: 8720
-        hash: "8018329c4b57647942ae34a5f83c2b12"
-    }
-    Frame {
-        msec: 8736
-        hash: "c37e9fd5c3d664c2e4911c8cb9fcabf7"
-    }
-    Frame {
-        msec: 8752
-        hash: "4e7895f802c9fc249894ba0db25959f7"
-    }
-    Frame {
-        msec: 8768
-        hash: "5fed71d99ef70432bc6be8caaea36f17"
-    }
-    Frame {
-        msec: 8784
-        hash: "69976d074acbd7a5731c70b33c8f084b"
-    }
-    Frame {
-        msec: 8800
-        hash: "c88952348da3df0627b12b8bb05ca13e"
-    }
-    Frame {
-        msec: 8816
-        hash: "cc5222da7a17c66d4db146c406492701"
-    }
-    Frame {
-        msec: 8832
-        hash: "8915e752776da27cb86019c9decc8a8c"
-    }
-    Frame {
-        msec: 8848
-        hash: "d8a77ccc7c01cf187e846a2903e1c55e"
-    }
-    Frame {
-        msec: 8864
-        hash: "3cf3f02f98a199c81ef73e8905e7f7ee"
-    }
-    Frame {
-        msec: 8880
-        hash: "7a1d47e0109fc370bf63714040cbef96"
-    }
-    Frame {
-        msec: 8896
-        hash: "2ca8b8ddbe73b29327e474da34a14a87"
-    }
-    Frame {
-        msec: 8912
-        hash: "ee75214865fca848aa38cc05b6049d8f"
-    }
-    Frame {
-        msec: 8928
-        hash: "05ab7d8118a806f2215160f5f266a082"
-    }
-    Frame {
-        msec: 8944
-        hash: "31e63095b7be56d0bf75e9cff832feb7"
-    }
-    Frame {
-        msec: 8960
-        hash: "3ffda2c2f154f1eb806e9f0963057fa1"
-    }
-    Frame {
-        msec: 8976
-        hash: "4e805203b58e8f6f331f2e878704fa01"
-    }
-    Frame {
-        msec: 8992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9088
-        hash: "4e805203b58e8f6f331f2e878704fa01"
-    }
-    Frame {
-        msec: 9104
-        hash: "3ffda2c2f154f1eb806e9f0963057fa1"
-    }
-    Frame {
-        msec: 9120
-        hash: "31e63095b7be56d0bf75e9cff832feb7"
-    }
-    Frame {
-        msec: 9136
-        hash: "05ab7d8118a806f2215160f5f266a082"
+        hash: "7b5de3772b8bcb4b10f3d265d5603afb"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.0.png
new file mode 100644
index 0000000..e69860e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.1.png
new file mode 100644
index 0000000..1db3c26
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.10.png
new file mode 100644
index 0000000..9c72d52
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.11.png
new file mode 100644
index 0000000..9c72d52
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.11.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.2.png
new file mode 100644
index 0000000..fbef805
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.3.png
new file mode 100644
index 0000000..dc56c7e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.4.png
new file mode 100644
index 0000000..04ea496
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.5.png
new file mode 100644
index 0000000..98bf7de
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.6.png
new file mode 100644
index 0000000..d95b895
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.7.png
new file mode 100644
index 0000000..9954344
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.8.png
new file mode 100644
index 0000000..d49c2ff
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.9.png
new file mode 100644
index 0000000..9c72d52
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.qml
new file mode 100644
index 0000000..94891e5
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.qml
@@ -0,0 +1,4687 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 32
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 48
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 64
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 80
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 96
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 112
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 128
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 144
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 160
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 176
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 192
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 208
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 224
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 240
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 256
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 272
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 288
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 304
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 320
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 118; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 336
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 352
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 368
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 384
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 400
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 118; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 416
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 432
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 448
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 464
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 480
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 496
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 512
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 528
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 544
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 560
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 576
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 592
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 608
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 624
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Frame {
+        msec: 640
+        hash: "a4edfba57a47b45f96fe1fa7a37c1720"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 117; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 656
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 672
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 117; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 688
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 704
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 720
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 736
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 752
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 768
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 784
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 800
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 816
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 832
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 848
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 864
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 880
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 896
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 912
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 928
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 944
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 960
+        image: "usingMultilineEdit.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 992
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1008
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1024
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1040
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1056
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1072
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1088
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1104
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1120
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1136
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1152
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1168
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1184
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1200
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1216
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1232
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1248
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1264
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1280
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Frame {
+        msec: 1296
+        hash: "bf9ad629e190df34f8bbb242e986083f"
+    }
+    Key {
+        type: 6
+        key: 44
+        modifiers: 0
+        text: "2c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1312
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1328
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1344
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1360
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Frame {
+        msec: 1376
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Key {
+        type: 7
+        key: 44
+        modifiers: 0
+        text: "2c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "bf65dbbfc02ad1589093d965c83d5806"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1408
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1424
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1440
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1456
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1472
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1488
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1504
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1520
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1536
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Frame {
+        msec: 1552
+        hash: "ef0640a754b76b5e28bff78376f1aaf3"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Frame {
+        msec: 1584
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Frame {
+        msec: 1600
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1616
+        hash: "b392b8d675e61166e9707f4a7f191c15"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1632
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1648
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1664
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1680
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1696
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1712
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Frame {
+        msec: 1728
+        hash: "f7a9826581a72f37b1211f1006d93ae5"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1760
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1776
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1808
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Frame {
+        msec: 1824
+        hash: "cea68eaed3000fe598917688b49525b7"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1840
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1856
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1872
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1888
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Frame {
+        msec: 1904
+        hash: "968932500933300e0a0ca711067d6659"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1920
+        image: "usingMultilineEdit.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "1d5b3f8dc6e0701c0c11a330e055ba5d"
+    }
+    Frame {
+        msec: 1952
+        hash: "1d5b3f8dc6e0701c0c11a330e055ba5d"
+    }
+    Frame {
+        msec: 1968
+        hash: "1d5b3f8dc6e0701c0c11a330e055ba5d"
+    }
+    Key {
+        type: 6
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1984
+        hash: "067182091936c99dfa5c29b226bd4351"
+    }
+    Frame {
+        msec: 2000
+        hash: "067182091936c99dfa5c29b226bd4351"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2016
+        hash: "067182091936c99dfa5c29b226bd4351"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2048
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Key {
+        type: 7
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2080
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2096
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2112
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Frame {
+        msec: 2144
+        hash: "810e996b65424f80e229160860805492"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2176
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2192
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2208
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2224
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Frame {
+        msec: 2240
+        hash: "10aca130f139e44c0889d8d9c9bb8673"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2256
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2272
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2288
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2304
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2320
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2336
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Frame {
+        msec: 2352
+        hash: "6785570c7f2cc9f3c6b0b07b8a94ecb2"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Frame {
+        msec: 2384
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Frame {
+        msec: 2400
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Frame {
+        msec: 2416
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2432
+        hash: "701c2738b7c064cd487bd0c6c0beb6b4"
+    }
+    Key {
+        type: 6
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2464
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2480
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2496
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2512
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Frame {
+        msec: 2528
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Key {
+        type: 7
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2544
+        hash: "35c0c51dd874faa28058251164836dcb"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2576
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2592
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2608
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2624
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2640
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2656
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2672
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Frame {
+        msec: 2688
+        hash: "12748fe9d3b72aff29449deeb2372d03"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2704
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2720
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2736
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2752
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2768
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Frame {
+        msec: 2784
+        hash: "0d119074fb7e882ebe4dfbad9bfb401a"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2816
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2832
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2848
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2864
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2880
+        image: "usingMultilineEdit.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2912
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Frame {
+        msec: 2928
+        hash: "3646bd6ea35fb8f0160a24a203b0f469"
+    }
+    Key {
+        type: 6
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "d90cbfbec0e5a73781664eec63ba7081"
+    }
+    Frame {
+        msec: 2960
+        hash: "d90cbfbec0e5a73781664eec63ba7081"
+    }
+    Frame {
+        msec: 2976
+        hash: "d90cbfbec0e5a73781664eec63ba7081"
+    }
+    Key {
+        type: 7
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2992
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Frame {
+        msec: 3008
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Frame {
+        msec: 3024
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Frame {
+        msec: 3040
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3056
+        hash: "8faa6d1174cf3e8ef10f6575276ed125"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3072
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Frame {
+        msec: 3088
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Frame {
+        msec: 3104
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3120
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 33554432
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3136
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Frame {
+        msec: 3152
+        hash: "bac072bfe350abe83fbc941e56845939"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 33554432
+        text: "49"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3168
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Frame {
+        msec: 3184
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Frame {
+        msec: 3200
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Frame {
+        msec: 3216
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 33554432
+        text: "49"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3232
+        hash: "386a85651164d0edbeb5cc2b7ee438c7"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3248
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Frame {
+        msec: 3264
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Frame {
+        msec: 3280
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Frame {
+        msec: 3296
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3312
+        hash: "982d48e7ef886a74791306f055ddc714"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3328
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3344
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3360
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3376
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Frame {
+        msec: 3392
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3408
+        hash: "38003a58f17d25d302c5e1b643b271b0"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3424
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3440
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3456
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3472
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Frame {
+        msec: 3488
+        hash: "18d37190d139a1567d91882fdac411d6"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 78
+        modifiers: 0
+        text: "6e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3504
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3520
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3536
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3552
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3568
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Frame {
+        msec: 3584
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Key {
+        type: 7
+        key: 78
+        modifiers: 0
+        text: "6e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3600
+        hash: "279aa32aaeebea7f8078e8a750d0514b"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3616
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Frame {
+        msec: 3632
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Frame {
+        msec: 3648
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Frame {
+        msec: 3664
+        hash: "626123df4dc8fc1321d0262871ffbe3e"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3680
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3696
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3712
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3728
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3744
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3760
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3776
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3792
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3808
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3824
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3840
+        image: "usingMultilineEdit.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3872
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3888
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3904
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3920
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3936
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3952
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Frame {
+        msec: 3968
+        hash: "00972f42fed66eb94832506b436b203d"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3984
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4000
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4016
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4032
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Frame {
+        msec: 4048
+        hash: "72d952ff90862b93ccec046f61d85360"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4064
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Frame {
+        msec: 4096
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Frame {
+        msec: 4112
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Frame {
+        msec: 4128
+        hash: "abd2bd3a1fdf5dbdd5bfdcc84bad136c"
+    }
+    Key {
+        type: 6
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4144
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Frame {
+        msec: 4160
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4176
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Frame {
+        msec: 4192
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Frame {
+        msec: 4208
+        hash: "f091e9b3d660c3664960f3fe6f624a1d"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4224
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4240
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Key {
+        type: 7
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4256
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4272
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4288
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4304
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4320
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4336
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4352
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Frame {
+        msec: 4368
+        hash: "bc9ae8ea7f8a7f1089263a20b4a5e826"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4384
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4400
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4416
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4432
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Frame {
+        msec: 4448
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4464
+        hash: "f96b7c209a5e558543157cf5aa4ce69e"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4480
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4496
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4512
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4528
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4544
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4560
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4576
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4592
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4608
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4624
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4640
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4656
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4672
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4688
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4704
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4720
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4736
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4752
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4768
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4784
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4800
+        image: "usingMultilineEdit.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Frame {
+        msec: 4832
+        hash: "67facce41bc51af385bd8102a7e1285e"
+    }
+    Key {
+        type: 6
+        key: 63
+        modifiers: 33554432
+        text: "3f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4848
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4864
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4880
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4896
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4912
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4928
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4944
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Key {
+        type: 7
+        key: 63
+        modifiers: 33554432
+        text: "3f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4960
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4976
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 4992
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5008
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5024
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5040
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5056
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5072
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5088
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5104
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5120
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5136
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5152
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5168
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5184
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5200
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5216
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5232
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5248
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5264
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5280
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5296
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5312
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5328
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5344
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5360
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5376
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5392
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5408
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5424
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5440
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5456
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5472
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5488
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5504
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5520
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5536
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5552
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5568
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5584
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5600
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5616
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5632
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5648
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5664
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5680
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5696
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5712
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5728
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5744
+        hash: "a616e994d83964ff75d95b702f355937"
+    }
+    Frame {
+        msec: 5760
+        image: "usingMultilineEdit.5.png"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 48; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5776
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Frame {
+        msec: 5792
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Frame {
+        msec: 5808
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Frame {
+        msec: 5824
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "e9532a9023548cf5dfca3fdaeb3467e7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "3ee2836c3a2ff4c71d82dd261941883b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "3ee2836c3a2ff4c71d82dd261941883b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 56; y: 41
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "3ee2836c3a2ff4c71d82dd261941883b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 56; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "4e620c1b847274f691e80a384eac5320"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 58; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 58
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5920
+        hash: "1a246aa1be0878c38da2eaac6befb738"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 69
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5936
+        hash: "7d6d4a33aacd1d2f530834af31069793"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 62; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5952
+        hash: "eba517141a4dc94025801fabc8c5e813"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5968
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 105
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 111
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 122
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 130
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 132
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 134
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 140
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 153
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6208
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6224
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6240
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Frame {
+        msec: 6256
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6272
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 152
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6288
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6304
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6320
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 63; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6336
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6352
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6368
+        hash: "a0f4a1f253c763054ca7d9727d517e5c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 58
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 51
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6384
+        hash: "b6589493e0225846be0af57024e25d98"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 37
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6400
+        hash: "b6589493e0225846be0af57024e25d98"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6416
+        hash: "d8a1bee2a0e57944d8268a2ce7e6c3c1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 16
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6432
+        hash: "a609d3c9cb375240e66dd316af27543c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6448
+        hash: "0d376060ba0f9843ed814a8d8150d047"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 48; y: -23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6464
+        hash: "9ad787bf41f0ab66beffff056a115c23"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6480
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6496
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6512
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6528
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6544
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6560
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6576
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6592
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6608
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6624
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6640
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6656
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Frame {
+        msec: 6672
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -47
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 44; y: -42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 44; y: -39
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6720
+        image: "usingMultilineEdit.6.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 46; y: -28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6752
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 48; y: -18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: -14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6768
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: -10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6784
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: -3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6800
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: -1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 0
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6816
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6832
+        hash: "bc4cd74678c08403bb16b74630d0fd18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6848
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6864
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6912
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6928
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6944
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6960
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6976
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 6992
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7008
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7024
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7040
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7056
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7072
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Frame {
+        msec: 7088
+        hash: "0e728de352bc8658bb3e2900a56bfad9"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 59; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7104
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7120
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7136
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7152
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7168
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 59; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7184
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7200
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7216
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7232
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7248
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7264
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7280
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7296
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7312
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7328
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7344
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7360
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7376
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7392
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7408
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7424
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7440
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7456
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7472
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7488
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7504
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7520
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7536
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7552
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Frame {
+        msec: 7568
+        hash: "c9b766ef3743159fdd7a01d3eeaa357b"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7584
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7600
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7616
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7632
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7648
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7664
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7680
+        image: "usingMultilineEdit.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Frame {
+        msec: 7712
+        hash: "f8d7e167379a5109b1744727b3bb5050"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7728
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7744
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7760
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7776
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7792
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7808
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7824
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7840
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7856
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7872
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7888
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7904
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7920
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7936
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Frame {
+        msec: 7952
+        hash: "d1f43fa2f710725527736ac3439577df"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 7968
+        hash: "1553d42725394fa4d4c9b97dc12a78b9"
+    }
+    Frame {
+        msec: 7984
+        hash: "1553d42725394fa4d4c9b97dc12a78b9"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8000
+        hash: "a62df700f3209668a813e765a79e7859"
+    }
+    Frame {
+        msec: 8016
+        hash: "a62df700f3209668a813e765a79e7859"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8032
+        hash: "e8928770969b82523e828e3036bbe106"
+    }
+    Frame {
+        msec: 8048
+        hash: "e8928770969b82523e828e3036bbe106"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8064
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8080
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8096
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8112
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8128
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8144
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8160
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8176
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Frame {
+        msec: 8192
+        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8208
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8224
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8240
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8256
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8272
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8288
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8304
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Frame {
+        msec: 8320
+        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8336
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8352
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8368
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8384
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8400
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8416
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8432
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8448
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Frame {
+        msec: 8464
+        hash: "978ed05f4ea2cc7ddb06807a25883335"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8480
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8496
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8512
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8528
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8544
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8560
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8576
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8592
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8608
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8624
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8640
+        image: "usingMultilineEdit.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8672
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8688
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8704
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8720
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8736
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8752
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8768
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8784
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8800
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8816
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8832
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8848
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8864
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8880
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8896
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8912
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8928
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8944
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8960
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8976
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 8992
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9008
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9024
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9040
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9056
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9072
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9088
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9104
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9120
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9136
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9152
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9168
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9184
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9200
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 70; y: 73
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9216
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9232
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9248
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9264
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9280
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 70; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9296
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9312
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9328
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9344
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9360
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9376
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9392
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9408
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9424
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Frame {
+        msec: 9440
+        hash: "b65c439a091d3293352de410d28aaca1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 71; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9456
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9472
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9488
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9504
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9520
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9536
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 71; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9552
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9568
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9584
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9600
+        image: "usingMultilineEdit.9.png"
+    }
+    Frame {
+        msec: 9616
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9632
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9648
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9664
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9680
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9696
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9712
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9728
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9744
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9760
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9776
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9792
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9808
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9824
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9840
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9856
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9872
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9888
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9904
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9920
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9936
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9952
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9968
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 9984
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10000
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10016
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10032
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10048
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10064
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10080
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10096
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10112
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10128
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10144
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10160
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10176
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10192
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10208
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10224
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10240
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10256
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10272
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10288
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10304
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10320
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10336
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Frame {
+        msec: 10352
+        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10368
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10384
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10400
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10416
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10432
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10448
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10464
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10480
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10496
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10512
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10528
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10544
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10560
+        image: "usingMultilineEdit.10.png"
+    }
+    Frame {
+        msec: 10576
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10592
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10608
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10624
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10640
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10656
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10672
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10688
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10704
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10720
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10736
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10752
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10768
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10784
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10800
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10816
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10832
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10848
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10864
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10880
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10896
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10912
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10928
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10944
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10960
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10976
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 10992
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11008
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11024
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11040
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11056
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11072
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11088
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11104
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11120
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11136
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11152
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11168
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11184
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11200
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11216
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11232
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11248
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11264
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11280
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11296
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11312
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11328
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11344
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11360
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11376
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11392
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11408
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11424
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11440
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11456
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11472
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11488
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11504
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11520
+        image: "usingMultilineEdit.11.png"
+    }
+    Frame {
+        msec: 11536
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11552
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11568
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11584
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11600
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+    Frame {
+        msec: 11616
+        hash: "3d08eff16edf54f522a75df1734150df"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
index b5bb102..d7054ba 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
@@ -2,14 +2,13 @@ import QtQuick 1.0
 
 Rectangle {
     Component { id: testableCursor
-        //Doesn't blink
+        //This shouldn't blink
         Rectangle {
             color:"black"
             width:1
         }
     }
-    color: "green"
-    width:400;
+    width:300;
     height:40;
     TextEdit {
         focus: true;
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
index 4cf7e97..f03e1cc 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
@@ -1,13 +1,14 @@
 import QtQuick 1.0
 
 Rectangle{
-    width: 600
-    height: 200
+    width: 280
+    height: 140
     Column{
         MultilineEdit{
             text: 'I am the very model of a modern major general. I\'ve information vegetable, animal and mineral. I know the kings of england and I quote the fights historical - from Marathon to Waterloo in order categorical.';
             width: 182; height: 60;
         }
+        Rectangle{height: 20; width: 20;}//Spacer
         MultilineEdit{text: 'Hello world'}
     }
 }
-- 
cgit v0.12


From 33f7a5d7f64dd0eed23a83f785f92466611dbc40 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 18:59:53 +1000
Subject: Clean up qmlvisual/qdeclarativetextinput visual tests

Platform visuals and some cleanup after extended neglect

Task-number: QTBUG-14792
---
 .../qdeclarativetextinput/cursorDelegate.qml       |    4 +-
 .../data-X11/cursorDelegate.0.png                  |  Bin 0 -> 3153 bytes
 .../data-X11/cursorDelegate.1.png                  |  Bin 0 -> 3622 bytes
 .../data-X11/cursorDelegate.2.png                  |  Bin 0 -> 3163 bytes
 .../data-X11/cursorDelegate.3.png                  |  Bin 0 -> 3145 bytes
 .../data-X11/cursorDelegate.4.png                  |  Bin 0 -> 3143 bytes
 .../data-X11/cursorDelegate.qml                    | 1551 ++++++++++
 .../qdeclarativetextinput/data-X11/echoMode.0.png  |  Bin 716 -> 570 bytes
 .../qdeclarativetextinput/data-X11/echoMode.1.png  |  Bin 1352 -> 1061 bytes
 .../qdeclarativetextinput/data-X11/echoMode.2.png  |  Bin 2047 -> 1661 bytes
 .../qdeclarativetextinput/data-X11/echoMode.3.png  |  Bin 2827 -> 0 bytes
 .../qdeclarativetextinput/data-X11/echoMode.4.png  |  Bin 2827 -> 0 bytes
 .../qdeclarativetextinput/data-X11/echoMode.qml    |  376 +--
 .../qdeclarativetextinput/data-X11/hAlign.0.png    |  Bin 1245 -> 0 bytes
 .../qdeclarativetextinput/data-X11/hAlign.qml      |   50 +-
 .../data-X11/usingLineEdit.0.png                   |  Bin 3137 -> 2659 bytes
 .../data-X11/usingLineEdit.1.png                   |  Bin 3195 -> 2696 bytes
 .../data-X11/usingLineEdit.10.png                  |  Bin 3853 -> 3331 bytes
 .../data-X11/usingLineEdit.2.png                   |  Bin 3171 -> 2659 bytes
 .../data-X11/usingLineEdit.3.png                   |  Bin 3228 -> 2682 bytes
 .../data-X11/usingLineEdit.4.png                   |  Bin 3198 -> 2695 bytes
 .../data-X11/usingLineEdit.5.png                   |  Bin 3310 -> 2825 bytes
 .../data-X11/usingLineEdit.6.png                   |  Bin 3233 -> 2681 bytes
 .../data-X11/usingLineEdit.7.png                   |  Bin 3607 -> 3111 bytes
 .../data-X11/usingLineEdit.8.png                   |  Bin 3657 -> 3178 bytes
 .../data-X11/usingLineEdit.9.png                   |  Bin 3262 -> 2806 bytes
 .../data-X11/usingLineEdit.qml                     | 1386 ++++-----
 .../data/cursorDelegate.0.png                      |  Bin 3314 -> 0 bytes
 .../data/cursorDelegate.1.png                      |  Bin 3377 -> 0 bytes
 .../data/cursorDelegate.2.png                      |  Bin 3323 -> 0 bytes
 .../data/cursorDelegate.3.png                      |  Bin 3325 -> 0 bytes
 .../data/cursorDelegate.4.png                      |  Bin 3322 -> 0 bytes
 .../data/cursorDelegate.5.png                      |  Bin 3322 -> 0 bytes
 .../data/cursorDelegate.6.png                      |  Bin 3326 -> 0 bytes
 .../data/cursorDelegate.7.png                      |  Bin 3814 -> 0 bytes
 .../data/cursorDelegate.8.png                      |  Bin 3324 -> 0 bytes
 .../qdeclarativetextinput/data/cursorDelegate.qml  | 2966 ++++----------------
 .../qdeclarativetextinput/data/echoMode.0.png      |  Bin 999 -> 0 bytes
 .../qdeclarativetextinput/data/echoMode.1.png      |  Bin 1880 -> 0 bytes
 .../qdeclarativetextinput/data/echoMode.2.png      |  Bin 2962 -> 0 bytes
 .../qdeclarativetextinput/data/echoMode.3.png      |  Bin 2827 -> 0 bytes
 .../qdeclarativetextinput/data/echoMode.4.png      |  Bin 2827 -> 0 bytes
 .../qdeclarativetextinput/data/hAlign.0.png        |  Bin 1245 -> 0 bytes
 .../qmlvisual/qdeclarativetextinput/hAlign.qml     |    1 +
 44 files changed, 3029 insertions(+), 3305 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.0.png

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
index 973462a..69dc32a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
@@ -11,8 +11,8 @@ import QtQuick 1.0
                     Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
                     opacity: 1
                     SequentialAnimation on opacity { running: cPage.parent.focus == true; loops: Animation.Infinite;
-                        NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
-                        NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
+                        NumberAnimation { to: 1; duration: 500; easing.type: "InQuad"}
+                        NumberAnimation { to: 0; duration: 500; easing.type: "OutQuad"}
                      }
                 }
                 width: 1;
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.0.png
new file mode 100644
index 0000000..5ab78c0
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.1.png
new file mode 100644
index 0000000..3cd1c11
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.2.png
new file mode 100644
index 0000000..c0e738e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.3.png
new file mode 100644
index 0000000..a373ded
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.4.png
new file mode 100644
index 0000000..647984d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.qml
new file mode 100644
index 0000000..6eb74ea
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/cursorDelegate.qml
@@ -0,0 +1,1551 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 32
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 48
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 64
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 80
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 96
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 112
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 128
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 144
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 160
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 176
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 192
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 208
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 224
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 240
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 256
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 272
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 288
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 304
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 320
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 336
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 352
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 368
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 384
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 400
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 416
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 432
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Frame {
+        msec: 448
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 464
+        hash: "97eff9733db71f7c5d396969582c572b"
+    }
+    Frame {
+        msec: 480
+        hash: "97eff9733db71f7c5d396969582c572b"
+    }
+    Frame {
+        msec: 496
+        hash: "97eff9733db71f7c5d396969582c572b"
+    }
+    Frame {
+        msec: 512
+        hash: "97eff9733db71f7c5d396969582c572b"
+    }
+    Frame {
+        msec: 528
+        hash: "87902d32dba1439e71ce5f57f514748e"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "cad95931a38718eb481a9175fdfec305"
+    }
+    Frame {
+        msec: 560
+        hash: "1dc99e5c7e4d2fa6b624b6df250b78fc"
+    }
+    Frame {
+        msec: 576
+        hash: "5d5739beb039a83bebb2c41489166edf"
+    }
+    Frame {
+        msec: 592
+        hash: "6320c9a1c0013f5aa6180992b934ca59"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 608
+        hash: "9d9837c1f3779e5dab0dfeb1d11fdea1"
+    }
+    Frame {
+        msec: 624
+        hash: "9d868112eaf70ce02ce93603278a565d"
+    }
+    Frame {
+        msec: 640
+        hash: "d2bccb3184d3bb42b91017410a8655b6"
+    }
+    Frame {
+        msec: 656
+        hash: "68f8be3e16637fd39a35f0cebb62b74a"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 672
+        hash: "04f5781b57ed9fee32d5ef80dc33f4ff"
+    }
+    Frame {
+        msec: 688
+        hash: "06cc2e24a848d441074de5ddff1c739a"
+    }
+    Frame {
+        msec: 704
+        hash: "94526186deb7248ac9c747ede15b106d"
+    }
+    Frame {
+        msec: 720
+        hash: "1ac130517df314f4f44b9bde2d3dcc53"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 736
+        hash: "270ecf4900e94d60599ded230633aa02"
+    }
+    Frame {
+        msec: 752
+        hash: "ef2093584cbce9182b99f297fcd2465d"
+    }
+    Frame {
+        msec: 768
+        hash: "c445cf5f56213a712585934681d8af55"
+    }
+    Frame {
+        msec: 784
+        hash: "9f0edb3871e015a549622e1b70d1b748"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 800
+        hash: "144c51d7aa47ea8cc8d79a97efa4b430"
+    }
+    Frame {
+        msec: 816
+        hash: "34f768a7c99dfb3c8f0e1fb1a08a37ac"
+    }
+    Frame {
+        msec: 832
+        hash: "4f3970c4ad02b69f96c11610494e8a50"
+    }
+    Frame {
+        msec: 848
+        hash: "815a1cf66f0c9eb47e244753eebb83ba"
+    }
+    Frame {
+        msec: 864
+        hash: "5db11f795c000b382fdc30726a711c65"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 880
+        hash: "67976ee172d0d55992c0e4734fbb7ccf"
+    }
+    Frame {
+        msec: 896
+        hash: "c764e4d5317acbbf5118a08565e5d5fd"
+    }
+    Frame {
+        msec: 912
+        hash: "a83f566d01b990e91f43bb63a58fb5b8"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 928
+        hash: "031282f352e01f23bc5f73bf8ce82c9a"
+    }
+    Frame {
+        msec: 944
+        hash: "1f3dc1d3ad0304376eac5d60d3c226ee"
+    }
+    Frame {
+        msec: 960
+        image: "cursorDelegate.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 992
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1008
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 1024
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 1040
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1056
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 1072
+        hash: "a2ad07326fafcb3012cdb869f39af466"
+    }
+    Frame {
+        msec: 1088
+        hash: "8622eb25a6da44926b5161bce213a483"
+    }
+    Frame {
+        msec: 1104
+        hash: "ccbd4d1e4865ebd9b0fe923e6ab05e5c"
+    }
+    Frame {
+        msec: 1120
+        hash: "775cd79b012f79b773449a0ad8457149"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1136
+        hash: "2a4ed061e512c5afd11072c4b707f707"
+    }
+    Frame {
+        msec: 1152
+        hash: "c855df7b17811f25fd17e4fb108c02e1"
+    }
+    Frame {
+        msec: 1168
+        hash: "46c37d8e67ece5cae4f766acf50f3ca3"
+    }
+    Frame {
+        msec: 1184
+        hash: "95a70f14ce01aae61190080ed3d55c77"
+    }
+    Frame {
+        msec: 1200
+        hash: "87da182d1285f3613bb2e4673e701757"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1216
+        hash: "5b97f13f43e713a6fbe96bdca8969191"
+    }
+    Frame {
+        msec: 1232
+        hash: "4d003182e7b7b0a05413b80f82a0fc41"
+    }
+    Frame {
+        msec: 1248
+        hash: "dba09e038291a8dfdc61911d6b4b9bdf"
+    }
+    Frame {
+        msec: 1264
+        hash: "a2ae1e5cc6cd72fae70804e07df5a8a1"
+    }
+    Frame {
+        msec: 1280
+        hash: "f1c2a24b6f0ebcf98122e8db1cdcb66f"
+    }
+    Frame {
+        msec: 1296
+        hash: "142dade1639655132435ae260b7935a0"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1312
+        hash: "e80c0175d947bceef4bf53b60bf7eac0"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1328
+        hash: "de912cd8bd2fe762ec6b1ec819732507"
+    }
+    Frame {
+        msec: 1344
+        hash: "d3fa9dfab37ee26572d25bcbe8c66b72"
+    }
+    Frame {
+        msec: 1360
+        hash: "33bdb2817a2858ce430813d0774f0172"
+    }
+    Frame {
+        msec: 1376
+        hash: "4f10f0ffb6b1c87155eedd53af36c74f"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "1b94be0de8412bd9380689895f290af7"
+    }
+    Frame {
+        msec: 1408
+        hash: "48b3a5e2b04c86a75f4b6595eb2c1f55"
+    }
+    Frame {
+        msec: 1424
+        hash: "d092fabd3dd51c718486e1e7dadaa0dc"
+    }
+    Frame {
+        msec: 1440
+        hash: "243359437235563f1a60b8eaf63365b6"
+    }
+    Frame {
+        msec: 1456
+        hash: "a986c8ed8ad2d8b6aab2a001906ba2ad"
+    }
+    Frame {
+        msec: 1472
+        hash: "da5e06dc481e9cb7d9159a84d0cc150a"
+    }
+    Frame {
+        msec: 1488
+        hash: "1d70a05fce3a05477e21d22b127ae96a"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "913448213a07f6c8427c8e310d2026de"
+    }
+    Frame {
+        msec: 1520
+        hash: "51bef5ae52977a935b66af4baf1da4e6"
+    }
+    Frame {
+        msec: 1536
+        hash: "367bc25f868c23005d7fe903a9ea681b"
+    }
+    Frame {
+        msec: 1552
+        hash: "3c25181652e788d128ed571ca4fea0b1"
+    }
+    Frame {
+        msec: 1568
+        hash: "0218f939ff2b8c0bc22a537ed0f053f0"
+    }
+    Frame {
+        msec: 1584
+        hash: "a3b765a823b2b3811273a1be90850533"
+    }
+    Frame {
+        msec: 1600
+        hash: "2a42a29774eb4f962d299f8c2c213d55"
+    }
+    Frame {
+        msec: 1616
+        hash: "1f0ad54d0fe8fc27cadbaaeaa37364e0"
+    }
+    Frame {
+        msec: 1632
+        hash: "04d6028d1b1a1178e5bf774db8eef2c6"
+    }
+    Frame {
+        msec: 1648
+        hash: "c325e46e89e8df04e2c3d8bf111c5f09"
+    }
+    Frame {
+        msec: 1664
+        hash: "70e6223ce16a797e2c56e21ad74b188b"
+    }
+    Frame {
+        msec: 1680
+        hash: "0fb8762fd28564b84b83c17d749a3645"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1696
+        hash: "ef5d19b59792ea8822e2391fe0d91dbd"
+    }
+    Frame {
+        msec: 1712
+        hash: "70ad15030164be8afbb4ab22d1ae5f5f"
+    }
+    Frame {
+        msec: 1728
+        hash: "a5dfb8bd4b681e0d8d2c082821a2a976"
+    }
+    Frame {
+        msec: 1744
+        hash: "864781fbb8673b1e603df015f2d88601"
+    }
+    Frame {
+        msec: 1760
+        hash: "0bdb6a155cdd14f4dce9fde3c5116dde"
+    }
+    Frame {
+        msec: 1776
+        hash: "5421f521a9bdccc8478fcee97e0dbc99"
+    }
+    Frame {
+        msec: 1792
+        hash: "c5f29693dd017932767f37e2fb2f22f2"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1808
+        hash: "b5e8abeaec33407e673f8021212528b1"
+    }
+    Frame {
+        msec: 1824
+        hash: "917c968e5ee8f0b25fdb175719d7dbfa"
+    }
+    Frame {
+        msec: 1840
+        hash: "56495c63676b9f73004e76e38d60567e"
+    }
+    Frame {
+        msec: 1856
+        hash: "86f1ccdd7ff408c5b141d79797eea1fa"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1872
+        hash: "9e9b32a9f71ab1aa4e87ddc323ccda03"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1888
+        hash: "360aef37452ce8f045659c227285cb82"
+    }
+    Frame {
+        msec: 1904
+        hash: "805949377c620fa4310aa4328eba1f23"
+    }
+    Frame {
+        msec: 1920
+        image: "cursorDelegate.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "00df8110a2008ba77b7e0bf2130e5319"
+    }
+    Frame {
+        msec: 1952
+        hash: "835f6f723577071461e41da1fd2e990a"
+    }
+    Frame {
+        msec: 1968
+        hash: "6876cafa4d6d3a7d387602eba4d26db1"
+    }
+    Frame {
+        msec: 1984
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
+    }
+    Frame {
+        msec: 2000
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
+    }
+    Frame {
+        msec: 2016
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
+    }
+    Frame {
+        msec: 2032
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2048
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "6876cafa4d6d3a7d387602eba4d26db1"
+    }
+    Frame {
+        msec: 2080
+        hash: "835f6f723577071461e41da1fd2e990a"
+    }
+    Frame {
+        msec: 2096
+        hash: "00df8110a2008ba77b7e0bf2130e5319"
+    }
+    Frame {
+        msec: 2112
+        hash: "627206a252bd6fcbf57d9f1cde0506bb"
+    }
+    Frame {
+        msec: 2128
+        hash: "805949377c620fa4310aa4328eba1f23"
+    }
+    Frame {
+        msec: 2144
+        hash: "360aef37452ce8f045659c227285cb82"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "0ac33070e0c736bc0fb5ab12fa444b5c"
+    }
+    Frame {
+        msec: 2176
+        hash: "520a544fd92f17a14380803e253b396f"
+    }
+    Frame {
+        msec: 2192
+        hash: "4a080a5154c517e6bcf24b3a1f1d7f2c"
+    }
+    Frame {
+        msec: 2208
+        hash: "e83642b0793f5a790efca65ccf20a720"
+    }
+    Frame {
+        msec: 2224
+        hash: "8210b9cbf19f519ee34f4bb1a6afce16"
+    }
+    Frame {
+        msec: 2240
+        hash: "54d04e64af5c0a3d29f2dc8c0977ed3a"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2256
+        hash: "ae2a644f96bd7b2662ebcf4ebc33d930"
+    }
+    Frame {
+        msec: 2272
+        hash: "718ac9cb5ef2992b06b34e957f987b7a"
+    }
+    Frame {
+        msec: 2288
+        hash: "a2e1dea5e5f37697c7ce1a9419b94f65"
+    }
+    Frame {
+        msec: 2304
+        hash: "c0eb56c72311263d892ce65331547531"
+    }
+    Frame {
+        msec: 2320
+        hash: "585ad3efb7330de889b8cf56a51a0899"
+    }
+    Frame {
+        msec: 2336
+        hash: "236e54ae31e5ee3d08a7bc9aeaef0d9b"
+    }
+    Frame {
+        msec: 2352
+        hash: "d6218c8bb4da9d62bdb5d0cf5d7f8e37"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "1dddd18a4ef66df9d9b431b2860e24d1"
+    }
+    Frame {
+        msec: 2384
+        hash: "5b1b45e75f5a829b31c0b6eb0189da7c"
+    }
+    Frame {
+        msec: 2400
+        hash: "062091bc7a5f3296c669614318b80fe7"
+    }
+    Frame {
+        msec: 2416
+        hash: "836f37fe92a46233640e0bd2c0932fea"
+    }
+    Frame {
+        msec: 2432
+        hash: "f14ec1544a380fc9993b39754c23c2f4"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "2d549b5fea734e47682415df1717e6a6"
+    }
+    Frame {
+        msec: 2464
+        hash: "824c5960260dd3ed7527709ebfb06d27"
+    }
+    Frame {
+        msec: 2480
+        hash: "258f034fe1e71f25a92e667e05f53e82"
+    }
+    Frame {
+        msec: 2496
+        hash: "c432e758e19c44d788cb38df6e4c6d69"
+    }
+    Frame {
+        msec: 2512
+        hash: "a1856592208f9a00385b13c44e1c4503"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2528
+        hash: "2b4d40a0555df0b86f52d13790185459"
+    }
+    Frame {
+        msec: 2544
+        hash: "b153143e6b16c47fa06663dc6b1034d6"
+    }
+    Frame {
+        msec: 2560
+        hash: "ac52236c5d73aeae7c0834df1e6bd84e"
+    }
+    Frame {
+        msec: 2576
+        hash: "136eeb348b0b96edc9aaf9fbea741973"
+    }
+    Frame {
+        msec: 2592
+        hash: "4f8a1dfa8906de2bcdfbf5c3b29fbf9b"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2608
+        hash: "7dc9726df2d112b46f4d9dbe66d534c7"
+    }
+    Frame {
+        msec: 2624
+        hash: "f64086ca0e83fa8bb0fae28065260fdc"
+    }
+    Frame {
+        msec: 2640
+        hash: "5237dd2b79d71bbfa0a0d3963a7f42b7"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2656
+        hash: "8dd435b577bb258979d33034885a8cd8"
+    }
+    Frame {
+        msec: 2672
+        hash: "2609c066b8f102b4189991bf7d01eaad"
+    }
+    Frame {
+        msec: 2688
+        hash: "986fab22391264d04df9a55b18aee645"
+    }
+    Frame {
+        msec: 2704
+        hash: "0256423680aa0843fe8ec84f5e68fc9b"
+    }
+    Frame {
+        msec: 2720
+        hash: "b822bdcad69aa868f48b2bbf2d62e297"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2736
+        hash: "14effed70ca60233be9b2f6d0a1b5e6c"
+    }
+    Frame {
+        msec: 2752
+        hash: "1abaf2c36a0fb9f04606c0e191d113cf"
+    }
+    Frame {
+        msec: 2768
+        hash: "cffb8ca29b0369d183d6461bf9e63fdf"
+    }
+    Frame {
+        msec: 2784
+        hash: "9378bebddb09036bec98ff7018dcf7c1"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "0c3823994ee8f838c26040118ba62622"
+    }
+    Frame {
+        msec: 2816
+        hash: "d374547f47adc81a18428c7a79cb9cf2"
+    }
+    Frame {
+        msec: 2832
+        hash: "449c2996a2d0e74f2300adad619700bc"
+    }
+    Frame {
+        msec: 2848
+        hash: "14379a320b6fc36de5d2a6776f1dc963"
+    }
+    Frame {
+        msec: 2864
+        hash: "cb010a99ffa3b6df26c6cd263a21cfcd"
+    }
+    Frame {
+        msec: 2880
+        image: "cursorDelegate.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "a445d23288d462009916e31f370a2068"
+    }
+    Frame {
+        msec: 2912
+        hash: "8b3f2811300830e837797056f262bec2"
+    }
+    Frame {
+        msec: 2928
+        hash: "2303a27e72334cae84b4fe51a62974ba"
+    }
+    Frame {
+        msec: 2944
+        hash: "f3a9f3e74d2d83e38aee78cab7209bd6"
+    }
+    Frame {
+        msec: 2960
+        hash: "ca4777127a535655f057af57cf3e8c7b"
+    }
+    Frame {
+        msec: 2976
+        hash: "de2b65920fa9177a79019f33712c2275"
+    }
+    Frame {
+        msec: 2992
+        hash: "de2b65920fa9177a79019f33712c2275"
+    }
+    Frame {
+        msec: 3008
+        hash: "de2b65920fa9177a79019f33712c2275"
+    }
+    Frame {
+        msec: 3024
+        hash: "de2b65920fa9177a79019f33712c2275"
+    }
+    Frame {
+        msec: 3040
+        hash: "de2b65920fa9177a79019f33712c2275"
+    }
+    Frame {
+        msec: 3056
+        hash: "de2b65920fa9177a79019f33712c2275"
+    }
+    Frame {
+        msec: 3072
+        hash: "ca4777127a535655f057af57cf3e8c7b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3088
+        hash: "83cfb141f6b77fa062443a442a5b2e9e"
+    }
+    Frame {
+        msec: 3104
+        hash: "b3e262864238d03f988c9750cc74e48f"
+    }
+    Frame {
+        msec: 3120
+        hash: "6ed2086ae01be46f0684bbecc05484c4"
+    }
+    Frame {
+        msec: 3136
+        hash: "91f6dad8f05577af6e4f5f0aceb06b4b"
+    }
+    Frame {
+        msec: 3152
+        hash: "1bfb0c299c3c0db0518eaa54137c22b0"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3168
+        hash: "37cc96ef4b760faadf76cc471f6ba49a"
+    }
+    Frame {
+        msec: 3184
+        hash: "67c848bf93e845eaf5eebc9b8e57482c"
+    }
+    Frame {
+        msec: 3200
+        hash: "e3906ad9b1dfbd1170364c11ff4b286f"
+    }
+    Frame {
+        msec: 3216
+        hash: "24dd59673c5659e3bf6f52723e1bcd07"
+    }
+    Frame {
+        msec: 3232
+        hash: "4b694f05f147bcf901a16807d4e3ec7c"
+    }
+    Frame {
+        msec: 3248
+        hash: "9d9dbf34f6a67a49210caa249b8a1abb"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3264
+        hash: "5381cde4763aa45c97793124e42db6f5"
+    }
+    Frame {
+        msec: 3280
+        hash: "0f113c0263faa47428c4d16891ac4d4f"
+    }
+    Frame {
+        msec: 3296
+        hash: "cc1767ec13803959333cd35bfb2d9119"
+    }
+    Frame {
+        msec: 3312
+        hash: "ec1b4c71f9bd63ccf6d766b0b2f68b30"
+    }
+    Frame {
+        msec: 3328
+        hash: "114ad78597ede2afc4dd8bafa1d4df21"
+    }
+    Frame {
+        msec: 3344
+        hash: "d08dc22ddc707316483f09b796ea0380"
+    }
+    Frame {
+        msec: 3360
+        hash: "135b2b0f4e469b207e673d1e7086cd4f"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3376
+        hash: "4267354fe0d24597bdb5ee1a6e9affbb"
+    }
+    Frame {
+        msec: 3392
+        hash: "700bd56ecea646bbec2017007bbb5b84"
+    }
+    Frame {
+        msec: 3408
+        hash: "874a65c2069f4ba89301c129f884f217"
+    }
+    Frame {
+        msec: 3424
+        hash: "b5ec22f95abb43c83533f7dc606667f6"
+    }
+    Frame {
+        msec: 3440
+        hash: "445de6663e80d1fe1527ec5acf4ec1de"
+    }
+    Frame {
+        msec: 3456
+        hash: "87c129a5bf08536d3fca90375283e26b"
+    }
+    Frame {
+        msec: 3472
+        hash: "a63e2438a9cd412c2b119cd42b11009f"
+    }
+    Frame {
+        msec: 3488
+        hash: "61a3475bef5fd276b836cf3483526f57"
+    }
+    Frame {
+        msec: 3504
+        hash: "097ab9a1a1fe9743f162f57b93599fe7"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3520
+        hash: "ebae1fb540c6ff6b0bc9a951391e2e94"
+    }
+    Frame {
+        msec: 3536
+        hash: "ffc2da2e4c091eadaa9746b42b56d9e4"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3552
+        hash: "f243d823fc9977e69a008010d8db8a01"
+    }
+    Frame {
+        msec: 3568
+        hash: "592ac5bbf1c4b3a360be4d76c40a2be2"
+    }
+    Frame {
+        msec: 3584
+        hash: "bd5b206097f30dfce884a8c74856857d"
+    }
+    Frame {
+        msec: 3600
+        hash: "f14ec1544a380fc9993b39754c23c2f4"
+    }
+    Frame {
+        msec: 3616
+        hash: "836f37fe92a46233640e0bd2c0932fea"
+    }
+    Frame {
+        msec: 3632
+        hash: "062091bc7a5f3296c669614318b80fe7"
+    }
+    Frame {
+        msec: 3648
+        hash: "5b1b45e75f5a829b31c0b6eb0189da7c"
+    }
+    Frame {
+        msec: 3664
+        hash: "1dddd18a4ef66df9d9b431b2860e24d1"
+    }
+    Frame {
+        msec: 3680
+        hash: "d6218c8bb4da9d62bdb5d0cf5d7f8e37"
+    }
+    Frame {
+        msec: 3696
+        hash: "236e54ae31e5ee3d08a7bc9aeaef0d9b"
+    }
+    Frame {
+        msec: 3712
+        hash: "585ad3efb7330de889b8cf56a51a0899"
+    }
+    Frame {
+        msec: 3728
+        hash: "c0eb56c72311263d892ce65331547531"
+    }
+    Frame {
+        msec: 3744
+        hash: "a2e1dea5e5f37697c7ce1a9419b94f65"
+    }
+    Frame {
+        msec: 3760
+        hash: "718ac9cb5ef2992b06b34e957f987b7a"
+    }
+    Frame {
+        msec: 3776
+        hash: "ae2a644f96bd7b2662ebcf4ebc33d930"
+    }
+    Frame {
+        msec: 3792
+        hash: "54d04e64af5c0a3d29f2dc8c0977ed3a"
+    }
+    Frame {
+        msec: 3808
+        hash: "8210b9cbf19f519ee34f4bb1a6afce16"
+    }
+    Frame {
+        msec: 3824
+        hash: "e83642b0793f5a790efca65ccf20a720"
+    }
+    Frame {
+        msec: 3840
+        image: "cursorDelegate.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "520a544fd92f17a14380803e253b396f"
+    }
+    Frame {
+        msec: 3872
+        hash: "0ac33070e0c736bc0fb5ab12fa444b5c"
+    }
+    Frame {
+        msec: 3888
+        hash: "5ee8c9dc7b238db131b3a078e46a8bbd"
+    }
+    Frame {
+        msec: 3904
+        hash: "69720bcca91f99f229aebc74c5e74261"
+    }
+    Frame {
+        msec: 3920
+        hash: "41d8f4031223f7c833d50208e231964a"
+    }
+    Frame {
+        msec: 3936
+        hash: "6fa8fd3252f367f3fafea4e3c7317a48"
+    }
+    Frame {
+        msec: 3952
+        hash: "8a1b63c42867f87a1cf4b47944b3860a"
+    }
+    Frame {
+        msec: 3968
+        hash: "8c6052eb4cf03d7742a73874d9f15285"
+    }
+    Frame {
+        msec: 3984
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4000
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4016
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4032
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4048
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Frame {
+        msec: 4064
+        hash: "8c6052eb4cf03d7742a73874d9f15285"
+    }
+    Frame {
+        msec: 4080
+        hash: "8a1b63c42867f87a1cf4b47944b3860a"
+    }
+    Frame {
+        msec: 4096
+        hash: "6fa8fd3252f367f3fafea4e3c7317a48"
+    }
+    Frame {
+        msec: 4112
+        hash: "41d8f4031223f7c833d50208e231964a"
+    }
+    Frame {
+        msec: 4128
+        hash: "69720bcca91f99f229aebc74c5e74261"
+    }
+    Frame {
+        msec: 4144
+        hash: "5ee8c9dc7b238db131b3a078e46a8bbd"
+    }
+    Frame {
+        msec: 4160
+        hash: "0ac33070e0c736bc0fb5ab12fa444b5c"
+    }
+    Frame {
+        msec: 4176
+        hash: "520a544fd92f17a14380803e253b396f"
+    }
+    Frame {
+        msec: 4192
+        hash: "4a080a5154c517e6bcf24b3a1f1d7f2c"
+    }
+    Frame {
+        msec: 4208
+        hash: "e83642b0793f5a790efca65ccf20a720"
+    }
+    Frame {
+        msec: 4224
+        hash: "8210b9cbf19f519ee34f4bb1a6afce16"
+    }
+    Frame {
+        msec: 4240
+        hash: "54d04e64af5c0a3d29f2dc8c0977ed3a"
+    }
+    Frame {
+        msec: 4256
+        hash: "ae2a644f96bd7b2662ebcf4ebc33d930"
+    }
+    Frame {
+        msec: 4272
+        hash: "718ac9cb5ef2992b06b34e957f987b7a"
+    }
+    Frame {
+        msec: 4288
+        hash: "a2e1dea5e5f37697c7ce1a9419b94f65"
+    }
+    Frame {
+        msec: 4304
+        hash: "c0eb56c72311263d892ce65331547531"
+    }
+    Frame {
+        msec: 4320
+        hash: "585ad3efb7330de889b8cf56a51a0899"
+    }
+    Frame {
+        msec: 4336
+        hash: "236e54ae31e5ee3d08a7bc9aeaef0d9b"
+    }
+    Frame {
+        msec: 4352
+        hash: "d6218c8bb4da9d62bdb5d0cf5d7f8e37"
+    }
+    Frame {
+        msec: 4368
+        hash: "1dddd18a4ef66df9d9b431b2860e24d1"
+    }
+    Frame {
+        msec: 4384
+        hash: "5b1b45e75f5a829b31c0b6eb0189da7c"
+    }
+    Frame {
+        msec: 4400
+        hash: "062091bc7a5f3296c669614318b80fe7"
+    }
+    Frame {
+        msec: 4416
+        hash: "836f37fe92a46233640e0bd2c0932fea"
+    }
+    Frame {
+        msec: 4432
+        hash: "f14ec1544a380fc9993b39754c23c2f4"
+    }
+    Frame {
+        msec: 4448
+        hash: "bd5b206097f30dfce884a8c74856857d"
+    }
+    Frame {
+        msec: 4464
+        hash: "592ac5bbf1c4b3a360be4d76c40a2be2"
+    }
+    Frame {
+        msec: 4480
+        hash: "f243d823fc9977e69a008010d8db8a01"
+    }
+    Frame {
+        msec: 4496
+        hash: "ffc2da2e4c091eadaa9746b42b56d9e4"
+    }
+    Frame {
+        msec: 4512
+        hash: "ebae1fb540c6ff6b0bc9a951391e2e94"
+    }
+    Frame {
+        msec: 4528
+        hash: "097ab9a1a1fe9743f162f57b93599fe7"
+    }
+    Frame {
+        msec: 4544
+        hash: "61a3475bef5fd276b836cf3483526f57"
+    }
+    Frame {
+        msec: 4560
+        hash: "a63e2438a9cd412c2b119cd42b11009f"
+    }
+    Frame {
+        msec: 4576
+        hash: "87c129a5bf08536d3fca90375283e26b"
+    }
+    Frame {
+        msec: 4592
+        hash: "445de6663e80d1fe1527ec5acf4ec1de"
+    }
+    Frame {
+        msec: 4608
+        hash: "b5ec22f95abb43c83533f7dc606667f6"
+    }
+    Frame {
+        msec: 4624
+        hash: "874a65c2069f4ba89301c129f884f217"
+    }
+    Frame {
+        msec: 4640
+        hash: "700bd56ecea646bbec2017007bbb5b84"
+    }
+    Frame {
+        msec: 4656
+        hash: "4267354fe0d24597bdb5ee1a6e9affbb"
+    }
+    Frame {
+        msec: 4672
+        hash: "135b2b0f4e469b207e673d1e7086cd4f"
+    }
+    Frame {
+        msec: 4688
+        hash: "d08dc22ddc707316483f09b796ea0380"
+    }
+    Frame {
+        msec: 4704
+        hash: "114ad78597ede2afc4dd8bafa1d4df21"
+    }
+    Frame {
+        msec: 4720
+        hash: "ec1b4c71f9bd63ccf6d766b0b2f68b30"
+    }
+    Frame {
+        msec: 4736
+        hash: "cc1767ec13803959333cd35bfb2d9119"
+    }
+    Frame {
+        msec: 4752
+        hash: "0f113c0263faa47428c4d16891ac4d4f"
+    }
+    Frame {
+        msec: 4768
+        hash: "5381cde4763aa45c97793124e42db6f5"
+    }
+    Frame {
+        msec: 4784
+        hash: "99940d6744ac1245f82d62f08c371285"
+    }
+    Frame {
+        msec: 4800
+        image: "cursorDelegate.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "77bbed46c7eb023252cdd80d0a15f38a"
+    }
+    Frame {
+        msec: 4832
+        hash: "36ee4da72825e96d5f670c94865a30d8"
+    }
+    Frame {
+        msec: 4848
+        hash: "c64d56c1b7df0a5c63ab8ff08ae6daf9"
+    }
+    Frame {
+        msec: 4864
+        hash: "942e038a3426fa318212a8f245141225"
+    }
+    Frame {
+        msec: 4880
+        hash: "c033ebaee12dd8fe953e91160f986c3d"
+    }
+    Frame {
+        msec: 4896
+        hash: "07e64024cf7eda082297f6f83dba8067"
+    }
+    Frame {
+        msec: 4912
+        hash: "b33cd5bbb90d435dd7ea3ab67bef88ee"
+    }
+    Frame {
+        msec: 4928
+        hash: "90712efd7c17b0ad33d2c2c02e9eaa97"
+    }
+    Frame {
+        msec: 4944
+        hash: "7e2e55555ee2c7e172e61ddb6365355d"
+    }
+    Frame {
+        msec: 4960
+        hash: "87ca0584879b25336a1023ac3252fc9a"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png
index f30ee4f..e7e4ad8 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png
index 7ae3b94..07a19e2 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png
index 636afe8..075c4d5 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.3.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.4.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
index b5a4837..31d3592 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
@@ -6,11 +6,11 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 32
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Key {
         type: 6
@@ -22,83 +22,83 @@ VisualTest {
     }
     Frame {
         msec: 48
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 64
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 80
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 96
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 112
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 128
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 144
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 160
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 176
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 192
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 208
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 224
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 240
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 256
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 272
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 288
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 304
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 320
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 336
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Frame {
         msec: 352
-        hash: "48400809c3862dae64b0cd00d51057a4"
+        hash: "eff6a4491bc00e5570ea73a1371f63fc"
     }
     Key {
         type: 6
@@ -110,23 +110,23 @@ VisualTest {
     }
     Frame {
         msec: 368
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 384
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 400
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 416
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 432
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Key {
         type: 7
@@ -138,27 +138,27 @@ VisualTest {
     }
     Frame {
         msec: 448
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 464
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 480
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 496
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 512
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 528
-        hash: "4acf112eda369b7eb351e0e522cefa05"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Key {
         type: 7
@@ -170,43 +170,43 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 560
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 576
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 592
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 608
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 624
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 640
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 656
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 672
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Frame {
         msec: 688
-        hash: "238dc96885dadb763bfc1500d8b7c5b2"
+        hash: "48b0300c8109a227176bd90e6b8ca682"
     }
     Key {
         type: 6
@@ -218,23 +218,23 @@ VisualTest {
     }
     Frame {
         msec: 704
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 720
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 736
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 752
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 768
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Key {
         type: 7
@@ -246,23 +246,23 @@ VisualTest {
     }
     Frame {
         msec: 784
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 800
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 816
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 832
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Frame {
         msec: 848
-        hash: "2da540e72d88932b61a261d791fc34b0"
+        hash: "7de871fbd0f87da5c31216863f6eb0ba"
     }
     Key {
         type: 6
@@ -274,15 +274,15 @@ VisualTest {
     }
     Frame {
         msec: 864
-        hash: "25ade09747f07a9bdd07f5885a72dc55"
+        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
     }
     Frame {
         msec: 880
-        hash: "25ade09747f07a9bdd07f5885a72dc55"
+        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
     }
     Frame {
         msec: 896
-        hash: "25ade09747f07a9bdd07f5885a72dc55"
+        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
     }
     Key {
         type: 7
@@ -294,15 +294,15 @@ VisualTest {
     }
     Frame {
         msec: 912
-        hash: "25ade09747f07a9bdd07f5885a72dc55"
+        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
     }
     Frame {
         msec: 928
-        hash: "25ade09747f07a9bdd07f5885a72dc55"
+        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
     }
     Frame {
         msec: 944
-        hash: "25ade09747f07a9bdd07f5885a72dc55"
+        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
     }
     Frame {
         msec: 960
@@ -310,7 +310,7 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "25ade09747f07a9bdd07f5885a72dc55"
+        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
     }
     Key {
         type: 6
@@ -322,19 +322,19 @@ VisualTest {
     }
     Frame {
         msec: 992
-        hash: "0a60e76e96846f9f4e909f7a01ede377"
+        hash: "7bd52cf50949b283ec40b82cf457841a"
     }
     Frame {
         msec: 1008
-        hash: "0a60e76e96846f9f4e909f7a01ede377"
+        hash: "7bd52cf50949b283ec40b82cf457841a"
     }
     Frame {
         msec: 1024
-        hash: "0a60e76e96846f9f4e909f7a01ede377"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1040
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Key {
         type: 7
@@ -346,51 +346,51 @@ VisualTest {
     }
     Frame {
         msec: 1056
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1072
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1088
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1104
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1120
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1136
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1152
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1168
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1184
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1200
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1216
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1232
-        hash: "6f28f435e552cbbf6376f2443ed3843c"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Key {
         type: 6
@@ -402,15 +402,15 @@ VisualTest {
     }
     Frame {
         msec: 1248
-        hash: "16a353e711a8fb654b5fe3097ba29296"
+        hash: "fd2dfea0c188c624ad6eec189d677d8e"
     }
     Frame {
         msec: 1264
-        hash: "16a353e711a8fb654b5fe3097ba29296"
+        hash: "fd2dfea0c188c624ad6eec189d677d8e"
     }
     Frame {
         msec: 1280
-        hash: "16a353e711a8fb654b5fe3097ba29296"
+        hash: "fd2dfea0c188c624ad6eec189d677d8e"
     }
     Key {
         type: 7
@@ -422,15 +422,15 @@ VisualTest {
     }
     Frame {
         msec: 1296
-        hash: "16a353e711a8fb654b5fe3097ba29296"
+        hash: "fd2dfea0c188c624ad6eec189d677d8e"
     }
     Frame {
         msec: 1312
-        hash: "16a353e711a8fb654b5fe3097ba29296"
+        hash: "fd2dfea0c188c624ad6eec189d677d8e"
     }
     Frame {
         msec: 1328
-        hash: "16a353e711a8fb654b5fe3097ba29296"
+        hash: "fd2dfea0c188c624ad6eec189d677d8e"
     }
     Key {
         type: 6
@@ -442,39 +442,39 @@ VisualTest {
     }
     Frame {
         msec: 1344
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1360
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1376
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1392
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1408
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1424
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1440
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1456
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Frame {
         msec: 1472
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Key {
         type: 7
@@ -486,7 +486,7 @@ VisualTest {
     }
     Frame {
         msec: 1488
-        hash: "fcdbf8ef17e1a7aa6e0e1d952b25d47d"
+        hash: "8c3642f420ecc94e77cbaee8b218bddb"
     }
     Key {
         type: 6
@@ -498,19 +498,19 @@ VisualTest {
     }
     Frame {
         msec: 1504
-        hash: "fe0e4e097f655e0b330ed6fcfce669c2"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1520
-        hash: "fe0e4e097f655e0b330ed6fcfce669c2"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Frame {
         msec: 1536
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Frame {
         msec: 1552
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Key {
         type: 7
@@ -522,27 +522,27 @@ VisualTest {
     }
     Frame {
         msec: 1568
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Frame {
         msec: 1584
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Frame {
         msec: 1600
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Frame {
         msec: 1616
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Frame {
         msec: 1632
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Frame {
         msec: 1648
-        hash: "522f11cbb8da0cca25af91d3f6d5240b"
+        hash: "7b294a04afc0567d321a28930bc43600"
     }
     Key {
         type: 6
@@ -554,23 +554,23 @@ VisualTest {
     }
     Frame {
         msec: 1664
-        hash: "f459ca172e643d6e22c38067f8ced305"
+        hash: "00095464e3f162c2a825f7fdae21ab6f"
     }
     Frame {
         msec: 1680
-        hash: "f459ca172e643d6e22c38067f8ced305"
+        hash: "00095464e3f162c2a825f7fdae21ab6f"
     }
     Frame {
         msec: 1696
-        hash: "f459ca172e643d6e22c38067f8ced305"
+        hash: "00095464e3f162c2a825f7fdae21ab6f"
     }
     Frame {
         msec: 1712
-        hash: "f459ca172e643d6e22c38067f8ced305"
+        hash: "00095464e3f162c2a825f7fdae21ab6f"
     }
     Frame {
         msec: 1728
-        hash: "f459ca172e643d6e22c38067f8ced305"
+        hash: "00095464e3f162c2a825f7fdae21ab6f"
     }
     Key {
         type: 6
@@ -582,7 +582,7 @@ VisualTest {
     }
     Frame {
         msec: 1744
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Key {
         type: 7
@@ -594,15 +594,15 @@ VisualTest {
     }
     Frame {
         msec: 1760
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Frame {
         msec: 1776
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Frame {
         msec: 1792
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Key {
         type: 7
@@ -614,19 +614,19 @@ VisualTest {
     }
     Frame {
         msec: 1808
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Frame {
         msec: 1824
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Frame {
         msec: 1840
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Frame {
         msec: 1856
-        hash: "0016ecff508885d3a199b27baa9b7ecf"
+        hash: "c25d79796963ca42789725c6621bce01"
     }
     Key {
         type: 6
@@ -638,15 +638,15 @@ VisualTest {
     }
     Frame {
         msec: 1872
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 1888
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 1904
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 1920
@@ -662,27 +662,27 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 1952
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 1968
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 1984
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 2000
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
     }
     Frame {
         msec: 2016
-        hash: "05c631afb9df51c23b1f714a7de92788"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Key {
         type: 6
@@ -694,11 +694,11 @@ VisualTest {
     }
     Frame {
         msec: 2032
-        hash: "95ad72a49b991225e2ed5ae9c2a7b4e5"
+        hash: "f87d1f15df169e08cdd3dff50d596492"
     }
     Frame {
         msec: 2048
-        hash: "95ad72a49b991225e2ed5ae9c2a7b4e5"
+        hash: "f87d1f15df169e08cdd3dff50d596492"
     }
     Key {
         type: 7
@@ -710,11 +710,11 @@ VisualTest {
     }
     Frame {
         msec: 2064
-        hash: "95ad72a49b991225e2ed5ae9c2a7b4e5"
+        hash: "f87d1f15df169e08cdd3dff50d596492"
     }
     Frame {
         msec: 2080
-        hash: "95ad72a49b991225e2ed5ae9c2a7b4e5"
+        hash: "f87d1f15df169e08cdd3dff50d596492"
     }
     Key {
         type: 6
@@ -726,19 +726,19 @@ VisualTest {
     }
     Frame {
         msec: 2096
-        hash: "7f2366b163c110a50259936c150d8287"
+        hash: "a50ab62d526aef826ad883f712a22325"
     }
     Frame {
         msec: 2112
-        hash: "7f2366b163c110a50259936c150d8287"
+        hash: "a50ab62d526aef826ad883f712a22325"
     }
     Frame {
         msec: 2128
-        hash: "7f2366b163c110a50259936c150d8287"
+        hash: "a50ab62d526aef826ad883f712a22325"
     }
     Frame {
         msec: 2144
-        hash: "7f2366b163c110a50259936c150d8287"
+        hash: "a50ab62d526aef826ad883f712a22325"
     }
     Key {
         type: 6
@@ -758,19 +758,19 @@ VisualTest {
     }
     Frame {
         msec: 2160
-        hash: "b5110b1a7aa74f7b4ed72f573f10b1fe"
+        hash: "f0c34703a0b5a0631654482fbc785b57"
     }
     Frame {
         msec: 2176
-        hash: "b5110b1a7aa74f7b4ed72f573f10b1fe"
+        hash: "f0c34703a0b5a0631654482fbc785b57"
     }
     Frame {
         msec: 2192
-        hash: "b5110b1a7aa74f7b4ed72f573f10b1fe"
+        hash: "f0c34703a0b5a0631654482fbc785b57"
     }
     Frame {
         msec: 2208
-        hash: "b5110b1a7aa74f7b4ed72f573f10b1fe"
+        hash: "f0c34703a0b5a0631654482fbc785b57"
     }
     Key {
         type: 6
@@ -782,7 +782,7 @@ VisualTest {
     }
     Frame {
         msec: 2224
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Key {
         type: 7
@@ -794,23 +794,23 @@ VisualTest {
     }
     Frame {
         msec: 2240
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Frame {
         msec: 2256
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Frame {
         msec: 2272
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Frame {
         msec: 2288
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Frame {
         msec: 2304
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Key {
         type: 7
@@ -822,11 +822,11 @@ VisualTest {
     }
     Frame {
         msec: 2320
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Frame {
         msec: 2336
-        hash: "30cdfb276e7a234c72d89a03e6a10dc5"
+        hash: "0921766e0d224b70d2c3f9f282c51143"
     }
     Key {
         type: 6
@@ -838,27 +838,27 @@ VisualTest {
     }
     Frame {
         msec: 2352
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2368
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2384
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2400
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2416
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2432
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Key {
         type: 7
@@ -870,19 +870,19 @@ VisualTest {
     }
     Frame {
         msec: 2448
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2464
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2480
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Frame {
         msec: 2496
-        hash: "c0f7406f3718ab0120c79ff119d6986c"
+        hash: "91b44cdde36433cac6644c476e34d4f9"
     }
     Key {
         type: 6
@@ -894,15 +894,15 @@ VisualTest {
     }
     Frame {
         msec: 2512
-        hash: "870d7866b8e289b4843b62c856d769d4"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2528
-        hash: "870d7866b8e289b4843b62c856d769d4"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2544
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Key {
         type: 7
@@ -914,83 +914,83 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2576
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2592
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2608
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2624
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2640
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2656
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2672
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2688
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2704
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2720
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2736
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2752
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2768
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2784
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2800
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2816
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2832
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2848
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2864
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2880
@@ -998,46 +998,46 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2912
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2928
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2944
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2960
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2976
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 2992
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 3008
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "73ebe3eec273bac501d56451c0c0a828"
     }
     Frame {
         msec: 3024
-        hash: "84e1cbf26e6b571603e0b9e69579af8b"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 3040
-        hash: "870d7866b8e289b4843b62c856d769d4"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 3056
-        hash: "870d7866b8e289b4843b62c856d769d4"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.0.png
deleted file mode 100644
index 87c2e07..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.qml
index a0351e8..32330f4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.qml
@@ -6,102 +6,102 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 32
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 48
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 64
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 80
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 96
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 112
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 128
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 144
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 160
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 176
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 192
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 208
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 224
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 240
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 256
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 272
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 288
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 304
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 320
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 336
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 352
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 368
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 384
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
     Frame {
         msec: 400
-        hash: "7619ed68aca3544f373777e11a4bfefa"
+        hash: "09298802dfc053e2bb1b3bb2192ca5b2"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.0.png
index b064e79..313fcc2 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png
index 7dd1bd8..81798cc 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png
index d8e55e2..3e37ebb 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png
index f9f1744..313fcc2 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.3.png
index 70ae713..dc3abe6 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.4.png
index 9ce28db..62b464a 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.5.png
index 2ef2ac0..ee26c35 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.6.png
index 2a614f8..2ea9142 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.7.png
index f916c97..fb0be3c 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.8.png
index 56bf00b..0122645 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png
index 97847d9..24da450 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml
index cdc5153..f014a30 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml
@@ -6,235 +6,235 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 32
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 48
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 64
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 80
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 96
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 112
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 128
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 144
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 160
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 176
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 192
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 208
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 224
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 240
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 256
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 272
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 288
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 304
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 320
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 336
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 352
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 368
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 384
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 400
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 416
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 432
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 448
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 464
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 480
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 496
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 512
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 528
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 544
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 560
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 576
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 592
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 608
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 624
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 640
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 656
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 672
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 688
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 704
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 720
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 736
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 752
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 768
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 784
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 800
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 816
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 832
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 848
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 864
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 880
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 896
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 912
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Frame {
         msec: 928
-        hash: "a6d33b1212bb4d1241734bfff167d1a5"
+        hash: "9d5b9f785409527b8f315fef560a4688"
     }
     Mouse {
         type: 2
@@ -246,7 +246,7 @@ VisualTest {
     }
     Frame {
         msec: 944
-        hash: "c83faf1ed7b59715046e1abef04fa546"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Mouse {
         type: 3
@@ -270,27 +270,27 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 992
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1008
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1024
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1040
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1056
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Mouse {
         type: 3
@@ -302,79 +302,79 @@ VisualTest {
     }
     Frame {
         msec: 1072
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1088
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1104
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1120
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1136
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1152
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1168
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1184
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1200
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1216
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1232
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1248
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1264
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1280
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1296
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1312
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1328
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1344
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1360
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Key {
         type: 6
@@ -386,139 +386,139 @@ VisualTest {
     }
     Frame {
         msec: 1376
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1392
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1408
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1424
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1440
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1456
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1472
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1488
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1504
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1520
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1536
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1552
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1568
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1584
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1600
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1616
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1632
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1648
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1664
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1680
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1696
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1712
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1728
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1744
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1760
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1776
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1792
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1808
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1824
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1840
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1856
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1872
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1888
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1904
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1920
@@ -526,19 +526,19 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1952
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1968
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 1984
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Key {
         type: 6
@@ -550,35 +550,35 @@ VisualTest {
     }
     Frame {
         msec: 2000
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2016
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2032
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2048
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2064
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2080
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2096
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2112
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Key {
         type: 7
@@ -598,95 +598,95 @@ VisualTest {
     }
     Frame {
         msec: 2128
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2144
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2160
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2176
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2192
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2208
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2224
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2240
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2256
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2272
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2288
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2304
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2320
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2336
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2352
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2368
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2384
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2400
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2416
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2432
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2448
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2464
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Frame {
         msec: 2480
-        hash: "3b899cd28b58c3f94946286a0ddcab89"
+        hash: "957c85bfa6586d5d92aa3689c178944f"
     }
     Key {
         type: 6
@@ -698,27 +698,27 @@ VisualTest {
     }
     Frame {
         msec: 2496
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2512
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2528
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2544
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2560
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2576
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Key {
         type: 7
@@ -730,55 +730,55 @@ VisualTest {
     }
     Frame {
         msec: 2592
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2608
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2624
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2640
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2656
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2672
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2688
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2704
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2720
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2736
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2752
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2768
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2784
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Key {
         type: 6
@@ -790,23 +790,23 @@ VisualTest {
     }
     Frame {
         msec: 2800
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2816
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2832
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2848
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2864
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2880
@@ -814,87 +814,87 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2912
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2928
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2944
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2960
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2976
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 2992
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3008
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3024
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3040
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3056
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3072
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3088
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3104
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3120
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3136
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3152
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3168
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3184
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3200
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Frame {
         msec: 3216
-        hash: "f2a573f227a3eb84f60418d0f3e81fb3"
+        hash: "ebd6e6bbd0edaffed688dd5fa2328393"
     }
     Key {
         type: 6
@@ -906,31 +906,31 @@ VisualTest {
     }
     Frame {
         msec: 3232
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3248
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3264
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3280
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3296
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3312
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3328
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Key {
         type: 7
@@ -942,59 +942,59 @@ VisualTest {
     }
     Frame {
         msec: 3344
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3360
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3376
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3392
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3408
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3424
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3440
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3456
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3472
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3488
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3504
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3520
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3536
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Frame {
         msec: 3552
-        hash: "202ad01bacfb48341efdd85197df6964"
+        hash: "923335b8fdb038fe10c8c557845c2ae1"
     }
     Key {
         type: 6
@@ -1006,35 +1006,35 @@ VisualTest {
     }
     Frame {
         msec: 3568
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3584
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3600
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3616
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3632
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3648
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3664
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3680
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Key {
         type: 7
@@ -1046,39 +1046,39 @@ VisualTest {
     }
     Frame {
         msec: 3696
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3712
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3728
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3744
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3760
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3776
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3792
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3808
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3824
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3840
@@ -1086,91 +1086,91 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3872
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3888
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3904
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3920
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3936
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3952
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3968
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 3984
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4000
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4016
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4032
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4048
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4064
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4080
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4096
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4112
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4128
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4144
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4160
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4176
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4192
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Key {
         type: 7
@@ -1182,131 +1182,131 @@ VisualTest {
     }
     Frame {
         msec: 4208
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4224
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4240
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4256
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4272
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4288
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4304
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4320
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4336
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4352
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4368
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4384
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4400
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4416
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4432
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4448
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4464
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4480
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4496
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4512
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4528
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4544
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4560
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4576
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4592
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4608
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4624
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4640
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4656
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4672
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4688
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Frame {
         msec: 4704
-        hash: "eac37a53473ad7f378a2a1bb37fa6b58"
+        hash: "3e9cbf56be37f593e907759285ddebdb"
     }
     Mouse {
         type: 2
@@ -1318,23 +1318,23 @@ VisualTest {
     }
     Frame {
         msec: 4720
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4736
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4752
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4768
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4784
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4800
@@ -1350,143 +1350,143 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4832
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4848
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4864
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4880
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4896
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4912
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4928
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4944
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4960
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4976
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 4992
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5008
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5024
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5040
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5056
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5072
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5088
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5104
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5120
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5136
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5152
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5168
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5184
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5200
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5216
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5232
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5248
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5264
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5280
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5296
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5312
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5328
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5344
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Frame {
         msec: 5360
-        hash: "c65ff28e032b18223c65f8810b39d603"
+        hash: "39ce4d31df138a329a21056b8d397fd7"
     }
     Key {
         type: 6
@@ -1498,67 +1498,67 @@ VisualTest {
     }
     Frame {
         msec: 5376
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5392
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5408
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5424
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5440
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5456
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5472
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5488
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5504
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5520
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5536
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5552
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5568
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5584
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5600
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Frame {
         msec: 5616
-        hash: "8c755780c2d281aba23c507bcebfd5db"
+        hash: "ed58b79d6459243c991a2f941279f88e"
     }
     Key {
         type: 7
@@ -1578,11 +1578,11 @@ VisualTest {
     }
     Frame {
         msec: 5632
-        hash: "baa42bc9d5e16c3e7af81e126d37655a"
+        hash: "c5d53d11b73e52746d8cdc7de15198cb"
     }
     Frame {
         msec: 5648
-        hash: "baa42bc9d5e16c3e7af81e126d37655a"
+        hash: "c5d53d11b73e52746d8cdc7de15198cb"
     }
     Key {
         type: 7
@@ -1602,11 +1602,11 @@ VisualTest {
     }
     Frame {
         msec: 5664
-        hash: "aa876e6d6ff0f169bcc3cf25be5e7a81"
+        hash: "ba3ef31e650737ec5b7477baa4ab5ecf"
     }
     Frame {
         msec: 5680
-        hash: "aa876e6d6ff0f169bcc3cf25be5e7a81"
+        hash: "ba3ef31e650737ec5b7477baa4ab5ecf"
     }
     Key {
         type: 7
@@ -1626,11 +1626,11 @@ VisualTest {
     }
     Frame {
         msec: 5696
-        hash: "8ec4c1a8ae28af44dcabf338fc056717"
+        hash: "59098eca4502479da33d40ec82896330"
     }
     Frame {
         msec: 5712
-        hash: "8ec4c1a8ae28af44dcabf338fc056717"
+        hash: "59098eca4502479da33d40ec82896330"
     }
     Key {
         type: 7
@@ -1650,11 +1650,11 @@ VisualTest {
     }
     Frame {
         msec: 5728
-        hash: "ec0da333c0bc090eec0ded5e4d18bd6e"
+        hash: "9c1888b9575771f653d672c19ab4083f"
     }
     Frame {
         msec: 5744
-        hash: "ec0da333c0bc090eec0ded5e4d18bd6e"
+        hash: "9c1888b9575771f653d672c19ab4083f"
     }
     Key {
         type: 7
@@ -1678,7 +1678,7 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "325ba5789a6150ec0fef81fa5b005c09"
+        hash: "48bb05f44207f641b573d43043882aa2"
     }
     Key {
         type: 7
@@ -1698,11 +1698,11 @@ VisualTest {
     }
     Frame {
         msec: 5792
-        hash: "023dd8fe428b1ed0f4c994f7e67ac3cd"
+        hash: "f5cb70509c060343a8c9b57d26ecf4ea"
     }
     Frame {
         msec: 5808
-        hash: "023dd8fe428b1ed0f4c994f7e67ac3cd"
+        hash: "f5cb70509c060343a8c9b57d26ecf4ea"
     }
     Key {
         type: 7
@@ -1722,11 +1722,11 @@ VisualTest {
     }
     Frame {
         msec: 5824
-        hash: "f661f599f576ae883f25422b20408138"
+        hash: "5bdfe389421df56140d27a21bbcc10d4"
     }
     Frame {
         msec: 5840
-        hash: "f661f599f576ae883f25422b20408138"
+        hash: "5bdfe389421df56140d27a21bbcc10d4"
     }
     Key {
         type: 7
@@ -1738,7 +1738,7 @@ VisualTest {
     }
     Frame {
         msec: 5856
-        hash: "f661f599f576ae883f25422b20408138"
+        hash: "5bdfe389421df56140d27a21bbcc10d4"
     }
     Key {
         type: 6
@@ -1750,11 +1750,11 @@ VisualTest {
     }
     Frame {
         msec: 5872
-        hash: "8e7ad34802a0ced493e88b779c73cc47"
+        hash: "0f48c779e033240e87675b43cfca02c5"
     }
     Frame {
         msec: 5888
-        hash: "8e7ad34802a0ced493e88b779c73cc47"
+        hash: "0f48c779e033240e87675b43cfca02c5"
     }
     Key {
         type: 7
@@ -1774,7 +1774,7 @@ VisualTest {
     }
     Frame {
         msec: 5904
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Key {
         type: 7
@@ -1786,39 +1786,39 @@ VisualTest {
     }
     Frame {
         msec: 5920
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 5936
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 5952
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 5968
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 5984
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6000
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6016
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6032
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6048
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Key {
         type: 6
@@ -1830,27 +1830,27 @@ VisualTest {
     }
     Frame {
         msec: 6064
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6080
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6096
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6112
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6128
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Frame {
         msec: 6144
-        hash: "943c7ec51fbe8db38fcd3086990fa4e0"
+        hash: "f5e148d32ec832bb9c4fb49016da7903"
     }
     Key {
         type: 6
@@ -1862,67 +1862,67 @@ VisualTest {
     }
     Frame {
         msec: 6160
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6176
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6192
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6208
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6224
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6240
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6256
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6272
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6288
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6304
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6320
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6336
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6352
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6368
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6384
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Frame {
         msec: 6400
-        hash: "bd2e37c4ac90a6389f7f4e1e1360b31b"
+        hash: "ac4c53142eea27d7148c74de76cdc4d4"
     }
     Key {
         type: 7
@@ -1942,11 +1942,11 @@ VisualTest {
     }
     Frame {
         msec: 6416
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6432
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Key {
         type: 7
@@ -1966,11 +1966,11 @@ VisualTest {
     }
     Frame {
         msec: 6448
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6464
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Key {
         type: 7
@@ -1998,63 +1998,63 @@ VisualTest {
     }
     Frame {
         msec: 6480
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6496
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6512
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6528
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6544
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6560
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6576
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6592
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6608
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6624
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6640
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6656
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6672
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6688
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6704
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6720
@@ -2062,19 +2062,19 @@ VisualTest {
     }
     Frame {
         msec: 6736
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6752
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6768
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6784
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Key {
         type: 6
@@ -2086,7 +2086,7 @@ VisualTest {
     }
     Frame {
         msec: 6800
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Key {
         type: 7
@@ -2098,39 +2098,39 @@ VisualTest {
     }
     Frame {
         msec: 6816
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6832
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6848
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6864
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6880
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6896
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6912
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6928
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Frame {
         msec: 6944
-        hash: "608bba00320e20da05aa2a6bbcba6e19"
+        hash: "ecfa95feb59486098b758894cba272c8"
     }
     Key {
         type: 6
@@ -2142,19 +2142,19 @@ VisualTest {
     }
     Frame {
         msec: 6960
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Frame {
         msec: 6976
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Frame {
         msec: 6992
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Frame {
         msec: 7008
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Key {
         type: 7
@@ -2166,23 +2166,23 @@ VisualTest {
     }
     Frame {
         msec: 7024
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Frame {
         msec: 7040
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Frame {
         msec: 7056
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Frame {
         msec: 7072
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Frame {
         msec: 7088
-        hash: "40456a6d22e09e1817b07f3898676524"
+        hash: "012fbe791afb6bb8b97091fbec1b0add"
     }
     Key {
         type: 6
@@ -2194,19 +2194,19 @@ VisualTest {
     }
     Frame {
         msec: 7104
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7120
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7136
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7152
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Key {
         type: 7
@@ -2218,31 +2218,31 @@ VisualTest {
     }
     Frame {
         msec: 7168
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7184
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7200
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7216
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7232
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7248
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Frame {
         msec: 7264
-        hash: "dada78341b65c1efb2816e16a8cbe8b5"
+        hash: "d1246ecb1e587b9618d4affb6303581b"
     }
     Key {
         type: 6
@@ -2254,23 +2254,23 @@ VisualTest {
     }
     Frame {
         msec: 7280
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7296
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7312
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7328
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7344
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Key {
         type: 7
@@ -2282,47 +2282,47 @@ VisualTest {
     }
     Frame {
         msec: 7360
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7376
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7392
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7408
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7424
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7440
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7456
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7472
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7488
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7504
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7520
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Key {
         type: 7
@@ -2334,39 +2334,39 @@ VisualTest {
     }
     Frame {
         msec: 7536
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7552
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7568
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7584
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7600
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7616
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7632
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7648
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7664
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7680
@@ -2374,207 +2374,207 @@ VisualTest {
     }
     Frame {
         msec: 7696
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7712
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7728
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7744
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7760
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7776
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7792
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7808
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7824
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7840
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7856
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7872
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7888
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7904
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7920
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7936
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7952
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7968
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 7984
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8000
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8016
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8032
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8048
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8064
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8080
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8096
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8112
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8128
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8144
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8160
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8176
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8192
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8208
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8224
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8240
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8256
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8272
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8288
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8304
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8320
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8336
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8352
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8368
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8384
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8400
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8416
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8432
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8448
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8464
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8480
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Frame {
         msec: 8496
-        hash: "f249bfae1934844abfd5fc158a9c89cf"
+        hash: "28b1455bb7b150afb4bec88f3328a1f6"
     }
     Mouse {
         type: 2
@@ -2586,19 +2586,19 @@ VisualTest {
     }
     Frame {
         msec: 8512
-        hash: "e594125fb367adee5b6acdb1268c86cd"
+        hash: "edb037dfb1fe973df3896e4a2d649b8c"
     }
     Frame {
         msec: 8528
-        hash: "e594125fb367adee5b6acdb1268c86cd"
+        hash: "edb037dfb1fe973df3896e4a2d649b8c"
     }
     Frame {
         msec: 8544
-        hash: "e594125fb367adee5b6acdb1268c86cd"
+        hash: "edb037dfb1fe973df3896e4a2d649b8c"
     }
     Frame {
         msec: 8560
-        hash: "e594125fb367adee5b6acdb1268c86cd"
+        hash: "edb037dfb1fe973df3896e4a2d649b8c"
     }
     Mouse {
         type: 5
@@ -2618,7 +2618,7 @@ VisualTest {
     }
     Frame {
         msec: 8576
-        hash: "e594125fb367adee5b6acdb1268c86cd"
+        hash: "edb037dfb1fe973df3896e4a2d649b8c"
     }
     Mouse {
         type: 5
@@ -2630,7 +2630,7 @@ VisualTest {
     }
     Frame {
         msec: 8592
-        hash: "7d4116a8689b6995702a042d974ef74b"
+        hash: "56e3c2d792e204e7d9758263edb6ab24"
     }
     Mouse {
         type: 5
@@ -2650,7 +2650,7 @@ VisualTest {
     }
     Frame {
         msec: 8608
-        hash: "cb9221f27ac24e4b6b103ca53acad3b3"
+        hash: "74b47cf865838cdb3b29cd2104d990fe"
     }
     Mouse {
         type: 5
@@ -2662,7 +2662,7 @@ VisualTest {
     }
     Frame {
         msec: 8624
-        hash: "074bc6abd9a67db829ae5d6c5f187fb6"
+        hash: "b7f624c97fc369c66314ecbb86549686"
     }
     Mouse {
         type: 5
@@ -2694,7 +2694,7 @@ VisualTest {
     }
     Frame {
         msec: 8656
-        hash: "074bc6abd9a67db829ae5d6c5f187fb6"
+        hash: "b7f624c97fc369c66314ecbb86549686"
     }
     Mouse {
         type: 5
@@ -2714,7 +2714,7 @@ VisualTest {
     }
     Frame {
         msec: 8672
-        hash: "074bc6abd9a67db829ae5d6c5f187fb6"
+        hash: "51219dfa7fc899bdba40d50b90ca3ca6"
     }
     Mouse {
         type: 5
@@ -2726,7 +2726,7 @@ VisualTest {
     }
     Frame {
         msec: 8688
-        hash: "7e403c56d5652321a7701529fc6b8098"
+        hash: "51219dfa7fc899bdba40d50b90ca3ca6"
     }
     Mouse {
         type: 5
@@ -2746,7 +2746,7 @@ VisualTest {
     }
     Frame {
         msec: 8704
-        hash: "7e403c56d5652321a7701529fc6b8098"
+        hash: "51219dfa7fc899bdba40d50b90ca3ca6"
     }
     Mouse {
         type: 5
@@ -2766,7 +2766,7 @@ VisualTest {
     }
     Frame {
         msec: 8720
-        hash: "7e403c56d5652321a7701529fc6b8098"
+        hash: "51219dfa7fc899bdba40d50b90ca3ca6"
     }
     Mouse {
         type: 5
@@ -2786,7 +2786,7 @@ VisualTest {
     }
     Frame {
         msec: 8736
-        hash: "7e403c56d5652321a7701529fc6b8098"
+        hash: "9320132e49323d536d435ce4f2263502"
     }
     Mouse {
         type: 5
@@ -2806,7 +2806,7 @@ VisualTest {
     }
     Frame {
         msec: 8752
-        hash: "2435f2526b3ccc12b7b573872b40e5f1"
+        hash: "9320132e49323d536d435ce4f2263502"
     }
     Mouse {
         type: 5
@@ -2826,7 +2826,7 @@ VisualTest {
     }
     Frame {
         msec: 8768
-        hash: "2435f2526b3ccc12b7b573872b40e5f1"
+        hash: "9320132e49323d536d435ce4f2263502"
     }
     Mouse {
         type: 5
@@ -2846,7 +2846,7 @@ VisualTest {
     }
     Frame {
         msec: 8784
-        hash: "2435f2526b3ccc12b7b573872b40e5f1"
+        hash: "ad318ee661054ed3b628c312467dc789"
     }
     Mouse {
         type: 5
@@ -2866,7 +2866,7 @@ VisualTest {
     }
     Frame {
         msec: 8800
-        hash: "2435f2526b3ccc12b7b573872b40e5f1"
+        hash: "ad318ee661054ed3b628c312467dc789"
     }
     Mouse {
         type: 5
@@ -2886,7 +2886,7 @@ VisualTest {
     }
     Frame {
         msec: 8816
-        hash: "f5a185b954e8b181222cc50075d8ebb6"
+        hash: "ad318ee661054ed3b628c312467dc789"
     }
     Mouse {
         type: 5
@@ -2906,7 +2906,7 @@ VisualTest {
     }
     Frame {
         msec: 8832
-        hash: "93a00b37c5027650791d1ff589408d0d"
+        hash: "6916d64662dd8accaa2c70cbd9b94af9"
     }
     Mouse {
         type: 5
@@ -2926,7 +2926,7 @@ VisualTest {
     }
     Frame {
         msec: 8848
-        hash: "0b29f6006be3604ef862db7d31f9a434"
+        hash: "dd995b598e90d482291b94f9cbebace9"
     }
     Mouse {
         type: 5
@@ -2946,7 +2946,7 @@ VisualTest {
     }
     Frame {
         msec: 8864
-        hash: "8390b63b71e1452cb93c576a3f2395e1"
+        hash: "8fb2e565879fdb7ef5ca53a142c1ea45"
     }
     Mouse {
         type: 5
@@ -2966,7 +2966,7 @@ VisualTest {
     }
     Frame {
         msec: 8880
-        hash: "72298910946a4e1a9ccc4520d99e9420"
+        hash: "6cdab9c68965444420401bb95c2d059b"
     }
     Mouse {
         type: 5
@@ -2986,7 +2986,7 @@ VisualTest {
     }
     Frame {
         msec: 8896
-        hash: "17d349b0ed29d6aa57bf8fda9a55abf8"
+        hash: "d11156abb2ef56ef6b8c4e78e2391d8a"
     }
     Mouse {
         type: 5
@@ -3006,7 +3006,7 @@ VisualTest {
     }
     Frame {
         msec: 8912
-        hash: "01e8a877d51f5564aaf2f11e7aadbc4a"
+        hash: "2390c7bfd983c14a6ff4c3573741e2fa"
     }
     Mouse {
         type: 5
@@ -3026,7 +3026,7 @@ VisualTest {
     }
     Frame {
         msec: 8928
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3046,7 +3046,7 @@ VisualTest {
     }
     Frame {
         msec: 8944
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3066,11 +3066,11 @@ VisualTest {
     }
     Frame {
         msec: 8960
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 8976
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3090,7 +3090,7 @@ VisualTest {
     }
     Frame {
         msec: 8992
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3102,55 +3102,55 @@ VisualTest {
     }
     Frame {
         msec: 9008
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9024
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9040
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9056
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9072
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9088
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9104
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9120
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9136
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9152
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9168
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9184
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Frame {
         msec: 9200
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3162,7 +3162,7 @@ VisualTest {
     }
     Frame {
         msec: 9216
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3174,7 +3174,7 @@ VisualTest {
     }
     Frame {
         msec: 9232
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3194,7 +3194,7 @@ VisualTest {
     }
     Frame {
         msec: 9248
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3214,7 +3214,7 @@ VisualTest {
     }
     Frame {
         msec: 9264
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3234,7 +3234,7 @@ VisualTest {
     }
     Frame {
         msec: 9280
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3254,7 +3254,7 @@ VisualTest {
     }
     Frame {
         msec: 9296
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3274,7 +3274,7 @@ VisualTest {
     }
     Frame {
         msec: 9312
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3294,7 +3294,7 @@ VisualTest {
     }
     Frame {
         msec: 9328
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3314,7 +3314,7 @@ VisualTest {
     }
     Frame {
         msec: 9344
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3334,7 +3334,7 @@ VisualTest {
     }
     Frame {
         msec: 9360
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3354,7 +3354,7 @@ VisualTest {
     }
     Frame {
         msec: 9376
-        hash: "bc8f49abd277f5f15d422341de212183"
+        hash: "e7442142350b9fdaf7fc7e763cafbaf5"
     }
     Mouse {
         type: 5
@@ -3374,7 +3374,7 @@ VisualTest {
     }
     Frame {
         msec: 9392
-        hash: "12e705f08ff90fd8ddb1937e5a7e23a0"
+        hash: "934022d70c2d094d6463d895803f2a79"
     }
     Mouse {
         type: 5
@@ -3394,7 +3394,7 @@ VisualTest {
     }
     Frame {
         msec: 9408
-        hash: "12e705f08ff90fd8ddb1937e5a7e23a0"
+        hash: "934022d70c2d094d6463d895803f2a79"
     }
     Mouse {
         type: 5
@@ -3414,7 +3414,7 @@ VisualTest {
     }
     Frame {
         msec: 9424
-        hash: "4daae0f05ff1b7ef68ed1d839b113dc4"
+        hash: "48caf4c2d3a5a6058b1ffa221ee77d83"
     }
     Mouse {
         type: 5
@@ -3434,7 +3434,7 @@ VisualTest {
     }
     Frame {
         msec: 9440
-        hash: "a1186544d7f5576e6ccbbd7938c1c374"
+        hash: "8e22c6013721d350acf1635f1c00488d"
     }
     Mouse {
         type: 5
@@ -3454,7 +3454,7 @@ VisualTest {
     }
     Frame {
         msec: 9456
-        hash: "6ce09c9a06135d2280e4f7bc1c81b70e"
+        hash: "c8dd72bfeec38d825dc7832f8bf7116d"
     }
     Mouse {
         type: 5
@@ -3474,7 +3474,7 @@ VisualTest {
     }
     Frame {
         msec: 9472
-        hash: "6ce09c9a06135d2280e4f7bc1c81b70e"
+        hash: "f3e934f22fead73fd52ab26d4f3fd480"
     }
     Mouse {
         type: 5
@@ -3494,7 +3494,7 @@ VisualTest {
     }
     Frame {
         msec: 9488
-        hash: "035b177c3cacd8cdef807d5673de4607"
+        hash: "7fc03d3341860a984be91feec0b67da2"
     }
     Mouse {
         type: 5
@@ -3514,7 +3514,7 @@ VisualTest {
     }
     Frame {
         msec: 9504
-        hash: "7b7e3c4600f3af7bd0f45799661db993"
+        hash: "7fc03d3341860a984be91feec0b67da2"
     }
     Mouse {
         type: 5
@@ -3534,7 +3534,7 @@ VisualTest {
     }
     Frame {
         msec: 9520
-        hash: "7b7e3c4600f3af7bd0f45799661db993"
+        hash: "a1eacc5be14a2c411660662dd9e78b2f"
     }
     Mouse {
         type: 5
@@ -3546,7 +3546,7 @@ VisualTest {
     }
     Frame {
         msec: 9536
-        hash: "7b7e3c4600f3af7bd0f45799661db993"
+        hash: "a1eacc5be14a2c411660662dd9e78b2f"
     }
     Mouse {
         type: 5
@@ -3566,7 +3566,7 @@ VisualTest {
     }
     Frame {
         msec: 9552
-        hash: "859950e1cf496ef830a30b3a0ec801ac"
+        hash: "a1eacc5be14a2c411660662dd9e78b2f"
     }
     Mouse {
         type: 5
@@ -3586,7 +3586,7 @@ VisualTest {
     }
     Frame {
         msec: 9568
-        hash: "859950e1cf496ef830a30b3a0ec801ac"
+        hash: "6808d46fa17f9e359c38aeca72466c97"
     }
     Mouse {
         type: 5
@@ -3606,7 +3606,7 @@ VisualTest {
     }
     Frame {
         msec: 9584
-        hash: "be7343825b6adcb16f49e20ee2bdf19f"
+        hash: "0b4b632291769b48d942f5aea91a8ae5"
     }
     Mouse {
         type: 5
@@ -3638,7 +3638,7 @@ VisualTest {
     }
     Frame {
         msec: 9616
-        hash: "597923ce1046fbf4b728545c54c97fa5"
+        hash: "0b4b632291769b48d942f5aea91a8ae5"
     }
     Mouse {
         type: 5
@@ -3658,7 +3658,7 @@ VisualTest {
     }
     Frame {
         msec: 9632
-        hash: "597923ce1046fbf4b728545c54c97fa5"
+        hash: "d730471882eacaf3280295d902c3927f"
     }
     Mouse {
         type: 5
@@ -3678,7 +3678,7 @@ VisualTest {
     }
     Frame {
         msec: 9648
-        hash: "597923ce1046fbf4b728545c54c97fa5"
+        hash: "d730471882eacaf3280295d902c3927f"
     }
     Mouse {
         type: 5
@@ -3698,7 +3698,7 @@ VisualTest {
     }
     Frame {
         msec: 9664
-        hash: "2fc5c42f94350f28ae0117bc7f6daff1"
+        hash: "f2a17005ff90345b440475a772277495"
     }
     Mouse {
         type: 5
@@ -3718,7 +3718,7 @@ VisualTest {
     }
     Frame {
         msec: 9680
-        hash: "4b4ec69d583151f1a64052d696966f9c"
+        hash: "62edb249cc9fcb08e5426f9acd54ad36"
     }
     Mouse {
         type: 5
@@ -3738,7 +3738,7 @@ VisualTest {
     }
     Frame {
         msec: 9696
-        hash: "0882a25ac1c2b534367736d825a73630"
+        hash: "ef6497718983eb548ec2aa43781d2555"
     }
     Mouse {
         type: 5
@@ -3758,7 +3758,7 @@ VisualTest {
     }
     Frame {
         msec: 9712
-        hash: "d5b6acc155f827c05b0c4c289a2e3eec"
+        hash: "d5b90efb68335fc4aa1fc222c67d1f53"
     }
     Mouse {
         type: 5
@@ -3778,7 +3778,7 @@ VisualTest {
     }
     Frame {
         msec: 9728
-        hash: "a05b3f2f9f22249ab694ac45e1de7b85"
+        hash: "a8cbbbe9cffd27002e8a1b3851b23bb0"
     }
     Mouse {
         type: 5
@@ -3798,7 +3798,7 @@ VisualTest {
     }
     Frame {
         msec: 9744
-        hash: "5b0e034813f8543627f370efdcf3591e"
+        hash: "a448d8d01e84961098d6b86319013d5f"
     }
     Mouse {
         type: 5
@@ -3818,7 +3818,7 @@ VisualTest {
     }
     Frame {
         msec: 9760
-        hash: "5b8d80b9d7e2a8c1a24c28e127d0f7e5"
+        hash: "afa98074edfb7b0e904f5645f592efae"
     }
     Mouse {
         type: 5
@@ -3838,7 +3838,7 @@ VisualTest {
     }
     Frame {
         msec: 9776
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3858,7 +3858,7 @@ VisualTest {
     }
     Frame {
         msec: 9792
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3870,7 +3870,7 @@ VisualTest {
     }
     Frame {
         msec: 9808
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3882,7 +3882,7 @@ VisualTest {
     }
     Frame {
         msec: 9824
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3894,7 +3894,7 @@ VisualTest {
     }
     Frame {
         msec: 9840
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3906,11 +3906,11 @@ VisualTest {
     }
     Frame {
         msec: 9856
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 9872
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3922,7 +3922,7 @@ VisualTest {
     }
     Frame {
         msec: 9888
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3934,7 +3934,7 @@ VisualTest {
     }
     Frame {
         msec: 9904
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3946,7 +3946,7 @@ VisualTest {
     }
     Frame {
         msec: 9920
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3958,11 +3958,11 @@ VisualTest {
     }
     Frame {
         msec: 9936
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 9952
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3974,7 +3974,7 @@ VisualTest {
     }
     Frame {
         msec: 9968
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3986,7 +3986,7 @@ VisualTest {
     }
     Frame {
         msec: 9984
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -3998,11 +3998,11 @@ VisualTest {
     }
     Frame {
         msec: 10000
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10016
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 5
@@ -4014,59 +4014,59 @@ VisualTest {
     }
     Frame {
         msec: 10032
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10048
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10064
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10080
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10096
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10112
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10128
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10144
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10160
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10176
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10192
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10208
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10224
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10240
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Mouse {
         type: 3
@@ -4078,79 +4078,79 @@ VisualTest {
     }
     Frame {
         msec: 10256
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10272
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10288
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10304
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10320
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10336
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10352
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10368
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10384
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10400
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10416
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10432
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10448
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10464
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10480
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10496
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10512
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10528
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10544
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10560
@@ -4158,178 +4158,178 @@ VisualTest {
     }
     Frame {
         msec: 10576
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10592
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10608
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10624
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10640
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10656
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10672
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10688
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10704
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10720
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10736
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10752
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10768
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10784
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10800
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10816
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10832
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10848
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10864
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10880
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10896
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10912
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10928
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10944
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10960
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10976
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 10992
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11008
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11024
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11040
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11056
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11072
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11088
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11104
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11120
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11136
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11152
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11168
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11184
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11200
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11216
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11232
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11248
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
     Frame {
         msec: 11264
-        hash: "66715d4a4f83d0e5905adbc4c459b0fb"
+        hash: "020ac5797abe98f97c4839afc67aac18"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.0.png
deleted file mode 100644
index f04f65e..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.1.png
deleted file mode 100644
index 46a703a..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.2.png
deleted file mode 100644
index e4a3877..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.3.png
deleted file mode 100644
index 9ef842a..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.4.png
deleted file mode 100644
index 706e2b3..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.5.png
deleted file mode 100644
index bcc86cc..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.6.png
deleted file mode 100644
index 51ddd44..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.7.png
deleted file mode 100644
index 0a2fdda..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.8.png
deleted file mode 100644
index 9c88bff..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.qml
index a1d998f..81f1bcc 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.qml
@@ -6,134 +6,146 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 32
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 48
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 64
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 80
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 96
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 112
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 128
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 144
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 160
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 176
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 192
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 208
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 224
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 240
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 256
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 272
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 288
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 304
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 320
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 336
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 352
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 368
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 384
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 400
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 416
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 432
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
     }
     Frame {
         msec: 448
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "65bbc5da769f475d1c47bdedb92ba65e"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 464
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "97eff9733db71f7c5d396969582c572b"
     }
     Frame {
         msec: 480
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "97eff9733db71f7c5d396969582c572b"
     }
     Frame {
         msec: 496
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "97eff9733db71f7c5d396969582c572b"
     }
     Frame {
         msec: 512
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+        hash: "97eff9733db71f7c5d396969582c572b"
+    }
+    Frame {
+        msec: 528
+        hash: "87902d32dba1439e71ce5f57f514748e"
     }
     Key {
-        type: 6
+        type: 7
         key: 16777234
         modifiers: 0
         text: ""
@@ -141,36 +153,44 @@ VisualTest {
         count: 1
     }
     Frame {
-        msec: 528
-        hash: "56db24ad686d34e75a2d184e5b1da2a9"
-    }
-    Frame {
         msec: 544
-        hash: "c3487c7c7dcd392e7eacb74045dd4143"
+        hash: "cad95931a38718eb481a9175fdfec305"
     }
     Frame {
         msec: 560
-        hash: "70aedcda6c93875d18ee111d8a19549e"
+        hash: "1dc99e5c7e4d2fa6b624b6df250b78fc"
     }
     Frame {
         msec: 576
-        hash: "47ad557d366536ad457f6866241dba93"
+        hash: "5d5739beb039a83bebb2c41489166edf"
     }
     Frame {
         msec: 592
-        hash: "e715c2a82745829665226df78598b819"
+        hash: "6320c9a1c0013f5aa6180992b934ca59"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 608
-        hash: "2ff4bd5602c34c020162f0503d625049"
+        hash: "9d9837c1f3779e5dab0dfeb1d11fdea1"
     }
     Frame {
         msec: 624
-        hash: "a494b3b25a23daa858034ebccce0d1c7"
+        hash: "9d868112eaf70ce02ce93603278a565d"
     }
     Frame {
         msec: 640
-        hash: "59d2fb8e21802d256b11730b31919fb3"
+        hash: "d2bccb3184d3bb42b91017410a8655b6"
+    }
+    Frame {
+        msec: 656
+        hash: "68f8be3e16637fd39a35f0cebb62b74a"
     }
     Key {
         type: 7
@@ -181,67 +201,47 @@ VisualTest {
         count: 1
     }
     Frame {
-        msec: 656
-        hash: "5e09b95292d6d0afe76a5015b0ccebf1"
-    }
-    Frame {
         msec: 672
-        hash: "de3c911aec7e42557ece4bdcf02ce562"
+        hash: "04f5781b57ed9fee32d5ef80dc33f4ff"
     }
     Frame {
         msec: 688
-        hash: "680f51f63c4b11a247a668eb7bbd2b62"
+        hash: "06cc2e24a848d441074de5ddff1c739a"
+    }
+    Frame {
+        msec: 704
+        hash: "94526186deb7248ac9c747ede15b106d"
+    }
+    Frame {
+        msec: 720
+        hash: "1ac130517df314f4f44b9bde2d3dcc53"
     }
     Key {
         type: 6
-        key: 16777236
+        key: 16777234
         modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 704
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 720
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
         msec: 736
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
+        hash: "270ecf4900e94d60599ded230633aa02"
     }
     Frame {
         msec: 752
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
+        hash: "ef2093584cbce9182b99f297fcd2465d"
     }
     Frame {
         msec: 768
-        hash: "fd3fd655785c4e3c470f742451e3470f"
+        hash: "c445cf5f56213a712585934681d8af55"
     }
     Frame {
         msec: 784
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 800
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 816
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
+        hash: "9f0edb3871e015a549622e1b70d1b748"
     }
     Key {
         type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
         key: 16777234
         modifiers: 0
         text: ""
@@ -249,28 +249,44 @@ VisualTest {
         count: 1
     }
     Frame {
+        msec: 800
+        hash: "144c51d7aa47ea8cc8d79a97efa4b430"
+    }
+    Frame {
+        msec: 816
+        hash: "34f768a7c99dfb3c8f0e1fb1a08a37ac"
+    }
+    Frame {
         msec: 832
-        hash: "4f097223462c8f619188b0b0c2ecb080"
+        hash: "4f3970c4ad02b69f96c11610494e8a50"
     }
     Frame {
         msec: 848
-        hash: "243be452ff0798538defc6a14cb8a08b"
+        hash: "815a1cf66f0c9eb47e244753eebb83ba"
     }
     Frame {
         msec: 864
-        hash: "e5472ed9a8a43a64a0fea12540619940"
+        hash: "5db11f795c000b382fdc30726a711c65"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 880
-        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
+        hash: "67976ee172d0d55992c0e4734fbb7ccf"
     }
     Frame {
         msec: 896
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+        hash: "c764e4d5317acbbf5118a08565e5d5fd"
     }
     Frame {
         msec: 912
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+        hash: "a83f566d01b990e91f43bb63a58fb5b8"
     }
     Key {
         type: 7
@@ -282,11 +298,11 @@ VisualTest {
     }
     Frame {
         msec: 928
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
+        hash: "031282f352e01f23bc5f73bf8ce82c9a"
     }
     Frame {
         msec: 944
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
+        hash: "1f3dc1d3ad0304376eac5d60d3c226ee"
     }
     Frame {
         msec: 960
@@ -294,207 +310,247 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 992
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1008
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 1024
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 1040
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 1056
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Key {
-        type: 6
-        key: 16777248
-        modifiers: 33554432
+        type: 7
+        key: 16777234
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
+    Frame {
+        msec: 1056
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 1072
-        hash: "d7703c18b69f485bba3abd655100b50d"
+        hash: "a2ad07326fafcb3012cdb869f39af466"
     }
     Frame {
         msec: 1088
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
+        hash: "8622eb25a6da44926b5161bce213a483"
     }
     Frame {
         msec: 1104
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
+        hash: "ccbd4d1e4865ebd9b0fe923e6ab05e5c"
     }
     Frame {
         msec: 1120
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+        hash: "775cd79b012f79b773449a0ad8457149"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1136
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+        hash: "2a4ed061e512c5afd11072c4b707f707"
     }
     Frame {
         msec: 1152
-        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
+        hash: "c855df7b17811f25fd17e4fb108c02e1"
     }
     Frame {
         msec: 1168
-        hash: "e5472ed9a8a43a64a0fea12540619940"
+        hash: "46c37d8e67ece5cae4f766acf50f3ca3"
     }
     Frame {
         msec: 1184
-        hash: "243be452ff0798538defc6a14cb8a08b"
+        hash: "95a70f14ce01aae61190080ed3d55c77"
     }
     Frame {
         msec: 1200
-        hash: "4f097223462c8f619188b0b0c2ecb080"
+        hash: "87da182d1285f3613bb2e4673e701757"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1216
-        hash: "e7346d8f223684143a0940def878b874"
+        hash: "5b97f13f43e713a6fbe96bdca8969191"
     }
     Frame {
         msec: 1232
-        hash: "512b9746ae4482557b8cef9f99905954"
+        hash: "4d003182e7b7b0a05413b80f82a0fc41"
     }
     Frame {
         msec: 1248
-        hash: "4220dde85eb1c027366efd0798927e8d"
+        hash: "dba09e038291a8dfdc61911d6b4b9bdf"
     }
     Frame {
         msec: 1264
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
+        hash: "a2ae1e5cc6cd72fae70804e07df5a8a1"
     }
     Frame {
         msec: 1280
-        hash: "de09380dd57c58ae99fbdba169a19975"
+        hash: "f1c2a24b6f0ebcf98122e8db1cdcb66f"
     }
     Frame {
         msec: 1296
-        hash: "bfc1b03df244839a012e8302dc07764f"
+        hash: "142dade1639655132435ae260b7935a0"
     }
-    Frame {
-        msec: 1312
-        hash: "d5f220e5337837ec0d07eb118e2f948e"
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
-        msec: 1328
-        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
+        msec: 1312
+        hash: "e80c0175d947bceef4bf53b60bf7eac0"
     }
     Key {
         type: 6
-        key: 16777234
+        key: 16777248
         modifiers: 100663296
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 1328
+        hash: "de912cd8bd2fe762ec6b1ec819732507"
+    }
+    Frame {
         msec: 1344
-        hash: "c659fd76d632aac26d396809b57826dd"
+        hash: "d3fa9dfab37ee26572d25bcbe8c66b72"
     }
     Frame {
         msec: 1360
-        hash: "b5ba335eca37416970dcab53157d7ae6"
+        hash: "33bdb2817a2858ce430813d0774f0172"
     }
     Frame {
         msec: 1376
-        hash: "df498dac81260d8867221612ff3b7619"
+        hash: "4f10f0ffb6b1c87155eedd53af36c74f"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1392
-        hash: "578c3a682278f4ead0ca894f029dbfb7"
+        hash: "1b94be0de8412bd9380689895f290af7"
     }
     Frame {
         msec: 1408
-        hash: "5fe9b2365b091047df1b18bcaa5b1bb4"
+        hash: "48b3a5e2b04c86a75f4b6595eb2c1f55"
     }
     Frame {
         msec: 1424
-        hash: "c513b8df83f1d1cc3c05769c41741653"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
+        hash: "d092fabd3dd51c718486e1e7dadaa0dc"
     }
     Frame {
         msec: 1440
-        hash: "ee70a2002f52a3f4a9fa32db668db3d0"
+        hash: "243359437235563f1a60b8eaf63365b6"
     }
     Frame {
         msec: 1456
-        hash: "3f299da38c2f3f9057df987d5d339e1f"
+        hash: "a986c8ed8ad2d8b6aab2a001906ba2ad"
     }
     Frame {
         msec: 1472
-        hash: "55f6adbd00910e5f39977162cfe8dcc5"
+        hash: "da5e06dc481e9cb7d9159a84d0cc150a"
     }
     Frame {
         msec: 1488
-        hash: "151fb386855954ae5143046cab314ddf"
+        hash: "1d70a05fce3a05477e21d22b127ae96a"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1504
-        hash: "d9ec76b2c07077b5b6d6c3777d116164"
+        hash: "913448213a07f6c8427c8e310d2026de"
     }
     Frame {
         msec: 1520
-        hash: "ef3ba6c27d9b28de829360985505c185"
+        hash: "51bef5ae52977a935b66af4baf1da4e6"
     }
     Frame {
         msec: 1536
-        hash: "8eafd8f9aea08c172f40de3c4f2b3b59"
+        hash: "367bc25f868c23005d7fe903a9ea681b"
     }
     Frame {
         msec: 1552
-        hash: "2329d5b8182794bb8375f0de204c9b16"
+        hash: "3c25181652e788d128ed571ca4fea0b1"
     }
     Frame {
         msec: 1568
-        hash: "e6b25cf1a8c6858f6937e649b1315955"
+        hash: "0218f939ff2b8c0bc22a537ed0f053f0"
     }
     Frame {
         msec: 1584
-        hash: "3aeedff600509a138b0de31e10bbdd7b"
+        hash: "a3b765a823b2b3811273a1be90850533"
     }
     Frame {
         msec: 1600
-        hash: "0636dee0ddc551ce8ecf3a6c6300b020"
+        hash: "2a42a29774eb4f962d299f8c2c213d55"
     }
     Frame {
         msec: 1616
-        hash: "77f5b0dfdf0c631cf863be60bd09db9c"
+        hash: "1f0ad54d0fe8fc27cadbaaeaa37364e0"
     }
     Frame {
         msec: 1632
-        hash: "2e86762371ae933546e8b2154c78f74b"
+        hash: "04d6028d1b1a1178e5bf774db8eef2c6"
     }
     Frame {
         msec: 1648
-        hash: "1051ec29f94c31b257a5b1c922f8e93f"
+        hash: "c325e46e89e8df04e2c3d8bf111c5f09"
+    }
+    Frame {
+        msec: 1664
+        hash: "70e6223ce16a797e2c56e21ad74b188b"
+    }
+    Frame {
+        msec: 1680
+        hash: "0fb8762fd28564b84b83c17d749a3645"
     }
     Key {
         type: 6
@@ -505,76 +561,84 @@ VisualTest {
         count: 1
     }
     Frame {
-        msec: 1664
-        hash: "5c60da876c8cc9fa334905b5fc7c2a3d"
-    }
-    Frame {
-        msec: 1680
-        hash: "c0b0cddd62853ac3499b7ada200d206a"
-    }
-    Frame {
         msec: 1696
-        hash: "5bd588d64917f942e0f5ea1553acbf63"
+        hash: "ef5d19b59792ea8822e2391fe0d91dbd"
     }
     Frame {
         msec: 1712
-        hash: "bc5744ef5c81b7d5b365bf977f909be5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
+        hash: "70ad15030164be8afbb4ab22d1ae5f5f"
     }
     Frame {
         msec: 1728
-        hash: "892a1a8a5a9c198e5ae04cc19f0e1d0c"
+        hash: "a5dfb8bd4b681e0d8d2c082821a2a976"
     }
     Frame {
         msec: 1744
-        hash: "708799d2d834302c659958701e217b37"
+        hash: "864781fbb8673b1e603df015f2d88601"
     }
     Frame {
         msec: 1760
-        hash: "360d75bcc178bcfd4f93741d653fd821"
+        hash: "0bdb6a155cdd14f4dce9fde3c5116dde"
     }
     Frame {
         msec: 1776
-        hash: "1cfe03528b1cd84e69efc02b9677c748"
+        hash: "5421f521a9bdccc8478fcee97e0dbc99"
     }
     Frame {
         msec: 1792
-        hash: "6f45d7c37f1fb90138011b2af24aaf1e"
+        hash: "c5f29693dd017932767f37e2fb2f22f2"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1808
-        hash: "ba164375e7ac18cf2e1e613498158fbf"
+        hash: "b5e8abeaec33407e673f8021212528b1"
     }
     Frame {
         msec: 1824
-        hash: "14052b9da9e17a6f06fed05d4ed82b9c"
+        hash: "917c968e5ee8f0b25fdb175719d7dbfa"
     }
     Frame {
         msec: 1840
-        hash: "aac15ce22bfe38f44a46e4644913f144"
+        hash: "56495c63676b9f73004e76e38d60567e"
     }
     Frame {
         msec: 1856
-        hash: "c63aa02ba29ea18334b188185690948d"
+        hash: "86f1ccdd7ff408c5b141d79797eea1fa"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1872
-        hash: "11ed187ccd4c2221f166851c08b6b467"
+        hash: "9e9b32a9f71ab1aa4e87ddc323ccda03"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1888
-        hash: "3543bd4e538981d4bb2c2313c9663a53"
+        hash: "360aef37452ce8f045659c227285cb82"
     }
     Frame {
         msec: 1904
-        hash: "a05fa618b094bde2b54b730f513bcabe"
+        hash: "805949377c620fa4310aa4328eba1f23"
     }
     Frame {
         msec: 1920
@@ -582,527 +646,623 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "52fc4a32526a74f9a04d8795c7a47c6e"
+        hash: "00df8110a2008ba77b7e0bf2130e5319"
     }
     Frame {
         msec: 1952
-        hash: "17623e1b0ffca3b7736ce930f078dbe0"
+        hash: "835f6f723577071461e41da1fd2e990a"
     }
     Frame {
         msec: 1968
-        hash: "75226dac5691627851d83c7370d7603c"
-    }
-    Key {
-        type: 7
-        key: 16777249
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+        hash: "6876cafa4d6d3a7d387602eba4d26db1"
     }
     Frame {
         msec: 1984
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
     }
     Frame {
         msec: 2000
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
     }
     Frame {
         msec: 2016
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
     }
     Frame {
         msec: 2032
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2048
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
+        hash: "5570ae1e700cdf42ba516be69fbaadc0"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2064
-        hash: "75226dac5691627851d83c7370d7603c"
+        hash: "6876cafa4d6d3a7d387602eba4d26db1"
     }
     Frame {
         msec: 2080
-        hash: "17623e1b0ffca3b7736ce930f078dbe0"
+        hash: "835f6f723577071461e41da1fd2e990a"
     }
     Frame {
         msec: 2096
-        hash: "52fc4a32526a74f9a04d8795c7a47c6e"
+        hash: "00df8110a2008ba77b7e0bf2130e5319"
     }
     Frame {
         msec: 2112
-        hash: "89f2d3b4441faee557b8d5f44e1e1e18"
+        hash: "627206a252bd6fcbf57d9f1cde0506bb"
     }
     Frame {
         msec: 2128
-        hash: "a05fa618b094bde2b54b730f513bcabe"
+        hash: "805949377c620fa4310aa4328eba1f23"
     }
     Frame {
         msec: 2144
-        hash: "3543bd4e538981d4bb2c2313c9663a53"
+        hash: "360aef37452ce8f045659c227285cb82"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2160
-        hash: "11ed187ccd4c2221f166851c08b6b467"
+        hash: "0ac33070e0c736bc0fb5ab12fa444b5c"
     }
     Frame {
         msec: 2176
-        hash: "c63aa02ba29ea18334b188185690948d"
+        hash: "520a544fd92f17a14380803e253b396f"
     }
     Frame {
         msec: 2192
-        hash: "aac15ce22bfe38f44a46e4644913f144"
+        hash: "4a080a5154c517e6bcf24b3a1f1d7f2c"
     }
     Frame {
         msec: 2208
-        hash: "14052b9da9e17a6f06fed05d4ed82b9c"
+        hash: "e83642b0793f5a790efca65ccf20a720"
     }
     Frame {
         msec: 2224
-        hash: "ba164375e7ac18cf2e1e613498158fbf"
+        hash: "8210b9cbf19f519ee34f4bb1a6afce16"
     }
     Frame {
         msec: 2240
-        hash: "6f45d7c37f1fb90138011b2af24aaf1e"
-    }
-    Frame {
-        msec: 2256
-        hash: "1cfe03528b1cd84e69efc02b9677c748"
+        hash: "54d04e64af5c0a3d29f2dc8c0977ed3a"
     }
     Key {
         type: 7
-        key: 16777248
+        key: 16777236
         modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 2256
+        hash: "ae2a644f96bd7b2662ebcf4ebc33d930"
+    }
+    Frame {
         msec: 2272
-        hash: "360d75bcc178bcfd4f93741d653fd821"
+        hash: "718ac9cb5ef2992b06b34e957f987b7a"
     }
     Frame {
         msec: 2288
-        hash: "708799d2d834302c659958701e217b37"
+        hash: "a2e1dea5e5f37697c7ce1a9419b94f65"
     }
     Frame {
         msec: 2304
-        hash: "892a1a8a5a9c198e5ae04cc19f0e1d0c"
+        hash: "c0eb56c72311263d892ce65331547531"
     }
     Frame {
         msec: 2320
-        hash: "bc5744ef5c81b7d5b365bf977f909be5"
+        hash: "585ad3efb7330de889b8cf56a51a0899"
     }
     Frame {
         msec: 2336
-        hash: "5bd588d64917f942e0f5ea1553acbf63"
+        hash: "236e54ae31e5ee3d08a7bc9aeaef0d9b"
     }
     Frame {
         msec: 2352
-        hash: "c0b0cddd62853ac3499b7ada200d206a"
+        hash: "d6218c8bb4da9d62bdb5d0cf5d7f8e37"
     }
     Key {
         type: 6
-        key: 16777236
-        modifiers: 0
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 100663296
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 2368
-        hash: "5c60da876c8cc9fa334905b5fc7c2a3d"
+        hash: "1dddd18a4ef66df9d9b431b2860e24d1"
     }
     Frame {
         msec: 2384
-        hash: "136a103a893991b97ec09f373c68c5b9"
+        hash: "5b1b45e75f5a829b31c0b6eb0189da7c"
     }
     Frame {
         msec: 2400
-        hash: "b2181ce0165ee060e1a8b713027011a9"
+        hash: "062091bc7a5f3296c669614318b80fe7"
     }
     Frame {
         msec: 2416
-        hash: "e4836bbaf1834658e3ec4bf54a619b53"
+        hash: "836f37fe92a46233640e0bd2c0932fea"
     }
     Frame {
         msec: 2432
-        hash: "3072492f5f72427c8d45cf3c5d3ff919"
+        hash: "f14ec1544a380fc9993b39754c23c2f4"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2448
-        hash: "d897cba896239c77df4f7adb93ad5def"
+        hash: "2d549b5fea734e47682415df1717e6a6"
     }
     Frame {
         msec: 2464
-        hash: "ec9867a95de6d6f4c0f92af567d73771"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "824c5960260dd3ed7527709ebfb06d27"
     }
     Frame {
         msec: 2480
-        hash: "06b72e3180eb946622e4592de0fa6f91"
+        hash: "258f034fe1e71f25a92e667e05f53e82"
     }
     Frame {
         msec: 2496
-        hash: "33f109c026eaefed113cc12db5912a19"
+        hash: "c432e758e19c44d788cb38df6e4c6d69"
     }
     Frame {
         msec: 2512
-        hash: "ce72c4b4470394dc1c4efd4d9de9907f"
+        hash: "a1856592208f9a00385b13c44e1c4503"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2528
-        hash: "64ac1105ea10ae1f6401e8421731c606"
+        hash: "2b4d40a0555df0b86f52d13790185459"
     }
     Frame {
         msec: 2544
-        hash: "ef977bd74941d3506b8f3ee4b1f587ad"
+        hash: "b153143e6b16c47fa06663dc6b1034d6"
     }
     Frame {
         msec: 2560
-        hash: "9278de91e10788ae5a80399ff5372460"
+        hash: "ac52236c5d73aeae7c0834df1e6bd84e"
     }
     Frame {
         msec: 2576
-        hash: "ddaaf945a5f714b856ed5155f4e502b2"
+        hash: "136eeb348b0b96edc9aaf9fbea741973"
     }
     Frame {
         msec: 2592
-        hash: "f6bb6ba15d996345df04825da71c2cf3"
+        hash: "4f8a1dfa8906de2bcdfbf5c3b29fbf9b"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2608
-        hash: "466c78a5a5052b39b113adeda761da6c"
+        hash: "7dc9726df2d112b46f4d9dbe66d534c7"
     }
     Frame {
         msec: 2624
-        hash: "db650537d773e0d8a737a7bf5f408a5e"
+        hash: "f64086ca0e83fa8bb0fae28065260fdc"
     }
     Frame {
         msec: 2640
-        hash: "64be9f85869f19defada296343895a2b"
+        hash: "5237dd2b79d71bbfa0a0d3963a7f42b7"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2656
-        hash: "5ac6d9751bfadbc7aa064ca0b4d78b2b"
+        hash: "8dd435b577bb258979d33034885a8cd8"
     }
     Frame {
         msec: 2672
-        hash: "a088b351dcc6fc3a8d29256f3a2410c3"
+        hash: "2609c066b8f102b4189991bf7d01eaad"
     }
     Frame {
         msec: 2688
-        hash: "a16a77170a6c969042024fa0868da12d"
+        hash: "986fab22391264d04df9a55b18aee645"
     }
     Frame {
         msec: 2704
-        hash: "3a2509d0d3a314d2ed72f811f4af741e"
+        hash: "0256423680aa0843fe8ec84f5e68fc9b"
     }
     Frame {
         msec: 2720
-        hash: "484db4e1954048cad7eea48bfea08267"
-    }
-    Frame {
-        msec: 2736
-        hash: "ad0f84634c5f99ab62ab6d12ad8d8c6a"
-    }
-    Frame {
-        msec: 2752
-        hash: "d99b590307f6910963257a1c41c50120"
+        hash: "b822bdcad69aa868f48b2bbf2d62e297"
     }
     Key {
         type: 6
         key: 16777234
-        modifiers: 0
+        modifiers: 100663296
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 2736
+        hash: "14effed70ca60233be9b2f6d0a1b5e6c"
+    }
+    Frame {
+        msec: 2752
+        hash: "1abaf2c36a0fb9f04606c0e191d113cf"
+    }
+    Frame {
         msec: 2768
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
+        hash: "cffb8ca29b0369d183d6461bf9e63fdf"
     }
     Frame {
         msec: 2784
-        hash: "4220dde85eb1c027366efd0798927e8d"
+        hash: "9378bebddb09036bec98ff7018dcf7c1"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2800
-        hash: "512b9746ae4482557b8cef9f99905954"
+        hash: "0c3823994ee8f838c26040118ba62622"
     }
     Frame {
         msec: 2816
-        hash: "e7346d8f223684143a0940def878b874"
+        hash: "d374547f47adc81a18428c7a79cb9cf2"
     }
     Frame {
         msec: 2832
-        hash: "4f097223462c8f619188b0b0c2ecb080"
+        hash: "449c2996a2d0e74f2300adad619700bc"
     }
     Frame {
         msec: 2848
-        hash: "243be452ff0798538defc6a14cb8a08b"
+        hash: "14379a320b6fc36de5d2a6776f1dc963"
     }
     Frame {
         msec: 2864
-        hash: "e5472ed9a8a43a64a0fea12540619940"
+        hash: "cb010a99ffa3b6df26c6cd263a21cfcd"
     }
     Frame {
         msec: 2880
         image: "cursorDelegate.2.png"
     }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
     Frame {
         msec: 2896
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+        hash: "a445d23288d462009916e31f370a2068"
     }
     Frame {
         msec: 2912
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+        hash: "8b3f2811300830e837797056f262bec2"
     }
     Frame {
         msec: 2928
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
+        hash: "2303a27e72334cae84b4fe51a62974ba"
     }
     Frame {
         msec: 2944
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
+        hash: "f3a9f3e74d2d83e38aee78cab7209bd6"
     }
     Frame {
         msec: 2960
-        hash: "d7703c18b69f485bba3abd655100b50d"
+        hash: "ca4777127a535655f057af57cf3e8c7b"
     }
     Frame {
         msec: 2976
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "de2b65920fa9177a79019f33712c2275"
     }
     Frame {
         msec: 2992
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "de2b65920fa9177a79019f33712c2275"
     }
     Frame {
         msec: 3008
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "de2b65920fa9177a79019f33712c2275"
     }
     Frame {
         msec: 3024
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "de2b65920fa9177a79019f33712c2275"
     }
     Frame {
         msec: 3040
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "de2b65920fa9177a79019f33712c2275"
     }
     Frame {
         msec: 3056
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "de2b65920fa9177a79019f33712c2275"
     }
     Frame {
         msec: 3072
-        hash: "d7703c18b69f485bba3abd655100b50d"
+        hash: "ca4777127a535655f057af57cf3e8c7b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3088
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
+        hash: "83cfb141f6b77fa062443a442a5b2e9e"
     }
     Frame {
         msec: 3104
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
+        hash: "b3e262864238d03f988c9750cc74e48f"
     }
     Frame {
         msec: 3120
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+        hash: "6ed2086ae01be46f0684bbecc05484c4"
     }
     Frame {
         msec: 3136
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+        hash: "91f6dad8f05577af6e4f5f0aceb06b4b"
     }
     Frame {
         msec: 3152
-        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
+        hash: "1bfb0c299c3c0db0518eaa54137c22b0"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3168
-        hash: "e5472ed9a8a43a64a0fea12540619940"
+        hash: "37cc96ef4b760faadf76cc471f6ba49a"
     }
     Frame {
         msec: 3184
-        hash: "243be452ff0798538defc6a14cb8a08b"
+        hash: "67c848bf93e845eaf5eebc9b8e57482c"
     }
     Frame {
         msec: 3200
-        hash: "4f097223462c8f619188b0b0c2ecb080"
+        hash: "e3906ad9b1dfbd1170364c11ff4b286f"
     }
     Frame {
         msec: 3216
-        hash: "e7346d8f223684143a0940def878b874"
+        hash: "24dd59673c5659e3bf6f52723e1bcd07"
     }
     Frame {
         msec: 3232
-        hash: "512b9746ae4482557b8cef9f99905954"
+        hash: "4b694f05f147bcf901a16807d4e3ec7c"
     }
     Frame {
         msec: 3248
-        hash: "4220dde85eb1c027366efd0798927e8d"
+        hash: "9d9dbf34f6a67a49210caa249b8a1abb"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3264
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
+        hash: "5381cde4763aa45c97793124e42db6f5"
     }
     Frame {
         msec: 3280
-        hash: "de09380dd57c58ae99fbdba169a19975"
+        hash: "0f113c0263faa47428c4d16891ac4d4f"
     }
     Frame {
         msec: 3296
-        hash: "bfc1b03df244839a012e8302dc07764f"
+        hash: "cc1767ec13803959333cd35bfb2d9119"
     }
     Frame {
         msec: 3312
-        hash: "d5f220e5337837ec0d07eb118e2f948e"
+        hash: "ec1b4c71f9bd63ccf6d766b0b2f68b30"
     }
     Frame {
         msec: 3328
-        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
+        hash: "114ad78597ede2afc4dd8bafa1d4df21"
     }
     Frame {
         msec: 3344
-        hash: "680f51f63c4b11a247a668eb7bbd2b62"
+        hash: "d08dc22ddc707316483f09b796ea0380"
     }
     Frame {
         msec: 3360
-        hash: "de3c911aec7e42557ece4bdcf02ce562"
+        hash: "135b2b0f4e469b207e673d1e7086cd4f"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3376
-        hash: "5e09b95292d6d0afe76a5015b0ccebf1"
+        hash: "4267354fe0d24597bdb5ee1a6e9affbb"
     }
     Frame {
         msec: 3392
-        hash: "59d2fb8e21802d256b11730b31919fb3"
+        hash: "700bd56ecea646bbec2017007bbb5b84"
     }
     Frame {
         msec: 3408
-        hash: "a494b3b25a23daa858034ebccce0d1c7"
+        hash: "874a65c2069f4ba89301c129f884f217"
     }
     Frame {
         msec: 3424
-        hash: "2ff4bd5602c34c020162f0503d625049"
+        hash: "b5ec22f95abb43c83533f7dc606667f6"
     }
     Frame {
         msec: 3440
-        hash: "e715c2a82745829665226df78598b819"
+        hash: "445de6663e80d1fe1527ec5acf4ec1de"
     }
     Frame {
         msec: 3456
-        hash: "47ad557d366536ad457f6866241dba93"
+        hash: "87c129a5bf08536d3fca90375283e26b"
     }
     Frame {
         msec: 3472
-        hash: "70aedcda6c93875d18ee111d8a19549e"
+        hash: "a63e2438a9cd412c2b119cd42b11009f"
     }
     Frame {
         msec: 3488
-        hash: "c3487c7c7dcd392e7eacb74045dd4143"
+        hash: "61a3475bef5fd276b836cf3483526f57"
     }
     Frame {
         msec: 3504
-        hash: "56db24ad686d34e75a2d184e5b1da2a9"
+        hash: "097ab9a1a1fe9743f162f57b93599fe7"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3520
-        hash: "436349a8371597a74404428983cd894c"
+        hash: "ebae1fb540c6ff6b0bc9a951391e2e94"
     }
     Frame {
         msec: 3536
-        hash: "6e1bb59ec518614a0414092f4939d5ad"
+        hash: "ffc2da2e4c091eadaa9746b42b56d9e4"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3552
-        hash: "f0aa02772df579b921e0c68f794d2327"
+        hash: "f243d823fc9977e69a008010d8db8a01"
     }
     Frame {
         msec: 3568
-        hash: "09ea1462da333c2aeaaa01e9e4f8d54b"
+        hash: "592ac5bbf1c4b3a360be4d76c40a2be2"
     }
     Frame {
         msec: 3584
-        hash: "46d23d8472ce833591dcff548a644288"
+        hash: "bd5b206097f30dfce884a8c74856857d"
     }
     Frame {
         msec: 3600
-        hash: "a7566d5d35a89078bb378bf3f6c78e13"
+        hash: "f14ec1544a380fc9993b39754c23c2f4"
     }
     Frame {
         msec: 3616
-        hash: "4c5f7155b20e34a5627387cdc466e890"
+        hash: "836f37fe92a46233640e0bd2c0932fea"
     }
     Frame {
         msec: 3632
-        hash: "e9b98922327c412db0116a56283d3c86"
+        hash: "062091bc7a5f3296c669614318b80fe7"
     }
     Frame {
         msec: 3648
-        hash: "29ffede9c16c34ead5f291e69e388084"
+        hash: "5b1b45e75f5a829b31c0b6eb0189da7c"
     }
     Frame {
         msec: 3664
-        hash: "16958b8f0b1dbdc15333d99bd1349124"
+        hash: "1dddd18a4ef66df9d9b431b2860e24d1"
     }
     Frame {
         msec: 3680
-        hash: "3408f8d6e4d6ef34d4d5a0cb51090c4c"
+        hash: "d6218c8bb4da9d62bdb5d0cf5d7f8e37"
     }
     Frame {
         msec: 3696
-        hash: "b32b099b260789266d0a3c0edd61c04e"
+        hash: "236e54ae31e5ee3d08a7bc9aeaef0d9b"
     }
     Frame {
         msec: 3712
-        hash: "4dd3617b25e8b95cf2ec31db8b3bb80f"
+        hash: "585ad3efb7330de889b8cf56a51a0899"
     }
     Frame {
         msec: 3728
-        hash: "46b42a08c59909f067810d1984f7a04e"
+        hash: "c0eb56c72311263d892ce65331547531"
     }
     Frame {
         msec: 3744
-        hash: "ab8c505601c381e8a44fa7b6eea6579d"
+        hash: "a2e1dea5e5f37697c7ce1a9419b94f65"
     }
     Frame {
         msec: 3760
-        hash: "73f56e6e1d2cbf3f559d679eb2c15529"
+        hash: "718ac9cb5ef2992b06b34e957f987b7a"
     }
     Frame {
         msec: 3776
-        hash: "b230c56da330823d7d7f7e081c304acb"
+        hash: "ae2a644f96bd7b2662ebcf4ebc33d930"
     }
     Frame {
         msec: 3792
-        hash: "9f3cbd0023dbd78ba4951c26f71c7d5d"
+        hash: "54d04e64af5c0a3d29f2dc8c0977ed3a"
     }
     Frame {
         msec: 3808
-        hash: "9e9b11cf2695dd02c1ab175ff194f491"
+        hash: "8210b9cbf19f519ee34f4bb1a6afce16"
     }
     Frame {
         msec: 3824
-        hash: "8fa6f8eb5deb0ab95c3454e5812ada1d"
+        hash: "e83642b0793f5a790efca65ccf20a720"
     }
     Frame {
         msec: 3840
@@ -1110,271 +1270,239 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "0b6b24ae8df7c3aa9abb48edb6619d8a"
+        hash: "520a544fd92f17a14380803e253b396f"
     }
     Frame {
         msec: 3872
-        hash: "45805295dd2482fdf21ac8c9bfe47869"
+        hash: "0ac33070e0c736bc0fb5ab12fa444b5c"
     }
     Frame {
         msec: 3888
-        hash: "4893cd31a730d786f075edfd0afc0ad9"
+        hash: "5ee8c9dc7b238db131b3a078e46a8bbd"
     }
     Frame {
         msec: 3904
-        hash: "a3fbfe732568f5cf6e63809fd7e0c32e"
+        hash: "69720bcca91f99f229aebc74c5e74261"
     }
     Frame {
         msec: 3920
-        hash: "21d3327710d51f714e84b5a28df13e4f"
+        hash: "41d8f4031223f7c833d50208e231964a"
     }
     Frame {
         msec: 3936
-        hash: "ea065ab48f27f60505eab36debee3faa"
+        hash: "6fa8fd3252f367f3fafea4e3c7317a48"
     }
     Frame {
         msec: 3952
-        hash: "fe4c2e368d2110374b7ba9e30f330713"
+        hash: "8a1b63c42867f87a1cf4b47944b3860a"
     }
     Frame {
         msec: 3968
-        hash: "723281f6c1a3f03cf170e4de93fa4dbf"
+        hash: "8c6052eb4cf03d7742a73874d9f15285"
     }
     Frame {
         msec: 3984
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4000
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4016
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4032
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4048
-        hash: "e3948b393a3778066a90197b31c71e51"
+        hash: "7bae45481596788afde8866a3c97edd7"
     }
     Frame {
         msec: 4064
-        hash: "723281f6c1a3f03cf170e4de93fa4dbf"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "8c6052eb4cf03d7742a73874d9f15285"
     }
     Frame {
         msec: 4080
-        hash: "c779e46a89c3c9d0f8234a3192175b60"
+        hash: "8a1b63c42867f87a1cf4b47944b3860a"
     }
     Frame {
         msec: 4096
-        hash: "f223cfeba468e161943b24ac960196de"
+        hash: "6fa8fd3252f367f3fafea4e3c7317a48"
     }
     Frame {
         msec: 4112
-        hash: "dd2f21f063d055edc23c874380149067"
+        hash: "41d8f4031223f7c833d50208e231964a"
     }
     Frame {
         msec: 4128
-        hash: "af580b32b67117eb062bbcefe262c719"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "69720bcca91f99f229aebc74c5e74261"
     }
     Frame {
         msec: 4144
-        hash: "991f76d483e033024932790f85bb3c5d"
+        hash: "5ee8c9dc7b238db131b3a078e46a8bbd"
     }
     Frame {
         msec: 4160
-        hash: "3d8aa66ab9533d14a468f0869b457033"
+        hash: "0ac33070e0c736bc0fb5ab12fa444b5c"
     }
     Frame {
         msec: 4176
-        hash: "a5540bd5d088ab1201b5f22b32579d7c"
+        hash: "520a544fd92f17a14380803e253b396f"
     }
     Frame {
         msec: 4192
-        hash: "e0844f30578fef2cdcee4e4ff28ab7cf"
+        hash: "4a080a5154c517e6bcf24b3a1f1d7f2c"
     }
     Frame {
         msec: 4208
-        hash: "710e7022b65a9b3fd3a7372bf7f37c7a"
+        hash: "e83642b0793f5a790efca65ccf20a720"
     }
     Frame {
         msec: 4224
-        hash: "db553c856b11db7e6feb38b9d562a804"
+        hash: "8210b9cbf19f519ee34f4bb1a6afce16"
     }
     Frame {
         msec: 4240
-        hash: "6ba56c4ec6e903b0d82235c230ed78cb"
+        hash: "54d04e64af5c0a3d29f2dc8c0977ed3a"
     }
     Frame {
         msec: 4256
-        hash: "786de35a11c3fc1a228392195f509c28"
+        hash: "ae2a644f96bd7b2662ebcf4ebc33d930"
     }
     Frame {
         msec: 4272
-        hash: "cc6307597cea821b63391fc9bdbe038b"
+        hash: "718ac9cb5ef2992b06b34e957f987b7a"
     }
     Frame {
         msec: 4288
-        hash: "73d49e4d0bef103e11820d888bef0368"
+        hash: "a2e1dea5e5f37697c7ce1a9419b94f65"
     }
     Frame {
         msec: 4304
-        hash: "b2ed6ebf66252463326c2f220b3992fa"
+        hash: "c0eb56c72311263d892ce65331547531"
     }
     Frame {
         msec: 4320
-        hash: "129b5bc6d55621e2366fc0d80f105df2"
+        hash: "585ad3efb7330de889b8cf56a51a0899"
     }
     Frame {
         msec: 4336
-        hash: "ae8fe55fa9b497cd6eff18a517c301d8"
+        hash: "236e54ae31e5ee3d08a7bc9aeaef0d9b"
     }
     Frame {
         msec: 4352
-        hash: "535210bd848a20db2966b06278198e07"
+        hash: "d6218c8bb4da9d62bdb5d0cf5d7f8e37"
     }
     Frame {
         msec: 4368
-        hash: "1f4ea7783b5c60bfc424c73cea07a3a0"
+        hash: "1dddd18a4ef66df9d9b431b2860e24d1"
     }
     Frame {
         msec: 4384
-        hash: "5b61f2e9308c4de2864bb7cf133ce545"
+        hash: "5b1b45e75f5a829b31c0b6eb0189da7c"
     }
     Frame {
         msec: 4400
-        hash: "f641f87e9556ecfd24f0f0a772295e52"
+        hash: "062091bc7a5f3296c669614318b80fe7"
     }
     Frame {
         msec: 4416
-        hash: "36f28574c0b042647bc064d75afa9fbc"
+        hash: "836f37fe92a46233640e0bd2c0932fea"
     }
     Frame {
         msec: 4432
-        hash: "dba2ca165b8ab35113b8ec127b204ae9"
+        hash: "f14ec1544a380fc9993b39754c23c2f4"
     }
     Frame {
         msec: 4448
-        hash: "56324b95f63eabba718df588159f374d"
+        hash: "bd5b206097f30dfce884a8c74856857d"
     }
     Frame {
         msec: 4464
-        hash: "af65d67fef3c743e31acca03716040c4"
+        hash: "592ac5bbf1c4b3a360be4d76c40a2be2"
     }
     Frame {
         msec: 4480
-        hash: "105481b5becd127af4c28961d900148c"
+        hash: "f243d823fc9977e69a008010d8db8a01"
     }
     Frame {
         msec: 4496
-        hash: "4859d6bf9c456e52fd463e4c2f68d7f6"
+        hash: "ffc2da2e4c091eadaa9746b42b56d9e4"
     }
     Frame {
         msec: 4512
-        hash: "21c0958bd3c6a1056bb062165c9bc18b"
+        hash: "ebae1fb540c6ff6b0bc9a951391e2e94"
     }
     Frame {
         msec: 4528
-        hash: "287d258a79f45c26c92c69cce6b1a2f3"
+        hash: "097ab9a1a1fe9743f162f57b93599fe7"
     }
     Frame {
         msec: 4544
-        hash: "deabc5c7dd111adcb253eb833f118764"
+        hash: "61a3475bef5fd276b836cf3483526f57"
     }
     Frame {
         msec: 4560
-        hash: "4bad7380f6b645c551edbe06ff67cac9"
+        hash: "a63e2438a9cd412c2b119cd42b11009f"
     }
     Frame {
         msec: 4576
-        hash: "67fc71c16d0b9405c35590bafdc5ea40"
-    }
-    Key {
-        type: 6
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "87c129a5bf08536d3fca90375283e26b"
     }
     Frame {
         msec: 4592
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
+        hash: "445de6663e80d1fe1527ec5acf4ec1de"
     }
     Frame {
         msec: 4608
-        hash: "23edee3af8f1904558863d37c520555a"
+        hash: "b5ec22f95abb43c83533f7dc606667f6"
     }
     Frame {
         msec: 4624
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "874a65c2069f4ba89301c129f884f217"
     }
     Frame {
         msec: 4640
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
+        hash: "700bd56ecea646bbec2017007bbb5b84"
     }
     Frame {
         msec: 4656
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
+        hash: "4267354fe0d24597bdb5ee1a6e9affbb"
     }
     Frame {
         msec: 4672
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
+        hash: "135b2b0f4e469b207e673d1e7086cd4f"
     }
     Frame {
         msec: 4688
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
+        hash: "d08dc22ddc707316483f09b796ea0380"
     }
     Frame {
         msec: 4704
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
+        hash: "114ad78597ede2afc4dd8bafa1d4df21"
     }
     Frame {
         msec: 4720
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
+        hash: "ec1b4c71f9bd63ccf6d766b0b2f68b30"
     }
     Frame {
         msec: 4736
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
+        hash: "cc1767ec13803959333cd35bfb2d9119"
     }
     Frame {
         msec: 4752
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
+        hash: "0f113c0263faa47428c4d16891ac4d4f"
     }
     Frame {
         msec: 4768
-        hash: "fd3fd655785c4e3c470f742451e3470f"
+        hash: "5381cde4763aa45c97793124e42db6f5"
     }
     Frame {
         msec: 4784
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
+        hash: "99940d6744ac1245f82d62f08c371285"
     }
     Frame {
         msec: 4800
@@ -1382,1998 +1510,42 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
+        hash: "77bbed46c7eb023252cdd80d0a15f38a"
     }
     Frame {
         msec: 4832
-        hash: "36b65658073ac2687dbd88ec7a408a98"
+        hash: "36ee4da72825e96d5f670c94865a30d8"
     }
     Frame {
         msec: 4848
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
+        hash: "c64d56c1b7df0a5c63ab8ff08ae6daf9"
     }
     Frame {
         msec: 4864
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
+        hash: "942e038a3426fa318212a8f245141225"
     }
     Frame {
         msec: 4880
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
+        hash: "c033ebaee12dd8fe953e91160f986c3d"
     }
     Frame {
         msec: 4896
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
+        hash: "07e64024cf7eda082297f6f83dba8067"
     }
     Frame {
         msec: 4912
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
+        hash: "b33cd5bbb90d435dd7ea3ab67bef88ee"
     }
     Frame {
         msec: 4928
-        hash: "3cc8791e419986e1e913d4e153243fb2"
+        hash: "90712efd7c17b0ad33d2c2c02e9eaa97"
     }
     Frame {
         msec: 4944
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
+        hash: "7e2e55555ee2c7e172e61ddb6365355d"
     }
     Frame {
         msec: 4960
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 4976
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 4992
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5008
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5024
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5040
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5056
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5072
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 5088
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
-    }
-    Frame {
-        msec: 5104
-        hash: "3cc8791e419986e1e913d4e153243fb2"
-    }
-    Frame {
-        msec: 5120
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
-    }
-    Frame {
-        msec: 5136
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
-    }
-    Frame {
-        msec: 5152
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
-    }
-    Frame {
-        msec: 5168
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
-    }
-    Frame {
-        msec: 5184
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
-    }
-    Frame {
-        msec: 5200
-        hash: "36b65658073ac2687dbd88ec7a408a98"
-    }
-    Frame {
-        msec: 5216
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Frame {
-        msec: 5232
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 5248
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 5264
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 5280
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 5296
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 5312
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 5328
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 5344
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
-    }
-    Frame {
-        msec: 5360
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Frame {
-        msec: 5376
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 5392
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
-    }
-    Frame {
-        msec: 5408
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 5424
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-    Frame {
-        msec: 5440
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
-    }
-    Frame {
-        msec: 5456
-        hash: "0fa12b48c08266f50e77506e4136dd56"
-    }
-    Frame {
-        msec: 5472
-        hash: "679ee2b26a118ab53a84fa116de09edf"
-    }
-    Frame {
-        msec: 5488
-        hash: "b9dcdd88fba70636cbcae160edcc0136"
-    }
-    Frame {
-        msec: 5504
-        hash: "90af75eeef63ae67e9f6ff1a61d7cca3"
-    }
-    Frame {
-        msec: 5520
-        hash: "29d80ae32451c24b655c4d1fd01d3aa1"
-    }
-    Frame {
-        msec: 5536
-        hash: "c73fe137644cbc006d0b5274b72faa46"
-    }
-    Frame {
-        msec: 5552
-        hash: "8a4d76ae60f5d720a382cced2f6a2b5e"
-    }
-    Frame {
-        msec: 5568
-        hash: "a1efa0d424d568d338c6db9fc095c2fb"
-    }
-    Frame {
-        msec: 5584
-        hash: "205cafcabb29b78a6db3dcaf44a74ab6"
-    }
-    Frame {
-        msec: 5600
-        hash: "7507a3d2158d4cc68454c85922526871"
-    }
-    Frame {
-        msec: 5616
-        hash: "7135a6a7999e82cb81e39228805332ee"
-    }
-    Frame {
-        msec: 5632
-        hash: "ac2b714b5f32d2b911f31690d7082dc1"
-    }
-    Frame {
-        msec: 5648
-        hash: "5cb1ae6d86aafdf11284480c81b939dc"
-    }
-    Frame {
-        msec: 5664
-        hash: "ac705840cc94eb4af7a52d62649d0157"
-    }
-    Frame {
-        msec: 5680
-        hash: "8c2ebcd80e26ac7b9d25be486f54c4ce"
-    }
-    Frame {
-        msec: 5696
-        hash: "12b84aa02dbbab3592d3eb3cb6884b41"
-    }
-    Frame {
-        msec: 5712
-        hash: "675043ddde6ed65a3ec4ed093be1e760"
-    }
-    Frame {
-        msec: 5728
-        hash: "478126aeef5ddae9c0a77d08294cf3f2"
-    }
-    Frame {
-        msec: 5744
-        hash: "0b43af73d91a500ccdf27b4347b9bc47"
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "a6d8708d08bedf0cab5230d6f2936936"
-    }
-    Frame {
-        msec: 5792
-        hash: "02e0646024aeef6f01b7541b15267baa"
-    }
-    Frame {
-        msec: 5808
-        hash: "da6717c94b46ad7a647c445c06314b0d"
-    }
-    Frame {
-        msec: 5824
-        hash: "2ed12d49d72884160ebbf6b6d0e15a9d"
-    }
-    Frame {
-        msec: 5840
-        hash: "a1fbc3333b7f742a8336a6fcbad156c9"
-    }
-    Frame {
-        msec: 5856
-        hash: "25cac33299d58cdd7775e8b75410085e"
-    }
-    Frame {
-        msec: 5872
-        hash: "5d81833eb342f632945c0571e18cb1f9"
-    }
-    Frame {
-        msec: 5888
-        hash: "23f6f2a7d971494af43a0fb97dbf8fb5"
-    }
-    Frame {
-        msec: 5904
-        hash: "216b70d02a4685dc07258454bb4e7c85"
-    }
-    Frame {
-        msec: 5920
-        hash: "1e06742af58d6e63facdc599c46e11b1"
-    }
-    Frame {
-        msec: 5936
-        hash: "00f8ac72d3794ed8d66db987402ecde0"
-    }
-    Frame {
-        msec: 5952
-        hash: "42ab5f162acba94f563823f5be1e37d2"
-    }
-    Frame {
-        msec: 5968
-        hash: "3272b97fdc54eb9f3590e7bbe4ac457d"
-    }
-    Frame {
-        msec: 5984
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6000
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6016
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6032
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6048
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6064
-        hash: "3272b97fdc54eb9f3590e7bbe4ac457d"
-    }
-    Frame {
-        msec: 6080
-        hash: "42ab5f162acba94f563823f5be1e37d2"
-    }
-    Frame {
-        msec: 6096
-        hash: "00f8ac72d3794ed8d66db987402ecde0"
-    }
-    Frame {
-        msec: 6112
-        hash: "1e06742af58d6e63facdc599c46e11b1"
-    }
-    Frame {
-        msec: 6128
-        hash: "216b70d02a4685dc07258454bb4e7c85"
-    }
-    Frame {
-        msec: 6144
-        hash: "23f6f2a7d971494af43a0fb97dbf8fb5"
-    }
-    Frame {
-        msec: 6160
-        hash: "5d81833eb342f632945c0571e18cb1f9"
-    }
-    Frame {
-        msec: 6176
-        hash: "25cac33299d58cdd7775e8b75410085e"
-    }
-    Frame {
-        msec: 6192
-        hash: "a1fbc3333b7f742a8336a6fcbad156c9"
-    }
-    Frame {
-        msec: 6208
-        hash: "2ed12d49d72884160ebbf6b6d0e15a9d"
-    }
-    Frame {
-        msec: 6224
-        hash: "da6717c94b46ad7a647c445c06314b0d"
-    }
-    Frame {
-        msec: 6240
-        hash: "02e0646024aeef6f01b7541b15267baa"
-    }
-    Frame {
-        msec: 6256
-        hash: "a6d8708d08bedf0cab5230d6f2936936"
-    }
-    Frame {
-        msec: 6272
-        hash: "68d459091a85f24ece39a207e395039b"
-    }
-    Frame {
-        msec: 6288
-        hash: "0b43af73d91a500ccdf27b4347b9bc47"
-    }
-    Frame {
-        msec: 6304
-        hash: "478126aeef5ddae9c0a77d08294cf3f2"
-    }
-    Frame {
-        msec: 6320
-        hash: "675043ddde6ed65a3ec4ed093be1e760"
-    }
-    Frame {
-        msec: 6336
-        hash: "12b84aa02dbbab3592d3eb3cb6884b41"
-    }
-    Frame {
-        msec: 6352
-        hash: "8c2ebcd80e26ac7b9d25be486f54c4ce"
-    }
-    Frame {
-        msec: 6368
-        hash: "ac705840cc94eb4af7a52d62649d0157"
-    }
-    Frame {
-        msec: 6384
-        hash: "5cb1ae6d86aafdf11284480c81b939dc"
-    }
-    Frame {
-        msec: 6400
-        hash: "ac2b714b5f32d2b911f31690d7082dc1"
-    }
-    Frame {
-        msec: 6416
-        hash: "7135a6a7999e82cb81e39228805332ee"
-    }
-    Frame {
-        msec: 6432
-        hash: "7507a3d2158d4cc68454c85922526871"
-    }
-    Frame {
-        msec: 6448
-        hash: "205cafcabb29b78a6db3dcaf44a74ab6"
-    }
-    Frame {
-        msec: 6464
-        hash: "a1efa0d424d568d338c6db9fc095c2fb"
-    }
-    Frame {
-        msec: 6480
-        hash: "8a4d76ae60f5d720a382cced2f6a2b5e"
-    }
-    Frame {
-        msec: 6496
-        hash: "c73fe137644cbc006d0b5274b72faa46"
-    }
-    Frame {
-        msec: 6512
-        hash: "29d80ae32451c24b655c4d1fd01d3aa1"
-    }
-    Frame {
-        msec: 6528
-        hash: "90af75eeef63ae67e9f6ff1a61d7cca3"
-    }
-    Frame {
-        msec: 6544
-        hash: "b9dcdd88fba70636cbcae160edcc0136"
-    }
-    Frame {
-        msec: 6560
-        hash: "679ee2b26a118ab53a84fa116de09edf"
-    }
-    Frame {
-        msec: 6576
-        hash: "0fa12b48c08266f50e77506e4136dd56"
-    }
-    Frame {
-        msec: 6592
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
-    }
-    Frame {
-        msec: 6608
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-    Frame {
-        msec: 6624
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 6640
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
-    }
-    Frame {
-        msec: 6656
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 6672
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 271; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "680f51f63c4b11a247a668eb7bbd2b62"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 270; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 269; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "bfc1b03df244839a012e8302dc07764f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 268; y: 107
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6752
-        hash: "de09380dd57c58ae99fbdba169a19975"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6768
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6784
-        hash: "4220dde85eb1c027366efd0798927e8d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 265; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6800
-        hash: "512b9746ae4482557b8cef9f99905954"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 263; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 261; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6816
-        hash: "e7346d8f223684143a0940def878b874"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 259; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6832
-        hash: "7e7382302681cd29a2c6959a3a704660"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 256; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6848
-        hash: "ef8f7dfdd4e70100ecaecca4055d8f52"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 250; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 243; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6864
-        hash: "f5cacabb78b88c31af1a1b1e6f60069b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 235; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "b016ef2306b0a721df86b6916e7953e4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6896
-        hash: "a78e9b0b93569b77b0659c771336971a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6912
-        hash: "b957ab07bcbaeffca963d9148130a965"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6928
-        hash: "140bc4b078bac52d6903bdfdfc35a94c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 190; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6944
-        hash: "047c3a7403ae88cceb7fc875793d1ed8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 181; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 172; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6960
-        hash: "03d48446aaf94450a3a9a8f1e956493f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6976
-        hash: "6672e47aa6a975fbd82d2fe5bc99bbaf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6992
-        hash: "3bc73489d06e446d4c96117756a59227"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7008
-        hash: "aed995a61df4a1c189ef2962000d02de"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7024
-        hash: "aed995a61df4a1c189ef2962000d02de"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 123; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7040
-        hash: "74f0bbe92a23146fbdbd365edd5741c8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 118; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 114; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7056
-        hash: "74f0bbe92a23146fbdbd365edd5741c8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7072
-        hash: "6456208c6367687b8dc701791eccd7d4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 108; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7088
-        hash: "376b59dc6e00a51bc9f2d4cfa2718e57"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7104
-        hash: "fb7bc3401f70ce6eee131c9c7510e1fe"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7120
-        hash: "675a419f0cd8351d6b2a65daf7d2707a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7136
-        hash: "2f7951abac64e0f10d3b66d04966b6e9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7152
-        hash: "1f8daa78c58ae11ec105bd87681c1762"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7168
-        hash: "23ab196ed43219c26d94431698f6ac8d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7184
-        hash: "9581e2695f4818e063ec032cb5bb6b7f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7200
-        hash: "6752cd7c5383e0ccc9b08f79db6ac310"
-    }
-    Frame {
-        msec: 7216
-        hash: "51f5675e0fb1410c5a8ec03a86b42681"
-    }
-    Frame {
-        msec: 7232
-        hash: "c3c23213b2649b5ccabd8e420a251e00"
-    }
-    Frame {
-        msec: 7248
-        hash: "02ceab31171fe983a10e862b53aea16f"
-    }
-    Frame {
-        msec: 7264
-        hash: "8a774dda9a1bc16bd270724e570daf20"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7280
-        hash: "2b6b892cebfcce14a9db485fecf16703"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7296
-        hash: "8b8e6d3362f018cbd9b487f03cfb7a22"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "a8477a9429633384073618cc60841e6c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "59558c6665b73f02809259e039b4423a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "93540071bab8a970a929d209f628970e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "78cdb0a05583150ea33040d32d95de47"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "4b1ee34985d3f5b8dd4355678ad39af4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7392
-        hash: "5484e7699c388eabf0311de49706397f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 113; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 117; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7408
-        hash: "dee6c2380f398323002ebb43a38d27e8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 124; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "d66a27728e7fd3c616842613a034c5a0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7440
-        hash: "5f851161f99fcf5b67cbe008a3faf411"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "013e949285cfa9edb34ab14e26753230"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "5b50acdcbd49969bcce2cfab6f9af380"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7488
-        hash: "d4aeb24211007cfc01512d289ae7aa01"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7504
-        hash: "6f1b7e12bbf54586e9a48989145f3274"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 162; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "0e09c7468bc03770c6cc7f0fba1ee9c0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7536
-        hash: "0fc4522bbf1a2e72002eb0a3c7224e1f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 165; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7552
-        hash: "91727292aaa314bf263c618a577b7f74"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7568
-        hash: "a78fb2545d11c521a50a10fd2d1700a7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7584
-        hash: "c207a291b47628921125acd4b8ed5ea8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7600
-        hash: "9a8e3df504ba36e82c51d71a3f5ce268"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7616
-        hash: "8cd9da94db91da50ae457d41866a32ba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7632
-        hash: "9e52b6fdc3ce4ad9c5986e47ffa762fc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 193; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7648
-        hash: "a1aff55bffb76bd4e2ac9ee482a03978"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7664
-        hash: "ba52431b72683cfbf0cc795a2407630e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 211; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7696
-        hash: "eb5a19fbfbdceef233ed3c86c782817c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7712
-        hash: "7c8f3f2e96fa6a63867cb716061c8c77"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7728
-        hash: "96b0007f857aa19b41d184a7c7931f69"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "96201712b9ffbd9bfbebb5a5b7e23aba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7760
-        hash: "d75e13a7715d5c329a47fdb818dfdbe5"
-    }
-    Frame {
-        msec: 7776
-        hash: "c8fa0c2d9e6aa1f3a33e76a31534359d"
-    }
-    Frame {
-        msec: 7792
-        hash: "03b11cc517f84c58a681906fdda98347"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7808
-        hash: "74cdf8af5d56216ad422951a56661536"
-    }
-    Frame {
-        msec: 7824
-        hash: "fcac2575aad872eada547508f312f09c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7840
-        hash: "7d76aec1f29d2d6745585be8ef113be5"
-    }
-    Frame {
-        msec: 7856
-        hash: "2b4fe4f39433671a9bc440efa1c589a8"
-    }
-    Frame {
-        msec: 7872
-        hash: "55a166f920e76173e14121d848a11aa0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "f764df8ecd68161d3529800e922254f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "749caf21947e915b163f72e6fd190032"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "c350910df8ae4fea573a20d334fd3401"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7936
-        hash: "d177da450f1d380a6d2406e2393b9582"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7952
-        hash: "bf3da78d7cac19daf2d5150b77840b1e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7968
-        hash: "22e337b0b81b18045a205355da6981ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7984
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8000
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8016
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Frame {
-        msec: 8032
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Frame {
-        msec: 8048
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8064
-        hash: "22e337b0b81b18045a205355da6981ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8080
-        hash: "bf3da78d7cac19daf2d5150b77840b1e"
-    }
-    Frame {
-        msec: 8096
-        hash: "d177da450f1d380a6d2406e2393b9582"
-    }
-    Frame {
-        msec: 8112
-        hash: "c350910df8ae4fea573a20d334fd3401"
-    }
-    Frame {
-        msec: 8128
-        hash: "749caf21947e915b163f72e6fd190032"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8144
-        hash: "f764df8ecd68161d3529800e922254f4"
-    }
-    Frame {
-        msec: 8160
-        hash: "55a166f920e76173e14121d848a11aa0"
-    }
-    Frame {
-        msec: 8176
-        hash: "2b4fe4f39433671a9bc440efa1c589a8"
-    }
-    Frame {
-        msec: 8192
-        hash: "7d76aec1f29d2d6745585be8ef113be5"
-    }
-    Frame {
-        msec: 8208
-        hash: "fcac2575aad872eada547508f312f09c"
-    }
-    Frame {
-        msec: 8224
-        hash: "74cdf8af5d56216ad422951a56661536"
-    }
-    Frame {
-        msec: 8240
-        hash: "03b11cc517f84c58a681906fdda98347"
-    }
-    Frame {
-        msec: 8256
-        hash: "c8fa0c2d9e6aa1f3a33e76a31534359d"
-    }
-    Frame {
-        msec: 8272
-        hash: "d75e13a7715d5c329a47fdb818dfdbe5"
-    }
-    Frame {
-        msec: 8288
-        hash: "96201712b9ffbd9bfbebb5a5b7e23aba"
-    }
-    Frame {
-        msec: 8304
-        hash: "96b0007f857aa19b41d184a7c7931f69"
-    }
-    Frame {
-        msec: 8320
-        hash: "bff5b731de7c93fa0cdcefbf99beeb5e"
-    }
-    Frame {
-        msec: 8336
-        hash: "ce76704964873be1bc6a324d8a3381be"
-    }
-    Frame {
-        msec: 8352
-        hash: "a31b4f2a3defc968098029328de9352d"
-    }
-    Frame {
-        msec: 8368
-        hash: "295e3f40a511bd30e1c6599ead93619a"
-    }
-    Frame {
-        msec: 8384
-        hash: "3cd74da8b04de8ec7446490dea0e4e6c"
-    }
-    Frame {
-        msec: 8400
-        hash: "78a7db5a316609136d1b873d20d5dd3e"
-    }
-    Frame {
-        msec: 8416
-        hash: "0f176fb11bfe26f872ef7103011df9e6"
-    }
-    Frame {
-        msec: 8432
-        hash: "47866013e79bc77607e0c40bf8457bed"
-    }
-    Frame {
-        msec: 8448
-        hash: "5f35467db5c5e0baf5caff90b97e2d0c"
-    }
-    Frame {
-        msec: 8464
-        hash: "fefa89763cc1ad8323fdf37b1f5f63d3"
-    }
-    Frame {
-        msec: 8480
-        hash: "b9823f88fa51944075ce6dedd695f097"
-    }
-    Frame {
-        msec: 8496
-        hash: "72521de21fcc57d6ccf16350b0df8eee"
-    }
-    Frame {
-        msec: 8512
-        hash: "fcd591a2e56ba5efa95b315b7bd10532"
-    }
-    Frame {
-        msec: 8528
-        hash: "5d437d59995741030e0975829712f85d"
-    }
-    Frame {
-        msec: 8544
-        hash: "e7189d174b181985b6aef10b8642726f"
-    }
-    Frame {
-        msec: 8560
-        hash: "cefadbae14e573f6c83d07ffc3a5152e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 277; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8576
-        hash: "0fa12b48c08266f50e77506e4136dd56"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 277; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8592
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8608
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8624
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 8672
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Frame {
-        msec: 8688
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
-    }
-    Frame {
-        msec: 8704
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 8720
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 8736
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 8752
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 8768
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 8784
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 8800
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 8816
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Frame {
-        msec: 8832
-        hash: "36b65658073ac2687dbd88ec7a408a98"
-    }
-    Frame {
-        msec: 8848
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
-    }
-    Frame {
-        msec: 8864
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
-    }
-    Frame {
-        msec: 8880
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
-    }
-    Frame {
-        msec: 8896
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
-    }
-    Frame {
-        msec: 8912
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
-    }
-    Frame {
-        msec: 8928
-        hash: "3cc8791e419986e1e913d4e153243fb2"
-    }
-    Frame {
-        msec: 8944
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
-    }
-    Frame {
-        msec: 8960
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 8976
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 8992
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9008
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9024
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9040
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9056
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9072
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 9088
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
-    }
-    Frame {
-        msec: 9104
-        hash: "3cc8791e419986e1e913d4e153243fb2"
-    }
-    Frame {
-        msec: 9120
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
-    }
-    Frame {
-        msec: 9136
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
-    }
-    Frame {
-        msec: 9152
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
-    }
-    Frame {
-        msec: 9168
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
-    }
-    Frame {
-        msec: 9184
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
-    }
-    Frame {
-        msec: 9200
-        hash: "36b65658073ac2687dbd88ec7a408a98"
-    }
-    Frame {
-        msec: 9216
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Frame {
-        msec: 9232
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 9248
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 9264
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 9280
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 9296
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 9312
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 9328
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 9344
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
-    }
-    Frame {
-        msec: 9360
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Frame {
-        msec: 9376
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 9392
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
-    }
-    Frame {
-        msec: 9408
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 9424
-        hash: "23edee3af8f1904558863d37c520555a"
+        hash: "87ca0584879b25336a1023ac3252fc9a"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.0.png
deleted file mode 100644
index 2b45a06..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.1.png
deleted file mode 100644
index 1f5bae0..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.2.png
deleted file mode 100644
index cb2b5a4..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.3.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.4.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.0.png
deleted file mode 100644
index 87c2e07..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
index 17e13fd..cf29f7c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
@@ -4,6 +4,7 @@ Item{
     width:600;
     height:300;
     Column{
+        //Because they have auto width, these three should look the same
         TextInput{ 
             text: "Jackdaws love my big sphinx of quartz"; 
             horizontalAlignment: TextInput.AlignLeft;
-- 
cgit v0.12


From b4a697c6c9f7dd879c5b0a8499af8bb472025b71 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 28 Oct 2010 19:12:25 +1000
Subject: Clean up package views visual test

Shorten duration and remove the element of flicking (not under test).

Task-number: QTBUG-14792
---
 .../Package_Views/data/packageviews.0.png          |  Bin 714 -> 797 bytes
 .../Package_Views/data/packageviews.1.png          |  Bin 798 -> 794 bytes
 .../Package_Views/data/packageviews.10.png         |  Bin 773 -> 0 bytes
 .../Package_Views/data/packageviews.11.png         |  Bin 773 -> 0 bytes
 .../Package_Views/data/packageviews.12.png         |  Bin 754 -> 0 bytes
 .../Package_Views/data/packageviews.13.png         |  Bin 742 -> 0 bytes
 .../Package_Views/data/packageviews.14.png         |  Bin 733 -> 0 bytes
 .../Package_Views/data/packageviews.15.png         |  Bin 712 -> 0 bytes
 .../Package_Views/data/packageviews.16.png         |  Bin 730 -> 0 bytes
 .../Package_Views/data/packageviews.17.png         |  Bin 730 -> 0 bytes
 .../Package_Views/data/packageviews.18.png         |  Bin 730 -> 0 bytes
 .../Package_Views/data/packageviews.19.png         |  Bin 744 -> 0 bytes
 .../Package_Views/data/packageviews.2.png          |  Bin 757 -> 817 bytes
 .../Package_Views/data/packageviews.20.png         |  Bin 754 -> 0 bytes
 .../Package_Views/data/packageviews.21.png         |  Bin 721 -> 0 bytes
 .../Package_Views/data/packageviews.22.png         |  Bin 732 -> 0 bytes
 .../Package_Views/data/packageviews.3.png          |  Bin 813 -> 796 bytes
 .../Package_Views/data/packageviews.4.png          |  Bin 756 -> 805 bytes
 .../Package_Views/data/packageviews.5.png          |  Bin 752 -> 774 bytes
 .../Package_Views/data/packageviews.6.png          |  Bin 752 -> 0 bytes
 .../Package_Views/data/packageviews.7.png          |  Bin 774 -> 0 bytes
 .../Package_Views/data/packageviews.8.png          |  Bin 774 -> 0 bytes
 .../Package_Views/data/packageviews.9.png          |  Bin 754 -> 0 bytes
 .../qmlvisual/Package_Views/data/packageviews.qml  | 3182 ++++----------------
 .../qmlvisual/Package_Views/packageviews.qml       |   16 +-
 25 files changed, 603 insertions(+), 2595 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.10.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.11.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.12.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.13.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.14.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.15.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.16.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.17.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.18.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.19.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.20.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.21.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.22.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.9.png

diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.0.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.0.png
index c59b816..f94e879 100644
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.0.png and b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.1.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.1.png
index d4dbc70..521e818 100644
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.1.png and b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.10.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.10.png
deleted file mode 100644
index ed9d345..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.10.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.11.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.11.png
deleted file mode 100644
index ed9d345..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.11.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.12.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.12.png
deleted file mode 100644
index 45ee400..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.12.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.13.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.13.png
deleted file mode 100644
index c73e158..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.13.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.14.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.14.png
deleted file mode 100644
index e2fff6d..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.14.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.15.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.15.png
deleted file mode 100644
index d7a13df..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.15.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.16.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.16.png
deleted file mode 100644
index beb3094..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.16.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.17.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.17.png
deleted file mode 100644
index beb3094..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.17.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.18.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.18.png
deleted file mode 100644
index beb3094..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.18.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.19.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.19.png
deleted file mode 100644
index d3a2650..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.19.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.2.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.2.png
index a09dd28..645abf8 100644
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.2.png and b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.20.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.20.png
deleted file mode 100644
index 600462a..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.20.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.21.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.21.png
deleted file mode 100644
index 6defca0..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.21.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.22.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.22.png
deleted file mode 100644
index 91967e1..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.22.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.3.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.3.png
index d099a79..517331a 100644
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.3.png and b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.4.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.4.png
index 385efc8..806063f 100644
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.4.png and b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.5.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.5.png
index 25a7c3c..8dfcf7b 100644
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.5.png and b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.6.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.6.png
deleted file mode 100644
index 25a7c3c..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.7.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.7.png
deleted file mode 100644
index 7a24f51..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.8.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.8.png
deleted file mode 100644
index 7a24f51..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.9.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.9.png
deleted file mode 100644
index 45ee400..0000000
Binary files a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.qml b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.qml
index 08cb46b..1804382 100644
--- a/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.qml
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.qml
@@ -6,239 +6,255 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 32
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 48
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 64
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 80
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 96
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 112
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 128
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 144
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 160
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 176
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 192
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 208
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 224
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 240
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 256
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 272
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 288
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 304
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 320
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 336
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 352
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 368
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 384
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 400
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 416
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 432
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 448
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 464
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 480
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 496
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 512
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 528
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 544
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 560
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 576
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 592
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 608
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 624
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 640
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 656
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 672
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 688
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 704
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 720
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 736
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 752
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 768
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 784
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 26; y: 79
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 800
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 816
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 832
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 848
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 26; y: 79
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 864
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 880
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "ae75402b2fa678a20c32d743e2b297a0"
     }
     Frame {
         msec: 896
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "76a9721ada8280925ff32e7207c01944"
     }
     Frame {
         msec: 912
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "87fb13adce4e2af05a7ad2f8cd18bad9"
     }
     Frame {
         msec: 928
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "cd7be3a5b9bae876998770dc52dbcd86"
     }
     Frame {
         msec: 944
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "3ba0b907dad0bfa9b20337d41661030b"
     }
     Frame {
         msec: 960
@@ -246,319 +262,271 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "856cbf02e052f9b08a02608128af818d"
     }
     Frame {
         msec: 992
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "5af677254d12dc96b82cde90c5a65140"
     }
     Frame {
         msec: 1008
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "72cb4e75acb87de293a3cb1872eb946b"
     }
     Frame {
         msec: 1024
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "9b057090349c0c544036a33a60710920"
     }
     Frame {
         msec: 1040
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "ae19cf81092e75979b6471c0b05541cf"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 48; y: 165
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1056
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "0f42c19fee319bc8c27a89e9692c5cd9"
     }
     Frame {
         msec: 1072
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "865e19e35f361b08e6e844aa88d149eb"
     }
     Frame {
         msec: 1088
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "d5fcf7bd78da8918a3512a76189c7202"
     }
     Frame {
         msec: 1104
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "d2a6b42c2a3f7ca9eb35acc47f1faaf6"
     }
     Frame {
         msec: 1120
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "1388e856eb04fc24091c94406f4b5118"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 48; y: 165
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1136
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "1388e856eb04fc24091c94406f4b5118"
     }
     Frame {
         msec: 1152
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "d529b6dcf510392488b370f6cfb87b3c"
     }
     Frame {
         msec: 1168
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "a50b1f2869c95f97a194a95581fa7be9"
     }
     Frame {
         msec: 1184
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "4bbee959f95548c3e76fb60ad363c184"
     }
     Frame {
         msec: 1200
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "5ec0185f4479377579822f92eb7f375a"
     }
     Frame {
         msec: 1216
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "263d09b9447d942c6c048139164d4427"
     }
     Frame {
         msec: 1232
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "291cc81fc3f82bca46db4e4403f39d49"
     }
     Frame {
         msec: 1248
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "c212f98ededa9ce7fc0fec697116a8e2"
     }
     Frame {
         msec: 1264
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "4309ef22d0c36d28a462ab2d4bf2cabd"
     }
     Frame {
         msec: 1280
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "f899f861c569416708c6754d821239e9"
     }
     Frame {
         msec: 1296
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "ed5ec237020ff06f258ce6e1b31e5eb8"
     }
     Frame {
         msec: 1312
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "98f3fe1c211d4f7bdc47b4a485226f14"
     }
     Frame {
         msec: 1328
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "40e376d37a85d225c46579b8f7c27159"
     }
     Frame {
         msec: 1344
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "cc8a178bf0cfc285185d17b37722bf41"
     }
     Frame {
         msec: 1360
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "b612439873d0eeb015d31cccd8e5a436"
     }
     Frame {
         msec: 1376
-        hash: "a327426c93b523526f993b5271ab4501"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 57; y: 164
-        modifiers: 0
-        sendToViewport: true
+        hash: "48c436165872098b474d0c691df11473"
     }
     Frame {
         msec: 1392
-        hash: "a327426c93b523526f993b5271ab4501"
+        hash: "48c436165872098b474d0c691df11473"
     }
     Mouse {
-        type: 5
-        button: 0
+        type: 2
+        button: 1
         buttons: 1
-        x: 57; y: 162
+        x: 44; y: 50
         modifiers: 0
         sendToViewport: true
     }
     Frame {
         msec: 1408
-        hash: "a327426c93b523526f993b5271ab4501"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 57; y: 159
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 57; y: 156
-        modifiers: 0
-        sendToViewport: true
+        hash: "48c436165872098b474d0c691df11473"
     }
     Frame {
         msec: 1424
-        hash: "a327426c93b523526f993b5271ab4501"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 56; y: 152
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 56; y: 147
-        modifiers: 0
-        sendToViewport: true
+        hash: "48c436165872098b474d0c691df11473"
     }
     Frame {
         msec: 1440
-        hash: "87b7cacfb2d9e8ad916e331b2cf1f13e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 55; y: 141
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 54; y: 133
-        modifiers: 0
-        sendToViewport: true
+        hash: "48c436165872098b474d0c691df11473"
     }
     Frame {
         msec: 1456
-        hash: "34290c1435c1a96d08152479d2d1334e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 54; y: 126
-        modifiers: 0
-        sendToViewport: true
+        hash: "48c436165872098b474d0c691df11473"
     }
     Mouse {
         type: 3
         button: 1
         buttons: 0
-        x: 54; y: 126
+        x: 44; y: 50
         modifiers: 0
         sendToViewport: true
     }
     Frame {
         msec: 1472
-        hash: "ef5fb09ec8fb4b0d97c864618d6f6231"
+        hash: "48c436165872098b474d0c691df11473"
     }
     Frame {
         msec: 1488
-        hash: "d5b4c2e1d4b0bc877c99739a67b4a4fb"
+        hash: "33cb50c11326c0589c7cc43ba6193e03"
     }
     Frame {
         msec: 1504
-        hash: "a3623a3f253590d51ee03b6849e88edb"
+        hash: "3f7e7534ccd7105762c78afab5ab997d"
     }
     Frame {
         msec: 1520
-        hash: "4c1115f1041629b7c37cf4ae001fd7d3"
+        hash: "53b23d3eb2aaa1b21e4abaf9c0bfc7f2"
     }
     Frame {
         msec: 1536
-        hash: "845bb3d1f52bee4a469fb12d6875a323"
+        hash: "609b37b12154291a28961210e81049fb"
     }
     Frame {
         msec: 1552
-        hash: "eb08b5a671149005dbafc8507bb78b18"
+        hash: "33cc6e17d087c251381ecf1b4cb9887c"
     }
     Frame {
         msec: 1568
-        hash: "16744a5b90b29954faf0710010ac6369"
+        hash: "dcb3e716035ca3f43895fda99c27e0d8"
     }
     Frame {
         msec: 1584
-        hash: "322bbe367fbbf0bf07f9153da652a5fc"
+        hash: "56bb753199873fac4ed9f30682bd1a3c"
     }
     Frame {
         msec: 1600
-        hash: "257769f7c3e24bb2d0cd674dfbe42913"
+        hash: "8b744c5cbf6154b73bd6c4fe6b087f0a"
     }
     Frame {
         msec: 1616
-        hash: "8e299cbcaeae4d53d0fc05e03d36e0d9"
+        hash: "f2d5996d7fd5391a4d96493e9ef6a637"
     }
     Frame {
         msec: 1632
-        hash: "f3fb7f30336045abb4557247aab5bde1"
+        hash: "4407a05b64c68d43b29124df1f0d8f44"
     }
     Frame {
         msec: 1648
-        hash: "468400fb4e9bfa454ea00f19aa5d77b5"
+        hash: "b71e43a8f7aa7a58cea80629b782a972"
     }
     Frame {
         msec: 1664
-        hash: "429cc820ada7a515b2cb71f133320949"
+        hash: "cca961a04dfdf9da8282219f2022fd2e"
     }
     Frame {
         msec: 1680
-        hash: "721ec7594d8f815e5648eb8d570d1179"
+        hash: "f3349a7ae7d7a97a6665476244d46dd6"
     }
     Frame {
         msec: 1696
-        hash: "9bc4105a0456c36738c435323e690db1"
+        hash: "78fc6123a10c027faa08dc2ff8318acc"
     }
     Frame {
         msec: 1712
-        hash: "e54a84718dbdc45dd814089051772585"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1728
-        hash: "2c969450ede6b6ea7e0e68ee54d02aaa"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1744
-        hash: "c2015dd1d4bd223a7fe1df03027af2f3"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1760
-        hash: "74108fedfb0967adea181893834bcd9b"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1776
-        hash: "b04a22f1cfde6ede57117992cd97dc1c"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1792
-        hash: "271d71cb03dd38100812466a973b79ef"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1808
-        hash: "130709eecd8eca395085020a83e7553a"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1824
-        hash: "a0e5e187ed5245fd766803d266195e6b"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1840
-        hash: "d29c145f3ba39a7c2c6ac54b27f9cea1"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1856
-        hash: "6e41349b4adb6e37a2f9f2482c0aa5b1"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1872
-        hash: "c02c52d3c87c6befb65f3bf392981cd5"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1888
-        hash: "ec48d113c8468bd1e1b465e248eecaee"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1904
-        hash: "a2c9b917d1f0cff0e088d3b624d9eeb8"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1920
@@ -566,255 +534,287 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "c4d4f8a351316b4a33f42f5fb030f304"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1952
-        hash: "1baee6be1da687309d84a992e430c915"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1968
-        hash: "4245f02817f7a674c34c581cbd9e1181"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 1984
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 181; y: 76
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 2000
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 2016
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
     }
     Frame {
         msec: 2032
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "6056cb02b921b56c63696d7fe9fe90fa"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 181; y: 76
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 2048
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "9f94c38547da1855e4bd3ae498aed705"
     }
     Frame {
         msec: 2064
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "783f73da3736a2c554c8d749ce0522c0"
     }
     Frame {
         msec: 2080
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "9a0e1c2bed75874381e4b1ce275d0f68"
     }
     Frame {
         msec: 2096
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "e2ce85192977e6422c89190b3cea4518"
     }
     Frame {
         msec: 2112
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "ba9c80ff0ed723bca702cb6b4c6dfb76"
     }
     Frame {
         msec: 2128
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "7e194db1b86bc7346248d2acf34af286"
     }
     Frame {
         msec: 2144
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "cdd013bb8ee5880b16449efc99dd3ae5"
     }
     Frame {
         msec: 2160
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "3ef7d0fb43c2a1c1398f1152573974e0"
     }
     Frame {
         msec: 2176
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "176d1a86257cc85315dac4ecfe33f543"
     }
     Frame {
         msec: 2192
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "6def1267e573217a19e7b8e2cf6d7b6c"
     }
     Frame {
         msec: 2208
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "f679db34d99e24cda2e41c2afeaf551e"
     }
     Frame {
         msec: 2224
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "54a27193c5e59cd7220b65d8fbbd9061"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 112; y: 79
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 2240
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "171db3d0bf50062a0d7edd8e4c174024"
     }
     Frame {
         msec: 2256
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "9a7d293dc455e1ef0d18f44c3db7eed7"
     }
     Frame {
         msec: 2272
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "83bef2586d5abeb0ac8765d62135d308"
     }
     Frame {
         msec: 2288
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "56fed2e01cc8a6b9ccbf15731d4e533b"
+    }
+    Frame {
+        msec: 2304
+        hash: "10174f2574c51155b8ee77ae545ac76d"
     }
     Mouse {
-        type: 2
+        type: 3
         button: 1
-        buttons: 1
-        x: 70; y: 89
+        buttons: 0
+        x: 112; y: 79
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 2304
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
-    }
-    Frame {
         msec: 2320
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "107928ffebd936080325a1f4e39a0ac0"
     }
     Frame {
         msec: 2336
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "107928ffebd936080325a1f4e39a0ac0"
     }
     Frame {
         msec: 2352
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 70; y: 89
-        modifiers: 0
-        sendToViewport: true
+        hash: "d46e040f85295e66d8b22185be553d3e"
     }
     Frame {
         msec: 2368
-        hash: "2fa6bb20f29467713c94886c6fffe5e3"
+        hash: "3368a34c316486a779d62d143588b425"
     }
     Frame {
         msec: 2384
-        hash: "3b9a75225adddb01e92286463e15bf98"
+        hash: "8f4cd4223c05e1b06a688c5eabc2a854"
     }
     Frame {
         msec: 2400
-        hash: "32f99602756898b4ec607d4124b5120f"
+        hash: "b576bf54b4bae38e8af6d922b3c73463"
     }
     Frame {
         msec: 2416
-        hash: "60007f14752d2d87ba6e335ad596f1ad"
+        hash: "a3a238f5bf182ec6afc398569fd51ac7"
     }
     Frame {
         msec: 2432
-        hash: "dcfad2407f53f83964fa7be762a137bd"
+        hash: "a31329ba054a6fe144c030cffb5bd401"
     }
     Frame {
         msec: 2448
-        hash: "fcc1a30a33bec046868734014132eb70"
+        hash: "0a4b96a93e62359b6003daa703af1a5f"
     }
     Frame {
         msec: 2464
-        hash: "f60592829a2765b3cd3a0cecb9c45426"
+        hash: "a16f126d874d957b879f45d36e88df34"
     }
     Frame {
         msec: 2480
-        hash: "a0e26063acd1b53b5eeeb31187f38336"
+        hash: "89735c5b14f075b8f65533d16b3f714a"
     }
     Frame {
         msec: 2496
-        hash: "d7f3e776038bd479db292bcba3a65fc7"
+        hash: "5d67dac0c4d2cf60e4cb717f4e4bc25f"
     }
     Frame {
         msec: 2512
-        hash: "4af31954235ab8a7cf8462eaa64d7dda"
+        hash: "dbfcc86e621a140466dd2a9215087e81"
     }
     Frame {
         msec: 2528
-        hash: "aff3f287c07f546e0d3e9e68731d82fe"
+        hash: "9f8dfa788048466dc07463e83d0377ff"
     }
     Frame {
         msec: 2544
-        hash: "75fbc4e26466e8a1f66503addfcbb525"
+        hash: "021e1edec94a1909790a4acdbbc71fd8"
     }
     Frame {
         msec: 2560
-        hash: "cb4c91f725ec46dd066475efc2bc2d65"
+        hash: "f16be9ff4aba07708d469d6cfb80f1c2"
     }
     Frame {
         msec: 2576
-        hash: "106434203ccc2fd8246c56520095a473"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2592
-        hash: "129ced0e7fc406e81b1ced72397adc5c"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2608
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2624
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2640
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2656
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2672
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2688
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2704
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2720
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2736
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 116; y: 165
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 2752
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2768
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2784
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
     }
     Frame {
         msec: 2800
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1ab35df24a27349264ec282eb1f53018"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 116; y: 165
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 2816
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "a0aa5583886efc9bb0571bbb02fdb051"
     }
     Frame {
         msec: 2832
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "a0aa5583886efc9bb0571bbb02fdb051"
     }
     Frame {
         msec: 2848
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "edec25fdce2e05c0456434be4b8fad84"
     }
     Frame {
         msec: 2864
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "0c2061fc908c98980404b9e08acdc2f2"
     }
     Frame {
         msec: 2880
@@ -822,311 +822,295 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "80eba5bc28e88ab12e195555f76bef1c"
     }
     Frame {
         msec: 2912
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "3a80012f6ca448fc30db70e9bcb23ddc"
     }
     Frame {
         msec: 2928
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "22a68838e9f6039e782facce7cfe0c9b"
     }
     Frame {
         msec: 2944
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "243fcc73e46db96ab6a91748adeff1a9"
     }
     Frame {
         msec: 2960
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "433bf03a821da5641909785b4c22cb55"
     }
     Frame {
         msec: 2976
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "66be8aa73b1e7173d899df3c0b9072a6"
     }
     Frame {
         msec: 2992
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "d7e563c1a1db45865794351daea5eb08"
     }
     Frame {
         msec: 3008
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "cc4345c2d4d0d7748c352a22f63030cb"
     }
     Frame {
         msec: 3024
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "382172adf3a339cac16a3e185ef4bb05"
     }
     Frame {
         msec: 3040
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "6019a3eac1825acdeac24d39c898d506"
     }
     Frame {
         msec: 3056
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "ac4b9427592a6fe7585625de8d1bff96"
     }
     Frame {
         msec: 3072
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3088
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3104
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3120
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3136
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3152
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3168
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 80; y: 189
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3184
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3200
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3216
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3232
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 80; y: 189
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3248
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7cf95f1bc67a90c0df788787589a75a9"
     }
     Frame {
         msec: 3264
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "a623e09cddb4304db658e30aef433dd8"
     }
     Frame {
         msec: 3280
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "4dce74fbb6649138a6ea6c288818fda5"
     }
     Frame {
         msec: 3296
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "2356d6d1f8481cf60542126f197ee0b1"
     }
     Frame {
         msec: 3312
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "7553601e70a7ccc3c60306fcf4999bed"
     }
     Frame {
         msec: 3328
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "bc86afd210d18dc68b433d70705b6603"
     }
     Frame {
         msec: 3344
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "8538d87120dd14958f92b81ceff304a3"
     }
     Frame {
         msec: 3360
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "2a8d299ff16589069d493bbab2ceda53"
     }
     Frame {
         msec: 3376
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "9f92b838c36e46d61a78f9013f04b580"
     }
     Frame {
         msec: 3392
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 49; y: 162
-        modifiers: 0
-        sendToViewport: true
+        hash: "7e6710b5491d5b9ad9a84691eadaa66c"
     }
     Frame {
         msec: 3408
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
+        hash: "1b165e39ff01747d5e9ad0d8769c8ee9"
     }
     Frame {
         msec: 3424
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 49; y: 161
-        modifiers: 0
-        sendToViewport: true
+        hash: "f78ad1eeb030eb58f8140da041acf4cd"
     }
     Frame {
         msec: 3440
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 49; y: 159
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 48; y: 157
-        modifiers: 0
-        sendToViewport: true
+        hash: "f009dcb6b085ae38a45206f35ab37754"
     }
     Frame {
         msec: 3456
-        hash: "49903693b112d5f35c4e877bef6bbdb0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 48; y: 153
-        modifiers: 0
-        sendToViewport: true
+        hash: "371dd67bf5a16ea085a256dd2e2583f9"
     }
     Mouse {
-        type: 5
-        button: 0
+        type: 2
+        button: 1
         buttons: 1
-        x: 48; y: 149
+        x: 75; y: 164
         modifiers: 0
         sendToViewport: true
     }
     Frame {
         msec: 3472
-        hash: "1c84452b0ce90ae6f136f5bcce408220"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 50; y: 144
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 50; y: 138
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 50; y: 138
-        modifiers: 0
-        sendToViewport: true
+        hash: "9a0606cd6930b3f992f0533f3f6a0f7a"
     }
     Frame {
         msec: 3488
-        hash: "4c77d402b995297dadb5e671f071605f"
+        hash: "1d538ccb1874fe2ddb410d48ca668d74"
     }
     Frame {
         msec: 3504
-        hash: "babd28626a81bd48b39b56f8da69c360"
+        hash: "71e08cb1eced66950e5893306b3043e7"
     }
     Frame {
         msec: 3520
-        hash: "71654a76f9b94fafaf3767003598fb96"
+        hash: "71e08cb1eced66950e5893306b3043e7"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 75; y: 164
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3536
-        hash: "87ad69a660e072e71f940db93be3a949"
+        hash: "71e08cb1eced66950e5893306b3043e7"
     }
     Frame {
         msec: 3552
-        hash: "147f7f3f1913bc5ac5889c1a4daa8026"
+        hash: "2da0d9bb50d97ca78ee56f3c528a7db5"
     }
     Frame {
         msec: 3568
-        hash: "9c26b3ad7a5dacd56028afa7bf4deef6"
+        hash: "7f5105df4d41a6739ce13d69451d6059"
     }
     Frame {
         msec: 3584
-        hash: "18611ff90e5af36c9b6396c3df4cd646"
+        hash: "8d171773d643ca5bfb095208efe841a9"
     }
     Frame {
         msec: 3600
-        hash: "84701fd73ed8e1951bd4c806b70654ac"
+        hash: "8aa93bddb58d0533b03d2b7fc6efb839"
     }
     Frame {
         msec: 3616
-        hash: "42b40f1683beb23f4fe5ade066c0626f"
+        hash: "26e2bcff7c3de9995e29fd8a06db4139"
     }
     Frame {
         msec: 3632
-        hash: "8c6aeefaa6f36cdffcf7bdb1597c6fbe"
+        hash: "94fe4626d8f978649bf200bf79885ec0"
     }
     Frame {
         msec: 3648
-        hash: "731cea2e0d8fb8aac6ae919b23b89b87"
+        hash: "61e92064d9da2db6ea0adfdffaad81f6"
     }
     Frame {
         msec: 3664
-        hash: "d4dc70a8e09e7ec03e7c1f5123b7abef"
+        hash: "54d5845c08eb5cc9263c84146fd9fcd2"
     }
     Frame {
         msec: 3680
-        hash: "5246e2f52aa104e8030eef105a5b5a7c"
+        hash: "d10a128980a46713093899696110d81e"
     }
     Frame {
         msec: 3696
-        hash: "a9c3d0034c09ba81d19d57ff550d7b4f"
+        hash: "ff6301533f4fb29194f20a4520824030"
     }
     Frame {
         msec: 3712
-        hash: "e9092b1be19273f1f29912cd493dd238"
+        hash: "598b6e7c6c6c0de77b4793d1f68beea6"
     }
     Frame {
         msec: 3728
-        hash: "c2b19c7b818c94e932558676a026f049"
+        hash: "e3d123e179a6930e1bc1864095621607"
     }
     Frame {
         msec: 3744
-        hash: "6627c4d6daab8e6500dbd0d921bc1ebd"
+        hash: "b1bb4c350969f579630680803e622662"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 72; y: 147
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3760
-        hash: "45c584ca18e8bfd6aa495c16a977662a"
+        hash: "3dd276bb96dd3a5ef96095e0b8251c05"
     }
     Frame {
         msec: 3776
-        hash: "de79039a8bb623f7d48afe1549ae23e0"
+        hash: "144402c1397313fb5d13b4972bb3a450"
     }
     Frame {
         msec: 3792
-        hash: "076d29278466038071095093266553f5"
+        hash: "144402c1397313fb5d13b4972bb3a450"
     }
     Frame {
         msec: 3808
-        hash: "73ed162dc5f9983bf22446f63691f7e4"
+        hash: "144402c1397313fb5d13b4972bb3a450"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 72; y: 146
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 72; y: 146
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3824
-        hash: "4cc3648635884a69191f0cfe2051f621"
+        hash: "144402c1397313fb5d13b4972bb3a450"
     }
     Frame {
         msec: 3840
@@ -1134,241 +1118,197 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "126b19793c902cf8848824fe4a38fe0c"
     }
     Frame {
         msec: 3872
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "1f7a173f70f04adcc28481cfa40ad82e"
     }
     Frame {
         msec: 3888
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "5189e3a7f4c93d6095d526ee4583adea"
     }
     Frame {
         msec: 3904
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "03ef5fa51d7455e58c34c52be2b2625b"
     }
     Frame {
         msec: 3920
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "6589088e4efab3426d5b3c08f885fcc4"
     }
     Frame {
         msec: 3936
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "35593c99aa3f7040efe6420ce90426f7"
     }
     Frame {
         msec: 3952
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "61e13ba4ed7251e607ae299841b55fea"
     }
     Frame {
         msec: 3968
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "7bc5f663e54b6ac10b7aa8787de0483a"
     }
     Frame {
         msec: 3984
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "141e2fa188fabeef8587770b2d18538c"
     }
     Frame {
         msec: 4000
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "5f59ea38bb55096d6ca50ffb9e9706ec"
     }
     Frame {
         msec: 4016
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "9ff31c7768afa3eba211e862bbfddda1"
     }
     Frame {
         msec: 4032
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "f8731aa264c5e534f13f4fa89fc320a1"
     }
     Frame {
         msec: 4048
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "87bc86979d05432f8ad16ca1f0537fa0"
     }
     Frame {
         msec: 4064
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "749f93235f677af13d162aacfde3840a"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 69; y: 113
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 4080
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3af211e45026670fef0e5b391bad3455"
     }
     Frame {
         msec: 4096
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3af211e45026670fef0e5b391bad3455"
     }
     Frame {
         msec: 4112
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3af211e45026670fef0e5b391bad3455"
     }
     Frame {
         msec: 4128
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3af211e45026670fef0e5b391bad3455"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 112
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 4144
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3af211e45026670fef0e5b391bad3455"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 70; y: 112
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 4160
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3af211e45026670fef0e5b391bad3455"
     }
     Frame {
         msec: 4176
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "de1b3a0b2ffb02f4969ce532bb7d6ad9"
     }
     Frame {
         msec: 4192
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "1e0bb98146f64975c4d5b8f8ef65319c"
     }
     Frame {
         msec: 4208
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3540ee1fc403cc923100888e3bd15168"
     }
     Frame {
         msec: 4224
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "8f8178db769ed067e40c06ec2a8f3e3f"
     }
     Frame {
         msec: 4240
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "18310df1f8f735313e71739c58b2e42d"
     }
     Frame {
         msec: 4256
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "0797a57080ad60f00a185ad7eecbc40f"
     }
     Frame {
         msec: 4272
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "80cffb466c0e8947f775a4b7a677cd20"
     }
     Frame {
         msec: 4288
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "3f80ed589a282924e1dd4fbbd99078b0"
     }
     Frame {
         msec: 4304
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "7368b2da0c37d4b212fff8222244d413"
     }
     Frame {
         msec: 4320
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "7fb81e12fc1cb3e6f08a4bd0af23f40d"
     }
     Frame {
         msec: 4336
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
-    }
-    Frame {
-        msec: 4352
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
-    }
-    Frame {
-        msec: 4368
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        hash: "6677c15df6babf38036d4083c63c2684"
     }
     Mouse {
         type: 2
         button: 1
         buttons: 1
-        x: 151; y: 170
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 168
+        x: 67; y: 89
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 4384
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
+        msec: 4352
+        hash: "106d90e84bd5b88c5df048ffc717e843"
     }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 166
-        modifiers: 0
-        sendToViewport: true
+    Frame {
+        msec: 4368
+        hash: "ce69c7e561e9f0c1fd5f3dba2ffda3e8"
     }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 163
-        modifiers: 0
-        sendToViewport: true
+    Frame {
+        msec: 4384
+        hash: "63b2956e9bad879bef156a318162656c"
     }
     Frame {
         msec: 4400
-        hash: "d06fbe4c7dd8bd392172aa5b29c6ceee"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 160
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 154
-        modifiers: 0
-        sendToViewport: true
+        hash: "e9f02812bdd7071d1ceb71e0c2195f3a"
     }
     Frame {
         msec: 4416
-        hash: "ac75b9adaecd10206c4daa07c93adb27"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 148
-        modifiers: 0
-        sendToViewport: true
+        hash: "e9f02812bdd7071d1ceb71e0c2195f3a"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 156; y: 141
+        x: 67; y: 88
         modifiers: 0
         sendToViewport: true
     }
     Frame {
         msec: 4432
-        hash: "539ec244fd42801cfcf97adc12f48786"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4448
-        hash: "7d7bc6f7d2ff1da352ddab0d679906e7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 162; y: 101
-        modifiers: 0
-        sendToViewport: true
+        hash: "e9f02812bdd7071d1ceb71e0c2195f3a"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 166; y: 83
+        x: 67; y: 87
         modifiers: 0
         sendToViewport: true
     }
@@ -1376,93 +1316,113 @@ VisualTest {
         type: 3
         button: 1
         buttons: 0
-        x: 166; y: 83
+        x: 67; y: 87
         modifiers: 0
         sendToViewport: true
     }
     Frame {
+        msec: 4448
+        hash: "e9f02812bdd7071d1ceb71e0c2195f3a"
+    }
+    Frame {
         msec: 4464
-        hash: "4b508eb55971a03c6dc8a50d0244fa21"
+        hash: "e33d1f7d03ec85600cb61896c66fd9ca"
     }
     Frame {
         msec: 4480
-        hash: "2ceb497ca10e6448a019b62a225a72e4"
+        hash: "72347f42ad925abdc614244b2ec01e7a"
     }
     Frame {
         msec: 4496
-        hash: "1fd9b89ebcb8e707c9b1b13ba64061b4"
+        hash: "5fbd0e2ce5e2fe609dfc5e5643bfbc8a"
     }
     Frame {
         msec: 4512
-        hash: "24a3a48843860f643e55ca6dfec84f98"
+        hash: "4bcb24b700ac09da7387738bce36def5"
     }
     Frame {
         msec: 4528
-        hash: "48ea9398101f44a707c44ee1c5102d0c"
+        hash: "7c489062131ef9fcdfe765cd0361361b"
     }
     Frame {
         msec: 4544
-        hash: "d8f2cebcdb542e75bbbaa4391ca881b8"
+        hash: "c4c1834200b2b7b3eb38b20d7147b8ee"
     }
     Frame {
         msec: 4560
-        hash: "df35827ac111c67588922aadd45b3c85"
+        hash: "49994b7471ec620ff52e5ba516bbb5d4"
     }
     Frame {
         msec: 4576
-        hash: "c1e612548c8d5c2f844e94ad4c0f1db4"
+        hash: "e1cf4e92e291b8509a8eb8a84f70dcad"
     }
     Frame {
         msec: 4592
-        hash: "c298bccebeb1f4528c935e5fd256479c"
+        hash: "9c7d6d53aa6089712389b1c2b4207d15"
     }
     Frame {
         msec: 4608
-        hash: "4c01d969eba4eca32b8a3b7f6f9c99f0"
+        hash: "408731f3b11d888fff1ef9340ad1c568"
     }
     Frame {
         msec: 4624
-        hash: "66c783ae698cb91195088591a9bd67c1"
+        hash: "d34f3092b84dea762adf7cf86c80abc6"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 67; y: 67
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 4640
-        hash: "5419f6889162fb0db6b8c9e521f57f4f"
+        hash: "d0202d3154721c968301e4fdb759b5d2"
     }
     Frame {
         msec: 4656
-        hash: "d153dbf30acf36145d7fcb8e37dd5c6d"
+        hash: "89601cb9b82465f6ae96156b7e259e70"
     }
     Frame {
         msec: 4672
-        hash: "ffbf186683dc979ef29cdd5ff50296fc"
+        hash: "7c775a699646acf45f26dea5bd5db783"
     }
     Frame {
         msec: 4688
-        hash: "ddcedde95d1ebcafe5b73924ecfa047a"
+        hash: "be285c318afaeb932a2fd50fdc357813"
     }
     Frame {
         msec: 4704
-        hash: "d94b9e92f2c1a5e0ea2f8dd21a905517"
+        hash: "5ddee39853aa1b8d1be287c86e5b763c"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 67; y: 67
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 4720
-        hash: "92c27d497128ccdcbfe8224a0f55a302"
+        hash: "5ddee39853aa1b8d1be287c86e5b763c"
     }
     Frame {
         msec: 4736
-        hash: "7146017581b03e6551822653e54d5001"
+        hash: "8386713865c12636ce442cd31eacb8ba"
     }
     Frame {
         msec: 4752
-        hash: "a39567e01b8963d3b71f5f525d1582d4"
+        hash: "9f4df793b3b6320e238b451e35183b9f"
     }
     Frame {
         msec: 4768
-        hash: "842654ef5a24143e41412b2450b6024c"
+        hash: "3cd41f6ab2303dd666269cca13dc95e3"
     }
     Frame {
         msec: 4784
-        hash: "c2a002588b4b3f89806d6d283c39ea54"
+        hash: "504a3dd9018c3c725a92a9d6e84743fc"
     }
     Frame {
         msec: 4800
@@ -1470,239 +1430,287 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "2bea5cc22ea4989f8f07fbf62d09880b"
+        hash: "63158568d5fdf558d0192809da0cf5fe"
     }
     Frame {
         msec: 4832
-        hash: "b8326b959b75b05c050ff91f0c34fa55"
+        hash: "c4f7130484f17854eace9e541c92207a"
     }
     Frame {
         msec: 4848
-        hash: "d5f2e63bd18b2067221ec80764c7500d"
+        hash: "406a0371c7366fadefcbae7d428d1879"
     }
     Frame {
         msec: 4864
-        hash: "157f93ebaa95664965539237ba121265"
+        hash: "f9d6128c4fe60d95a001642cb80ccb99"
     }
     Frame {
         msec: 4880
-        hash: "5bda47a6295e500f24b6ba7bf04e9282"
+        hash: "2fb6886550a0eb7927274cd9cfc46819"
     }
     Frame {
         msec: 4896
-        hash: "0134d543cfbf085eb4b5ea4a0f5ae32f"
+        hash: "dd4ac1eb6d18bc267b2f39d6d291a8bd"
     }
     Frame {
         msec: 4912
-        hash: "d27f2ad3bd9817c23caf01ba64335776"
+        hash: "7f1e1114fe65b7a54364a04ad7697d4c"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 66; y: 45
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 4928
-        hash: "4dd96288601f4481a24b75afedd34599"
+        hash: "60a4882d0384489465fec8660933c29c"
     }
     Frame {
         msec: 4944
-        hash: "d5ebfbd190fe2482af54004ad9434818"
+        hash: "2330e35830fb707c9d9074b54cd5c7f6"
     }
     Frame {
         msec: 4960
-        hash: "6a8c5c64228b3be521407e00c2b6a1de"
+        hash: "02c275412e380c7f2878bc1f01e2850a"
     }
     Frame {
         msec: 4976
-        hash: "645219e7aa6761bef1b11ac8f17f1f42"
+        hash: "02c275412e380c7f2878bc1f01e2850a"
     }
     Frame {
         msec: 4992
-        hash: "54fff3170fa43d99eca2c87381ecaf1e"
+        hash: "02c275412e380c7f2878bc1f01e2850a"
     }
     Frame {
         msec: 5008
-        hash: "54fff3170fa43d99eca2c87381ecaf1e"
+        hash: "02c275412e380c7f2878bc1f01e2850a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 43
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 66; y: 43
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 5024
-        hash: "00c3c11b9b266504b8cdbdf4edcc3a98"
+        hash: "02c275412e380c7f2878bc1f01e2850a"
     }
     Frame {
         msec: 5040
-        hash: "00c3c11b9b266504b8cdbdf4edcc3a98"
+        hash: "a304ddc3e20220f7ed06aeae22589927"
     }
     Frame {
         msec: 5056
-        hash: "00c3c11b9b266504b8cdbdf4edcc3a98"
+        hash: "8ef8e13dff7e5f12c1d0a7a0e438a24f"
     }
     Frame {
         msec: 5072
-        hash: "54fff3170fa43d99eca2c87381ecaf1e"
+        hash: "ef7ef97e56c6b7579e11022861dd3eb5"
     }
     Frame {
         msec: 5088
-        hash: "6a8c5c64228b3be521407e00c2b6a1de"
+        hash: "133613dd5ac9242ce0b6926986cd384a"
     }
     Frame {
         msec: 5104
-        hash: "f91cea801322d1bc6ac1b9eeae96c704"
+        hash: "eb5125c97b9deca07e999ec7e78986b3"
     }
     Frame {
         msec: 5120
-        hash: "d27f2ad3bd9817c23caf01ba64335776"
+        hash: "123c37efefdc1c8e6b27b7eff3bffff8"
     }
     Frame {
         msec: 5136
-        hash: "5bda47a6295e500f24b6ba7bf04e9282"
+        hash: "8443d904bcb63ab2d14cbb5a2e2a8fe7"
     }
     Frame {
         msec: 5152
-        hash: "d5f2e63bd18b2067221ec80764c7500d"
+        hash: "379826db02c7e5cb8ab9007a419e34f9"
     }
     Frame {
         msec: 5168
-        hash: "b10145c10c2bc9d01ec6a49a399f728e"
+        hash: "672d45cdc24a2e1286956e3ce00cab56"
     }
     Frame {
         msec: 5184
-        hash: "f0b759a49bf21b0c9b311a1dd02d7807"
+        hash: "cbaa7c4f52b2ebc1176a3bbe3e029487"
     }
     Frame {
         msec: 5200
-        hash: "1c5546c3ddbde95d10921c8c32fd2d67"
+        hash: "35d70b84722fecd08b1c03f01c5a9895"
     }
     Frame {
         msec: 5216
-        hash: "c2a002588b4b3f89806d6d283c39ea54"
+        hash: "65c1d1c4fc845229853836afd2e7a3c4"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 68; y: 19
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 5232
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "a238ffd4f6de5ca91bcf0e629407ad11"
     }
     Frame {
         msec: 5248
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "42322853eef74b9b849d81d7aa2ea4af"
     }
     Frame {
         msec: 5264
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "25fb0c4c04d9dcda865a8b254970330c"
     }
     Frame {
         msec: 5280
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "565891a25190705df8b424e1e5e73ddd"
     }
     Frame {
         msec: 5296
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "565891a25190705df8b424e1e5e73ddd"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 68; y: 19
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 5312
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "565891a25190705df8b424e1e5e73ddd"
     }
     Frame {
         msec: 5328
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "39e05f846071d4ec9a1413922a928995"
     }
     Frame {
         msec: 5344
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "7040400386930b34d989df4cdf36d125"
     }
     Frame {
         msec: 5360
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "2d3c081a1bbb94952becfd486d455de5"
     }
     Frame {
         msec: 5376
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "7a0719f22b0b74e4139ada77ca8d38d6"
     }
     Frame {
         msec: 5392
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "40d070285de7865fa8f415ff06be69d3"
     }
     Frame {
         msec: 5408
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "875ba6c617a4b5d157c747ead185247c"
     }
     Frame {
         msec: 5424
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "2d0ef679259f503d42cc2267b8d95a4e"
     }
     Frame {
         msec: 5440
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "b2aeceddd4d36e600f617578d64a4c32"
     }
     Frame {
         msec: 5456
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "a065ec04aff7a7c164ed8c152130589f"
     }
     Frame {
         msec: 5472
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "a09d94403ce40a8afb12e390aea3d848"
     }
     Frame {
         msec: 5488
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "34b116228527a669dadbfc75f309d045"
     }
     Frame {
         msec: 5504
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "5bee91cba46537ddaefe87f4e118d3d5"
     }
     Frame {
         msec: 5520
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "d0d8bd32268f3e3a62a08514f0d53799"
     }
     Frame {
         msec: 5536
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "b90c3915255d3f98700f8af0181fa6ee"
     }
     Frame {
         msec: 5552
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5568
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5584
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5600
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5616
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5632
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5648
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5664
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5680
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5696
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5712
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5728
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5744
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5760
@@ -1710,2042 +1718,50 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5792
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5808
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5824
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5840
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5856
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5872
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5888
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5904
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5920
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5936
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
     Frame {
         msec: 5952
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 5968
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 5984
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6000
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6016
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6032
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6048
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6064
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6080
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6096
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6112
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6128
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6144
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6160
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6176
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6192
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6208
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6224
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6240
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6256
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6272
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6288
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6304
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6320
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6336
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6352
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6368
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6384
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6400
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6416
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6432
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6448
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6464
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6480
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6496
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6512
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 177; y: 168
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6528
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6544
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6560
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6576
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 178; y: 168
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6592
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 178; y: 168
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6608
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6624
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6640
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6656
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6672
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6688
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6704
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6720
-        image: "packageviews.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6752
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6768
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6784
-        hash: "1eb5d2140ff3c71d55a6e5338dd2853e"
-    }
-    Frame {
-        msec: 6800
-        hash: "f6de07972a225d276b4b5c424dc490ef"
-    }
-    Frame {
-        msec: 6816
-        hash: "d8c400ca33d590a9b4d9b179b5634d94"
-    }
-    Frame {
-        msec: 6832
-        hash: "21ec87c22e52b3daa78bd94b771a105c"
-    }
-    Frame {
-        msec: 6848
-        hash: "19a3667f4051e40e944ec58abb16846a"
-    }
-    Frame {
-        msec: 6864
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6880
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6896
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6912
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6928
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6944
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6960
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6976
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 6992
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7008
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7024
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7040
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7056
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7072
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7088
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7104
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7120
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7136
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7152
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7168
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7184
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7200
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7216
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7232
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7248
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7264
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7280
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7296
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7312
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7328
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7344
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7360
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7376
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7392
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7408
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 157; y: 37
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Frame {
-        msec: 7440
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 39
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "08369a783b1f1f4e64da7dab40df6ef3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 44
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 51
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "e8ad02d4c2429a03ff0686888e4038bf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 59
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 67
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7488
-        hash: "43dcc86aeff3b8b74ae1b87e735e8963"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7504
-        hash: "96e10ce9e5a80caf626213e5c696d84d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "3b34cb99481d5418136840afd649807d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 134
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 164; y: 134
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7536
-        hash: "494cf05eb3d8eb221d0e3c233c936e87"
-    }
-    Frame {
-        msec: 7552
-        hash: "e0d5f3aab9fbfac1de47f42202dbeb79"
-    }
-    Frame {
-        msec: 7568
-        hash: "8cd6919e15ea4320e00e79d43596ea80"
-    }
-    Frame {
-        msec: 7584
-        hash: "395a63aa12928a6b597eabd74f019a03"
-    }
-    Frame {
-        msec: 7600
-        hash: "16d4ccbda396a9afcaeac4ddca733012"
-    }
-    Frame {
-        msec: 7616
-        hash: "71955518b68a9817a41d5d0f63adcc57"
-    }
-    Frame {
-        msec: 7632
-        hash: "152f2569fe8849d5c4289699dba2ee32"
-    }
-    Frame {
-        msec: 7648
-        hash: "a1de2cb5acc31a9d73e005c3a44cee4f"
-    }
-    Frame {
-        msec: 7664
-        hash: "96ceaad68263b5165a65f557ae19d9cd"
-    }
-    Frame {
-        msec: 7680
-        image: "packageviews.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "9ff5d2774820dac56655a44d965c7742"
-    }
-    Frame {
-        msec: 7712
-        hash: "79cdbfb2f93a35680eab38f0df2eaf66"
-    }
-    Frame {
-        msec: 7728
-        hash: "19896d510a27871fc589579e27adc0dc"
-    }
-    Frame {
-        msec: 7744
-        hash: "71b62e488897345eebf8d9640d50585f"
-    }
-    Frame {
-        msec: 7760
-        hash: "4853b95a3f1ae0ebbd468dff3605d595"
-    }
-    Frame {
-        msec: 7776
-        hash: "a8030aa0aede17d91758af08256cf39d"
-    }
-    Frame {
-        msec: 7792
-        hash: "a2a5e71349060ae262d337d9aa33b549"
-    }
-    Frame {
-        msec: 7808
-        hash: "7b5f32f0e53ab102ef6f1eca7da016dd"
-    }
-    Frame {
-        msec: 7824
-        hash: "7b5f32f0e53ab102ef6f1eca7da016dd"
-    }
-    Frame {
-        msec: 7840
-        hash: "25908df38057c7394135108d9618e28d"
-    }
-    Frame {
-        msec: 7856
-        hash: "d3b3ab6e43eef22ca71fc35c36b1f50d"
-    }
-    Frame {
-        msec: 7872
-        hash: "c25759db4e12acbe8e4701c7c86d1957"
-    }
-    Frame {
-        msec: 7888
-        hash: "fe67a155ead8495d646fa7bbcf5db6b4"
-    }
-    Frame {
-        msec: 7904
-        hash: "34e2877a8b84e53e5c85fb1b25d57e2b"
-    }
-    Frame {
-        msec: 7920
-        hash: "2fc6c5a0e9bb80e3c8f12553e7e96d02"
-    }
-    Frame {
-        msec: 7936
-        hash: "b5122a2530e21a01e93862bd8060e320"
-    }
-    Frame {
-        msec: 7952
-        hash: "9c55e0c920bcf5189fb24e1765d221db"
-    }
-    Frame {
-        msec: 7968
-        hash: "1106703562135e36ae62130200960fc8"
-    }
-    Frame {
-        msec: 7984
-        hash: "c24b57dbf01d2646fbbeb3e66636e220"
-    }
-    Frame {
-        msec: 8000
-        hash: "71663a05c04bb77c2e25299a9c6dd9ce"
-    }
-    Frame {
-        msec: 8016
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8032
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8048
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8064
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8080
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8096
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8112
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8128
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8144
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8160
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8176
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8192
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8208
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8224
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8240
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8256
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8272
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8288
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8304
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8320
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8336
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8352
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8368
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8384
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8400
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8416
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8432
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8448
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8464
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8480
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8496
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8512
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8528
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8544
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8560
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8576
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8592
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8608
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8624
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8640
-        image: "packageviews.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8672
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8688
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Frame {
-        msec: 8704
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 46; y: 147
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8720
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 146
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8736
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 145
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 143
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8752
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 141
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8768
-        hash: "dd6caf22c0cacf5c34686785072da5f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 138
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 134
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 46; y: 129
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8784
-        hash: "7b1354e70befc84c343145987c81562f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 45; y: 122
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8800
-        hash: "6107f00c6472d877b5c109dd58d73145"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 45; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 45; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8816
-        hash: "47288701643899e26b53d28595d59b29"
-    }
-    Frame {
-        msec: 8832
-        hash: "a3b4b613d19c8f21ec1b75c1c660ed1d"
-    }
-    Frame {
-        msec: 8848
-        hash: "7a5d9fe471eb673f68b77d97f9108bac"
-    }
-    Frame {
-        msec: 8864
-        hash: "20a09795ffcf05276d7a5be24b33e207"
-    }
-    Frame {
-        msec: 8880
-        hash: "225e529ac77f225fc8b84ed71cdcd70f"
-    }
-    Frame {
-        msec: 8896
-        hash: "e4188406a3d3d1f1b83547d362a187f8"
-    }
-    Frame {
-        msec: 8912
-        hash: "82707040aad297885ba1c8c6672dc017"
-    }
-    Frame {
-        msec: 8928
-        hash: "a369118e98e2bd67dc4242c5e8c86cb8"
-    }
-    Frame {
-        msec: 8944
-        hash: "001ef50f7d2b7db7e0db8d2190137d0c"
-    }
-    Frame {
-        msec: 8960
-        hash: "2db473b2bd9fd602ed0298501752dae9"
-    }
-    Frame {
-        msec: 8976
-        hash: "f9cdbb4e515abf23721627e3f2748960"
-    }
-    Frame {
-        msec: 8992
-        hash: "cbc072c5b117ce156a4d6661ae488a77"
-    }
-    Frame {
-        msec: 9008
-        hash: "79acb38cec803e6ebeb570dc4d7bbb30"
-    }
-    Frame {
-        msec: 9024
-        hash: "848014437545fc8d2e454a774586a8ca"
-    }
-    Frame {
-        msec: 9040
-        hash: "0836f3a48355f6384c6b3f452df1e7d6"
-    }
-    Frame {
-        msec: 9056
-        hash: "b3da223cdf138e915fcb424cf9181d6b"
-    }
-    Frame {
-        msec: 9072
-        hash: "1a7cf7e7ddaac64eeff0d23997580b8c"
-    }
-    Frame {
-        msec: 9088
-        hash: "cfbd055b2f905db503250b49120948db"
-    }
-    Frame {
-        msec: 9104
-        hash: "c5b8a4ce51ec806f0ce654a8977fb17d"
-    }
-    Frame {
-        msec: 9120
-        hash: "d09ba0ea9e7fed2f50d6463ac74da470"
-    }
-    Frame {
-        msec: 9136
-        hash: "47ec5bab098fd88ef5be3703c316717a"
-    }
-    Frame {
-        msec: 9152
-        hash: "3ea8c442ed43bd3a2aebc9cc2aacfc01"
-    }
-    Frame {
-        msec: 9168
-        hash: "f016f14b0b21781924ac2afe146b1b97"
-    }
-    Frame {
-        msec: 9184
-        hash: "7b7b6954cce0ca202585310520bbb3e3"
-    }
-    Frame {
-        msec: 9200
-        hash: "b0de94ee3b0ce4845101606d2d512426"
-    }
-    Frame {
-        msec: 9216
-        hash: "8dc56bcb2313bd8dd9ef0cbc098b80e5"
-    }
-    Frame {
-        msec: 9232
-        hash: "a1692b26fb73ade5a05e03de3f4a8dbe"
-    }
-    Frame {
-        msec: 9248
-        hash: "672dd46e629475d823b182104f15aa24"
-    }
-    Frame {
-        msec: 9264
-        hash: "2859e53d63c20af7891efc99d5e515b5"
-    }
-    Frame {
-        msec: 9280
-        hash: "b44b1c4eaa33fbd09c8e59c1bf2a8f2a"
-    }
-    Frame {
-        msec: 9296
-        hash: "d520fa81032ca25ec2cb6c358488049d"
-    }
-    Frame {
-        msec: 9312
-        hash: "3676c00bd5c3e9af8c4092afd80f58c2"
-    }
-    Frame {
-        msec: 9328
-        hash: "6be4d4c35aba5a8d32a28dd88f32acd1"
-    }
-    Frame {
-        msec: 9344
-        hash: "375473d4d838ef937c3164e7451d9391"
-    }
-    Frame {
-        msec: 9360
-        hash: "610253e766974af4958c3623547deebd"
-    }
-    Frame {
-        msec: 9376
-        hash: "20b79be381a95930c924240815cc63f4"
-    }
-    Frame {
-        msec: 9392
-        hash: "88130d7132f472ff8495d640adf290cc"
-    }
-    Frame {
-        msec: 9408
-        hash: "2e81f4c9a0221708146adcb508eb2d30"
-    }
-    Frame {
-        msec: 9424
-        hash: "977f52ed922ba5db66440f115f7484a2"
-    }
-    Frame {
-        msec: 9440
-        hash: "706f99c32d00be14ae67b4866fee0cd9"
-    }
-    Frame {
-        msec: 9456
-        hash: "210231604091497b510c4a1d42295574"
-    }
-    Frame {
-        msec: 9472
-        hash: "210231604091497b510c4a1d42295574"
-    }
-    Frame {
-        msec: 9488
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9504
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9520
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9536
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9552
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9568
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9584
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9600
-        image: "packageviews.9.png"
-    }
-    Frame {
-        msec: 9616
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9632
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9648
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9664
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9680
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9696
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9712
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9728
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9744
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9760
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9776
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9792
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9808
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9824
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9840
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9856
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9872
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9888
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9904
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9920
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9936
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9952
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9968
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 9984
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10000
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10016
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10032
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10048
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10064
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10080
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10096
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10112
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10128
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10144
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10160
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10176
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 48; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10192
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10208
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10224
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10240
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10256
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 48; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10272
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 10288
-        hash: "c54f97c72088b6319efba3c79bbef0fa"
-    }
-    Frame {
-        msec: 10304
-        hash: "3627adf820bc44f99cca852096f337a0"
-    }
-    Frame {
-        msec: 10320
-        hash: "48c0f775534ff9bbe9227e60ad9a3622"
-    }
-    Frame {
-        msec: 10336
-        hash: "da5c6fd80ee0dc20e81031c84ede20cf"
-    }
-    Frame {
-        msec: 10352
-        hash: "ce7595da55b274259771eb99a42df454"
-    }
-    Frame {
-        msec: 10368
-        hash: "c2dd2aa17b9508477699fefe55bfbd06"
-    }
-    Frame {
-        msec: 10384
-        hash: "4ee897ddfec1081eef8bc5d799774f82"
-    }
-    Frame {
-        msec: 10400
-        hash: "f4da67964a175acf4cde4a24b054c24c"
-    }
-    Frame {
-        msec: 10416
-        hash: "e3da951dad465f1a69d8d7c08e888f02"
-    }
-    Frame {
-        msec: 10432
-        hash: "ff862073eada170a07d209048367b823"
-    }
-    Frame {
-        msec: 10448
-        hash: "cb61d5a89c1acc2b646f3c07214bea4a"
-    }
-    Frame {
-        msec: 10464
-        hash: "15d842ac551c15a136c7598adf2fe2b1"
-    }
-    Frame {
-        msec: 10480
-        hash: "04b9e85f7418bbc402e51e0ce8149180"
-    }
-    Frame {
-        msec: 10496
-        hash: "455dff37edfac66f5e4ae78e10b93cf9"
-    }
-    Frame {
-        msec: 10512
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10528
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10544
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10560
-        image: "packageviews.10.png"
-    }
-    Frame {
-        msec: 10576
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10592
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10608
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10624
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10640
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10656
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10672
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10688
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10704
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10720
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10736
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10752
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10768
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10784
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10800
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10816
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10832
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10848
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10864
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10880
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10896
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10912
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10928
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10944
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10960
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10976
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 10992
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11008
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11024
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11040
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11056
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11072
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11088
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11104
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11120
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11136
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11152
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11168
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11184
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11200
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11216
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11232
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11248
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11264
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11280
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11296
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11312
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11328
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11344
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11360
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11376
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11392
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11408
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11424
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11440
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11456
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11472
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11488
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11504
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 47; y: 141
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11520
-        image: "packageviews.11.png"
-    }
-    Frame {
-        msec: 11536
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11552
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11568
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 47; y: 141
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11584
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11600
-        hash: "259e9da7c3b8738db1762128f2c8d4b0"
-    }
-    Frame {
-        msec: 11616
-        hash: "cf515f316c197a307a7fb8373df3b107"
-    }
-    Frame {
-        msec: 11632
-        hash: "927379ba611284d5c98a3eb5aca04f7c"
-    }
-    Frame {
-        msec: 11648
-        hash: "387ad2042589de0a19cb13aa0cac8872"
-    }
-    Frame {
-        msec: 11664
-        hash: "6536ad87d1f04b13c28c43ae0fed984f"
-    }
-    Frame {
-        msec: 11680
-        hash: "38d77d6610739614e95c70f32736f238"
-    }
-    Frame {
-        msec: 11696
-        hash: "9a6c3a95b61d3b9b787417600123b6d8"
-    }
-    Frame {
-        msec: 11712
-        hash: "782d907d7d170108beb030c93d9a4d94"
-    }
-    Frame {
-        msec: 11728
-        hash: "646ee08d1ffe676ca0363f70e14c2ed6"
-    }
-    Frame {
-        msec: 11744
-        hash: "830730ed9990c8f96fa5c7e6b4228884"
-    }
-    Frame {
-        msec: 11760
-        hash: "2e678862f358814278d38950c7c5765b"
-    }
-    Frame {
-        msec: 11776
-        hash: "c656eb6ace9caf86d417d79452c4ea34"
-    }
-    Frame {
-        msec: 11792
-        hash: "227a9bb3644c26622ef654ba2c61ddad"
-    }
-    Frame {
-        msec: 11808
-        hash: "bc8188bf8be749bfb28fc64bb5773922"
-    }
-    Frame {
-        msec: 11824
-        hash: "f1e90cfd466bdc26ba98632fe1e5360c"
-    }
-    Frame {
-        msec: 11840
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11856
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11872
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11888
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11904
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11920
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11936
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11952
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11968
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 11984
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12000
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12016
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12032
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12048
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12064
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12080
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12096
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12112
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12128
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12144
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12160
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12176
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12192
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12208
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12224
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12240
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12256
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12272
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12288
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12304
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12320
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12336
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12352
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12368
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12384
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12400
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12416
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12432
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12448
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12464
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12480
-        image: "packageviews.12.png"
-    }
-    Frame {
-        msec: 12496
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12512
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12528
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12544
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12560
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12576
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12592
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12608
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12624
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12640
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12656
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12672
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12688
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12704
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12720
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12736
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12752
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12768
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12784
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12800
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12816
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12832
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12848
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12864
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12880
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12896
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12912
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12928
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12944
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12960
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12976
-        hash: "81795ee4213ac62e073d811aaf6b580c"
-    }
-    Frame {
-        msec: 12992
-        hash: "81795ee4213ac62e073d811aaf6b580c"
+        hash: "8d52a504170547407fad6d8785b7199b"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
index 99379f1..a9de3f8 100644
--- a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
@@ -17,18 +17,10 @@ Rectangle {
             ListElement { itemColor: "yellow" }
             ListElement { itemColor: "slategrey" }
             ListElement { itemColor: "cyan" }
-            ListElement { itemColor: "red" }
-            ListElement { itemColor: "green" }
-            ListElement { itemColor: "blue" }
-            ListElement { itemColor: "orange" }
-            ListElement { itemColor: "purple" }
-            ListElement { itemColor: "yellow" }
-            ListElement { itemColor: "slategrey" }
-            ListElement { itemColor: "cyan" }
         }
         delegate: Package {
             Rectangle {
-                id: listItem; Package.name: "list"; width:root.width/2; height: 50; color: "transparent"; border.color: "white"
+                id: listItem; Package.name: "list"; width:root.width/2; height: 25; color: "transparent"; border.color: "white"
                 MouseArea {
                     anchors.fill: parent
                     onClicked: myState.state = myState.state == "list" ? "grid" : "list"
@@ -50,12 +42,12 @@ Rectangle {
                     State {
                         name: "list"
                         ParentChange { target: myContent; parent: listItem }
-                        PropertyChanges { target: myContent; x: 0; y: 0; width: listItem.width }
+                        PropertyChanges { target: myContent; x: 0; y: 0; width: listItem.width; height: listItem.height }
                     },
                     State {
                         name: "grid"
                         ParentChange { target: myContent; parent: gridItem }
-                        PropertyChanges { target: myContent; x: 0; y: 0; width: gridItem.width }
+                        PropertyChanges { target: myContent; x: 0; y: 0; width: gridItem.width; height: gridItem.height }
                     }
                 ]
 
@@ -64,7 +56,7 @@ Rectangle {
                         from: "*"; to: "*"
                         SequentialAnimation {
                             ParentAnimation{
-                                NumberAnimation { properties: "x,y,width"; easing.type: "InOutQuad" }
+                                NumberAnimation { properties: "x,y,width,height"; easing.type: "InOutQuad" }
                             }
                         }
                     }
-- 
cgit v0.12


From 47448f58b73add569137ced50667c1e42bbcea75 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 10:34:42 +1000
Subject: Shrink and update qdeclarativetext visual tests

Task-number: QTBUG-14792
---
 .../qdeclarativetext/font/data-X11/plaintext.0.png | Bin 0 -> 77181 bytes
 .../qdeclarativetext/font/data-X11/plaintext.qml   |  11 +++
 .../qdeclarativetext/font/data-X11/richtext.0.png  | Bin 0 -> 103375 bytes
 .../qdeclarativetext/font/data-X11/richtext.qml    |  11 +++
 .../qdeclarativetext/font/data/plaintext.0.png     | Bin 0 -> 77181 bytes
 .../qdeclarativetext/font/data/plaintext.qml       |  11 +++
 .../qdeclarativetext/font/data/richtext.0.png      | Bin 0 -> 103375 bytes
 .../qdeclarativetext/font/data/richtext.qml        |  11 +++
 .../qmlvisual/qdeclarativetext/font/plaintext.qml  |  88 ++++++++++++---------
 .../qmlvisual/qdeclarativetext/font/richtext.qml   |  50 +++++-------
 10 files changed, 112 insertions(+), 70 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
new file mode 100644
index 0000000..89195ae
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.qml
new file mode 100644
index 0000000..fdf2310
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
new file mode 100644
index 0000000..6a48728
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.qml
new file mode 100644
index 0000000..3da391d
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "richtext.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png
new file mode 100644
index 0000000..89195ae
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
new file mode 100644
index 0000000..fdf2310
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png
new file mode 100644
index 0000000..6a48728
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml
new file mode 100644
index 0000000..3da391d
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "richtext.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
index 25db179..e82d80f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
@@ -1,11 +1,11 @@
 import QtQuick 1.0
 
 Rectangle {
-    id: s; width: 800; height: 1000; color: "lightsteelblue"
-    property string text: "The quick brown fox jumps over the lazy dog."
+    id: s; width: 620; height: 600; color: "lightsteelblue"
+    property string text: "Jackdaws love my big sphinx of quartz."
 
     Column {
-        spacing: 10
+        spacing: 8
         Text {
             text: s.text
         }
@@ -13,7 +13,7 @@ Rectangle {
             text: s.text; font.pixelSize: 18
         }
         Text {
-            text: s.text; font.pointSize: 25
+            text: s.text; font.pointSize: 20
         }
         Text {
             text: s.text; color: "red"; smooth: true
@@ -52,40 +52,52 @@ Rectangle {
             text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200; wrapMode: Text.WordWrap
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200; wrapMode: Text.WordWrap
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200; wrapMode: Text.WordWrap
-        }
-        Text {
-            text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere
-        }
-        Text {
-            text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap
+            text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20
+        }
+        Row{
+            height: childrenRect.height
+            spacing: 4
+            Text {
+                text: s.text; elide: Text.ElideLeft; width: 200
+            }
+            Text {
+                text: s.text; elide: Text.ElideMiddle; width: 200
+            }
+            Text {
+                text: s.text; elide: Text.ElideRight; width: 200
+            }
+        }
+        Row{
+            height: childrenRect.height
+            spacing: 4
+            Text{
+                text: s.text; elide: Text.ElideLeft; width: 200; wrapMode: Text.WordWrap
+            }
+            Text {
+                text: s.text; elide: Text.ElideMiddle; width: 200; wrapMode: Text.WordWrap
+            }
+            Text {
+                text: s.text; elide: Text.ElideRight; width: 200; wrapMode: Text.WordWrap
+            }
+        }
+        Row{
+            height: childrenRect.height
+            spacing: 4
+            Text {
+                text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere
+            }
+            Text {
+                text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap
+            }
+            Text {
+text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200
+            }
         }
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
index 31b0e69..7d174cc 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
@@ -1,11 +1,11 @@
 import QtQuick 1.0
 
 Rectangle {
-    id: s; width: 800; height: 1000; color: "lightsteelblue"
+    id: s; width: 620; height: 600; color: "lightsteelblue"
     property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>."
 
     Column {
-        spacing: 10
+        spacing: 6
         Text {
             text: s.text
         }
@@ -13,7 +13,7 @@ Rectangle {
             text: s.text; font.pixelSize: 18
         }
         Text {
-            text: s.text; font.pointSize: 25
+            text: s.text; font.pointSize: 18
         }
         Text {
             text: s.text; color: "red"; smooth: true
@@ -52,40 +52,26 @@ Rectangle {
             text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
+            text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
+            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
+            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20
         }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200; wrapMode: Text.WordWrap
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200; wrapMode: Text.WordWrap
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200; wrapMode: Text.WordWrap
-        }
-        Text {
-            text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere
-        }
-        Text {
-            text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap
+        Row{
+            height: childrenRect.height;
+            spacing: 4
+            Text {
+                text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere
+            }
+            Text {
+                text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap
+            }
+            Text {
+                text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200
+            }
         }
     }
 }
-- 
cgit v0.12


From 95b0b37704c97c5b4b48cd53c6592fc714c99828 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 29 Oct 2010 10:39:59 +1000
Subject: Revert "Work around bug causing qml apps to crash on Symbian 5.0
 devices."

This reverts commit 391e173a8915230205a93b6e0709762f75547772.
---
 configure.exe                    | Bin 1326080 -> 1325568 bytes
 tools/configure/configureapp.cpp |   1 -
 2 files changed, 1 deletion(-)

diff --git a/configure.exe b/configure.exe
index 14c2b47..c36256e 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 93ce162..983416a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1556,7 +1556,6 @@ void Configure::applySpecSpecifics()
         dictionary[ "ARM_FPU_TYPE" ]        = "softvfp";
         dictionary[ "SQL_SQLITE" ]          = "yes";
         dictionary[ "SQL_SQLITE_LIB" ]      = "system";
-        dictionary[ "DECLARATIVE_DEBUG" ]   = "no";
 
         // Disable building docs and translations for now
         disabledBuildParts << "docs" << "translations";
-- 
cgit v0.12


From 8250d455d8d85c5fe0c819f997ba0902315bfce4 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 29 Oct 2010 10:43:20 +1000
Subject: Do not crash on Symbian

The qml debugging enabler in QtDeclarative made any Qt app crash
which used QDeclarative. Reason was that QtDeclarative.dll tried
to directly access (private) writable static data from QtGui.dll.

This patch adds an accessor function for the data to QtGui, and
the crash is gone.

Done-by: Kai Koehne
Reviewed-by: Kai Koehne
(cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1)

Conflicts:

	src/declarative/debugger/qdeclarativedebugservice.cpp
---
 src/declarative/debugger/qdeclarativedebugservice.cpp | 16 ++++++++--------
 src/gui/kernel/qapplication.cpp                       |  9 +++++++--
 src/gui/kernel/qapplication_p.h                       |  3 ++-
 src/s60installs/bwins/QtGuiu.def                      |  4 +++-
 src/s60installs/eabi/QtGuiu.def                       |  4 +++-
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index bdbc8bf..66009f6 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -204,13 +204,13 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
         bool ok = false;
 
         // format: qmljsdebugger=port:3768[,block]
-        if (!appD->qmljsDebugArguments.isEmpty()) {
+        if (!appD->qmljsDebugArgumentsString().isEmpty()) {
 
-            if (appD->qmljsDebugArguments.indexOf(QLatin1String("port:")) == 0) {
-                int separatorIndex = appD->qmljsDebugArguments.indexOf(QLatin1Char(','));
-                port = appD->qmljsDebugArguments.mid(5, separatorIndex - 5).toInt(&ok);
+            if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
+                int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
+                port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok);
             }
-            block = appD->qmljsDebugArguments.contains(QLatin1String("block"));
+            block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block"));
 
             if (ok) {
                 server = new QDeclarativeDebugServer(port);
@@ -219,9 +219,9 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
                     server->waitForConnection();
                 }
             } else {
-                qWarning(QString("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
-                                 "Format is -qmljsdebugger=port:<port>[,block]").arg(
-                             appD->qmljsDebugArguments).toAscii().constData());
+                qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+                                            "Format is -qmljsdebugger=port:<port>[,block]").arg(
+                             appD->qmljsDebugArgumentsString()).toAscii().constData());
             }
         }
 #endif
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 745cd2e..64237ab 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -494,7 +494,7 @@ bool QApplicationPrivate::fade_tooltip = false;
 bool QApplicationPrivate::animate_toolbox = false;
 bool QApplicationPrivate::widgetCount = false;
 bool QApplicationPrivate::load_testability = false;
-QString QApplicationPrivate::qmljsDebugArguments;
+QString QApplicationPrivate::qmljs_debug_arguments;
 #ifdef QT_KEYPAD_NAVIGATION
 #  ifdef Q_OS_SYMBIAN
 Qt::NavigationMode QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadDirectional;
@@ -567,7 +567,7 @@ void QApplicationPrivate::process_cmdline()
         if (arg == "-qdevel" || arg == "-qdebug") {
             // obsolete argument
         } else if (arg.indexOf("-qmljsdebugger=", 0) != -1) {
-            qmljsDebugArguments = QString::fromLocal8Bit(arg.right(arg.length() - 15));
+            qmljs_debug_arguments = QString::fromLocal8Bit(arg.right(arg.length() - 15));
         } else if (arg.indexOf("-style=", 0) != -1) {
             s = QString::fromLocal8Bit(arg.right(arg.length() - 7).toLower());
         } else if (arg == "-style" && i < argc-1) {
@@ -6077,6 +6077,11 @@ QPixmap QApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape)
     return QPixmap();
 }
 
+QString QApplicationPrivate::qmljsDebugArgumentsString()
+{
+    return qmljs_debug_arguments;
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qapplication.cpp"
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index e0ef8b3..b98f562 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -446,7 +446,8 @@ public:
     static bool animate_toolbox;
     static bool widgetCount; // Coupled with -widgetcount switch
     static bool load_testability; // Coupled with -testability switch
-    static QString qmljsDebugArguments; // a string containing arguments for js/qml debugging.
+    static QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging.
+    static QString qmljsDebugArgumentsString(); // access string from other libraries
 
 #ifdef Q_WS_MAC
     static bool native_modal_dialog_active;
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index aacc03a..afc89ae 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12890,8 +12890,10 @@ EXPORTS
 	?lastRightBearing@QFontEngine@@IAE?AUQFixed@@ABUQGlyphLayout@@_N@Z @ 12889 NONAME ; struct QFixed QFontEngine::lastRightBearing(struct QGlyphLayout const &, bool)
 	?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@PAVQGraphicsItem@@@Z @ 12890 NONAME ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *, class QGraphicsItem *)
 	?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12891 NONAME ; void QTapAndHoldGesture::setTimeout(int)
-	?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ; class QString QApplicationPrivate::qmljsDebugArguments
+	?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ABSENT ; class QString QApplicationPrivate::qmljsDebugArguments
 	?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const
 	?maxTextureHeight@QTextureGlyphCache@@UBEHXZ @ 12894 NONAME ; int QTextureGlyphCache::maxTextureHeight(void) const
 	?maxTextureWidth@QTextureGlyphCache@@UBEHXZ @ 12895 NONAME ; int QTextureGlyphCache::maxTextureWidth(void) const
+	?qmljs_debug_arguments@QApplicationPrivate@@2VQString@@A @ 12896 NONAME ; class QString QApplicationPrivate::qmljs_debug_arguments
+	?qmljsDebugArgumentsString@QApplicationPrivate@@SA?AVQString@@XZ @ 12897 NONAME ; class QString QApplicationPrivate::qmljsDebugArgumentsString(void)
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 4442d33..aa050f9 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12094,7 +12094,9 @@ EXPORTS
 	_ZN18QTapAndHoldGesture7timeoutEv @ 12093 NONAME
 	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12094 NONAME ABSENT
 	_ZN20QGraphicsItemPrivate14children_clearEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 12095 NONAME
-	_ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4
+	_ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4 ABSENT
 	_ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFP13QGraphicsItem @ 12097 NONAME
 	_ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME
+	_ZN19QApplicationPrivate21qmljs_debug_argumentsE @ 12099 NONAME DATA 4
+	_ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME
 
-- 
cgit v0.12


From 2c2e16dc5b43536eba6cb89c93401fed8f3c26a8 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 10:51:20 +1000
Subject: Update when text changes to ""

Also fixes a doc typo. Includes test.

Task-number: QTBUG-14469
---
 src/declarative/graphicsitems/qdeclarativetext.cpp |   3 +-
 .../qdeclarativetext/bugs/QTBUG-14469.qml          |  22 +
 .../bugs/data-X11/QTBUG-14469.0.png                | Bin 0 -> 422 bytes
 .../qdeclarativetext/bugs/data-X11/QTBUG-14469.qml | 475 +++++++++++++++++++++
 .../qdeclarativetext/bugs/data/QTBUG-14469.0.png   | Bin 0 -> 422 bytes
 .../qdeclarativetext/bugs/data/QTBUG-14469.qml     | 475 +++++++++++++++++++++
 6 files changed, 974 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.qml

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index c8e3615..865af2d 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -221,6 +221,7 @@ void QDeclarativeTextPrivate::updateSize()
     if (text.isEmpty()) {
         q->setImplicitHeight(fm.height());
         emit q->paintedSizeChanged();
+        q->update();
         return;
     }
 
@@ -866,7 +867,7 @@ void QDeclarativeText::setStyleColor(const QColor &color)
     and \c Text.AlignVCenter.
 
     Note that for a single line of text, the size of the text is the area of the text. In this common case,
-    all alignments are equivalent. If you want the text to be, say, centered in it parent, then you will
+    all alignments are equivalent. If you want the text to be, say, centered in its parent, then you will
     need to either modify the Item::anchors, or set horizontalAlignment to Text.AlignHCenter and bind the width to 
     that of the parent.
 */
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml
new file mode 100644
index 0000000..ea3a939
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml
@@ -0,0 +1,22 @@
+import QtQuick 1.0
+
+/* The bug was that if text was set to "" or the size didn't increase, the text didn't repaint
+   ended up only repainting for 1, 10, 11, 12.
+   Test passes if it goes from "" to 13 back to "" with all numbers being painted (and the text disappearing at 0)
+ */
+
+Item{
+    width: 80
+    height: 80
+    property int val: 0
+    Text{
+        id: txt;
+        text: val == 0 ? "" : val
+    }
+    Timer{
+        interval: 100
+        running: true
+        repeat: true;
+        onTriggered: {val = (val + 1) % 14;}
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.0.png
new file mode 100644
index 0000000..b8cc1c7
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.qml
new file mode 100644
index 0000000..6201c72
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data-X11/QTBUG-14469.qml
@@ -0,0 +1,475 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 32
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 48
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 64
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 80
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 96
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 112
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 128
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 144
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 160
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 176
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 192
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 208
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 224
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 240
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 256
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 272
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 288
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 304
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 320
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 336
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 352
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 368
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 384
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 400
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 416
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 432
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 448
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 464
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 480
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 496
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 512
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 528
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 544
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 560
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 576
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 592
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 608
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 624
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 640
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 656
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 672
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 688
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 704
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 720
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 736
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 752
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 768
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 784
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 800
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 816
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 832
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 848
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 864
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 880
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 896
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 912
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 928
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 944
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 960
+        image: "QTBUG-14469.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 992
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 1008
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 1024
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1040
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1056
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1072
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1088
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1104
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1120
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1136
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1152
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1168
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1184
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1200
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1216
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1232
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1248
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1264
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1280
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1296
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1312
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1328
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1344
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1360
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1376
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1392
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1408
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1424
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1440
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1456
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1472
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1488
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1504
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1520
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1536
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1552
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1568
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1584
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1600
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1616
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1632
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1648
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1664
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1680
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1696
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1712
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1728
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1744
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1760
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1776
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1792
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1808
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1824
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 1840
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 1856
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 1872
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.0.png
new file mode 100644
index 0000000..b8cc1c7
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.qml
new file mode 100644
index 0000000..6201c72
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/data/QTBUG-14469.qml
@@ -0,0 +1,475 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 32
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 48
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 64
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 80
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 96
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 112
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 128
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 144
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 160
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 176
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 192
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 208
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 224
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 240
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 256
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 272
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 288
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 304
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 320
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 336
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 352
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 368
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 384
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 400
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 416
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 432
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 448
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 464
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 480
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 496
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 512
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 528
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 544
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 560
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 576
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 592
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 608
+        hash: "51cd7a5bc24cdb50832066cc04cae313"
+    }
+    Frame {
+        msec: 624
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 640
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 656
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 672
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 688
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 704
+        hash: "bac094de06155c73e4d2d9e2fd99b038"
+    }
+    Frame {
+        msec: 720
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 736
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 752
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 768
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 784
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 800
+        hash: "3159c438d2cb58e31b4b458ba417f794"
+    }
+    Frame {
+        msec: 816
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 832
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 848
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 864
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 880
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 896
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 912
+        hash: "a4f9c320c8aa558c66dd25d132bb5834"
+    }
+    Frame {
+        msec: 928
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 944
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 960
+        image: "QTBUG-14469.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 992
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 1008
+        hash: "b1a283365bbffbc0ddaa4aa661e52add"
+    }
+    Frame {
+        msec: 1024
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1040
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1056
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1072
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1088
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1104
+        hash: "57ba00590bed6fe1b0f8fc3e54b9637e"
+    }
+    Frame {
+        msec: 1120
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1136
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1152
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1168
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1184
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1200
+        hash: "e1b070e2bf36e5d8a34cabc0d52b2830"
+    }
+    Frame {
+        msec: 1216
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1232
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1248
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1264
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1280
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1296
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1312
+        hash: "bc81044e90cc001fc351a1518ba4b41e"
+    }
+    Frame {
+        msec: 1328
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1344
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1360
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1376
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1392
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1408
+        hash: "18386b56e44b1f3981b3aa8fe980410b"
+    }
+    Frame {
+        msec: 1424
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1440
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1456
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1472
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1488
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1504
+        hash: "fab978e1e0ee5140d8131320ff2322e9"
+    }
+    Frame {
+        msec: 1520
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1536
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1552
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1568
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1584
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1600
+        hash: "6971eb49a32b8f9e09c24ac1340728cb"
+    }
+    Frame {
+        msec: 1616
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1632
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1648
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1664
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1680
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1696
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1712
+        hash: "449c6b632a3b85462fe3947a071ffa91"
+    }
+    Frame {
+        msec: 1728
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1744
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1760
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1776
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1792
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1808
+        hash: "9c804e5eec3b31acd55a510d301cc419"
+    }
+    Frame {
+        msec: 1824
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 1840
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 1856
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+    Frame {
+        msec: 1872
+        hash: "799c7a637b061686c1456c9c535594d3"
+    }
+}
-- 
cgit v0.12


From 3a784f3c74b10b898d40b06e82851929cba1eca2 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 11:05:49 +1000
Subject: Add a test for multiline text alignment

Apparently this is something we've had troubles with in the past

Task-number: QTBUG-14792
---
 .../align/data-X11/multilineAlign.0.png            | Bin 0 -> 1895 bytes
 .../align/data-X11/multilineAlign.qml              | 247 +++++++++++++++++++++
 .../align/data/multilineAlign.0.png                | Bin 0 -> 1895 bytes
 .../qdeclarativetext/align/data/multilineAlign.qml | 247 +++++++++++++++++++++
 .../qdeclarativetext/align/multilineAlign.qml      |  24 ++
 5 files changed, 518 insertions(+)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
new file mode 100644
index 0000000..e6b2b3c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.qml
new file mode 100644
index 0000000..1b43aa3
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.qml
@@ -0,0 +1,247 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 32
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 48
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 64
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 80
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 96
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 112
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 128
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 144
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 160
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 176
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 192
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 208
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 224
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 240
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 256
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 272
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 288
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 304
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 320
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 336
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 352
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 368
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 384
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 400
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 416
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 432
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 448
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 464
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 480
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 496
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 512
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 528
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 544
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 560
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 576
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 592
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 608
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 624
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 640
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 656
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 672
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 688
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 704
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 720
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 736
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 752
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 768
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 784
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 800
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 816
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 832
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 848
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 864
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 880
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 896
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 912
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 928
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 944
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 960
+        image: "multilineAlign.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.0.png
new file mode 100644
index 0000000..e6b2b3c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.qml
new file mode 100644
index 0000000..1b43aa3
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.qml
@@ -0,0 +1,247 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 32
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 48
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 64
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 80
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 96
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 112
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 128
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 144
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 160
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 176
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 192
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 208
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 224
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 240
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 256
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 272
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 288
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 304
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 320
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 336
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 352
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 368
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 384
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 400
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 416
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 432
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 448
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 464
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 480
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 496
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 512
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 528
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 544
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 560
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 576
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 592
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 608
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 624
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 640
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 656
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 672
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 688
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 704
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 720
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 736
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 752
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 768
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 784
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 800
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 816
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 832
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 848
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 864
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 880
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 896
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 912
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 928
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 944
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 960
+        image: "multilineAlign.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
new file mode 100644
index 0000000..976f0b0
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
@@ -0,0 +1,24 @@
+import QtQuick 1.0
+
+/*Tests both the alignments of multiline text, and that
+  it can deal with changing them properly
+*/
+Item{
+    width: 100
+    height: 80
+    property int stage: 0
+    onStageChanged: if(stage == 6) Qt.quit();
+    Text{
+        text: "I am the very model of a modern major general."
+        anchors.fill: parent;
+        wrapMode: Text.WordWrap
+        horizontalAlignment: (stage<1 ? Text.AlignRight : (stage<3 ? Text.AlignHCenter : Text.AlignLeft))
+        verticalAlignment: (stage<2 ? Text.AlignBottom : (stage<4 ? Text.AlignVCenter : Text.AlignTop))
+    }
+    Timer{
+        interval: 160
+        running: true
+        repeat: true
+        onTriggered: stage += 1
+    }
+}
-- 
cgit v0.12


From ecb2d6faca9d4b8b2ea216a4647b42df2fc0f805 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 11:15:14 +1000
Subject: Clean up qdeclarativeboarderimage visual tests

Includes speeding up the animated resize tests.

Task-number: QTBUG-14792
---
 .../content/MyBorderImage.qml                      |    8 +-
 .../data/animated-smooth.0.png                     |  Bin 61731 -> 89135 bytes
 .../data/animated-smooth.1.png                     |  Bin 98927 -> 26593 bytes
 .../data/animated-smooth.2.png                     |  Bin 48780 -> 0 bytes
 .../data/animated-smooth.3.png                     |  Bin 32431 -> 0 bytes
 .../data/animated-smooth.4.png                     |  Bin 35835 -> 0 bytes
 .../data/animated-smooth.5.png                     |  Bin 79428 -> 0 bytes
 .../data/animated-smooth.6.png                     |  Bin 45928 -> 0 bytes
 .../data/animated-smooth.qml                       | 1536 ++---------------
 .../qdeclarativeborderimage/data/animated.0.png    |  Bin 23684 -> 30167 bytes
 .../qdeclarativeborderimage/data/animated.1.png    |  Bin 29115 -> 14694 bytes
 .../qdeclarativeborderimage/data/animated.2.png    |  Bin 27580 -> 0 bytes
 .../qdeclarativeborderimage/data/animated.3.png    |  Bin 14822 -> 0 bytes
 .../qdeclarativeborderimage/data/animated.4.png    |  Bin 21356 -> 0 bytes
 .../qdeclarativeborderimage/data/animated.5.png    |  Bin 31143 -> 0 bytes
 .../qdeclarativeborderimage/data/animated.6.png    |  Bin 26468 -> 0 bytes
 .../qdeclarativeborderimage/data/animated.7.png    |  Bin 16225 -> 0 bytes
 .../qdeclarativeborderimage/data/animated.qml      | 1796 ++------------------
 .../qdeclarativeborderimage/data/borders.0.png     |  Bin 22832 -> 24327 bytes
 19 files changed, 262 insertions(+), 3078 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.7.png

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
index f4ead54..75a644a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
@@ -20,14 +20,14 @@ Item {
 
         SequentialAnimation on width {
             loops: Animation.Infinite
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
+            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 1000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 1000; easing.type: "InOutQuad" }
         }
 
         SequentialAnimation on height {
             loops: Animation.Infinite
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
+            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 1000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 1000; easing.type: "InOutQuad" }
         }
 
         border.top: container.margin
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.0.png
index 9a6b079..b6ef0f5 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png
index 4366d53..11622a7 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.2.png
deleted file mode 100644
index 85a2729..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.3.png
deleted file mode 100644
index de6ff7c..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.4.png
deleted file mode 100644
index fe7d3dd..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.5.png
deleted file mode 100644
index e73bef5..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.6.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.6.png
deleted file mode 100644
index 0c75422..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
index e974234..1200099 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
@@ -22,223 +22,223 @@ VisualTest {
     }
     Frame {
         msec: 80
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "9419c891e347fe6b25d30c05bae5d14c"
     }
     Frame {
         msec: 96
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "62430dd693c4eaeb7afe9e85229406a4"
     }
     Frame {
         msec: 112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "a9b6aeb509076bf17c2068ce280326fb"
     }
     Frame {
         msec: 128
-        hash: "cd2180be80101c2aa4350b51b7a6f502"
+        hash: "2570806925c3a61a7afaa09331c6eed8"
     }
     Frame {
         msec: 144
-        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
+        hash: "98d48920293b11511e8bbf820dd49acc"
     }
     Frame {
         msec: 160
-        hash: "ed9f2ca797894612600bc4b7fbaecb84"
+        hash: "e4809aefa55620a86484f66582d4d1b6"
     }
     Frame {
         msec: 176
-        hash: "59470d71fa4426d0283e86371f2bfc2a"
+        hash: "098b063b0e5eb3dd22adb3353342725e"
     }
     Frame {
         msec: 192
-        hash: "9a2f92efb51bcc6293d6a8e82d5314ea"
+        hash: "30aadc837ec2e7d8a2495453348804bc"
     }
     Frame {
         msec: 208
-        hash: "7b66e21652a7d0982226e281a48411a9"
+        hash: "05013a538f2796c728b4d0ddad059851"
     }
     Frame {
         msec: 224
-        hash: "a716c8d2c94433dee719f92f0822c8ec"
+        hash: "b221f14ea2c04078e23ac37ef817c50e"
     }
     Frame {
         msec: 240
-        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
+        hash: "3ef9de605fff5d3156bccc99a93c5da6"
     }
     Frame {
         msec: 256
-        hash: "5a8932d13d624932a65694fd19ec05cd"
+        hash: "7722a4c025f1d2b560c7fec8ba8f7b6d"
     }
     Frame {
         msec: 272
-        hash: "48e62dd171f5da82b5aa26c765e4042c"
+        hash: "e24ad2d67f10d2cc58dffcc469342005"
     }
     Frame {
         msec: 288
-        hash: "63d3c47f7dec1236440a05e0a8380900"
+        hash: "5153a42348885ce8de81f8086f73c163"
     }
     Frame {
         msec: 304
-        hash: "323af110731b7af0c30f8862ff59b833"
+        hash: "7083d70df6cc476ec342abbe6f4409b4"
     }
     Frame {
         msec: 320
-        hash: "83c029e328e80af83158c37089cf0ece"
+        hash: "befd4cd74f59291a9f9a01ad2a051029"
     }
     Frame {
         msec: 336
-        hash: "3f9a09ae19be34348bb2552915360cf7"
+        hash: "705cd5a0717b6a8de8871bf0bfb38129"
     }
     Frame {
         msec: 352
-        hash: "df624d70cae1bcefda8d69c0ff055d83"
+        hash: "a65d51747c0183a3a096e51326fdae78"
     }
     Frame {
         msec: 368
-        hash: "d671a3b971468e1d8aa30ab655e020a9"
+        hash: "99ec9ca33a26afd9e34c1d3246502926"
     }
     Frame {
         msec: 384
-        hash: "74c837b29f7f05b615123f0e608b523f"
+        hash: "3355ce4b409474e6dbd99d010471a0a4"
     }
     Frame {
         msec: 400
-        hash: "277ef98ea859fb7685fe6cd44a538a7d"
+        hash: "bcfb117c5860306c016a05e828773777"
     }
     Frame {
         msec: 416
-        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
+        hash: "4650216f60377bf7798877546c723d0a"
     }
     Frame {
         msec: 432
-        hash: "456be9c208d690c479ba12bf6325dde0"
+        hash: "3821707e1201c5eebb043f86887c6bc4"
     }
     Frame {
         msec: 448
-        hash: "10307beea6d99ab0ff5863f8e35555ed"
+        hash: "19c079bd61467706ff54f039f512dee6"
     }
     Frame {
         msec: 464
-        hash: "170a1d5fe3422cf5223a78015a6a45fd"
+        hash: "9fdd3bb7d735a96df8538f2883d784fe"
     }
     Frame {
         msec: 480
-        hash: "64ecb03aa538e74d0b99c6dec7751401"
+        hash: "d8096b88c24221d7176472031de3dc14"
     }
     Frame {
         msec: 496
-        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
+        hash: "be4abb3dd1ee3fc62b83d152a1a89576"
     }
     Frame {
         msec: 512
-        hash: "0f347763f25350ebb62dda1536372b45"
+        hash: "e3d2caf6eb0afd2e6efd5c08a580e158"
     }
     Frame {
         msec: 528
-        hash: "0af81ee0d76ff8335a0e347dc086ca37"
+        hash: "40bdf75ac82c26a741939945dbf85924"
     }
     Frame {
         msec: 544
-        hash: "061406edcbd2d4930ab89c3fcab63c7f"
+        hash: "e2e3bee6bf84bc82c50a68e442440f05"
     }
     Frame {
         msec: 560
-        hash: "31d65134f340d82dd40f2401bda3fb7e"
+        hash: "2cb89b7538d4dd398a9ff5a94e2d0020"
     }
     Frame {
         msec: 576
-        hash: "16c16c77c65b36d1e0954d5ead2642be"
+        hash: "41dce41d337e7d24a5e70d831dbb448b"
     }
     Frame {
         msec: 592
-        hash: "61c16009b65a55bffb63e27727e1615e"
+        hash: "7812862b4c1d67a64792a94cb584a9ed"
     }
     Frame {
         msec: 608
-        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
+        hash: "a82a2af4b9cee89e03db363f979d1661"
     }
     Frame {
         msec: 624
-        hash: "89c159ef00d273ecfe61332e1bf7244d"
+        hash: "7071a72a55fab2d7b367eb113d38dc6d"
     }
     Frame {
         msec: 640
-        hash: "f4d0d3bca25e67908b38910f47b4757e"
+        hash: "835de3a883cb3a7c35cb533f51f9b32c"
     }
     Frame {
         msec: 656
-        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
+        hash: "498afb76e236561638532ba6cafd758a"
     }
     Frame {
         msec: 672
-        hash: "4310a4c3037d845f088f21ad608f366a"
+        hash: "38ebf5835263e6e80e75653971ad74b4"
     }
     Frame {
         msec: 688
-        hash: "3d518cd0348d6202243364af1dd6ce89"
+        hash: "b5e8c06b458b1afac627ed7f7e76c868"
     }
     Frame {
         msec: 704
-        hash: "41987e6b4248d7944c0dbc6eb3862023"
+        hash: "594e33c35006281b2df3a45c13c31c44"
     }
     Frame {
         msec: 720
-        hash: "3e81338d38723d56f2d6c428271f81c1"
+        hash: "a49989ca004a6991b49d1978cfc0fed7"
     }
     Frame {
         msec: 736
-        hash: "74af3457583fbaf73f14556aeccc8403"
+        hash: "a743fc5cdcaadd42095e9e0d8441f7cc"
     }
     Frame {
         msec: 752
-        hash: "efc119983701908a904deb24108c59cb"
+        hash: "4ca1600674bad4b753007322945e25dd"
     }
     Frame {
         msec: 768
-        hash: "3a77785cfd7755f567619d8e04583f6a"
+        hash: "d2921c6ae6a1aa9168a2fa93e8936ff2"
     }
     Frame {
         msec: 784
-        hash: "fd85d1dd931033973283a408b5e328a8"
+        hash: "55b9f82693d6ebde9ec23e3ed554bb9c"
     }
     Frame {
         msec: 800
-        hash: "5d3e85acabe5e5ff802eb7731676274f"
+        hash: "15e72f5cd1847f591b0c4f6ecb74ed4a"
     }
     Frame {
         msec: 816
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
+        hash: "7aa94688f72d6ddade09a9d99f1c5563"
     }
     Frame {
         msec: 832
-        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
+        hash: "b782f52c9cb50c72307bbd8fd15fffd2"
     }
     Frame {
         msec: 848
-        hash: "84ef6dda8318b623832f58c46d762e89"
+        hash: "8106f20a3c0c3e7ea0e502e963993330"
     }
     Frame {
         msec: 864
-        hash: "b699285764f5e8866a9996f4a0dccc69"
+        hash: "670b05d25b72ed4c6affdcf873374947"
     }
     Frame {
         msec: 880
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
+        hash: "a34b08cb7e724c0563f86a5c8e209868"
     }
     Frame {
         msec: 896
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
+        hash: "f5281eba399a13f6fa024ae0fa6b01bd"
     }
     Frame {
         msec: 912
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
+        hash: "db4dba10574839c3b3d8684aa1a2ad08"
     }
     Frame {
         msec: 928
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
+        hash: "b90f1f30d340d292c658145f62e2bb8a"
     }
     Frame {
         msec: 944
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
+        hash: "452c45b5cc9be80abde7af04ba49731c"
     }
     Frame {
         msec: 960
@@ -246,239 +246,239 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
+        hash: "8af61e4b09309e31394ae635d58fafd2"
     }
     Frame {
         msec: 992
-        hash: "0d407ee07692d0e5a480a60952807b3c"
+        hash: "9ce60e38b7025c6fa72432de6a3c88b2"
     }
     Frame {
         msec: 1008
-        hash: "845170815a87565dc4229792032b3357"
+        hash: "9e7f9d0e83a33f005d9ee579140c5562"
     }
     Frame {
         msec: 1024
-        hash: "8b8120cfc14de03e048632fdea61be21"
+        hash: "9e7f9d0e83a33f005d9ee579140c5562"
     }
     Frame {
         msec: 1040
-        hash: "b0070117f1c24a4da87434725d4bb989"
+        hash: "9ce60e38b7025c6fa72432de6a3c88b2"
     }
     Frame {
         msec: 1056
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
+        hash: "8af61e4b09309e31394ae635d58fafd2"
     }
     Frame {
         msec: 1072
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
+        hash: "d9ab04d0a6a9373e5622e1124db17866"
     }
     Frame {
         msec: 1088
-        hash: "853429387cc639496c7338244de7e1b7"
+        hash: "452c45b5cc9be80abde7af04ba49731c"
     }
     Frame {
         msec: 1104
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
+        hash: "b90f1f30d340d292c658145f62e2bb8a"
     }
     Frame {
         msec: 1120
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
+        hash: "db4dba10574839c3b3d8684aa1a2ad08"
     }
     Frame {
         msec: 1136
-        hash: "53f05993ba3b426949badd2e4cd66d84"
+        hash: "f5281eba399a13f6fa024ae0fa6b01bd"
     }
     Frame {
         msec: 1152
-        hash: "23291a0239c69ea07db959e709b1ff5f"
+        hash: "a34b08cb7e724c0563f86a5c8e209868"
     }
     Frame {
         msec: 1168
-        hash: "85ef33fcb3f91e4fc20391bf94455984"
+        hash: "670b05d25b72ed4c6affdcf873374947"
     }
     Frame {
         msec: 1184
-        hash: "d6615fc345831a3cc5b9a7196284b632"
+        hash: "8106f20a3c0c3e7ea0e502e963993330"
     }
     Frame {
         msec: 1200
-        hash: "07acba64dc608439a8a54fcb080379e8"
+        hash: "b782f52c9cb50c72307bbd8fd15fffd2"
     }
     Frame {
         msec: 1216
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
+        hash: "7aa94688f72d6ddade09a9d99f1c5563"
     }
     Frame {
         msec: 1232
-        hash: "1f964c6c9bebdc9945dc69a6095400f7"
+        hash: "15e72f5cd1847f591b0c4f6ecb74ed4a"
     }
     Frame {
         msec: 1248
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
+        hash: "55b9f82693d6ebde9ec23e3ed554bb9c"
     }
     Frame {
         msec: 1264
-        hash: "2084ccc60ddd493399c128717816d33b"
+        hash: "d2921c6ae6a1aa9168a2fa93e8936ff2"
     }
     Frame {
         msec: 1280
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
+        hash: "4ca1600674bad4b753007322945e25dd"
     }
     Frame {
         msec: 1296
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
+        hash: "a743fc5cdcaadd42095e9e0d8441f7cc"
     }
     Frame {
         msec: 1312
-        hash: "fce2648975106bc5c0ca9a4530f7f748"
+        hash: "a49989ca004a6991b49d1978cfc0fed7"
     }
     Frame {
         msec: 1328
-        hash: "39cc17ee2e889f17dd07179fda99e431"
+        hash: "594e33c35006281b2df3a45c13c31c44"
     }
     Frame {
         msec: 1344
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
+        hash: "b5e8c06b458b1afac627ed7f7e76c868"
     }
     Frame {
         msec: 1360
-        hash: "d65d50fbb920e683b041a1c72238225b"
+        hash: "38ebf5835263e6e80e75653971ad74b4"
     }
     Frame {
         msec: 1376
-        hash: "45d891d804609ebbe1d5ac3f826d0c17"
+        hash: "498afb76e236561638532ba6cafd758a"
     }
     Frame {
         msec: 1392
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
+        hash: "835de3a883cb3a7c35cb533f51f9b32c"
     }
     Frame {
         msec: 1408
-        hash: "00ab7798bcd77a99886dff0414f35382"
+        hash: "7071a72a55fab2d7b367eb113d38dc6d"
     }
     Frame {
         msec: 1424
-        hash: "5cc90d798786c270ddd2616512f4459f"
+        hash: "a82a2af4b9cee89e03db363f979d1661"
     }
     Frame {
         msec: 1440
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
+        hash: "7812862b4c1d67a64792a94cb584a9ed"
     }
     Frame {
         msec: 1456
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
+        hash: "41dce41d337e7d24a5e70d831dbb448b"
     }
     Frame {
         msec: 1472
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
+        hash: "2cb89b7538d4dd398a9ff5a94e2d0020"
     }
     Frame {
         msec: 1488
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
+        hash: "e2e3bee6bf84bc82c50a68e442440f05"
     }
     Frame {
         msec: 1504
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
+        hash: "40bdf75ac82c26a741939945dbf85924"
     }
     Frame {
         msec: 1520
-        hash: "deed4c06c9b713834490832b88e7acaf"
+        hash: "e3d2caf6eb0afd2e6efd5c08a580e158"
     }
     Frame {
         msec: 1536
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
+        hash: "be4abb3dd1ee3fc62b83d152a1a89576"
     }
     Frame {
         msec: 1552
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
+        hash: "d8096b88c24221d7176472031de3dc14"
     }
     Frame {
         msec: 1568
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
+        hash: "9fdd3bb7d735a96df8538f2883d784fe"
     }
     Frame {
         msec: 1584
-        hash: "a087b532ecb2f28e4ee60819228c2522"
+        hash: "19c079bd61467706ff54f039f512dee6"
     }
     Frame {
         msec: 1600
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
+        hash: "3821707e1201c5eebb043f86887c6bc4"
     }
     Frame {
         msec: 1616
-        hash: "880640372bf584955627f6835f24be13"
+        hash: "4650216f60377bf7798877546c723d0a"
     }
     Frame {
         msec: 1632
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
+        hash: "bcfb117c5860306c016a05e828773777"
     }
     Frame {
         msec: 1648
-        hash: "705d9c8de05c859a42769f73761c6a63"
+        hash: "3355ce4b409474e6dbd99d010471a0a4"
     }
     Frame {
         msec: 1664
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
+        hash: "99ec9ca33a26afd9e34c1d3246502926"
     }
     Frame {
         msec: 1680
-        hash: "774740a393f3e9b8f12b81cce8da8280"
+        hash: "a65d51747c0183a3a096e51326fdae78"
     }
     Frame {
         msec: 1696
-        hash: "64cd225202ed6c91b02c368a9160a656"
+        hash: "705cd5a0717b6a8de8871bf0bfb38129"
     }
     Frame {
         msec: 1712
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
+        hash: "befd4cd74f59291a9f9a01ad2a051029"
     }
     Frame {
         msec: 1728
-        hash: "47e920e3884ccf2f0f49e78070af6929"
+        hash: "7083d70df6cc476ec342abbe6f4409b4"
     }
     Frame {
         msec: 1744
-        hash: "fe899138116774df4c4441687e3019c5"
+        hash: "5153a42348885ce8de81f8086f73c163"
     }
     Frame {
         msec: 1760
-        hash: "5d9ee853f083d514fbe51d6953d8e000"
+        hash: "e24ad2d67f10d2cc58dffcc469342005"
     }
     Frame {
         msec: 1776
-        hash: "5736362b42bc2d801e02edabb983663a"
+        hash: "7722a4c025f1d2b560c7fec8ba8f7b6d"
     }
     Frame {
         msec: 1792
-        hash: "c3ea530de646612f9203c5800cad884b"
+        hash: "3ef9de605fff5d3156bccc99a93c5da6"
     }
     Frame {
         msec: 1808
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
+        hash: "b221f14ea2c04078e23ac37ef817c50e"
     }
     Frame {
         msec: 1824
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
+        hash: "05013a538f2796c728b4d0ddad059851"
     }
     Frame {
         msec: 1840
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
+        hash: "30aadc837ec2e7d8a2495453348804bc"
     }
     Frame {
         msec: 1856
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
+        hash: "098b063b0e5eb3dd22adb3353342725e"
     }
     Frame {
         msec: 1872
-        hash: "25506557c853a0020e98cf3992956989"
+        hash: "e4809aefa55620a86484f66582d4d1b6"
     }
     Frame {
         msec: 1888
-        hash: "9a64706c52c9e962816953e32950b8ba"
+        hash: "98d48920293b11511e8bbf820dd49acc"
     }
     Frame {
         msec: 1904
-        hash: "3cbfded47413172ada64095e65c55e8a"
+        hash: "2570806925c3a61a7afaa09331c6eed8"
     }
     Frame {
         msec: 1920
@@ -486,1338 +486,58 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "c5e399e29b988148913e62ee208b3326"
+        hash: "62430dd693c4eaeb7afe9e85229406a4"
     }
     Frame {
         msec: 1952
-        hash: "b980703c1d0018937e83a8ba8862469e"
+        hash: "9419c891e347fe6b25d30c05bae5d14c"
     }
     Frame {
         msec: 1968
-        hash: "05312f9529c94d3331ace7d73c544284"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 1984
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2000
-        hash: "ee297a2d68c9e58157d9bf189d353713"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2016
-        hash: "00f3c9b8b37cb104cf2a7701639bc61f"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2032
-        hash: "ee297a2d68c9e58157d9bf189d353713"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2048
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2064
-        hash: "05312f9529c94d3331ace7d73c544284"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2080
-        hash: "b980703c1d0018937e83a8ba8862469e"
+        hash: "9419c891e347fe6b25d30c05bae5d14c"
     }
     Frame {
         msec: 2096
-        hash: "c5e399e29b988148913e62ee208b3326"
+        hash: "62430dd693c4eaeb7afe9e85229406a4"
     }
     Frame {
         msec: 2112
-        hash: "3b7b83e97d17440b42e6ef4b962076d8"
+        hash: "a9b6aeb509076bf17c2068ce280326fb"
     }
     Frame {
         msec: 2128
-        hash: "3cbfded47413172ada64095e65c55e8a"
+        hash: "2570806925c3a61a7afaa09331c6eed8"
     }
     Frame {
         msec: 2144
-        hash: "9a64706c52c9e962816953e32950b8ba"
-    }
-    Frame {
-        msec: 2160
-        hash: "25506557c853a0020e98cf3992956989"
-    }
-    Frame {
-        msec: 2176
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
-    }
-    Frame {
-        msec: 2192
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
-    }
-    Frame {
-        msec: 2208
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
-    }
-    Frame {
-        msec: 2224
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
-    }
-    Frame {
-        msec: 2240
-        hash: "c3ea530de646612f9203c5800cad884b"
-    }
-    Frame {
-        msec: 2256
-        hash: "5736362b42bc2d801e02edabb983663a"
-    }
-    Frame {
-        msec: 2272
-        hash: "5d9ee853f083d514fbe51d6953d8e000"
-    }
-    Frame {
-        msec: 2288
-        hash: "fe899138116774df4c4441687e3019c5"
-    }
-    Frame {
-        msec: 2304
-        hash: "47e920e3884ccf2f0f49e78070af6929"
-    }
-    Frame {
-        msec: 2320
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
-    }
-    Frame {
-        msec: 2336
-        hash: "64cd225202ed6c91b02c368a9160a656"
-    }
-    Frame {
-        msec: 2352
-        hash: "774740a393f3e9b8f12b81cce8da8280"
-    }
-    Frame {
-        msec: 2368
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
-    }
-    Frame {
-        msec: 2384
-        hash: "705d9c8de05c859a42769f73761c6a63"
-    }
-    Frame {
-        msec: 2400
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
-    }
-    Frame {
-        msec: 2416
-        hash: "880640372bf584955627f6835f24be13"
-    }
-    Frame {
-        msec: 2432
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
-    }
-    Frame {
-        msec: 2448
-        hash: "a087b532ecb2f28e4ee60819228c2522"
-    }
-    Frame {
-        msec: 2464
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
-    }
-    Frame {
-        msec: 2480
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
-    }
-    Frame {
-        msec: 2496
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
-    }
-    Frame {
-        msec: 2512
-        hash: "deed4c06c9b713834490832b88e7acaf"
-    }
-    Frame {
-        msec: 2528
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
-    }
-    Frame {
-        msec: 2544
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
-    }
-    Frame {
-        msec: 2560
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
-    }
-    Frame {
-        msec: 2576
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
-    }
-    Frame {
-        msec: 2592
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
-    }
-    Frame {
-        msec: 2608
-        hash: "5cc90d798786c270ddd2616512f4459f"
-    }
-    Frame {
-        msec: 2624
-        hash: "00ab7798bcd77a99886dff0414f35382"
-    }
-    Frame {
-        msec: 2640
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
-    }
-    Frame {
-        msec: 2656
-        hash: "45d891d804609ebbe1d5ac3f826d0c17"
-    }
-    Frame {
-        msec: 2672
-        hash: "d65d50fbb920e683b041a1c72238225b"
-    }
-    Frame {
-        msec: 2688
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
-    }
-    Frame {
-        msec: 2704
-        hash: "39cc17ee2e889f17dd07179fda99e431"
-    }
-    Frame {
-        msec: 2720
-        hash: "fce2648975106bc5c0ca9a4530f7f748"
-    }
-    Frame {
-        msec: 2736
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
-    }
-    Frame {
-        msec: 2752
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
-    }
-    Frame {
-        msec: 2768
-        hash: "2084ccc60ddd493399c128717816d33b"
-    }
-    Frame {
-        msec: 2784
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
-    }
-    Frame {
-        msec: 2800
-        hash: "1f964c6c9bebdc9945dc69a6095400f7"
-    }
-    Frame {
-        msec: 2816
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
-    }
-    Frame {
-        msec: 2832
-        hash: "07acba64dc608439a8a54fcb080379e8"
-    }
-    Frame {
-        msec: 2848
-        hash: "d6615fc345831a3cc5b9a7196284b632"
-    }
-    Frame {
-        msec: 2864
-        hash: "85ef33fcb3f91e4fc20391bf94455984"
-    }
-    Frame {
-        msec: 2880
-        image: "animated-smooth.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "53f05993ba3b426949badd2e4cd66d84"
-    }
-    Frame {
-        msec: 2912
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
-    }
-    Frame {
-        msec: 2928
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
-    }
-    Frame {
-        msec: 2944
-        hash: "853429387cc639496c7338244de7e1b7"
-    }
-    Frame {
-        msec: 2960
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
-    }
-    Frame {
-        msec: 2976
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
-    }
-    Frame {
-        msec: 2992
-        hash: "b0070117f1c24a4da87434725d4bb989"
-    }
-    Frame {
-        msec: 3008
-        hash: "8b8120cfc14de03e048632fdea61be21"
-    }
-    Frame {
-        msec: 3024
-        hash: "845170815a87565dc4229792032b3357"
-    }
-    Frame {
-        msec: 3040
-        hash: "0d407ee07692d0e5a480a60952807b3c"
-    }
-    Frame {
-        msec: 3056
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
-    }
-    Frame {
-        msec: 3072
-        hash: "d7e96278583f83ab636ed68fa130e4d2"
-    }
-    Frame {
-        msec: 3088
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
-    }
-    Frame {
-        msec: 3104
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
-    }
-    Frame {
-        msec: 3120
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
-    }
-    Frame {
-        msec: 3136
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
-    }
-    Frame {
-        msec: 3152
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
-    }
-    Frame {
-        msec: 3168
-        hash: "b699285764f5e8866a9996f4a0dccc69"
-    }
-    Frame {
-        msec: 3184
-        hash: "84ef6dda8318b623832f58c46d762e89"
-    }
-    Frame {
-        msec: 3200
-        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
-    }
-    Frame {
-        msec: 3216
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
-    }
-    Frame {
-        msec: 3232
-        hash: "5d3e85acabe5e5ff802eb7731676274f"
-    }
-    Frame {
-        msec: 3248
-        hash: "fd85d1dd931033973283a408b5e328a8"
-    }
-    Frame {
-        msec: 3264
-        hash: "3a77785cfd7755f567619d8e04583f6a"
-    }
-    Frame {
-        msec: 3280
-        hash: "efc119983701908a904deb24108c59cb"
-    }
-    Frame {
-        msec: 3296
-        hash: "74af3457583fbaf73f14556aeccc8403"
-    }
-    Frame {
-        msec: 3312
-        hash: "3e81338d38723d56f2d6c428271f81c1"
-    }
-    Frame {
-        msec: 3328
-        hash: "41987e6b4248d7944c0dbc6eb3862023"
-    }
-    Frame {
-        msec: 3344
-        hash: "3d518cd0348d6202243364af1dd6ce89"
-    }
-    Frame {
-        msec: 3360
-        hash: "4310a4c3037d845f088f21ad608f366a"
-    }
-    Frame {
-        msec: 3376
-        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
-    }
-    Frame {
-        msec: 3392
-        hash: "f4d0d3bca25e67908b38910f47b4757e"
-    }
-    Frame {
-        msec: 3408
-        hash: "89c159ef00d273ecfe61332e1bf7244d"
-    }
-    Frame {
-        msec: 3424
-        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
-    }
-    Frame {
-        msec: 3440
-        hash: "61c16009b65a55bffb63e27727e1615e"
-    }
-    Frame {
-        msec: 3456
-        hash: "16c16c77c65b36d1e0954d5ead2642be"
-    }
-    Frame {
-        msec: 3472
-        hash: "31d65134f340d82dd40f2401bda3fb7e"
-    }
-    Frame {
-        msec: 3488
-        hash: "061406edcbd2d4930ab89c3fcab63c7f"
-    }
-    Frame {
-        msec: 3504
-        hash: "0af81ee0d76ff8335a0e347dc086ca37"
-    }
-    Frame {
-        msec: 3520
-        hash: "0f347763f25350ebb62dda1536372b45"
-    }
-    Frame {
-        msec: 3536
-        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
-    }
-    Frame {
-        msec: 3552
-        hash: "64ecb03aa538e74d0b99c6dec7751401"
-    }
-    Frame {
-        msec: 3568
-        hash: "170a1d5fe3422cf5223a78015a6a45fd"
-    }
-    Frame {
-        msec: 3584
-        hash: "10307beea6d99ab0ff5863f8e35555ed"
-    }
-    Frame {
-        msec: 3600
-        hash: "456be9c208d690c479ba12bf6325dde0"
-    }
-    Frame {
-        msec: 3616
-        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
-    }
-    Frame {
-        msec: 3632
-        hash: "277ef98ea859fb7685fe6cd44a538a7d"
-    }
-    Frame {
-        msec: 3648
-        hash: "74c837b29f7f05b615123f0e608b523f"
-    }
-    Frame {
-        msec: 3664
-        hash: "d671a3b971468e1d8aa30ab655e020a9"
-    }
-    Frame {
-        msec: 3680
-        hash: "df624d70cae1bcefda8d69c0ff055d83"
-    }
-    Frame {
-        msec: 3696
-        hash: "3f9a09ae19be34348bb2552915360cf7"
-    }
-    Frame {
-        msec: 3712
-        hash: "83c029e328e80af83158c37089cf0ece"
-    }
-    Frame {
-        msec: 3728
-        hash: "323af110731b7af0c30f8862ff59b833"
-    }
-    Frame {
-        msec: 3744
-        hash: "63d3c47f7dec1236440a05e0a8380900"
-    }
-    Frame {
-        msec: 3760
-        hash: "48e62dd171f5da82b5aa26c765e4042c"
-    }
-    Frame {
-        msec: 3776
-        hash: "5a8932d13d624932a65694fd19ec05cd"
-    }
-    Frame {
-        msec: 3792
-        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
-    }
-    Frame {
-        msec: 3808
-        hash: "a716c8d2c94433dee719f92f0822c8ec"
-    }
-    Frame {
-        msec: 3824
-        hash: "7b66e21652a7d0982226e281a48411a9"
-    }
-    Frame {
-        msec: 3840
-        image: "animated-smooth.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "59470d71fa4426d0283e86371f2bfc2a"
-    }
-    Frame {
-        msec: 3872
-        hash: "ed9f2ca797894612600bc4b7fbaecb84"
-    }
-    Frame {
-        msec: 3888
-        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
-    }
-    Frame {
-        msec: 3904
-        hash: "cd2180be80101c2aa4350b51b7a6f502"
-    }
-    Frame {
-        msec: 3920
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3936
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3952
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3968
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3984
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4000
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4016
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4032
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4048
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4064
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4080
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4096
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4128
-        hash: "cd2180be80101c2aa4350b51b7a6f502"
-    }
-    Frame {
-        msec: 4144
-        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
-    }
-    Frame {
-        msec: 4160
-        hash: "ed9f2ca797894612600bc4b7fbaecb84"
-    }
-    Frame {
-        msec: 4176
-        hash: "59470d71fa4426d0283e86371f2bfc2a"
-    }
-    Frame {
-        msec: 4192
-        hash: "9a2f92efb51bcc6293d6a8e82d5314ea"
-    }
-    Frame {
-        msec: 4208
-        hash: "7b66e21652a7d0982226e281a48411a9"
-    }
-    Frame {
-        msec: 4224
-        hash: "a716c8d2c94433dee719f92f0822c8ec"
-    }
-    Frame {
-        msec: 4240
-        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
-    }
-    Frame {
-        msec: 4256
-        hash: "5a8932d13d624932a65694fd19ec05cd"
-    }
-    Frame {
-        msec: 4272
-        hash: "48e62dd171f5da82b5aa26c765e4042c"
-    }
-    Frame {
-        msec: 4288
-        hash: "63d3c47f7dec1236440a05e0a8380900"
-    }
-    Frame {
-        msec: 4304
-        hash: "323af110731b7af0c30f8862ff59b833"
-    }
-    Frame {
-        msec: 4320
-        hash: "83c029e328e80af83158c37089cf0ece"
-    }
-    Frame {
-        msec: 4336
-        hash: "3f9a09ae19be34348bb2552915360cf7"
-    }
-    Frame {
-        msec: 4352
-        hash: "df624d70cae1bcefda8d69c0ff055d83"
-    }
-    Frame {
-        msec: 4368
-        hash: "d671a3b971468e1d8aa30ab655e020a9"
-    }
-    Frame {
-        msec: 4384
-        hash: "74c837b29f7f05b615123f0e608b523f"
-    }
-    Frame {
-        msec: 4400
-        hash: "277ef98ea859fb7685fe6cd44a538a7d"
-    }
-    Frame {
-        msec: 4416
-        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
-    }
-    Frame {
-        msec: 4432
-        hash: "456be9c208d690c479ba12bf6325dde0"
-    }
-    Frame {
-        msec: 4448
-        hash: "10307beea6d99ab0ff5863f8e35555ed"
-    }
-    Frame {
-        msec: 4464
-        hash: "170a1d5fe3422cf5223a78015a6a45fd"
-    }
-    Frame {
-        msec: 4480
-        hash: "64ecb03aa538e74d0b99c6dec7751401"
-    }
-    Frame {
-        msec: 4496
-        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
-    }
-    Frame {
-        msec: 4512
-        hash: "0f347763f25350ebb62dda1536372b45"
-    }
-    Frame {
-        msec: 4528
-        hash: "0af81ee0d76ff8335a0e347dc086ca37"
-    }
-    Frame {
-        msec: 4544
-        hash: "061406edcbd2d4930ab89c3fcab63c7f"
-    }
-    Frame {
-        msec: 4560
-        hash: "31d65134f340d82dd40f2401bda3fb7e"
-    }
-    Frame {
-        msec: 4576
-        hash: "16c16c77c65b36d1e0954d5ead2642be"
-    }
-    Frame {
-        msec: 4592
-        hash: "61c16009b65a55bffb63e27727e1615e"
-    }
-    Frame {
-        msec: 4608
-        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
-    }
-    Frame {
-        msec: 4624
-        hash: "89c159ef00d273ecfe61332e1bf7244d"
-    }
-    Frame {
-        msec: 4640
-        hash: "f4d0d3bca25e67908b38910f47b4757e"
-    }
-    Frame {
-        msec: 4656
-        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
-    }
-    Frame {
-        msec: 4672
-        hash: "4310a4c3037d845f088f21ad608f366a"
-    }
-    Frame {
-        msec: 4688
-        hash: "3d518cd0348d6202243364af1dd6ce89"
-    }
-    Frame {
-        msec: 4704
-        hash: "41987e6b4248d7944c0dbc6eb3862023"
-    }
-    Frame {
-        msec: 4720
-        hash: "3e81338d38723d56f2d6c428271f81c1"
-    }
-    Frame {
-        msec: 4736
-        hash: "74af3457583fbaf73f14556aeccc8403"
-    }
-    Frame {
-        msec: 4752
-        hash: "efc119983701908a904deb24108c59cb"
-    }
-    Frame {
-        msec: 4768
-        hash: "3a77785cfd7755f567619d8e04583f6a"
-    }
-    Frame {
-        msec: 4784
-        hash: "fd85d1dd931033973283a408b5e328a8"
-    }
-    Frame {
-        msec: 4800
-        image: "animated-smooth.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
-    }
-    Frame {
-        msec: 4832
-        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
-    }
-    Frame {
-        msec: 4848
-        hash: "84ef6dda8318b623832f58c46d762e89"
-    }
-    Frame {
-        msec: 4864
-        hash: "b699285764f5e8866a9996f4a0dccc69"
-    }
-    Frame {
-        msec: 4880
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
-    }
-    Frame {
-        msec: 4896
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
-    }
-    Frame {
-        msec: 4912
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
-    }
-    Frame {
-        msec: 4928
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
-    }
-    Frame {
-        msec: 4944
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
-    }
-    Frame {
-        msec: 4960
-        hash: "d7e96278583f83ab636ed68fa130e4d2"
-    }
-    Frame {
-        msec: 4976
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
-    }
-    Frame {
-        msec: 4992
-        hash: "0d407ee07692d0e5a480a60952807b3c"
-    }
-    Frame {
-        msec: 5008
-        hash: "845170815a87565dc4229792032b3357"
-    }
-    Frame {
-        msec: 5024
-        hash: "8b8120cfc14de03e048632fdea61be21"
-    }
-    Frame {
-        msec: 5040
-        hash: "b0070117f1c24a4da87434725d4bb989"
-    }
-    Frame {
-        msec: 5056
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
-    }
-    Frame {
-        msec: 5072
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
-    }
-    Frame {
-        msec: 5088
-        hash: "853429387cc639496c7338244de7e1b7"
-    }
-    Frame {
-        msec: 5104
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
-    }
-    Frame {
-        msec: 5120
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
-    }
-    Frame {
-        msec: 5136
-        hash: "53f05993ba3b426949badd2e4cd66d84"
-    }
-    Frame {
-        msec: 5152
-        hash: "23291a0239c69ea07db959e709b1ff5f"
-    }
-    Frame {
-        msec: 5168
-        hash: "85ef33fcb3f91e4fc20391bf94455984"
-    }
-    Frame {
-        msec: 5184
-        hash: "d6615fc345831a3cc5b9a7196284b632"
-    }
-    Frame {
-        msec: 5200
-        hash: "07acba64dc608439a8a54fcb080379e8"
-    }
-    Frame {
-        msec: 5216
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
-    }
-    Frame {
-        msec: 5232
-        hash: "1f964c6c9bebdc9945dc69a6095400f7"
-    }
-    Frame {
-        msec: 5248
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
-    }
-    Frame {
-        msec: 5264
-        hash: "2084ccc60ddd493399c128717816d33b"
-    }
-    Frame {
-        msec: 5280
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
-    }
-    Frame {
-        msec: 5296
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
-    }
-    Frame {
-        msec: 5312
-        hash: "fce2648975106bc5c0ca9a4530f7f748"
-    }
-    Frame {
-        msec: 5328
-        hash: "39cc17ee2e889f17dd07179fda99e431"
-    }
-    Frame {
-        msec: 5344
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
-    }
-    Frame {
-        msec: 5360
-        hash: "d65d50fbb920e683b041a1c72238225b"
-    }
-    Frame {
-        msec: 5376
-        hash: "45d891d804609ebbe1d5ac3f826d0c17"
-    }
-    Frame {
-        msec: 5392
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
-    }
-    Frame {
-        msec: 5408
-        hash: "00ab7798bcd77a99886dff0414f35382"
-    }
-    Frame {
-        msec: 5424
-        hash: "5cc90d798786c270ddd2616512f4459f"
-    }
-    Frame {
-        msec: 5440
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
-    }
-    Frame {
-        msec: 5456
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
-    }
-    Frame {
-        msec: 5472
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
-    }
-    Frame {
-        msec: 5488
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
-    }
-    Frame {
-        msec: 5504
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
-    }
-    Frame {
-        msec: 5520
-        hash: "deed4c06c9b713834490832b88e7acaf"
-    }
-    Frame {
-        msec: 5536
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
-    }
-    Frame {
-        msec: 5552
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
-    }
-    Frame {
-        msec: 5568
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
-    }
-    Frame {
-        msec: 5584
-        hash: "a087b532ecb2f28e4ee60819228c2522"
-    }
-    Frame {
-        msec: 5600
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
-    }
-    Frame {
-        msec: 5616
-        hash: "880640372bf584955627f6835f24be13"
-    }
-    Frame {
-        msec: 5632
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
-    }
-    Frame {
-        msec: 5648
-        hash: "705d9c8de05c859a42769f73761c6a63"
-    }
-    Frame {
-        msec: 5664
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
-    }
-    Frame {
-        msec: 5680
-        hash: "774740a393f3e9b8f12b81cce8da8280"
-    }
-    Frame {
-        msec: 5696
-        hash: "64cd225202ed6c91b02c368a9160a656"
-    }
-    Frame {
-        msec: 5712
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
-    }
-    Frame {
-        msec: 5728
-        hash: "47e920e3884ccf2f0f49e78070af6929"
-    }
-    Frame {
-        msec: 5744
-        hash: "fe899138116774df4c4441687e3019c5"
-    }
-    Frame {
-        msec: 5760
-        image: "animated-smooth.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "5736362b42bc2d801e02edabb983663a"
-    }
-    Frame {
-        msec: 5792
-        hash: "c3ea530de646612f9203c5800cad884b"
-    }
-    Frame {
-        msec: 5808
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
-    }
-    Frame {
-        msec: 5824
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
-    }
-    Frame {
-        msec: 5840
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
-    }
-    Frame {
-        msec: 5856
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
-    }
-    Frame {
-        msec: 5872
-        hash: "25506557c853a0020e98cf3992956989"
-    }
-    Frame {
-        msec: 5888
-        hash: "9a64706c52c9e962816953e32950b8ba"
-    }
-    Frame {
-        msec: 5904
-        hash: "3cbfded47413172ada64095e65c55e8a"
-    }
-    Frame {
-        msec: 5920
-        hash: "3b7b83e97d17440b42e6ef4b962076d8"
-    }
-    Frame {
-        msec: 5936
-        hash: "c5e399e29b988148913e62ee208b3326"
-    }
-    Frame {
-        msec: 5952
-        hash: "b980703c1d0018937e83a8ba8862469e"
-    }
-    Frame {
-        msec: 5968
-        hash: "05312f9529c94d3331ace7d73c544284"
-    }
-    Frame {
-        msec: 5984
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
-    }
-    Frame {
-        msec: 6000
-        hash: "ee297a2d68c9e58157d9bf189d353713"
-    }
-    Frame {
-        msec: 6016
-        hash: "00f3c9b8b37cb104cf2a7701639bc61f"
-    }
-    Frame {
-        msec: 6032
-        hash: "ee297a2d68c9e58157d9bf189d353713"
-    }
-    Frame {
-        msec: 6048
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
-    }
-    Frame {
-        msec: 6064
-        hash: "05312f9529c94d3331ace7d73c544284"
-    }
-    Frame {
-        msec: 6080
-        hash: "b980703c1d0018937e83a8ba8862469e"
-    }
-    Frame {
-        msec: 6096
-        hash: "c5e399e29b988148913e62ee208b3326"
-    }
-    Frame {
-        msec: 6112
-        hash: "3b7b83e97d17440b42e6ef4b962076d8"
-    }
-    Frame {
-        msec: 6128
-        hash: "3cbfded47413172ada64095e65c55e8a"
-    }
-    Frame {
-        msec: 6144
-        hash: "9a64706c52c9e962816953e32950b8ba"
-    }
-    Frame {
-        msec: 6160
-        hash: "25506557c853a0020e98cf3992956989"
-    }
-    Frame {
-        msec: 6176
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
-    }
-    Frame {
-        msec: 6192
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
-    }
-    Frame {
-        msec: 6208
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
-    }
-    Frame {
-        msec: 6224
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
-    }
-    Frame {
-        msec: 6240
-        hash: "c3ea530de646612f9203c5800cad884b"
-    }
-    Frame {
-        msec: 6256
-        hash: "5736362b42bc2d801e02edabb983663a"
-    }
-    Frame {
-        msec: 6272
-        hash: "5d9ee853f083d514fbe51d6953d8e000"
-    }
-    Frame {
-        msec: 6288
-        hash: "fe899138116774df4c4441687e3019c5"
-    }
-    Frame {
-        msec: 6304
-        hash: "47e920e3884ccf2f0f49e78070af6929"
-    }
-    Frame {
-        msec: 6320
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
-    }
-    Frame {
-        msec: 6336
-        hash: "64cd225202ed6c91b02c368a9160a656"
-    }
-    Frame {
-        msec: 6352
-        hash: "774740a393f3e9b8f12b81cce8da8280"
-    }
-    Frame {
-        msec: 6368
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
-    }
-    Frame {
-        msec: 6384
-        hash: "705d9c8de05c859a42769f73761c6a63"
-    }
-    Frame {
-        msec: 6400
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
-    }
-    Frame {
-        msec: 6416
-        hash: "880640372bf584955627f6835f24be13"
-    }
-    Frame {
-        msec: 6432
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
-    }
-    Frame {
-        msec: 6448
-        hash: "a087b532ecb2f28e4ee60819228c2522"
-    }
-    Frame {
-        msec: 6464
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
-    }
-    Frame {
-        msec: 6480
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
-    }
-    Frame {
-        msec: 6496
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
-    }
-    Frame {
-        msec: 6512
-        hash: "deed4c06c9b713834490832b88e7acaf"
-    }
-    Frame {
-        msec: 6528
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
-    }
-    Frame {
-        msec: 6544
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
-    }
-    Frame {
-        msec: 6560
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
-    }
-    Frame {
-        msec: 6576
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
-    }
-    Frame {
-        msec: 6592
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
-    }
-    Frame {
-        msec: 6608
-        hash: "5cc90d798786c270ddd2616512f4459f"
-    }
-    Frame {
-        msec: 6624
-        hash: "00ab7798bcd77a99886dff0414f35382"
-    }
-    Frame {
-        msec: 6640
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
-    }
-    Frame {
-        msec: 6656
-        hash: "45d891d804609ebbe1d5ac3f826d0c17"
-    }
-    Frame {
-        msec: 6672
-        hash: "d65d50fbb920e683b041a1c72238225b"
-    }
-    Frame {
-        msec: 6688
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
-    }
-    Frame {
-        msec: 6704
-        hash: "39cc17ee2e889f17dd07179fda99e431"
-    }
-    Frame {
-        msec: 6720
-        image: "animated-smooth.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
-    }
-    Frame {
-        msec: 6752
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
-    }
-    Frame {
-        msec: 6768
-        hash: "2084ccc60ddd493399c128717816d33b"
-    }
-    Frame {
-        msec: 6784
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
-    }
-    Frame {
-        msec: 6800
-        hash: "1f964c6c9bebdc9945dc69a6095400f7"
-    }
-    Frame {
-        msec: 6816
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
-    }
-    Frame {
-        msec: 6832
-        hash: "07acba64dc608439a8a54fcb080379e8"
-    }
-    Frame {
-        msec: 6848
-        hash: "d6615fc345831a3cc5b9a7196284b632"
-    }
-    Frame {
-        msec: 6864
-        hash: "85ef33fcb3f91e4fc20391bf94455984"
-    }
-    Frame {
-        msec: 6880
-        hash: "23291a0239c69ea07db959e709b1ff5f"
-    }
-    Frame {
-        msec: 6896
-        hash: "53f05993ba3b426949badd2e4cd66d84"
-    }
-    Frame {
-        msec: 6912
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
-    }
-    Frame {
-        msec: 6928
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
-    }
-    Frame {
-        msec: 6944
-        hash: "853429387cc639496c7338244de7e1b7"
-    }
-    Frame {
-        msec: 6960
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
-    }
-    Frame {
-        msec: 6976
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
-    }
-    Frame {
-        msec: 6992
-        hash: "b0070117f1c24a4da87434725d4bb989"
-    }
-    Frame {
-        msec: 7008
-        hash: "8b8120cfc14de03e048632fdea61be21"
-    }
-    Frame {
-        msec: 7024
-        hash: "845170815a87565dc4229792032b3357"
-    }
-    Frame {
-        msec: 7040
-        hash: "0d407ee07692d0e5a480a60952807b3c"
-    }
-    Frame {
-        msec: 7056
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
-    }
-    Frame {
-        msec: 7072
-        hash: "d7e96278583f83ab636ed68fa130e4d2"
-    }
-    Frame {
-        msec: 7088
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7104
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
-    }
-    Frame {
-        msec: 7120
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
-    }
-    Frame {
-        msec: 7136
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
-    }
-    Frame {
-        msec: 7152
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
-    }
-    Frame {
-        msec: 7168
-        hash: "b699285764f5e8866a9996f4a0dccc69"
-    }
-    Frame {
-        msec: 7184
-        hash: "84ef6dda8318b623832f58c46d762e89"
-    }
-    Frame {
-        msec: 7200
-        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
-    }
-    Frame {
-        msec: 7216
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
-    }
-    Frame {
-        msec: 7232
-        hash: "5d3e85acabe5e5ff802eb7731676274f"
+        hash: "98d48920293b11511e8bbf820dd49acc"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.0.png
index 99228f9..3efd596 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.1.png
index a2dcd00..517fc06 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.2.png
deleted file mode 100644
index 8a80020..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.3.png
deleted file mode 100644
index 02b57ef..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.4.png
deleted file mode 100644
index df0f6cc..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.5.png
deleted file mode 100644
index 0add64d..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.6.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.6.png
deleted file mode 100644
index 0886207..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.7.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.7.png
deleted file mode 100644
index bc1a7b0..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.qml
index 630a6d2..236003a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.qml
@@ -22,223 +22,223 @@ VisualTest {
     }
     Frame {
         msec: 80
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
     }
     Frame {
         msec: 96
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "465ec993948f7b75aeb5759976f4620d"
     }
     Frame {
         msec: 112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "b63e4d1686057828fd8781f1c33585f5"
     }
     Frame {
         msec: 128
-        hash: "4c60d345821f515c7811f3b69eb94607"
+        hash: "4d45d70f997c2c67166905c97a900d2e"
     }
     Frame {
         msec: 144
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
+        hash: "08b9be66e23c7b6f6f629c7470394601"
     }
     Frame {
         msec: 160
-        hash: "228d5312c261d1a5455faf69ec2f2520"
+        hash: "406224b535b4425d2708df0083acdc8e"
     }
     Frame {
         msec: 176
-        hash: "465ec993948f7b75aeb5759976f4620d"
+        hash: "8419f1d75b14130730bcfec4e3a9b058"
     }
     Frame {
         msec: 192
-        hash: "755cfccc38bababc468fe6e1076804bb"
+        hash: "c1936628aec13e08e9581dcd2c6d5717"
     }
     Frame {
         msec: 208
-        hash: "b63e4d1686057828fd8781f1c33585f5"
+        hash: "8c66a33d26eec2a1133f4362710a5fab"
     }
     Frame {
         msec: 224
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
+        hash: "01947e631c3db43f7c5b4427229bc0c8"
     }
     Frame {
         msec: 240
-        hash: "4d45d70f997c2c67166905c97a900d2e"
+        hash: "06d8d8a1a41893d4e27725948a75caf4"
     }
     Frame {
         msec: 256
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
+        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
     }
     Frame {
         msec: 272
-        hash: "08b9be66e23c7b6f6f629c7470394601"
+        hash: "2a7bed775824968e318c3d40fbc5b1c2"
     }
     Frame {
         msec: 288
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
+        hash: "f1a7a4a67a21f5025294af4bea3f8998"
     }
     Frame {
         msec: 304
-        hash: "406224b535b4425d2708df0083acdc8e"
+        hash: "18c2f321a149e38b258ac264d40c2376"
     }
     Frame {
         msec: 320
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
+        hash: "19d05a96f3ae7388e854bbf1075b51c1"
     }
     Frame {
         msec: 336
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
+        hash: "554e1d360463871e7c05cfe6f8abe1dd"
     }
     Frame {
         msec: 352
-        hash: "a85ee8be6a47bbd1b14137803ce606ec"
+        hash: "60f158382f75103c78e2b9b408e0fe65"
     }
     Frame {
         msec: 368
-        hash: "c1936628aec13e08e9581dcd2c6d5717"
+        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
     }
     Frame {
         msec: 384
-        hash: "75c9bf83ca3fe24612c245698c089430"
+        hash: "a6f17da2dd581bdc249ff62f833dc025"
     }
     Frame {
         msec: 400
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
+        hash: "1ea07ee309ce2c52cbc36370b75a872f"
     }
     Frame {
         msec: 416
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
+        hash: "c7eb7837dce71c914186326216214eeb"
     }
     Frame {
         msec: 432
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
+        hash: "93cf31eabb454ec536c638a506be0648"
     }
     Frame {
         msec: 448
-        hash: "3f62f032239d412d3637198f5e3e83d6"
+        hash: "1ac8c393f084aa1894c26610b7f40ea6"
     }
     Frame {
         msec: 464
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
+        hash: "f04e84ad3579d6334077abe73101d206"
     }
     Frame {
         msec: 480
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
+        hash: "ff0928dfd16b2da9811a172c19817a97"
     }
     Frame {
         msec: 496
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
+        hash: "7383209c80b403b93da3264eadbc047f"
     }
     Frame {
         msec: 512
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
+        hash: "bc747167dfb3388ac63e9e68a86b9a03"
     }
     Frame {
         msec: 528
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
+        hash: "ae48da4a66f93c806725ce749700aac8"
     }
     Frame {
         msec: 544
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
+        hash: "956429472da133324c970774f77784f5"
     }
     Frame {
         msec: 560
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
+        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
     }
     Frame {
         msec: 576
-        hash: "a40014d842471784e1222eb205395f6f"
+        hash: "81d2fc6727dc7449d1a87b4abea9b704"
     }
     Frame {
         msec: 592
-        hash: "18c2f321a149e38b258ac264d40c2376"
+        hash: "80ebac4d923f67fb8dba3d133ce657ba"
     }
     Frame {
         msec: 608
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
+        hash: "5359f5e45e5467c62c2d9521c8199c48"
     }
     Frame {
         msec: 624
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
+        hash: "08f55088cdce741c67539f73291e53ab"
     }
     Frame {
         msec: 640
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
+        hash: "97f7a2175dcf9ac2581a92d614d72f88"
     }
     Frame {
         msec: 656
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
+        hash: "985868869ef2c332da379460a2f3a71b"
     }
     Frame {
         msec: 672
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
+        hash: "e91bb914c1eb63cd4269b30a220a128a"
     }
     Frame {
         msec: 688
-        hash: "60f158382f75103c78e2b9b408e0fe65"
+        hash: "84c94704c16e246df1048f958cc8cefb"
     }
     Frame {
         msec: 704
-        hash: "4e60300cfab8634e04dcd1b556251d31"
+        hash: "99de44f74f8e1f79652ab46afb4bb59e"
     }
     Frame {
         msec: 720
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
+        hash: "a1bd4e995365e79389dba80f9e3b7af8"
     }
     Frame {
         msec: 736
-        hash: "b74521d6ac531414aeeca0fb28379d11"
+        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
     }
     Frame {
         msec: 752
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
+        hash: "11673a112566a64aca3c7010b9cc9c4d"
     }
     Frame {
         msec: 768
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
+        hash: "5b027815ea3c1ea54e1a02c798c468db"
     }
     Frame {
         msec: 784
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
+        hash: "73c5f23f51797a33f4d2898738e6356e"
     }
     Frame {
         msec: 800
-        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
+        hash: "fb17df681d99d5de05f6329bba697ea5"
     }
     Frame {
         msec: 816
-        hash: "c7eb7837dce71c914186326216214eeb"
+        hash: "0b1a741975e3d9ef8f5e78f371c89441"
     }
     Frame {
         msec: 832
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
+        hash: "a790f0e884ab85f7802dd094e4ef550f"
     }
     Frame {
         msec: 848
-        hash: "93cf31eabb454ec536c638a506be0648"
+        hash: "b12faa76c07adc21634cd8f8cb8436ae"
     }
     Frame {
         msec: 864
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
+        hash: "f57727419bb51fb1e589b960ddeb20ae"
     }
     Frame {
         msec: 880
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
+        hash: "8172e076b05d95248d89e815fde820ef"
     }
     Frame {
         msec: 896
-        hash: "8861bf848da5c96b35addff736b01520"
+        hash: "74c1e71378b502bc1b732a55806a10f1"
     }
     Frame {
         msec: 912
-        hash: "f04e84ad3579d6334077abe73101d206"
+        hash: "a67e9a0f55512fb1c55f13c6b483923b"
     }
     Frame {
         msec: 928
-        hash: "eac4600372f0fdfadee88896ac915a48"
+        hash: "13ca95adab171d9fad9ee8b75d0226bc"
     }
     Frame {
         msec: 944
-        hash: "ff0928dfd16b2da9811a172c19817a97"
+        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
     }
     Frame {
         msec: 960
@@ -246,239 +246,239 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "7383209c80b403b93da3264eadbc047f"
+        hash: "29245946cbd811fe6bf6b2b41cc13002"
     }
     Frame {
         msec: 992
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
+        hash: "058c918e83bfdd665cd836566b53959b"
     }
     Frame {
         msec: 1008
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
+        hash: "ed5d80c33dbf72624385b1cf43784626"
     }
     Frame {
         msec: 1024
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
+        hash: "ed5d80c33dbf72624385b1cf43784626"
     }
     Frame {
         msec: 1040
-        hash: "ae48da4a66f93c806725ce749700aac8"
+        hash: "058c918e83bfdd665cd836566b53959b"
     }
     Frame {
         msec: 1056
-        hash: "c763f56728e17fc119539a4d45dfccc3"
+        hash: "29245946cbd811fe6bf6b2b41cc13002"
     }
     Frame {
         msec: 1072
-        hash: "956429472da133324c970774f77784f5"
+        hash: "d1ed4916cb1ecff60277d74369ff311b"
     }
     Frame {
         msec: 1088
-        hash: "a4ddb4956d71fd642d54757938100cf3"
+        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
     }
     Frame {
         msec: 1104
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
+        hash: "13ca95adab171d9fad9ee8b75d0226bc"
     }
     Frame {
         msec: 1120
-        hash: "68dae343cf324391ec6721cea14575f7"
+        hash: "a67e9a0f55512fb1c55f13c6b483923b"
     }
     Frame {
         msec: 1136
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
+        hash: "74c1e71378b502bc1b732a55806a10f1"
     }
     Frame {
         msec: 1152
-        hash: "c3a1f12febc979150028737722d6d045"
+        hash: "8172e076b05d95248d89e815fde820ef"
     }
     Frame {
         msec: 1168
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
+        hash: "f57727419bb51fb1e589b960ddeb20ae"
     }
     Frame {
         msec: 1184
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
+        hash: "b12faa76c07adc21634cd8f8cb8436ae"
     }
     Frame {
         msec: 1200
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
+        hash: "a790f0e884ab85f7802dd094e4ef550f"
     }
     Frame {
         msec: 1216
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
+        hash: "0b1a741975e3d9ef8f5e78f371c89441"
     }
     Frame {
         msec: 1232
-        hash: "08f55088cdce741c67539f73291e53ab"
+        hash: "fb17df681d99d5de05f6329bba697ea5"
     }
     Frame {
         msec: 1248
-        hash: "93128906d054e44bfd126fc22bdc3102"
+        hash: "73c5f23f51797a33f4d2898738e6356e"
     }
     Frame {
         msec: 1264
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
+        hash: "5b027815ea3c1ea54e1a02c798c468db"
     }
     Frame {
         msec: 1280
-        hash: "587cb6e05048579088e88e0180e3ad48"
+        hash: "11673a112566a64aca3c7010b9cc9c4d"
     }
     Frame {
         msec: 1296
-        hash: "985868869ef2c332da379460a2f3a71b"
+        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
     }
     Frame {
         msec: 1312
-        hash: "94084ca4998fcda408f6987f52c34185"
+        hash: "a1bd4e995365e79389dba80f9e3b7af8"
     }
     Frame {
         msec: 1328
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
+        hash: "99de44f74f8e1f79652ab46afb4bb59e"
     }
     Frame {
         msec: 1344
-        hash: "e880d93963c80e4fab5173554c9600fc"
+        hash: "84c94704c16e246df1048f958cc8cefb"
     }
     Frame {
         msec: 1360
-        hash: "84c94704c16e246df1048f958cc8cefb"
+        hash: "e91bb914c1eb63cd4269b30a220a128a"
     }
     Frame {
         msec: 1376
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
+        hash: "985868869ef2c332da379460a2f3a71b"
     }
     Frame {
         msec: 1392
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
+        hash: "97f7a2175dcf9ac2581a92d614d72f88"
     }
     Frame {
         msec: 1408
-        hash: "44072400ca3f0237d1aebae28a94becc"
+        hash: "08f55088cdce741c67539f73291e53ab"
     }
     Frame {
         msec: 1424
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
+        hash: "5359f5e45e5467c62c2d9521c8199c48"
     }
     Frame {
         msec: 1440
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
+        hash: "80ebac4d923f67fb8dba3d133ce657ba"
     }
     Frame {
         msec: 1456
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
+        hash: "81d2fc6727dc7449d1a87b4abea9b704"
     }
     Frame {
         msec: 1472
-        hash: "826c7741ba0c51de407bb799e8f360b5"
+        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
     }
     Frame {
         msec: 1488
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
+        hash: "956429472da133324c970774f77784f5"
     }
     Frame {
         msec: 1504
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
+        hash: "ae48da4a66f93c806725ce749700aac8"
     }
     Frame {
         msec: 1520
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
+        hash: "bc747167dfb3388ac63e9e68a86b9a03"
     }
     Frame {
         msec: 1536
-        hash: "65c514c9e926affe1da0b4826d2754c7"
+        hash: "7383209c80b403b93da3264eadbc047f"
     }
     Frame {
         msec: 1552
-        hash: "73c5f23f51797a33f4d2898738e6356e"
+        hash: "ff0928dfd16b2da9811a172c19817a97"
     }
     Frame {
         msec: 1568
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
+        hash: "f04e84ad3579d6334077abe73101d206"
     }
     Frame {
         msec: 1584
-        hash: "fb17df681d99d5de05f6329bba697ea5"
+        hash: "1ac8c393f084aa1894c26610b7f40ea6"
     }
     Frame {
         msec: 1600
-        hash: "1bf7a98884b506b38326f59f85a53f41"
+        hash: "93cf31eabb454ec536c638a506be0648"
     }
     Frame {
         msec: 1616
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
+        hash: "c7eb7837dce71c914186326216214eeb"
     }
     Frame {
         msec: 1632
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
+        hash: "1ea07ee309ce2c52cbc36370b75a872f"
     }
     Frame {
         msec: 1648
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
+        hash: "a6f17da2dd581bdc249ff62f833dc025"
     }
     Frame {
         msec: 1664
-        hash: "3b644aac161f0a75bfb64f5075373190"
+        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
     }
     Frame {
         msec: 1680
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
+        hash: "60f158382f75103c78e2b9b408e0fe65"
     }
     Frame {
         msec: 1696
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
+        hash: "554e1d360463871e7c05cfe6f8abe1dd"
     }
     Frame {
         msec: 1712
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
+        hash: "19d05a96f3ae7388e854bbf1075b51c1"
     }
     Frame {
         msec: 1728
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
+        hash: "18c2f321a149e38b258ac264d40c2376"
     }
     Frame {
         msec: 1744
-        hash: "8172e076b05d95248d89e815fde820ef"
+        hash: "f1a7a4a67a21f5025294af4bea3f8998"
     }
     Frame {
         msec: 1760
-        hash: "a88d6fc324ef48aa52c642a1662ec679"
+        hash: "2a7bed775824968e318c3d40fbc5b1c2"
     }
     Frame {
         msec: 1776
-        hash: "74c1e71378b502bc1b732a55806a10f1"
+        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
     }
     Frame {
         msec: 1792
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
+        hash: "06d8d8a1a41893d4e27725948a75caf4"
     }
     Frame {
         msec: 1808
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
+        hash: "01947e631c3db43f7c5b4427229bc0c8"
     }
     Frame {
         msec: 1824
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
+        hash: "8c66a33d26eec2a1133f4362710a5fab"
     }
     Frame {
         msec: 1840
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
+        hash: "c1936628aec13e08e9581dcd2c6d5717"
     }
     Frame {
         msec: 1856
-        hash: "affab9fb48c889a2680eb81458d400f9"
+        hash: "8419f1d75b14130730bcfec4e3a9b058"
     }
     Frame {
         msec: 1872
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
+        hash: "406224b535b4425d2708df0083acdc8e"
     }
     Frame {
         msec: 1888
-        hash: "36c054064c9a76f4072492e55c70fb6c"
+        hash: "08b9be66e23c7b6f6f629c7470394601"
     }
     Frame {
         msec: 1904
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
+        hash: "4d45d70f997c2c67166905c97a900d2e"
     }
     Frame {
         msec: 1920
@@ -486,1606 +486,70 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
+        hash: "465ec993948f7b75aeb5759976f4620d"
     }
     Frame {
         msec: 1952
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
     }
     Frame {
         msec: 1968
-        hash: "058c918e83bfdd665cd836566b53959b"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 1984
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2000
-        hash: "ed5d80c33dbf72624385b1cf43784626"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2016
-        hash: "911591db1519ba264847f09868e38e0e"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2032
-        hash: "ed5d80c33dbf72624385b1cf43784626"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2048
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2064
-        hash: "058c918e83bfdd665cd836566b53959b"
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
     }
     Frame {
         msec: 2080
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
     }
     Frame {
         msec: 2096
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
+        hash: "465ec993948f7b75aeb5759976f4620d"
     }
     Frame {
         msec: 2112
-        hash: "63ebaa4869728f5e2891d068e4b0091c"
+        hash: "b63e4d1686057828fd8781f1c33585f5"
     }
     Frame {
         msec: 2128
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
+        hash: "4d45d70f997c2c67166905c97a900d2e"
     }
     Frame {
         msec: 2144
-        hash: "36c054064c9a76f4072492e55c70fb6c"
+        hash: "08b9be66e23c7b6f6f629c7470394601"
     }
     Frame {
         msec: 2160
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
+        hash: "406224b535b4425d2708df0083acdc8e"
     }
     Frame {
         msec: 2176
-        hash: "affab9fb48c889a2680eb81458d400f9"
+        hash: "8419f1d75b14130730bcfec4e3a9b058"
     }
     Frame {
         msec: 2192
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
-    }
-    Frame {
-        msec: 2208
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
-    }
-    Frame {
-        msec: 2224
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
-    }
-    Frame {
-        msec: 2240
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
-    }
-    Frame {
-        msec: 2256
-        hash: "74c1e71378b502bc1b732a55806a10f1"
-    }
-    Frame {
-        msec: 2272
-        hash: "a88d6fc324ef48aa52c642a1662ec679"
-    }
-    Frame {
-        msec: 2288
-        hash: "8172e076b05d95248d89e815fde820ef"
-    }
-    Frame {
-        msec: 2304
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
-    }
-    Frame {
-        msec: 2320
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
-    }
-    Frame {
-        msec: 2336
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
-    }
-    Frame {
-        msec: 2352
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
-    }
-    Frame {
-        msec: 2368
-        hash: "3b644aac161f0a75bfb64f5075373190"
-    }
-    Frame {
-        msec: 2384
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
-    }
-    Frame {
-        msec: 2400
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
-    }
-    Frame {
-        msec: 2416
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
-    }
-    Frame {
-        msec: 2432
-        hash: "1bf7a98884b506b38326f59f85a53f41"
-    }
-    Frame {
-        msec: 2448
-        hash: "fb17df681d99d5de05f6329bba697ea5"
-    }
-    Frame {
-        msec: 2464
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
-    }
-    Frame {
-        msec: 2480
-        hash: "73c5f23f51797a33f4d2898738e6356e"
-    }
-    Frame {
-        msec: 2496
-        hash: "65c514c9e926affe1da0b4826d2754c7"
-    }
-    Frame {
-        msec: 2512
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
-    }
-    Frame {
-        msec: 2528
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
-    }
-    Frame {
-        msec: 2544
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
-    }
-    Frame {
-        msec: 2560
-        hash: "826c7741ba0c51de407bb799e8f360b5"
-    }
-    Frame {
-        msec: 2576
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
-    }
-    Frame {
-        msec: 2592
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
-    }
-    Frame {
-        msec: 2608
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
-    }
-    Frame {
-        msec: 2624
-        hash: "44072400ca3f0237d1aebae28a94becc"
-    }
-    Frame {
-        msec: 2640
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
-    }
-    Frame {
-        msec: 2656
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
-    }
-    Frame {
-        msec: 2672
-        hash: "84c94704c16e246df1048f958cc8cefb"
-    }
-    Frame {
-        msec: 2688
-        hash: "e880d93963c80e4fab5173554c9600fc"
-    }
-    Frame {
-        msec: 2704
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
-    }
-    Frame {
-        msec: 2720
-        hash: "94084ca4998fcda408f6987f52c34185"
-    }
-    Frame {
-        msec: 2736
-        hash: "985868869ef2c332da379460a2f3a71b"
-    }
-    Frame {
-        msec: 2752
-        hash: "587cb6e05048579088e88e0180e3ad48"
-    }
-    Frame {
-        msec: 2768
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
-    }
-    Frame {
-        msec: 2784
-        hash: "93128906d054e44bfd126fc22bdc3102"
-    }
-    Frame {
-        msec: 2800
-        hash: "08f55088cdce741c67539f73291e53ab"
-    }
-    Frame {
-        msec: 2816
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
-    }
-    Frame {
-        msec: 2832
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
-    }
-    Frame {
-        msec: 2848
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
-    }
-    Frame {
-        msec: 2864
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
-    }
-    Frame {
-        msec: 2880
-        image: "animated.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
-    }
-    Frame {
-        msec: 2912
-        hash: "68dae343cf324391ec6721cea14575f7"
-    }
-    Frame {
-        msec: 2928
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
-    }
-    Frame {
-        msec: 2944
-        hash: "a4ddb4956d71fd642d54757938100cf3"
-    }
-    Frame {
-        msec: 2960
-        hash: "956429472da133324c970774f77784f5"
-    }
-    Frame {
-        msec: 2976
-        hash: "c763f56728e17fc119539a4d45dfccc3"
-    }
-    Frame {
-        msec: 2992
-        hash: "ae48da4a66f93c806725ce749700aac8"
-    }
-    Frame {
-        msec: 3008
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
-    }
-    Frame {
-        msec: 3024
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
-    }
-    Frame {
-        msec: 3040
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
-    }
-    Frame {
-        msec: 3056
-        hash: "7383209c80b403b93da3264eadbc047f"
-    }
-    Frame {
-        msec: 3072
-        hash: "280288a7988736e30a2a3e4289ac3b0c"
-    }
-    Frame {
-        msec: 3088
-        hash: "ff0928dfd16b2da9811a172c19817a97"
-    }
-    Frame {
-        msec: 3104
-        hash: "eac4600372f0fdfadee88896ac915a48"
-    }
-    Frame {
-        msec: 3120
-        hash: "f04e84ad3579d6334077abe73101d206"
-    }
-    Frame {
-        msec: 3136
-        hash: "8861bf848da5c96b35addff736b01520"
-    }
-    Frame {
-        msec: 3152
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
-    }
-    Frame {
-        msec: 3168
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
-    }
-    Frame {
-        msec: 3184
-        hash: "93cf31eabb454ec536c638a506be0648"
-    }
-    Frame {
-        msec: 3200
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
-    }
-    Frame {
-        msec: 3216
-        hash: "c7eb7837dce71c914186326216214eeb"
-    }
-    Frame {
-        msec: 3232
-        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
-    }
-    Frame {
-        msec: 3248
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
-    }
-    Frame {
-        msec: 3264
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
-    }
-    Frame {
-        msec: 3280
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
-    }
-    Frame {
-        msec: 3296
-        hash: "b74521d6ac531414aeeca0fb28379d11"
-    }
-    Frame {
-        msec: 3312
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
-    }
-    Frame {
-        msec: 3328
-        hash: "4e60300cfab8634e04dcd1b556251d31"
-    }
-    Frame {
-        msec: 3344
-        hash: "60f158382f75103c78e2b9b408e0fe65"
-    }
-    Frame {
-        msec: 3360
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
-    }
-    Frame {
-        msec: 3376
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
-    }
-    Frame {
-        msec: 3392
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
-    }
-    Frame {
-        msec: 3408
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
-    }
-    Frame {
-        msec: 3424
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
-    }
-    Frame {
-        msec: 3440
-        hash: "18c2f321a149e38b258ac264d40c2376"
-    }
-    Frame {
-        msec: 3456
-        hash: "a40014d842471784e1222eb205395f6f"
-    }
-    Frame {
-        msec: 3472
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
-    }
-    Frame {
-        msec: 3488
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
-    }
-    Frame {
-        msec: 3504
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
-    }
-    Frame {
-        msec: 3520
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
-    }
-    Frame {
-        msec: 3536
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
-    }
-    Frame {
-        msec: 3552
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
-    }
-    Frame {
-        msec: 3568
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
-    }
-    Frame {
-        msec: 3584
-        hash: "3f62f032239d412d3637198f5e3e83d6"
-    }
-    Frame {
-        msec: 3600
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
-    }
-    Frame {
-        msec: 3616
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
-    }
-    Frame {
-        msec: 3632
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
-    }
-    Frame {
-        msec: 3648
-        hash: "75c9bf83ca3fe24612c245698c089430"
-    }
-    Frame {
-        msec: 3664
-        hash: "c1936628aec13e08e9581dcd2c6d5717"
-    }
-    Frame {
-        msec: 3680
-        hash: "a85ee8be6a47bbd1b14137803ce606ec"
-    }
-    Frame {
-        msec: 3696
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
-    }
-    Frame {
-        msec: 3712
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
-    }
-    Frame {
-        msec: 3728
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-    Frame {
-        msec: 3744
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 3760
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Frame {
-        msec: 3776
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 3792
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 3808
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 3824
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 3840
-        image: "animated.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 3872
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 3888
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 3904
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 3920
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3936
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3952
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3968
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3984
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4000
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4016
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4032
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4048
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4064
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4080
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4096
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4128
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 4144
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 4160
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 4176
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 4192
-        hash: "755cfccc38bababc468fe6e1076804bb"
-    }
-    Frame {
-        msec: 4208
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 4224
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 4240
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 4256
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 4272
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Frame {
-        msec: 4288
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 4304
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-    Frame {
-        msec: 4320
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
-    }
-    Frame {
-        msec: 4336
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
-    }
-    Frame {
-        msec: 4352
-        hash: "a85ee8be6a47bbd1b14137803ce606ec"
-    }
-    Frame {
-        msec: 4368
-        hash: "c1936628aec13e08e9581dcd2c6d5717"
-    }
-    Frame {
-        msec: 4384
-        hash: "75c9bf83ca3fe24612c245698c089430"
-    }
-    Frame {
-        msec: 4400
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
-    }
-    Frame {
-        msec: 4416
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
-    }
-    Frame {
-        msec: 4432
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
-    }
-    Frame {
-        msec: 4448
-        hash: "3f62f032239d412d3637198f5e3e83d6"
-    }
-    Frame {
-        msec: 4464
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
-    }
-    Frame {
-        msec: 4480
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
-    }
-    Frame {
-        msec: 4496
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
-    }
-    Frame {
-        msec: 4512
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
-    }
-    Frame {
-        msec: 4528
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
-    }
-    Frame {
-        msec: 4544
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
-    }
-    Frame {
-        msec: 4560
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
-    }
-    Frame {
-        msec: 4576
-        hash: "a40014d842471784e1222eb205395f6f"
-    }
-    Frame {
-        msec: 4592
-        hash: "18c2f321a149e38b258ac264d40c2376"
-    }
-    Frame {
-        msec: 4608
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
-    }
-    Frame {
-        msec: 4624
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
-    }
-    Frame {
-        msec: 4640
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
-    }
-    Frame {
-        msec: 4656
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
-    }
-    Frame {
-        msec: 4672
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
-    }
-    Frame {
-        msec: 4688
-        hash: "60f158382f75103c78e2b9b408e0fe65"
-    }
-    Frame {
-        msec: 4704
-        hash: "4e60300cfab8634e04dcd1b556251d31"
-    }
-    Frame {
-        msec: 4720
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
-    }
-    Frame {
-        msec: 4736
-        hash: "b74521d6ac531414aeeca0fb28379d11"
-    }
-    Frame {
-        msec: 4752
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
-    }
-    Frame {
-        msec: 4768
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
-    }
-    Frame {
-        msec: 4784
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
-    }
-    Frame {
-        msec: 4800
-        image: "animated.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "c7eb7837dce71c914186326216214eeb"
-    }
-    Frame {
-        msec: 4832
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
-    }
-    Frame {
-        msec: 4848
-        hash: "93cf31eabb454ec536c638a506be0648"
-    }
-    Frame {
-        msec: 4864
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
-    }
-    Frame {
-        msec: 4880
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
-    }
-    Frame {
-        msec: 4896
-        hash: "8861bf848da5c96b35addff736b01520"
-    }
-    Frame {
-        msec: 4912
-        hash: "f04e84ad3579d6334077abe73101d206"
-    }
-    Frame {
-        msec: 4928
-        hash: "eac4600372f0fdfadee88896ac915a48"
-    }
-    Frame {
-        msec: 4944
-        hash: "ff0928dfd16b2da9811a172c19817a97"
-    }
-    Frame {
-        msec: 4960
-        hash: "280288a7988736e30a2a3e4289ac3b0c"
-    }
-    Frame {
-        msec: 4976
-        hash: "7383209c80b403b93da3264eadbc047f"
-    }
-    Frame {
-        msec: 4992
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
-    }
-    Frame {
-        msec: 5008
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
-    }
-    Frame {
-        msec: 5024
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
-    }
-    Frame {
-        msec: 5040
-        hash: "ae48da4a66f93c806725ce749700aac8"
-    }
-    Frame {
-        msec: 5056
-        hash: "c763f56728e17fc119539a4d45dfccc3"
-    }
-    Frame {
-        msec: 5072
-        hash: "956429472da133324c970774f77784f5"
-    }
-    Frame {
-        msec: 5088
-        hash: "a4ddb4956d71fd642d54757938100cf3"
-    }
-    Frame {
-        msec: 5104
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
-    }
-    Frame {
-        msec: 5120
-        hash: "68dae343cf324391ec6721cea14575f7"
-    }
-    Frame {
-        msec: 5136
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
-    }
-    Frame {
-        msec: 5152
-        hash: "c3a1f12febc979150028737722d6d045"
-    }
-    Frame {
-        msec: 5168
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
-    }
-    Frame {
-        msec: 5184
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
-    }
-    Frame {
-        msec: 5200
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
-    }
-    Frame {
-        msec: 5216
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
-    }
-    Frame {
-        msec: 5232
-        hash: "08f55088cdce741c67539f73291e53ab"
-    }
-    Frame {
-        msec: 5248
-        hash: "93128906d054e44bfd126fc22bdc3102"
-    }
-    Frame {
-        msec: 5264
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
-    }
-    Frame {
-        msec: 5280
-        hash: "587cb6e05048579088e88e0180e3ad48"
-    }
-    Frame {
-        msec: 5296
-        hash: "985868869ef2c332da379460a2f3a71b"
-    }
-    Frame {
-        msec: 5312
-        hash: "94084ca4998fcda408f6987f52c34185"
-    }
-    Frame {
-        msec: 5328
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
-    }
-    Frame {
-        msec: 5344
-        hash: "e880d93963c80e4fab5173554c9600fc"
-    }
-    Frame {
-        msec: 5360
-        hash: "84c94704c16e246df1048f958cc8cefb"
-    }
-    Frame {
-        msec: 5376
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
-    }
-    Frame {
-        msec: 5392
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
-    }
-    Frame {
-        msec: 5408
-        hash: "44072400ca3f0237d1aebae28a94becc"
-    }
-    Frame {
-        msec: 5424
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
-    }
-    Frame {
-        msec: 5440
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
-    }
-    Frame {
-        msec: 5456
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
-    }
-    Frame {
-        msec: 5472
-        hash: "826c7741ba0c51de407bb799e8f360b5"
-    }
-    Frame {
-        msec: 5488
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
-    }
-    Frame {
-        msec: 5504
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
-    }
-    Frame {
-        msec: 5520
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
-    }
-    Frame {
-        msec: 5536
-        hash: "65c514c9e926affe1da0b4826d2754c7"
-    }
-    Frame {
-        msec: 5552
-        hash: "73c5f23f51797a33f4d2898738e6356e"
-    }
-    Frame {
-        msec: 5568
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
-    }
-    Frame {
-        msec: 5584
-        hash: "fb17df681d99d5de05f6329bba697ea5"
-    }
-    Frame {
-        msec: 5600
-        hash: "1bf7a98884b506b38326f59f85a53f41"
-    }
-    Frame {
-        msec: 5616
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
-    }
-    Frame {
-        msec: 5632
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
-    }
-    Frame {
-        msec: 5648
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
-    }
-    Frame {
-        msec: 5664
-        hash: "3b644aac161f0a75bfb64f5075373190"
-    }
-    Frame {
-        msec: 5680
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
-    }
-    Frame {
-        msec: 5696
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
-    }
-    Frame {
-        msec: 5712
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
-    }
-    Frame {
-        msec: 5728
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
-    }
-    Frame {
-        msec: 5744
-        hash: "8172e076b05d95248d89e815fde820ef"
-    }
-    Frame {
-        msec: 5760
-        image: "animated.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "74c1e71378b502bc1b732a55806a10f1"
-    }
-    Frame {
-        msec: 5792
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
-    }
-    Frame {
-        msec: 5808
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
-    }
-    Frame {
-        msec: 5824
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
-    }
-    Frame {
-        msec: 5840
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
-    }
-    Frame {
-        msec: 5856
-        hash: "affab9fb48c889a2680eb81458d400f9"
-    }
-    Frame {
-        msec: 5872
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
-    }
-    Frame {
-        msec: 5888
-        hash: "36c054064c9a76f4072492e55c70fb6c"
-    }
-    Frame {
-        msec: 5904
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
-    }
-    Frame {
-        msec: 5920
-        hash: "63ebaa4869728f5e2891d068e4b0091c"
-    }
-    Frame {
-        msec: 5936
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
-    }
-    Frame {
-        msec: 5952
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
-    }
-    Frame {
-        msec: 5968
-        hash: "058c918e83bfdd665cd836566b53959b"
-    }
-    Frame {
-        msec: 5984
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
-    }
-    Frame {
-        msec: 6000
-        hash: "ed5d80c33dbf72624385b1cf43784626"
-    }
-    Frame {
-        msec: 6016
-        hash: "911591db1519ba264847f09868e38e0e"
-    }
-    Frame {
-        msec: 6032
-        hash: "ed5d80c33dbf72624385b1cf43784626"
-    }
-    Frame {
-        msec: 6048
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
-    }
-    Frame {
-        msec: 6064
-        hash: "058c918e83bfdd665cd836566b53959b"
-    }
-    Frame {
-        msec: 6080
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
-    }
-    Frame {
-        msec: 6096
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
-    }
-    Frame {
-        msec: 6112
-        hash: "63ebaa4869728f5e2891d068e4b0091c"
-    }
-    Frame {
-        msec: 6128
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
-    }
-    Frame {
-        msec: 6144
-        hash: "36c054064c9a76f4072492e55c70fb6c"
-    }
-    Frame {
-        msec: 6160
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
-    }
-    Frame {
-        msec: 6176
-        hash: "affab9fb48c889a2680eb81458d400f9"
-    }
-    Frame {
-        msec: 6192
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
-    }
-    Frame {
-        msec: 6208
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
-    }
-    Frame {
-        msec: 6224
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
-    }
-    Frame {
-        msec: 6240
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
-    }
-    Frame {
-        msec: 6256
-        hash: "74c1e71378b502bc1b732a55806a10f1"
-    }
-    Frame {
-        msec: 6272
-        hash: "a88d6fc324ef48aa52c642a1662ec679"
-    }
-    Frame {
-        msec: 6288
-        hash: "8172e076b05d95248d89e815fde820ef"
-    }
-    Frame {
-        msec: 6304
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
-    }
-    Frame {
-        msec: 6320
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
-    }
-    Frame {
-        msec: 6336
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
-    }
-    Frame {
-        msec: 6352
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
-    }
-    Frame {
-        msec: 6368
-        hash: "3b644aac161f0a75bfb64f5075373190"
-    }
-    Frame {
-        msec: 6384
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
-    }
-    Frame {
-        msec: 6400
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
-    }
-    Frame {
-        msec: 6416
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
-    }
-    Frame {
-        msec: 6432
-        hash: "1bf7a98884b506b38326f59f85a53f41"
-    }
-    Frame {
-        msec: 6448
-        hash: "fb17df681d99d5de05f6329bba697ea5"
-    }
-    Frame {
-        msec: 6464
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
-    }
-    Frame {
-        msec: 6480
-        hash: "73c5f23f51797a33f4d2898738e6356e"
-    }
-    Frame {
-        msec: 6496
-        hash: "65c514c9e926affe1da0b4826d2754c7"
-    }
-    Frame {
-        msec: 6512
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
-    }
-    Frame {
-        msec: 6528
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
-    }
-    Frame {
-        msec: 6544
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
-    }
-    Frame {
-        msec: 6560
-        hash: "826c7741ba0c51de407bb799e8f360b5"
-    }
-    Frame {
-        msec: 6576
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
-    }
-    Frame {
-        msec: 6592
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
-    }
-    Frame {
-        msec: 6608
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
-    }
-    Frame {
-        msec: 6624
-        hash: "44072400ca3f0237d1aebae28a94becc"
-    }
-    Frame {
-        msec: 6640
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
-    }
-    Frame {
-        msec: 6656
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
-    }
-    Frame {
-        msec: 6672
-        hash: "84c94704c16e246df1048f958cc8cefb"
-    }
-    Frame {
-        msec: 6688
-        hash: "e880d93963c80e4fab5173554c9600fc"
-    }
-    Frame {
-        msec: 6704
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
-    }
-    Frame {
-        msec: 6720
-        image: "animated.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "985868869ef2c332da379460a2f3a71b"
-    }
-    Frame {
-        msec: 6752
-        hash: "587cb6e05048579088e88e0180e3ad48"
-    }
-    Frame {
-        msec: 6768
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
-    }
-    Frame {
-        msec: 6784
-        hash: "93128906d054e44bfd126fc22bdc3102"
-    }
-    Frame {
-        msec: 6800
-        hash: "08f55088cdce741c67539f73291e53ab"
-    }
-    Frame {
-        msec: 6816
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
-    }
-    Frame {
-        msec: 6832
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
-    }
-    Frame {
-        msec: 6848
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
-    }
-    Frame {
-        msec: 6864
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
-    }
-    Frame {
-        msec: 6880
-        hash: "c3a1f12febc979150028737722d6d045"
-    }
-    Frame {
-        msec: 6896
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
-    }
-    Frame {
-        msec: 6912
-        hash: "68dae343cf324391ec6721cea14575f7"
-    }
-    Frame {
-        msec: 6928
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
-    }
-    Frame {
-        msec: 6944
-        hash: "a4ddb4956d71fd642d54757938100cf3"
-    }
-    Frame {
-        msec: 6960
-        hash: "956429472da133324c970774f77784f5"
-    }
-    Frame {
-        msec: 6976
-        hash: "c763f56728e17fc119539a4d45dfccc3"
-    }
-    Frame {
-        msec: 6992
-        hash: "ae48da4a66f93c806725ce749700aac8"
-    }
-    Frame {
-        msec: 7008
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
-    }
-    Frame {
-        msec: 7024
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
-    }
-    Frame {
-        msec: 7040
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
-    }
-    Frame {
-        msec: 7056
-        hash: "7383209c80b403b93da3264eadbc047f"
-    }
-    Frame {
-        msec: 7072
-        hash: "280288a7988736e30a2a3e4289ac3b0c"
-    }
-    Frame {
-        msec: 7088
-        hash: "ff0928dfd16b2da9811a172c19817a97"
-    }
-    Frame {
-        msec: 7104
-        hash: "eac4600372f0fdfadee88896ac915a48"
-    }
-    Frame {
-        msec: 7120
-        hash: "f04e84ad3579d6334077abe73101d206"
-    }
-    Frame {
-        msec: 7136
-        hash: "8861bf848da5c96b35addff736b01520"
-    }
-    Frame {
-        msec: 7152
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
-    }
-    Frame {
-        msec: 7168
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
-    }
-    Frame {
-        msec: 7184
-        hash: "93cf31eabb454ec536c638a506be0648"
-    }
-    Frame {
-        msec: 7200
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
-    }
-    Frame {
-        msec: 7216
-        hash: "c7eb7837dce71c914186326216214eeb"
-    }
-    Frame {
-        msec: 7232
-        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
-    }
-    Frame {
-        msec: 7248
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
-    }
-    Frame {
-        msec: 7264
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
-    }
-    Frame {
-        msec: 7280
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
-    }
-    Frame {
-        msec: 7296
-        hash: "b74521d6ac531414aeeca0fb28379d11"
-    }
-    Frame {
-        msec: 7312
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
-    }
-    Frame {
-        msec: 7328
-        hash: "4e60300cfab8634e04dcd1b556251d31"
-    }
-    Frame {
-        msec: 7344
-        hash: "60f158382f75103c78e2b9b408e0fe65"
-    }
-    Frame {
-        msec: 7360
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
-    }
-    Frame {
-        msec: 7376
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
-    }
-    Frame {
-        msec: 7392
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
-    }
-    Frame {
-        msec: 7408
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
-    }
-    Frame {
-        msec: 7424
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
-    }
-    Frame {
-        msec: 7440
-        hash: "18c2f321a149e38b258ac264d40c2376"
-    }
-    Frame {
-        msec: 7456
-        hash: "a40014d842471784e1222eb205395f6f"
-    }
-    Frame {
-        msec: 7472
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
-    }
-    Frame {
-        msec: 7488
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
-    }
-    Frame {
-        msec: 7504
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
-    }
-    Frame {
-        msec: 7520
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
-    }
-    Frame {
-        msec: 7536
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
-    }
-    Frame {
-        msec: 7552
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
-    }
-    Frame {
-        msec: 7568
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
-    }
-    Frame {
-        msec: 7584
-        hash: "3f62f032239d412d3637198f5e3e83d6"
-    }
-    Frame {
-        msec: 7600
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
-    }
-    Frame {
-        msec: 7616
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
-    }
-    Frame {
-        msec: 7632
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
-    }
-    Frame {
-        msec: 7648
-        hash: "75c9bf83ca3fe24612c245698c089430"
-    }
-    Frame {
-        msec: 7664
         hash: "c1936628aec13e08e9581dcd2c6d5717"
     }
-    Frame {
-        msec: 7680
-        image: "animated.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
-    }
-    Frame {
-        msec: 7712
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
-    }
-    Frame {
-        msec: 7728
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-    Frame {
-        msec: 7744
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 7760
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Frame {
-        msec: 7776
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 7792
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 7808
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 7824
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 7840
-        hash: "755cfccc38bababc468fe6e1076804bb"
-    }
-    Frame {
-        msec: 7856
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 7872
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 7888
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 7904
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 7920
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7936
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7952
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7968
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7984
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8000
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8016
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8032
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8048
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8064
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8080
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8096
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8128
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 8144
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 8160
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 8176
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 8192
-        hash: "755cfccc38bababc468fe6e1076804bb"
-    }
-    Frame {
-        msec: 8208
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 8224
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 8240
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 8256
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 8272
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8288
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 8304
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png
index bb9dfbb..03d7082 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png differ
-- 
cgit v0.12


From 29de2567ae5b32ac6871119eb573736f3e345da6 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 11:21:57 +1000
Subject: Clean up qdeclarativeflickable visual tests

They are mostly still fine, it's just that the flickable parameters
had changed. Expected outputs have been revised.

Task-number: QTBUG-14792
---
 .../data/flickable-horizontal.0.png                |  Bin 1427 -> 1423 bytes
 .../data/flickable-horizontal.1.png                |  Bin 1357 -> 1424 bytes
 .../data/flickable-horizontal.2.png                |  Bin 1405 -> 1397 bytes
 .../data/flickable-horizontal.3.png                |  Bin 1427 -> 1453 bytes
 .../data/flickable-horizontal.qml                  | 1144 ++-
 .../data/flickable-vertical.0.png                  |  Bin 1951 -> 1971 bytes
 .../data/flickable-vertical.1.png                  |  Bin 1951 -> 1941 bytes
 .../data/flickable-vertical.10.png                 |  Bin 1952 -> 1966 bytes
 .../data/flickable-vertical.11.png                 |  Bin 1930 -> 1966 bytes
 .../data/flickable-vertical.12.png                 |  Bin 1974 -> 1966 bytes
 .../data/flickable-vertical.13.png                 |  Bin 1961 -> 1972 bytes
 .../data/flickable-vertical.14.png                 |  Bin 1959 -> 0 bytes
 .../data/flickable-vertical.15.png                 |  Bin 1937 -> 0 bytes
 .../data/flickable-vertical.16.png                 |  Bin 1618 -> 0 bytes
 .../data/flickable-vertical.17.png                 |  Bin 1952 -> 0 bytes
 .../data/flickable-vertical.18.png                 |  Bin 1952 -> 0 bytes
 .../data/flickable-vertical.19.png                 |  Bin 1930 -> 0 bytes
 .../data/flickable-vertical.2.png                  |  Bin 1976 -> 1629 bytes
 .../data/flickable-vertical.20.png                 |  Bin 1930 -> 0 bytes
 .../data/flickable-vertical.21.png                 |  Bin 1947 -> 0 bytes
 .../data/flickable-vertical.22.png                 |  Bin 1941 -> 0 bytes
 .../data/flickable-vertical.23.png                 |  Bin 1951 -> 0 bytes
 .../data/flickable-vertical.24.png                 |    0
 .../data/flickable-vertical.3.png                  |  Bin 1987 -> 1966 bytes
 .../data/flickable-vertical.4.png                  |  Bin 1947 -> 1966 bytes
 .../data/flickable-vertical.5.png                  |  Bin 1975 -> 1995 bytes
 .../data/flickable-vertical.6.png                  |  Bin 1928 -> 2013 bytes
 .../data/flickable-vertical.7.png                  |  Bin 1928 -> 1963 bytes
 .../data/flickable-vertical.8.png                  |  Bin 1928 -> 1963 bytes
 .../data/flickable-vertical.9.png                  |  Bin 1928 -> 2002 bytes
 .../data/flickable-vertical.qml                    | 7504 ++++++++------------
 .../qdeclarativeflickable/flickable-vertical.qml   |    2 +-
 32 files changed, 3788 insertions(+), 4862 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.14.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.15.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.16.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.17.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.18.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.19.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.20.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.21.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.22.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.23.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.24.png

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.0.png
index 016902b..f8b7339 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.1.png
index a654936..2d29f35 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.2.png
index cfd5517..507d9ca 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.3.png
index 016902b..1622522 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.qml
index 289af88..92f108c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.qml
@@ -6,309 +6,277 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 32
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 48
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 64
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 80
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 96
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 112
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 128
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 144
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 160
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 176
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 192
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 208
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 224
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 240
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 256
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 272
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 288
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 304
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 320
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 336
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 352
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 368
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 384
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 400
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 416
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 432
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 448
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 464
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 480
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 496
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 512
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 528
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 544
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 560
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 576
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 592
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 608
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 624
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 640
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 656
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 672
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 688
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 704
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 720
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 447; y: 145
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 736
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 752
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 768
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 784
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 800
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 816
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 832
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 848
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 864
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 880
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 896
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 912
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 928
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 944
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Mouse {
-        type: 2
-        button: 1
+        type: 5
+        button: 0
         buttons: 1
-        x: 477; y: 171
+        x: 446; y: 145
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 960
-        image: "flickable-horizontal.0.png"
+        msec: 784
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 473; y: 171
+        x: 440; y: 146
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 976
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        msec: 800
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 463; y: 171
+        x: 425; y: 151
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 992
-        hash: "c4d91a9e7f785ccd50db55f697d75cb9"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 407; y: 157
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 1008
-        hash: "c4d91a9e7f785ccd50db55f697d75cb9"
+        msec: 816
+        hash: "c92e345e4ffdb30c28d9d5aa5400bd30"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 449; y: 171
+        x: 359; y: 169
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 1024
-        hash: "4f054038668f56cf3fc46dee08504b24"
+        msec: 832
+        hash: "90f94986ab44ab59618e9a5da17b8cc9"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 425; y: 172
+        x: 309; y: 181
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 1040
-        hash: "e6ae6e2a8e5fb7204ae1f559b5dc4a63"
+        msec: 848
+        hash: "0154a65f8693b98576101ac1c2fc8761"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 393; y: 172
+        x: 282; y: 187
         modifiers: 0
         sendToViewport: true
     }
@@ -316,769 +284,1073 @@ VisualTest {
         type: 3
         button: 1
         buttons: 0
-        x: 393; y: 172
+        x: 282; y: 187
         modifiers: 0
         sendToViewport: true
     }
     Frame {
+        msec: 864
+        hash: "792c1b5267f14c891dae2348a8188a92"
+    }
+    Frame {
+        msec: 880
+        hash: "15ce9e88d4ad2e698bf167d1432c0b8a"
+    }
+    Frame {
+        msec: 896
+        hash: "8f4109ef4c24d286d73f689565a0d056"
+    }
+    Frame {
+        msec: 912
+        hash: "f5728190bf5c94742686f063b4a4b09b"
+    }
+    Frame {
+        msec: 928
+        hash: "a38c7527a9a818b7bc25466b0e4939f9"
+    }
+    Frame {
+        msec: 944
+        hash: "ed3902455fc31a4e3232308b815a4daa"
+    }
+    Frame {
+        msec: 960
+        image: "flickable-horizontal.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "de5647af86a322921dcc68e81979a3cc"
+    }
+    Frame {
+        msec: 992
+        hash: "c32349580e3a9586cc1133c935607cf0"
+    }
+    Frame {
+        msec: 1008
+        hash: "cd2068492e346eb20d50aee69e3a3559"
+    }
+    Frame {
+        msec: 1024
+        hash: "f43a1a38894b8ffad009ba995d84b0ee"
+    }
+    Frame {
+        msec: 1040
+        hash: "2d5c4a73df2a054801571f1ce119e31f"
+    }
+    Frame {
         msec: 1056
-        hash: "3bfaaef12ca852421ad179d8598a306d"
+        hash: "b8825cc6bdca8102a655d797ea41b5b1"
     }
     Frame {
         msec: 1072
-        hash: "e00ff5e13a9a97bc11e041f89e4782f5"
+        hash: "3f0be15b85220743d004f2d54b6e137c"
     }
     Frame {
         msec: 1088
-        hash: "ae10ada837b21365936672e9a4b4b175"
+        hash: "4b0952d33149b44ffa0a06723a4116c7"
     }
     Frame {
         msec: 1104
-        hash: "63566d7f1707025c9ec37e398d0e69ef"
+        hash: "9056bda43259e92cfe56fdf394e2ca54"
     }
     Frame {
         msec: 1120
-        hash: "20e9d299cd867d680cf85f99e06cd200"
+        hash: "82ec9f09d2303e5b0b9c05b9a10a84db"
     }
     Frame {
         msec: 1136
-        hash: "4d3a19b3c50a20ba1d93a8bcd178a424"
+        hash: "751a9b3054c09d900364d7c9cac8bc2b"
     }
     Frame {
         msec: 1152
-        hash: "d373ab5240e438e8234ae05f935c1ef8"
+        hash: "17dfdfef20f9da7e8b6f16df974baea9"
     }
     Frame {
         msec: 1168
-        hash: "2f9c00aa1f8a8cc5d10e6c6a0baee366"
+        hash: "108e6d9a5a81df32823bfd7a90a000a7"
     }
     Frame {
         msec: 1184
-        hash: "0fd8203b0a33fd8243ecd878f04f9b42"
+        hash: "71dd0d55a3e837d3a8e4b4e318579ade"
     }
     Frame {
         msec: 1200
-        hash: "24a197df4209c7076d68031e5dd4fd9e"
+        hash: "8013cdb2615bca89134ea040409af509"
     }
     Frame {
         msec: 1216
-        hash: "9e4271eacdc875183e3c8e7a1eb098c2"
+        hash: "4b2826ad4c755690bd837994133f5fac"
     }
     Frame {
         msec: 1232
-        hash: "cdf7aac4ff7e5df806977eb38392f5bc"
+        hash: "52d0da7f138bd37ac587a448d6402aca"
     }
     Frame {
         msec: 1248
-        hash: "1ace4a1312cad6f173a04c388624a97f"
+        hash: "e634724c5bb294d338210845bf64d2cf"
     }
     Frame {
         msec: 1264
-        hash: "193d6d6838ac1d5ddb941fbb340ec506"
+        hash: "59bc5f0d057ee431f289806377f19213"
     }
     Frame {
         msec: 1280
-        hash: "ed82807a48f28610ba9bda0c7ab91ce4"
+        hash: "6ef2c5f7766c2cc77b30d636bfaa4422"
     }
     Frame {
         msec: 1296
-        hash: "e1168bb9a88a972decb0c537d86d7758"
+        hash: "578d056c3db094420dbaa51bd08ced20"
     }
     Frame {
         msec: 1312
-        hash: "828ba428b04826687c6ef19b72318924"
+        hash: "14c6f7a04a52caffefa07af556ccb262"
     }
     Frame {
         msec: 1328
-        hash: "7dae52c428253cf44045ffaabaadd2f4"
+        hash: "7cb63d56fec144d0509ce219fc6fe459"
     }
     Frame {
         msec: 1344
-        hash: "06e2a81e1a2421523642cfcf17ec22e4"
+        hash: "462dafa7f6427aecf6c28a5dcf5a10cc"
     }
     Frame {
         msec: 1360
-        hash: "283997835a54e80c0ab8a0321bd03ce7"
+        hash: "45360814f985ed780a443568a91fc170"
     }
     Frame {
         msec: 1376
-        hash: "6354f9379b7b25c8fabda4e5bc3cdf6a"
+        hash: "0d18ceb2436e4f7eb56a3443fab706e6"
     }
     Frame {
         msec: 1392
-        hash: "6bc87dfd21d59efd3397e3cfb0d00d25"
+        hash: "1d83f367ba9f7f1d4496208271e925ed"
     }
     Frame {
         msec: 1408
-        hash: "4f97fc9aa1f79a6b007a00459386b9ff"
+        hash: "fdbd00ee4c122aef779df42ea53f403a"
     }
     Frame {
         msec: 1424
-        hash: "2b5c711ede124c9e97d3ef83a3fdcc8b"
+        hash: "bedd1cb304efd4851813b39a746198a4"
     }
     Frame {
         msec: 1440
-        hash: "5a8cbd4ac3fcd920f2aea6e2cfa96467"
+        hash: "9aa7bed86efa9634466736f20ee0ab5b"
     }
     Frame {
         msec: 1456
-        hash: "5b32961cb36e519f5b1d50386e796d3e"
+        hash: "00fc8186a7ae44e10195a7b13defa0d2"
     }
     Frame {
         msec: 1472
-        hash: "c91f95cccd38cbd1a16ee65abffd40ab"
+        hash: "42d6e8e0bbed879ed63644c83e61e7bd"
     }
     Frame {
         msec: 1488
-        hash: "25108050298d3ffc850113971bcf54da"
+        hash: "df074f8c210249e5ef652349479b6325"
     }
     Frame {
         msec: 1504
-        hash: "6a236881f2a1cb487ee1945c279e020b"
+        hash: "4f94020437e35cf44dd3576997990ab7"
     }
     Frame {
         msec: 1520
-        hash: "2df1824df1cf20022595f64d26adb4ad"
+        hash: "8ca6c3b4fa3be73ac35073356b680a35"
     }
     Frame {
         msec: 1536
-        hash: "4ca4a0a4b4fd9f9c4846adebcdc8fd67"
+        hash: "c25eee1c5791383ebc59974e7754eacb"
     }
     Frame {
         msec: 1552
-        hash: "1696ef0862ff4772f960d203c43fbddf"
+        hash: "f4917ada78942428cc6b9aa5e56c013d"
     }
     Frame {
         msec: 1568
-        hash: "c5846835b8eb5d98c481ee5811344ea1"
+        hash: "23e1e607101fc7260a4ac841344f5fe0"
     }
     Frame {
         msec: 1584
-        hash: "fbcb044ee53302de573321b43f068e65"
+        hash: "2dcc7d187d8e0493e5766efbf09ef37c"
     }
     Frame {
         msec: 1600
-        hash: "d369e0a6c4a3e63102be29a7362ef9eb"
+        hash: "c1e5602753e80cf44d7b330140c6912e"
     }
     Frame {
         msec: 1616
-        hash: "e93131b881805d4aa44949c69f486821"
+        hash: "febaf72d01a3763461b4b7d2ddd7a23e"
     }
     Frame {
         msec: 1632
-        hash: "b7aeee9e5065f1d4656e451b542ecf6a"
+        hash: "071262b911b61576f451be25691a57cf"
     }
     Frame {
         msec: 1648
-        hash: "05521ca19960c070d5f3dd72c5ade0e4"
+        hash: "44705db9289fd8753b9d63e8bc963b38"
     }
     Frame {
         msec: 1664
-        hash: "2c68cb3291cf1f892c8b8eb28b409e4d"
+        hash: "0c41d7b7d36bd083abfc0b83b862cad9"
     }
     Frame {
         msec: 1680
-        hash: "5a0908aea91df2b9e65d222829c2b0ba"
+        hash: "0c41d7b7d36bd083abfc0b83b862cad9"
     }
     Frame {
         msec: 1696
-        hash: "0d4ff147517eee8b3dbcd51a708b2aa7"
+        hash: "071262b911b61576f451be25691a57cf"
     }
     Frame {
         msec: 1712
-        hash: "521e1075de1de89c6e25f469d2728ab7"
+        hash: "a00aa90e894b48203b0446ca287ee712"
     }
     Frame {
         msec: 1728
-        hash: "c543447f98ae608058c6c02c8c8665e6"
+        hash: "26c9ca53ee4b084c6595ad65bf4880df"
     }
     Frame {
         msec: 1744
-        hash: "ac259db754b7dfb8cce8548527c72e4b"
+        hash: "f4917ada78942428cc6b9aa5e56c013d"
     }
     Frame {
         msec: 1760
-        hash: "bc5b68d5ecfb583ae41001e326b7aa9b"
+        hash: "ffedee7bf2d8099e361b8b1706b03f88"
     }
     Frame {
         msec: 1776
-        hash: "e08051cb1ab2d8f979a52dc86411f78f"
+        hash: "1778ef1629ce977015b641448b46634f"
     }
     Frame {
         msec: 1792
-        hash: "b1746ad9563359f0d70a1aaee62e9bd8"
+        hash: "42d6e8e0bbed879ed63644c83e61e7bd"
     }
     Frame {
         msec: 1808
-        hash: "5d6bc33ff2857fb8db582362bf7c19c7"
+        hash: "99e843ec69b79b79b0792e0a2f28cd1b"
     }
     Frame {
         msec: 1824
-        hash: "83f2c3a7124f9be4dbe883a27ca7df8e"
+        hash: "8b3ebca70b50a6a93823e015ea80f0f9"
     }
     Frame {
         msec: 1840
-        hash: "189f7cfb5ede1f8380b1a05b7e3d942e"
+        hash: "8eaa7f076064ce55051237b04861e408"
     }
     Frame {
         msec: 1856
-        hash: "07b1a4e5ca156e6aa1f3e76b825807ce"
+        hash: "6acc0ca5e5808d911287edfa78c8ac02"
     }
     Frame {
         msec: 1872
-        hash: "48b25f0acfe6eb3bc2cb9eb16e6595d0"
+        hash: "e9f05899e0b53c21f6efe834095a3ea4"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 91; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 93; y: 209
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1888
-        hash: "15ae05f5ed098021073c4593587949ea"
+        hash: "e9f05899e0b53c21f6efe834095a3ea4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 99; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 108; y: 210
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1904
-        hash: "b300f2c75f4aebcf84ed37ad424ca9fa"
+        hash: "d2dece405f5f6ed1de2acb6615a931de"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 142; y: 214
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1920
         image: "flickable-horizontal.1.png"
     }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
     Frame {
         msec: 1936
-        hash: "7d8ea492fb1c664502e95e085896c569"
+        hash: "45ea16bca2c9ae07cb7dead1e24f6ed0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 229; y: 218
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 220
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1952
-        hash: "7513b077e073d78b387309b56e1fd44c"
+        hash: "c10c8b0c94f899414d8b3ef0b7c97646"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 322; y: 223
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 322; y: 223
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1968
-        hash: "ed1ac5cf6d4b081983a8e16258f431bf"
+        hash: "807aff4e6c96a9d0de7fa55e233446b1"
     }
     Frame {
         msec: 1984
-        hash: "fbb31f23ba6e5d02011363abfb4b3f18"
+        hash: "dbd02848cefacbb26f4bcb7d8f073d6c"
     }
     Frame {
         msec: 2000
-        hash: "6f01df424b38036b9921b4ee1491a1c1"
+        hash: "9a60608d8ea1b39fa2d3851873f2f08e"
     }
     Frame {
         msec: 2016
-        hash: "11f706dfacbec5c0be0c2f3c5442f717"
+        hash: "e7b3e3a40281f63889808211d6746374"
     }
     Frame {
         msec: 2032
-        hash: "0a70348986f4987f43db3e55af63fca5"
+        hash: "188c225c46ec00105df230bfeea09974"
     }
     Frame {
         msec: 2048
-        hash: "6f8b7aaad846f83c6349836d7af34662"
+        hash: "e2e977b42e91d8c5dee57fd8245692eb"
     }
     Frame {
         msec: 2064
-        hash: "44723b22aad6d2d814e074ff9324f3c4"
+        hash: "ca2f12fb173c405f95e608858ab982ad"
     }
     Frame {
         msec: 2080
-        hash: "44723b22aad6d2d814e074ff9324f3c4"
+        hash: "fa86ee5f25fa425cf2569c8ef570b9d8"
     }
     Frame {
         msec: 2096
-        hash: "44723b22aad6d2d814e074ff9324f3c4"
+        hash: "9b74656866fb8c7394bbbecec6414aca"
     }
     Frame {
         msec: 2112
-        hash: "1c12d2c68223324f040b7a693cef2074"
+        hash: "87147326d1baab174c0f9a5ccdc2cb84"
     }
     Frame {
         msec: 2128
-        hash: "0a70348986f4987f43db3e55af63fca5"
+        hash: "c0d00f98c71bf3f8e5954b45fbab95a8"
     }
     Frame {
         msec: 2144
-        hash: "bf4de7baf2730cdaf83887d50d577986"
+        hash: "c087d1d62e56e573b55c1d8599bba8a6"
     }
     Frame {
         msec: 2160
-        hash: "23ddb2c0793d7161a0d8c5b2a777dceb"
+        hash: "dd5a94c6febdee58e8f115cb75131aaa"
     }
     Frame {
         msec: 2176
-        hash: "7513b077e073d78b387309b56e1fd44c"
+        hash: "a7465d6137f865f512ce65ceb29533b4"
     }
     Frame {
         msec: 2192
-        hash: "83fa82362057466dff6a243a95d423db"
+        hash: "409086f6bb661aab8b548fea56d7e6b1"
     }
     Frame {
         msec: 2208
-        hash: "0e60b632ce511109cb01d2e5ff6945f8"
+        hash: "6a22911e0fb58df31271baa463ff599d"
     }
     Frame {
         msec: 2224
-        hash: "78c25194827c4243a16807491f798cdf"
+        hash: "c4f6dd30d5fdfcf91a8b29cf5c622423"
     }
     Frame {
         msec: 2240
-        hash: "4c9dc46794d4a32e654395bb9d78409e"
+        hash: "5a95b83f237c7243a198a43e9a587179"
     }
     Frame {
         msec: 2256
-        hash: "e996d4f3a0b3a4a4ed29ec23a1ad5615"
+        hash: "d79ed290efc6dbd976d574bf0b14a6a3"
     }
     Frame {
         msec: 2272
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "a7bcb436e96d7c981852239462573495"
     }
     Frame {
         msec: 2288
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "f63cc82e351daab503e316f8b516990f"
     }
     Frame {
         msec: 2304
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "4ea63cd25a1424042ffc60549a78563c"
     }
     Frame {
         msec: 2320
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "ef0fb776012575b3b0dbf6e5f4dee571"
     }
     Frame {
         msec: 2336
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "e2508faec7737be2666d87ad715b5f74"
     }
     Frame {
         msec: 2352
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "9fe4e897c6b853f774d11817a0eb53bf"
     }
     Frame {
         msec: 2368
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "c122ce2e73cbfedcc99d649c21d91f9d"
     }
     Frame {
         msec: 2384
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "883b8b180853f1f432ae98ddfe1b6ce3"
     }
     Frame {
         msec: 2400
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "d0808284e431da60f61d571c257a3011"
     }
     Frame {
         msec: 2416
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "df90f19450bf4d9496aab987a89e3a02"
     }
     Frame {
         msec: 2432
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "5640c1e64556b90e7fbd4448fa9db462"
     }
     Frame {
         msec: 2448
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "6d9b5c2f7d0dedbbc444e69bb39fed08"
     }
     Frame {
         msec: 2464
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "485c4a8049068cf73bf22db5fd3618be"
     }
     Frame {
         msec: 2480
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "9e25da59c9e7e4cf7796902e8e2ff92a"
     }
     Frame {
         msec: 2496
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "bd45e8f2442d7c1a1b16a762bc29e7cf"
     }
     Frame {
         msec: 2512
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "ec1013d23e581dbb39b1549d2e1b3b32"
     }
     Frame {
         msec: 2528
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "1ea3c2fde8ee3a14406e027f2124d793"
     }
     Frame {
         msec: 2544
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "3c3f31a05fb2f32538872c9fa158aaab"
     }
     Frame {
         msec: 2560
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "05a84d9c55e634ec01edd2a63e13613b"
     }
     Frame {
         msec: 2576
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "0f7ccd2da58e2e73b0ab18bb681dafd5"
     }
     Frame {
         msec: 2592
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "e481ff78029f8bc4bf7c697db6824f6a"
     }
     Frame {
         msec: 2608
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "efb92b8b7a90acabeb4a8d5cae52fe3c"
     }
     Frame {
         msec: 2624
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "4728dd0fac4edf40cfd5ef5a422b4ed9"
     }
     Frame {
         msec: 2640
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "27641dcd772c979ae22d12bfbadbb67f"
     }
     Frame {
         msec: 2656
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "26268714105bc4832d336a38a859fc50"
     }
     Frame {
         msec: 2672
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "caf0d351d3b6914ca52853a30643ea48"
     }
     Frame {
         msec: 2688
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "319824b1143925162f04aaddcfaa65d9"
     }
     Frame {
         msec: 2704
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "73aa36815f34bf5e005000e7da38555e"
     }
     Frame {
         msec: 2720
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "73aa36815f34bf5e005000e7da38555e"
     }
     Frame {
         msec: 2736
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "319824b1143925162f04aaddcfaa65d9"
     }
     Frame {
         msec: 2752
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "caf0d351d3b6914ca52853a30643ea48"
     }
     Frame {
         msec: 2768
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 152; y: 189
-        modifiers: 0
-        sendToViewport: true
+        hash: "c87ba4dda0a5c931d0c7ae74a0fb2896"
     }
     Frame {
         msec: 2784
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "ab551561ad8a3937558afc080b3e6130"
     }
     Frame {
         msec: 2800
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
+        hash: "474d8b566b9e4ef7dc125a8df30ccbb1"
     }
     Frame {
         msec: 2816
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 190
-        modifiers: 0
-        sendToViewport: true
+        hash: "cc7dfbcfafa12d40210a4d5fa7f60862"
     }
     Frame {
         msec: 2832
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 169; y: 191
-        modifiers: 0
-        sendToViewport: true
+        hash: "3c3f31a05fb2f32538872c9fa158aaab"
     }
     Frame {
         msec: 2848
-        hash: "edd015434d7ead96c03a51a2b1c9e527"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 192
-        modifiers: 0
-        sendToViewport: true
+        hash: "9705c0dd30c3f381084ec29242bebb2f"
     }
     Frame {
         msec: 2864
-        hash: "ea0eda505daea4171e27aac358aa6a4a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 256; y: 192
-        modifiers: 0
-        sendToViewport: true
+        hash: "917579854722d6e6711811e10cbe229f"
     }
     Frame {
         msec: 2880
         image: "flickable-horizontal.2.png"
     }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 331; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
     Frame {
         msec: 2896
-        hash: "34f70dfe1c226e63300112aa9a4a6968"
+        hash: "e2166fe87d04be70a9b1d4c8d1002b49"
     }
     Frame {
         msec: 2912
-        hash: "34f70dfe1c226e63300112aa9a4a6968"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 395; y: 194
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 395; y: 194
-        modifiers: 0
-        sendToViewport: true
+        hash: "5640c1e64556b90e7fbd4448fa9db462"
     }
     Frame {
         msec: 2928
-        hash: "dd61e0ae58d7a344908a10bb97cfcb39"
+        hash: "88cef15940302e2b8b43e73234fd7b9c"
     }
     Frame {
         msec: 2944
-        hash: "14a384c4bdd3e89808761d1e86976170"
+        hash: "041aecec2b0b0d59a56e1dd26b45cab1"
     }
     Frame {
         msec: 2960
-        hash: "0e82a4920a53239f117448cd0e0b27f2"
+        hash: "0d519463c713f3da46ecacd155e1a0f3"
     }
     Frame {
         msec: 2976
-        hash: "711e29bf6fbbeb7882064adb0619f4ac"
+        hash: "5dd0c855b97d298244fb599c9f781651"
     }
     Frame {
         msec: 2992
-        hash: "43307cbfe1688daf300fafc8df0082b8"
+        hash: "bfc51621e9bc95d2d46cec632a3fae12"
     }
     Frame {
         msec: 3008
-        hash: "46d788d926c03d85a68b66252e73ae90"
+        hash: "b05fb6e798ab3fed940b5ac4d88ca378"
     }
     Frame {
         msec: 3024
-        hash: "a0042935ad2d5557c906050d4a3581c9"
+        hash: "6bc9cc0d3b11ea91856296b0ec934a8b"
     }
     Frame {
         msec: 3040
-        hash: "b618a40490ca0aea310f08b452fa8c68"
+        hash: "f4e63f3af69dacbf2d1d719d4d03a266"
     }
     Frame {
         msec: 3056
-        hash: "e2aaad7f160a6d77dd788c76bb8cb8a7"
+        hash: "31ab08997eb86fab062a3128aecbccb5"
     }
     Frame {
         msec: 3072
-        hash: "ab5c27fa790c67a6678db0bbae1ae477"
+        hash: "90736b240ba1e634bd0ea86423908e16"
     }
     Frame {
         msec: 3088
-        hash: "b43ed7af838cd6edd32393fc56cf8fb1"
+        hash: "90736b240ba1e634bd0ea86423908e16"
     }
     Frame {
         msec: 3104
-        hash: "88ac50602c9f27fb5b882ad32d14ff46"
+        hash: "e74982557dc06aac572078840c7e889a"
     }
     Frame {
         msec: 3120
-        hash: "259af2e080ed93e16cb633fa940c7c08"
+        hash: "e74982557dc06aac572078840c7e889a"
     }
     Frame {
         msec: 3136
-        hash: "d05bec2351068d552b7bbbf47cf82fad"
+        hash: "ca30c14c7344d1711a35c707f8804f6e"
     }
     Frame {
         msec: 3152
-        hash: "5354b8e07f1ed22950687187ee7a0290"
+        hash: "e616110d39009f0d636b816828cc0ccb"
     }
     Frame {
         msec: 3168
-        hash: "3bfaaef12ca852421ad179d8598a306d"
+        hash: "e616110d39009f0d636b816828cc0ccb"
     }
     Frame {
         msec: 3184
-        hash: "40d3a77fce7a9a9ca7ae6023fc4cfc10"
+        hash: "e616110d39009f0d636b816828cc0ccb"
     }
     Frame {
         msec: 3200
-        hash: "5837c0122aa6b28518f1b7043ead99a9"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 412; y: 214
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3216
-        hash: "9514d8530275e4642810ac441e8de353"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 3232
-        hash: "3b720882f52340549d8e1b9659443461"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
     Frame {
         msec: 3248
-        hash: "4de5b95c8f4949a4f1ee9a119940e80a"
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 408; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 407; y: 214
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3264
-        hash: "a35097c00483e0b481222e4ad220c7a4"
+        hash: "10a89da9887cb4bbd812c090a8a56797"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 403; y: 214
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3280
-        hash: "82ac348a63a4e358a877a2e45d48e2b1"
+        hash: "1991cbb0fb053937f922731d5716032c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 398; y: 214
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3296
-        hash: "1322108409d1fa87d128f0c44c81ab4b"
+        hash: "df447575a4734bb5bd9badc6e27d98e4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 391; y: 214
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3312
-        hash: "f6b030effcca891ab20073f106b22d73"
+        hash: "0fbfe1e0d7fb54450188398aa40690cd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 383; y: 214
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3328
-        hash: "a7ccd998ac2ff2777d9423d704ddef48"
+        hash: "cb62e60296046c73d301d7186e14faed"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 369; y: 213
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3344
-        hash: "b6d971a4f3321b7f3632e778ce733589"
+        hash: "909cbd1292476584554e22232cb43639"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 352; y: 211
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3360
-        hash: "b6d971a4f3321b7f3632e778ce733589"
+        hash: "e63b7e502dfb2834c06a969b683b9bd3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 331; y: 210
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3376
-        hash: "b6d971a4f3321b7f3632e778ce733589"
+        hash: "4ea63cd25a1424042ffc60549a78563c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 314; y: 210
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3392
-        hash: "82ef6700a513e39508fb6de5ef07f1e7"
+        hash: "77e39d2d4bfcacecdae4f014e4506d71"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 300; y: 210
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3408
-        hash: "9e4c4d479bc0b1a61566eae12416bea6"
+        hash: "db576eca8bad67cb8b994f12fc448969"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 288; y: 210
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3424
-        hash: "f6b030effcca891ab20073f106b22d73"
+        hash: "efeb3f616da9d78505c3c82fc34ee31c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 278; y: 210
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3440
-        hash: "8968acd022a9ba6fcc3ea52bdd7268c4"
+        hash: "e4f8bb02f8ac6bc40e1801cc8f360078"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 210
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3456
-        hash: "de8f1a1fd680af475173d5f81e85b26c"
+        hash: "82118ef71809e3867717232c4d9c5518"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 252; y: 208
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3472
-        hash: "82e8c0c7cb7c2b1e8d7a5fc019533e6b"
+        hash: "5363451c696f6c6eb792b23d086243d7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 238; y: 208
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3488
-        hash: "f820d250252cd910af97e5c9be181457"
+        hash: "fe6afe8ae8a7c216a1cffc5515f273d5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 227; y: 206
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3504
-        hash: "a40558c1fbf328d3c891b473b2454020"
+        hash: "9b165741d86c70380c15e15cff3fabb6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 206
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3520
-        hash: "0ef9e64bad67670102e1e4d9ef0e96f3"
+        hash: "f5e176355468f4fa224d4dfcdd7525a3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 206
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3536
-        hash: "1d8013765ac2d3fe09ccaa6db098a208"
+        hash: "8c5a14a76e052cc6503a3e78245d1da3"
     }
     Frame {
         msec: 3552
-        hash: "1d8013765ac2d3fe09ccaa6db098a208"
+        hash: "8c5a14a76e052cc6503a3e78245d1da3"
     }
     Frame {
         msec: 3568
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "8c5a14a76e052cc6503a3e78245d1da3"
     }
     Frame {
         msec: 3584
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "8c5a14a76e052cc6503a3e78245d1da3"
     }
     Frame {
         msec: 3600
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "8c5a14a76e052cc6503a3e78245d1da3"
     }
     Frame {
         msec: 3616
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "8c5a14a76e052cc6503a3e78245d1da3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 206
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3632
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "f5e176355468f4fa224d4dfcdd7525a3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 232; y: 204
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3648
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "acf538fce5f1b90b83474d9898b7cdd7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 246; y: 203
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3664
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "5a0ee016b8732fbc36064e8a35d91215"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 265; y: 203
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3680
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "8fd06a14c1de175813845ce8f07db6ec"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 292; y: 201
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3696
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "26b0ff6ffda0725e0800f7ea3af510ef"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 310; y: 201
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3712
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "80443f134511be0356a687c9b542b3e7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 321; y: 199
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3728
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "3eeb98a829d29b3dc52f3d145ac49d58"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 323; y: 199
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3744
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "f4d43069b16f41a30e5549aae911d4cd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 324; y: 199
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3760
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "661c89fa832f0abdcf4ae0c9e8e2d18f"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 324; y: 199
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 3776
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "661c89fa832f0abdcf4ae0c9e8e2d18f"
     }
     Frame {
         msec: 3792
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "1520f54b6c8606b9e8372c5c06180453"
     }
     Frame {
         msec: 3808
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "0fcf5e2ce47348cbb5bb485f101fe5ac"
     }
     Frame {
         msec: 3824
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "2eb070e69de07c89830543e0475fc110"
     }
     Frame {
         msec: 3840
@@ -1086,114 +1358,218 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "90f94986ab44ab59618e9a5da17b8cc9"
     }
     Frame {
         msec: 3872
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "cc969b2c64839ca6d3b5069c0ed938d0"
     }
     Frame {
         msec: 3888
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "1f819e18d1297a1c7eeebb7b040bdef8"
     }
     Frame {
         msec: 3904
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "3643b99afbd8af0953cb39b2c8c04b9f"
     }
     Frame {
         msec: 3920
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "713fd2e2fa38ab27604cb9cae59f1777"
     }
     Frame {
         msec: 3936
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "e2508faec7737be2666d87ad715b5f74"
     }
     Frame {
         msec: 3952
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "fc33b1c7479caeff676ffd885a18d618"
     }
     Frame {
         msec: 3968
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "aca01143db4f870a56bb7546e84cbc5e"
     }
     Frame {
         msec: 3984
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "442b58c39fd3745c61a1eb5043fcbb53"
     }
     Frame {
         msec: 4000
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "7983d7183cc11d6819fa0a006c2d67b4"
     }
     Frame {
         msec: 4016
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "9fe4e897c6b853f774d11817a0eb53bf"
     }
     Frame {
         msec: 4032
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "43f528c81ccfa5b9921dfa3564a24c68"
     }
     Frame {
         msec: 4048
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "dfe04ff0b3ccf205bb38beeab58a4411"
     }
     Frame {
         msec: 4064
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "32ff30b50b500e9feb51e8eef205783c"
     }
     Frame {
         msec: 4080
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "7d83ab4c336b05bcf2cde4e7d8031f6c"
     }
     Frame {
         msec: 4096
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "c92e345e4ffdb30c28d9d5aa5400bd30"
     }
     Frame {
         msec: 4112
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "02eec604d0c00965aae4ac61b91bdc22"
     }
     Frame {
         msec: 4128
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "df447575a4734bb5bd9badc6e27d98e4"
     }
     Frame {
         msec: 4144
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "bac10d8f94a39573313b3b8b2f871c49"
     }
     Frame {
         msec: 4160
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
+        hash: "e5944c5dc6dec8f0c28b7ec3cd58723d"
     }
     Frame {
         msec: 4176
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "1991cbb0fb053937f922731d5716032c"
     }
     Frame {
         msec: 4192
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "50d6538bcaffc343f6626635a3e5899c"
     }
     Frame {
         msec: 4208
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "f3613f57cdb9ed38d8e3fa636962aa99"
     }
     Frame {
         msec: 4224
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "10a89da9887cb4bbd812c090a8a56797"
     }
     Frame {
         msec: 4240
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "89ba74d46970ad2edff701475c059ec8"
     }
     Frame {
         msec: 4256
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+        hash: "6e8b84c70e81578a2216e9e975b35434"
+    }
+    Frame {
+        msec: 4272
+        hash: "6e8b84c70e81578a2216e9e975b35434"
+    }
+    Frame {
+        msec: 4288
+        hash: "883b8b180853f1f432ae98ddfe1b6ce3"
+    }
+    Frame {
+        msec: 4304
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4320
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4336
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4352
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4368
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4384
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4400
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4416
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4432
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4448
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4464
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4480
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4496
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4512
+        hash: "e616110d39009f0d636b816828cc0ccb"
+    }
+    Frame {
+        msec: 4528
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4544
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4560
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4576
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4592
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4608
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4624
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4640
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4656
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4672
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4688
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
+    }
+    Frame {
+        msec: 4704
+        hash: "244c12e82ee0b2528a0dbb02a8b8134a"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.0.png
index 18fef53..67f2de8 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.1.png
index 18fef53..6ab0a15 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.10.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.10.png
index b352c68..d525858 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.11.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.11.png
index ce7ee68..d525858 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.11.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.12.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.12.png
index d8cdacf..d525858 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.12.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.12.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.13.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.13.png
index 0c2fa7b..167703b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.13.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.13.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.14.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.14.png
deleted file mode 100644
index e9b3028..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.14.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.15.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.15.png
deleted file mode 100644
index 2186a8b..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.15.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.16.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.16.png
deleted file mode 100644
index b4590af..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.16.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.17.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.17.png
deleted file mode 100644
index fe29f19..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.17.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.18.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.18.png
deleted file mode 100644
index fe29f19..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.18.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.19.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.19.png
deleted file mode 100644
index 4f8587f..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.19.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.2.png
index 0a7cc03..9dd9ae8 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.20.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.20.png
deleted file mode 100644
index 4f8587f..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.20.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.21.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.21.png
deleted file mode 100644
index c0b0bdf..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.21.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.22.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.22.png
deleted file mode 100644
index 4168c3b..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.22.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.23.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.23.png
deleted file mode 100644
index 18fef53..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.23.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.24.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.24.png
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png
index fc6669d..d525858 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.4.png
index c0b0bdf..d525858 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.5.png
index 2ffa96e..c066392 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.6.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.6.png
index f550b89..e7accc7 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.7.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.7.png
index f550b89..f282709 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.8.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.8.png
index f550b89..f282709 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.9.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.9.png
index f550b89..593cf12 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.qml
index a5ca451..86fd3ca 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.qml
@@ -6,239 +6,343 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 32
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 48
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 64
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 80
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 96
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 112
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 128
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 144
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 160
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 176
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 192
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 208
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 224
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 240
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 256
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 272
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 288
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 304
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 320
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 336
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 352
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 368
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 384
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 400
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 416
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 432
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 448
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 464
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 480
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 496
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 512
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 528
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 544
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 560
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 576
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 592
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 608
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 624
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 640
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 656
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 143; y: 471
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 672
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Frame {
         msec: 688
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 143; y: 470
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 704
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 469
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 467
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 720
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 463
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 453
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 736
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 433
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 410
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 752
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "26a71f2ecae39fb2f61ab13ad4fe2796"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 365
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 768
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "5aedca385a68ed5f6281c48a57bb94e5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 340
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 319
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 784
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4ee9f528fecf850db3be24a26241c2c5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 300
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 144; y: 300
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 800
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "bc83cb2708fba7bae035bc5da984fc71"
     }
     Frame {
         msec: 816
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "1d0ca08757375ac51024b83c0d224474"
     }
     Frame {
         msec: 832
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "ee09f63ce3b3ead641ba4a4853772d41"
     }
     Frame {
         msec: 848
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "5e944bc5723d75fa859f7cb8d2b106e1"
     }
     Frame {
         msec: 864
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "55ab5752ac0f4c93f5db6c92c519e5fb"
     }
     Frame {
         msec: 880
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "026bd0f5e380d54b8688172e44ff9f08"
     }
     Frame {
         msec: 896
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "5812a751d877896801a4bc6d2dd3ecc8"
     }
     Frame {
         msec: 912
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "2e6fd08a00480c4a018311d7ef3d0f50"
     }
     Frame {
         msec: 928
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "981ea7420d7ab189bb17fbfdde889471"
     }
     Frame {
         msec: 944
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b3b737cb536205f6d0faef4f8b1f2e77"
     }
     Frame {
         msec: 960
@@ -246,239 +350,311 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4dafcfd5f5c5de1e83b9b7514ba5bde0"
     }
     Frame {
         msec: 992
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "97104a677cb208783522af82f4690003"
     }
     Frame {
         msec: 1008
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4b1f38c9fdd8f79f2c43273913438ddc"
     }
     Frame {
         msec: 1024
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "7f76a7579174d7f8ea0e0819f70aebf6"
     }
     Frame {
         msec: 1040
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "97dd3be905cb37a7f178f27018ffe0f8"
     }
     Frame {
         msec: 1056
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "19fa6136cba216000b3ce56f0b7c02e6"
     }
     Frame {
         msec: 1072
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "e311e2cb0c6c6a844f092dcbf2b89a70"
     }
     Frame {
         msec: 1088
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "a954794d643718ca538ce1347ee93899"
     }
     Frame {
         msec: 1104
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "1b97f96d6615d2455ab49262347d3ae7"
     }
     Frame {
         msec: 1120
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4ce55b03ac0ab7d6301b8185e139667d"
     }
     Frame {
         msec: 1136
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "c0c37b06ccca61524ee3530a3e9707c6"
     }
     Frame {
         msec: 1152
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "9cddaaaa52819cbb2dd740c31ebed5e2"
     }
     Frame {
         msec: 1168
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "5c82f9c2c59d3b844c7eb1bef77c2722"
     }
     Frame {
         msec: 1184
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "27b8e460849e8a06ad35e147f725d6df"
     }
     Frame {
         msec: 1200
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "381c0e45f68daf697f80fb0cb87f028e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 121; y: 138
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1216
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "f4b378fcf727ba85bcbf90c938dc9806"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 121; y: 141
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1232
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "f4b378fcf727ba85bcbf90c938dc9806"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 121; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 121; y: 155
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1248
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "852a7007d816d4cbec894f42549311f0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 119; y: 185
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1264
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "1ecc94e9c4aec0fa099816a7276f484a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 122; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 228
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1280
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "8d74af236c5b0023b0577235f74aad7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 128; y: 270
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 128; y: 270
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 1296
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "5485c7dd5e79c3823c0c9258470f8ca7"
     }
     Frame {
         msec: 1312
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "a5fe758873729aeaf0a0c45fbdcc9b8f"
     }
     Frame {
         msec: 1328
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "7b134402e3268b66e3fc7e16624463ee"
     }
     Frame {
         msec: 1344
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "146f339b009287872f22d27892c0e2e5"
     }
     Frame {
         msec: 1360
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "1436a3a4cd29690da39ead7d08f0c927"
     }
     Frame {
         msec: 1376
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "1cdabb8da157c35c1bcc5d5965d60e59"
     }
     Frame {
         msec: 1392
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "b05878876db2fbfde1cf4069f2dae3db"
     }
     Frame {
         msec: 1408
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "6f8089424b163d79c7bcfe1715eca6ee"
     }
     Frame {
         msec: 1424
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "91ffc70bd8a4e0f917d534131de849cf"
     }
     Frame {
         msec: 1440
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "5c03d99e1bf12f55de8fc36742d7a962"
     }
     Frame {
         msec: 1456
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "bc22d18311f322713a046763262b65f8"
     }
     Frame {
         msec: 1472
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "59557c6874603decba5d383d3429005a"
     }
     Frame {
         msec: 1488
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "e2df3b279fffcd89c90afbfdbf14b5b3"
     }
     Frame {
         msec: 1504
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "a0aab7c147a30bb1765dec0f461b0ac1"
     }
     Frame {
         msec: 1520
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "f58d85bd7b3b772032bdb4e2ee8867d8"
     }
     Frame {
         msec: 1536
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "05e6f6753a40075653b8b757ea626b2f"
     }
     Frame {
         msec: 1552
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "6bfe88cb1d1a2264cc3fbf5143640507"
     }
     Frame {
         msec: 1568
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "d54065930af312621115cc08d73fa541"
     }
     Frame {
         msec: 1584
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "c3666377c19e3b4034a90a36651020de"
     }
     Frame {
         msec: 1600
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "92610ffcd541d943841bfea8bfcc2815"
     }
     Frame {
         msec: 1616
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "87d1472f48148a1cc8ae16700227ed1e"
     }
     Frame {
         msec: 1632
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4bb790042573e5de09938f1beb3d8e73"
     }
     Frame {
         msec: 1648
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "f0a748b20f8b0d7a9a5ef0c26e5d29d1"
     }
     Frame {
         msec: 1664
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "66b7697170705d246dbb9c33e2edd85a"
     }
     Frame {
         msec: 1680
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "22bc677976f53937c80f908d17a6b994"
     }
     Frame {
         msec: 1696
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "8d35befcc7c03d9c7ff04d3aca966057"
     }
     Frame {
         msec: 1712
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "c27b4404612c57b2f360bc958acf8487"
     }
     Frame {
         msec: 1728
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "79aaa8cd6081e771ceab5f6d638df7ad"
     }
     Frame {
         msec: 1744
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "8959c740dfc85a79c056dd5057474161"
     }
     Frame {
         msec: 1760
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4ba9cdf84e1d16d80bb57c670bdb85a9"
     }
     Frame {
         msec: 1776
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "f4f2b1847a8e3233e0e283853c942b60"
     }
     Frame {
         msec: 1792
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "da3f760fdd2f45d66f3ef410101afbab"
     }
     Frame {
         msec: 1808
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "17e5c56c3909da0da882bc0c8cf5c6d4"
     }
     Frame {
         msec: 1824
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4e931b797bdbe7d397125a4f80f3d865"
     }
     Frame {
         msec: 1840
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "0fc21dde21d8c11e39f1f740dddf9439"
     }
     Frame {
         msec: 1856
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "3be4aa6c6f014b79a25bd04b1e44e6fd"
     }
     Frame {
         msec: 1872
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "9049c7636d06a2885a910440a5cb829d"
     }
     Frame {
         msec: 1888
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "9049c7636d06a2885a910440a5cb829d"
     }
     Frame {
         msec: 1904
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "9049c7636d06a2885a910440a5cb829d"
     }
     Frame {
         msec: 1920
@@ -486,1869 +662,285 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "222242141fadd2c27435ce93aa1c460d"
     }
     Frame {
         msec: 1952
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "17e5c56c3909da0da882bc0c8cf5c6d4"
     }
     Frame {
         msec: 1968
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "2e7cc1dd1c62de751ff6734853fbadd7"
     }
     Frame {
         msec: 1984
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "5d234f4d69167a436ed6c95e909ae6e8"
     }
     Frame {
         msec: 2000
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "dee8be671b7d430a3bf044ea67841f15"
     }
     Frame {
         msec: 2016
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "f75438b7deb18e36c2ce397291401f4d"
     }
     Frame {
         msec: 2032
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "84d6efd807d94fb345ea640782dbfdcf"
     }
     Frame {
         msec: 2048
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "9dea3319774b70cb45eab5a71207c6bc"
     }
     Frame {
         msec: 2064
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "706c98bffe5118d5f49a3eb371b121f6"
     }
     Frame {
         msec: 2080
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "4ca3b88d0af1ea0fae4a08ee2a8b7413"
     }
     Frame {
         msec: 2096
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "2959676d888680c3288f9226d8ad1059"
     }
     Frame {
         msec: 2112
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "92a7dddbdf86f7fcd4f1d7631b7a3210"
     }
     Frame {
         msec: 2128
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "2de45cf2660f9ea4b54b3dfe3a2d6b8f"
     }
     Frame {
         msec: 2144
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "aa17f9e53e23f3de7addd126bbe2b866"
     }
     Frame {
         msec: 2160
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "36eb0221391fb7257c6eff73a1f491f3"
     }
     Frame {
         msec: 2176
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "a4b644bf91108dbc9b21a1646dab0b37"
     }
     Frame {
         msec: 2192
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "f16544e0ad09c14dc8980203aec29591"
     }
     Frame {
         msec: 2208
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "1a93e2ed871ae094aff5eeaa07385a94"
     }
     Frame {
         msec: 2224
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "977a2efa43d3be0340975ccbe6b0e8a9"
     }
     Frame {
         msec: 2240
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "0a8c81335816c747d320b3a147ee0350"
     }
     Frame {
         msec: 2256
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "0a8c81335816c747d320b3a147ee0350"
     }
     Frame {
         msec: 2272
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "0ab48b86c21be99f7caa3dda6d3a3e4d"
     }
     Frame {
         msec: 2288
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "46e69596c809d4c7563d5d44ca62eb02"
     }
     Frame {
         msec: 2304
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "46e69596c809d4c7563d5d44ca62eb02"
     }
     Frame {
         msec: 2320
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "46e69596c809d4c7563d5d44ca62eb02"
     }
     Frame {
         msec: 2336
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "46e69596c809d4c7563d5d44ca62eb02"
     }
     Frame {
         msec: 2352
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        hash: "573a18633748447b94bb67fd8e1726a4"
     }
     Frame {
         msec: 2368
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 143; y: 387
-        modifiers: 0
-        sendToViewport: true
+        hash: "573a18633748447b94bb67fd8e1726a4"
     }
     Frame {
         msec: 2384
-        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 386
-        modifiers: 0
-        sendToViewport: true
+        hash: "573a18633748447b94bb67fd8e1726a4"
     }
     Frame {
         msec: 2400
-        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
+        hash: "573a18633748447b94bb67fd8e1726a4"
     }
     Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 386
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
+        type: 2
+        button: 1
         buttons: 1
-        x: 147; y: 380
+        x: 32; y: 574
         modifiers: 0
         sendToViewport: true
     }
     Frame {
         msec: 2416
-        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 372
-        modifiers: 0
-        sendToViewport: true
+        hash: "573a18633748447b94bb67fd8e1726a4"
     }
     Frame {
         msec: 2432
-        hash: "90d9c65705a006741671657d00ab9dba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 346
-        modifiers: 0
-        sendToViewport: true
+        hash: "573a18633748447b94bb67fd8e1726a4"
     }
     Frame {
         msec: 2448
-        hash: "8c6301fb7409a22fda85072d48e838c8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 328
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 304
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2464
-        hash: "f5121fd6b0f20844d13cd8625a1a5047"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 276
-        modifiers: 0
-        sendToViewport: true
+        hash: "573a18633748447b94bb67fd8e1726a4"
     }
     Mouse {
         type: 3
         button: 1
         buttons: 0
-        x: 159; y: 276
+        x: 32; y: 574
         modifiers: 0
         sendToViewport: true
     }
     Frame {
+        msec: 2464
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Frame {
         msec: 2480
-        hash: "0d64b804b3b7e3ee052395f612d62bcf"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2496
-        hash: "17b68429dfaf80bb3313e78bb01d6c4e"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2512
-        hash: "e86ea3b103a7d9f95f7484f3579a95b5"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2528
-        hash: "884d3842f4aa2a38ff73511b143789a0"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2544
-        hash: "646d1dd3003ccac06b7251e8ce1beb2f"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2560
-        hash: "ff66db77c56bf6830bc39211b3441e69"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2576
-        hash: "8ff9c081cf823adaf6b17014fc582f12"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2592
-        hash: "7b1563aed6f030003e04f19bb6e91a51"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2608
-        hash: "3661b26f082e44cbc38e6033c28e99cb"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2624
-        hash: "8e0f117dc1f2527d6b2b3f0c849fbda1"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2640
-        hash: "5a13b0045bc132ec6c917a6d7ddf9c7a"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2656
-        hash: "06f332d287ed14b29dd0a252d59565a2"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2672
-        hash: "7b1512aabac1fb17ecc8e0c771e2477f"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2688
-        hash: "22b62a7b42df6bbafad76d99001616c7"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2704
-        hash: "0f6588fc79fa06097b2ba9bf6b1d6d14"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2720
-        hash: "c7849941c7572b3581a7eb9423838d90"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2736
-        hash: "8ddd8e9dc33698ecca6e19f2318e1c2e"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2752
-        hash: "1606eb49c73e60445d9eca11e23a33f9"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
         msec: 2768
-        hash: "6a7e58d27492742bf3d853ee37144dae"
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 123; y: 264
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
         msec: 2784
-        hash: "a55ba5b7ccdabd39385c6cb32e8e1b26"
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
     Frame {
         msec: 2800
-        hash: "afe5705e8ebc240babee4a88a4321189"
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
-    Frame {
-        msec: 2816
-        hash: "807d92ab4b8d2295f3abfd3508258dd5"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 123; y: 265
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 2832
-        hash: "ae95ed79eee246c74535d9ca97878ce6"
+        msec: 2816
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
-    Frame {
-        msec: 2848
-        hash: "c8cf5d07a06646552d5595603532b786"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 123; y: 266
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 2864
-        hash: "45971fd130662a263fcd86513aee222d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 269
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 2880
-        image: "flickable-vertical.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "8e78a9098ebd02cc828b76609c58d6b9"
-    }
-    Frame {
-        msec: 2912
-        hash: "7f4d7a1c8e0a5494bf7f37a0a165d02b"
-    }
-    Frame {
-        msec: 2928
-        hash: "881ed825133259e731b71cf6251ed862"
-    }
-    Frame {
-        msec: 2944
-        hash: "8fb86c54b4e0280de18eb2d4f1c55e68"
-    }
-    Frame {
-        msec: 2960
-        hash: "58ad7494c0bddc0de86bfd041f45a5d3"
-    }
-    Frame {
-        msec: 2976
-        hash: "87489ba1390ee152a7de023e8ba25c72"
-    }
-    Frame {
-        msec: 2992
-        hash: "b1f06b26110799e88837781cdf4688a7"
-    }
-    Frame {
-        msec: 3008
-        hash: "d23e94ef53ce3b8143a716028ab729f9"
-    }
-    Frame {
-        msec: 3024
-        hash: "1c5fdf8d85537836b698a50fcab58a4e"
-    }
-    Frame {
-        msec: 3040
-        hash: "bd9c6ea06278efa4d491519734d0032f"
-    }
-    Frame {
-        msec: 3056
-        hash: "b533e6543ca4efb34e187d540e4ed7e0"
-    }
-    Frame {
-        msec: 3072
-        hash: "65f4ff7328ce366671436512da44a094"
-    }
-    Frame {
-        msec: 3088
-        hash: "e7afcc4c29cd1868bcf1ebea1d19fca1"
-    }
-    Frame {
-        msec: 3104
-        hash: "ddaf80f4b1d98b07fe4bf8282e13b2a8"
-    }
-    Frame {
-        msec: 3120
-        hash: "d4888df20b11e30a7d613a32e603cea5"
-    }
-    Frame {
-        msec: 3136
-        hash: "ac74be483173b08cb41b8d63e3e4d073"
-    }
-    Frame {
-        msec: 3152
-        hash: "35c65757fe27f68e35c438269c00ba53"
-    }
-    Frame {
-        msec: 3168
-        hash: "b8a28356b50362f2dabd0ab4a0d1d621"
-    }
-    Frame {
-        msec: 3184
-        hash: "71205ebfcce9e3a018fe2c30f7f3ee92"
-    }
-    Frame {
-        msec: 3200
-        hash: "0ef526ebcc23342ba4b8dfa8ed41e7de"
-    }
-    Frame {
-        msec: 3216
-        hash: "9caaec9ca80b5da75e5e1231635c2f37"
-    }
-    Frame {
-        msec: 3232
-        hash: "bb6b951e8c2252d873828e9ef1c9b625"
-    }
-    Frame {
-        msec: 3248
-        hash: "15faa58fbb91f80a8c1256e5627e7777"
-    }
-    Frame {
-        msec: 3264
-        hash: "bf2d0f512ade00ee44adb6624573daf9"
-    }
-    Frame {
-        msec: 3280
-        hash: "5af713203ef673d40c69b014dcaf242f"
-    }
-    Frame {
-        msec: 3296
-        hash: "970972470176fbd64208a3b25d4f5f65"
-    }
-    Frame {
-        msec: 3312
-        hash: "135a4356d91e594ee2b71132ecf9a606"
-    }
-    Frame {
-        msec: 3328
-        hash: "8a6364c0e033d517180ec287e61b3c9d"
-    }
-    Frame {
-        msec: 3344
-        hash: "71c7d7eddd49b77e8f96f3b7a6e8470f"
-    }
-    Frame {
-        msec: 3360
-        hash: "59667814b3e1a2d832b895235a9cdaf6"
-    }
-    Frame {
-        msec: 3376
-        hash: "a324de5e8d115862b9908aba881df913"
-    }
-    Frame {
-        msec: 3392
-        hash: "300902de67507207465a74bf6404c1c4"
-    }
-    Frame {
-        msec: 3408
-        hash: "63f40e307d9f0c14bab111e833047ee1"
-    }
-    Frame {
-        msec: 3424
-        hash: "53f54f5a4745043ef616ac21583416ef"
-    }
-    Frame {
-        msec: 3440
-        hash: "851e6eebe48034d3185674f6908932af"
-    }
-    Frame {
-        msec: 3456
-        hash: "06ef04a044394ab55fe2806a50db2abf"
-    }
-    Frame {
-        msec: 3472
-        hash: "88c82d8bb518b18a174f55c647395de1"
-    }
-    Frame {
-        msec: 3488
-        hash: "e62b84c87e1d73028305b9038915c53d"
-    }
-    Frame {
-        msec: 3504
-        hash: "fdb38aa631cd6967585dd23e20f866a9"
-    }
-    Frame {
-        msec: 3520
-        hash: "edabcd9bee25b1abcabced3b0b3dff1e"
-    }
-    Frame {
-        msec: 3536
-        hash: "6f0a2dc3151c018846b13fd2e11d0fab"
-    }
-    Frame {
-        msec: 3552
-        hash: "5101944e7867260ffdd3134436c6373a"
-    }
-    Frame {
-        msec: 3568
-        hash: "a04f231f840571734f8dab609b2f82fd"
-    }
-    Frame {
-        msec: 3584
-        hash: "87c22f82c659b405fd4e81640ce0b166"
-    }
-    Frame {
-        msec: 3600
-        hash: "2273564228baea48cac343a4f30d6a59"
-    }
-    Frame {
-        msec: 3616
-        hash: "8a4d1fc12743e6153c0f47e1fce9d55f"
-    }
-    Frame {
-        msec: 3632
-        hash: "944cd812097868935a686211551ccd35"
-    }
-    Frame {
-        msec: 3648
-        hash: "a2f1a14510a1cfe3c2c45fa10b0442b4"
-    }
-    Frame {
-        msec: 3664
-        hash: "d754cc64c12ef8cc2db0ddf99381e88c"
-    }
-    Frame {
-        msec: 3680
-        hash: "168487c8ca6f3463b3aa4433cfc99792"
-    }
-    Frame {
-        msec: 3696
-        hash: "67a82c1516b0d8d953c7055f07a9fdc7"
-    }
-    Frame {
-        msec: 3712
-        hash: "0df1592631b8cc1986f905a049b40bf0"
-    }
-    Frame {
-        msec: 3728
-        hash: "8677472d35e17d7bd5fe40f7841bb01d"
-    }
-    Frame {
-        msec: 3744
-        hash: "4472a8412e41377e0795d51706fb9180"
-    }
-    Frame {
-        msec: 3760
-        hash: "84533717ec1419617895f2ec646fb1c0"
-    }
-    Frame {
-        msec: 3776
-        hash: "ad50bd7708be94c6b8e63077e589ae48"
-    }
-    Frame {
-        msec: 3792
-        hash: "a37fb5d7cec3fbff8e12157c88e08833"
-    }
-    Frame {
-        msec: 3808
-        hash: "df1ca02b5bb76338ff24a561876f89f2"
-    }
-    Frame {
-        msec: 3824
-        hash: "df1ca02b5bb76338ff24a561876f89f2"
-    }
-    Frame {
-        msec: 3840
-        image: "flickable-vertical.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "a37fb5d7cec3fbff8e12157c88e08833"
-    }
-    Frame {
-        msec: 3872
-        hash: "3c8a94d2e139a9e84eaa6bf522250756"
-    }
-    Frame {
-        msec: 3888
-        hash: "23647f577ee83bc500ca1078eea2be90"
-    }
-    Frame {
-        msec: 3904
-        hash: "c1a52221113c162e963a2a165b8d08a5"
-    }
-    Frame {
-        msec: 3920
-        hash: "993c57d4ed9026f8615c68ef5d8c5c16"
-    }
-    Frame {
-        msec: 3936
-        hash: "3d843eac108e047b6fe9ac21d8866fdd"
-    }
-    Frame {
-        msec: 3952
-        hash: "5be1fa7cb99fda017cd5cdcf91a18525"
-    }
-    Frame {
-        msec: 3968
-        hash: "c68ef5177f4568eb77c0f4135ba65e44"
-    }
-    Frame {
-        msec: 3984
-        hash: "f047939a56a0ecee5deefcd3d2bf1710"
-    }
-    Frame {
-        msec: 4000
-        hash: "4af748f59c6a62156a228ae635ec2d9c"
-    }
-    Frame {
-        msec: 4016
-        hash: "b69b045557a8eada80a24eb4caa7ea4e"
-    }
-    Frame {
-        msec: 4032
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4048
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4064
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4080
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4096
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4112
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4128
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4144
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4160
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4176
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4192
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4208
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4224
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4240
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4256
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4272
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4288
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4304
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4320
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4336
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4352
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4368
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4384
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4400
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4416
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4432
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4448
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4464
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4480
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4496
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4512
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4528
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4544
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4560
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4576
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4592
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4608
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4624
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4640
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4656
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4672
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4688
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4704
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4720
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4736
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4752
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4768
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4784
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4800
-        image: "flickable-vertical.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4832
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4848
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4864
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4880
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4896
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4912
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4928
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4944
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4960
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4976
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4992
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5008
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5024
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5040
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5056
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5072
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5088
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5104
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5120
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5136
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5152
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5168
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5184
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5200
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5216
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5232
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5248
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5264
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5280
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 173; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5328
-        hash: "0031f6edee383e97a3a31fe4268ff778"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 175; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 179; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5344
-        hash: "e594c62fe10165ae08e3dd8b33b9f584"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 159
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 183
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5360
-        hash: "dd61c97aafee69eb7c54a47dceea5810"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5376
-        hash: "29d06473d4aac07c89041b4413ce421f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 227
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 243
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "7843b1bdb9efdbee0e6dd39ef8f1078a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 253
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 185; y: 253
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "f609350d3c3041998340c9a6ded9baec"
-    }
-    Frame {
-        msec: 5424
-        hash: "53b559ea9764ad466a0ffc1c55a596c2"
-    }
-    Frame {
-        msec: 5440
-        hash: "8ac64c07cb29adff5d8510f956f3c35d"
-    }
-    Frame {
-        msec: 5456
-        hash: "cb7ab2e7af067f1493197731515462fa"
-    }
-    Frame {
-        msec: 5472
-        hash: "a0509acbb96bb3ced08a7c968836bd69"
-    }
-    Frame {
-        msec: 5488
-        hash: "e4c5e681a275b4eff49eed39a6b544d6"
-    }
-    Frame {
-        msec: 5504
-        hash: "4403e91762ff703eb12dee1b47f4072c"
-    }
-    Frame {
-        msec: 5520
-        hash: "9f548a31dea71208c9f465e37bafc589"
-    }
-    Frame {
-        msec: 5536
-        hash: "c86dd18e63508adfdbd5b3b891fd0d99"
-    }
-    Frame {
-        msec: 5552
-        hash: "b182070ff0c1b579a9fd16d39f950079"
-    }
-    Frame {
-        msec: 5568
-        hash: "4308c4d6346e20ed89026c0ec216ae89"
-    }
-    Frame {
-        msec: 5584
-        hash: "2da84d83767e5ac1f7ce361bdcebe9c8"
-    }
-    Frame {
-        msec: 5600
-        hash: "a3ce932ebf10147f79a183e44a6f6eb7"
-    }
-    Frame {
-        msec: 5616
-        hash: "f5907789e23150c8dd0858d7c5098907"
-    }
-    Frame {
-        msec: 5632
-        hash: "98b76cfad574957f5b7633390c6788c8"
-    }
-    Frame {
-        msec: 5648
-        hash: "8c58d6511a7077cc386216a6227e8b52"
-    }
-    Frame {
-        msec: 5664
-        hash: "2ca5e16bfd83f933f32367aa49db0e1d"
-    }
-    Frame {
-        msec: 5680
-        hash: "ba387d0ab480eb9eaf6993c2ad168350"
-    }
-    Frame {
-        msec: 5696
-        hash: "ae9f3b3245ccf921967a178712566b55"
-    }
-    Frame {
-        msec: 5712
-        hash: "32cf742724558260447f61da03d5f321"
-    }
-    Frame {
-        msec: 5728
-        hash: "ad21273f37c1abac0719f532dd5530ac"
-    }
-    Frame {
-        msec: 5744
-        hash: "50e43629e0b8d0d651b9670241354cb1"
-    }
-    Frame {
-        msec: 5760
-        image: "flickable-vertical.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "e4f0192406831c8e0abe1b561120b9c0"
-    }
-    Frame {
-        msec: 5792
-        hash: "4c98e619b487d67d114ed0d7800f157e"
-    }
-    Frame {
-        msec: 5808
-        hash: "11ed6dc9464396eb790db236f3713164"
-    }
-    Frame {
-        msec: 5824
-        hash: "908febb1e344d6972d6df611e82792bd"
-    }
-    Frame {
-        msec: 5840
-        hash: "03536bb4d6ff84bf75d9ec3574bb7361"
-    }
-    Frame {
-        msec: 5856
-        hash: "f9946a44c2d4e91a947e6bda7415cf9b"
-    }
-    Frame {
-        msec: 5872
-        hash: "0e63e4b9dd6bc7d7b684cb461c6257bf"
-    }
-    Frame {
-        msec: 5888
-        hash: "1ffe88b771bed2aa27aafe6853b67c7a"
-    }
-    Frame {
-        msec: 5904
-        hash: "ff1b78113a710481273ecf01cc978a46"
-    }
-    Frame {
-        msec: 5920
-        hash: "e381553fa74436ca4b0d166bdca78cf7"
-    }
-    Frame {
-        msec: 5936
-        hash: "d9a6f9bfc011edb7da23091fe24e2717"
-    }
-    Frame {
-        msec: 5952
-        hash: "bd137e8b15f5c485d10b83461dedc67f"
-    }
-    Frame {
-        msec: 5968
-        hash: "8f5b5e19845aa537790b683ef37c8626"
-    }
-    Frame {
-        msec: 5984
-        hash: "5abbf0dccef8a3bb7b090a24d715a25f"
-    }
-    Frame {
-        msec: 6000
-        hash: "bf924dd11e226022c9c812b5c7e8229e"
-    }
-    Frame {
-        msec: 6016
-        hash: "c47b59ff7f3c4acfb296959f6eb14801"
-    }
-    Frame {
-        msec: 6032
-        hash: "b5c0ac4514d44a651a4ab817646f1d88"
-    }
-    Frame {
-        msec: 6048
-        hash: "86a9fba0e2ca761a4fb71e5edbf34cab"
-    }
-    Frame {
-        msec: 6064
-        hash: "5bf43304399bdc979afd2580b922fd30"
-    }
-    Frame {
-        msec: 6080
-        hash: "3696756d6250f23b1122d314df08b936"
-    }
-    Frame {
-        msec: 6096
-        hash: "49c7b24b1655a1b5a9b4cc2187f7cc58"
-    }
-    Frame {
-        msec: 6112
-        hash: "a387dce727804fb4ca1c3378ba130d08"
-    }
-    Frame {
-        msec: 6128
-        hash: "505150386afee9c5d89566c90778cf58"
-    }
-    Frame {
-        msec: 6144
-        hash: "a00ecae0150a069d306127ed54c4921f"
-    }
-    Frame {
-        msec: 6160
-        hash: "e556bfca052e4d8922a4b85d6e94a22a"
-    }
-    Frame {
-        msec: 6176
-        hash: "ac710b4796de4d0b7d275c5fffcefe1f"
-    }
-    Frame {
-        msec: 6192
-        hash: "2f0475e842083c93b0fa0b8a8a33117a"
-    }
-    Frame {
-        msec: 6208
-        hash: "6de0e820748df06e702a82f127d9f635"
-    }
-    Frame {
-        msec: 6224
-        hash: "b3748d7a26ea8289e2faa9dd624b23a3"
-    }
-    Frame {
-        msec: 6240
-        hash: "52be51e9a5bf6e6d0c2e64e584a4bf11"
-    }
-    Frame {
-        msec: 6256
-        hash: "9c4a08a51556d56f2809d27a1de0aae3"
-    }
-    Frame {
-        msec: 6272
-        hash: "4a151e94a39b68a47374cc45cb8969df"
-    }
-    Frame {
-        msec: 6288
-        hash: "a2c2926224103d6e0a679b891451f791"
-    }
-    Frame {
-        msec: 6304
-        hash: "c192adca5c3cf3741f6e7b33d53a722a"
-    }
-    Frame {
-        msec: 6320
-        hash: "8fa9d85c213243e0709e3e32f03cebd9"
-    }
-    Frame {
-        msec: 6336
-        hash: "20f516aa2c4ebc239a283176d83ade6f"
-    }
-    Frame {
-        msec: 6352
-        hash: "ac8ace61348c5500dd6e2d1f3b4b174b"
-    }
-    Frame {
-        msec: 6368
-        hash: "39cc6b136e17283ddc65425150cec7be"
-    }
-    Frame {
-        msec: 6384
-        hash: "b250cb3fd5a7ab5c76ae15d5a500a894"
-    }
-    Frame {
-        msec: 6400
-        hash: "f07e4f8b61c0ce514364e062867687a2"
-    }
-    Frame {
-        msec: 6416
-        hash: "caed510a4edc2830f885f9a8ff98c072"
-    }
-    Frame {
-        msec: 6432
-        hash: "2cfba2b8cd1cbc260edf390e17532afa"
-    }
-    Frame {
-        msec: 6448
-        hash: "f1d705e01521261f22b89aeefb146c7a"
-    }
-    Frame {
-        msec: 6464
-        hash: "9508799a0e28e60a65925b7c10fa2874"
-    }
-    Frame {
-        msec: 6480
-        hash: "accdad5176a0cdce92ed07a7ae818a13"
-    }
-    Frame {
-        msec: 6496
-        hash: "2748258d00cf2f0e5f94c94f97ed95ae"
-    }
-    Frame {
-        msec: 6512
-        hash: "994897c0842947675e2e2df4021c1b5e"
-    }
-    Frame {
-        msec: 6528
-        hash: "22936773b2fc5c555f14a8375da2a7a4"
-    }
-    Frame {
-        msec: 6544
-        hash: "22936773b2fc5c555f14a8375da2a7a4"
-    }
-    Frame {
-        msec: 6560
-        hash: "b58badc862e394bf5374554e019f90c0"
-    }
-    Frame {
-        msec: 6576
-        hash: "b58badc862e394bf5374554e019f90c0"
-    }
-    Frame {
-        msec: 6592
-        hash: "b58badc862e394bf5374554e019f90c0"
-    }
-    Frame {
-        msec: 6608
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6624
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6640
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6656
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6672
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6688
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6704
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6720
-        image: "flickable-vertical.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6752
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6768
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 31; y: 575
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6784
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6800
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6816
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6832
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6848
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6864
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 31; y: 575
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6896
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6912
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6928
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6944
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6960
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6976
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6992
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7008
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7024
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7040
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7056
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7072
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7088
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7104
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7120
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7136
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7152
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7168
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7184
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7200
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7216
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7232
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7248
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7264
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7280
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 156; y: 403
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7296
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 402
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 396
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 386
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 376
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 360
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 344
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 322
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 298
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 278
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 168; y: 278
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7392
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7408
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7424
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7440
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7456
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7472
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7488
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7504
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7520
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7536
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7552
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7568
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7584
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7600
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7616
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7632
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7648
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7664
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7680
-        image: "flickable-vertical.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7712
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7728
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7744
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7760
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7776
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7792
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7808
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 154; y: 161
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7824
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Frame {
-        msec: 7840
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 162
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7856
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 167
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7872
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 150; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 229
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 255
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
+        msec: 2832
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 134; y: 281
+        x: 124; y: 275
         modifiers: 0
         sendToViewport: true
     }
@@ -2356,31 +948,19 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 132; y: 313
+        x: 125; y: 284
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 7936
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 128; y: 343
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7952
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
+        msec: 2848
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 126; y: 373
+        x: 125; y: 293
         modifiers: 0
         sendToViewport: true
     }
@@ -2388,475 +968,315 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 126; y: 397
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 126; y: 397
+        x: 127; y: 304
         modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7968
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7984
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8000
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8016
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8032
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8048
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8064
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8080
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8096
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8112
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8128
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8144
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8160
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8176
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8192
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8208
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8224
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8240
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8256
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8272
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8288
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8304
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8320
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8336
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8352
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8368
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8384
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8400
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8416
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8432
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8448
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8464
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8480
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8496
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8512
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8528
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8544
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8560
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8576
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8592
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8608
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8624
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8640
-        image: "flickable-vertical.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8672
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8688
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8704
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8720
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8736
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8752
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8768
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8784
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8800
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8816
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8832
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8848
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8864
-        hash: "679369b924d719ae309a45034bdba40d"
+        sendToViewport: true
     }
     Frame {
-        msec: 8880
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2864
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
-    Frame {
-        msec: 8896
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 129; y: 320
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 8912
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 337
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 8928
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2880
+        image: "flickable-vertical.2.png"
     }
-    Frame {
-        msec: 8944
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 136; y: 354
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 8960
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 142; y: 375
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 8976
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2896
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
-    Frame {
-        msec: 8992
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 392
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 9008
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 149; y: 411
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9024
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2912
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
-    Frame {
-        msec: 9040
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 451
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9056
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2928
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
-    Frame {
-        msec: 9072
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 466
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 9088
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 479
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9104
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2944
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
     Mouse {
-        type: 2
-        button: 1
+        type: 5
+        button: 0
         buttons: 1
-        x: 44; y: 574
+        x: 161; y: 488
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 9120
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 493
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9136
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2960
+        hash: "96fb3652bfcf0aac1e35a2e50532816f"
     }
-    Frame {
-        msec: 9152
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 494
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 3
         button: 1
         buttons: 0
-        x: 44; y: 574
+        x: 161; y: 494
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 9168
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2976
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9184
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 2992
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9200
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3008
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9216
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3024
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9232
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3040
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9248
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3056
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9264
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3072
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9280
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3088
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9296
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3104
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9312
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3120
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9328
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3136
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9344
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3152
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9360
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3168
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9376
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3184
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 9392
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 162; y: 474
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9408
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3200
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 9424
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 472
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 9440
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 468
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9456
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3216
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 9472
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 464
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 9488
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 460
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9504
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3232
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 9520
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 450
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 9536
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 438
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9552
-        hash: "679369b924d719ae309a45034bdba40d"
+        msec: 3248
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 9568
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 172; y: 426
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 9584
-        hash: "679369b924d719ae309a45034bdba40d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 409
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 9600
-        image: "flickable-vertical.9.png"
+        msec: 3264
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Mouse {
-        type: 2
-        button: 1
+        type: 5
+        button: 0
         buttons: 1
-        x: 152; y: 444
+        x: 174; y: 397
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 9616
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 152; y: 442
+        x: 176; y: 383
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 9632
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+        msec: 3280
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 152; y: 440
+        x: 176; y: 367
         modifiers: 0
         sendToViewport: true
     }
@@ -2864,31 +1284,39 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 152; y: 438
+        x: 176; y: 350
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 9648
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+        msec: 3296
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 335
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 154; y: 429
+        x: 172; y: 316
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 9664
-        hash: "3b0e0ed925b1c197cd94afd3d1a6d572"
+        msec: 3312
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 156; y: 421
+        x: 170; y: 296
         modifiers: 0
         sendToViewport: true
     }
@@ -2896,31 +1324,47 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 158; y: 413
+        x: 168; y: 279
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 9680
-        hash: "d7b3838ee1219816b76224c29c7ba2e1"
+        msec: 3328
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 262
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 160; y: 403
+        x: 166; y: 244
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 9696
-        hash: "9835b420f0c40a03f8f9fafe39e209f1"
+        msec: 3344
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 231
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 162; y: 393
+        x: 164; y: 222
         modifiers: 0
         sendToViewport: true
     }
@@ -2928,599 +1372,543 @@ VisualTest {
         type: 3
         button: 1
         buttons: 0
-        x: 162; y: 393
+        x: 164; y: 222
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 9712
-        hash: "46fb2005a813fc2c278f1bfe83801c0e"
-    }
-    Frame {
-        msec: 9728
-        hash: "81dd9308e475548db21474c37cb9a5b0"
-    }
-    Frame {
-        msec: 9744
-        hash: "10043d74eef240abd2360d45845dd51e"
-    }
-    Frame {
-        msec: 9760
-        hash: "0f83b8f23ba42b22c10a2b68227db64e"
-    }
-    Frame {
-        msec: 9776
-        hash: "7a296e3702c9fef25cb53ac04053853b"
-    }
-    Frame {
-        msec: 9792
-        hash: "ae439daa32f76a368ab314c86c55a378"
-    }
-    Frame {
-        msec: 9808
-        hash: "42ac3503dfa462bf0b5d8c15f6f3b143"
-    }
-    Frame {
-        msec: 9824
-        hash: "b8bb92eb2de7ca0f5924b09f380f47db"
-    }
-    Frame {
-        msec: 9840
-        hash: "994e314d2d38005b6006e81468f10efa"
-    }
-    Frame {
-        msec: 9856
-        hash: "be6a32f3c82aeccebc7778ff5646637f"
-    }
-    Frame {
-        msec: 9872
-        hash: "2fb196f53d5e785e04a14d98d9dab8a1"
-    }
-    Frame {
-        msec: 9888
-        hash: "0926f8209f4f35f6e6fa92935d7408e4"
-    }
-    Frame {
-        msec: 9904
-        hash: "780450301d37ea2b94eb9386e7e5294c"
-    }
-    Frame {
-        msec: 9920
-        hash: "cd4e9629c767813c9a2a2fa30dc5114b"
-    }
-    Frame {
-        msec: 9936
-        hash: "409630d7b9c3c4231bccf74f7453f0af"
-    }
-    Frame {
-        msec: 9952
-        hash: "4c98e619b487d67d114ed0d7800f157e"
-    }
-    Frame {
-        msec: 9968
-        hash: "0a8157dc45764ab8e0e0b89e5c73a76b"
+        msec: 3360
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 9984
-        hash: "ecfc611b58e000df9f608c8889a2a84f"
+        msec: 3376
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10000
-        hash: "5c6bc246446c75d57bcd40e86041892b"
+        msec: 3392
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10016
-        hash: "fe1a3e688da126861b29a94b676b68f7"
+        msec: 3408
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10032
-        hash: "f5feef892bf013916bacb63ff6460cb7"
+        msec: 3424
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10048
-        hash: "665018efd991cab3acb4b80005fc2bd3"
+        msec: 3440
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10064
-        hash: "bc7614e4a0e0724a9cb0981f09f8a7f6"
+        msec: 3456
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10080
-        hash: "463a6da452a5a6267240992ad5284e89"
+        msec: 3472
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10096
-        hash: "eca3f146e0143856f58b4f7aee42e6f8"
+        msec: 3488
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10112
-        hash: "dec9b9845509c4d28d7faae043b292d1"
+        msec: 3504
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10128
-        hash: "49452842cb2429cd465e40478638e0e3"
+        msec: 3520
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10144
-        hash: "a7029d0090d3620ee21b9e3d55eefe78"
+        msec: 3536
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10160
-        hash: "1041b18d422acba0b9a45ca89856e493"
+        msec: 3552
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10176
-        hash: "d53038b688b920715b196dd4cc2b2587"
+        msec: 3568
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10192
-        hash: "da59ffebb491ab5fa98429117c3bb8ac"
+        msec: 3584
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10208
-        hash: "602269f78eaf0df36c66de72e005989a"
+        msec: 3600
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10224
-        hash: "a311b6b35feb4096b0d01753a6695210"
+        msec: 3616
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10240
-        hash: "cd303e8850c6aac58fcf2a98db418f1b"
+        msec: 3632
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10256
-        hash: "6e9132dd840a136cc688676bce7640de"
+        msec: 3648
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10272
-        hash: "a3818492bb4ebd91ce86675d34731c58"
+        msec: 3664
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10288
-        hash: "b85a127895713234028641787312b717"
+        msec: 3680
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10304
-        hash: "a030dc1543e84d8a0ec9f77fd6325060"
+        msec: 3696
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10320
-        hash: "669cd28abe17d419e9cabe4d796a38c3"
+        msec: 3712
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10336
-        hash: "bfdd15cf058050203561b5f935106263"
+        msec: 3728
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10352
-        hash: "a39abc94fee93175a6a37b402750e4f7"
+        msec: 3744
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10368
-        hash: "0c65e19e12d95ec8ee253219b0c3e472"
+        msec: 3760
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10384
-        hash: "15debc234e70765a4510bfbda886a2c9"
+        msec: 3776
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10400
-        hash: "9566a87437cb6e9025f9a3881a620823"
+        msec: 3792
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10416
-        hash: "b66d89244cba537a21901dcb11387bf7"
+        msec: 3808
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10432
-        hash: "03347ce314393bd84873026cd01c562f"
+        msec: 3824
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10448
-        hash: "458fab2449dba089ae6f1e78a230564b"
+        msec: 3840
+        image: "flickable-vertical.3.png"
     }
     Frame {
-        msec: 10464
-        hash: "7115f27574bfc68ff58a2e4fb65107dd"
+        msec: 3856
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10480
-        hash: "66260c030dddda4b086bc98982a11934"
+        msec: 3872
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10496
-        hash: "d5790ee5eb8ecf249cb1dcf58aefa4ee"
+        msec: 3888
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10512
-        hash: "6bec07ba1e2ac637aab7a9038cbacc93"
+        msec: 3904
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10528
-        hash: "a72f36cc18c8620a2bd85bac49f6771a"
+        msec: 3920
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10544
-        hash: "65b178ae559ab0ba9c568718f287ff68"
+        msec: 3936
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10560
-        image: "flickable-vertical.10.png"
+        msec: 3952
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10576
-        hash: "b35a8e33f876921d477809b5adb7a201"
+        msec: 3968
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10592
-        hash: "057b69ef8137f38c596432da547f1ead"
+        msec: 3984
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10608
-        hash: "62f76f46857106010c2e862ed19baeea"
+        msec: 4000
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10624
-        hash: "fbfc73e1b20b79d71953c298ca095047"
+        msec: 4016
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10640
-        hash: "aea78988f875083660dd46d6afc71683"
+        msec: 4032
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10656
-        hash: "60d8decd7ded420433256a94f1bf954f"
+        msec: 4048
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10672
-        hash: "221f72cdf18e0b33e7f6a65356fcc61b"
+        msec: 4064
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10688
-        hash: "221f72cdf18e0b33e7f6a65356fcc61b"
+        msec: 4080
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10704
-        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
+        msec: 4096
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10720
-        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
+        msec: 4112
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10736
-        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
+        msec: 4128
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10752
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4144
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10768
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4160
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10784
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4176
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10800
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4192
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10816
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4208
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10832
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4224
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10848
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4240
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10864
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4256
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10880
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4272
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 2
         button: 1
         buttons: 1
-        x: 98; y: 573
+        x: 38; y: 583
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 10896
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10912
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4288
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10928
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4304
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10944
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4320
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10960
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4336
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 3
         button: 1
         buttons: 0
-        x: 98; y: 573
+        x: 38; y: 583
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 10976
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4352
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 10992
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4368
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11008
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4384
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11024
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4400
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11040
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4416
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11056
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4432
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11072
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4448
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11088
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4464
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11104
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4480
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11120
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4496
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11136
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4512
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11152
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4528
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11168
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4544
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11184
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4560
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11200
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4576
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11216
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4592
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11232
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4608
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11248
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4624
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11264
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4640
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11280
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4656
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11296
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4672
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11312
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4688
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11328
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4704
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11344
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4720
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11360
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4736
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11376
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4752
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11392
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4768
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11408
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4784
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 110; y: 578
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4800
+        image: "flickable-vertical.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Frame {
+        msec: 4832
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 110; y: 578
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 11424
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4848
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11440
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4864
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11456
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4880
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11472
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4896
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11488
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4912
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11504
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4928
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11520
-        image: "flickable-vertical.11.png"
+        msec: 4944
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11536
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4960
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11552
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4976
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11568
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 4992
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11584
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5008
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11600
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5024
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11616
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5040
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11632
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5056
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11648
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5072
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11664
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5088
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11680
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5104
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11696
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5120
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11712
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5136
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 11728
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5152
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 2
         button: 1
         buttons: 1
-        x: 170; y: 335
+        x: 123; y: 218
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11744
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11760
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 336
-        modifiers: 0
-        sendToViewport: true
+        msec: 5168
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 170; y: 338
+        x: 123; y: 219
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11776
-        hash: "28a06534a2e35250c67112dfb6c05095"
+        msec: 5184
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 170; y: 346
+        x: 124; y: 223
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 11792
-        hash: "12040d4dd56848fc93d6390005045188"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 170; y: 359
+        x: 124; y: 230
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11808
-        hash: "caa70db5f31eb607c2de39734a42796c"
+        msec: 5200
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 168; y: 367
+        x: 126; y: 241
         modifiers: 0
         sendToViewport: true
     }
@@ -3528,375 +1916,219 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 166; y: 379
+        x: 126; y: 257
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11824
-        hash: "ca45ab832b5a8b041ba8bea1185a2b38"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 393
-        modifiers: 0
-        sendToViewport: true
+        msec: 5216
+        hash: "43865bf07d3b0818bd0fd3388451f055"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 164; y: 407
+        x: 130; y: 300
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11840
-        hash: "188042b1a045dc96a65a7fc0e90568c3"
+        msec: 5232
+        hash: "d7e49dfc8f9faef7d405451ae52691e0"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 164; y: 419
+        x: 132; y: 325
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 11856
-        hash: "714a3cf591beeeddbdc2df94f5cedef1"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 164; y: 443
+        x: 134; y: 349
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11872
-        hash: "e9978c24eef649d01cb2245f783cb562"
+        msec: 5248
+        hash: "427d51731dac5e356c5ab82d272c0d5a"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 164; y: 461
+        x: 136; y: 372
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 11888
-        hash: "bc8f32062afdfe33da7c99ee867bc2a3"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 166; y: 467
+        x: 138; y: 395
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11904
-        hash: "d788c09f4acba8197b2d8fef2e8ece51"
+        msec: 5264
+        hash: "9370cc84e32afc59c81c4d2dbf5fa690"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 168; y: 470
+        x: 142; y: 433
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 11920
-        hash: "b0a383eb416727c22451a30a997f48f1"
+        msec: 5280
+        hash: "984bd78f9f503e8a3ffac5bbe69fe3a9"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 169; y: 472
+        x: 144; y: 470
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 11936
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 11952
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 11968
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 11984
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12000
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12016
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12032
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12048
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12064
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
     Mouse {
         type: 3
         button: 1
         buttons: 0
-        x: 169; y: 472
+        x: 144; y: 470
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 12080
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12096
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12112
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12128
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12144
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5296
+        hash: "022106d1ecd8195923b6d79fb95d1135"
     }
     Frame {
-        msec: 12160
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5312
+        hash: "5b6bd34ae7e59923bb4b4c2e4e7a0bf3"
     }
     Frame {
-        msec: 12176
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5328
+        hash: "2f8a121667195d85cd05417a350dd35b"
     }
     Frame {
-        msec: 12192
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5344
+        hash: "d0f7fcb01dc6abc0ae29ca1ee45edf24"
     }
     Frame {
-        msec: 12208
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5360
+        hash: "9f3e5d23ea33bff4f05900d6faf7dbae"
     }
     Frame {
-        msec: 12224
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5376
+        hash: "535f40614a02fa3f627748a5c24b3a39"
     }
     Frame {
-        msec: 12240
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5392
+        hash: "138bc0c4dd08ffec0c79c4c7474ed318"
     }
     Frame {
-        msec: 12256
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5408
+        hash: "838f07195d00b19104bbbd93c7670dab"
     }
     Frame {
-        msec: 12272
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5424
+        hash: "b7fb0944bf53ccc62effe159333449ff"
     }
     Frame {
-        msec: 12288
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5440
+        hash: "56a21c9210074ef8a044019fa9375b14"
     }
     Frame {
-        msec: 12304
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5456
+        hash: "4ef80a5d73981ce1f1081fc578ea088a"
     }
     Frame {
-        msec: 12320
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5472
+        hash: "f3f9cf99ab436c1a2805c0859df9589e"
     }
     Frame {
-        msec: 12336
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5488
+        hash: "0d88023fe7af39e409f7a12348d4e3d6"
     }
     Frame {
-        msec: 12352
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5504
+        hash: "b4abf98d58fe490ceb7a62621292f8d9"
     }
     Frame {
-        msec: 12368
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5520
+        hash: "5c3247324b214b961ed40da985fb50a4"
     }
     Frame {
-        msec: 12384
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5536
+        hash: "41195a5c39ac1ecbd175e5663d23cdaa"
     }
     Frame {
-        msec: 12400
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5552
+        hash: "028460cd5eecd50a12261e541f1776bf"
     }
     Frame {
-        msec: 12416
-        hash: "6b81b365eb057ffa32d89e564bc92949"
+        msec: 5568
+        hash: "56763e343221db0a111bb91e72640911"
     }
     Frame {
-        msec: 12432
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 171; y: 452
-        modifiers: 0
-        sendToViewport: true
+        msec: 5584
+        hash: "a4b644bf91108dbc9b21a1646dab0b37"
     }
     Frame {
-        msec: 12448
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 172; y: 450
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 448
-        modifiers: 0
-        sendToViewport: true
+        msec: 5600
+        hash: "c2d2d51f0147e78550f762ec84f7f338"
     }
     Frame {
-        msec: 12464
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 175; y: 434
-        modifiers: 0
-        sendToViewport: true
+        msec: 5616
+        hash: "1a93e2ed871ae094aff5eeaa07385a94"
     }
     Frame {
-        msec: 12480
-        image: "flickable-vertical.12.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 175; y: 431
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 423
-        modifiers: 0
-        sendToViewport: true
+        msec: 5632
+        hash: "977a2efa43d3be0340975ccbe6b0e8a9"
     }
     Frame {
-        msec: 12496
-        hash: "7e760a017ab10fe920074405248d1473"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 415
-        modifiers: 0
-        sendToViewport: true
+        msec: 5648
+        hash: "977a2efa43d3be0340975ccbe6b0e8a9"
     }
     Frame {
-        msec: 12512
-        hash: "eab43f1c2b6fb79aad578a164b8b7b28"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 181; y: 395
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 383
-        modifiers: 0
-        sendToViewport: true
+        msec: 5664
+        hash: "0a8c81335816c747d320b3a147ee0350"
     }
     Frame {
-        msec: 12528
-        hash: "a5446ca4c6650ffc9812845bdb8db088"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 371
-        modifiers: 0
-        sendToViewport: true
+        msec: 5680
+        hash: "0a8c81335816c747d320b3a147ee0350"
     }
     Frame {
-        msec: 12544
-        hash: "71cb7dc7f9dbb9e17d7f44885ec71bdb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 357
-        modifiers: 0
-        sendToViewport: true
+        msec: 5696
+        hash: "46e69596c809d4c7563d5d44ca62eb02"
     }
     Frame {
-        msec: 12560
-        hash: "ccf0908d968f658311a9787182de498a"
+        msec: 5712
+        hash: "46e69596c809d4c7563d5d44ca62eb02"
     }
     Mouse {
-        type: 5
-        button: 0
+        type: 2
+        button: 1
         buttons: 1
-        x: 187; y: 329
+        x: 176; y: 412
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 12576
-        hash: "26b9c6379590bbda24d129bd4f19f7d3"
+        msec: 5728
+        hash: "aebff194f1c84190623ebfc358503b5f"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 303
+        x: 177; y: 406
         modifiers: 0
         sendToViewport: true
     }
@@ -3904,1139 +2136,1363 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 293
+        x: 177; y: 395
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 12592
-        hash: "6c88a02ffdffee6d615ddc6a11c1b698"
+        msec: 5744
+        hash: "39f1cee1ad7ab2ab6601e2b67f5d83c7"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 283
+        x: 181; y: 367
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 12608
-        hash: "38175cb09b6e63353b478635b22dbb5b"
+        msec: 5760
+        image: "flickable-vertical.5.png"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 280
+        x: 183; y: 326
         modifiers: 0
         sendToViewport: true
     }
+    Frame {
+        msec: 5776
+        hash: "02d9d0829c64b92e98b8093b38e6f848"
+    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 277
+        x: 183; y: 299
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 12624
-        hash: "5084910bf204e8b688de31d4f9018a57"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 275
+        x: 180; y: 276
         modifiers: 0
         sendToViewport: true
     }
+    Frame {
+        msec: 5792
+        hash: "46f76f341787a80b9f9c16a5bc9f83c5"
+    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 273
+        x: 175; y: 214
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 12640
-        hash: "e984565312571ec144a1cd4cc11253e8"
+        msec: 5808
+        hash: "67c3225460673038d190169115622f02"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 272
+        x: 167; y: 147
         modifiers: 0
         sendToViewport: true
     }
     Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 271
+        type: 3
+        button: 1
+        buttons: 0
+        x: 167; y: 147
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 12656
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5824
+        hash: "2cb9abc32225ea9d39deb09da6119a94"
     }
     Frame {
-        msec: 12672
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5840
+        hash: "bf69fa4cd3f73e15f07394d290b801e6"
     }
     Frame {
-        msec: 12688
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5856
+        hash: "cf5f2524171ca121f4478c3c6d7dfd35"
     }
     Frame {
-        msec: 12704
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5872
+        hash: "d498a494fa489150bd324e18a1c14fe5"
     }
     Frame {
-        msec: 12720
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5888
+        hash: "459c2e8110f1c21b3f8d590e7c0355de"
     }
     Frame {
-        msec: 12736
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5904
+        hash: "1bde4841026fd6117b49d94d697b03fa"
     }
     Frame {
-        msec: 12752
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5920
+        hash: "84b025039284f616d69465ec8cc245b8"
     }
     Frame {
-        msec: 12768
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5936
+        hash: "3652c4664895a0b6fbe06521a79c8bb9"
     }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 187; y: 271
-        modifiers: 0
-        sendToViewport: true
+    Frame {
+        msec: 5952
+        hash: "f817f6059b8cb3fc4a85c9c91df6c7a3"
     }
     Frame {
-        msec: 12784
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5968
+        hash: "cb671ab3c3a9de0c17df2896e45beca9"
     }
     Frame {
-        msec: 12800
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 5984
+        hash: "d9102b25f63ca9274057dad0ab2b6102"
     }
     Frame {
-        msec: 12816
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6000
+        hash: "b9df17ad73b7a5b018ab30c5c57afd02"
     }
     Frame {
-        msec: 12832
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6016
+        hash: "664494b87407881a11b4732f0713f587"
     }
     Frame {
-        msec: 12848
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6032
+        hash: "cac62fc442c064286b7e4a71a13b929c"
     }
     Frame {
-        msec: 12864
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6048
+        hash: "989b4649dca89e227f552979af1c68f0"
     }
     Frame {
-        msec: 12880
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6064
+        hash: "80b4b11b3cbc684d920fa89c3345d8bc"
     }
     Frame {
-        msec: 12896
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6080
+        hash: "dcbd4e93e7ac0ef0e78c6a19cf3295f1"
     }
     Frame {
-        msec: 12912
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6096
+        hash: "33f3ddd9d7fa5a472465029d7a7263ae"
     }
     Frame {
-        msec: 12928
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6112
+        hash: "fb5675d4870528b9c0591c5a80530b17"
     }
     Frame {
-        msec: 12944
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6128
+        hash: "e57dbe962c1ef45893e41559cee19d16"
     }
     Frame {
-        msec: 12960
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6144
+        hash: "a9081993871e0171e25159a078a5cdbc"
     }
     Frame {
-        msec: 12976
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6160
+        hash: "cadc7f53518ba3f4cbe8e686b90fa5ab"
     }
     Frame {
-        msec: 12992
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 6176
+        hash: "e9208a44f95ccc181bfc64e8785bd633"
     }
     Frame {
-        msec: 13008
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6192
+        hash: "a69f2969122a547b1af195f581c272b8"
     }
     Frame {
-        msec: 13024
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6208
+        hash: "eee0b7c2f01bcc57f141d9aa27f73da6"
     }
     Frame {
-        msec: 13040
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6224
+        hash: "f58ac16d11909563cf214b6c2baef0dc"
     }
     Frame {
-        msec: 13056
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6240
+        hash: "e373def5a0bcd30ea7f4acb539785e3c"
     }
     Frame {
-        msec: 13072
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6256
+        hash: "0dce9f4bab793ea1d6e368cd6fb37047"
     }
     Frame {
-        msec: 13088
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6272
+        hash: "4a4725f2546b08faffa3a543de578e59"
     }
     Frame {
-        msec: 13104
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6288
+        hash: "ea36b5869634115182c365990518b993"
     }
     Frame {
-        msec: 13120
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6304
+        hash: "45b102bd0c5ab42783b9e428cea202a4"
     }
     Frame {
-        msec: 13136
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6320
+        hash: "0154e6010f3a8621a8f992bb7dcfd5b8"
     }
     Frame {
-        msec: 13152
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6336
+        hash: "035a8c7e9eece0f9ea4f5ad62658d7f9"
     }
     Frame {
-        msec: 13168
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6352
+        hash: "fc1050cf971296a9200c548feee08d0a"
     }
     Frame {
-        msec: 13184
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6368
+        hash: "ef9c7f1228ac6825cce8ce0e9e7aaac5"
     }
     Frame {
-        msec: 13200
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6384
+        hash: "70ef278074b1527aba16eca8c3811af5"
     }
     Frame {
-        msec: 13216
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6400
+        hash: "08012939aca6381dedd838a7fd0be1a3"
     }
     Frame {
-        msec: 13232
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6416
+        hash: "2c702b17a0ec2aac2928ad8bcc2e080b"
     }
     Frame {
-        msec: 13248
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6432
+        hash: "e70e243e8ecc8e8f50ea4f0f4559c8c6"
     }
     Frame {
-        msec: 13264
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6448
+        hash: "73013ff1a7f0c3040f3520f0581e4ce0"
     }
     Frame {
-        msec: 13280
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6464
+        hash: "14cdd689ae9e5b15e212d9dab63ec946"
     }
     Frame {
-        msec: 13296
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6480
+        hash: "354d822bf252559211513e49e417a413"
     }
     Frame {
-        msec: 13312
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6496
+        hash: "77eb798efd1447eca75de12dc2c7a215"
     }
     Frame {
-        msec: 13328
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6512
+        hash: "08dc9068d21db7ff87d4d88eb1443aed"
     }
     Frame {
-        msec: 13344
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6528
+        hash: "baab3b98e70ca51d1cbd27d4a998380f"
     }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 181; y: 242
-        modifiers: 0
-        sendToViewport: true
+    Frame {
+        msec: 6544
+        hash: "baab3b98e70ca51d1cbd27d4a998380f"
     }
     Frame {
-        msec: 13360
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6560
+        hash: "baab3b98e70ca51d1cbd27d4a998380f"
     }
     Frame {
-        msec: 13376
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6576
+        hash: "84519c415186e5abd122a1f39e26265b"
     }
     Frame {
-        msec: 13392
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6592
+        hash: "df63754934af656e08e93ce4fa69c19e"
     }
     Frame {
-        msec: 13408
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6608
+        hash: "34439eb26069feabee5ba97bfd1c2cb3"
     }
     Frame {
-        msec: 13424
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6624
+        hash: "46534a7da31ac76c52036e51c63db72e"
     }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 181; y: 242
-        modifiers: 0
-        sendToViewport: true
+    Frame {
+        msec: 6640
+        hash: "cf8e86112be37fc94687aa8bd437e1a2"
     }
     Frame {
-        msec: 13440
-        image: "flickable-vertical.13.png"
+        msec: 6656
+        hash: "f93ba6420ab0ef719aa10c6aae71c878"
     }
     Frame {
-        msec: 13456
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6672
+        hash: "22f991814552e7e3e2db8fea0abe9d6c"
     }
     Frame {
-        msec: 13472
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6688
+        hash: "7d2773bec8310d92166ab7184741ace4"
     }
     Frame {
-        msec: 13488
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6704
+        hash: "f18aace5e0d4ca8a385a57682d82e43f"
     }
     Frame {
-        msec: 13504
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6720
+        image: "flickable-vertical.6.png"
     }
     Frame {
-        msec: 13520
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6736
+        hash: "7f445e22f19808ca71416cadd497f305"
     }
     Frame {
-        msec: 13536
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6752
+        hash: "d6ef83bec490d2fb0f4d640f8c43f694"
     }
     Frame {
-        msec: 13552
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6768
+        hash: "fbd19c34e68a21c8924f83c4d0cbcb79"
     }
     Frame {
-        msec: 13568
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6784
+        hash: "179abedb6eef26a2e78c3a7884cb2178"
     }
     Frame {
-        msec: 13584
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6800
+        hash: "292af687e9001eb7cf8434094202b4a0"
     }
     Frame {
-        msec: 13600
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6816
+        hash: "1de0a8aa08194151e2b72d8b16cdba5f"
     }
     Frame {
-        msec: 13616
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6832
+        hash: "ee607cf6f558e3ed7b08dad80a17dd05"
     }
     Frame {
-        msec: 13632
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6848
+        hash: "2024a393baa1fa1c2d38ccc6756c4a44"
     }
     Frame {
-        msec: 13648
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6864
+        hash: "898ac470a5b1619564496132c0150df2"
     }
     Frame {
-        msec: 13664
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6880
+        hash: "b447e3917b7353e97409755159a614bc"
     }
     Frame {
-        msec: 13680
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 6896
+        hash: "d03610c18a2c21785e59b4de7b92f20e"
+    }
+    Frame {
+        msec: 6912
+        hash: "014dfa76c222aea838483840befff092"
+    }
+    Frame {
+        msec: 6928
+        hash: "014dfa76c222aea838483840befff092"
+    }
+    Frame {
+        msec: 6944
+        hash: "7830f79e5a37242fd97dd6ff9f89e9d0"
+    }
+    Frame {
+        msec: 6960
+        hash: "331a6b6ebaa7e9f7b970bacafe070b2f"
+    }
+    Frame {
+        msec: 6976
+        hash: "331a6b6ebaa7e9f7b970bacafe070b2f"
+    }
+    Frame {
+        msec: 6992
+        hash: "331a6b6ebaa7e9f7b970bacafe070b2f"
+    }
+    Frame {
+        msec: 7008
+        hash: "331a6b6ebaa7e9f7b970bacafe070b2f"
+    }
+    Frame {
+        msec: 7024
+        hash: "eb0b45fac8756d32586cac82f25c5a51"
+    }
+    Frame {
+        msec: 7040
+        hash: "eb0b45fac8756d32586cac82f25c5a51"
+    }
+    Frame {
+        msec: 7056
+        hash: "eb0b45fac8756d32586cac82f25c5a51"
+    }
+    Frame {
+        msec: 7072
+        hash: "eb0b45fac8756d32586cac82f25c5a51"
+    }
+    Frame {
+        msec: 7088
+        hash: "eb0b45fac8756d32586cac82f25c5a51"
+    }
+    Frame {
+        msec: 7104
+        hash: "eb0b45fac8756d32586cac82f25c5a51"
+    }
+    Frame {
+        msec: 7120
+        hash: "eb0b45fac8756d32586cac82f25c5a51"
+    }
+    Frame {
+        msec: 7136
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7152
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7168
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7184
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7200
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7216
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7232
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7248
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7264
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Frame {
+        msec: 7280
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13696
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7296
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13712
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7312
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13728
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7328
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13744
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7344
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13760
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7360
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13776
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7376
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13792
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7392
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13808
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7408
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13824
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7424
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13840
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7440
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13856
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7456
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13872
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7472
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13888
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7488
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13904
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7504
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13920
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7520
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13936
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7536
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Mouse {
         type: 2
         button: 1
         buttons: 1
-        x: 181; y: 242
+        x: 94; y: 581
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 13952
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7552
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13968
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7568
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 13984
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7584
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14000
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7600
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
-    Frame {
-        msec: 14016
-        hash: "4b86de37ae9bc630a2f3440811087617"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 94; y: 581
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14032
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7616
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14048
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7632
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14064
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7648
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14080
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7664
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14096
-        hash: "4b86de37ae9bc630a2f3440811087617"
+        msec: 7680
+        image: "flickable-vertical.7.png"
     }
     Frame {
-        msec: 14112
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7696
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14128
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7712
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14144
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7728
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14160
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7744
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14176
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7760
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14192
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7776
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14208
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7792
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14224
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7808
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14240
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7824
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14256
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7840
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14272
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7856
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14288
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7872
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14304
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7888
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14320
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7904
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14336
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7920
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14352
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7936
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
-    Frame {
-        msec: 14368
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 146; y: 574
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14384
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7952
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14400
-        image: "flickable-vertical.14.png"
+        msec: 7968
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14416
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 7984
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14432
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
+        msec: 8000
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14448
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8016
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
-    Frame {
-        msec: 14464
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 146; y: 574
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14480
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8032
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14496
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8048
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14512
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8064
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14528
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8080
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14544
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8096
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14560
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8112
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14576
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8128
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14592
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8144
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14608
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8160
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14624
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+        msec: 8176
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14640
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8192
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14656
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8208
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14672
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8224
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14688
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8240
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14704
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8256
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14720
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8272
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14736
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8288
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14752
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8304
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 14768
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8320
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
-    Frame {
-        msec: 14784
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 161; y: 422
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 14800
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 420
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14816
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8336
+        hash: "bd1667fe88a71bc2f52ba5a6c9dc098c"
     }
-    Frame {
-        msec: 14832
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 415
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 14848
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 411
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14864
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8352
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 406
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 397
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14880
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8368
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 386
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 375
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14896
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8384
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 364
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 352
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14912
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8400
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 342
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 331
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14928
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8416
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 319
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 308
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14944
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8432
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 297
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 284
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14960
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8448
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 272
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 261
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14976
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8464
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 250
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 235
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 14992
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8480
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 211
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 15008
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 8496
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
-    Frame {
-        msec: 15024
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 198
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 15040
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 187
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 3
         button: 1
         buttons: 0
-        x: 181; y: 242
+        x: 153; y: 187
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 15056
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15072
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15088
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15104
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15120
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15136
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15152
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15168
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15184
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15200
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15216
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15232
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15248
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15264
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15280
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8512
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15296
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8528
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15312
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8544
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15328
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8560
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15344
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8576
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15360
-        image: "flickable-vertical.15.png"
+        msec: 8592
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15376
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8608
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15392
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8624
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15408
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8640
+        image: "flickable-vertical.8.png"
     }
     Frame {
-        msec: 15424
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8656
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15440
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8672
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15456
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8688
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15472
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8704
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15488
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8720
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15504
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8736
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15520
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8752
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15536
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8768
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15552
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8784
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15568
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8800
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15584
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8816
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15600
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8832
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15616
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8848
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15632
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8864
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15648
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8880
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15664
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8896
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15680
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8912
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15696
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8928
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Frame {
-        msec: 15712
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8944
+        hash: "1889f1f0e319b90b6a68d76df6eebe96"
     }
     Mouse {
         type: 2
         button: 1
         buttons: 1
-        x: 192; y: 218
+        x: 127; y: 125
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 15728
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15744
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15760
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15776
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15792
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15808
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15824
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15840
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15856
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15872
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15888
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15904
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15920
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15936
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15952
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15968
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15984
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16000
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8960
+        hash: "c1d084f6e9361c6c0c70f064ae863051"
     }
-    Frame {
-        msec: 16016
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 127; y: 128
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 16032
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 127; y: 131
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16048
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8976
+        hash: "c1d084f6e9361c6c0c70f064ae863051"
     }
-    Frame {
-        msec: 16064
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 128; y: 135
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 16080
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 128; y: 139
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16096
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 8992
+        hash: "a84a07f9d3006718d55de7d6ed60795e"
     }
-    Frame {
-        msec: 16112
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 152
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16128
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 9008
+        hash: "deaa0f57eff99ca88f7204e8d8b159b5"
     }
-    Frame {
-        msec: 16144
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 134; y: 176
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16160
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 9024
+        hash: "4366ee113f7c987a2d8e5978b667e3d0"
     }
-    Frame {
-        msec: 16176
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 207
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16192
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 9040
+        hash: "9dbad53daf3a7988498c561dda4c00a6"
     }
-    Frame {
-        msec: 16208
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 238
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16224
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+        msec: 9056
+        hash: "e70aeae6d78628c16a7c8c354cf91c98"
     }
-    Frame {
-        msec: 16240
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 266
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16256
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9072
+        hash: "38aa5fd0540648edce34103704d8b861"
     }
-    Frame {
-        msec: 16272
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 288
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16288
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9088
+        hash: "ff08c650e24f63fe7eae1984bb190e02"
     }
-    Frame {
-        msec: 16304
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 308
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16320
-        image: "flickable-vertical.16.png"
+        msec: 9104
+        hash: "0d0f2377991d15416bf76619d2f71218"
     }
-    Frame {
-        msec: 16336
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 327
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16352
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9120
+        hash: "b7681257ec2ad1d532aa522147dd7549"
     }
-    Frame {
-        msec: 16368
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 343
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16384
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9136
+        hash: "baaf75edb3c17bbc754e26fe15f1d295"
     }
-    Frame {
-        msec: 16400
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 353
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16416
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9152
+        hash: "b68aab52cbcaf524ebb80f2a3af014b4"
     }
-    Frame {
-        msec: 16432
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 363
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16448
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9168
+        hash: "c69d2b45d92950f7246976bcc247c687"
     }
-    Frame {
-        msec: 16464
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 373
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16480
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9184
+        hash: "68cd8f467ac225f6e2c5a2914f92edc1"
     }
-    Frame {
-        msec: 16496
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 383
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16512
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9200
+        hash: "90cfbee19fd7c03bcfc9a57d94c7fd8d"
     }
-    Frame {
-        msec: 16528
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 387
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 16544
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 155; y: 387
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16560
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9216
+        hash: "8216a9f0024507e4cb8406575760947f"
     }
     Frame {
-        msec: 16576
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9232
+        hash: "47f76e736f13c6f2318e8c8a8ab69d0e"
     }
     Frame {
-        msec: 16592
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9248
+        hash: "75fc24bcf9d4b8d00f8a493b0095f445"
     }
     Frame {
-        msec: 16608
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9264
+        hash: "d8e9b69514f411a6672b7057c33bcc41"
     }
     Frame {
-        msec: 16624
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9280
+        hash: "9743d8ab32903d7fac7a4101ad24bcfd"
     }
-    Frame {
-        msec: 16640
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 150; y: 438
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16656
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+        msec: 9296
+        hash: "6bfcd36f945af8cc7b2aa2cca1cde750"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 222
+        x: 150; y: 442
         modifiers: 0
         sendToViewport: true
     }
@@ -5044,19 +3500,19 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 224
+        x: 150; y: 446
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16672
-        hash: "c30bea2a73a8b5af4565ef3996f29416"
+        msec: 9312
+        hash: "8e821eb27a5fd0933805d3e88d1f5f1e"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 228
+        x: 152; y: 451
         modifiers: 0
         sendToViewport: true
     }
@@ -5064,127 +3520,135 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 230
+        x: 152; y: 457
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16688
-        hash: "9612c176ec3ecf76a367728f451522a4"
+        msec: 9328
+        hash: "84191607b7ba11b1204bba0ab5b4f98c"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 233
+        x: 152; y: 467
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16704
-        hash: "24f6feeeb1ff82c8d4262f74e4656602"
+        msec: 9344
+        hash: "e154e8cdbc4f9a1d4cbe926306bf76c1"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 238
+        x: 152; y: 474
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16720
-        hash: "5823b56f1e362fdfc216a82e2dcdec61"
+        msec: 9360
+        hash: "2510607dadaf22d60838934cd460bde4"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 241
+        x: 152; y: 492
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16736
-        hash: "4ee243b91e847dabaceb21b5540c2a6d"
+        msec: 9376
+        hash: "38087462c92bae32df01a27520183c5f"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 245
+        x: 154; y: 499
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16752
-        hash: "87f1dc2238577fc5be6b1bd941226f3e"
+        msec: 9392
+        hash: "0e5231ff13dd8b3205acb2c451fcf208"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 251
+        x: 154; y: 515
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16768
-        hash: "480c6fcf1b3862a41a7225c35d8080c3"
+        msec: 9408
+        hash: "12dfb280b1cb828b75d04f62b5261f78"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 198; y: 256
+        x: 157; y: 545
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16784
-        hash: "0ac819bd8e6ce19553bd954e466e7ac0"
+        msec: 9424
+        hash: "fc89205b7a0bae9c2726b775aabf7a6a"
+    }
+    Frame {
+        msec: 9440
+        hash: "40807414ec0f879ae666f27360d2b91d"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 199; y: 258
+        x: 159; y: 567
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 16800
-        hash: "0636dd7c4eb0b56697fb59fb46f47f9c"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 201; y: 267
+        x: 160; y: 581
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16816
-        hash: "62f76f46857106010c2e862ed19baeea"
+        msec: 9456
+        hash: "01c759fad050fa6cecefdf7e2d528bd3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 594
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 276
+        x: 162; y: 608
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16832
-        hash: "26b9c6379590bbda24d129bd4f19f7d3"
+        msec: 9472
+        hash: "81887d4c0718d74f51d03c9efcd7d265"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 279
+        x: 162; y: 620
         modifiers: 0
         sendToViewport: true
     }
@@ -5192,1011 +3656,1159 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 280
+        x: 162; y: 639
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16848
-        hash: "21baf0596553627c8e683a31c2e6d04f"
+        msec: 9488
+        hash: "d0e6f2146daffb910be0be23a2b77a5c"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 281
+        x: 160; y: 682
         modifiers: 0
         sendToViewport: true
     }
+    Frame {
+        msec: 9504
+        hash: "ffcf5113009c86c8b2df2e9276f2e8c0"
+    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 282
+        x: 157; y: 704
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 16864
-        hash: "036679da5def5e696361f2373172a3f4"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 283
+        x: 155; y: 729
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16880
-        hash: "e3fc6101bc6cccf309b3df6b194820ea"
+        msec: 9520
+        hash: "45d262f0b3bec61a2a235ab613db664c"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 285
+        x: 150; y: 775
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16896
-        hash: "d9ee6d0a7455cfd724c1856549100756"
+        msec: 9536
+        hash: "1bb9a85fc290e30b841648bd9573ac84"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 286
+        x: 146; y: 823
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16912
-        hash: "caa70db5f31eb607c2de39734a42796c"
+        msec: 9552
+        hash: "46ff9bb9662543c711fcd84f44fc6af6"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 287
+        x: 141; y: 869
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16928
-        hash: "e2dc88b454e69cf92d6887a2f0629a94"
+        msec: 9568
+        hash: "84fe171380d203a80fedaf4b10412e1a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 139; y: 907
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 16944
-        hash: "e2dc88b454e69cf92d6887a2f0629a94"
+        msec: 9584
+        hash: "496f7ba4a3d45861d93e2cb95e3d5dea"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 203; y: 288
+        x: 135; y: 947
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 16960
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9600
+        image: "flickable-vertical.9.png"
     }
-    Frame {
-        msec: 16976
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 133; y: 962
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 16992
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 133; y: 977
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 17008
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9616
+        hash: "e3c4f8d056d2c3b5aef3184fda19a92d"
     }
-    Frame {
-        msec: 17024
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 993
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 17040
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 129; y: 1006
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 17056
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9632
+        hash: "90be1cd9716907fc46309f9f043a6f84"
     }
-    Frame {
-        msec: 17072
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 122; y: 1029
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 17088
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9648
+        hash: "b6e868b2d23004f75d0bdb1519e8487d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 118; y: 1043
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 3
         button: 1
         buttons: 0
-        x: 203; y: 288
+        x: 118; y: 1043
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 17104
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17120
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17136
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17152
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17168
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17184
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17200
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17216
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9664
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17232
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9680
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17248
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9696
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17264
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9712
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17280
-        image: "flickable-vertical.17.png"
+        msec: 9728
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17296
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9744
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17312
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9760
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17328
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9776
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17344
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9792
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17360
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9808
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17376
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9824
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17392
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9840
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17408
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9856
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17424
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9872
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17440
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9888
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17456
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9904
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17472
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9920
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17488
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9936
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17504
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9952
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17520
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9968
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17536
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 9984
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17552
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10000
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17568
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10016
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17584
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10032
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17600
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10048
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17616
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10064
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17632
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10080
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17648
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10096
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17664
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10112
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17680
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10128
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17696
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10144
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17712
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10160
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17728
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10176
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17744
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10192
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17760
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10208
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17776
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10224
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17792
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10240
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17808
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10256
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17824
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10272
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17840
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10288
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17856
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10304
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17872
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10320
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 17888
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10336
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 17904
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 158; y: 415
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 17920
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10352
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Frame {
-        msec: 17936
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10368
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 17952
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 416
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 17968
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10384
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 17984
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 417
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18000
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 422
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18016
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10400
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 18032
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 429
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18048
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 444
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18064
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10416
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18080
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 459
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18096
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 173; y: 473
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18112
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10432
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18128
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 486
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18144
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 178; y: 499
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18160
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10448
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18176
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 180; y: 512
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18192
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 524
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18208
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10464
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18224
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 535
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18240
-        image: "flickable-vertical.18.png"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 548
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18256
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10480
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18272
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 189; y: 562
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18288
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 189; y: 577
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18304
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10496
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18320
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 191; y: 593
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18336
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 193; y: 609
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18352
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10512
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18368
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 195; y: 626
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18384
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 641
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18400
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10528
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18416
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 655
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18432
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 670
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18448
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10544
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
-        type: 2
-        button: 1
+        type: 5
+        button: 0
         buttons: 1
-        x: 102; y: 575
+        x: 201; y: 681
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 18464
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 201; y: 690
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18480
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10560
+        image: "flickable-vertical.10.png"
     }
-    Frame {
-        msec: 18496
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 201; y: 698
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 102; y: 575
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 706
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 18512
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10576
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18528
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 712
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18544
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 718
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18560
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10592
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18576
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 722
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18592
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 725
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18608
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10608
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18624
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 727
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18640
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 731
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18656
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10624
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18672
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 735
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18688
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 737
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18704
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10640
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18720
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 739
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 18736
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 740
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18752
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10656
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18768
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 741
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18784
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10672
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18800
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10688
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18816
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10704
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 18832
-        hash: "fac8455a2707b04aabff25723375a78b"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 205; y: 741
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 18848
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10720
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18864
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10736
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18880
-        hash: "fac8455a2707b04aabff25723375a78b"
+        msec: 10752
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18896
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10768
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18912
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10784
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18928
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10800
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18944
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10816
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18960
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10832
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18976
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10848
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 18992
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10864
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19008
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10880
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19024
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10896
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19040
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10912
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19056
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10928
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19072
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10944
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19088
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10960
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19104
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10976
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19120
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 10992
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19136
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11008
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19152
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11024
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19168
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11040
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19184
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11056
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19200
-        image: "flickable-vertical.19.png"
+        msec: 11072
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19216
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11088
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19232
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11104
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19248
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11120
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19264
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 164; y: 571
-        modifiers: 0
-        sendToViewport: true
+        msec: 11136
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19280
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11152
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19296
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11168
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19312
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11184
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19328
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 164; y: 571
-        modifiers: 0
-        sendToViewport: true
+        msec: 11200
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19344
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11216
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19360
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11232
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19376
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11248
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19392
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11264
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19408
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11280
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19424
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11296
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19440
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11312
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19456
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11328
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19472
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11344
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19488
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11360
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19504
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11376
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19520
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11392
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19536
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11408
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19552
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11424
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19568
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11440
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19584
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11456
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19600
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11472
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19616
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11488
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19632
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11504
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 19648
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 115; y: 578
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 19664
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11520
+        image: "flickable-vertical.11.png"
     }
     Frame {
-        msec: 19680
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11536
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19696
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11552
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19712
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11568
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19728
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11584
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 19744
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 115; y: 578
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 19760
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11600
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19776
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11616
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19792
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11632
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19808
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11648
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19824
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11664
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19840
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11680
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19856
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11696
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19872
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11712
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19888
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11728
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19904
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11744
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19920
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11760
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19936
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11776
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19952
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11792
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19968
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11808
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 19984
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11824
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20000
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11840
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20016
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11856
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20032
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11872
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 20048
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 130; y: 410
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 20064
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11888
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20080
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11904
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20096
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11920
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20112
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11936
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20128
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11952
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20144
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11968
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 20160
-        image: "flickable-vertical.20.png"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 130; y: 410
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 20176
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 11984
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20192
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 12000
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20208
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 12016
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 20224
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
+        msec: 12032
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
-        type: 2
+        type: 4
         button: 1
         buttons: 1
-        x: 170; y: 450
+        x: 130; y: 410
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 20240
-        hash: "b8e7a053fc023be42ab5136f6e7305fd"
+        msec: 12048
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Frame {
-        msec: 20256
-        hash: "b8e7a053fc023be42ab5136f6e7305fd"
+        msec: 12064
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 170; y: 448
+        x: 131; y: 410
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 20272
-        hash: "b8e7a053fc023be42ab5136f6e7305fd"
+        msec: 12080
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 172; y: 438
+        x: 133; y: 408
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 20288
-        hash: "40cf6e4567c796d6ad83778fb1959d8a"
-    }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 176; y: 410
+        x: 134; y: 405
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 20304
-        hash: "9914584daf02407c1edc3b6a38b8302d"
+        msec: 12096
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 176; y: 388
+        x: 136; y: 403
         modifiers: 0
         sendToViewport: true
     }
@@ -6204,351 +4816,219 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 176; y: 366
+        x: 140; y: 396
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 20320
-        hash: "5aff2316a5e34f5e15b7cb36257a3d72"
+        msec: 12112
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 176; y: 342
+        x: 150; y: 380
         modifiers: 0
         sendToViewport: true
     }
+    Frame {
+        msec: 12128
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
+    }
     Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 176; y: 342
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 370
         modifiers: 0
         sendToViewport: true
     }
-    Frame {
-        msec: 20336
-        hash: "de1f9ff1abfa8cdc760bc84129fab40d"
-    }
-    Frame {
-        msec: 20352
-        hash: "032c4fd62a0a611207262d317d4ea103"
-    }
-    Frame {
-        msec: 20368
-        hash: "1db8a7b3899f5efea25ccf93285ee6bd"
-    }
-    Frame {
-        msec: 20384
-        hash: "3c106f68b755862346cddd21d75c0caf"
-    }
-    Frame {
-        msec: 20400
-        hash: "41d025dfe037b9cebe84e4c7200e9d15"
-    }
-    Frame {
-        msec: 20416
-        hash: "f347687313c88150a6f977ae8b1620fc"
-    }
-    Frame {
-        msec: 20432
-        hash: "4bb30faaec54e2a47dfd2b2988a6c231"
-    }
-    Frame {
-        msec: 20448
-        hash: "fede02600e790d4b6eb1f85563b37cbc"
-    }
-    Frame {
-        msec: 20464
-        hash: "0a949f7150b3709b9eda62c98f98fc62"
-    }
-    Frame {
-        msec: 20480
-        hash: "214e571c2346b0d6b5d1220e856a8e67"
-    }
-    Frame {
-        msec: 20496
-        hash: "f84207d20cfff984d1c79654a1074d02"
-    }
-    Frame {
-        msec: 20512
-        hash: "7dc3592294dcd88fbfff2f984fd2d4c3"
-    }
-    Frame {
-        msec: 20528
-        hash: "42829e78f62e692a093df267d2b673e2"
-    }
-    Frame {
-        msec: 20544
-        hash: "d264570c78e7d1ea283c72191953a2ce"
-    }
-    Frame {
-        msec: 20560
-        hash: "b69b045557a8eada80a24eb4caa7ea4e"
-    }
-    Frame {
-        msec: 20576
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20592
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20608
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20624
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20640
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20656
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20672
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20688
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20704
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20720
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20736
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20752
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20768
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20784
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20800
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20816
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20832
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20848
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20864
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20880
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20896
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20912
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20928
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20944
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20960
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20976
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20992
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21008
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21024
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21040
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21056
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21072
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21088
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21104
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 361
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21120
-        image: "flickable-vertical.21.png"
+        msec: 12144
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 21136
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 353
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21152
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 343
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21168
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12160
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 21184
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 332
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21200
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 324
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21216
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12176
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 21232
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 315
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21248
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 309
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21264
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12192
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 21280
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 303
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21296
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 297
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21312
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12208
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 21328
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 293
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21344
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 291
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21360
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12224
+        hash: "c246bde0eb2b3e1797dfb770a9db78bb"
     }
-    Frame {
-        msec: 21376
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 290
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21392
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 168; y: 290
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21408
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12240
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21424
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12256
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21440
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12272
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21456
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12288
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21472
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12304
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21488
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12320
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21504
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12336
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21520
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12352
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21536
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12368
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21552
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12384
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 21568
-        hash: "a76f069dfcb1af0794999c34507e190e"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 167; y: 295
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21584
-        hash: "a76f069dfcb1af0794999c34507e190e"
+        msec: 12400
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
-        type: 2
-        button: 1
+        type: 5
+        button: 0
         buttons: 1
-        x: 197; y: 124
+        x: 167; y: 300
         modifiers: 0
         sendToViewport: true
     }
@@ -6556,19 +5036,19 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 197; y: 132
+        x: 165; y: 308
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 21600
-        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
+        msec: 12416
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 197; y: 146
+        x: 165; y: 316
         modifiers: 0
         sendToViewport: true
     }
@@ -6576,19 +5056,19 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 197; y: 164
+        x: 165; y: 326
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 21616
-        hash: "463fce69afc3dec181425c9adaa3e77c"
+        msec: 12432
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 197; y: 190
+        x: 163; y: 336
         modifiers: 0
         sendToViewport: true
     }
@@ -6596,442 +5076,512 @@ VisualTest {
         type: 5
         button: 0
         buttons: 1
-        x: 195; y: 218
+        x: 163; y: 346
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 21632
-        hash: "9af34ff618e277eafad32e0377ecc94b"
+        msec: 12448
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 356
+        modifiers: 0
+        sendToViewport: true
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 187; y: 250
+        x: 165; y: 369
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 21648
-        hash: "db4b2333630ccc4a7982361609a12837"
+        msec: 12464
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Mouse {
         type: 5
         button: 0
         buttons: 1
-        x: 183; y: 284
+        x: 165; y: 382
         modifiers: 0
         sendToViewport: true
     }
     Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 183; y: 284
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 393
         modifiers: 0
         sendToViewport: true
     }
     Frame {
-        msec: 21664
-        hash: "50335b19a1e210f87924d01bb343a0e0"
-    }
-    Frame {
-        msec: 21680
-        hash: "59b4f80a7cd6b732eb26f3b4147efe7e"
+        msec: 12480
+        image: "flickable-vertical.12.png"
     }
-    Frame {
-        msec: 21696
-        hash: "b99cc1f07bcb0480801d4d5403372525"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 405
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21712
-        hash: "871040b0f921646609b79828bab38949"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 415
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21728
-        hash: "2acb3d19eed000313872d5cd66765b53"
+        msec: 12496
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 21744
-        hash: "b5431a2d2e856a726ceac2066b128f8f"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 420
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 21760
-        hash: "04047c917a95a2a3df30c14bb20601dd"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 429
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21776
-        hash: "fea7ac3d26975f438129e394c667e628"
+        msec: 12512
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 21792
-        hash: "4db41ff05865cabc4ef288478254e633"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 433
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21808
-        hash: "e0d3737effd817a8f603eb393677b8b6"
+        msec: 12528
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 21824
-        hash: "d4f06941d213544ddcae714ddc0b47e9"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 167; y: 433
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21840
-        hash: "dbb21caf4a4c9b88563f1d0aad35f3d3"
+        msec: 12544
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21856
-        hash: "eb9a052219c3f955f2c036834990089b"
+        msec: 12560
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21872
-        hash: "40090a35caf674ed9c4bf1d10f9209ea"
+        msec: 12576
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21888
-        hash: "064de0abec66d1ddcf0f6073ce7d91ef"
+        msec: 12592
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21904
-        hash: "f407334d0b63a34657dc1306fd67aeb7"
+        msec: 12608
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21920
-        hash: "1c0744be97c65c68ca92bd86d42c7b0e"
+        msec: 12624
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
     Frame {
-        msec: 21936
-        hash: "7469d4a06c5df073e22db3c905baefc1"
+        msec: 12640
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 21952
-        hash: "35912a7e2ecc0c387fc9fb9da7201bfd"
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 145; y: 357
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 21968
-        hash: "9f835091374f0d0d9a6996e6dad10e19"
+        msec: 12656
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 21984
-        hash: "afade1ecbaf5f920880eaff3b3de606e"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 350
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 22000
-        hash: "9c70e8a020c8c1101b9884529cb4527f"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 342
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 22016
-        hash: "3e7d4dc75f85dfeb065da18ef1c102c1"
+        msec: 12672
+        hash: "b0e76c5cfeb797888e8c032b3f2781bd"
     }
-    Frame {
-        msec: 22032
-        hash: "16852d62a77eefccea9497ae1b09842d"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 333
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 22048
-        hash: "ea8afda6d837a98f408a7aa133494575"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 323
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 22064
-        hash: "666435dccf30c53eb09ea7ad8b5264a1"
+        msec: 12688
+        hash: "7eda3c99a4c066ed00c717e33a66682c"
     }
-    Frame {
-        msec: 22080
-        image: "flickable-vertical.22.png"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 147; y: 305
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 22096
-        hash: "2e959bf0470bac84e2220d9e8a8bbb97"
+        msec: 12704
+        hash: "85402c05dd1bd85316422aec2b774e4f"
     }
-    Frame {
-        msec: 22112
-        hash: "595b6cfd559f8362b010616de4947ec6"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 147; y: 285
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 22128
-        hash: "976dd345cc7cb4e3c09a288530d3c8af"
+        msec: 12720
+        hash: "f8ebaae72eb98b880aaf5bb8cf517840"
     }
-    Frame {
-        msec: 22144
-        hash: "9493e425d5cd3f9eef904a1be63f45f1"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 147; y: 275
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 22160
-        hash: "0a2013afebb5e09d82633c8d8a393f01"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 147; y: 264
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 22176
-        hash: "d8377c464bc59d95e0670d697888d804"
+        msec: 12736
+        hash: "83ebbcd20af8178175ea72698b9bfd08"
     }
-    Frame {
-        msec: 22192
-        hash: "52f9416973da953bd6fe55b2fe22786a"
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 253
+        modifiers: 0
+        sendToViewport: true
     }
-    Frame {
-        msec: 22208
-        hash: "23b9af0f371b7817e9ceaa1a83995d35"
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 145; y: 253
+        modifiers: 0
+        sendToViewport: true
     }
     Frame {
-        msec: 22224
-        hash: "34b0e0333c91bc4533e0c01eaeb3d3f9"
+        msec: 12752
+        hash: "a154f7125f88c25484aea9f268a10e22"
     }
     Frame {
-        msec: 22240
-        hash: "1597b86afe2841c3bb77bb5dd6aa6803"
+        msec: 12768
+        hash: "4a1fdbc170f98e3c438cf47526fd16a1"
     }
     Frame {
-        msec: 22256
-        hash: "d74111814ff259fea47e1eb3b36e174b"
+        msec: 12784
+        hash: "99228a13ebf2516199d339cc73e1358f"
     }
     Frame {
-        msec: 22272
-        hash: "c64c46fe9cd75afbf2385241ea8e55d4"
+        msec: 12800
+        hash: "724687b54e474e4dc53b105ed9ca2def"
     }
     Frame {
-        msec: 22288
-        hash: "1e8740a104643fe30b0e874bbbed44ab"
+        msec: 12816
+        hash: "4db074b34af9472a5d853928953901dc"
     }
     Frame {
-        msec: 22304
-        hash: "ef669a8d142947463084383a6c7c7f85"
+        msec: 12832
+        hash: "ab1acd2ba148a7830f75cbf2e09e426c"
     }
     Frame {
-        msec: 22320
-        hash: "2314c42b5994bdbfd73eb2c3ea54626b"
+        msec: 12848
+        hash: "04a22e2278823d9e49e524ef2d8d45c5"
     }
     Frame {
-        msec: 22336
-        hash: "53a0694d8eee91b968bd43efe43f2c9e"
+        msec: 12864
+        hash: "f5a658c7c2b185e250dc1b245457094b"
     }
     Frame {
-        msec: 22352
-        hash: "be4772528f30c18193e49ae04a290af8"
+        msec: 12880
+        hash: "bb611d6a086b0eedb37111d7575847df"
     }
     Frame {
-        msec: 22368
-        hash: "a0b0877ab92a0323e35fdb7beb602dee"
+        msec: 12896
+        hash: "04e9e40c43a51b704378871710ad9f8b"
     }
     Frame {
-        msec: 22384
-        hash: "a0e299fb4ba811a0b22fb62c222cb86c"
+        msec: 12912
+        hash: "7ff5ba1e30f93de2dd3cad953d3d60fb"
     }
     Frame {
-        msec: 22400
-        hash: "2562bc9c9aa60a48b6ca00333f60d163"
+        msec: 12928
+        hash: "f85e46ed733dbbec83509d6a3b4c72a0"
     }
     Frame {
-        msec: 22416
-        hash: "486b45c385d88d6f054fa6308b55f2ac"
+        msec: 12944
+        hash: "2f08cc1d92102138d6a4945116727be5"
     }
     Frame {
-        msec: 22432
-        hash: "86502af668ed6336dce8fe329e3408a6"
+        msec: 12960
+        hash: "864a68a8519e58081205d74b4184498b"
     }
     Frame {
-        msec: 22448
-        hash: "2a79a6530a07f00810310117d00d28ed"
+        msec: 12976
+        hash: "1fb6a1ecbde71566486a1310a5ab9c17"
     }
     Frame {
-        msec: 22464
-        hash: "94a5fce3e0c3b219e0d807bfcade11e8"
+        msec: 12992
+        hash: "5ab977d88d850d94340bfc0c15137486"
     }
     Frame {
-        msec: 22480
-        hash: "94a5fce3e0c3b219e0d807bfcade11e8"
+        msec: 13008
+        hash: "79bafb9b957d88f938c977b37e1d8b9c"
     }
     Frame {
-        msec: 22496
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13024
+        hash: "fa5b1cf343b45407f6cee7ce38ca9eb0"
     }
     Frame {
-        msec: 22512
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13040
+        hash: "1147ff69795a65878ffea7bed4b9a93f"
     }
     Frame {
-        msec: 22528
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13056
+        hash: "08ad4cd6fbdba8c98dfbc096ab91ebd2"
     }
     Frame {
-        msec: 22544
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13072
+        hash: "3ee0c33a1a80b8cad7ec525b8b16cb70"
     }
     Frame {
-        msec: 22560
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13088
+        hash: "cabd708943ce14892bb69aa22dc4a2b5"
     }
     Frame {
-        msec: 22576
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13104
+        hash: "86a7afcbbd67b50b7bf3ef85f1843e3d"
     }
     Frame {
-        msec: 22592
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13120
+        hash: "111f0161479cf82c08dd918b6ece8e45"
     }
     Frame {
-        msec: 22608
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13136
+        hash: "33da9e73f1521297c3d250f00cda20cd"
     }
     Frame {
-        msec: 22624
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13152
+        hash: "72f166ddddac3962b39cf4283b4554f3"
     }
     Frame {
-        msec: 22640
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13168
+        hash: "1ee57340798998f95114d929d2702ce6"
     }
     Frame {
-        msec: 22656
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13184
+        hash: "eb036d3246a2361aa1b11c8408f9eb1a"
     }
     Frame {
-        msec: 22672
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13200
+        hash: "af73e799d7cb536d0ba6db985396c597"
     }
     Frame {
-        msec: 22688
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13216
+        hash: "5d84accad1fa5d421bc3effb148d81a6"
     }
     Frame {
-        msec: 22704
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13232
+        hash: "d752289e96eb2398096297234b6b88f6"
     }
     Frame {
-        msec: 22720
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13248
+        hash: "53970a50451c182f672d0ddcd572279d"
     }
     Frame {
-        msec: 22736
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13264
+        hash: "6323f61cc6966e75be10a49aeaab9a3e"
     }
     Frame {
-        msec: 22752
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13280
+        hash: "fb679e5ad89681f482d94b4dab80e3bb"
     }
     Frame {
-        msec: 22768
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13296
+        hash: "1788a7f680bbcbcedb2583cead6ced57"
     }
     Frame {
-        msec: 22784
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13312
+        hash: "b325580b9f88dd5490d914f580b9d341"
     }
     Frame {
-        msec: 22800
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13328
+        hash: "8fa25fff546b060a92b60e6fbb3b2fa8"
     }
     Frame {
-        msec: 22816
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13344
+        hash: "2fb5ee5e86745910b46d98943af4c9d5"
     }
     Frame {
-        msec: 22832
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13360
+        hash: "7fcdce21e2e1b14501e79d9c716b0011"
     }
     Frame {
-        msec: 22848
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13376
+        hash: "bf79452e478bfe3374d4c275fc3b42fb"
     }
     Frame {
-        msec: 22864
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13392
+        hash: "1069c4aff64ab8193798965af7a6988e"
     }
     Frame {
-        msec: 22880
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13408
+        hash: "3031ea711d0880a2fafd557f23c38cc0"
     }
     Frame {
-        msec: 22896
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13424
+        hash: "5955c49ae05578f6a9b023a1f6c8301b"
     }
     Frame {
-        msec: 22912
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13440
+        image: "flickable-vertical.13.png"
     }
     Frame {
-        msec: 22928
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13456
+        hash: "af2fc9780356c01d44e7e918643e334b"
     }
     Frame {
-        msec: 22944
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13472
+        hash: "b28600a5433e08299bf5ab3c789a4d5a"
     }
     Frame {
-        msec: 22960
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13488
+        hash: "159dab2806a6fbac4f090c4ca029433e"
     }
     Frame {
-        msec: 22976
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13504
+        hash: "b1937894776d083eb38f105901344d55"
     }
     Frame {
-        msec: 22992
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13520
+        hash: "2420c1280e6520e35f30879fe139ed77"
     }
     Frame {
-        msec: 23008
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13536
+        hash: "ba0018197140b398caa05eada958e2ce"
     }
     Frame {
-        msec: 23024
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13552
+        hash: "b04094c2734f71e17a2d0091b3c85565"
     }
     Frame {
-        msec: 23040
-        image: "flickable-vertical.23.png"
+        msec: 13568
+        hash: "2ff995d15a49fcbd0adfcb970135ebae"
     }
     Frame {
-        msec: 23056
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13584
+        hash: "9b10dc438e944a8711aef1f45c912538"
     }
     Frame {
-        msec: 23072
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13600
+        hash: "c397307c99d125789e03b0239c6d7130"
     }
     Frame {
-        msec: 23088
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13616
+        hash: "aa6fe1c4d968bbf381f38c09e9c26eea"
     }
     Frame {
-        msec: 23104
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13632
+        hash: "8d586f001d41ccde450a4ce88a8ef89a"
     }
     Frame {
-        msec: 23120
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13648
+        hash: "80f98a4935097ec76bd863ffe4e3a441"
     }
     Frame {
-        msec: 23136
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13664
+        hash: "620b4eddf956d85701387a114ec228fc"
     }
     Frame {
-        msec: 23152
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13680
+        hash: "dc56a6cafe22e56d6d5efee62c324784"
     }
     Frame {
-        msec: 23168
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13696
+        hash: "8fcf5f5b350ffc80cde03b044dc81e57"
     }
     Frame {
-        msec: 23184
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13712
+        hash: "5bc02d5bfcc6f4a9349623139663e664"
     }
     Frame {
-        msec: 23200
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13728
+        hash: "6a71734b1a38cdbacf8447a41481d67c"
     }
     Frame {
-        msec: 23216
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13744
+        hash: "34b069ef8080e15db86f66983f18c58d"
     }
     Frame {
-        msec: 23232
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13760
+        hash: "0131b30e21796e0ea9ad1484ac7ac6e4"
     }
     Frame {
-        msec: 23248
-        hash: "8443c45791c906a9fe23831844f48a1c"
+        msec: 13776
+        hash: "0131b30e21796e0ea9ad1484ac7ac6e4"
     }
-    Frame {
-        msec: 23264
-        hash: "8443c45791c906a9fe23831844f48a1c
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
index 5f43f95..5c8ff52 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
@@ -85,6 +85,6 @@ Rectangle {
         height: 50
         x: 200
         y: parent.height - 50
-        color: blue
+        color: "blue"
     }
 }
-- 
cgit v0.12


From b6ee57e14e145d9caa3f572d55447ec92f78cea4 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 11:39:07 +1000
Subject: Mark qdeclarativegridview autotests as expect-fail

Includes the task numbers of the bugs, for later processing.

Task-number: QTBUG-14792
---
 .../qdeclarativegridview/data/gridview.0.png       |  Bin 1303 -> 0 bytes
 .../qdeclarativegridview/data/gridview.1.png       |  Bin 1317 -> 0 bytes
 .../qdeclarativegridview/data/gridview.2.png       |  Bin 1318 -> 0 bytes
 .../qdeclarativegridview/data/gridview.3.png       |  Bin 1306 -> 0 bytes
 .../qdeclarativegridview/data/gridview.4.png       |  Bin 1308 -> 0 bytes
 .../qdeclarativegridview/data/gridview.5.png       |  Bin 1303 -> 0 bytes
 .../qdeclarativegridview/data/gridview.6.png       |  Bin 1323 -> 0 bytes
 .../qdeclarativegridview/data/gridview.7.png       |  Bin 1325 -> 0 bytes
 .../qdeclarativegridview/data/gridview.8.png       |  Bin 1346 -> 0 bytes
 .../qdeclarativegridview/data/gridview.9.png       |  Bin 1303 -> 0 bytes
 .../qdeclarativegridview/data/gridview.qml         | 2859 --------------------
 .../qdeclarativegridview/data/gridview2.0.png      |  Bin 1310 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.1.png      |  Bin 1322 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.10.png     |  Bin 1313 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.2.png      |  Bin 1341 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.3.png      |  Bin 1368 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.4.png      |  Bin 1319 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.5.png      |  Bin 1352 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.6.png      |  Bin 1309 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.7.png      |  Bin 1347 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.8.png      |  Bin 1310 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.9.png      |  Bin 1354 -> 0 bytes
 .../qdeclarativegridview/data/gridview2.qml        | 2479 -----------------
 .../qmlvisual/qdeclarativegridview/gridview.qml    |    2 +
 .../qmlvisual/qdeclarativegridview/gridview2.qml   |    2 +
 25 files changed, 4 insertions(+), 5338 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png
deleted file mode 100644
index 6c82777..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png
deleted file mode 100644
index 07b1f7c..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png
deleted file mode 100644
index f2f08c0..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png
deleted file mode 100644
index 08649f9..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png
deleted file mode 100644
index f9c2f17..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png
deleted file mode 100644
index 52ec0bd..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png
deleted file mode 100644
index 3fe25be..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png
deleted file mode 100644
index 4cc12a6..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png
deleted file mode 100644
index 2267f23..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png
deleted file mode 100644
index 6c82777..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
deleted file mode 100644
index 67aa10a..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
+++ /dev/null
@@ -1,2859 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 32
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 48
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 64
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 80
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 96
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 112
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 128
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 144
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 160
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 176
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 192
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 208
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 224
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 240
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 256
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 272
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 288
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 304
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 320
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 336
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 352
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 368
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 384
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 400
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 416
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 432
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "96ad89eafa7f99269518a192573af91b"
-    }
-    Frame {
-        msec: 464
-        hash: "735b00b968d0e2ea1f34cc0bdc028a8e"
-    }
-    Frame {
-        msec: 480
-        hash: "ce37c8e15fbb1aea72aff9629683fa96"
-    }
-    Frame {
-        msec: 496
-        hash: "a3f2471ef4ceac77a1c20ac327550d8d"
-    }
-    Frame {
-        msec: 512
-        hash: "28f120bd3bda9552dbc8cc908409c67d"
-    }
-    Frame {
-        msec: 528
-        hash: "f21cf0ed746fa48e67dc90c70c5bbae8"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "485d55730366b68e01582879f6970fa1"
-    }
-    Frame {
-        msec: 560
-        hash: "700e53c78b28993dce5dafb4035f4760"
-    }
-    Frame {
-        msec: 576
-        hash: "1e538e175a5e402e2334cf354392e8a7"
-    }
-    Frame {
-        msec: 592
-        hash: "0fbfba93eebaf05ae60067b365b6b4bc"
-    }
-    Frame {
-        msec: 608
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 624
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 640
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 656
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 672
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 688
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 704
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 720
-        hash: "25e48099a8194ed2674651818d854c61"
-    }
-    Frame {
-        msec: 736
-        hash: "b75d02dfc238ba2292306ca1421279c3"
-    }
-    Frame {
-        msec: 752
-        hash: "7e48b7d9c1291b4e438c81f44228d8ad"
-    }
-    Frame {
-        msec: 768
-        hash: "fe4b009abe081a6eaeab6ef9e996f3fd"
-    }
-    Frame {
-        msec: 784
-        hash: "edea8c305fe88708dbafc03e427caa09"
-    }
-    Frame {
-        msec: 800
-        hash: "7b58803f12d0ab893acf539799d79e31"
-    }
-    Frame {
-        msec: 816
-        hash: "9b56c3d1d140114dcc57d0a8568e9b95"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 832
-        hash: "35e38e273dbc8e565917b21d00fc1530"
-    }
-    Frame {
-        msec: 848
-        hash: "116e294391333e8780daeca54c3d51ea"
-    }
-    Frame {
-        msec: 864
-        hash: "6219676215f82540d7a53b2a8aa60279"
-    }
-    Frame {
-        msec: 880
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 896
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 912
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 928
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 944
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 960
-        image: "gridview.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 992
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1008
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1024
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1040
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1056
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1072
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1088
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1104
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1120
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1136
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1152
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1168
-        hash: "2667c2596de97dc15353158eba03495f"
-    }
-    Frame {
-        msec: 1184
-        hash: "6a7b64e1427dcb7e438aa09a739cbc7b"
-    }
-    Frame {
-        msec: 1200
-        hash: "5bad6dc745958f5827403ea593c78752"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1216
-        hash: "b393401219ada7d094a451dba8af3f1a"
-    }
-    Frame {
-        msec: 1232
-        hash: "ba656452f8adf3d1ca7db9286274c37f"
-    }
-    Frame {
-        msec: 1248
-        hash: "1e9725c8c364a491f34035fad1f77c63"
-    }
-    Frame {
-        msec: 1264
-        hash: "a0aef0b65446dec0673b5cec3a260390"
-    }
-    Frame {
-        msec: 1280
-        hash: "d60c11a5d376af0831d6f05f2a839a92"
-    }
-    Frame {
-        msec: 1296
-        hash: "1dd2c456c6ee9cc8f9be0e9f3617d44b"
-    }
-    Frame {
-        msec: 1312
-        hash: "56208e6551e2f4202bab2d62a1cf46a2"
-    }
-    Frame {
-        msec: 1328
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1344
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1360
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1376
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1392
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1408
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1424
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1440
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1456
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1472
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1488
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1504
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1520
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1536
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1552
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1568
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1584
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1600
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1616
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1632
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1648
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "f0f00d22d15ed9828db7b5f3a3669fe9"
-    }
-    Frame {
-        msec: 1680
-        hash: "153e7984089530bbd052c9e4f62eb14c"
-    }
-    Frame {
-        msec: 1696
-        hash: "0525d40cc58d054a3abd7ee2486576f8"
-    }
-    Frame {
-        msec: 1712
-        hash: "8c23d5245774ab5252c98c19c33f8171"
-    }
-    Frame {
-        msec: 1728
-        hash: "5ca243794d1350f04cf973d4bfc8ab89"
-    }
-    Frame {
-        msec: 1744
-        hash: "d19b7f4c0897aba498e122d83b4cbbf1"
-    }
-    Frame {
-        msec: 1760
-        hash: "99e41460dd8efc6e5c3faf54b14c3d43"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1776
-        hash: "703469f8b133156ed3aabe02762d66c3"
-    }
-    Frame {
-        msec: 1792
-        hash: "1cc2c383e988048db76a80d8d7f5a0e2"
-    }
-    Frame {
-        msec: 1808
-        hash: "8e87117c19eb9d6e600c44e0f3869ae1"
-    }
-    Frame {
-        msec: 1824
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1840
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1856
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1872
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1888
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1904
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1920
-        image: "gridview.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1952
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1968
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1984
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2000
-        hash: "4924037ce643d0748b8b2c666e61fd62"
-    }
-    Frame {
-        msec: 2016
-        hash: "ef9750584e669a8b2d415d13854e12a6"
-    }
-    Frame {
-        msec: 2032
-        hash: "69937eacef6e6b11ad1d5741c69a1faa"
-    }
-    Frame {
-        msec: 2048
-        hash: "a1bd870fffd95a0604dd8e170e571632"
-    }
-    Frame {
-        msec: 2064
-        hash: "a3a72386594aacc88977cdaa6441df48"
-    }
-    Frame {
-        msec: 2080
-        hash: "6d8e89de38d52f0f0f871dfa18361cb5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2096
-        hash: "96cfb1eb6893fac86c9434d1ffb82fcb"
-    }
-    Frame {
-        msec: 2112
-        hash: "5e11df1660634ff317be474118174ec5"
-    }
-    Frame {
-        msec: 2128
-        hash: "2eb75858b50c3a9a80673ab89014ed63"
-    }
-    Frame {
-        msec: 2144
-        hash: "3ff5d66f7902af92d49ebebf04d16c26"
-    }
-    Frame {
-        msec: 2160
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2176
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2192
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2208
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2224
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2240
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2256
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2272
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2288
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2304
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2320
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2336
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2352
-        hash: "efeda5b2d97e1b7c22e2308250501cb7"
-    }
-    Frame {
-        msec: 2368
-        hash: "d6158379b699279f66b94a8418e53af1"
-    }
-    Frame {
-        msec: 2384
-        hash: "ab960b0669fa594e0552df623a9136ea"
-    }
-    Frame {
-        msec: 2400
-        hash: "0ebf6be1305ee1eb8740f4d0365ef4c5"
-    }
-    Frame {
-        msec: 2416
-        hash: "46cde47dffc6f2687c8c643eca09b95d"
-    }
-    Frame {
-        msec: 2432
-        hash: "2b8698ce02a6964115d960ae19f40c37"
-    }
-    Frame {
-        msec: 2448
-        hash: "ff1e7d800bb27b41710c50554adc1091"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2464
-        hash: "5837b3aca09038cae23dcb149acc8b0b"
-    }
-    Frame {
-        msec: 2480
-        hash: "dbe7c571cdbdb9de4fd01faa6d5374cf"
-    }
-    Frame {
-        msec: 2496
-        hash: "f431abcaf05f49ead909296d7649f8a9"
-    }
-    Frame {
-        msec: 2512
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2528
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2544
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2560
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2576
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2592
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2608
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2624
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2640
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2656
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2672
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2688
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2704
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2720
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2736
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2752
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2768
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2784
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2800
-        hash: "4f2fafdb59db544352e3067d67c0a714"
-    }
-    Frame {
-        msec: 2816
-        hash: "4dcd4cdf6f4e305732185ec52cd2f2f6"
-    }
-    Frame {
-        msec: 2832
-        hash: "dfd3c29b0520edbbee57dfacfa7e2b30"
-    }
-    Frame {
-        msec: 2848
-        hash: "257d3d8bcf78671d35a898befec091cb"
-    }
-    Frame {
-        msec: 2864
-        hash: "20e89c544284603943396694abe86756"
-    }
-    Frame {
-        msec: 2880
-        image: "gridview.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "b88c6af89423b32b3a4413035711df03"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2912
-        hash: "e34de13af44c449c9ecc86e06ce01ed2"
-    }
-    Frame {
-        msec: 2928
-        hash: "98ffe81129aa7cc7325764221f1dae59"
-    }
-    Frame {
-        msec: 2944
-        hash: "db2d545de9879362738e71a02a3d1d26"
-    }
-    Frame {
-        msec: 2960
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 2976
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 2992
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3008
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3024
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3040
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3056
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3072
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3088
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3104
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3120
-        hash: "02d8c90faf56c65252e4f938944bda7b"
-    }
-    Frame {
-        msec: 3136
-        hash: "a32994e2320e357241f63b956b6db236"
-    }
-    Frame {
-        msec: 3152
-        hash: "9ada466c26c217adbcd7a93df264ed75"
-    }
-    Frame {
-        msec: 3168
-        hash: "79d1a3489be95d113e8c611a2ba63456"
-    }
-    Frame {
-        msec: 3184
-        hash: "d3aa82455c4ae3ac25097354e132a30f"
-    }
-    Frame {
-        msec: 3200
-        hash: "62d12e5933ed4ed048ccafd229f4b2b7"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3216
-        hash: "5bc4ac94ae20e425084d0811dee1ba08"
-    }
-    Frame {
-        msec: 3232
-        hash: "6d5113e3732dc7a9172eea3667a01f7b"
-    }
-    Frame {
-        msec: 3248
-        hash: "e435a2588b25d3336f290331931f5981"
-    }
-    Frame {
-        msec: 3264
-        hash: "bce201adbeb319b181cce139f179d7f0"
-    }
-    Frame {
-        msec: 3280
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3296
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3312
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3328
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3344
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3360
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3376
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3392
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3408
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3424
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3440
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3456
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3472
-        hash: "8f0f3cd35ae92047f23084f447046eb8"
-    }
-    Frame {
-        msec: 3488
-        hash: "ceb12e6c5e9f0566039040d9f3ff587f"
-    }
-    Frame {
-        msec: 3504
-        hash: "dfd0c89c3ea73aceefcdafa71609c720"
-    }
-    Frame {
-        msec: 3520
-        hash: "8d8ed1a9dc6a9f74dfc81b79f02af4c5"
-    }
-    Frame {
-        msec: 3536
-        hash: "d450bd62e03e1e4c7cb66e98ece05f97"
-    }
-    Frame {
-        msec: 3552
-        hash: "d1ece2210cd24eedd5361e5c3a162236"
-    }
-    Frame {
-        msec: 3568
-        hash: "77589e48b9db95e702055753046319e5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3584
-        hash: "7793263ecb831a1e63fbd76c8addde03"
-    }
-    Frame {
-        msec: 3600
-        hash: "bfa9675f981c37fed27dea100226f61a"
-    }
-    Frame {
-        msec: 3616
-        hash: "9780849fe8abd22c32ccafcdd46b0d65"
-    }
-    Frame {
-        msec: 3632
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3648
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3664
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3680
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3696
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3712
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3728
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3744
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3760
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3776
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3792
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3808
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3824
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3840
-        image: "gridview.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3872
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3888
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3904
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3920
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3936
-        hash: "a61dbcb7d914afe34009085bf37fb8e2"
-    }
-    Frame {
-        msec: 3952
-        hash: "89175b83b4f7ee4b5d99219cdc97aa59"
-    }
-    Frame {
-        msec: 3968
-        hash: "f524421286503f6175e4ad71dd89145f"
-    }
-    Frame {
-        msec: 3984
-        hash: "ca5af7d98a008eccba1e21be0da61f3c"
-    }
-    Frame {
-        msec: 4000
-        hash: "77c19e7e17e00787ff0d7a4e7bad7bc8"
-    }
-    Frame {
-        msec: 4016
-        hash: "04c8db761e324101ad92e0ac9ceed7d4"
-    }
-    Frame {
-        msec: 4032
-        hash: "97a3dcb81349efab6b44d458e83ce5c4"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4048
-        hash: "e86ebc276b88705c97cc9efb66ccc6b2"
-    }
-    Frame {
-        msec: 4064
-        hash: "a134bbfd14879f13b288a04d23382348"
-    }
-    Frame {
-        msec: 4080
-        hash: "9530ad3f58ad1c66401572869f7d91bc"
-    }
-    Frame {
-        msec: 4096
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4112
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4128
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4144
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4160
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4176
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4192
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4208
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4224
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4240
-        hash: "980e0fa84fd3bab496623936f5f220a2"
-    }
-    Frame {
-        msec: 4256
-        hash: "ed3268911723d664699bbc31317befc1"
-    }
-    Frame {
-        msec: 4272
-        hash: "3bfda4b3b0b2d2a97ec1c0b5b3f4da63"
-    }
-    Frame {
-        msec: 4288
-        hash: "1616c6def28659d51905564ff83cc112"
-    }
-    Frame {
-        msec: 4304
-        hash: "68342f34c18956d3a093f8eeeae6977e"
-    }
-    Frame {
-        msec: 4320
-        hash: "ac1b12959e9055a28fe2bda0a12b75bc"
-    }
-    Frame {
-        msec: 4336
-        hash: "009b85ff6b86e418c78ed33a5e88d3f1"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4352
-        hash: "59753bc7dc69767fe2109fdc41f20dae"
-    }
-    Frame {
-        msec: 4368
-        hash: "1c87d3d8c8d564d4d95a26f57fd28f38"
-    }
-    Frame {
-        msec: 4384
-        hash: "4e43b7b6787002c9013010dd74c83f49"
-    }
-    Frame {
-        msec: 4400
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4416
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4432
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4448
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4464
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4480
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4496
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4512
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4528
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4544
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4560
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4576
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4592
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4608
-        hash: "84de5b5e8b0fba190a783c72967661c7"
-    }
-    Frame {
-        msec: 4624
-        hash: "60b696f4913379d28f300fd1b531c6cb"
-    }
-    Frame {
-        msec: 4640
-        hash: "d01e651d9094332fd82ad1cea3e93e9d"
-    }
-    Frame {
-        msec: 4656
-        hash: "87be4cd7c894b03b2b64c996e915d71f"
-    }
-    Frame {
-        msec: 4672
-        hash: "b07fccb0c5565d2feed5a9fcdf8acead"
-    }
-    Frame {
-        msec: 4688
-        hash: "3dca3165fd34be549d21fb6c414c67d8"
-    }
-    Frame {
-        msec: 4704
-        hash: "5f69f3298f8ca73fa9b3b6e630c60186"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4720
-        hash: "d7f41e9a29d550a7d9a41bb947569abe"
-    }
-    Frame {
-        msec: 4736
-        hash: "4ede2e90ad216a2d44580c50a25dea23"
-    }
-    Frame {
-        msec: 4752
-        hash: "9b339845ee588b789dc9095c272e0bdf"
-    }
-    Frame {
-        msec: 4768
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4784
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4800
-        image: "gridview.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4832
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4848
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4864
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4880
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4896
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4912
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4928
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4944
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4960
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4976
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4992
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5008
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5024
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5040
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5056
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5072
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5088
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5104
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5120
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5136
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5152
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5168
-        hash: "d6f0a6d7604bad811eeba13fd7c45368"
-    }
-    Frame {
-        msec: 5184
-        hash: "5f92e1531a3f6c21ec82e3c908167fc7"
-    }
-    Frame {
-        msec: 5200
-        hash: "5214e99ff052dcdc8f85bad29de92e03"
-    }
-    Frame {
-        msec: 5216
-        hash: "d4abed9f0f1115c9a45b0b9b4f54754e"
-    }
-    Frame {
-        msec: 5232
-        hash: "cfae8a0281e704b0e62f6bf31b32800f"
-    }
-    Frame {
-        msec: 5248
-        hash: "c203f0674596ae690bf19f2d49be62ac"
-    }
-    Frame {
-        msec: 5264
-        hash: "2e2c7e05aade104bdc4f6c489b6f0601"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5280
-        hash: "b4b2148b0557dcab3a441165e5e4de5f"
-    }
-    Frame {
-        msec: 5296
-        hash: "c5e791d27a42a63d25cdbd492b4af29a"
-    }
-    Frame {
-        msec: 5312
-        hash: "0f94ebcb407f8e6ae263bd954f2c8177"
-    }
-    Frame {
-        msec: 5328
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5344
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5360
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5376
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5392
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5408
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5424
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5440
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5456
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5472
-        hash: "6fdfe69e377da72e04dc130f5677ed2c"
-    }
-    Frame {
-        msec: 5488
-        hash: "c041d26d43766fa1735f2ada2a43225b"
-    }
-    Frame {
-        msec: 5504
-        hash: "aa62dbd6c6256665ee1b4ef468607978"
-    }
-    Frame {
-        msec: 5520
-        hash: "987fcdf6483a83b1242053f4e7fb7a26"
-    }
-    Frame {
-        msec: 5536
-        hash: "fbde70c34709b68eb22f5460a8815fba"
-    }
-    Frame {
-        msec: 5552
-        hash: "911ddc838ebaf5ade1bb026dff2741ba"
-    }
-    Frame {
-        msec: 5568
-        hash: "120bbf35b2a3b756bdeaea0df43e49b2"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5584
-        hash: "ea93e33c079d6dc5fb18c69fb4fed441"
-    }
-    Frame {
-        msec: 5600
-        hash: "b9ac8ab01cb59b1fee11967bdb6d2dd6"
-    }
-    Frame {
-        msec: 5616
-        hash: "3ff266bf29cbcaa30bc1e7af5dd9866b"
-    }
-    Frame {
-        msec: 5632
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5648
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5664
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5680
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5696
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5712
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5728
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5744
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5760
-        image: "gridview.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5792
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5808
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5824
-        hash: "de1f83d25751639dff42f1755a6534c3"
-    }
-    Frame {
-        msec: 5840
-        hash: "edefdea8b2461d03fb97cf5ed66e9b6d"
-    }
-    Frame {
-        msec: 5856
-        hash: "cef1886397e3932a511f37571b5011f4"
-    }
-    Frame {
-        msec: 5872
-        hash: "05589ad354314d9e04ef90c1addd99f5"
-    }
-    Frame {
-        msec: 5888
-        hash: "ff88b52e3755b9b4785d2719ddd4f090"
-    }
-    Frame {
-        msec: 5904
-        hash: "f59edc3016b177a2e8faa6612d718b17"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5920
-        hash: "dc673a7cdd927f70b28ebcfe51cd3d89"
-    }
-    Frame {
-        msec: 5936
-        hash: "3abec0da85fb663e63ab22188e092827"
-    }
-    Frame {
-        msec: 5952
-        hash: "50c2c8ac68cafad7c47b576cd8f4a037"
-    }
-    Frame {
-        msec: 5968
-        hash: "06c31b861e2b96e6595b2244d7b3f4d5"
-    }
-    Frame {
-        msec: 5984
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6000
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6016
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6032
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6048
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6064
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6080
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6096
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6112
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6128
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6144
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6160
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6176
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6192
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6208
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6224
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6240
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6256
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6272
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6288
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6304
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6320
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6336
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6352
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6368
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6384
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6400
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6416
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6432
-        hash: "7f52a770775c19e10784b4c5f7874210"
-    }
-    Frame {
-        msec: 6448
-        hash: "827cfb74286a2a80aca8b6c5277d6cfd"
-    }
-    Frame {
-        msec: 6464
-        hash: "8399231eda9b66821d43a3d8c4c7d645"
-    }
-    Frame {
-        msec: 6480
-        hash: "fc163583671f3c4023361460b436c895"
-    }
-    Frame {
-        msec: 6496
-        hash: "893dea6496c95c32095ad1d673e500c2"
-    }
-    Frame {
-        msec: 6512
-        hash: "808c7403b2cdcc882059da56a2f806fe"
-    }
-    Frame {
-        msec: 6528
-        hash: "7466b2e5b86ba8ad46be75818659786c"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6544
-        hash: "dd2561cd780e24401130305d47757a53"
-    }
-    Frame {
-        msec: 6560
-        hash: "bee89299532d43fc3e6c3e69c343b381"
-    }
-    Frame {
-        msec: 6576
-        hash: "94f8474aedee94098592c05d8fc7d868"
-    }
-    Frame {
-        msec: 6592
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6608
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6624
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6640
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6656
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6672
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6688
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6704
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6720
-        image: "gridview.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "ccd58be20d47422121d6ef799b927a7a"
-    }
-    Frame {
-        msec: 6752
-        hash: "e090c7f39649786a1796870e25bd0f0d"
-    }
-    Frame {
-        msec: 6768
-        hash: "acf3dcd9f4a869169dbc1ae7fe60e9d0"
-    }
-    Frame {
-        msec: 6784
-        hash: "51795e9a720845e8305d23507785e1ca"
-    }
-    Frame {
-        msec: 6800
-        hash: "0d34a43e177e6b73e2ff9155747d0385"
-    }
-    Frame {
-        msec: 6816
-        hash: "1876c3cdffc1af01da1aaa0ac636d0a8"
-    }
-    Frame {
-        msec: 6832
-        hash: "3131296b6edf4190520e2cdb3f8b936e"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6848
-        hash: "ee92f0a764e5081b130e205a5c362b07"
-    }
-    Frame {
-        msec: 6864
-        hash: "8737ea2c60aeb215228c00a7fddd1baa"
-    }
-    Frame {
-        msec: 6880
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6896
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6912
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6928
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6944
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6960
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6976
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6992
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7008
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7024
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7040
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7056
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7072
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7088
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7104
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7120
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7136
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7152
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7168
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7184
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7200
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7216
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7232
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7248
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7264
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7280
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7296
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7312
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7328
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7344
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7360
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7376
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7392
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7408
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7424
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7440
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7456
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7472
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7488
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7504
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7520
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7536
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7552
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7568
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7584
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7600
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7616
-        hash: "eb0d1be15f63af6eaf6634b02e5f240a"
-    }
-    Frame {
-        msec: 7632
-        hash: "2423c305bebb3449e87c78e8fb447c88"
-    }
-    Frame {
-        msec: 7648
-        hash: "f0ede6ea85647728db80878b3e525edc"
-    }
-    Frame {
-        msec: 7664
-        hash: "387d127b2b000dc344ee4768cf2d29b2"
-    }
-    Frame {
-        msec: 7680
-        image: "gridview.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "1d0d8100e994c16d7973ad9a97b0068f"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7712
-        hash: "95fb4a6d0331ffc4773e39ec8c3e6511"
-    }
-    Frame {
-        msec: 7728
-        hash: "34738f16150228d971972833d4bd5c8f"
-    }
-    Frame {
-        msec: 7744
-        hash: "9b71c8dacc530f32d7c6f409928caf5c"
-    }
-    Frame {
-        msec: 7760
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7776
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7792
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7808
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7824
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7840
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7856
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7872
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7888
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7904
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7920
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7936
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7952
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7968
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7984
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 8000
-        hash: "0587fc809c38c3bbe1fbac2960596974"
-    }
-    Frame {
-        msec: 8016
-        hash: "d20eba806cf4730a850db4c095fa36f9"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8032
-        hash: "c1663e75ba05b341e1e970a451958ea0"
-    }
-    Frame {
-        msec: 8048
-        hash: "ea40cc33b689d6b42fc5a69fa30178e4"
-    }
-    Frame {
-        msec: 8064
-        hash: "a07a1c61de1813158ff743cd326ee427"
-    }
-    Frame {
-        msec: 8080
-        hash: "6dfddaa340df8999ca77f6a6e4c6c3ce"
-    }
-    Frame {
-        msec: 8096
-        hash: "76ca40bb169c1ddc291847d4be2d38d7"
-    }
-    Frame {
-        msec: 8112
-        hash: "e44778541b76208981a3944a64235cac"
-    }
-    Frame {
-        msec: 8128
-        hash: "fdf45ea650d31957cc675c3bec8bf53e"
-    }
-    Frame {
-        msec: 8144
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8160
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8176
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8192
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8208
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8224
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8240
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8256
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8272
-        hash: "338481e6390f2a61e975084c16427584"
-    }
-    Frame {
-        msec: 8288
-        hash: "8923c45c23b1f4250b7d1e483b07a4da"
-    }
-    Frame {
-        msec: 8304
-        hash: "b21de834906d0eecea985561e2e41e4f"
-    }
-    Frame {
-        msec: 8320
-        hash: "a8c9761cfb20631520ed890cd2648c4b"
-    }
-    Frame {
-        msec: 8336
-        hash: "abf96a042ef12190bc48ff49732ef55a"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8352
-        hash: "5b9506dfb038cd26dfc81ecd2406ada9"
-    }
-    Frame {
-        msec: 8368
-        hash: "be75b8d39f81b2fdaff01469bfc67d4a"
-    }
-    Frame {
-        msec: 8384
-        hash: "488aa2977f349df82b5f6ae5e3619d35"
-    }
-    Frame {
-        msec: 8400
-        hash: "d69f17f0ce8537511353d20b59d20de0"
-    }
-    Frame {
-        msec: 8416
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8432
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8448
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8464
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8480
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8496
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8512
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8528
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8544
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8560
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8576
-        hash: "8f74d33bf95cbf37fdb4521c69373a64"
-    }
-    Frame {
-        msec: 8592
-        hash: "e33bb4cd12790c9d9992efdd3e23bee9"
-    }
-    Frame {
-        msec: 8608
-        hash: "36f32e34b4093091c4707f26c52896ad"
-    }
-    Frame {
-        msec: 8624
-        hash: "5ab5e142f8dc883287c116cedbacfd55"
-    }
-    Frame {
-        msec: 8640
-        image: "gridview.8.png"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8656
-        hash: "c74212e45a6c4b6a18caeb6a22350609"
-    }
-    Frame {
-        msec: 8672
-        hash: "8919643a7d13677dd902941860093209"
-    }
-    Frame {
-        msec: 8688
-        hash: "6f2ab4400fadf51b994351f0975e31fc"
-    }
-    Frame {
-        msec: 8704
-        hash: "4798559ce6f9bd7455ed5385d0030763"
-    }
-    Frame {
-        msec: 8720
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8736
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8752
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8768
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8784
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8800
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8816
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8832
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8848
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8864
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8880
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8896
-        hash: "fac81cf6f45cb47abc1fa36d23e39d34"
-    }
-    Frame {
-        msec: 8912
-        hash: "862f4deee01183fd38b094da59048b23"
-    }
-    Frame {
-        msec: 8928
-        hash: "2f3b147221da30d8857d25fc788b3eac"
-    }
-    Frame {
-        msec: 8944
-        hash: "5b295b187c6cfc6aefa51e5efc2c27e3"
-    }
-    Frame {
-        msec: 8960
-        hash: "fe3139ddc8fdbc1b0c25bd641f83e833"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8976
-        hash: "8f2a9585dc6248a403aafd0f151d6ba0"
-    }
-    Frame {
-        msec: 8992
-        hash: "39eca8cc6bb8ea30cc452dc24f8e46dc"
-    }
-    Frame {
-        msec: 9008
-        hash: "8dbbc6026942cb6e572f1cb7e2675713"
-    }
-    Frame {
-        msec: 9024
-        hash: "62dfa07b96dd18c6be89822654bf09f3"
-    }
-    Frame {
-        msec: 9040
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9056
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9072
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9088
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9104
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9120
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9136
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9152
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9168
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9184
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9200
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9216
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9232
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9248
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9264
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9280
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9296
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9312
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9328
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9344
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9360
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9376
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9392
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9408
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9424
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9440
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9456
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9472
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9488
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9504
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9520
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9536
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9552
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9568
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9584
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9600
-        image: "gridview.9.png"
-    }
-    Frame {
-        msec: 9616
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9632
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9648
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9664
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9680
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9696
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9712
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9728
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9744
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9760
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9776
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9792
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9808
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9824
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9840
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png
deleted file mode 100644
index 3021d58..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png
deleted file mode 100644
index baeb1a6..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png
deleted file mode 100644
index b0486e5..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png
deleted file mode 100644
index 2d0c731..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png
deleted file mode 100644
index af9ed05..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png
deleted file mode 100644
index 0b0945d..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png
deleted file mode 100644
index 618ae0c..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png
deleted file mode 100644
index fc31262..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png
deleted file mode 100644
index 22291ac..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png
deleted file mode 100644
index 3021d58..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png
deleted file mode 100644
index 2f2f5b9..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml
deleted file mode 100644
index 1c90af9..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml
+++ /dev/null
@@ -1,2479 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "dba2f6f1c773bd4cd9523108fca861c4"
-    }
-    Frame {
-        msec: 32
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 48
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 64
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 80
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 96
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 112
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 128
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 144
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 160
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 176
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 192
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 208
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 224
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 240
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 256
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 272
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 288
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 304
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 320
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 336
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 352
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 368
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 384
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 400
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 416
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 432
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 448
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 464
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 480
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 496
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 512
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 528
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 544
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 560
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 576
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 592
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 608
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 624
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 640
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 656
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 672
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 688
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 704
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 720
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 736
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 752
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 768
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 784
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 800
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 816
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 832
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 848
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 864
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 880
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 896
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 912
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 928
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 944
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 960
-        image: "gridview2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 992
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1008
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1024
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1040
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1056
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1072
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1088
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1104
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1120
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1136
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1152
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1168
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1184
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1200
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1216
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1232
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1248
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1264
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1280
-        hash: "aaec7184a27e6700d96ffff376b8fa53"
-    }
-    Frame {
-        msec: 1296
-        hash: "3fa3a890a4ff4a59336a9a2d478d0dde"
-    }
-    Frame {
-        msec: 1312
-        hash: "3711c6c2f4f9aba7f2c72bd1f1d85016"
-    }
-    Frame {
-        msec: 1328
-        hash: "23da2f9a800b805ce7b77ff08218907d"
-    }
-    Frame {
-        msec: 1344
-        hash: "12e4bc953b06cdaad0720f87fb96a37e"
-    }
-    Frame {
-        msec: 1360
-        hash: "46e69658bda69bab202a2790a76ba1cd"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1376
-        hash: "44608e67c69b92ccbb45e119e1158fe3"
-    }
-    Frame {
-        msec: 1392
-        hash: "97a309b47017d38294644a486a7ce68e"
-    }
-    Frame {
-        msec: 1408
-        hash: "41f42b50b22e0496c8aca5019b24b9cb"
-    }
-    Frame {
-        msec: 1424
-        hash: "8603ea1cb60c804563f50bc41c0180fe"
-    }
-    Frame {
-        msec: 1440
-        hash: "e29777fa70daafe9640c6e9bb7bd63d6"
-    }
-    Frame {
-        msec: 1456
-        hash: "2c4c360320f527e99fee799e68c2c0aa"
-    }
-    Frame {
-        msec: 1472
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1488
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1504
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1520
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1536
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1552
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1568
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1584
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1600
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1616
-        hash: "17027b7c099b11cb5382f30dbbd1e647"
-    }
-    Frame {
-        msec: 1632
-        hash: "0e17461a4ca843f9903b7f03e99a0b00"
-    }
-    Frame {
-        msec: 1648
-        hash: "a5e61901920553e59892fa405beea15a"
-    }
-    Frame {
-        msec: 1664
-        hash: "310eaf71fe8d3807606e58a666c65ccd"
-    }
-    Frame {
-        msec: 1680
-        hash: "76f556d05fb77082f33eb1836c10587a"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1696
-        hash: "4e7e4b7790a96396e7ea3533b5c32ed9"
-    }
-    Frame {
-        msec: 1712
-        hash: "b065287b6490f58ca6f0e9eb2027cf20"
-    }
-    Frame {
-        msec: 1728
-        hash: "907cd9dbdffa1d395caaabd466dc8e86"
-    }
-    Frame {
-        msec: 1744
-        hash: "3b144e5b4867328beafa3020ce931480"
-    }
-    Frame {
-        msec: 1760
-        hash: "b59b2b60b7d55424b61b1b0ed3e227b8"
-    }
-    Frame {
-        msec: 1776
-        hash: "4032e934871b315b68c7c2abea42efee"
-    }
-    Frame {
-        msec: 1792
-        hash: "8f80127b2f8d6fc10aa84062544cc381"
-    }
-    Frame {
-        msec: 1808
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1824
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1840
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1856
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1872
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1888
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1904
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1920
-        image: "gridview2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1952
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1968
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1984
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 2000
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 2016
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2032
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 2048
-        hash: "a45d2630872a14541f39b862e15ff461"
-    }
-    Frame {
-        msec: 2064
-        hash: "714711d7382ef8bba5fb39e2e44bd59c"
-    }
-    Frame {
-        msec: 2080
-        hash: "63deed0356e761f94f88be18a7d10053"
-    }
-    Frame {
-        msec: 2096
-        hash: "d5b4fc1b568a4a1b63a91b422272c704"
-    }
-    Frame {
-        msec: 2112
-        hash: "b6d2c80925cc6b4b7b297bd6ee903c7c"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2128
-        hash: "38117482196360353586cb7ace593894"
-    }
-    Frame {
-        msec: 2144
-        hash: "2301f3a148bf4e311cc8ce011ddf65f8"
-    }
-    Frame {
-        msec: 2160
-        hash: "2a4982a0961f89a15618f8d4c2081f5a"
-    }
-    Frame {
-        msec: 2176
-        hash: "acf8666d6a8a29925f3895aa8e93f713"
-    }
-    Frame {
-        msec: 2192
-        hash: "967ed026bc92a6d2747c5227105543a6"
-    }
-    Frame {
-        msec: 2208
-        hash: "ff72f3fb95f25990c99c1c14cfef57da"
-    }
-    Frame {
-        msec: 2224
-        hash: "0874a4f863596c3860dcf5b1f7f6ceb2"
-    }
-    Frame {
-        msec: 2240
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2256
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2272
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2288
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2304
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2320
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2336
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2352
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2368
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2384
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2400
-        hash: "7c4bbf0423d63d7642d218cac56a6215"
-    }
-    Frame {
-        msec: 2416
-        hash: "e8c77dbc89721b51549f8d46453fe09d"
-    }
-    Frame {
-        msec: 2432
-        hash: "7953503590b639872ac12215695e8cea"
-    }
-    Frame {
-        msec: 2448
-        hash: "edaee946a2e25fed6de9acfda0d44a14"
-    }
-    Frame {
-        msec: 2464
-        hash: "4996ef39bb0122c10d65f8dd8674b386"
-    }
-    Frame {
-        msec: 2480
-        hash: "ede7c6ca9d6deb7819c3715e98755d6e"
-    }
-    Frame {
-        msec: 2496
-        hash: "e703fad2fcf9244ec9865200c7d17ce3"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2512
-        hash: "e2bfc16fd893bb3eb0e5df89a0169af3"
-    }
-    Frame {
-        msec: 2528
-        hash: "cfd0eb2bc378bd46644f3f7820150685"
-    }
-    Frame {
-        msec: 2544
-        hash: "442b05b04762c2bcda291aaa0341398e"
-    }
-    Frame {
-        msec: 2560
-        hash: "55842a6503057eea98e2075ef160873e"
-    }
-    Frame {
-        msec: 2576
-        hash: "730f80233dacf1119660a76d2a34c5fc"
-    }
-    Frame {
-        msec: 2592
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2608
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2624
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2640
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2656
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2672
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2688
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2704
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2720
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2736
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2752
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2768
-        hash: "4d04c12bc7fab0b22df3135bf3a87a22"
-    }
-    Frame {
-        msec: 2784
-        hash: "fdca5a3f8312452feba7f37b1caa6419"
-    }
-    Frame {
-        msec: 2800
-        hash: "97b955e0f8cde30299b238d9ac0eb308"
-    }
-    Frame {
-        msec: 2816
-        hash: "19664de1a738458810896959ba4087ad"
-    }
-    Frame {
-        msec: 2832
-        hash: "4f9a4b6de6a2969e4639076a8f7c258e"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2848
-        hash: "a10f18aa686be2681a48082ec9f01df7"
-    }
-    Frame {
-        msec: 2864
-        hash: "b8f39a6cca377dd573429d879286dd63"
-    }
-    Frame {
-        msec: 2880
-        image: "gridview2.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "3301e52a46efbc49882401c77853ffde"
-    }
-    Frame {
-        msec: 2912
-        hash: "0c614597f17496ebc701efe7b0c1fbb6"
-    }
-    Frame {
-        msec: 2928
-        hash: "6dda2d6b034c932e279cf216c9b3e6ad"
-    }
-    Frame {
-        msec: 2944
-        hash: "7bf08cd5fe3ad3f83bbef28f452e0545"
-    }
-    Frame {
-        msec: 2960
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 2976
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 2992
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 3008
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 3024
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3040
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 3056
-        hash: "0fe7d46e7c18ce7bb5a098c5c662d557"
-    }
-    Frame {
-        msec: 3072
-        hash: "cd5df541cc1ed545bc27da9e4a937261"
-    }
-    Frame {
-        msec: 3088
-        hash: "35762467b83fee1870cff9b0436994d3"
-    }
-    Frame {
-        msec: 3104
-        hash: "75a620b42caabf5b1576041dbd4c2808"
-    }
-    Frame {
-        msec: 3120
-        hash: "f1b06290a6cbd48b8d3d4ce1e42ed754"
-    }
-    Frame {
-        msec: 3136
-        hash: "8e1a50dc082828587a4656117760a852"
-    }
-    Frame {
-        msec: 3152
-        hash: "aae8e5f166e736040138d8e222a844dd"
-    }
-    Frame {
-        msec: 3168
-        hash: "f69e5cf2bcb26fe49126776695b0b7e0"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3184
-        hash: "7b482fece0255ea07496ef0545b008a2"
-    }
-    Frame {
-        msec: 3200
-        hash: "3f96eaebfebe8d4eeb347b201b59ab11"
-    }
-    Frame {
-        msec: 3216
-        hash: "9943626d2226c3be711c8213906133f0"
-    }
-    Frame {
-        msec: 3232
-        hash: "fd5fd8177b3957c27f1de0d95621351a"
-    }
-    Frame {
-        msec: 3248
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3264
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3280
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3296
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3312
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3328
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3344
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3360
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3376
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3392
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3408
-        hash: "fb437f6c23561092a124e498f1604ff2"
-    }
-    Frame {
-        msec: 3424
-        hash: "402ba144bbb7260eec4553e68eb35cda"
-    }
-    Frame {
-        msec: 3440
-        hash: "76a983de9e85e0c81dfb8908252bd6c9"
-    }
-    Frame {
-        msec: 3456
-        hash: "09219f55fae47a0afed887ebf68a36bc"
-    }
-    Frame {
-        msec: 3472
-        hash: "344e81cc262093facef2f6a235a734dc"
-    }
-    Frame {
-        msec: 3488
-        hash: "8f1c5544eb537555b1c59a377b15e31d"
-    }
-    Frame {
-        msec: 3504
-        hash: "606b9bb549fe2e4bbd09d67b7dea0d1a"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3520
-        hash: "63e239c97bd01a61cb31ef2869e7f47c"
-    }
-    Frame {
-        msec: 3536
-        hash: "f7c176550c39f8a1ad64590cf33a60a4"
-    }
-    Frame {
-        msec: 3552
-        hash: "8581cb14ed81efdf9abb638b5e542cc3"
-    }
-    Frame {
-        msec: 3568
-        hash: "7a1e9354ecc49d8bc27d303c7bdc81f9"
-    }
-    Frame {
-        msec: 3584
-        hash: "610288b97276ee03702ed8a814ef333d"
-    }
-    Frame {
-        msec: 3600
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3616
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3632
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3648
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3664
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3680
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3696
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3712
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3728
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3744
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3760
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3776
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3792
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3808
-        hash: "9713c6b9aff051dd0cc45c545d34b688"
-    }
-    Frame {
-        msec: 3824
-        hash: "1f8fd4d759e343720a8681b6ad126b72"
-    }
-    Frame {
-        msec: 3840
-        image: "gridview2.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "8550d916d91a40b0c3a886b962e07ffc"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3872
-        hash: "df0c2e474139e79429bfc19c79a65ef8"
-    }
-    Frame {
-        msec: 3888
-        hash: "acfb99d081d754276e5ed59bd590aeab"
-    }
-    Frame {
-        msec: 3904
-        hash: "2b34cd101b442f7a3de2893fd5514c16"
-    }
-    Frame {
-        msec: 3920
-        hash: "df92ced66faa1d59354d8010278438ec"
-    }
-    Frame {
-        msec: 3936
-        hash: "dd39a8e6fa3784453461193a6da416cd"
-    }
-    Frame {
-        msec: 3952
-        hash: "5670e8f91ea2df451f0974a51cd77d7d"
-    }
-    Frame {
-        msec: 3968
-        hash: "74b97a09bfe7400872a2c6214e04a5ac"
-    }
-    Frame {
-        msec: 3984
-        hash: "cfd55b963506ab54cf09a7311e84bcc9"
-    }
-    Frame {
-        msec: 4000
-        hash: "59657ee9293c03f064d62de826931435"
-    }
-    Frame {
-        msec: 4016
-        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
-    }
-    Frame {
-        msec: 4032
-        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
-    }
-    Frame {
-        msec: 4048
-        hash: "9dc38985113124130e2ca7950e0bd144"
-    }
-    Frame {
-        msec: 4064
-        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
-    }
-    Frame {
-        msec: 4080
-        hash: "1f4d59a4e4684aab309363a711b30006"
-    }
-    Frame {
-        msec: 4096
-        hash: "a11e332de151b43051796e16dbcf75c3"
-    }
-    Frame {
-        msec: 4112
-        hash: "1a0e82029ae107cb2a018786752433ff"
-    }
-    Frame {
-        msec: 4128
-        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
-    }
-    Frame {
-        msec: 4144
-        hash: "2b418f811992399c3f87c268db745632"
-    }
-    Frame {
-        msec: 4160
-        hash: "0e9a056207053ca98c4e9f42de244c62"
-    }
-    Frame {
-        msec: 4176
-        hash: "1945c3f9e3a1337e7d111e15adea345f"
-    }
-    Frame {
-        msec: 4192
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4208
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4224
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4240
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4256
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4272
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4288
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4304
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4320
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4336
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4352
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4368
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4384
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4400
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4416
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4432
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4448
-        hash: "1945c3f9e3a1337e7d111e15adea345f"
-    }
-    Frame {
-        msec: 4464
-        hash: "0e9a056207053ca98c4e9f42de244c62"
-    }
-    Frame {
-        msec: 4480
-        hash: "2b418f811992399c3f87c268db745632"
-    }
-    Frame {
-        msec: 4496
-        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
-    }
-    Frame {
-        msec: 4512
-        hash: "1a0e82029ae107cb2a018786752433ff"
-    }
-    Frame {
-        msec: 4528
-        hash: "a11e332de151b43051796e16dbcf75c3"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4544
-        hash: "1f4d59a4e4684aab309363a711b30006"
-    }
-    Frame {
-        msec: 4560
-        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
-    }
-    Frame {
-        msec: 4576
-        hash: "9dc38985113124130e2ca7950e0bd144"
-    }
-    Frame {
-        msec: 4592
-        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
-    }
-    Frame {
-        msec: 4608
-        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
-    }
-    Frame {
-        msec: 4624
-        hash: "59657ee9293c03f064d62de826931435"
-    }
-    Frame {
-        msec: 4640
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4656
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4672
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4688
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4704
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4720
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4736
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4752
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4768
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4784
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4800
-        image: "gridview2.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4832
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4848
-        hash: "d46eea049d6156a5e85d9c6811d9d367"
-    }
-    Frame {
-        msec: 4864
-        hash: "d5796ae85247cb8502f92f0d044e4e1f"
-    }
-    Frame {
-        msec: 4880
-        hash: "90987ac49c1a4e6b668436e3ff631e6c"
-    }
-    Frame {
-        msec: 4896
-        hash: "c38d69759ad80242b1fe83ba191cd421"
-    }
-    Frame {
-        msec: 4912
-        hash: "09d08aed76a04e492d8a39cc4dd2b8f5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4928
-        hash: "9671d2ff9a2ef46ce3c750a1965404a4"
-    }
-    Frame {
-        msec: 4944
-        hash: "f55857816d666ece4a7987a70883b3d1"
-    }
-    Frame {
-        msec: 4960
-        hash: "a2d80527b30316d9120b057bbfcfa666"
-    }
-    Frame {
-        msec: 4976
-        hash: "87ca69287c1469cbc7e65d1673016de7"
-    }
-    Frame {
-        msec: 4992
-        hash: "51588c7ebbe2dcd87a3c9bebf028aee3"
-    }
-    Frame {
-        msec: 5008
-        hash: "917a9a171273fe9fd4c450eeed6f58ed"
-    }
-    Frame {
-        msec: 5024
-        hash: "6e7ade250a9a9692caee2a220dd2ac53"
-    }
-    Frame {
-        msec: 5040
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5056
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5072
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5088
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5104
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5120
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5136
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5152
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5168
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5184
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5200
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5216
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5232
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5248
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5264
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5280
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5296
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5312
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5328
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5344
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5360
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5376
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5392
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5408
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5424
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5440
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5456
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5472
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5488
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5504
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5520
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5536
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5552
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5568
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5584
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5600
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5616
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5632
-        hash: "c5c9aab9bea757f1c451e89df72bd836"
-    }
-    Frame {
-        msec: 5648
-        hash: "a8cf3085f8c3b743f3f15db1ad7b8801"
-    }
-    Frame {
-        msec: 5664
-        hash: "c25a92050eced1c304506572723273a3"
-    }
-    Frame {
-        msec: 5680
-        hash: "cff981039c1a3eb6c3c1a20f142fbae2"
-    }
-    Frame {
-        msec: 5696
-        hash: "930765587fe3355873bbdff66b812b74"
-    }
-    Frame {
-        msec: 5712
-        hash: "6a60f97c7b39add465e1bd366e9c644b"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5728
-        hash: "7a1fd3c488d1064a75dc598c9a773291"
-    }
-    Frame {
-        msec: 5744
-        hash: "e2ecd7e68e27eb3d2dcb5e368d3ee5a0"
-    }
-    Frame {
-        msec: 5760
-        image: "gridview2.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "20f3aaca2efc3066076e73d1d95e5363"
-    }
-    Frame {
-        msec: 5792
-        hash: "b18d476cadc36e22dddc3185f595c123"
-    }
-    Frame {
-        msec: 5808
-        hash: "8cbc47555178c8ee355774eab17b4b19"
-    }
-    Frame {
-        msec: 5824
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5840
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5856
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5872
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5888
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5904
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5920
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5936
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5952
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5968
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5984
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6000
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6016
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6032
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6048
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6064
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6080
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6096
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6112
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6128
-        hash: "8c2fab0c73d1cfbeeb0ec937085d6b3b"
-    }
-    Frame {
-        msec: 6144
-        hash: "5d9353517177ef7c6314d8a65cb009ec"
-    }
-    Frame {
-        msec: 6160
-        hash: "ed8de504f7e2028cd369c1555314fd81"
-    }
-    Frame {
-        msec: 6176
-        hash: "8fe84d8badbe5bd08d097ba6bda10611"
-    }
-    Frame {
-        msec: 6192
-        hash: "d77419a55a3cf933505e793bb258e6af"
-    }
-    Frame {
-        msec: 6208
-        hash: "457ac82be02e2f5e08e51ccc78c94781"
-    }
-    Frame {
-        msec: 6224
-        hash: "e57e2852f065afff9c24c5bc9f29edee"
-    }
-    Frame {
-        msec: 6240
-        hash: "f72cd6ad3324936c3a18c264e23e05a9"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6256
-        hash: "a4bf7eae6fc7a05239d09421ae95304a"
-    }
-    Frame {
-        msec: 6272
-        hash: "423f3bd07df8bee25818644c07201a3c"
-    }
-    Frame {
-        msec: 6288
-        hash: "225e9c698424f287b9458b7839b4479b"
-    }
-    Frame {
-        msec: 6304
-        hash: "0f463db7e4acc184a4efb7b5e5c0d397"
-    }
-    Frame {
-        msec: 6320
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6336
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6352
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6368
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6384
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6400
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6416
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6432
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6448
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6464
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6480
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6496
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6512
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6528
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6544
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6560
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6576
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6592
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6608
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6624
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6640
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6656
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6672
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6688
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6704
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6720
-        image: "gridview2.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6752
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6768
-        hash: "738f6bcc043d221488285c7e529b1d1c"
-    }
-    Frame {
-        msec: 6784
-        hash: "cb0a4e8e79372dd67e8ecfea2143a47c"
-    }
-    Frame {
-        msec: 6800
-        hash: "544d1825b36f4e7950c1a62b26c1fd9b"
-    }
-    Frame {
-        msec: 6816
-        hash: "df99396622342b4f092b0db34a224c3d"
-    }
-    Frame {
-        msec: 6832
-        hash: "47391f51e5df2249a6ca1f1f6e8e80e0"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6848
-        hash: "d8079a874ca18d00aeeb611effcbeb8b"
-    }
-    Frame {
-        msec: 6864
-        hash: "4cfd9264af6935aca425da75ebb2d7cc"
-    }
-    Frame {
-        msec: 6880
-        hash: "aee6547cb653cd2d56d07285d836149d"
-    }
-    Frame {
-        msec: 6896
-        hash: "969720f17eae51258e2e143e14bfa737"
-    }
-    Frame {
-        msec: 6912
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6928
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6944
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6960
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6976
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6992
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7008
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7024
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7040
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7056
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7072
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7088
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7104
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7120
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7136
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7152
-        hash: "beeaec4b983c970ae448e33047dfdfea"
-    }
-    Frame {
-        msec: 7168
-        hash: "7c415ab1b7d8e25b71af75d3eec8ee4a"
-    }
-    Frame {
-        msec: 7184
-        hash: "8913037e57b9a6a58b68f2d6e69b1bd1"
-    }
-    Frame {
-        msec: 7200
-        hash: "19e59e9409fdaf90ccf75606b58688b7"
-    }
-    Frame {
-        msec: 7216
-        hash: "1ae71ef5b1006f637bd8df0769af65a6"
-    }
-    Frame {
-        msec: 7232
-        hash: "1f0aa8b368b2dbccafd54b923d8cce95"
-    }
-    Frame {
-        msec: 7248
-        hash: "c5079fb25a8c80a995d7aa5fbbd91428"
-    }
-    Frame {
-        msec: 7264
-        hash: "59f41220fa5d23db298c9e94f115c17b"
-    }
-    Frame {
-        msec: 7280
-        hash: "48259dfe8b266d9e7f50b187be98c3cb"
-    }
-    Frame {
-        msec: 7296
-        hash: "f7554552598351c3b8dfcbe3ebc32b3b"
-    }
-    Frame {
-        msec: 7312
-        hash: "219e9cd84d7e5c5c0e6cb80100aa3ab5"
-    }
-    Frame {
-        msec: 7328
-        hash: "5578e870ee8ce00bce5a59bb25e3d0a9"
-    }
-    Frame {
-        msec: 7344
-        hash: "4d9cebbf750c03380694245e0e22ab94"
-    }
-    Frame {
-        msec: 7360
-        hash: "a60a8032e97ed0a3caa05012c1283de5"
-    }
-    Frame {
-        msec: 7376
-        hash: "3bee20b349a7e9d67f7770ede6da8673"
-    }
-    Frame {
-        msec: 7392
-        hash: "d8c34576c25fb8b5e4fa12680ac32e99"
-    }
-    Frame {
-        msec: 7408
-        hash: "cd1360aa7db7c3b2f2012dfc44de2198"
-    }
-    Frame {
-        msec: 7424
-        hash: "cd82782f63c9a7d21d51b3440c2f038b"
-    }
-    Frame {
-        msec: 7440
-        hash: "e59061967a841aa45607c0828b687527"
-    }
-    Frame {
-        msec: 7456
-        hash: "01962406c9aaf1aa8bf3ab49e30ddf5f"
-    }
-    Frame {
-        msec: 7472
-        hash: "5a5732a568189e598c7985ee806bc67e"
-    }
-    Frame {
-        msec: 7488
-        hash: "54775aed3a6283c1fa330d65de5bc70c"
-    }
-    Frame {
-        msec: 7504
-        hash: "66640b4a5c1e68924b25de24e3c3f008"
-    }
-    Frame {
-        msec: 7520
-        hash: "76999d3125f20ba47dbdff38ee722a8a"
-    }
-    Frame {
-        msec: 7536
-        hash: "5159c81533bee8825cff11910bcb90dc"
-    }
-    Frame {
-        msec: 7552
-        hash: "ac0295495345987d1e000f6bb2436927"
-    }
-    Frame {
-        msec: 7568
-        hash: "d56b4a04f1d2835a0852ea20e8e2f451"
-    }
-    Frame {
-        msec: 7584
-        hash: "ae41fe23e2ab508d7642973c0d9d35b0"
-    }
-    Frame {
-        msec: 7600
-        hash: "730ca01fbee6ec4928715ec52773c06c"
-    }
-    Frame {
-        msec: 7616
-        hash: "ad1fa52c617a2b119d61eb9fb7d58a82"
-    }
-    Frame {
-        msec: 7632
-        hash: "c74321a822b515a393e8e218bd45e8e3"
-    }
-    Frame {
-        msec: 7648
-        hash: "a9e2f3bee1d47166204c74bdf90cd8c8"
-    }
-    Frame {
-        msec: 7664
-        hash: "e10d4bf08980ea7d079a2f359ee62b95"
-    }
-    Frame {
-        msec: 7680
-        image: "gridview2.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "9f0ba6051e684e54ff4e36d980a7e600"
-    }
-    Frame {
-        msec: 7712
-        hash: "aa6268d8d7fb3d2b91db3e225e8c818a"
-    }
-    Frame {
-        msec: 7728
-        hash: "8e547e55279b1929f42bf51e753f142e"
-    }
-    Frame {
-        msec: 7744
-        hash: "5386c71f8d6701379e177f161d714da2"
-    }
-    Frame {
-        msec: 7760
-        hash: "a184e9e6012c72fc1aeaed9f98b0fb1e"
-    }
-    Frame {
-        msec: 7776
-        hash: "777a6b70ca77c45e2e5e3914cc328dcb"
-    }
-    Frame {
-        msec: 7792
-        hash: "424f73f25a1e91126f951838d45adc3b"
-    }
-    Frame {
-        msec: 7808
-        hash: "3f7f2eb6b9a5d19fbfcd700baf566dfb"
-    }
-    Frame {
-        msec: 7824
-        hash: "c3c4c72b25c2295b82a5fd7454942f77"
-    }
-    Frame {
-        msec: 7840
-        hash: "3b35e93d3eb9d28c5c03d6d353f805d2"
-    }
-    Frame {
-        msec: 7856
-        hash: "5dcad019a1c0eaaab381a7602e1914ff"
-    }
-    Frame {
-        msec: 7872
-        hash: "602a5c569555767413bf445af44c744f"
-    }
-    Frame {
-        msec: 7888
-        hash: "3e9facab95dae772f695b6f7c5175063"
-    }
-    Frame {
-        msec: 7904
-        hash: "0921220ec36ca7b25eaae699872a2006"
-    }
-    Frame {
-        msec: 7920
-        hash: "1d5fa7fd630af62bcc805bdc6686df37"
-    }
-    Frame {
-        msec: 7936
-        hash: "165c02de63604aa118d9f8995e6b45af"
-    }
-    Frame {
-        msec: 7952
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 7968
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 7984
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8000
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8016
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8032
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8048
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8064
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8080
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8096
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8112
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8128
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8144
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8160
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8176
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8192
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8208
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8224
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8240
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8256
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8272
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8288
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8304
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8320
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8336
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8352
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8368
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8384
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8400
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8416
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8432
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8448
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8464
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8480
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8496
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8512
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8528
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8544
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8560
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8576
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8592
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8608
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8624
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8640
-        image: "gridview2.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8672
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8688
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8704
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8720
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8736
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8752
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8768
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8784
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8800
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8816
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8832
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8848
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8864
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8880
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8896
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8912
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8928
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8944
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8960
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8976
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8992
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 9008
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 9024
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
index c79e19f..4dac63e 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
@@ -1,5 +1,7 @@
 import QtQuick 1.0
 
+//Currently doesn't behave right, see QTBUG-14837
+
 Rectangle {
     width: 300; height: 400; color: "black"
 
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
index 811e0e4..e27b4df 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
@@ -1,5 +1,7 @@
 import QtQuick 1.0
 
+//Currently doesn't behave right: see QTBUG-14838
+
 Rectangle {
     width: 300; height: 400; color: "black"
 
-- 
cgit v0.12


From efe07823154a1fd1348ddb4951478adace2401b1 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 11:44:38 +1000
Subject: Clean up qdeclarativeparticles visual test

update visuals, and add a couple comments.

Task-number: QTBUG-14792
---
 .../qdeclarativeparticles/data/particles.0.png     | Bin 10219 -> 9951 bytes
 .../qdeclarativeparticles/data/particles.1.png     | Bin 13469 -> 14613 bytes
 .../qdeclarativeparticles/data/particles.2.png     | Bin 14051 -> 14056 bytes
 .../qdeclarativeparticles/data/particles.qml       | 376 ++++++++++-----------
 .../qmlvisual/qdeclarativeparticles/particles.qml  |  10 +-
 5 files changed, 193 insertions(+), 193 deletions(-)

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png
index 7321d95..da77af9 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png
index 49d2a5a..578c9e9 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png
index 6fe14b7..24c6126 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
index 463edf8..3fec1ef 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
@@ -10,235 +10,235 @@ VisualTest {
     }
     Frame {
         msec: 32
-        hash: "43c0ad5826e8058260951f063f0851ab"
+        hash: "c7eb3936886726f584d1bd99133a199f"
     }
     Frame {
         msec: 48
-        hash: "55eb2c9939514338e7ef58c9276fc223"
+        hash: "f7f6eeab119435f0cccd55074b4941bf"
     }
     Frame {
         msec: 64
-        hash: "6a1bbb91bf450547d6100b6e61a98f6d"
+        hash: "06f52743e61bf0212971652c500fe5d1"
     }
     Frame {
         msec: 80
-        hash: "bdb9b8cab70c72d99aba830eb8e8913b"
+        hash: "1f9dd3a3a0524c60791362f560936f9b"
     }
     Frame {
         msec: 96
-        hash: "71a0e046bc68183b830df9dafd8fa147"
+        hash: "42538495fc9d63384a1709476c06d750"
     }
     Frame {
         msec: 112
-        hash: "e7228e0ed77e05c661282c2d2fe88b3e"
+        hash: "4d1b53541ffe5cdfcf0e3aa2916b1bac"
     }
     Frame {
         msec: 128
-        hash: "93a4c3e501b05844f687a2dd1754aad2"
+        hash: "6a3a683dbd2ad7c89f0788441303485e"
     }
     Frame {
         msec: 144
-        hash: "1856ac86313c16bf4874130d9a48ff45"
+        hash: "125a936660dae42969fab4144d166ac6"
     }
     Frame {
         msec: 160
-        hash: "3637d8dad4f44c938f91b0800bd9fb2f"
+        hash: "87d008547326ff1bf2c4c2a9d9b99abc"
     }
     Frame {
         msec: 176
-        hash: "c5ace4ede38d29363d69c6b4b2f9349f"
+        hash: "0df69d85b37d3ebf0e314a7e89701703"
     }
     Frame {
         msec: 192
-        hash: "a5d832d02f4a635052817654df90caba"
+        hash: "7af12cac3bd33c903d6aa6fa8f89b498"
     }
     Frame {
         msec: 208
-        hash: "9ebf8bea8abe7ac209d47214a87f8fc0"
+        hash: "424c950111c492ded19df874b938067c"
     }
     Frame {
         msec: 224
-        hash: "35b8f5cb18284867be8d27d601394a2b"
+        hash: "bee69a0df1ca8ccc7d83a52f9de34f8c"
     }
     Frame {
         msec: 240
-        hash: "a2c4a6063f219af6f2b29b2d21a4265d"
+        hash: "47da1538d818e22d836de57d5c6601ce"
     }
     Frame {
         msec: 256
-        hash: "27f25ace7b8e93c55638ed99f49b821c"
+        hash: "fbfb0e177b19d6ef9433619f60dd9580"
     }
     Frame {
         msec: 272
-        hash: "4f6511bfbbd8113195a7597eb6dfb219"
+        hash: "23b4f8bb116e8db48db25ccccedba43a"
     }
     Frame {
         msec: 288
-        hash: "6a696159cdbb51a67064c600124535d1"
+        hash: "13f0847f1b86f880690692066cde21c7"
     }
     Frame {
         msec: 304
-        hash: "6cd667eb352256dbb728532634e7ffd0"
+        hash: "639ca4c978bea080139b219c75bf01d1"
     }
     Frame {
         msec: 320
-        hash: "28fa16c8936bf86a8426ded306aa2b8c"
+        hash: "19debcaa7bbde930eda2fd08ac1e9d8a"
     }
     Frame {
         msec: 336
-        hash: "061fecdb88733e3e51c5823571bc4d19"
+        hash: "1d733c5010604bff67138f1eb9881dcd"
     }
     Frame {
         msec: 352
-        hash: "f64530f638b3d18d56593e0b7c884f5d"
+        hash: "b14435e41a3730baff06bb0800157081"
     }
     Frame {
         msec: 368
-        hash: "8530cf40739890dc7401fad65a6325bf"
+        hash: "504b3548c38d50f15235594f3f3d7be5"
     }
     Frame {
         msec: 384
-        hash: "0abc555552e7256dbc424b2eac5c95f2"
+        hash: "4e73ef73c949da579217c1d94139a75a"
     }
     Frame {
         msec: 400
-        hash: "64aeae59a8c958dfc62d92636b2f5217"
+        hash: "5fced44782484b1962368b9c04bf5246"
     }
     Frame {
         msec: 416
-        hash: "3e0f50f5bee017220b129d06b2acde2c"
+        hash: "6ab0cd5c14e1871a35d003574255c1db"
     }
     Frame {
         msec: 432
-        hash: "e676c01ff2e35bdfe674be67d49945b1"
+        hash: "23f5c485fbd0acd607119e93277284db"
     }
     Frame {
         msec: 448
-        hash: "bc060b480aab94fd440fd27f5beb7383"
+        hash: "02ebd53ee0e6ca3605916b05d827989e"
     }
     Frame {
         msec: 464
-        hash: "79c79f723de72315e63da8a7cbe1b425"
+        hash: "99b1d1e72d7da88a7d5d5a7907e1b1f4"
     }
     Frame {
         msec: 480
-        hash: "7bf93c2697af75d0f862a47d57cd6a7f"
+        hash: "b7de7d40263f2811ec51f28f8ff4929c"
     }
     Frame {
         msec: 496
-        hash: "7641b9e233f4aabd99bcd985ce1d51ae"
+        hash: "e64059f850dd4c8642a9883a1c5356bf"
     }
     Frame {
         msec: 512
-        hash: "b596a28cb67617d37408bd25d947d088"
+        hash: "b0aefb8f8d4d970ba4b51d7f77b55cf1"
     }
     Frame {
         msec: 528
-        hash: "f2c5cdf15c27b05c0ea97675ddc41757"
+        hash: "5ab4b1373c233b2342eb66cf9eccac8d"
     }
     Frame {
         msec: 544
-        hash: "eae5eb8c41a1d6d75446618518490f20"
+        hash: "b3726c296d5919a59c32201d857e92b4"
     }
     Frame {
         msec: 560
-        hash: "0be5e9a6d857fe1a262524801c69490d"
+        hash: "70e246371f9cf83b5913f2fc53f6b736"
     }
     Frame {
         msec: 576
-        hash: "65478b8c4d932c10924f70462a662254"
+        hash: "871cd4b99b6d544d487424219e0caf92"
     }
     Frame {
         msec: 592
-        hash: "7b034f3c98e8eb38eec11cf3c2aa0804"
+        hash: "8c002ec15e88220bf12ebaa5a3390570"
     }
     Frame {
         msec: 608
-        hash: "5bbc8eed41500ccbc820cfb38794232f"
+        hash: "21c994a5ad23938a9e873d04bbd4165e"
     }
     Frame {
         msec: 624
-        hash: "1b39d555ca8932b40efd769c4ba74d3f"
+        hash: "1f04a0ed31823cd0817f3e97a11e3a46"
     }
     Frame {
         msec: 640
-        hash: "f9a38e12becbce400191e22f1d22427c"
+        hash: "f163eda68878ae0ed4cac7f941e24414"
     }
     Frame {
         msec: 656
-        hash: "cbc27c72517d76edfc2d3692cd83f151"
+        hash: "560527d6c7fa64a4739f9c79f3eaab8f"
     }
     Frame {
         msec: 672
-        hash: "4a883a5aed05f0bbcefcefea6ef56df6"
+        hash: "df7e7469ff685c4cd822232b1aa66029"
     }
     Frame {
         msec: 688
-        hash: "7a30ea30c0619c87c96bcaba916c64df"
+        hash: "fa92bf73b0737d4ac8bbc16518cd9c2a"
     }
     Frame {
         msec: 704
-        hash: "33cd0797b6d229592ed53117fcaaa898"
+        hash: "bb2f2765ba20b727701352f11ed30417"
     }
     Frame {
         msec: 720
-        hash: "21178ef9366c8a65ecb9e21d584573b0"
+        hash: "4c45617ce77a5869cdbfcfe851796422"
     }
     Frame {
         msec: 736
-        hash: "fe75beac8681fdac8a2b79c9c7267128"
+        hash: "24aa2eabe8d2a4adc5a096dd201a3bc1"
     }
     Frame {
         msec: 752
-        hash: "df26a23d394e053417de86309683c5e0"
+        hash: "2eb5de2524ad38e1dcd44d89b115e75a"
     }
     Frame {
         msec: 768
-        hash: "411594a1ed7c351cb872e0a6f3081b1b"
+        hash: "8b39e542908051b0ab8fbf3cd36f3be9"
     }
     Frame {
         msec: 784
-        hash: "b4b639f204cfed9e1fec872e4de115c2"
+        hash: "a447e9d7c87c90633dcfc550fcf04ff6"
     }
     Frame {
         msec: 800
-        hash: "4d801e2f4848399c011d60264720b912"
+        hash: "c3d1e7753b592bc0d0c3169e3cf08bb7"
     }
     Frame {
         msec: 816
-        hash: "4f28c7b154853ff78cdefb5a5ac9d2b7"
+        hash: "fb20ccb3b36798835fbc1d529a7424ea"
     }
     Frame {
         msec: 832
-        hash: "cc6d4283b0d7bf9f579637575d5e1fef"
+        hash: "ff253670ae78826250b9612cf2a2e1a4"
     }
     Frame {
         msec: 848
-        hash: "8edc371d23d01be547990074b5e640af"
+        hash: "45fb7f71debd3b61062a4165c04c0637"
     }
     Frame {
         msec: 864
-        hash: "874845d7178e6cd8369f21379060f561"
+        hash: "a1542b5bc5e65cdb3f8775cf21b54429"
     }
     Frame {
         msec: 880
-        hash: "98fb6d79990775385603fb1a50ab5186"
+        hash: "a146b5b88875e4148658dd55e162d6f4"
     }
     Frame {
         msec: 896
-        hash: "d15539efc27baabb5a74f464b152d266"
+        hash: "94222050206925d4c9b38da03125cc0c"
     }
     Frame {
         msec: 912
-        hash: "fc44d091d6689e8870162a6d29b6d287"
+        hash: "71a63ace8450029b968723cfa684330c"
     }
     Frame {
         msec: 928
-        hash: "a3c964f4bf524e22092b1650df43375a"
+        hash: "14e4d2af07146133c6a0e87391747c6a"
     }
     Frame {
         msec: 944
-        hash: "ca203fd630ec1eadea37cf36bd30ba40"
+        hash: "e380593e219531620dbca0a8131b4f13"
     }
     Frame {
         msec: 960
@@ -246,239 +246,239 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "2e0630818c04fc6c259eec8561c645cd"
+        hash: "2b33354b9e53eae7ebd5996ae0350773"
     }
     Frame {
         msec: 992
-        hash: "a7b1f6305ddcf4a338e1a96ea31a5341"
+        hash: "0d2871475891f96e1cc4150cbe725d46"
     }
     Frame {
         msec: 1008
-        hash: "23a5013a8f9407d06ac6fd0c1e961743"
+        hash: "b6d064a26c282ce4fd8cba48de0a0f7b"
     }
     Frame {
         msec: 1024
-        hash: "9de73decddaab4269bd33efdb21278a3"
+        hash: "9ad67d9833d749b2b8158abb3076357b"
     }
     Frame {
         msec: 1040
-        hash: "7582c26b45dd11c262f51b387af89cb2"
+        hash: "ce86624a1e055fdb4711dd73be31dc42"
     }
     Frame {
         msec: 1056
-        hash: "650e0d395f1d1f2ddda8711089d85511"
+        hash: "a2c6fc81e1f02477f6ad084acaf12b0d"
     }
     Frame {
         msec: 1072
-        hash: "9ff84e81219aa6bb7ab534b2a47a3930"
+        hash: "bab24924a5ac4cd45c1fa7b5e4ff3efe"
     }
     Frame {
         msec: 1088
-        hash: "11e255273e8ca4716047fb52636f0c3e"
+        hash: "8c8fd3b9cc257dab84df8e88a3e7a001"
     }
     Frame {
         msec: 1104
-        hash: "b2fcbefd13db3c765183b1eefc2ca0bc"
+        hash: "a3f9936dc4e3161d9db1fa39267cda4d"
     }
     Frame {
         msec: 1120
-        hash: "7150aff523c0d480702f6a326699cb65"
+        hash: "d6669c8a47077f665a93587ea3cafe6e"
     }
     Frame {
         msec: 1136
-        hash: "63886c15107a2a7d639069cd81c3cd07"
+        hash: "601dbd220a7f312d4343323ae99e21ee"
     }
     Frame {
         msec: 1152
-        hash: "1ec1fc30bbb5f43a1d6d36bce345f569"
+        hash: "722411ffc1d6740caed9bf1231bc54ba"
     }
     Frame {
         msec: 1168
-        hash: "34060cbc31ce1fbf406cbb595312c609"
+        hash: "cb3bd6f5ee770399e21a07e56dcf28ef"
     }
     Frame {
         msec: 1184
-        hash: "6f3a04c7f411785956e640aa630f7ac4"
+        hash: "1819d6719e6b56b3e673dacf1865272e"
     }
     Frame {
         msec: 1200
-        hash: "d7bdb7e170b6f193eaf4b07c01b4dc6b"
+        hash: "6b6532937a3e37df28b3939cbadc4741"
     }
     Frame {
         msec: 1216
-        hash: "6ca02c0d9cfeb4b1932f7ad1feac9850"
+        hash: "8a065d54600e9ae3c7958f7b71d8432d"
     }
     Frame {
         msec: 1232
-        hash: "d446c7b185361de5c615a17ac1fee607"
+        hash: "2259806ac264b292f5701f34ffac5c35"
     }
     Frame {
         msec: 1248
-        hash: "bc2faf5b7b2972f155954e4e685e80ae"
+        hash: "e4b2a6440df9141616f89cbb6a6ba0aa"
     }
     Frame {
         msec: 1264
-        hash: "2bf26cedc76aea4a6d9744b7dd935db8"
+        hash: "034b74fe5327909214bb5a6e3084edf2"
     }
     Frame {
         msec: 1280
-        hash: "accbee9d0f8cf73ef72aa7bfb49b3fa5"
+        hash: "976fd9bc54baefe8d71002a22706052a"
     }
     Frame {
         msec: 1296
-        hash: "933eb2e46f42e212bdfc515d30f663d3"
+        hash: "45138388ebc6ec44a205934475907b25"
     }
     Frame {
         msec: 1312
-        hash: "7495318c893dbb22771b53e93c7614e8"
+        hash: "01edec5ae6e33b49baee2abe2a59ad7d"
     }
     Frame {
         msec: 1328
-        hash: "894fe23c1b3543451293c047b640c4bb"
+        hash: "9a89ff95df027e53827c5554a28e05a8"
     }
     Frame {
         msec: 1344
-        hash: "9b7179ef059ee82ca4a383f536f47a42"
+        hash: "8d1cd8a1181b7320990b7348b424ce4b"
     }
     Frame {
         msec: 1360
-        hash: "5ec1a5bfac2473efdcad7dba0da4015c"
+        hash: "2366d1ee0c0740f0d19fe2ce1acfe4c3"
     }
     Frame {
         msec: 1376
-        hash: "2bd64528e83260a80e7f2843e2c34a19"
+        hash: "071988963ab2d1a53243e0f6837fecb0"
     }
     Frame {
         msec: 1392
-        hash: "16bf64a9bf6b4bc09b108c65d074b5f2"
+        hash: "20f1e8adef04cea6bcd1511ac47a7922"
     }
     Frame {
         msec: 1408
-        hash: "c33eaa717ba63655f375499058b1be55"
+        hash: "2241def30a3ef54ea82e5fa2b1ef5997"
     }
     Frame {
         msec: 1424
-        hash: "d080f4591f9fd59745bf850525590849"
+        hash: "15365370ac6859f1bfc76e96e603c417"
     }
     Frame {
         msec: 1440
-        hash: "921585c88ec133c83c07650745bb4441"
+        hash: "45edcbeb23c88f62982f9af9a4647f4c"
     }
     Frame {
         msec: 1456
-        hash: "f037b28137b22a0c91fc71fc6626475a"
+        hash: "b7a9c7c44e6f9ff5132d1ad3f6137dc8"
     }
     Frame {
         msec: 1472
-        hash: "e10b3c432a230d5509c2fa7df48b56c9"
+        hash: "8a55b85fdd63ac63c1a566a5c4d92a04"
     }
     Frame {
         msec: 1488
-        hash: "ac02c7b7e68ee8cfad1fe556020e93d8"
+        hash: "e1973b7d557dec08e6375feefb56db47"
     }
     Frame {
         msec: 1504
-        hash: "12d59e70dedfa0c741afed9b98cb9a3a"
+        hash: "a321445212e561de4262228482b0edbe"
     }
     Frame {
         msec: 1520
-        hash: "a9aa635ccde26829d7e1cdc29fcce8d1"
+        hash: "a2c787a576e1f85561c08330b6801e98"
     }
     Frame {
         msec: 1536
-        hash: "f571b3da827b884ad036dade8ad2fe37"
+        hash: "ba84070f0081d4c7a08ebc3204d9aebf"
     }
     Frame {
         msec: 1552
-        hash: "1ffa8d7512e9001cbc78b28451133b44"
+        hash: "4b82a6908ed0caf3cbfd9dc9211ec69a"
     }
     Frame {
         msec: 1568
-        hash: "2ef4b10f2eafd71dfde15f7f00e923c6"
+        hash: "a1dc7c4ad596fc005cf3077ee78406e1"
     }
     Frame {
         msec: 1584
-        hash: "09b3bc232a134eae5ae14c0336f508ba"
+        hash: "53d76884202d4b9ce3874db796705b80"
     }
     Frame {
         msec: 1600
-        hash: "ebadb5c6b4986c865f7f8ef232680b7e"
+        hash: "9f24c090531259f9d83ea97e842c4f14"
     }
     Frame {
         msec: 1616
-        hash: "26621991073510e9a95e3b208e3ee56e"
+        hash: "541c81585a781bab82d4ee95b9f844ff"
     }
     Frame {
         msec: 1632
-        hash: "f18e97f13c06f3c5368edf851f19f401"
+        hash: "73e15141e6c6bfba4a2c820ba96e3f6e"
     }
     Frame {
         msec: 1648
-        hash: "3c322dbbf5ecfe1de56595dcb7d949e1"
+        hash: "0500129b602ab14925aa09a1d9bee3d0"
     }
     Frame {
         msec: 1664
-        hash: "50058d1bb992a6d0601c9d5490149936"
+        hash: "2d45ba5e0e21430f468332c13ce3ee15"
     }
     Frame {
         msec: 1680
-        hash: "4cc78f56f13478ec21a4a0d6b22f956b"
+        hash: "bafd11c210e683d79ac438c5612503bc"
     }
     Frame {
         msec: 1696
-        hash: "d765cd86560dff3faa5a3c902512c74c"
+        hash: "f968f49e6a0674877c55282e5543edab"
     }
     Frame {
         msec: 1712
-        hash: "ad983068c2149b0c06da3b89a5d94d24"
+        hash: "705307529862a3825a0870b294058825"
     }
     Frame {
         msec: 1728
-        hash: "e6da7260001771fc00c472bccae641fe"
+        hash: "a008a501d1dc16a5ffaee325fdd90816"
     }
     Frame {
         msec: 1744
-        hash: "71778ad8a61ecb0f78f7234ecf0d1d97"
+        hash: "5091621481873738658f4d8543582c62"
     }
     Frame {
         msec: 1760
-        hash: "6b2209ea5f7f17c2cd868986f0c907d9"
+        hash: "141216eeb31b5af4ec247bb930169a7f"
     }
     Frame {
         msec: 1776
-        hash: "6513c82829ef7e7c9461dcf5b50f675f"
+        hash: "bfb203e39ab0a9837fc5b9c9b49d9580"
     }
     Frame {
         msec: 1792
-        hash: "0172c5bdf96c8bceab25a6c82bdbe527"
+        hash: "1f2704480af7dd2bb382d13450f34755"
     }
     Frame {
         msec: 1808
-        hash: "64b53bf1c1988d3a799b564089f8e63f"
+        hash: "f3182da7f6202250a6cc2de3e43fcf87"
     }
     Frame {
         msec: 1824
-        hash: "a1bdea4771ec9719cfe88f4e827bd005"
+        hash: "6fa500f5ff387c5801186fb7eced96f4"
     }
     Frame {
         msec: 1840
-        hash: "263de376cee2ba7701a7ca116bc1be81"
+        hash: "1874d59911d70daf098cd053da69127b"
     }
     Frame {
         msec: 1856
-        hash: "9795dada7f09d7d4d40df858dea8bc70"
+        hash: "52a7bcb9a18e8d4a24c2617124b7961b"
     }
     Frame {
         msec: 1872
-        hash: "85ea4c63fc31f79423cb509f6c6d4faa"
+        hash: "f3a7dd26aa4177dbee02d52df664c751"
     }
     Frame {
         msec: 1888
-        hash: "c86d8c4460d1e3c2f26b723dc628fe84"
+        hash: "5180db29e325f00c3940b6a7b8eb8a8e"
     }
     Frame {
         msec: 1904
-        hash: "6bf6ef1fd377bfcf0b93baa7f28e1d3d"
+        hash: "eab16b6ef76e627eff492cdf5d5da9e2"
     }
     Frame {
         msec: 1920
@@ -486,239 +486,239 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "57b8a48bed9375b74391950c28e611da"
+        hash: "00743f1dceb5d0351a67a237bcf1985b"
     }
     Frame {
         msec: 1952
-        hash: "70203655bc832998529071d7f665ecbe"
+        hash: "85ecf35d439bd4129f8780d8ee561dfb"
     }
     Frame {
         msec: 1968
-        hash: "9ab9808d495f907a255d85fbd82491e2"
+        hash: "785d712b57b3ec4cee6b9e2fcfa1b775"
     }
     Frame {
         msec: 1984
-        hash: "297570136b058ba43e883b0aef20d82f"
+        hash: "77906acfafec6ab595e8dad00373f953"
     }
     Frame {
         msec: 2000
-        hash: "0c2f15ce83e2d961ec36299b13890709"
+        hash: "33722e5c66ee6dfc87ca62a53590969e"
     }
     Frame {
         msec: 2016
-        hash: "6d57b6dcb1dbfa35245d79ef36ca49b2"
+        hash: "7bd3d9e36789b3456c5e098d02341ce3"
     }
     Frame {
         msec: 2032
-        hash: "12a71804fd71991706d8a39b676d1628"
+        hash: "be4af661ca19ca607acf0d8949b58c26"
     }
     Frame {
         msec: 2048
-        hash: "f6a9e1b0b498fc576f3eadeb86c08fe9"
+        hash: "e249df985887229664d3c61c7b01d2ef"
     }
     Frame {
         msec: 2064
-        hash: "051c2ed34cbef82d44aec4841a33f086"
+        hash: "541a01af440e81c7b20fa9df0e85f5f9"
     }
     Frame {
         msec: 2080
-        hash: "12b89590b20fff8d6c94dde40a5d6185"
+        hash: "3579e5a3ab93b8c9998ef812f43ba158"
     }
     Frame {
         msec: 2096
-        hash: "7a29cd11ddb042203465a9522ff951ce"
+        hash: "c2902c8068a48788e5511d2987191181"
     }
     Frame {
         msec: 2112
-        hash: "4853f364261ab8e1c9d35cfe42efb385"
+        hash: "3fc7d417d13cbccbff81c0630cf968f3"
     }
     Frame {
         msec: 2128
-        hash: "7149ab3ed649cac9cf662be7c434056f"
+        hash: "5507fabe77585c38b2929e2565cd8e9d"
     }
     Frame {
         msec: 2144
-        hash: "bbe199700474dda156355d31ac09be39"
+        hash: "73f6a9a1602929b80ba28ac2c8095a95"
     }
     Frame {
         msec: 2160
-        hash: "a3f3fbbe844b8c6fb8cb8bbcc17120e3"
+        hash: "3377ee6818f1fbf15cfe2916ef7328ed"
     }
     Frame {
         msec: 2176
-        hash: "e9a04cfe9e8c50f74978fbd4ecce536a"
+        hash: "4bea4237a5044b9ffbe9815b877a5b96"
     }
     Frame {
         msec: 2192
-        hash: "0df1d4211f770cdd7b8a98ea476c6f42"
+        hash: "f25dadf7b916625f120d3b5fc1602d0d"
     }
     Frame {
         msec: 2208
-        hash: "a6837afb43663b9473db2378b1a9f989"
+        hash: "ba095d86b7ecc9e2ca6c5d6567d6debf"
     }
     Frame {
         msec: 2224
-        hash: "691ea67f3b84b8dda449c2a8e86b1087"
+        hash: "296129caee6a9526aa2c6071fb07198c"
     }
     Frame {
         msec: 2240
-        hash: "16d18947637c63662b9a502c493f06ec"
+        hash: "42abe26548e9eb7a2c63aea7f349808c"
     }
     Frame {
         msec: 2256
-        hash: "8f9207d404da08706e150f3b64d0088d"
+        hash: "2d187394342584568aa24353233f67f7"
     }
     Frame {
         msec: 2272
-        hash: "48ad430e38cdc34845a834cfb9ea70ef"
+        hash: "5c4047c8ca78103d443f9058f3ec3237"
     }
     Frame {
         msec: 2288
-        hash: "1252cfb294ae99c40b03dd021160553f"
+        hash: "05af8a131ec98b5bc60669bfcdee9a16"
     }
     Frame {
         msec: 2304
-        hash: "b1d5e752fbe03c95ee0dc7bbdf6fb9f6"
+        hash: "b486a796a74962d6b5a4e928ff9e6a2d"
     }
     Frame {
         msec: 2320
-        hash: "2282cb42ef0c812ba27e33ed0f962a84"
+        hash: "8bfa5cc3edf294a728bae51014733230"
     }
     Frame {
         msec: 2336
-        hash: "42fc82c8d40d383b3cf31a741a4358c5"
+        hash: "fb5928a74d75f7eb23ed914e12ea2dba"
     }
     Frame {
         msec: 2352
-        hash: "368c1ffa2deb1911929f1769e31c8017"
+        hash: "16c83f70c3559e97c4a28df7e8b94d95"
     }
     Frame {
         msec: 2368
-        hash: "8693bdbde404e36970943ac6b650ca00"
+        hash: "a7f926210d56dc368c99da12a27db42e"
     }
     Frame {
         msec: 2384
-        hash: "57609613c336029b60da428d48842a4e"
+        hash: "9f235f259af00126a3fc2417d399dee6"
     }
     Frame {
         msec: 2400
-        hash: "b61dafe9e87421d3fcf8cb9ff0e7a41b"
+        hash: "2397c99cc1697303bad9fbd029ee63a3"
     }
     Frame {
         msec: 2416
-        hash: "c8c34d1d82bef418ef97f52cb9773cf4"
+        hash: "b83a021c82c203d6cf690edd5fd98c89"
     }
     Frame {
         msec: 2432
-        hash: "aa756c09717dc02e81e76511b4c58f60"
+        hash: "4e9e74f8b115b69b593f0233f9431258"
     }
     Frame {
         msec: 2448
-        hash: "96e75c5ce1b5393f6cc46fbbe0a67689"
+        hash: "2d8f24eea1e87691eb2292bd01756498"
     }
     Frame {
         msec: 2464
-        hash: "fb5febae411f43a6cd218b03b36f5018"
+        hash: "bad7ffbfe4feac5e7a13a70c8096ddab"
     }
     Frame {
         msec: 2480
-        hash: "889870fa67784261e7b73b7d0a53324e"
+        hash: "6869d23bf601c67593f23402023f931d"
     }
     Frame {
         msec: 2496
-        hash: "fb124d4ebee6457f2137f07954619912"
+        hash: "6e4846623fe8b4a1c850729620cd7502"
     }
     Frame {
         msec: 2512
-        hash: "258ae87f78805c555e0ed802c5123eeb"
+        hash: "f679d87f206ca71de191f3991c13f4b0"
     }
     Frame {
         msec: 2528
-        hash: "2e730872c37f118a03864d23ebf7bab3"
+        hash: "7f503ceda23f0e4718f6216c3b4ddef7"
     }
     Frame {
         msec: 2544
-        hash: "381386302f210932bc7d44247a48f13c"
+        hash: "69f01285109c21cbd32a0f17942734be"
     }
     Frame {
         msec: 2560
-        hash: "306f8e6d183eb080da3375d65f2491f0"
+        hash: "f2060324802c080703ff62c051c7cff2"
     }
     Frame {
         msec: 2576
-        hash: "39862f236aabf362d0a07ba64eb212e1"
+        hash: "45d01b58f0812596aff06a09c1167d83"
     }
     Frame {
         msec: 2592
-        hash: "57452ecfea80ebd4d9fd23f8efbb34f2"
+        hash: "688c9931abdaa7225da91cdf7f2beb48"
     }
     Frame {
         msec: 2608
-        hash: "64bd12d4f6e32f19abef79289673c2fe"
+        hash: "d522505f28615cc17206ca6099dbd83e"
     }
     Frame {
         msec: 2624
-        hash: "56340d636f4df7e5f68e84c1d8388429"
+        hash: "ad86d8cee90c1458b64318f3edd94aee"
     }
     Frame {
         msec: 2640
-        hash: "795cd97d4be294fa6157f23793861ec3"
+        hash: "6dda1a6359b421ef7c9ffa4ecd863341"
     }
     Frame {
         msec: 2656
-        hash: "4be9fd5314ad6721a0ddf5a5dc51ccee"
+        hash: "dcc388cdf2b87e10b07e2f05ab6dce3c"
     }
     Frame {
         msec: 2672
-        hash: "3349b775c329db022bf0414b9ed57466"
+        hash: "a5d64264be7778929116c9407548c7f8"
     }
     Frame {
         msec: 2688
-        hash: "587b7070836063f9d138c4a4ee8da8bb"
+        hash: "cc7ac18a25936825d42694a9022b73fa"
     }
     Frame {
         msec: 2704
-        hash: "5bb078819bef7695c9af1bd4b544a26a"
+        hash: "4423af95764aadbaffe3c608fb3a376b"
     }
     Frame {
         msec: 2720
-        hash: "799c05999713e8b29f7d2917f515d2c2"
+        hash: "ad186cd5735531e2e6bfb2fc387dee2d"
     }
     Frame {
         msec: 2736
-        hash: "41bb926661acd8e21300f4933734748a"
+        hash: "d0e7c8071350bac03cf06996b6f74a63"
     }
     Frame {
         msec: 2752
-        hash: "2ead23d38a2f1834c7688a9657d9d7cc"
+        hash: "d012311c64fb35717155ebc88f9940d6"
     }
     Frame {
         msec: 2768
-        hash: "196309eac81adea21630dda19947ef5e"
+        hash: "13111334420c479b6a3ddbde65e2d143"
     }
     Frame {
         msec: 2784
-        hash: "cf414b2004712581f11f27890745c761"
+        hash: "3a77939f35498ef91590cd57c534fb6a"
     }
     Frame {
         msec: 2800
-        hash: "6b2a6837da878fa8f3811b2045e098b1"
+        hash: "89cbc568600c18c3d7163c3079a3f584"
     }
     Frame {
         msec: 2816
-        hash: "7390cfdef1d4bc194b86854b1947f15d"
+        hash: "2a8db5a4cae5258578749a88fbf915ce"
     }
     Frame {
         msec: 2832
-        hash: "9e4543fcf65a56edfbcaf46805343071"
+        hash: "ddd9cef18ce748096869dae9c2e23de3"
     }
     Frame {
         msec: 2848
-        hash: "3a886e2ed813eb7d44d0cd67eb5dee31"
+        hash: "d9e213af096ce69f75863ed7c39b59f4"
     }
     Frame {
         msec: 2864
-        hash: "625baed6cbf3a58b32060810be53d0b6"
+        hash: "69e9bfa09b8f5a1e2d83b77a5c9bc374"
     }
     Frame {
         msec: 2880
@@ -726,50 +726,50 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "484666ad104cee644c6a7e8ec0c4b10e"
+        hash: "449168c60d6c9f04c94b3c48f27de7ff"
     }
     Frame {
         msec: 2912
-        hash: "41abe2e2d92b293407141d0333d7d04a"
+        hash: "e60ed277794737b9f5d8c4a575f5b300"
     }
     Frame {
         msec: 2928
-        hash: "953c03834bd3b50798b77c0c6bb0f4a8"
+        hash: "5c1a39fa9789064ff0d5ea1fd4c6d187"
     }
     Frame {
         msec: 2944
-        hash: "a076463868003c62df3ee5147ffd4660"
+        hash: "64c1593bf33b85593153ac9eeeb7793e"
     }
     Frame {
         msec: 2960
-        hash: "b389b5c9ed31816dd562a8f1332d28c9"
+        hash: "dab7df26ba23ed3e750fa6080916f177"
     }
     Frame {
         msec: 2976
-        hash: "246706829939a2619d64fad63e424fdb"
+        hash: "5958428d5ab5a379f9bbcc0f86c20d1b"
     }
     Frame {
         msec: 2992
-        hash: "d5e644f16bde52c566191a054a1279e5"
+        hash: "65929536b7b8b48958fab7bd1e3ccca5"
     }
     Frame {
         msec: 3008
-        hash: "10b2e99d2e08939b75c24a6bbf481858"
+        hash: "cb157ba8c58bb7a8ec357e83e82ab441"
     }
     Frame {
         msec: 3024
-        hash: "732a7bb0009f394f0039e09594362c75"
+        hash: "bf36b7c52a3b3b2fb08524131bb4b9e2"
     }
     Frame {
         msec: 3040
-        hash: "261f38ce42a8a8c86daadd497ecfad07"
+        hash: "0d2dbb3ba42cad9e8b5833c97dd0cdba"
     }
     Frame {
         msec: 3056
-        hash: "8b66ae6261db386d6c4e88d0146db090"
+        hash: "f918a9f5fa6808b545c715dffa2f4838"
     }
     Frame {
         msec: 3072
-        hash: "dc8dba79e4466059c29725084cf801bb"
+        hash: "ec11344fb21ee06df6cface390d611d9"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
index b36a220..78ba061 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
@@ -4,31 +4,31 @@ import Qt.labs.particles 1.0
 Rectangle {
     width: 640; height: 480; color: "black"
 
-    Particles { id:particlesAnotEmitting
+    Particles { id:particlesAneverEmitting
         y:60; width: 260; height:30; source: "star.png";
         lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
         velocity:30; velocityDeviation:10; emissionRate: 0
         ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
     }
-    Particles { id:particlesA
+    Particles { id:particlesA //snowy particles from the top
         y:0; width: 260; height:30; source: "star.png";
         lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
         velocity:30; velocityDeviation:10; emissionRate: 10
         ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
     }
 
-    Particles { id:particlesB
+    Particles { id:particlesB //particle fountain bursting every second
         y:280; x:180; width:1; height:1; lifeSpan:1000; source: "star.png"
         count: 100; angle:270; angleDeviation:45; velocity:50; velocityDeviation:30;
         emissionRate: 0
         ParticleMotionGravity { yattractor: 1000; xattractor:0; acceleration:25 }
     }
 
-        Timer { running: true; interval: 1000; repeat: true; onTriggered: particlesB.burst(200, 2000); }
+    Timer { running: true; interval: 1000; repeat: true; onTriggered: particlesB.burst(200, 2000); }
 
     Column{
         x: 340;
-        Repeater{
+        Repeater{//emission variance test
             model: 5
             delegate: Component{
                 Item{
-- 
cgit v0.12


From cbeda35432a347851f9ff842403c168ee742eff7 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 11:53:15 +1000
Subject: Update visuals for qdeclarativepathview visual tests

The only difference appears to be a change to the flicking parameters,
so the test is still valid.

Task-number: QTBUG-14792
---
 .../data/test-pathview-2.0.png                     | Bin 2263 -> 2270 bytes
 .../data/test-pathview-2.1.png                     | Bin 2329 -> 2332 bytes
 .../data/test-pathview-2.2.png                     | Bin 2279 -> 2354 bytes
 .../data/test-pathview-2.3.png                     | Bin 2263 -> 2280 bytes
 .../data/test-pathview-2.4.png                     | Bin 2263 -> 2280 bytes
 .../data/test-pathview-2.5.png                     | Bin 2308 -> 2311 bytes
 .../data/test-pathview-2.6.png                     | Bin 2280 -> 2286 bytes
 .../qdeclarativepathview/data/test-pathview-2.qml  | 894 ++++++++++-----------
 .../qdeclarativepathview/data/test-pathview.0.png  | Bin 2412 -> 2412 bytes
 .../qdeclarativepathview/data/test-pathview.1.png  | Bin 2443 -> 2373 bytes
 .../qdeclarativepathview/data/test-pathview.2.png  | Bin 2398 -> 2404 bytes
 .../qdeclarativepathview/data/test-pathview.3.png  | Bin 2390 -> 2390 bytes
 .../qdeclarativepathview/data/test-pathview.4.png  | Bin 2416 -> 2416 bytes
 .../qdeclarativepathview/data/test-pathview.5.png  | Bin 2395 -> 2395 bytes
 .../qdeclarativepathview/data/test-pathview.qml    | 264 +++---
 .../qdeclarativepathview/test-pathview.qml         |   2 +-
 16 files changed, 580 insertions(+), 580 deletions(-)

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.0.png
index 18c8a9e..3e1a92d 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.1.png
index e86acb4..8658d7d 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.2.png
index 17990b7..f1a56d7 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.3.png
index 18c8a9e..e1eaebf 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.4.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.4.png
index 18c8a9e..e1eaebf 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.5.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.5.png
index 8636f8f..06e7d18 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.6.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.6.png
index fa7c4b6..2c6c5f9 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.qml
index 54ef858..e3baa4d 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 32
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 48
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 64
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 80
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 96
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 112
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 128
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 144
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 160
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 176
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 192
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 208
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 224
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 240
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 256
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 272
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 288
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 304
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 320
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 336
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 352
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 368
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 384
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 400
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 416
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 432
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 448
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 464
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 480
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 496
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 512
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 528
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 544
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 560
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 576
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 592
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 608
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 624
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 640
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 656
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 672
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 688
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 704
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 720
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 736
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 752
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 768
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 784
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 800
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 816
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 832
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 848
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 864
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 880
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 896
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 912
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 928
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 944
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 960
@@ -246,23 +246,23 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 992
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 1008
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 1024
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Frame {
         msec: 1040
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Mouse {
         type: 2
@@ -274,7 +274,7 @@ VisualTest {
     }
     Frame {
         msec: 1056
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Mouse {
         type: 5
@@ -286,7 +286,7 @@ VisualTest {
     }
     Frame {
         msec: 1072
-        hash: "1ed6fa56736cf7cb2f99b5d362974463"
+        hash: "cffe9de189a5c9bed3d98f8803b47212"
     }
     Mouse {
         type: 5
@@ -298,7 +298,7 @@ VisualTest {
     }
     Frame {
         msec: 1088
-        hash: "24f3dd6c49dd8b19cd0c387409405e18"
+        hash: "e8c46deb6b5f5739e4b95d53619e9314"
     }
     Mouse {
         type: 5
@@ -310,7 +310,7 @@ VisualTest {
     }
     Frame {
         msec: 1104
-        hash: "08c828e7fdfba4252fa7a9fb06eb728e"
+        hash: "11d19a126669227211f399d262bfd8bd"
     }
     Mouse {
         type: 5
@@ -322,7 +322,7 @@ VisualTest {
     }
     Frame {
         msec: 1120
-        hash: "b76110faf8520f52128b5e1af8f2b838"
+        hash: "46d81424418241d7dd98c581491c08c7"
     }
     Mouse {
         type: 5
@@ -334,7 +334,7 @@ VisualTest {
     }
     Frame {
         msec: 1136
-        hash: "5f56acb5f39ac291cc8e73c0268df214"
+        hash: "8674dba6282cd9dd6ca31442f7f996e2"
     }
     Mouse {
         type: 5
@@ -346,7 +346,7 @@ VisualTest {
     }
     Frame {
         msec: 1152
-        hash: "840ee0c0d8ea94e22e783a15687f979d"
+        hash: "efc9e337337267c43b865f33c8912c4c"
     }
     Mouse {
         type: 5
@@ -358,7 +358,7 @@ VisualTest {
     }
     Frame {
         msec: 1168
-        hash: "69827007bbdf5a360ccc34a016315113"
+        hash: "b3fd11ff8cf16bad9fd7e1329add6029"
     }
     Mouse {
         type: 5
@@ -370,7 +370,7 @@ VisualTest {
     }
     Frame {
         msec: 1184
-        hash: "2437beb8f9cb39b125611fb186bad820"
+        hash: "3be61bd51ca152965c0e789a7587fe98"
     }
     Mouse {
         type: 5
@@ -390,183 +390,183 @@ VisualTest {
     }
     Frame {
         msec: 1200
-        hash: "df07c389b26fc191234c70b97bfaa432"
+        hash: "9b02fac96198b587d59b10ddc021dfca"
     }
     Frame {
         msec: 1216
-        hash: "8d4e23f4e91d0e0df9d87c3171d5971f"
+        hash: "505b19e66a416012cc10125381b3e012"
     }
     Frame {
         msec: 1232
-        hash: "dd79837aefeabffa7184be07f2a98969"
+        hash: "eff92d7a9b0962067d5ef97e86a23c07"
     }
     Frame {
         msec: 1248
-        hash: "2d9bb2aaf4b882902f090ff0c89053c8"
+        hash: "74f48d40be0dd93988d01aa18f26ae96"
     }
     Frame {
         msec: 1264
-        hash: "b1ec9adbb026d8002a7f16fe9a8d56d2"
+        hash: "1f8608199813f9c54c426f59290089fa"
     }
     Frame {
         msec: 1280
-        hash: "43b23d6e1aeeb36350c3530650e9156f"
+        hash: "8b4e68ab41bf4e0e23d86c7f99ff11a5"
     }
     Frame {
         msec: 1296
-        hash: "03f231597c4d5010ee71c74217f2483d"
+        hash: "00180bb46496f5b10350071a7f0e1f85"
     }
     Frame {
         msec: 1312
-        hash: "8607c7412a5a1b4ea1522f28c465a83e"
+        hash: "d966232acbb1ecf2339a1df02642dd9e"
     }
     Frame {
         msec: 1328
-        hash: "671e80e290bec997eb36320ff76fdccf"
+        hash: "0235a7aa18d390099e6934971354f878"
     }
     Frame {
         msec: 1344
-        hash: "5f6717112bd45e5ebe194e0f87d12be6"
+        hash: "136159dc7d4775e108c4738b7c1bcc86"
     }
     Frame {
         msec: 1360
-        hash: "ca8e33c7a5428d70ae13cb64e5098a48"
+        hash: "e976f2c7ef3d61c2e200fcc849e9f4cd"
     }
     Frame {
         msec: 1376
-        hash: "86e60eb395f66bbaa1ec07b3e07013c0"
+        hash: "09181b465a9d228006e827b56ec83c1d"
     }
     Frame {
         msec: 1392
-        hash: "342fa6ddc02d0a793e97a79ba8882415"
+        hash: "8b3f884ac343f1272e3d3af6b2b4d875"
     }
     Frame {
         msec: 1408
-        hash: "a907fbcc47807d4eb6d66e070ea7f2de"
+        hash: "419ffc2f8685ea8d1e5232c4440b2d96"
     }
     Frame {
         msec: 1424
-        hash: "04838f8b495bed6d050cbe54d00aad31"
+        hash: "105b3cc7c5b8f07e90a3c3aaa9d78ce7"
     }
     Frame {
         msec: 1440
-        hash: "d485534916473ea6c4612230c5a95421"
+        hash: "6005de2db98dfd9cb8e3cb42a668a6bd"
     }
     Frame {
         msec: 1456
-        hash: "1d3da7cc5b9120724645558584f2f0f3"
+        hash: "2bae12b6d577965a3cd24bb05c4f5e44"
     }
     Frame {
         msec: 1472
-        hash: "c271f057d5f1745e910b2b407c52a4f3"
+        hash: "e74db37aedd78bf1765d0a3b4ed89023"
     }
     Frame {
         msec: 1488
-        hash: "050d1814a9ced514db6cfd2732eb76be"
+        hash: "49511dcf43ce2dbbe4fbafb461189e72"
     }
     Frame {
         msec: 1504
-        hash: "cfcd21aadfe3fd611caad83920fb2432"
+        hash: "21183bde6a5cb1d9769e01630e1b593a"
     }
     Frame {
         msec: 1520
-        hash: "472f900ef8eef74522da3338ce7fa93e"
+        hash: "15bef0512513a0bdef002a4af5e1b3d3"
     }
     Frame {
         msec: 1536
-        hash: "f9d892a81c6ba3b9fc4c6e76082d4fa7"
+        hash: "d46944a859d8be8c3371bf719ffe6251"
     }
     Frame {
         msec: 1552
-        hash: "a3febe1c3c4585e25a410a91cc34c1fa"
+        hash: "2a5249bc1e0eba408654d6500fe22e6f"
     }
     Frame {
         msec: 1568
-        hash: "74cd765c9d9a6fb243070b4a56a07e87"
+        hash: "df860d60c47ea0eae7ed917ce1cd0578"
     }
     Frame {
         msec: 1584
-        hash: "469d324abbef017a99bc587bfae622b3"
+        hash: "90bfd7e58c63e7e2ad647d37a597c084"
     }
     Frame {
         msec: 1600
-        hash: "6054ff6e658f0a5f5e313f0a724d9610"
+        hash: "a400250799ca74b0de5fa0b00ea54223"
     }
     Frame {
         msec: 1616
-        hash: "67cee7ebe428c9d35f1f28274f3049d5"
+        hash: "1943506235c641ee444394b2bf48f2ea"
     }
     Frame {
         msec: 1632
-        hash: "ce6c3a1dd726eacbba6306e56121beef"
+        hash: "ac9dd2d323a513f6cf729890b5b6dccc"
     }
     Frame {
         msec: 1648
-        hash: "a7d5f703c98c0c8cd32b189a79e1fd05"
+        hash: "029cbaec81f7e1251d8de63b8011f06e"
     }
     Frame {
         msec: 1664
-        hash: "41cfd9982767ba904843fb73a5a0ed71"
+        hash: "c0cf823c09a96cf8b6ac063a87f1e5ed"
     }
     Frame {
         msec: 1680
-        hash: "388dcde17a820800237d1185372d889f"
+        hash: "9ed0e1fef6937f5e05b6647b0fb9d534"
     }
     Frame {
         msec: 1696
-        hash: "3bd72585388f04d55900ccd345cd576e"
+        hash: "61b878c5c6db407032c6abb76e49e1b2"
     }
     Frame {
         msec: 1712
-        hash: "0e5c63b066f2b70000eca7f3aaa3a195"
+        hash: "b842458ea2b17501f089c9b5cdd15cc4"
     }
     Frame {
         msec: 1728
-        hash: "15199f3e9f00afc76279b5bbffb78d92"
+        hash: "8a308f9048be4323eb82229b2bcdfbe2"
     }
     Frame {
         msec: 1744
-        hash: "596ad681a3b96afbc284e3af5fd173cb"
+        hash: "5a4e29c2d768a3d0ca319ae7406920dd"
     }
     Frame {
         msec: 1760
-        hash: "e5ae2d0245fc5d74c6ea3f7dddd1ca2a"
+        hash: "b96f98a169e700ccf5c77b42e1143d50"
     }
     Frame {
         msec: 1776
-        hash: "0d152716f9ebe5f0fae3f5cabb20630f"
+        hash: "570b2182f63d4eebc2c9d136636c5c7a"
     }
     Frame {
         msec: 1792
-        hash: "74afbfa464b0d19b53432fa4d5ea2804"
+        hash: "df2bb468c032ce62cc23ac3600123649"
     }
     Frame {
         msec: 1808
-        hash: "c8aa3f4738a8c07cdf2450a24c885ce6"
+        hash: "f6579e334ba34bae43c6fa9bae465e32"
     }
     Frame {
         msec: 1824
-        hash: "2e4e0003f1b1cb10593075862b972643"
+        hash: "b6bba71527e894c0520eb840db66fc8a"
     }
     Frame {
         msec: 1840
-        hash: "acea518c7da7330ae78daf5fbfd1a423"
+        hash: "510afb9fd3812786cfdfb82b7131a158"
     }
     Frame {
         msec: 1856
-        hash: "0b8d4ea6947b522c6aa9a32d9f16723e"
+        hash: "13da41ed3e0e071c1645e71a003a8a1d"
     }
     Frame {
         msec: 1872
-        hash: "19f2aef82586817ef574a70865060997"
+        hash: "c09aabd8c11c6124d97793563b274c7a"
     }
     Frame {
         msec: 1888
-        hash: "115565eb0ba3024dbf15d00ed242c389"
+        hash: "34101fd20242b0b48d056f24f21c8939"
     }
     Frame {
         msec: 1904
-        hash: "7e59425c85acf93f5bf55e139c148737"
+        hash: "34f064cb167b85e79a2f113eb430a675"
     }
     Frame {
         msec: 1920
@@ -574,139 +574,139 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "ce96601476cf55f665bef09bb1b038e2"
+        hash: "d50eb3d7eaad3d2a825876dcf1f59d91"
     }
     Frame {
         msec: 1952
-        hash: "dc6eaacefe37fc709ac0bef99110f796"
+        hash: "c0c308b9eb3af4c1af3bc7e197696475"
     }
     Frame {
         msec: 1968
-        hash: "82ad9b84425bd8e385524cb052a8fdd4"
+        hash: "67e630b9f050a64645e276695f3d4932"
     }
     Frame {
         msec: 1984
-        hash: "608000b44ade998e225010d5ea562316"
+        hash: "5bb212885448a7506ee6de766ea80a8a"
     }
     Frame {
         msec: 2000
-        hash: "ec6b4d519b7bafcf5293c2b5e6585007"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2016
-        hash: "9895792ffa929ba6fc600949f11766b6"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2032
-        hash: "0d2b27c9ca22520b269f93c90de08df4"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2048
-        hash: "78a61e4565db709215b419aa56f6efab"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2064
-        hash: "d6f2aebed062d093c00b27a52f0b14b8"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2080
-        hash: "21b7a438ad1e835b84e5576e52abbe84"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2096
-        hash: "703e32f43e9a71b8677d6839a0eafe06"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2112
-        hash: "b04bea8af558de4120723fc5abd0f36c"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2128
-        hash: "ac8e91c3b55e058ce8ff08ad6e3af9b6"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2144
-        hash: "54846c8c70b232d05ff5eaf144f6f7d3"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2160
-        hash: "52281806f5c80512b4bcab7f61139f74"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2176
-        hash: "a352657ff34ef8962162c00647df343a"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2192
-        hash: "3a0b12d1f8bf5cae8ac06289dd30d52a"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2208
-        hash: "2c6bbcd05719f69b9a67be18de2084a6"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2224
-        hash: "ab091484522587412b0e8aceeb8987ce"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2240
-        hash: "13682b0d45bcbad0f011d08899085b1d"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2256
-        hash: "3c5d6f82eafd1b04edfbcbffbdbe2177"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2272
-        hash: "151803d70b7c3327df32c8602fcd677a"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2288
-        hash: "78613cec5364fe3f0df84188793d8eac"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2304
-        hash: "fc05a3cad43af35230c5ba89f6fd13c5"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2320
-        hash: "9f826733b300c89eeb80452129505e8b"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2336
-        hash: "8565efc5c1fb1bdf5629e3bd495bb611"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2352
-        hash: "3b8f6e8c526ab8cce170277c378a5a69"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2368
-        hash: "07db3bc0ab19e0ca829e89558bacf1a1"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2384
-        hash: "ed8843024c6ac28a8c782839b362149c"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2400
-        hash: "381a9f6564c090613aa2cd0476b95210"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2416
-        hash: "c3fabd891fa8e27fd71df175db383667"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2432
-        hash: "9b441792fdaa9ba9d340fc0c6a9c11bd"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2448
-        hash: "3209c9ba69fa016370e3d56e7e1e37a4"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Frame {
         msec: 2464
-        hash: "34da0a01453fbb2571b370257fd35f8e"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Mouse {
         type: 2
@@ -726,7 +726,7 @@ VisualTest {
     }
     Frame {
         msec: 2480
-        hash: "32e6204a07c493d0a0f9f50773fe8f32"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Mouse {
         type: 5
@@ -738,7 +738,7 @@ VisualTest {
     }
     Frame {
         msec: 2496
-        hash: "2a1814768ae500ba9c24bc2e3e4de1d5"
+        hash: "f9ec9b4de5244e58fbba2f6871e4a61b"
     }
     Mouse {
         type: 5
@@ -750,7 +750,7 @@ VisualTest {
     }
     Frame {
         msec: 2512
-        hash: "7cf6e3c52d12d590beafd061979a49cb"
+        hash: "a123e6b06abaa4dda4645bc174edc6ad"
     }
     Mouse {
         type: 5
@@ -770,7 +770,7 @@ VisualTest {
     }
     Frame {
         msec: 2528
-        hash: "c66c36642ab7f6c32b45e27de38d23b6"
+        hash: "a706a48bce5eec7a1d55fec0df8c4d81"
     }
     Mouse {
         type: 5
@@ -782,7 +782,7 @@ VisualTest {
     }
     Frame {
         msec: 2544
-        hash: "6e003380cc6fd303ae3b499863225ba5"
+        hash: "297edbcda96e508dc9d0d977951c015a"
     }
     Mouse {
         type: 5
@@ -794,7 +794,7 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "a790259cea2c247493be58c6018435b9"
+        hash: "7d334b1b7bfe3893473b02b49e2e1bda"
     }
     Mouse {
         type: 5
@@ -814,79 +814,79 @@ VisualTest {
     }
     Frame {
         msec: 2576
-        hash: "e6cce7468a27b5063821df8dbaa15c18"
+        hash: "45ba14d15a8fcac259a06dc85a935f18"
     }
     Frame {
         msec: 2592
-        hash: "ff8386cbe89aeac184f4a75237ef4a14"
+        hash: "0119f472e718a8e6bc59a998c18beb7f"
     }
     Frame {
         msec: 2608
-        hash: "1a11a90853b025837b991be40efb78f8"
+        hash: "fb08ca9960ec17a26dcf27de6474392f"
     }
     Frame {
         msec: 2624
-        hash: "17da10de7e2d2fcf125207e2873bdee8"
+        hash: "b209bd311ce16fa9daf612786b7c5f53"
     }
     Frame {
         msec: 2640
-        hash: "dfbda435d05903cc3a31f4f8f31e8985"
+        hash: "d47eb1544d2c417e5b452df6715efe0e"
     }
     Frame {
         msec: 2656
-        hash: "1f3753e809099f20c6289f150a096935"
+        hash: "caf3eeb521fbd0b5f97e99111d4a2416"
     }
     Frame {
         msec: 2672
-        hash: "9454afc9d70103e1f1c00eb0ad2ca534"
+        hash: "5726e2e19aca222de3ce0125cf1def6c"
     }
     Frame {
         msec: 2688
-        hash: "860ab90e2421a0c8faab304915b5e6f2"
+        hash: "7f2ca733f50390284d90e757788c6c64"
     }
     Frame {
         msec: 2704
-        hash: "600258507426a8c3c89e3591ee9328f1"
+        hash: "72eb5d86be5e9b477abbfbfae78261fc"
     }
     Frame {
         msec: 2720
-        hash: "0795a607b893da2bdc0970195f3039fd"
+        hash: "f0a1dda33df6856a02e5668c6bb45aa2"
     }
     Frame {
         msec: 2736
-        hash: "e300b9109e242d85537fc3f4461eaf8e"
+        hash: "55863490cefc48da96a368b95055ac2b"
     }
     Frame {
         msec: 2752
-        hash: "dbb84b38e2bda694f210f133dc133180"
+        hash: "e01c23ac71fd3906a47b4a969ee592d9"
     }
     Frame {
         msec: 2768
-        hash: "2455e9de47da4db88eef35fea1dc2abe"
+        hash: "b45eb0154d405b49c9f7ea1452601b4e"
     }
     Frame {
         msec: 2784
-        hash: "5f0c3d7e089c921a68813a48f0fd8844"
+        hash: "b5bf040d5dbf4f7cf8c5a0dc3d6aaea1"
     }
     Frame {
         msec: 2800
-        hash: "e6d9e7d0fdc724a6a1804bc94629cab4"
+        hash: "c171c81a12d4971f33154e52f789967a"
     }
     Frame {
         msec: 2816
-        hash: "d177183bcbaa27ad061fd88bd037277d"
+        hash: "fac8265a6d744a11120a0d434821d8b4"
     }
     Frame {
         msec: 2832
-        hash: "78dd13fa6367abd14374462d89a3d066"
+        hash: "2b6b1f9aa8aa32c9e48579d215e31268"
     }
     Frame {
         msec: 2848
-        hash: "41d12e4c362ccc99a1a04b3a09f0e68c"
+        hash: "8455997dc106cd5d386eb3cf3703828c"
     }
     Frame {
         msec: 2864
-        hash: "5112700bf72aacb176e63ef054fce244"
+        hash: "c6525e8ee9c7ac6fa4d0c8d6dd4e1745"
     }
     Frame {
         msec: 2880
@@ -894,239 +894,239 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "0257e67512c62ffc42a272fd304e4ed3"
+        hash: "bc501c449f5d8b7de40b27204c5344a4"
     }
     Frame {
         msec: 2912
-        hash: "42cd0a98aa0f3768cf77aac284072fa9"
+        hash: "fe850b5232c819a9171d0b93aaf5e811"
     }
     Frame {
         msec: 2928
-        hash: "811d27f89b0c434fc49e4280f85c2f27"
+        hash: "a54d819719aeb80392e5b6ffbc25dea0"
     }
     Frame {
         msec: 2944
-        hash: "887406c50c666d08e4d98c040efae9a5"
+        hash: "8479d90984fd9f619b86529231b840fd"
     }
     Frame {
         msec: 2960
-        hash: "27e10fa9d82920c7f761465501d44564"
+        hash: "6bfa9782e64bfc0041175073aa2bbb80"
     }
     Frame {
         msec: 2976
-        hash: "ba67dbe0010ba2aae3ca100886b11553"
+        hash: "8df19b6bd14c7e1f014dfdb4cc887263"
     }
     Frame {
         msec: 2992
-        hash: "8064db575e2c74c0faf7782adc527a08"
+        hash: "02dd88bf2766c756b840bea3e6f7dd80"
     }
     Frame {
         msec: 3008
-        hash: "b7fd5446ad957610ab853e0c597b9a36"
+        hash: "edf9f3ca4b85ffba5ca051d96b1b3b64"
     }
     Frame {
         msec: 3024
-        hash: "092b53eb50e91d74db7899328899cfd3"
+        hash: "7da796da178c888018981d7dd39b3784"
     }
     Frame {
         msec: 3040
-        hash: "0346065ad603b41db9365987ebe81586"
+        hash: "d4b850c173169ec184634bb2001e3f3d"
     }
     Frame {
         msec: 3056
-        hash: "705083f27a338fea544c9806f0d8fcb3"
+        hash: "37afe96e32df2ac6031d70fe9ded7d56"
     }
     Frame {
         msec: 3072
-        hash: "fc29b4888e26deec4c983e487b9bd058"
+        hash: "7a0f09bc5d91c4295000d39c97b31d76"
     }
     Frame {
         msec: 3088
-        hash: "0ff734e0509908eba292c1814f677e5b"
+        hash: "afbbb94bc89ef4f9e321dd2c391d0af1"
     }
     Frame {
         msec: 3104
-        hash: "7181d9011ddd3ad49ee95fac2e146b12"
+        hash: "93c4ff33449244b76103f0d35cc7a9e1"
     }
     Frame {
         msec: 3120
-        hash: "4478b07b0331bb30e60f23ee74475f73"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3136
-        hash: "514aa7a4b1230ae1701004f479eeb5f2"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3152
-        hash: "56e51f8f36e0f1a5a4b6b21c41151375"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3168
-        hash: "f58216f12e507a91482ded5372f960c7"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3184
-        hash: "18e8675ca5ea7ade7e32b29f1632e1ff"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3200
-        hash: "13ec0166cc7dd82042e596739c598a1e"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3216
-        hash: "5cebf9afa912b17ac3161619d238e5da"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3232
-        hash: "f096b191e347b7e2eab51b6adc1a5aac"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3248
-        hash: "81cffc13a615ab673172912760863c08"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3264
-        hash: "e89c7acfc07bc0eb6e9740d545400064"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3280
-        hash: "e681f06f57d43a38acb29a3cb45e4384"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3296
-        hash: "945bfe7808fb620dc3f7ad887183244c"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3312
-        hash: "4d1fc53701adce4e4af87c32e6c5a8de"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3328
-        hash: "c42bbf27e800558fab33bc6e9a0f36b9"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3344
-        hash: "5f48f59812b17a9be466f0601f0ed0df"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3360
-        hash: "f3a3f645115077b7aeb66465280b7a16"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3376
-        hash: "d1c295b2157001ff1020515f4b2aceaa"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3392
-        hash: "e5f364e0e4bd75dd04280f6b6f48b8ba"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3408
-        hash: "f439df4b5907ba0201c0dad934115721"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3424
-        hash: "2e7eb0e999792f3aa87c63865f68d26b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3440
-        hash: "45d3ccb3b03adc8323445207d2dca502"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3456
-        hash: "c345f92a25406e33256bfe47dc7f72f3"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3472
-        hash: "dcb2663d27d644c0b50aa7386aa9d488"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3488
-        hash: "ebe4b9eaf39676bcdd968f8517efa222"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3504
-        hash: "deb3e3e6fdf8fe18de907f88822538e8"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3520
-        hash: "30e8ab0e6cf32a45190c4b29e458d858"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3536
-        hash: "059e6f57c2c78a25ab8b515c878231f9"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3552
-        hash: "fa7621f338ae187edac5cb69b22e64b3"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3568
-        hash: "bf287cbb0963fc8e575cd95808e1983d"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3584
-        hash: "741dc09e0ae13d6afbdaae701cb699ef"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3600
-        hash: "8dd52007df5585aed4b9737a8314a74d"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3616
-        hash: "ddcd945a3a4467d8dd0b7a4197aafed5"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3632
-        hash: "015deb5f228fa2f77978315ccca4f4c8"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3648
-        hash: "e1c960e966873e694837fd98f231cfcb"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3664
-        hash: "17a177d37b427d9488e36d19b345a397"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3680
-        hash: "d4aded08d04f79d50536ecf539c0583d"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3696
-        hash: "72890e9b84acf9df6083e23ab9270da1"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3712
-        hash: "313859115de570f8d41f67c4db7cf49e"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3728
-        hash: "98918d73b6d6b375db53470dd72c7b35"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3744
-        hash: "ff706517a4d257747893c11a3b059926"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3760
-        hash: "73e62664a31232c1a349568c8da6ce64"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3776
-        hash: "bed046c6eae90d267e859cd76d3eacfb"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3792
-        hash: "4643348fc1b47f0d3244e7e717247953"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3808
-        hash: "0305bfc35b5618da19e9eabb3c1b5d2b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3824
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3840
@@ -1134,47 +1134,47 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3872
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3888
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3904
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3920
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3936
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3952
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3968
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 3984
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4000
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4016
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 2
@@ -1186,7 +1186,7 @@ VisualTest {
     }
     Frame {
         msec: 4032
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1198,7 +1198,7 @@ VisualTest {
     }
     Frame {
         msec: 4048
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1210,7 +1210,7 @@ VisualTest {
     }
     Frame {
         msec: 4064
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1222,7 +1222,7 @@ VisualTest {
     }
     Frame {
         msec: 4080
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1234,7 +1234,7 @@ VisualTest {
     }
     Frame {
         msec: 4096
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1254,7 +1254,7 @@ VisualTest {
     }
     Frame {
         msec: 4112
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1266,7 +1266,7 @@ VisualTest {
     }
     Frame {
         msec: 4128
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1278,7 +1278,7 @@ VisualTest {
     }
     Frame {
         msec: 4144
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1298,7 +1298,7 @@ VisualTest {
     }
     Frame {
         msec: 4160
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1310,7 +1310,7 @@ VisualTest {
     }
     Frame {
         msec: 4176
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1322,7 +1322,7 @@ VisualTest {
     }
     Frame {
         msec: 4192
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1342,7 +1342,7 @@ VisualTest {
     }
     Frame {
         msec: 4208
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1354,7 +1354,7 @@ VisualTest {
     }
     Frame {
         msec: 4224
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1366,7 +1366,7 @@ VisualTest {
     }
     Frame {
         msec: 4240
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1386,7 +1386,7 @@ VisualTest {
     }
     Frame {
         msec: 4256
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1398,7 +1398,7 @@ VisualTest {
     }
     Frame {
         msec: 4272
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1410,7 +1410,7 @@ VisualTest {
     }
     Frame {
         msec: 4288
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1430,7 +1430,7 @@ VisualTest {
     }
     Frame {
         msec: 4304
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1442,7 +1442,7 @@ VisualTest {
     }
     Frame {
         msec: 4320
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1454,7 +1454,7 @@ VisualTest {
     }
     Frame {
         msec: 4336
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1474,115 +1474,115 @@ VisualTest {
     }
     Frame {
         msec: 4352
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4368
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4384
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4400
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4416
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4432
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4448
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4464
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4480
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4496
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4512
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4528
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4544
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4560
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4576
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4592
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4608
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4624
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4640
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4656
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4672
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4688
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4704
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4720
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4736
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4752
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4768
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4784
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4800
@@ -1590,147 +1590,147 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4832
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4848
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4864
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4880
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4896
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4912
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4928
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4944
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4960
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4976
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 4992
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5008
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5024
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5040
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5056
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5072
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5088
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5104
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5120
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5136
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5152
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5168
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5184
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5200
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5216
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5232
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5248
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5264
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5280
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5296
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5312
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5328
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5344
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5360
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Frame {
         msec: 5376
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 2
@@ -1742,7 +1742,7 @@ VisualTest {
     }
     Frame {
         msec: 5392
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1762,7 +1762,7 @@ VisualTest {
     }
     Frame {
         msec: 5408
-        hash: "754f9689239e6154a762a6a1e9e0131b"
+        hash: "5e21e09fa0ec2b1e9f29be60100c40f2"
     }
     Mouse {
         type: 5
@@ -1774,7 +1774,7 @@ VisualTest {
     }
     Frame {
         msec: 5424
-        hash: "ba4e61f8de7f078cfc1e5fc8dd3c65f3"
+        hash: "d269b601f6c58e4349a5bc41ed8040cb"
     }
     Mouse {
         type: 5
@@ -1786,7 +1786,7 @@ VisualTest {
     }
     Frame {
         msec: 5440
-        hash: "00389598468dbd1a90cada9543715770"
+        hash: "b5fb0c0e78b48380e5d9dd82be64554c"
     }
     Mouse {
         type: 5
@@ -1798,7 +1798,7 @@ VisualTest {
     }
     Frame {
         msec: 5456
-        hash: "ab020b76bc23554e176bd3a59712c3bc"
+        hash: "86699ae4ad4491a39272704aa8d2be0a"
     }
     Mouse {
         type: 5
@@ -1810,7 +1810,7 @@ VisualTest {
     }
     Frame {
         msec: 5472
-        hash: "96483c5c51cc851c55166b13617b12ea"
+        hash: "f7ad9df8715594e9012d9e6ba61784ae"
     }
     Mouse {
         type: 5
@@ -1822,7 +1822,7 @@ VisualTest {
     }
     Frame {
         msec: 5488
-        hash: "1ad679d1400a0f185a380a75840c6a50"
+        hash: "5d50347997afcdd437e8f5b1afd5fdb6"
     }
     Mouse {
         type: 5
@@ -1842,7 +1842,7 @@ VisualTest {
     }
     Frame {
         msec: 5504
-        hash: "b5ed338d402d16a831c0595311350789"
+        hash: "40290cb6417848caf299aac419e78b3e"
     }
     Mouse {
         type: 5
@@ -1862,63 +1862,63 @@ VisualTest {
     }
     Frame {
         msec: 5520
-        hash: "bf51ff7b6f264170d9c5700559e03262"
+        hash: "cdd32a53cd968afc378069fa7fc08fc1"
     }
     Frame {
         msec: 5536
-        hash: "0d62681e661aad7b67b880e13afeb4de"
+        hash: "2f0e8c2f895506b3d484da3024c0e823"
     }
     Frame {
         msec: 5552
-        hash: "3371739270c458d4ce8a08f2e12d4ba5"
+        hash: "e97ab47515d55760919b4319f7aa2f4a"
     }
     Frame {
         msec: 5568
-        hash: "db271b0ebfa0172d8386ac9afde9f296"
+        hash: "e8698483768d3cf121985ffce93c89e0"
     }
     Frame {
         msec: 5584
-        hash: "d64c064ab483c9636b2736c67b2b1a48"
+        hash: "75f23e628458b6abce65873777ec2226"
     }
     Frame {
         msec: 5600
-        hash: "20a8ccb0ff1c0d5ff606b343f1a32bff"
+        hash: "5477a54c2c2fd9de2b76a82fb8c9c371"
     }
     Frame {
         msec: 5616
-        hash: "5547bb0a4d6b51733829597b9d8d141a"
+        hash: "c20f1a85cf8166664b1dc44986fc7f1a"
     }
     Frame {
         msec: 5632
-        hash: "1135177a5cb24aa11372653985599775"
+        hash: "44f4b02055397a06c628564d9f2180f3"
     }
     Frame {
         msec: 5648
-        hash: "5031ea6ca8ec59155edb7c1f10f77925"
+        hash: "09d79da372ded40a24d1fdc0d5d97fa6"
     }
     Frame {
         msec: 5664
-        hash: "7c5c1015af23f32c002a24a880201883"
+        hash: "7fec934dac44b7365ef110fc9fa2ff0b"
     }
     Frame {
         msec: 5680
-        hash: "c1dd3ad07775d74d2e81b830d07543e0"
+        hash: "d9f6e4e21629626f9f3fbdf879173147"
     }
     Frame {
         msec: 5696
-        hash: "ad6651f644be3c6f1ebf340809fe516f"
+        hash: "674967f6494a5aa45f4344142f54145f"
     }
     Frame {
         msec: 5712
-        hash: "1eb69541ae67d9d9193b86a6592de4c2"
+        hash: "59090ec0960776ae02deb8f2365848a8"
     }
     Frame {
         msec: 5728
-        hash: "c9c40ec693a421243804efb8f99707f4"
+        hash: "6ced1eb439584cd55d7ea83b4c6ad89d"
     }
     Frame {
         msec: 5744
-        hash: "832884a5102069ca085001156a04e74e"
+        hash: "2f93341754e279408ebe9389987d6354"
     }
     Frame {
         msec: 5760
@@ -1926,239 +1926,239 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "df0c7d73069e1087d34c7a703197cb2a"
+        hash: "6ecfb56d8e685d6e251938ecc740a0d3"
     }
     Frame {
         msec: 5792
-        hash: "4a8e1f548e48b86140aa1a5fa8b17bd3"
+        hash: "eb3254187a72afde5091eb240f1ce043"
     }
     Frame {
         msec: 5808
-        hash: "f79f47e3a0c16a1361fa287a594c4673"
+        hash: "cc367bfa5264fa7539d26ca7f2b81300"
     }
     Frame {
         msec: 5824
-        hash: "c26da5ed2e4055f5c172b48163560143"
+        hash: "6a869340f179e768d271b28fd8983c1b"
     }
     Frame {
         msec: 5840
-        hash: "0e971cd0c2e25d52b689d4b22509a7d9"
+        hash: "e22f23a5d5e55eed1e74414dfd4da00f"
     }
     Frame {
         msec: 5856
-        hash: "40bae0ef35772c476cddccc034b7c872"
+        hash: "c6b0c88158ff5052bb3e8ff4c46fa0f3"
     }
     Frame {
         msec: 5872
-        hash: "ce1fc0faae5e313bc21e024dac3097da"
+        hash: "8cebf630fa954c5a3be2b26b29597379"
     }
     Frame {
         msec: 5888
-        hash: "ba614972cec0e9fa47cb09f1ba77eefb"
+        hash: "60bc980648f99ca37a80bff2e462f2f6"
     }
     Frame {
         msec: 5904
-        hash: "2266ae29490ae01ff8a2329956c124a7"
+        hash: "8c3db2a7a7314931a5553408f41551af"
     }
     Frame {
         msec: 5920
-        hash: "debae0194926cb5af0a8f7fdfb7f08b8"
+        hash: "97323491971e95f6d09c83afbcadcbdc"
     }
     Frame {
         msec: 5936
-        hash: "10a7111367cfcbe24063b9ee6975e4fc"
+        hash: "9abecb040056c3d07614c1d0253d08c6"
     }
     Frame {
         msec: 5952
-        hash: "3c0f9e0603e33506f31ff6569d007b97"
+        hash: "b3efc154d193cb69f074c511918f4976"
     }
     Frame {
         msec: 5968
-        hash: "69d92abce3f093cc7610bd715a7396fa"
+        hash: "e8fd8d8ebfb33d0f7c7717f89dec87b8"
     }
     Frame {
         msec: 5984
-        hash: "befad9882a6af920684d94c74d8d7f78"
+        hash: "fe9eb2c5b292db6fedbdacb4e31b8d9c"
     }
     Frame {
         msec: 6000
-        hash: "10632052ac53504bd36687ba7aa7ebc1"
+        hash: "6e86cbefdb523a7153019aa6c3bdee40"
     }
     Frame {
         msec: 6016
-        hash: "af4053320c12cbcc6f0e7e321dba1c83"
+        hash: "142b81c3de5c7140680f6c0ed77e7a55"
     }
     Frame {
         msec: 6032
-        hash: "4560c5fcef9d630d744e80dc46947b9d"
+        hash: "cfef661007ee19ef6c39cc784f3e8369"
     }
     Frame {
         msec: 6048
-        hash: "012ee780ed98131321aaa241a2599c5f"
+        hash: "1305eafc2ffd60605274e043829bce0c"
     }
     Frame {
         msec: 6064
-        hash: "25d3fb9d44bc2be3b86a5451d8ffaec2"
+        hash: "3c6d2fc8364dd9e5e0409cc6f3d16e78"
     }
     Frame {
         msec: 6080
-        hash: "09c5cbff81a5c9fae40ec29b936ee52b"
+        hash: "e1eb0c51700d3b5c56cf8555d9eb8cf6"
     }
     Frame {
         msec: 6096
-        hash: "27a0b1d2ea2fc8729e5542c6462c1815"
+        hash: "9778e7a92f9223f4a8b01edab2627c94"
     }
     Frame {
         msec: 6112
-        hash: "c6f347c942aed190ebee077b5bd0888c"
+        hash: "7616da76832eace7846df67ff29524bd"
     }
     Frame {
         msec: 6128
-        hash: "029d78844bd72acb310bd2887489bdf0"
+        hash: "f7bf509b2764a44227e1b6ebbb6bcabe"
     }
     Frame {
         msec: 6144
-        hash: "3af16ab398f1515e90e81460ac061a74"
+        hash: "a2efece1011c7f90872154242db70d46"
     }
     Frame {
         msec: 6160
-        hash: "0151ca050722645e2899919f79f6aa0b"
+        hash: "f77dbceb3f26533f2f795ea16116a880"
     }
     Frame {
         msec: 6176
-        hash: "eead61dfc1851bc9fba3b4bca510af6a"
+        hash: "8874effc7fa1455c658490f42aad0046"
     }
     Frame {
         msec: 6192
-        hash: "da822098c606556ad8683316f5a821ab"
+        hash: "6d8e2a8c79eed4edbc7a1005fd7e85fd"
     }
     Frame {
         msec: 6208
-        hash: "ee47fc2bcf2264f5799a76308fbf2b65"
+        hash: "7d0f33ce8f934f0d4bfd6ac5b50bc0a6"
     }
     Frame {
         msec: 6224
-        hash: "81b208b84ca887d35cda79b5c0e4cd4e"
+        hash: "1aefde7dbbd6ca7f57637147bfd7a664"
     }
     Frame {
         msec: 6240
-        hash: "fd52ccaddcb79a2dfa12bb57640a3610"
+        hash: "524fa1fc729a033983817fd9591dff09"
     }
     Frame {
         msec: 6256
-        hash: "b187e8fcd0a777657a733c260aaaf557"
+        hash: "c5559eb1e5bb5d2ab20888831a3924a0"
     }
     Frame {
         msec: 6272
-        hash: "2cfe47a86bf9df3704002288b6249ed9"
+        hash: "e5e78ff025bfa205f6ad243484122ec1"
     }
     Frame {
         msec: 6288
-        hash: "b79b81706f62789a15557ac1a017addf"
+        hash: "b3a4e501838e7c44f9b0e21b263922a3"
     }
     Frame {
         msec: 6304
-        hash: "77a84eb447fe7034783678f6903ff76d"
+        hash: "c35ddb641840b7d7a100e074aab82bb8"
     }
     Frame {
         msec: 6320
-        hash: "82529385d3072812fa737193914ece1c"
+        hash: "1121ff859d3a120efd8d3f6b307d2f5c"
     }
     Frame {
         msec: 6336
-        hash: "a7ccfa6c8aebf2016f2f12045d2f1abe"
+        hash: "2be325c442cfc17ae7b722add60170e1"
     }
     Frame {
         msec: 6352
-        hash: "486d38e7ea6a5cf13f2ecd1c6919ece7"
+        hash: "c3e86d4a73c739c159e71255ca08457e"
     }
     Frame {
         msec: 6368
-        hash: "6c5bd377d2289ec88f969e961f1dcf65"
+        hash: "fc56984eb2c3c9db61a54edcfe67f36b"
     }
     Frame {
         msec: 6384
-        hash: "92e20565fbcf8c7c9a67726f3a0dd41f"
+        hash: "477421a20f47af33b4272fd8f63718bb"
     }
     Frame {
         msec: 6400
-        hash: "0fcd995a26262b875440d0d9f03d16c4"
+        hash: "dee4659125ff750159c5b5ec0acd6a99"
     }
     Frame {
         msec: 6416
-        hash: "f679759eddca739764bd2816ee53ef31"
+        hash: "31dce66ad26dbcee6f1515dd43a94354"
     }
     Frame {
         msec: 6432
-        hash: "adffd1da9b750df3d9f48820a2235c0b"
+        hash: "25c4478c27d808b85746cd65fbb1f93f"
     }
     Frame {
         msec: 6448
-        hash: "e0f8730acf7a6802ade228f95d700c08"
+        hash: "f9094ea959b54b92a6d39db6cd9b5f10"
     }
     Frame {
         msec: 6464
-        hash: "2c5209c3715bb9f39ac23a8b32a17ef9"
+        hash: "47f1d0f234073353ca233206c2872093"
     }
     Frame {
         msec: 6480
-        hash: "741694ef4cbd3477a8e13ba89fc9d607"
+        hash: "3a6cf2c77f1ae99977f2ed0b4683aecf"
     }
     Frame {
         msec: 6496
-        hash: "e88d6a61acb3fde6b441c2e718a0c2fb"
+        hash: "df203035dbd68ffe2c9dc532061e7927"
     }
     Frame {
         msec: 6512
-        hash: "b91863800e6ab967616d68def388d5d5"
+        hash: "20f69f8e32fd217967feb9a955e27717"
     }
     Frame {
         msec: 6528
-        hash: "4c28a99236c351a2e3e3301c0b5bbba8"
+        hash: "0bd932d1953ee28c38a359ddfb0c2075"
     }
     Frame {
         msec: 6544
-        hash: "6affb524d7f63fef94d29629a148be04"
+        hash: "0c6c75cca96a1d04c9b60d9bd1543318"
     }
     Frame {
         msec: 6560
-        hash: "f7823d25adf673117f010738d977b787"
+        hash: "9b4c8f6cf066800c1f2bb07357fc2e0d"
     }
     Frame {
         msec: 6576
-        hash: "dfb930f3db30ec53c8e9a1aa5d9056e4"
+        hash: "eb861eb18ddb237cd11d24e101be83d1"
     }
     Frame {
         msec: 6592
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "086db75c06bf1fb1f527f5c8e6255d02"
     }
     Frame {
         msec: 6608
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "e807b1166ca3f658c780b1fef8400b8d"
     }
     Frame {
         msec: 6624
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6640
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6656
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6672
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6688
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6704
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6720
@@ -2166,138 +2166,138 @@ VisualTest {
     }
     Frame {
         msec: 6736
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6752
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6768
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6784
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6800
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6816
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6832
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6848
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6864
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6880
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6896
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6912
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6928
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6944
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6960
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6976
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 6992
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7008
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7024
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7040
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7056
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7072
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7088
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7104
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7120
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7136
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7152
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7168
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7184
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7200
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7216
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7232
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7248
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
     Frame {
         msec: 7264
-        hash: "57269234dc01b66f6aeb841c328c06b5"
+        hash: "a9c65a178a4b4598705bf736c0b1b595"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png
index 16a7e10..d94ea19 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png
index 116ce88..df940df 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png
index 13896d4..d10afe1 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png
index 5d18003..8f99617 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png
index cd3387f..18b1c09 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.5.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.5.png
index 9f31c69..e15d688 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml
index 06d32b6..949807d 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml
@@ -246,7 +246,7 @@ VisualTest {
     }
     Frame {
         msec: 912
-        hash: "1c2d4a99e7e2f5e945c05857d6a463a2"
+        hash: "01b9c877f51b878ed262943aedcf89b4"
     }
     Mouse {
         type: 5
@@ -558,79 +558,79 @@ VisualTest {
     }
     Frame {
         msec: 1616
-        hash: "0b3782e842a6c54585d6a266314025d8"
+        hash: "64c0ba48b59addcbd9dc2a36c24b3070"
     }
     Frame {
         msec: 1632
-        hash: "02409885b82ebac931df18d8e23238d7"
+        hash: "5ce463d514a776055897052defbae117"
     }
     Frame {
         msec: 1648
-        hash: "edcbd91ad267c125c431367be3e4a8a3"
+        hash: "16b25853ec30feee97c3f11a0ea5767e"
     }
     Frame {
         msec: 1664
-        hash: "47641fd7ec919b3c041c5acc04b0d083"
+        hash: "55cfc9179923c935a44de0fee69d74ce"
     }
     Frame {
         msec: 1680
-        hash: "ea8f026fee0fba2c27a8df1e1e531acb"
+        hash: "47641fd7ec919b3c041c5acc04b0d083"
     }
     Frame {
         msec: 1696
-        hash: "e2e8a398760be380f9b2b7dbcb03c0e8"
+        hash: "466eedb320beed99d7eba5a71095438a"
     }
     Frame {
         msec: 1712
-        hash: "a1767f2e10f9ab87050ef246a4a29bbb"
+        hash: "a7520215940ca21acd148ca88c0fec62"
     }
     Frame {
         msec: 1728
-        hash: "f60cccf793bd6d356d69b1394638a201"
+        hash: "f5c8bff5c3305064dbaa777707994de3"
     }
     Frame {
         msec: 1744
-        hash: "31dc8c50a99164c19445a089223c8813"
+        hash: "95b37e22bb68634029e18bcef7e9502c"
     }
     Frame {
         msec: 1760
-        hash: "78ff726b7da5ba03fa74f66b39bf1006"
+        hash: "f60cccf793bd6d356d69b1394638a201"
     }
     Frame {
         msec: 1776
-        hash: "6f8a540dccf7182f6aed8903a0afb109"
+        hash: "d77a5c2553e9391c14a49dba951ae236"
     }
     Frame {
         msec: 1792
-        hash: "c914c500507b9c7180dcf25e985135e9"
+        hash: "0bfa2f6e5fa25a9847c2515de8ad53bd"
     }
     Frame {
         msec: 1808
-        hash: "39702ce38bcfca46ef3a8dbb7299c725"
+        hash: "202c077b20213814545ab594987b3c46"
     }
     Frame {
         msec: 1824
-        hash: "969b71ee88a1d244e62af1cecc105234"
+        hash: "32c5d1644c4f6a3386b4300b1dadae2e"
     }
     Frame {
         msec: 1840
-        hash: "11c8397fb9d7b993761b08ba8c9958e5"
+        hash: "c914c500507b9c7180dcf25e985135e9"
     }
     Frame {
         msec: 1856
-        hash: "79ad4a90ab449e3232db993b30786d89"
+        hash: "62095b2214425007cb19a6218819ed21"
     }
     Frame {
         msec: 1872
-        hash: "daf979fd50e0860bf30f377a059d89dc"
+        hash: "06d25e03eca85906c93d60b7c80b353c"
     }
     Frame {
         msec: 1888
-        hash: "5412e7524dc22e8064c8a8c684092802"
+        hash: "605992eb3f636b705b4b6dd7dfbe1a5f"
     }
     Frame {
         msec: 1904
-        hash: "2c3bea8bf10ecf6c19b93e94cb7ac0ea"
+        hash: "3241ccb6da86acc69bb07c044ba5bade"
     }
     Frame {
         msec: 1920
@@ -638,15 +638,15 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "bbfa2f8aaab0abaff9d771d5ec546d96"
+        hash: "f09fe53cd6698a94d1626df1a1e4079b"
     }
     Frame {
         msec: 1952
-        hash: "be2811bf369bc9dd8c5d9deec3b84788"
+        hash: "aff96cfa2f88f1f2ce6af5e6a838fb79"
     }
     Frame {
         msec: 1968
-        hash: "779838915f48eb917d36c3f2b65eedae"
+        hash: "dddc255c053608f6b199cebb40e164bc"
     }
     Mouse {
         type: 2
@@ -666,7 +666,7 @@ VisualTest {
     }
     Frame {
         msec: 1984
-        hash: "d20b5fe14b47dfb1e73f8ef44802da11"
+        hash: "345864eccf0b48f94097c9e0f037d71d"
     }
     Mouse {
         type: 5
@@ -678,7 +678,7 @@ VisualTest {
     }
     Frame {
         msec: 2000
-        hash: "5312dd1f9d309ab5134b8bb67685488e"
+        hash: "05e9776009f78d5466473c67a900e74d"
     }
     Mouse {
         type: 5
@@ -698,219 +698,219 @@ VisualTest {
     }
     Frame {
         msec: 2016
-        hash: "8d6b6cbb74cc654bc5aff10a807dd3cb"
+        hash: "3a2bca372b5e492d71c73c945851a616"
     }
     Frame {
         msec: 2032
-        hash: "dee717869177d1de4a26599b120f1c3d"
+        hash: "f7957d18f0fc7421f7109dfc5debba3a"
     }
     Frame {
         msec: 2048
-        hash: "2b2c60f42024784ceed5c68505dfa5ca"
+        hash: "cdd2a73b65b60991f1a3671cc668fa0e"
     }
     Frame {
         msec: 2064
-        hash: "1a6a108fd6cf607ec08dbedd804d12f7"
+        hash: "d1646d66d0726f163cd32d4e985da46b"
     }
     Frame {
         msec: 2080
-        hash: "10bc4d0a1dc400fedc9a68b68c6525fd"
+        hash: "1d2ea750a691ba78943c8e6e1a950017"
     }
     Frame {
         msec: 2096
-        hash: "dc6a4abfbfb38e90af2308320d0f795b"
+        hash: "c372a639a59e7cb1f5573de540dd0dcf"
     }
     Frame {
         msec: 2112
-        hash: "82c61d8461001c19af7c2b458d427e0b"
+        hash: "964fc74c67a84cb84516389c57468ada"
     }
     Frame {
         msec: 2128
-        hash: "e455d9ccffedaa708532bb69ad15871e"
+        hash: "7310eb82821b9c209dd9e54d7b8d2e61"
     }
     Frame {
         msec: 2144
-        hash: "b9c6169ad08724fc70df30668dfe7509"
+        hash: "55b62e5afa61e8acb4faf97f7c2b1aa5"
     }
     Frame {
         msec: 2160
-        hash: "a3fe5862be470470854d4157c1c027db"
+        hash: "4a9994d898380369eb705efb52839402"
     }
     Frame {
         msec: 2176
-        hash: "6a3804bd5f4fd5f1c424615ceb620525"
+        hash: "340811fac74949d8561c825547801ab0"
     }
     Frame {
         msec: 2192
-        hash: "df0d72248310654a9cf47e707fe9e414"
+        hash: "4ab688cb3f157dff07a652a84d1ed1da"
     }
     Frame {
         msec: 2208
-        hash: "beb19f2b2979ab40b5ccf8c0fbe9b72f"
+        hash: "a249bd338776e1f0d11ad70aebcb91b3"
     }
     Frame {
         msec: 2224
-        hash: "be3449b49048b764bea68a76baa0fc75"
+        hash: "6db4a1fd4f2597a180705b7d927ef512"
     }
     Frame {
         msec: 2240
-        hash: "4a615cae9c8f85e7b8aecd4c9014f1eb"
+        hash: "7a47ac68a2a433d6edce92b772c3c608"
     }
     Frame {
         msec: 2256
-        hash: "b3c274f1a9d65684c0a55a544bf77810"
+        hash: "10f23e9e7729a6525549b71143ae539c"
     }
     Frame {
         msec: 2272
-        hash: "31456b01fcfb60a77d2b9662c2fff7b6"
+        hash: "c977e2525e1fb7406414862fbd23fcf8"
     }
     Frame {
         msec: 2288
-        hash: "2be5cf3f6158bf09659acc68b134846f"
+        hash: "66251028e13fbd8f4f4d6836eb9615f9"
     }
     Frame {
         msec: 2304
-        hash: "5f9c725a11305f3e6c48ab332faabf50"
+        hash: "925b50a4f9fe33d83463914c2221be82"
     }
     Frame {
         msec: 2320
-        hash: "277c2733c7245d045665198984b74224"
+        hash: "7169f87de9a332bb94108661e9783a54"
     }
     Frame {
         msec: 2336
-        hash: "265b8342bc747fb43a5291df0f4ce48b"
+        hash: "3ff3c0d2db8d1d65cfc7b14520cf41aa"
     }
     Frame {
         msec: 2352
-        hash: "803b49ec31955b481009a51c64bcce65"
+        hash: "0757ee68ff9923a2dbeb2129f3d4409c"
     }
     Frame {
         msec: 2368
-        hash: "a717b30ad50746cdf0fae82212ac88f0"
+        hash: "223dd69204949b494cda0762ef9965fd"
     }
     Frame {
         msec: 2384
-        hash: "65f46c8e69f24d060b5da6f866867f51"
+        hash: "e97c6ba010857de43baeccbe85e2b262"
     }
     Frame {
         msec: 2400
-        hash: "52f9e5d1106d00a950470076a50e4239"
+        hash: "9f170350da8b3785d5db9c24ce8cacf8"
     }
     Frame {
         msec: 2416
-        hash: "058a787aae2845308e68bb93f6a811e4"
+        hash: "512f3a1ef9d5c263ab22559490dc3022"
     }
     Frame {
         msec: 2432
-        hash: "621985111c25994c0c0fe3635be67c1d"
+        hash: "0f3df7f366bc918c55172df45c22056e"
     }
     Frame {
         msec: 2448
-        hash: "2949b8185cefbaaf587a043d805cc670"
+        hash: "71f8f04423b9a3356aa08235a91ddde7"
     }
     Frame {
         msec: 2464
-        hash: "d4a03127ae5047184c736617deeac92d"
+        hash: "0c48c98562318f7bac502c49fd09fd5e"
     }
     Frame {
         msec: 2480
-        hash: "876c6c5ac4500de6234423bf6f3511d6"
+        hash: "17defd865ec00da3a74360044a906ea9"
     }
     Frame {
         msec: 2496
-        hash: "eb08aa172cfbdb696b6f672dfa7b6fff"
+        hash: "07ef0b634016b52023174a6a593cb2aa"
     }
     Frame {
         msec: 2512
-        hash: "a60c13b8f46faa0a35dbb539010550d4"
+        hash: "56d06c41e9ad55852654bcc6ce77504d"
     }
     Frame {
         msec: 2528
-        hash: "c6f8786506e0326a5734ab8aea782f95"
+        hash: "05848d818a1531a649f9c23947e67855"
     }
     Frame {
         msec: 2544
-        hash: "a49927f2aae24e692fc379f0ab6f4ee9"
+        hash: "11c8397fb9d7b993761b08ba8c9958e5"
     }
     Frame {
         msec: 2560
-        hash: "2f1a2d50e1090b34ad1ea6a36eec4fe0"
+        hash: "82255275db096d4150bd6cbd07805b3f"
     }
     Frame {
         msec: 2576
-        hash: "a5ee24d37be960a88684748b73dc75fe"
+        hash: "8dd3572656f6feb16d55d9318b6b6317"
     }
     Frame {
         msec: 2592
-        hash: "28682389395b47ae33ceec1ba3beef4e"
+        hash: "8096e99b41c38a777df2010057119afb"
     }
     Frame {
         msec: 2608
-        hash: "1869667b50b76d99716dd0d7849901fa"
+        hash: "4187c358b8319dffdef36c67b02a4921"
     }
     Frame {
         msec: 2624
-        hash: "2806ee1005193f55825aa6147583985f"
+        hash: "f891ef9a694bc6513f04e38d34c78e24"
     }
     Frame {
         msec: 2640
-        hash: "c00589dce90e3ab2f2c8890f30f80d3d"
+        hash: "77db9416fb003a5bb793b6573ca3a3cd"
     }
     Frame {
         msec: 2656
-        hash: "1f1881f0a29525e380ecbcce15499fa4"
+        hash: "152cf831ca83212fc026b1146c49a386"
     }
     Frame {
         msec: 2672
-        hash: "2a4c3ff764545a3899c864680f22f0a3"
+        hash: "a596b17515b471d5e67edda3baf8938b"
     }
     Frame {
         msec: 2688
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "307db3e3c929da9783b12d7a2efdbda5"
     }
     Frame {
         msec: 2704
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "1baff6641852daabdc639a35a4821189"
     }
     Frame {
         msec: 2720
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "1f7df5b9c29773c7ae3d08005e7dd903"
     }
     Frame {
         msec: 2736
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "7eb1937ccb2727c27e57b7d7960678d2"
     }
     Frame {
         msec: 2752
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "8294b7a9105083887634973a1c64b70a"
     }
     Frame {
         msec: 2768
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "89ea9be6ebb280ff43d7b037d989aa53"
     }
     Frame {
         msec: 2784
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "4cbeaef4f796eebf114c5e470389d30a"
     }
     Frame {
         msec: 2800
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "0ce8c069bf3fb31d759d62e429c67a15"
     }
     Frame {
         msec: 2816
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "201f1b39884249f60a53a201f783ce9b"
     }
     Frame {
         msec: 2832
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "bcafa2c76a9747a64565a3d3484c1c91"
     }
     Frame {
         msec: 2848
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "94c7ff74b5a37b6e03a47afc40fde107"
     }
     Frame {
         msec: 2864
-        hash: "2685820514ce5d5729f3761b1eaa1682"
+        hash: "08127dfa54da0616ce6cb19c646487ed"
     }
     Frame {
         msec: 2880
@@ -934,7 +934,7 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "ce00c77e8ff1768b41f5585344af1c58"
+        hash: "b76ce9c50fcbe38a29c1930302dd61da"
     }
     Mouse {
         type: 5
@@ -946,7 +946,7 @@ VisualTest {
     }
     Frame {
         msec: 2912
-        hash: "24f401275fa6ec7d26234609792fe0b8"
+        hash: "d30704b159562c21cd2f42f2370acdfa"
     }
     Mouse {
         type: 5
@@ -958,7 +958,7 @@ VisualTest {
     }
     Frame {
         msec: 2928
-        hash: "d3c74863c627a1b922a6b6c4a24f8c40"
+        hash: "db0916ebf147ee738aaf7492bd38c262"
     }
     Mouse {
         type: 5
@@ -978,203 +978,203 @@ VisualTest {
     }
     Frame {
         msec: 2944
-        hash: "64a3209e6adc737065e5d5c3202a7283"
+        hash: "128058d78c8ceabf4867c8c2d23c8007"
     }
     Frame {
         msec: 2960
-        hash: "cf936ffe4330edefddb31c59368491fc"
+        hash: "9a59b6d1576b70796abcd58167e5135e"
     }
     Frame {
         msec: 2976
-        hash: "a67213db044bb876f737cd355fe54444"
+        hash: "2d5f030aa7ae5f7b5df1894f0250a391"
     }
     Frame {
         msec: 2992
-        hash: "0f9e97057cbbd8071e0f5f61318bdf9c"
+        hash: "fb45fe68abab13f5eb4e8022f1e4e2f1"
     }
     Frame {
         msec: 3008
-        hash: "c5f38d334df86ebb6ac4600c83eced20"
+        hash: "ad090853500b3720c1bb4d750731e25c"
     }
     Frame {
         msec: 3024
-        hash: "6d8e6049a36eac4136dbdb5fb18d0650"
+        hash: "f8f560f26cc0b63f51858c5119b7a1ef"
     }
     Frame {
         msec: 3040
-        hash: "8ee97cff4a632e6e297bd3bdac27b8d4"
+        hash: "87e9d53c0ffcf7231693d9d6619ad37e"
     }
     Frame {
         msec: 3056
-        hash: "aca1fcd005d211d35245e64a44002c01"
+        hash: "73000f490569eb178d47a00b96d39a17"
     }
     Frame {
         msec: 3072
-        hash: "7076180bf0eb14a5e733be9320f1f009"
+        hash: "b8a196eca9c3bd95659931115bec319f"
     }
     Frame {
         msec: 3088
-        hash: "e0a0545b3a0b6a0b07d3fa987e1d58b6"
+        hash: "5f9265d0818701ce08066b55a8bbd904"
     }
     Frame {
         msec: 3104
-        hash: "0294b098ce7f0d381542776320e52d2e"
+        hash: "9a62f2e25e8d32872e43fbdcdb838756"
     }
     Frame {
         msec: 3120
-        hash: "36f8bcc42add38fe149e34a703cf8a02"
+        hash: "1c7b238074d274e4f105b5c2b7fd6dac"
     }
     Frame {
         msec: 3136
-        hash: "631426bde50fd35d1da1c30d9878253e"
+        hash: "f6fbd5658a122ced7257852b4d38605d"
     }
     Frame {
         msec: 3152
-        hash: "a4d64c9d378138bedf63389e58d8f1d6"
+        hash: "24a0cc1d69213b12f9420fa9ffee7319"
     }
     Frame {
         msec: 3168
-        hash: "17fdf61bffd947c2e9898f5c4517fdf8"
+        hash: "8811594c57e514da3afeb04460569e5d"
     }
     Frame {
         msec: 3184
-        hash: "653b8c7a55bc4ca763238098711eafa1"
+        hash: "760d4afdc958184b5b68bc3bcc2f1d3b"
     }
     Frame {
         msec: 3200
-        hash: "89e15b3ee1b1fc945801e08cfcdba62c"
+        hash: "b3b2ca99af9aa022dfebf71bfa1cd491"
     }
     Frame {
         msec: 3216
-        hash: "7ea615af67336895e6cee6d3a39ff7de"
+        hash: "293dbff5edf4dde1f57ca3af1c4bce5e"
     }
     Frame {
         msec: 3232
-        hash: "88faee45db80f04ef1120c35057a5f7d"
+        hash: "0c48c98562318f7bac502c49fd09fd5e"
     }
     Frame {
         msec: 3248
-        hash: "8cfe34047b29ac85e58d55e0f6e0b195"
+        hash: "1cac8d792f55f3e47549d628bd729a7d"
     }
     Frame {
         msec: 3264
-        hash: "39255546502fcb882005fe4c38c21fb0"
+        hash: "d63664b4a6c42c67a3c700e3a000fc07"
     }
     Frame {
         msec: 3280
-        hash: "6bf7a959a05fc27f651b2a3ba07de30d"
+        hash: "be41201056bd58d4793c9c7b5cc63f3f"
     }
     Frame {
         msec: 3296
-        hash: "c2c61cb8dbbbd38827277ab32579c6da"
+        hash: "0ea52d61c7b8803d76340874b846783d"
     }
     Frame {
         msec: 3312
-        hash: "ff370d4b4e44c4cbacca96107105df21"
+        hash: "260c743db91b8802e2c27f8c92d620e5"
     }
     Frame {
         msec: 3328
-        hash: "ccadd9e070d54de21c76397d18ad3de8"
+        hash: "33d3dbe981874cd04edd35a4e5bf4e68"
     }
     Frame {
         msec: 3344
-        hash: "6302c39de00070b0a23f9dc87f74dd8d"
+        hash: "27d183bfe7a7775ba47578de7a5b2dcb"
     }
     Frame {
         msec: 3360
-        hash: "7ab69e6d9809c78dc723609bd2761206"
+        hash: "a6c0bd87922ca8d40fe413ab8624dd24"
     }
     Frame {
         msec: 3376
-        hash: "c429cc724b39891805cf4c1448de60b3"
+        hash: "218d68463d34cc31dc81756be9effd02"
     }
     Frame {
         msec: 3392
-        hash: "396ddf0b01e9fe7c2bfb220e64a0c7ec"
+        hash: "29e9148ab8c0aa66988a6bcda12b06ea"
     }
     Frame {
         msec: 3408
-        hash: "7a519a4efeecef5e7623a270e458fb13"
+        hash: "8cc09fb7e94b1bd0d3482e0bf5d0abec"
     }
     Frame {
         msec: 3424
-        hash: "869d174a939e0638a1a22d5c8a010c14"
+        hash: "39a595b99ed012a1e54b516b75f8652d"
     }
     Frame {
         msec: 3440
-        hash: "9ecd2cf4e3b42ff93bcbf4db9829666c"
+        hash: "30754f5e10dc0d148f10a5eced16258a"
     }
     Frame {
         msec: 3456
-        hash: "b06b58b250d3df365806a3f8991d57f3"
+        hash: "85de32bfdfaea28e4c534dca69b1255e"
     }
     Frame {
         msec: 3472
-        hash: "7a6fb03feb2ae0af1f143daedd22a88b"
+        hash: "459bda74f223c6cfbee12524939b09ef"
     }
     Frame {
         msec: 3488
-        hash: "e9fe338dbe7afb69f3870743b0a18805"
+        hash: "db2ae2401ff1a65911339e2292f075dd"
     }
     Frame {
         msec: 3504
-        hash: "04b8def2085e9ce4065b02b938915557"
+        hash: "0cc18d7cbf42cb68baedd73cf59d8c08"
     }
     Frame {
         msec: 3520
-        hash: "7e6942f72012875ba83a1c9121e1f786"
+        hash: "36c72c3d608fc5126f4b62d4416ad54e"
     }
     Frame {
         msec: 3536
-        hash: "291e2d79a79959d9c8c586b6bdc31689"
+        hash: "7f4db14f493a300ba37dae79a9d60084"
     }
     Frame {
         msec: 3552
-        hash: "e490bc7fd92f486b964cca967bd33b38"
+        hash: "efe0031b95195bebfd887ef63c2ce441"
     }
     Frame {
         msec: 3568
-        hash: "0c9858e0445e25d2b12c84801de441cb"
+        hash: "ade092ef64fc3b1e4d4afc86dca3cf71"
     }
     Frame {
         msec: 3584
-        hash: "72ba7a4aacb150e1e9c6de72cff82258"
+        hash: "e57a7cf2f90b87fed0fd438599fabae3"
     }
     Frame {
         msec: 3600
-        hash: "1daca95256842545a5b77bcc46782478"
+        hash: "1be372fe7de83c4d019e3856c03b39b6"
     }
     Frame {
         msec: 3616
-        hash: "869f3d16e203ad47f1ae7ca83e369b75"
+        hash: "4cb14166395004b6f0f04c6d95879583"
     }
     Frame {
         msec: 3632
-        hash: "9cc9cb20aab3369f4e3c5259d291708c"
+        hash: "a5ec71ba41f5fc0eeebf907749f26266"
     }
     Frame {
         msec: 3648
-        hash: "a507b957bab3efe2023a65f8c8b3540a"
+        hash: "257ef3bb651dbd43635576563c0f97c7"
     }
     Frame {
         msec: 3664
-        hash: "9fce2a6cddd8b06a80ce16599b56caa6"
+        hash: "aa95d440ff9c75215bd2483befe18f78"
     }
     Frame {
         msec: 3680
-        hash: "2f85d3064968e3e7b669f733fad58459"
+        hash: "670815d144a7838b02bf24cf586c8df4"
     }
     Frame {
         msec: 3696
-        hash: "6dd6fad85dc5317a22a05a8486317767"
+        hash: "5f58ff1dd96ee21710ce2aeee81c232b"
     }
     Frame {
         msec: 3712
-        hash: "b0faa2ec225cd96fb6d2fd05dc66bed1"
+        hash: "0c5a6c2dfbac5b97481b8e505fd4c4eb"
     }
     Frame {
         msec: 3728
-        hash: "3188219f095c2a9ac7c0f6034463d769"
+        hash: "b269e9fe4d14537c8bef0b66effe7319"
     }
     Frame {
         msec: 3744
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
index ce516ac..c89bd68 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
@@ -33,7 +33,7 @@ Rectangle {
 
     PathView {
         id: photoPathView; model: rssModel; delegate: photoDelegate
-        y: 100; width: 800; height: 330; pathItemCount: 10; z: 1
+        y: 100; width: 800; height: 330; z: 1
         path: Path {
             startX: -50; startY: 40;
             
-- 
cgit v0.12


From f1354b80b78adfdb8a4f0a09dc2f593f4b02a4ea Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 12:08:59 +1000
Subject: Clean up qdeclarativepositioner tests

dynamic.qml is now at expect-fail status, see QTBUG-14839

Task-number: QTBUG-14792
---
 .../qdeclarativepositioners/data/dynamic.0.png     |  Bin 1429 -> 0 bytes
 .../qdeclarativepositioners/data/dynamic.1.png     |  Bin 1433 -> 0 bytes
 .../qdeclarativepositioners/data/dynamic.2.png     |  Bin 1431 -> 0 bytes
 .../qdeclarativepositioners/data/dynamic.3.png     |  Bin 1428 -> 0 bytes
 .../qdeclarativepositioners/data/dynamic.4.png     |  Bin 1432 -> 0 bytes
 .../qdeclarativepositioners/data/dynamic.5.png     |  Bin 1434 -> 0 bytes
 .../qdeclarativepositioners/data/dynamic.qml       | 1603 --------------------
 .../data/usingRepeater.0.png                       |  Bin 2782 -> 0 bytes
 .../qdeclarativepositioners/data/usingRepeater.qml |  268 +---
 .../qmlvisual/qdeclarativepositioners/dynamic.qml  |   65 +-
 .../qdeclarativepositioners/usingRepeater.qml      |    5 +-
 11 files changed, 70 insertions(+), 1871 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png
deleted file mode 100644
index f474afe..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png
deleted file mode 100644
index 8b7ae74..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png
deleted file mode 100644
index 9088bb4..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png
deleted file mode 100644
index 18cd429..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png
deleted file mode 100644
index 739afc1..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png
deleted file mode 100644
index 93f0682..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml
deleted file mode 100644
index 4b36e16..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml
+++ /dev/null
@@ -1,1603 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 32
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 48
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 64
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 80
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 96
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 112
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 128
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 144
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 160
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 176
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 192
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 208
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 224
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 240
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 256
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 272
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 288
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 304
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 320
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 336
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 352
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 368
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 384
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 400
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 416
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 432
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 448
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 464
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 480
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 496
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 512
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 528
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 544
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 560
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 576
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 592
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 608
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 624
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 640
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 656
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 672
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 688
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 704
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 720
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 736
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 752
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 768
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 784
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 800
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 816
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 832
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 848
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 864
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 880
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 896
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 912
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 928
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 944
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 960
-        image: "dynamic.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 992
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 1008
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 1024
-        hash: "3e52e7d7d428cf1b850cb9c60dbb3c21"
-    }
-    Frame {
-        msec: 1040
-        hash: "64f75ab14c979d33d6e0c0d86b76cd35"
-    }
-    Frame {
-        msec: 1056
-        hash: "c198a48f4050f176465649d203d6e09a"
-    }
-    Frame {
-        msec: 1072
-        hash: "6dd8cee5a585a96e78f2cf7478c4da62"
-    }
-    Frame {
-        msec: 1088
-        hash: "09edfbce2ea4b8a547f769ce709dcb6b"
-    }
-    Frame {
-        msec: 1104
-        hash: "e93d01aa6e4f5d3fc82cf5a008e3ea17"
-    }
-    Frame {
-        msec: 1120
-        hash: "0e2e7b5eec0e62853972b0139b8c17c6"
-    }
-    Frame {
-        msec: 1136
-        hash: "26d4f54628ce20f5665bdc6ddc7f3b6a"
-    }
-    Frame {
-        msec: 1152
-        hash: "59836aa6eff85b0152be352b97076d89"
-    }
-    Frame {
-        msec: 1168
-        hash: "47cc9894096731a52ca342ab04df9aad"
-    }
-    Frame {
-        msec: 1184
-        hash: "ec95dd3b34a0f17f6fb9b5bedab73653"
-    }
-    Frame {
-        msec: 1200
-        hash: "e32c2b70882828b5082ca3ec889a0dde"
-    }
-    Frame {
-        msec: 1216
-        hash: "68d3f8e9c9d5388a6f8360368c8f4d2f"
-    }
-    Frame {
-        msec: 1232
-        hash: "17378b2bd8bde7f357fa5463f457c7b2"
-    }
-    Frame {
-        msec: 1248
-        hash: "03db786cd54ec34ce8db15953a5fc847"
-    }
-    Frame {
-        msec: 1264
-        hash: "9e22a82a622ed0287c44cc629059d5bd"
-    }
-    Frame {
-        msec: 1280
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1296
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1312
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1328
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1344
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1360
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1376
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1392
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1408
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1424
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1440
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1456
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1472
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1488
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1504
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1520
-        hash: "981fb1ee75e307b548a32df08a86f4cd"
-    }
-    Frame {
-        msec: 1536
-        hash: "f77568307e93d8cd9f0ae417cc19d6e3"
-    }
-    Frame {
-        msec: 1552
-        hash: "3bdd4468e26aceee0dad6b3b97b1c1ea"
-    }
-    Frame {
-        msec: 1568
-        hash: "252c9ebc2c32755b2289ee1b03877fe3"
-    }
-    Frame {
-        msec: 1584
-        hash: "64169b7eb7b7ae8573556c5f80230965"
-    }
-    Frame {
-        msec: 1600
-        hash: "4965dfa709a9ac7d8f7dfb4bf8303c65"
-    }
-    Frame {
-        msec: 1616
-        hash: "8c53cf92510154087341ac65a93aae5a"
-    }
-    Frame {
-        msec: 1632
-        hash: "4dd7502e3e238743d2f3cf038270491e"
-    }
-    Frame {
-        msec: 1648
-        hash: "cd9a58316837eb92f4ac92dbd86bdba3"
-    }
-    Frame {
-        msec: 1664
-        hash: "5de043e3ac8696b59293a2fa60ed7e65"
-    }
-    Frame {
-        msec: 1680
-        hash: "1bf42a6f6be5a3468d2f47cccfac761e"
-    }
-    Frame {
-        msec: 1696
-        hash: "ca05510c1ad25e5d3b002603f4379a09"
-    }
-    Frame {
-        msec: 1712
-        hash: "f6904a918a6475f1965d74372e52a4b1"
-    }
-    Frame {
-        msec: 1728
-        hash: "9e2312ddfc1648b615288107a06c9f9c"
-    }
-    Frame {
-        msec: 1744
-        hash: "95c470273b1cb08d4d602efcce339554"
-    }
-    Frame {
-        msec: 1760
-        hash: "dade96f707d4a21885480e13b258b7e9"
-    }
-    Frame {
-        msec: 1776
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1792
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1808
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1824
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1840
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1856
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1872
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1888
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1904
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1920
-        image: "dynamic.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1952
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1968
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1984
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 2000
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 2016
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2032
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2048
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2064
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2080
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2096
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2112
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2128
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2144
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2160
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2176
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2192
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2208
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2224
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2240
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2256
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2272
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2288
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2304
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2320
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2336
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2352
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2368
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2384
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2400
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2416
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2432
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2448
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2464
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2480
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2496
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2512
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2528
-        hash: "fabf4e535bc4cc17497939d2eeae4a2d"
-    }
-    Frame {
-        msec: 2544
-        hash: "a7981035f46869f5ae824d0c58b263b2"
-    }
-    Frame {
-        msec: 2560
-        hash: "86d8e369bdceb499b244f84ed9e80ba3"
-    }
-    Frame {
-        msec: 2576
-        hash: "e28a7dc7ea8690da75670b5a6e93a26b"
-    }
-    Frame {
-        msec: 2592
-        hash: "bf4e815360a67bd80732bd8812269b21"
-    }
-    Frame {
-        msec: 2608
-        hash: "a6f8c56cb93da8acc0c90e35596a60d4"
-    }
-    Frame {
-        msec: 2624
-        hash: "1e60656f0758605169e51b57bd03af36"
-    }
-    Frame {
-        msec: 2640
-        hash: "c069b26b9fae47e0104070d702ba9562"
-    }
-    Frame {
-        msec: 2656
-        hash: "457eb2ca1adff6cbb158afa140b2f20b"
-    }
-    Frame {
-        msec: 2672
-        hash: "4e5e750b0d94b6777aebff85d38225d9"
-    }
-    Frame {
-        msec: 2688
-        hash: "96d9840c2354a8786a8470309be97544"
-    }
-    Frame {
-        msec: 2704
-        hash: "ac7570cc7eeff1acd8c47f2d9328f8be"
-    }
-    Frame {
-        msec: 2720
-        hash: "887f937bb263c54f29659f27f2b7a3e3"
-    }
-    Frame {
-        msec: 2736
-        hash: "616371183c82b97f69a4c6e2367b8066"
-    }
-    Frame {
-        msec: 2752
-        hash: "36de8ffa9abe850fb681b37aea45ef8b"
-    }
-    Frame {
-        msec: 2768
-        hash: "0505101f0edaaf7ff17deeaaddc6bbf9"
-    }
-    Frame {
-        msec: 2784
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2800
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2816
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2832
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2848
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2864
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2880
-        image: "dynamic.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2912
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2928
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2944
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2960
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2976
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2992
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 3008
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 3024
-        hash: "99e4d853d64a381e8db27707b5ff2b25"
-    }
-    Frame {
-        msec: 3040
-        hash: "ab0e62aeffc0d57a5e1d63e6cf49b809"
-    }
-    Frame {
-        msec: 3056
-        hash: "4ab11bbf1fb6adb0eec8895f78a24a41"
-    }
-    Frame {
-        msec: 3072
-        hash: "634ff2ceb39a3f263a3362238a4ae252"
-    }
-    Frame {
-        msec: 3088
-        hash: "7f4856873dc23a02297b2497101de9b9"
-    }
-    Frame {
-        msec: 3104
-        hash: "bca3919e9d8e6dc5badd8090401dc934"
-    }
-    Frame {
-        msec: 3120
-        hash: "824bfe40c3657cfe1368563640e4cfce"
-    }
-    Frame {
-        msec: 3136
-        hash: "f831c1600f68bda139697c406ca70c5e"
-    }
-    Frame {
-        msec: 3152
-        hash: "f8102ca251a9ff46a8fe5a24cff0d2d6"
-    }
-    Frame {
-        msec: 3168
-        hash: "f33407ad684aa16efc6615d1cf6fa4b9"
-    }
-    Frame {
-        msec: 3184
-        hash: "a73d27f776a6ebfc90309b34421700e5"
-    }
-    Frame {
-        msec: 3200
-        hash: "ff2a4e2663fc50dfec35152f0e79f935"
-    }
-    Frame {
-        msec: 3216
-        hash: "4935f5f58f2672e9d240625151044bda"
-    }
-    Frame {
-        msec: 3232
-        hash: "f3ad5c203f621fe4d5d321c3c1880743"
-    }
-    Frame {
-        msec: 3248
-        hash: "d4fb7cd2e1f6a533dae65ddbb50da8ac"
-    }
-    Frame {
-        msec: 3264
-        hash: "91705e9234c4f02d0a730f6270f9e95f"
-    }
-    Frame {
-        msec: 3280
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3296
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3312
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3328
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3344
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3360
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3376
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3392
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3408
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3424
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3440
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3456
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3472
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3488
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3504
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3520
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3536
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3552
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3568
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3584
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3600
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3616
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3632
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3648
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3664
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3680
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3696
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3712
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3728
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3744
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3760
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3776
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3792
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3808
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3824
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3840
-        image: "dynamic.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3872
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3888
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3904
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3920
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3936
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3952
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3968
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3984
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4000
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4016
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4032
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4048
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4064
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4080
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4096
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4112
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4128
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4144
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4160
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4176
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4192
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4208
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4224
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4240
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4256
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4272
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4288
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4304
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4320
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4336
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4352
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4368
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4384
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4400
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4416
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4432
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4448
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4464
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4480
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4496
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4512
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4528
-        hash: "9681be99003f8a14cc5654d06d2c8255"
-    }
-    Frame {
-        msec: 4544
-        hash: "bcb592a2335aa2e35956881fd028f4e6"
-    }
-    Frame {
-        msec: 4560
-        hash: "f914b25fdcb02a02b71220d82b7b2a75"
-    }
-    Frame {
-        msec: 4576
-        hash: "63c82c08eb7f2bd50b54b94c952df3f2"
-    }
-    Frame {
-        msec: 4592
-        hash: "8a8dc82be81fa55605c6c2e749895120"
-    }
-    Frame {
-        msec: 4608
-        hash: "271f8d79b8052dfcd840ffa9ba9ffeec"
-    }
-    Frame {
-        msec: 4624
-        hash: "8f77bbd0585b57e69ac1919bd81ee3b1"
-    }
-    Frame {
-        msec: 4640
-        hash: "b974260a2f90e141ebc33ced98fbca88"
-    }
-    Frame {
-        msec: 4656
-        hash: "77ada180f8a45652a6fa636d7ece4d9d"
-    }
-    Frame {
-        msec: 4672
-        hash: "4c8dc2e33cd989cb3b0938c6c75b5f95"
-    }
-    Frame {
-        msec: 4688
-        hash: "a145954989508b925a444e14f0c27a20"
-    }
-    Frame {
-        msec: 4704
-        hash: "8d27ff203819174747ae4a5cee8d0ae8"
-    }
-    Frame {
-        msec: 4720
-        hash: "830f34b0dab780c6efe2294872ba8508"
-    }
-    Frame {
-        msec: 4736
-        hash: "5d70a4bbd815569cfe5735b596bad080"
-    }
-    Frame {
-        msec: 4752
-        hash: "964527bb82ea006e03b030c787a8597c"
-    }
-    Frame {
-        msec: 4768
-        hash: "1ad54954b818fa9e6032ac4b6114e7db"
-    }
-    Frame {
-        msec: 4784
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4800
-        image: "dynamic.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4832
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4848
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4864
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4880
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4896
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4912
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4928
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4944
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4960
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4976
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4992
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 5008
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 5024
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 5040
-        hash: "baeb8adffc13e230e797e0437f2ad5fa"
-    }
-    Frame {
-        msec: 5056
-        hash: "d2e440fcad0ee2b7b35d7e5c4e581f73"
-    }
-    Frame {
-        msec: 5072
-        hash: "fb8acb2f69234d3ee089281d0297ad7c"
-    }
-    Frame {
-        msec: 5088
-        hash: "7fda29a83dc535ed8d6b35e999400311"
-    }
-    Frame {
-        msec: 5104
-        hash: "6482e3eb10cfdbdeb57dd38ba3e3d67e"
-    }
-    Frame {
-        msec: 5120
-        hash: "4d222549bc2565c1598a532460aae4e6"
-    }
-    Frame {
-        msec: 5136
-        hash: "776d1b0f9945c0e1ceda0cf117264919"
-    }
-    Frame {
-        msec: 5152
-        hash: "f2c362b34a0982ee1a11dea6b063945e"
-    }
-    Frame {
-        msec: 5168
-        hash: "115f02b8893972b5b1d63525ce70762e"
-    }
-    Frame {
-        msec: 5184
-        hash: "7f2d53581fe2c6c45a628fa4cd9b5742"
-    }
-    Frame {
-        msec: 5200
-        hash: "b5ed1120c4edf842b15d5144adbd93b0"
-    }
-    Frame {
-        msec: 5216
-        hash: "3511938df57c4cdce316692de204b057"
-    }
-    Frame {
-        msec: 5232
-        hash: "99583918d068ab5d132fe7a699c2a7a6"
-    }
-    Frame {
-        msec: 5248
-        hash: "c0ce9df18479dbb57fb1dbc777f4f0e5"
-    }
-    Frame {
-        msec: 5264
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5280
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5296
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5312
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5328
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5344
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5360
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5376
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5392
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5408
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5424
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5440
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5456
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5472
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5488
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5504
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5520
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5536
-        hash: "98cc64411264d8a635a6afe6b11cee6e"
-    }
-    Frame {
-        msec: 5552
-        hash: "b86434b7af8ad1db946c43a2791d69ab"
-    }
-    Frame {
-        msec: 5568
-        hash: "f45616f9e33658d1dddb537e842c8768"
-    }
-    Frame {
-        msec: 5584
-        hash: "e49d8955e27cdc19a37c331e56c81af1"
-    }
-    Frame {
-        msec: 5600
-        hash: "b2dbe764906b50195f65dc11a5842515"
-    }
-    Frame {
-        msec: 5616
-        hash: "71ce7c63d65c29cdffd83f5ae07f0b93"
-    }
-    Frame {
-        msec: 5632
-        hash: "901d01e1fc777ec185cd023ad0ace4c1"
-    }
-    Frame {
-        msec: 5648
-        hash: "a3f31de30fc2e92bae1f735504216216"
-    }
-    Frame {
-        msec: 5664
-        hash: "0fc52dd8102506e3e7671fa548551b23"
-    }
-    Frame {
-        msec: 5680
-        hash: "fb92809e728416035dbb91116ad8fe0e"
-    }
-    Frame {
-        msec: 5696
-        hash: "9003dc8ca4f781909035cb03dc45864f"
-    }
-    Frame {
-        msec: 5712
-        hash: "2bff1de793ad8521fd54413849c3cf29"
-    }
-    Frame {
-        msec: 5728
-        hash: "8362e4db7c4446282d844a4fc6632d19"
-    }
-    Frame {
-        msec: 5744
-        hash: "b874fa274c6ec77c106ff4a0288f9169"
-    }
-    Frame {
-        msec: 5760
-        image: "dynamic.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5792
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5808
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5824
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5840
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5856
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5872
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5888
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5904
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5920
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5936
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5952
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5968
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5984
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 6000
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 6016
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 6032
-        hash: "7621e64568058b82bcb6f6b46cee3ebc"
-    }
-    Frame {
-        msec: 6048
-        hash: "f77f6de6fc88813f49427b4888a59dbf"
-    }
-    Frame {
-        msec: 6064
-        hash: "d3a48f596219372ac25941e4c5ec5b2b"
-    }
-    Frame {
-        msec: 6080
-        hash: "d572d932b613f9ca1e0acf144f127dd1"
-    }
-    Frame {
-        msec: 6096
-        hash: "edf317eaf51d933bcd0f57f214921a81"
-    }
-    Frame {
-        msec: 6112
-        hash: "e0cee7959a5a8a08ad03d75e7b5c6ca1"
-    }
-    Frame {
-        msec: 6128
-        hash: "96877a15f44d4a2c8d9974cb28b9e1b6"
-    }
-    Frame {
-        msec: 6144
-        hash: "c0ffb0ef6dd9d007d201feebd2f68e44"
-    }
-    Frame {
-        msec: 6160
-        hash: "209fb930223243fa19c5dde9e85ec518"
-    }
-    Frame {
-        msec: 6176
-        hash: "ae98ac4dba0e78eb8fb7f7dbe29b2832"
-    }
-    Frame {
-        msec: 6192
-        hash: "c94a7d68ce007d83df77a595a5815a96"
-    }
-    Frame {
-        msec: 6208
-        hash: "4c28e409bf5a6c1289bcab8cd59a9e42"
-    }
-    Frame {
-        msec: 6224
-        hash: "ea1009f1a3446dd5ce937e6949794794"
-    }
-    Frame {
-        msec: 6240
-        hash: "940c16766c2f87feef48e1187672ca9b"
-    }
-    Frame {
-        msec: 6256
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6272
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6288
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6304
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6320
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6336
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6352
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6368
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6384
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
deleted file mode 100644
index 3234c98..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
index bdf8fee..5d88df7 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
@@ -6,334 +6,130 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 32
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 48
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 64
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 80
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 96
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 112
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 128
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 144
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 160
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 176
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 192
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 208
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 224
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 240
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 256
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "1a396cf01a6c31155609532654653599"
     }
     Frame {
         msec: 272
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 288
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 304
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 320
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 336
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 352
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 368
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 384
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 400
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 416
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 432
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 448
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 464
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 480
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 496
-        hash: "e9c524091a0351926c3d658b9935f176"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
     Frame {
         msec: 512
-        hash: "e9c524091a0351926c3d658b9935f176"
-    }
-    Frame {
-        msec: 528
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 544
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 560
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 576
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 592
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 608
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 624
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 640
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 656
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 672
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 688
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 704
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 720
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 736
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 752
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 768
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 784
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 800
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 816
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 832
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 848
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 864
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 880
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 896
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 912
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 928
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 944
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 960
-        image: "usingRepeater.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 992
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1008
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1024
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1040
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1056
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1072
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1088
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1104
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1120
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1136
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1152
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1168
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1184
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1200
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1216
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1232
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1248
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1264
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1280
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1296
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1312
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
-    }
-    Frame {
-        msec: 1328
-        hash: "2b1fb0ebb6f728fe685d95b5947cce90"
+        hash: "8a4565aee33d40840bda26b65b6a0d90"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
index 8da3602..8a522a5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
@@ -1,13 +1,14 @@
 import QtQuick 1.0
 
+//Expected to fail until QTBUG-14839 is resolved
 Item {
-    width: 400; height: 400;
+    width: 120; height: 60;
     property int step: 0
     function tick()
     {
         step++;
         if(step == 1){
-            row1.destroy(); //Not dynamically created, so is this valid?
+            //row1.destroy(); //Not dynamically created, so is this valid?
         }else if(step == 2){
             r2a.destroy();
         }else if(step == 3){
@@ -21,42 +22,46 @@ Item {
         }else if(step == 7){
             r3c.parent = row2;
         }else if(step == 8){
-            row3.destroy();
+            //row3.destroy();//empty now, so should have no effect//May be invalid, but was deleting the reparent items at one point
         }else{
             repeater.model++;
         }
     }
 
-    //Tests base positioner functionality, so just using row
-    Row{
-        id: row1
-        Rectangle{id: r1a; width:20; height:20; color: "red"}
-        Rectangle{id: r1b; width:20; height:20; color: "green"}
-        Rectangle{id: r1c; width:20; height:20; color: "blue"}
-    }
-    Row{
-        y:20
-        id: row2
-        move: Transition{NumberAnimation{properties:"x"}}
-        Repeater{ 
-            id: repeater 
-            model: 0; 
-            delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}}
+    //Tests base positioner functionality, so don't need them all.
+    Column{
+        move: Transition{NumberAnimation{properties:"y"}}
+        Row{
+            id: row1
+            height: childrenRect.height
+            Rectangle{id: r1a; width:20; height:20; color: "red"}
+            Rectangle{id: r1b; width:20; height:20; color: "green"}
+            Rectangle{id: r1c; width:20; height:20; color: "blue"}
+        }
+        Row{
+            id: row2
+            height: childrenRect.height
+            move: Transition{NumberAnimation{properties:"x"}}
+            Repeater{ 
+                id: repeater 
+                model: 0; 
+                delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}}
+            }
+            Rectangle{id: r2a; width:20; height:20; color: "red"}
+            Rectangle{id: r2b; width:20; height:20; color: "green"}
+            Rectangle{id: r2c; width:20; height:20; color: "blue"}
+        }
+        Row{
+            move: Transition{NumberAnimation{properties:"x"}}
+            id: row3
+            height: childrenRect.height
+            Rectangle{id: r3a; width:20; height:20; color: "red"}
+            Rectangle{id: r3b; width:20; height:20; color: "green"}
+            Rectangle{id: r3c; width:20; height:20; color: "blue"}
         }
-        Rectangle{id: r2a; width:20; height:20; color: "red"}
-        Rectangle{id: r2b; width:20; height:20; color: "green"}
-        Rectangle{id: r2c; width:20; height:20; color: "blue"}
-    }
-    Row{
-        move: Transition{NumberAnimation{properties:"x"}}
-        y:40
-        id: row3
-        Rectangle{id: r3a; width:20; height:20; color: "red"}
-        Rectangle{id: r3b; width:20; height:20; color: "green"}
-        Rectangle{id: r3c; width:20; height:20; color: "blue"}
     }
     Timer{
-        interval: 500;
+        interval: 250;
         running: true;
         repeat: true;
         onTriggered: tick();
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
index c318a99..c236b6a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
@@ -1,7 +1,7 @@
 import QtQuick 1.0
 
 Item{
-    width: 200; height: 600
+    width: 40; height: 320
     Column{
         Rectangle{color:"Red"; width:40; height:40;}
         Repeater{
@@ -11,5 +11,6 @@ Item{
         }
         Rectangle{color:"Blue"; width:40; height:40;}
     }
-    Timer{ interval: 500; running: true; onTriggered: rep.model=6;}
+    Timer{ interval: 250; running: true; onTriggered: rep.model=6;}
+    Timer{ interval: 500; running: true; onTriggered: Qt.quit();}
 }
-- 
cgit v0.12


From 8389b9c2cdb2957c3e6db678e39fba060df9d045 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 12:13:26 +1000
Subject: Clean up qdeclarativesmoothedanimation visual tests

Smoothed animation test is actually just a subset of smoothed follow now

Task-number: QTBUG-14792
---
 .../data/easefollow.0.png                          |  Bin 1305 -> 0 bytes
 .../data/easefollow.1.png                          |  Bin 1306 -> 0 bytes
 .../data/easefollow.2.png                          |  Bin 1305 -> 0 bytes
 .../data/easefollow.3.png                          |  Bin 1303 -> 0 bytes
 .../data/easefollow.4.png                          |  Bin 1303 -> 0 bytes
 .../data/easefollow.5.png                          |  Bin 1305 -> 0 bytes
 .../data/easefollow.6.png                          |  Bin 1306 -> 0 bytes
 .../data/easefollow.qml                            | 1807 --------------------
 .../smoothedanimation.qml                          |   45 -
 9 files changed, 1852 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.0.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.0.png
deleted file mode 100644
index 21b6afb..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.1.png
deleted file mode 100644
index bb8a02b..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.2.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.2.png
deleted file mode 100644
index da60237..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.3.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.3.png
deleted file mode 100644
index 3e943e8..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.4.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.4.png
deleted file mode 100644
index 4fbaf26..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.5.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.5.png
deleted file mode 100644
index c10d196..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.6.png
deleted file mode 100644
index a672c06..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.qml b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.qml
deleted file mode 100644
index 2500ef0..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.qml
+++ /dev/null
@@ -1,1807 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "1f60efdb8704b92c9361daa468a25391"
-    }
-    Frame {
-        msec: 32
-        hash: "3bb6a87617e0e5d4922e573eec975886"
-    }
-    Frame {
-        msec: 48
-        hash: "268941737e6324d580890b151de621fb"
-    }
-    Frame {
-        msec: 64
-        hash: "99c674eccc082d7f0982257a748d93e5"
-    }
-    Frame {
-        msec: 80
-        hash: "2970467e8262c8a3f0b11be71245d048"
-    }
-    Frame {
-        msec: 96
-        hash: "63cbd06d6bb035d27c18dba49238d8b2"
-    }
-    Frame {
-        msec: 112
-        hash: "49f77bb3d323f882c0ec56e1f1040b3a"
-    }
-    Frame {
-        msec: 128
-        hash: "40263c5f9b5d2236536163785f832b4d"
-    }
-    Frame {
-        msec: 144
-        hash: "dc63b1c21a2027c4beb9c297a3677fbd"
-    }
-    Frame {
-        msec: 160
-        hash: "4fab52ea29a819fec032f19dbcbef012"
-    }
-    Frame {
-        msec: 176
-        hash: "60b48407a8f8ae2cce7d3e7c8b21991c"
-    }
-    Frame {
-        msec: 192
-        hash: "6e542c681092a5ebeef0534fa2bd2d6c"
-    }
-    Frame {
-        msec: 208
-        hash: "c7c6471969bbf81efdb86d1695548fc6"
-    }
-    Frame {
-        msec: 224
-        hash: "b7f4ad9a49feb400894209c02b94478a"
-    }
-    Frame {
-        msec: 240
-        hash: "3eb58b2f5233aead976183c13f241113"
-    }
-    Frame {
-        msec: 256
-        hash: "54f2036c50c6d8079fc0cadc01385980"
-    }
-    Frame {
-        msec: 272
-        hash: "f297659d75f6e724d72bd548821f4c9f"
-    }
-    Frame {
-        msec: 288
-        hash: "112798f080336fc9c603a7e9097dd8aa"
-    }
-    Frame {
-        msec: 304
-        hash: "c432e6ec2b53ca43cb7a7325d0cc379b"
-    }
-    Frame {
-        msec: 320
-        hash: "4a6d3db3efd665ad7f372bf3f2508ed7"
-    }
-    Frame {
-        msec: 336
-        hash: "0befa5dc4d2cc196fed0eb1a3aa75b8f"
-    }
-    Frame {
-        msec: 352
-        hash: "a34d010b50d59c362b54e44d69c2df91"
-    }
-    Frame {
-        msec: 368
-        hash: "cbdacced50186c87066ce1d46548b27e"
-    }
-    Frame {
-        msec: 384
-        hash: "a4060010ae4d3c0973bda48d68f7bd0a"
-    }
-    Frame {
-        msec: 400
-        hash: "47353437da587f732f986004c09884d0"
-    }
-    Frame {
-        msec: 416
-        hash: "080c348145167bbec671a04da6f7564f"
-    }
-    Frame {
-        msec: 432
-        hash: "69dead737c717a076ae3865680341fb4"
-    }
-    Frame {
-        msec: 448
-        hash: "1efdc31c5c8fa72fc848877deb6caaa4"
-    }
-    Frame {
-        msec: 464
-        hash: "28d7da1e933d0585d03acf4a529e7b42"
-    }
-    Frame {
-        msec: 480
-        hash: "bf85534124bf025b7ede0d6c80b8e443"
-    }
-    Frame {
-        msec: 496
-        hash: "cdbeb2d51541b1b1eff060efe993db91"
-    }
-    Frame {
-        msec: 512
-        hash: "52ad56ae16c8ab523adda8edc512dd87"
-    }
-    Frame {
-        msec: 528
-        hash: "61b1937f4c8dd2cb0ddd7031c5bfb3ab"
-    }
-    Frame {
-        msec: 544
-        hash: "1b109baba71b16827f90da654af093a3"
-    }
-    Frame {
-        msec: 560
-        hash: "d56621362802c8626868f36ba1e7db22"
-    }
-    Frame {
-        msec: 576
-        hash: "ee5555ec3ad8760f43bbf5958a925936"
-    }
-    Frame {
-        msec: 592
-        hash: "1ed2831144a453af1978605c0e42d17c"
-    }
-    Frame {
-        msec: 608
-        hash: "c74d5cdb3395a702269dfa88c8c9d975"
-    }
-    Frame {
-        msec: 624
-        hash: "ea98ddd9588cc23fd82a342ec2925ba8"
-    }
-    Frame {
-        msec: 640
-        hash: "e76b94d6d57f1a510f7649eaab892562"
-    }
-    Frame {
-        msec: 656
-        hash: "022f40b6fe9dbaf8019855234acb3461"
-    }
-    Frame {
-        msec: 672
-        hash: "467da4f48aa6aeb113f0797facf157e8"
-    }
-    Frame {
-        msec: 688
-        hash: "8df407aadd4d896eb6537e1555a0242f"
-    }
-    Frame {
-        msec: 704
-        hash: "122e4671881e31f54e617729f4fbb3b0"
-    }
-    Frame {
-        msec: 720
-        hash: "562718f101c3cd7525b890076413df5e"
-    }
-    Frame {
-        msec: 736
-        hash: "07feae99ecf4b70eb094fd3e10deca56"
-    }
-    Frame {
-        msec: 752
-        hash: "0980d133b1006cc07796023880415163"
-    }
-    Frame {
-        msec: 768
-        hash: "7112b6ac97678b3b942c64c5108f0329"
-    }
-    Frame {
-        msec: 784
-        hash: "bb9f893a9aaee60ab6c30918552828a4"
-    }
-    Frame {
-        msec: 800
-        hash: "65d1f29437aaaea33676757276f1e434"
-    }
-    Frame {
-        msec: 816
-        hash: "52adcf2509f3236ac8ef571708e77206"
-    }
-    Frame {
-        msec: 832
-        hash: "22df5e7eda8a813531d0e0366cbfbf64"
-    }
-    Frame {
-        msec: 848
-        hash: "fe9b7b7812dd2410b8ed2eb19aa78f4d"
-    }
-    Frame {
-        msec: 864
-        hash: "141e22de4469f316b5ef5471f3c7bba0"
-    }
-    Frame {
-        msec: 880
-        hash: "1125c0a105fc4a2cae36b798058ce23f"
-    }
-    Frame {
-        msec: 896
-        hash: "8c17c5da2ae867fb0016a485ba9e4166"
-    }
-    Frame {
-        msec: 912
-        hash: "d8da9fc7ec4dcefb894c5a6a71e9d001"
-    }
-    Frame {
-        msec: 928
-        hash: "00ff642bea89fd89de394d78f8c5db33"
-    }
-    Frame {
-        msec: 944
-        hash: "8549063d517a3ce1ffd44c56b3b6cf5e"
-    }
-    Frame {
-        msec: 960
-        image: "easefollow.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "95a642caa72bb31cc1e04ecc12d07cd0"
-    }
-    Frame {
-        msec: 992
-        hash: "e65c823476bf920d0386f62ca831e6a0"
-    }
-    Frame {
-        msec: 1008
-        hash: "91e8913dc693c91a674a10b5b088dd8f"
-    }
-    Frame {
-        msec: 1024
-        hash: "1a469ffa0d530f72c78dc14783891c78"
-    }
-    Frame {
-        msec: 1040
-        hash: "6e46a83d07f8bc034b421103ef0e4f8c"
-    }
-    Frame {
-        msec: 1056
-        hash: "8ddacab411a8b73b6c9e69576fa1b003"
-    }
-    Frame {
-        msec: 1072
-        hash: "41f419a85fe44efe27c9a526d83a1e9a"
-    }
-    Frame {
-        msec: 1088
-        hash: "73d4ece31b258f9caf4556ce20a5be1f"
-    }
-    Frame {
-        msec: 1104
-        hash: "ef3ebe0acb50386cf79b9f08fbba2fbc"
-    }
-    Frame {
-        msec: 1120
-        hash: "c11a84d2fa80f28adb1466409812e987"
-    }
-    Frame {
-        msec: 1136
-        hash: "2e9db854b02d28b38063ff2a8e821ed1"
-    }
-    Frame {
-        msec: 1152
-        hash: "48e073c0e6b19aea8314629a2179af87"
-    }
-    Frame {
-        msec: 1168
-        hash: "77e518b7428d93b67a8fb0d33d85ed97"
-    }
-    Frame {
-        msec: 1184
-        hash: "1d18323af9c62e015513451883f8b39f"
-    }
-    Frame {
-        msec: 1200
-        hash: "df49889ba157cdc1ca240d08d2760ad7"
-    }
-    Frame {
-        msec: 1216
-        hash: "7b8cd2bcf0a4c38ab870f27894a43d2f"
-    }
-    Frame {
-        msec: 1232
-        hash: "84f10e0c9fd57dd1799df7fc34c5ef01"
-    }
-    Frame {
-        msec: 1248
-        hash: "ead4e609bc4a0755032b1648485b9625"
-    }
-    Frame {
-        msec: 1264
-        hash: "9a9829c3bd4a3a4155383c37e21e8db8"
-    }
-    Frame {
-        msec: 1280
-        hash: "5008917f60256abad867f32c1caf954d"
-    }
-    Frame {
-        msec: 1296
-        hash: "c21455d66ed0754177af5ce44b7c7600"
-    }
-    Frame {
-        msec: 1312
-        hash: "e8332f2586d80a2700b610e8fe5c72d9"
-    }
-    Frame {
-        msec: 1328
-        hash: "0d0c8af138f98bae8a370ebec4a4796c"
-    }
-    Frame {
-        msec: 1344
-        hash: "04065e8feeb900d18deeb941572f7f10"
-    }
-    Frame {
-        msec: 1360
-        hash: "992a225b1f25bf5b21dd7f8a55dc4b70"
-    }
-    Frame {
-        msec: 1376
-        hash: "8ef739d91ee2a4337cbfc3dc94ce9845"
-    }
-    Frame {
-        msec: 1392
-        hash: "46744977a26b37ab65e65e1891ceafe7"
-    }
-    Frame {
-        msec: 1408
-        hash: "1b4c0d79eeb8d6b2e30172f3664407b9"
-    }
-    Frame {
-        msec: 1424
-        hash: "d572831ed34d14d1125570b8b8767bdb"
-    }
-    Frame {
-        msec: 1440
-        hash: "8b785c756d11e0fc18959d0897a45673"
-    }
-    Frame {
-        msec: 1456
-        hash: "164a71ffcea63ceb6c1ebeb8d0d07af1"
-    }
-    Frame {
-        msec: 1472
-        hash: "e128dc12d5117eed9f7c0a16e8348ba2"
-    }
-    Frame {
-        msec: 1488
-        hash: "4c7db5b12d83bf22b1c88ac06ca7c385"
-    }
-    Frame {
-        msec: 1504
-        hash: "c7283df8dbd78121e17a5893e3ea4f3c"
-    }
-    Frame {
-        msec: 1520
-        hash: "fea768e5bb43f6d86d88ced9f73915de"
-    }
-    Frame {
-        msec: 1536
-        hash: "b99b54f8e75452c539bb4e7b6a36e944"
-    }
-    Frame {
-        msec: 1552
-        hash: "b7274938d16f03b376ad9739e2e893f1"
-    }
-    Frame {
-        msec: 1568
-        hash: "e61601942193add8c1c8ebf5c5319932"
-    }
-    Frame {
-        msec: 1584
-        hash: "8fdc2181e0120391505706716ba7e5d7"
-    }
-    Frame {
-        msec: 1600
-        hash: "66f737ed28453da5175d6b5e807c374d"
-    }
-    Frame {
-        msec: 1616
-        hash: "2e00a7895d61edbe794f0a8000871b30"
-    }
-    Frame {
-        msec: 1632
-        hash: "1a279fc6b7c4105eccc4e3bc99481bef"
-    }
-    Frame {
-        msec: 1648
-        hash: "bc1dea4d23ca9bc29b72a8c2bde4787b"
-    }
-    Frame {
-        msec: 1664
-        hash: "8ef40e0be5fb82b32b365b3d4b85421d"
-    }
-    Frame {
-        msec: 1680
-        hash: "ee37c68bf38d5eed4e3e9a31306f6801"
-    }
-    Frame {
-        msec: 1696
-        hash: "303d760c87a7a833606c8e9f46cb5fc0"
-    }
-    Frame {
-        msec: 1712
-        hash: "cc2563b47c58efd39bec6b4e0f2995bb"
-    }
-    Frame {
-        msec: 1728
-        hash: "33f7daf09497510475283d6dc7c51228"
-    }
-    Frame {
-        msec: 1744
-        hash: "5b5e2de9934c80bd49e0eb7afd85151d"
-    }
-    Frame {
-        msec: 1760
-        hash: "5e6bf706336789ca6b60a82998b70113"
-    }
-    Frame {
-        msec: 1776
-        hash: "b4d4a860f49bfb88dd2079862b40b7ec"
-    }
-    Frame {
-        msec: 1792
-        hash: "07b571fa55327487e34a592c778beb67"
-    }
-    Frame {
-        msec: 1808
-        hash: "cb5b349a536cf75a83734181b3eab92b"
-    }
-    Frame {
-        msec: 1824
-        hash: "ce903bb58c5c86f2955e68412893aedf"
-    }
-    Frame {
-        msec: 1840
-        hash: "ffa89e879558c83ed538812a93e2fe29"
-    }
-    Frame {
-        msec: 1856
-        hash: "562aa66bf537853be82a654542c8b80e"
-    }
-    Frame {
-        msec: 1872
-        hash: "dc45dac0cc20220bcc81210fb5506ee2"
-    }
-    Frame {
-        msec: 1888
-        hash: "3b429eb827df0800a1ad8b906ea32ef9"
-    }
-    Frame {
-        msec: 1904
-        hash: "d6ebaf12515d9e24cdbf6d75080c0b28"
-    }
-    Frame {
-        msec: 1920
-        image: "easefollow.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "9f6d26224055c809dc2f3490cd0ff880"
-    }
-    Frame {
-        msec: 1952
-        hash: "5630cc8f0b401f7d81bdceaaae5cce68"
-    }
-    Frame {
-        msec: 1968
-        hash: "dafda60467e5e2b99c41543dd191ac2d"
-    }
-    Frame {
-        msec: 1984
-        hash: "e053cb07a734278cd111d612883c165e"
-    }
-    Frame {
-        msec: 2000
-        hash: "63870f3e99c11707004dab9439d61389"
-    }
-    Frame {
-        msec: 2016
-        hash: "14c311a6fab45f828c3a19535ea9edc8"
-    }
-    Frame {
-        msec: 2032
-        hash: "13e614446cbfcbfd2a7ecc5f0e8688df"
-    }
-    Frame {
-        msec: 2048
-        hash: "173c97f59da05b9347180a4824e60c06"
-    }
-    Frame {
-        msec: 2064
-        hash: "932e2a9bbcb7dc5befca8f63d8fa3c95"
-    }
-    Frame {
-        msec: 2080
-        hash: "4b8f232ffe0cbc7f900de5737c9f95be"
-    }
-    Frame {
-        msec: 2096
-        hash: "9686d294d4e931a5eed0e6b5bda63377"
-    }
-    Frame {
-        msec: 2112
-        hash: "969c569d92e3ec51dfbdd20d64432224"
-    }
-    Frame {
-        msec: 2128
-        hash: "0cef3550cca9fb5611b836098c517dd1"
-    }
-    Frame {
-        msec: 2144
-        hash: "6728080a09aa5d48462a3abb8e285e8a"
-    }
-    Frame {
-        msec: 2160
-        hash: "4b904dc671b7fc72db0b6e52543e96bd"
-    }
-    Frame {
-        msec: 2176
-        hash: "38232f89dffc9b16db6ea60b02f8d1be"
-    }
-    Frame {
-        msec: 2192
-        hash: "6b41f2a0f950eddad217a03e137f9a9b"
-    }
-    Frame {
-        msec: 2208
-        hash: "be576ea74c2c404da46fcf1d22de6df9"
-    }
-    Frame {
-        msec: 2224
-        hash: "3f44bad4b51ceff2944337064a5efa91"
-    }
-    Frame {
-        msec: 2240
-        hash: "e1ab98ac1366e9fd8af62a6a26878c73"
-    }
-    Frame {
-        msec: 2256
-        hash: "bd131e1725a54b3dbbb86a29ca8a56a9"
-    }
-    Frame {
-        msec: 2272
-        hash: "4d3e8af70f228643803f780c4e36f1a6"
-    }
-    Frame {
-        msec: 2288
-        hash: "853a5ab4271af7a7638454cfa883aa33"
-    }
-    Frame {
-        msec: 2304
-        hash: "ede9260157000f346900153ce2409278"
-    }
-    Frame {
-        msec: 2320
-        hash: "b2b16d8ce1ba89f0d9558ac387e25c3d"
-    }
-    Frame {
-        msec: 2336
-        hash: "387d338910453637c5cf80fa35528e56"
-    }
-    Frame {
-        msec: 2352
-        hash: "26deabf9cdd994455f2a8802eb0e04dc"
-    }
-    Frame {
-        msec: 2368
-        hash: "13939659a315dae1b81e3ea166102edf"
-    }
-    Frame {
-        msec: 2384
-        hash: "be92b55bb7562372401b25a9167abb2b"
-    }
-    Frame {
-        msec: 2400
-        hash: "ee7bf60d7ee97b7de5e909b9af88df80"
-    }
-    Frame {
-        msec: 2416
-        hash: "434313a3bcd1d7582b0d89b9a145ef09"
-    }
-    Frame {
-        msec: 2432
-        hash: "0857ca59a283897e3df62b9633488f83"
-    }
-    Frame {
-        msec: 2448
-        hash: "76718fc7e3d21b54930bc8307a57733a"
-    }
-    Frame {
-        msec: 2464
-        hash: "93a91588b38129053a462b920fd686e3"
-    }
-    Frame {
-        msec: 2480
-        hash: "2a2486c52fde915696fd8cbd3682e8db"
-    }
-    Frame {
-        msec: 2496
-        hash: "b1f4ab6cc5fb4a3a1b4885f2d1b29277"
-    }
-    Frame {
-        msec: 2512
-        hash: "4258afce8a85a2e9ead149e34b43d8fc"
-    }
-    Frame {
-        msec: 2528
-        hash: "6672c71b98e13d51ebb523aed9036a72"
-    }
-    Frame {
-        msec: 2544
-        hash: "eaa39af7eb78948f433e3b44a9454317"
-    }
-    Frame {
-        msec: 2560
-        hash: "0a766bc97bea67d4b848c703eaa6777a"
-    }
-    Frame {
-        msec: 2576
-        hash: "0b461ec1885ede1dd96b71cf38bfd3d6"
-    }
-    Frame {
-        msec: 2592
-        hash: "15efc929370a3864529080e30db1026a"
-    }
-    Frame {
-        msec: 2608
-        hash: "e1529e30ff1e4ea1b092a88e85f2f1f6"
-    }
-    Frame {
-        msec: 2624
-        hash: "f29bd9dbf7317e94b885da63f0cb7374"
-    }
-    Frame {
-        msec: 2640
-        hash: "e5294e087e2ce0d7d936c0129b6c37ae"
-    }
-    Frame {
-        msec: 2656
-        hash: "9c63129e774b391cc398cf5da5c9339c"
-    }
-    Frame {
-        msec: 2672
-        hash: "4371d85854419d4b00671176bb7c5a2b"
-    }
-    Frame {
-        msec: 2688
-        hash: "dd10b3f50e2fdc56c75f00321634b1cc"
-    }
-    Frame {
-        msec: 2704
-        hash: "aac6256b21152a5f1f8c576b667d275e"
-    }
-    Frame {
-        msec: 2720
-        hash: "c937c44037b2228590d334df4d56a86f"
-    }
-    Frame {
-        msec: 2736
-        hash: "f6c714db51cbd1bdb737afe612c33f9c"
-    }
-    Frame {
-        msec: 2752
-        hash: "0bba45af79f3201bc7cf042d5c648f73"
-    }
-    Frame {
-        msec: 2768
-        hash: "941b08ddbafea3bd46262c060b1e290b"
-    }
-    Frame {
-        msec: 2784
-        hash: "d898918dc2023de239b4ab38f7420960"
-    }
-    Frame {
-        msec: 2800
-        hash: "d1a16dc2282329113093d06862e7a871"
-    }
-    Frame {
-        msec: 2816
-        hash: "bba5359475f643fbeee240e71e843d4c"
-    }
-    Frame {
-        msec: 2832
-        hash: "03cf861f4b6bc767e723e47e95c2448b"
-    }
-    Frame {
-        msec: 2848
-        hash: "a64bf158c6199b88bc2db3b741d342f0"
-    }
-    Frame {
-        msec: 2864
-        hash: "cf0fe7cb42ba842f1c28c1211adb768d"
-    }
-    Frame {
-        msec: 2880
-        image: "easefollow.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "9b3c6414e4ef5a452a5c92bb0b893fc3"
-    }
-    Frame {
-        msec: 2912
-        hash: "7cc7ddec3ac2d8cac33c0b0f80a7544d"
-    }
-    Frame {
-        msec: 2928
-        hash: "7dd4e7d606e953c872c57fad786d64aa"
-    }
-    Frame {
-        msec: 2944
-        hash: "117cc903a39d99ca22f6556095e6f883"
-    }
-    Frame {
-        msec: 2960
-        hash: "c6c9304fd65fee1909473bdb21ac7806"
-    }
-    Frame {
-        msec: 2976
-        hash: "8e704fe81c040f49c4d80e7dcc46084d"
-    }
-    Frame {
-        msec: 2992
-        hash: "d202d5c0a058e1e088fdd280e59f17bb"
-    }
-    Frame {
-        msec: 3008
-        hash: "90c072dea32c056f8bd6d010df681929"
-    }
-    Frame {
-        msec: 3024
-        hash: "80b4e99f1b47e64084e295a2a3e1121e"
-    }
-    Frame {
-        msec: 3040
-        hash: "41d6307075ec9ae9e92d227921f71289"
-    }
-    Frame {
-        msec: 3056
-        hash: "f33de23cf4a5c4881310c6866261d387"
-    }
-    Frame {
-        msec: 3072
-        hash: "441faa0a1fc95d66b27479dfc1e40188"
-    }
-    Frame {
-        msec: 3088
-        hash: "2314b5f6ba3864abd5e87bc87bd621b0"
-    }
-    Frame {
-        msec: 3104
-        hash: "e71e3b0ad953258ceef3101e38283fdb"
-    }
-    Frame {
-        msec: 3120
-        hash: "890c3b0e727f136bf1ccc486531c9677"
-    }
-    Frame {
-        msec: 3136
-        hash: "2a0d23e6dcc6475c323dbf8eb36e8094"
-    }
-    Frame {
-        msec: 3152
-        hash: "692682e82347936f87a66484b428e959"
-    }
-    Frame {
-        msec: 3168
-        hash: "cf4005c08789762ad21be1a1d78755c9"
-    }
-    Frame {
-        msec: 3184
-        hash: "566184563091626bb20ae679e3ce3b91"
-    }
-    Frame {
-        msec: 3200
-        hash: "f88a24ad3bbc2699924bb9a7ff6490b3"
-    }
-    Frame {
-        msec: 3216
-        hash: "23f3f63d07b2bdc2b82ff4e8606a634d"
-    }
-    Frame {
-        msec: 3232
-        hash: "fe121c71ce469ec6f0bf957eb2f0447b"
-    }
-    Frame {
-        msec: 3248
-        hash: "ba217690a33c701afe11842aa8105cbb"
-    }
-    Frame {
-        msec: 3264
-        hash: "e5c7c1323108f13ba26f5198cc62c137"
-    }
-    Frame {
-        msec: 3280
-        hash: "664f76d3d0008b56be2790c470befc91"
-    }
-    Frame {
-        msec: 3296
-        hash: "b3f54070ba64b983ccd2a15941ef4c35"
-    }
-    Frame {
-        msec: 3312
-        hash: "8a0ba2ae36ad3811778f3a3bc55743f5"
-    }
-    Frame {
-        msec: 3328
-        hash: "bfdc71733ca45a2ba2e8abf751554a62"
-    }
-    Frame {
-        msec: 3344
-        hash: "686e4d7bb5ae148d37fc2a1f6004a33a"
-    }
-    Frame {
-        msec: 3360
-        hash: "29c553d9fe42fdbbd019d0ead61dffa0"
-    }
-    Frame {
-        msec: 3376
-        hash: "bfa2b72c6554a2ed80a3b86f2cbed986"
-    }
-    Frame {
-        msec: 3392
-        hash: "074ff90417a947f0a04926d5675d073b"
-    }
-    Frame {
-        msec: 3408
-        hash: "6f56f9e0aa40149156ca71d6f8d4476a"
-    }
-    Frame {
-        msec: 3424
-        hash: "950ce749bbf572021de2dd1688cb87e6"
-    }
-    Frame {
-        msec: 3440
-        hash: "2d0903bd71862dc6f28bd702d955ae99"
-    }
-    Frame {
-        msec: 3456
-        hash: "2733adae56728f1b744a4086ecb98052"
-    }
-    Frame {
-        msec: 3472
-        hash: "779859d739e799bba15beeb97d18e682"
-    }
-    Frame {
-        msec: 3488
-        hash: "9074386cfabe136b8839637e5cd58f57"
-    }
-    Frame {
-        msec: 3504
-        hash: "fa5bcbf20c6ad0a218f23d98961229a1"
-    }
-    Frame {
-        msec: 3520
-        hash: "5406c94da1717eaa5eb0010564216059"
-    }
-    Frame {
-        msec: 3536
-        hash: "27d0a3c3a33c04df843bebd72ef79824"
-    }
-    Frame {
-        msec: 3552
-        hash: "270df9c99c2679071b854b3d82337f79"
-    }
-    Frame {
-        msec: 3568
-        hash: "5b3945505443a67e7a91f66fe42b4fe3"
-    }
-    Frame {
-        msec: 3584
-        hash: "9a2f8565c354cb366725368ed323ccf4"
-    }
-    Frame {
-        msec: 3600
-        hash: "6702cb7ccd61c008b511932d7bd5d107"
-    }
-    Frame {
-        msec: 3616
-        hash: "f6b86c3a1cc88357f588b6dae11aae30"
-    }
-    Frame {
-        msec: 3632
-        hash: "b10c23937f420db72af8abaf126f71c2"
-    }
-    Frame {
-        msec: 3648
-        hash: "7d6b0810ffc6e488c8168e19bccb7358"
-    }
-    Frame {
-        msec: 3664
-        hash: "c01ef69ec46391909619434e9d9dd0ce"
-    }
-    Frame {
-        msec: 3680
-        hash: "a046464fccb0c5ba1f63f8b569821a44"
-    }
-    Frame {
-        msec: 3696
-        hash: "8763c526924d882438f9aa9bfb4fe87d"
-    }
-    Frame {
-        msec: 3712
-        hash: "dede7a62d6e5c10e8f30caa075bd8dfd"
-    }
-    Frame {
-        msec: 3728
-        hash: "3b408e5c986f5bb01d8c3949876b792f"
-    }
-    Frame {
-        msec: 3744
-        hash: "0a458f3b17cdd3ea85522779c9346af9"
-    }
-    Frame {
-        msec: 3760
-        hash: "fef521f0301cce90af88d37e6d441ec8"
-    }
-    Frame {
-        msec: 3776
-        hash: "3d083e0822242b3b37c6839ca91a1f68"
-    }
-    Frame {
-        msec: 3792
-        hash: "f8fe013a717e6e61830137bdc78a8b40"
-    }
-    Frame {
-        msec: 3808
-        hash: "0ae80ad65dd194043500fa50b5a547a6"
-    }
-    Frame {
-        msec: 3824
-        hash: "a53c67fa32ef971eaea202fa5d8a6ad6"
-    }
-    Frame {
-        msec: 3840
-        image: "easefollow.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "41f86bbf0658b127f01e8d46d7ec941b"
-    }
-    Frame {
-        msec: 3872
-        hash: "d20f21df127565f9eb87c5d759a638d9"
-    }
-    Frame {
-        msec: 3888
-        hash: "85ff94f03cea3e111807e90d062c1367"
-    }
-    Frame {
-        msec: 3904
-        hash: "aa637850fe5f05a71ac4c7d31dbb36ee"
-    }
-    Frame {
-        msec: 3920
-        hash: "c86a67096c5e62bb73b785cdf6a5b6b1"
-    }
-    Frame {
-        msec: 3936
-        hash: "9d53537f2c50a0016bf7bb522b2ec3d8"
-    }
-    Frame {
-        msec: 3952
-        hash: "b48630c27c27785ddce568a85d4dc58f"
-    }
-    Frame {
-        msec: 3968
-        hash: "01c1bdb6e261cc509f26712b13eeb554"
-    }
-    Frame {
-        msec: 3984
-        hash: "af8a44284695fd999acd5944434f0372"
-    }
-    Frame {
-        msec: 4000
-        hash: "b156d9d6d5163f007ac4a309d8927ae9"
-    }
-    Frame {
-        msec: 4016
-        hash: "2df3715416c3c005f04b66fe1258c0d8"
-    }
-    Frame {
-        msec: 4032
-        hash: "96b4a7c6b8542b50fc345b54d38ec82a"
-    }
-    Frame {
-        msec: 4048
-        hash: "7e62e757fafa06833444c3a7e1d96ce4"
-    }
-    Frame {
-        msec: 4064
-        hash: "5222a8f9366c7d974d0687d05d229069"
-    }
-    Frame {
-        msec: 4080
-        hash: "ec96169f4633c3bddfd582feeb8e9ad4"
-    }
-    Frame {
-        msec: 4096
-        hash: "cb10db893d1e1cb2a370507dc5679985"
-    }
-    Frame {
-        msec: 4112
-        hash: "d7e346c2ac77796bde639bd829b72e85"
-    }
-    Frame {
-        msec: 4128
-        hash: "ba5bea8857e4fb444bedd3873563e7db"
-    }
-    Frame {
-        msec: 4144
-        hash: "05556fba5d1714f70fd6c2bfb43d213b"
-    }
-    Frame {
-        msec: 4160
-        hash: "aeeabf35f9759f045a670a9b9f90dc68"
-    }
-    Frame {
-        msec: 4176
-        hash: "131bd453f4c7726e5fdd546252700e2e"
-    }
-    Frame {
-        msec: 4192
-        hash: "7c5c3b5bb7a4082e6b9b43640e29f4e2"
-    }
-    Frame {
-        msec: 4208
-        hash: "07515e21b7a7895f333e4a8bbd2202eb"
-    }
-    Frame {
-        msec: 4224
-        hash: "6cf136f223ac6edd39ba6ed9b4445884"
-    }
-    Frame {
-        msec: 4240
-        hash: "84264f5745add8a922101735ed8def84"
-    }
-    Frame {
-        msec: 4256
-        hash: "660863d1e4b361f2e5445b417be0d2ad"
-    }
-    Frame {
-        msec: 4272
-        hash: "7ceb86f4b16546370d72164d0ca3147c"
-    }
-    Frame {
-        msec: 4288
-        hash: "a13e97da9722545ad87ac3c5eb92c497"
-    }
-    Frame {
-        msec: 4304
-        hash: "5896b5307cbd609d2062d3607786d40c"
-    }
-    Frame {
-        msec: 4320
-        hash: "c8c511115394116e4544c67f615ea5d5"
-    }
-    Frame {
-        msec: 4336
-        hash: "59ca5fdf12a735e5c292901b54acccb2"
-    }
-    Frame {
-        msec: 4352
-        hash: "155cce2738d34e0eac86f5eb63d638f0"
-    }
-    Frame {
-        msec: 4368
-        hash: "83a840c3ae7dbd9a05c17fdd8be07d7a"
-    }
-    Frame {
-        msec: 4384
-        hash: "800a15de28b14d88f0ad58fc3f4a2520"
-    }
-    Frame {
-        msec: 4400
-        hash: "c8381439a3cd3f9e7f80061023723a6e"
-    }
-    Frame {
-        msec: 4416
-        hash: "e3d63000db4b9458b202dece49d1bdba"
-    }
-    Frame {
-        msec: 4432
-        hash: "c943e56781695798f3c221f8ab09681a"
-    }
-    Frame {
-        msec: 4448
-        hash: "1137ee66d7fbf5a84c33f5ffff15b3dd"
-    }
-    Frame {
-        msec: 4464
-        hash: "5a98013cc4462aad18cad8d941f77aa0"
-    }
-    Frame {
-        msec: 4480
-        hash: "d0b3748fb49a13c0ad9a68b0e2914921"
-    }
-    Frame {
-        msec: 4496
-        hash: "12113f71f9117670acbd7877edded7e0"
-    }
-    Frame {
-        msec: 4512
-        hash: "22983424da08cdae7a9c6a8905b37736"
-    }
-    Frame {
-        msec: 4528
-        hash: "b2db5618a025cefb2650124c81880c49"
-    }
-    Frame {
-        msec: 4544
-        hash: "84fb5e7edc5b42163a83e0cd362b3a46"
-    }
-    Frame {
-        msec: 4560
-        hash: "39d6f1ed0f60a0c366c22e1442c455ac"
-    }
-    Frame {
-        msec: 4576
-        hash: "702367f6e4aaa2a862e57f9e02a08758"
-    }
-    Frame {
-        msec: 4592
-        hash: "ecc75293bc156c560d55cb7d278a4e58"
-    }
-    Frame {
-        msec: 4608
-        hash: "e68af8e97ce65376fd7904e599440c92"
-    }
-    Frame {
-        msec: 4624
-        hash: "75fe9f766d6cf636cd72d8879a461439"
-    }
-    Frame {
-        msec: 4640
-        hash: "162aef147ef4bbb0cd92bd70e4f37f62"
-    }
-    Frame {
-        msec: 4656
-        hash: "d879aae8949976c7bad4d97f1e5b5549"
-    }
-    Frame {
-        msec: 4672
-        hash: "8a983d7228190721f988de2d72cb3aa2"
-    }
-    Frame {
-        msec: 4688
-        hash: "a4f3c63fde664d128cd35b129a4f9a23"
-    }
-    Frame {
-        msec: 4704
-        hash: "115fb5f3c9b7f1c28ab379596faba91c"
-    }
-    Frame {
-        msec: 4720
-        hash: "ea9600c4d6c77a3b32e59401aa84fe96"
-    }
-    Frame {
-        msec: 4736
-        hash: "bd6531fdd9cfd46af2df73bacb31f4c5"
-    }
-    Frame {
-        msec: 4752
-        hash: "33bdcf1df50eab5e7963c649fbd32226"
-    }
-    Frame {
-        msec: 4768
-        hash: "236e88fb72369a55f9eba4b50712ae85"
-    }
-    Frame {
-        msec: 4784
-        hash: "5eb3c14a6296fb3a1c58603b2fc937c8"
-    }
-    Frame {
-        msec: 4800
-        image: "easefollow.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "31d11a1ce6422524241c77603fe53e61"
-    }
-    Frame {
-        msec: 4832
-        hash: "44e8b9947026c10b922c84883dd8e889"
-    }
-    Frame {
-        msec: 4848
-        hash: "d049e4f7c4bc1849398859a4d630c1b3"
-    }
-    Frame {
-        msec: 4864
-        hash: "e83b4757898e4eeef74be8213619fbfa"
-    }
-    Frame {
-        msec: 4880
-        hash: "d08f40615f2d5abc6236e856a67575dd"
-    }
-    Frame {
-        msec: 4896
-        hash: "d9cb26bf1b8bbafb2aed8f74bd454077"
-    }
-    Frame {
-        msec: 4912
-        hash: "aa321b94a6cc53b2ebac80e834c0a908"
-    }
-    Frame {
-        msec: 4928
-        hash: "48da37164be156b67a4b3b14e50f2375"
-    }
-    Frame {
-        msec: 4944
-        hash: "f522ce7728a4a9e7fad86c72f29bd8f9"
-    }
-    Frame {
-        msec: 4960
-        hash: "9bc1d16b4bda596702a3d8a3fad8a5c5"
-    }
-    Frame {
-        msec: 4976
-        hash: "5275dccf18745dec6c59b846de17d9ef"
-    }
-    Frame {
-        msec: 4992
-        hash: "4eb6babc177b96f69b148d52f56d82d7"
-    }
-    Frame {
-        msec: 5008
-        hash: "ccdfb454070ac04c4fe4f3513c52f8c8"
-    }
-    Frame {
-        msec: 5024
-        hash: "07f6adad6e8ff4f0eff92c758636a951"
-    }
-    Frame {
-        msec: 5040
-        hash: "241e0ad9218d49be477509e008e45548"
-    }
-    Frame {
-        msec: 5056
-        hash: "151a482e821779da8a61063f1cc73f8c"
-    }
-    Frame {
-        msec: 5072
-        hash: "1499d207c5a3a9bc7bbb84d9c5e35578"
-    }
-    Frame {
-        msec: 5088
-        hash: "c253753f653157a5058ef071f16b8bbb"
-    }
-    Frame {
-        msec: 5104
-        hash: "ec9fea5a870724a106b952edef7fb466"
-    }
-    Frame {
-        msec: 5120
-        hash: "99b673f8ed049d31a2aecabcc46d841d"
-    }
-    Frame {
-        msec: 5136
-        hash: "61e77fea693ea55aafbdc94c40c3ab33"
-    }
-    Frame {
-        msec: 5152
-        hash: "53e44a3732ee6858d5bd596b4c5d5305"
-    }
-    Frame {
-        msec: 5168
-        hash: "5b25d3894a56dc4f4a0aa8f88cb69e23"
-    }
-    Frame {
-        msec: 5184
-        hash: "5683ad02f1b9126f4e4ff6b03044fdc6"
-    }
-    Frame {
-        msec: 5200
-        hash: "0a3ec255575ec1b70e0b10cf59c7c5fd"
-    }
-    Frame {
-        msec: 5216
-        hash: "0f5f46fe3fdf42d4651891f13c8afc7e"
-    }
-    Frame {
-        msec: 5232
-        hash: "b6955407245c73e356a460d99dad77be"
-    }
-    Frame {
-        msec: 5248
-        hash: "6018b53414921943b37c33fa04a29697"
-    }
-    Frame {
-        msec: 5264
-        hash: "ff184d349ce0b648f8c1fce91ae997f6"
-    }
-    Frame {
-        msec: 5280
-        hash: "9c112a3a785d970593887eeab72fa7fe"
-    }
-    Frame {
-        msec: 5296
-        hash: "00384fb20d4c6cd6236d519d2d734cc3"
-    }
-    Frame {
-        msec: 5312
-        hash: "601ea99400e5f50ee9a5a4b74b6f3017"
-    }
-    Frame {
-        msec: 5328
-        hash: "9afed04bf7eca24d9b6d31ac84ae59c2"
-    }
-    Frame {
-        msec: 5344
-        hash: "1983319c8043bfe403513af7ccb5b924"
-    }
-    Frame {
-        msec: 5360
-        hash: "b0244e4e1b61202ede78405415c22bca"
-    }
-    Frame {
-        msec: 5376
-        hash: "ec5516b1aaeace8784b04649c51ab40b"
-    }
-    Frame {
-        msec: 5392
-        hash: "8ff7d2001594abb588f769bab15406d7"
-    }
-    Frame {
-        msec: 5408
-        hash: "64d5fd96a1726aa5276f9b508566676f"
-    }
-    Frame {
-        msec: 5424
-        hash: "ab49497a6c825038354f076bdbbbc235"
-    }
-    Frame {
-        msec: 5440
-        hash: "6b821e43be932800b20af58a7b5a1ff7"
-    }
-    Frame {
-        msec: 5456
-        hash: "683a2902300f930e2a81a82dc37c583b"
-    }
-    Frame {
-        msec: 5472
-        hash: "86d7946d7fbb66369ccbf26430939225"
-    }
-    Frame {
-        msec: 5488
-        hash: "fb38f5fb6555fc14e95a47c595a6ea0c"
-    }
-    Frame {
-        msec: 5504
-        hash: "3878f685d9fa3299e9ffe78c22595387"
-    }
-    Frame {
-        msec: 5520
-        hash: "b48840a68ff007901b02332c7177f315"
-    }
-    Frame {
-        msec: 5536
-        hash: "9d847abc99220b04aceef12e5c09aac0"
-    }
-    Frame {
-        msec: 5552
-        hash: "9893ac89fda64d96ec4140c3c87e17a5"
-    }
-    Frame {
-        msec: 5568
-        hash: "cd94e1c36e6be9877cd9c12df42bd968"
-    }
-    Frame {
-        msec: 5584
-        hash: "c1ce5e53b74af022dc103ad74ff5f1af"
-    }
-    Frame {
-        msec: 5600
-        hash: "b3630e08eac02a9578a00b01baabaaba"
-    }
-    Frame {
-        msec: 5616
-        hash: "0eb9241aa1f9526c1e24ba76d630805c"
-    }
-    Frame {
-        msec: 5632
-        hash: "1b532ae7f9253469467522d4ca66c47b"
-    }
-    Frame {
-        msec: 5648
-        hash: "7e6e49079ed6330da2e337a5e4ffd730"
-    }
-    Frame {
-        msec: 5664
-        hash: "0391d668f4b906b244a5f5c1713573c2"
-    }
-    Frame {
-        msec: 5680
-        hash: "8070fa3280d0d64bf976d4a276359c4c"
-    }
-    Frame {
-        msec: 5696
-        hash: "f7d0d36a2d40c798f56ac7ecc1effca6"
-    }
-    Frame {
-        msec: 5712
-        hash: "9f8e35ee5080e811c670c480a9c2bd9f"
-    }
-    Frame {
-        msec: 5728
-        hash: "c7fea75a43a59a11aa504df32afcdaf8"
-    }
-    Frame {
-        msec: 5744
-        hash: "7e549a93ffc6ddcc3d8111f10c05b29e"
-    }
-    Frame {
-        msec: 5760
-        image: "easefollow.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "92d298262f610a2dafa095e3d67c80af"
-    }
-    Frame {
-        msec: 5792
-        hash: "db8826b0b2feece0999863b8827a6234"
-    }
-    Frame {
-        msec: 5808
-        hash: "12c7050e8094bb39212aed0163666d1a"
-    }
-    Frame {
-        msec: 5824
-        hash: "69531beace5c749bf90160a4b25f736a"
-    }
-    Frame {
-        msec: 5840
-        hash: "ce873e4dbc8853183b54d59991b2e030"
-    }
-    Frame {
-        msec: 5856
-        hash: "fa1078973634578d69527402b11fb7e0"
-    }
-    Frame {
-        msec: 5872
-        hash: "1e3b3db590567c0afd1913101192cda9"
-    }
-    Frame {
-        msec: 5888
-        hash: "7b9e097018278b784973a546da3d401a"
-    }
-    Frame {
-        msec: 5904
-        hash: "a7b0667093888480de6697280aeea9ba"
-    }
-    Frame {
-        msec: 5920
-        hash: "e381f2422ead86575abf643b0b0c9797"
-    }
-    Frame {
-        msec: 5936
-        hash: "44b08f5a0de2a6955e02f67753f409c8"
-    }
-    Frame {
-        msec: 5952
-        hash: "db04665e58448ecc7f95baa3e4ea79a5"
-    }
-    Frame {
-        msec: 5968
-        hash: "0e4aae728d8d543538a9446c41e18e91"
-    }
-    Frame {
-        msec: 5984
-        hash: "e3cd1bbb1d9963e5c74d36e526a871b0"
-    }
-    Frame {
-        msec: 6000
-        hash: "bcd893a0e200ddda4e1468c159018865"
-    }
-    Frame {
-        msec: 6016
-        hash: "9c5293356aa6312f909e655e9bcf961b"
-    }
-    Frame {
-        msec: 6032
-        hash: "0bab7b9166f6af554d4fa0badeec739e"
-    }
-    Frame {
-        msec: 6048
-        hash: "e74996581f0aaeced118c5cbfd977d90"
-    }
-    Frame {
-        msec: 6064
-        hash: "5d128eb20a2a23da8c2d9a35293e5769"
-    }
-    Frame {
-        msec: 6080
-        hash: "ebbbc343698287faf7ffa7526a726b54"
-    }
-    Frame {
-        msec: 6096
-        hash: "d812172192cc19590f9a2d7dbf970439"
-    }
-    Frame {
-        msec: 6112
-        hash: "60263addb1b4b5ac43f8199b8ed77e40"
-    }
-    Frame {
-        msec: 6128
-        hash: "702a1ff2876eaaa59359811bb6437c5b"
-    }
-    Frame {
-        msec: 6144
-        hash: "8f81dc43decce5094ee7a089f0009730"
-    }
-    Frame {
-        msec: 6160
-        hash: "efda5dd9edd83a0da089d0b28806c6b6"
-    }
-    Frame {
-        msec: 6176
-        hash: "7274a33a7a5272d7abdaf41f4b2bf664"
-    }
-    Frame {
-        msec: 6192
-        hash: "0cc80077476e721a3da85c17cc56a65e"
-    }
-    Frame {
-        msec: 6208
-        hash: "e65a534f0e7e70520a9c2cfa09ee8159"
-    }
-    Frame {
-        msec: 6224
-        hash: "b05b514c63bd8998785382e6a9cbd849"
-    }
-    Frame {
-        msec: 6240
-        hash: "10a04d641e0cc65c120d8bcf2f3e54c8"
-    }
-    Frame {
-        msec: 6256
-        hash: "68418e2206a496dd15a05b50fec6f87e"
-    }
-    Frame {
-        msec: 6272
-        hash: "6549e0989e1c86e3a7eb0dcc8dd31380"
-    }
-    Frame {
-        msec: 6288
-        hash: "bd0193c2cbc8958f674f4ec52a693b72"
-    }
-    Frame {
-        msec: 6304
-        hash: "746440b45a3688dbd32b34c57454e956"
-    }
-    Frame {
-        msec: 6320
-        hash: "6b54ee8af30be2178e8b3afab5dcb4c7"
-    }
-    Frame {
-        msec: 6336
-        hash: "ba2fbad3fe2fe25ec0c0c542659168dc"
-    }
-    Frame {
-        msec: 6352
-        hash: "84bd72703bd8200f8f090783d06ae451"
-    }
-    Frame {
-        msec: 6368
-        hash: "17c9fb063280c2ee4cb4a13273bbb199"
-    }
-    Frame {
-        msec: 6384
-        hash: "df28fd55719f5c2d164596d02c2faff2"
-    }
-    Frame {
-        msec: 6400
-        hash: "c2e280e78e892200d40022d17ce695b7"
-    }
-    Frame {
-        msec: 6416
-        hash: "c657caa0c5158e178ec5df80bbad6bcb"
-    }
-    Frame {
-        msec: 6432
-        hash: "d91f4f6ec6503fe8280f9b02dd11e64a"
-    }
-    Frame {
-        msec: 6448
-        hash: "0fb9400cdca9dbd4035fbf8af9952360"
-    }
-    Frame {
-        msec: 6464
-        hash: "cac0e1b4aa094306b95f90ede4705391"
-    }
-    Frame {
-        msec: 6480
-        hash: "e60a4bb14300a937a767effee931c60f"
-    }
-    Frame {
-        msec: 6496
-        hash: "8b461397e3f210ee7e9305dcab2af2db"
-    }
-    Frame {
-        msec: 6512
-        hash: "6ce9ec0942dd06c9f73929a7e176852c"
-    }
-    Frame {
-        msec: 6528
-        hash: "da36e254635eea854a6552ba008117f9"
-    }
-    Frame {
-        msec: 6544
-        hash: "0bec6402b5eb09d05ce8e9ff5253ea8d"
-    }
-    Frame {
-        msec: 6560
-        hash: "72f6610527d395ca590eda166ef6bc4e"
-    }
-    Frame {
-        msec: 6576
-        hash: "622ae3fd47adb2432e2a40d3c5539393"
-    }
-    Frame {
-        msec: 6592
-        hash: "0b18c49e2bbf9370216e06b555faf183"
-    }
-    Frame {
-        msec: 6608
-        hash: "0c090bb975fb883301b52479fd6f5fdf"
-    }
-    Frame {
-        msec: 6624
-        hash: "c4205d7ecb7327426d9591e77247acab"
-    }
-    Frame {
-        msec: 6640
-        hash: "f0e0075243e4b8aa97056248fe6033ed"
-    }
-    Frame {
-        msec: 6656
-        hash: "47f99b40a8764ee9d9e429061fb7acb2"
-    }
-    Frame {
-        msec: 6672
-        hash: "49e8c1e974b0716570d85109b53817a5"
-    }
-    Frame {
-        msec: 6688
-        hash: "72f981bad831b6ed858009527902f734"
-    }
-    Frame {
-        msec: 6704
-        hash: "e959a0493b06369a429f90f66cb65977"
-    }
-    Frame {
-        msec: 6720
-        image: "easefollow.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "93470d983282f24425558f47ad705154"
-    }
-    Frame {
-        msec: 6752
-        hash: "cdccbe1a7c7abd4a6a6ee754ed0c9759"
-    }
-    Frame {
-        msec: 6768
-        hash: "0e1b7b5332a9fcdb492db5314a2a0267"
-    }
-    Frame {
-        msec: 6784
-        hash: "1e1ffe3439aab51d0b325474e7d8dc28"
-    }
-    Frame {
-        msec: 6800
-        hash: "e8e7e9b5871caf77f15678616d6c9c8a"
-    }
-    Frame {
-        msec: 6816
-        hash: "9771fff3b7752154d093c038bea73d28"
-    }
-    Frame {
-        msec: 6832
-        hash: "1af851ea214cbddb0e3a743084a5cf6b"
-    }
-    Frame {
-        msec: 6848
-        hash: "1566182a7e29bbb738705a90c4909617"
-    }
-    Frame {
-        msec: 6864
-        hash: "feed650e1d948fe622234d212fb745f2"
-    }
-    Frame {
-        msec: 6880
-        hash: "3cd3d063275b91f9680717421c118ba4"
-    }
-    Frame {
-        msec: 6896
-        hash: "c1f088801334762cd499e7cc70e1e59a"
-    }
-    Frame {
-        msec: 6912
-        hash: "e8f8d153e7a027a5092a9209411d97f7"
-    }
-    Frame {
-        msec: 6928
-        hash: "f11747c3533b4b2fc77a64ca0cace8b0"
-    }
-    Frame {
-        msec: 6944
-        hash: "21618c67a2a8bbce86fc872060ad40e8"
-    }
-    Frame {
-        msec: 6960
-        hash: "02da96335db74b87ceefe91b1dfe72e6"
-    }
-    Frame {
-        msec: 6976
-        hash: "2b2e4143143ead8dea5865fd782f1775"
-    }
-    Frame {
-        msec: 6992
-        hash: "13e710900b05e26cdb030b1e2b2be715"
-    }
-    Frame {
-        msec: 7008
-        hash: "29e8995d17aac4d02034debcbb9fcb98"
-    }
-    Frame {
-        msec: 7024
-        hash: "1099db1b3e4c69e84c6ab1b7c311bf1e"
-    }
-    Frame {
-        msec: 7040
-        hash: "cc7cb720043334f1eeb385dce4389dc2"
-    }
-    Frame {
-        msec: 7056
-        hash: "34c7a62c1bc7261e2fd31c40068b37a7"
-    }
-    Frame {
-        msec: 7072
-        hash: "7fafbe05cbcaa21893e3aa0f1fcfb5a0"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7088
-        hash: "5b26c8cf047706633795a8ed3e703a89"
-    }
-    Frame {
-        msec: 7104
-        hash: "e0774bf9e74d0cde81c5cb216a9258fc"
-    }
-    Frame {
-        msec: 7120
-        hash: "0870262f643245e13f4fba79fd575897"
-    }
-    Frame {
-        msec: 7136
-        hash: "8faf0d050bb435ade8af5012c1a6b0dc"
-    }
-    Frame {
-        msec: 7152
-        hash: "382c037895cc39a6870db57b5016c01f"
-    }
-    Frame {
-        msec: 7168
-        hash: "f1f5a2cbc103ab1bee9f537fa8266e03"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml
deleted file mode 100644
index ac0c141..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
-    width: 800; height: 240; color: "gray"
-
-    Rectangle {
-        id: rect
-        width: 50; height: 20; y: 30; color: "black"
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: 50; to: 700; duration: 2000 }
-            NumberAnimation { from: 700; to: 50; duration: 2000 }
-        }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 60; color: "red"
-        x: rect.x
-        Behavior on x { SmoothedAnimation { velocity: 400 } }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 90; color: "yellow"
-        x: rect.x
-        Behavior on x { SmoothedAnimation { velocity: 300; reversingMode: SmoothedAnimation.Immediate } }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 120; color: "green"
-        x: rect.x
-        Behavior on x { SmoothedAnimation { reversingMode: SmoothedAnimation.Sync } }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 150; color: "purple"
-        x: rect.x
-        Behavior on x { SmoothedAnimation { maximumEasingTime: 200 } }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 180; color: "blue"
-        x: rect.x
-        Behavior on x { SmoothedAnimation { duration: 300 } }
-    }
-}
-- 
cgit v0.12


From 55c4d94dfea78951f3371d3697a3cb28539b3012 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 29 Oct 2010 12:21:10 +1000
Subject: Regression: QML fonts look bad on Mac with font smoothing on

Task-number: QTBUG-14840
---
 src/declarative/util/qdeclarativeview.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 2381172..0e31a20 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -72,6 +72,7 @@
 QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(frameRateDebug, QML_SHOW_FRAMERATE)
+extern Q_GUI_EXPORT bool qt_applefontsmoothing_enabled;
 
 class QDeclarativeScene : public QGraphicsScene
 {
@@ -696,7 +697,14 @@ void QDeclarativeView::paintEvent(QPaintEvent *event)
     if (frameRateDebug()) 
         time = d->frameTimer.restart();
 
+#ifdef Q_WS_MAC
+    bool oldSmooth = qt_applefontsmoothing_enabled;
+    qt_applefontsmoothing_enabled = false;
+#endif
     QGraphicsView::paintEvent(event);
+#ifdef Q_WS_MAC
+    qt_applefontsmoothing_enabled = oldSmooth;
+#endif
 
     QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Painting);
 
-- 
cgit v0.12


From 2255e4f681d20b095f328a8ee3f33ce328353a8f Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 13:14:12 +1000
Subject: Update qdeclarativespringanimation visual tests

Still correct, main problem was not getting updated visuals when
we switched away from follows.

Task-number: QTBUG-14792
---
 .../qdeclarativespringanimation/clock.qml          |   64 +
 .../content/background.png                         |  Bin 0 -> 46895 bytes
 .../qdeclarativespringanimation/content/center.png |  Bin 0 -> 765 bytes
 .../qdeclarativespringanimation/content/clock.png  |  Bin 0 -> 20653 bytes
 .../qdeclarativespringanimation/content/hour.png   |  Bin 0 -> 625 bytes
 .../qdeclarativespringanimation/content/minute.png |  Bin 0 -> 625 bytes
 .../qdeclarativespringanimation/content/second.png |  Bin 0 -> 303 bytes
 .../qdeclarativespringanimation/data/clock.0.png   |  Bin 0 -> 16437 bytes
 .../qdeclarativespringanimation/data/clock.1.png   |  Bin 0 -> 16543 bytes
 .../qdeclarativespringanimation/data/clock.qml     |  615 +++++++
 .../qdeclarativespringanimation/data/follow.0.png  |  Bin 0 -> 975 bytes
 .../qdeclarativespringanimation/data/follow.1.png  |  Bin 0 -> 1244 bytes
 .../qdeclarativespringanimation/data/follow.2.png  |  Bin 0 -> 1225 bytes
 .../qdeclarativespringanimation/data/follow.3.png  |  Bin 0 -> 1243 bytes
 .../qdeclarativespringanimation/data/follow.4.png  |  Bin 0 -> 1230 bytes
 .../qdeclarativespringanimation/data/follow.5.png  |  Bin 0 -> 1244 bytes
 .../qdeclarativespringanimation/data/follow.6.png  |  Bin 0 -> 1242 bytes
 .../qdeclarativespringanimation/data/follow.qml    | 1763 ++++++++++++++++++++
 .../qdeclarativespringanimation/follow.qml         |   79 +
 .../qmlvisual/qdeclarativespringfollow/clock.qml   |   67 -
 .../content/background.png                         |  Bin 46895 -> 0 bytes
 .../qdeclarativespringfollow/content/center.png    |  Bin 765 -> 0 bytes
 .../qdeclarativespringfollow/content/clock.png     |  Bin 20653 -> 0 bytes
 .../qdeclarativespringfollow/content/hour.png      |  Bin 625 -> 0 bytes
 .../qdeclarativespringfollow/content/minute.png    |  Bin 625 -> 0 bytes
 .../qdeclarativespringfollow/content/second.png    |  Bin 303 -> 0 bytes
 .../qdeclarativespringfollow/data/clock.0.png      |  Bin 17294 -> 0 bytes
 .../qdeclarativespringfollow/data/clock.1.png      |  Bin 17394 -> 0 bytes
 .../qdeclarativespringfollow/data/clock.2.png      |  Bin 17524 -> 0 bytes
 .../qdeclarativespringfollow/data/clock.3.png      |  Bin 17572 -> 0 bytes
 .../qdeclarativespringfollow/data/clock.qml        | 1135 -------------
 .../qdeclarativespringfollow/data/follow.0.png     |  Bin 959 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.1.png     |  Bin 1244 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.10.png    |  Bin 1299 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.2.png     |  Bin 1224 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.3.png     |  Bin 1243 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.4.png     |  Bin 1230 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.5.png     |  Bin 1231 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.6.png     |  Bin 1239 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.7.png     |  Bin 1241 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.8.png     |  Bin 1237 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.9.png     |  Bin 1229 -> 0 bytes
 .../qdeclarativespringfollow/data/follow.qml       | 1763 --------------------
 .../qmlvisual/qdeclarativespringfollow/follow.qml  |   79 -
 44 files changed, 2521 insertions(+), 3044 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/clock.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/background.png
 create mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png
 create mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png
 create mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png
 create mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png
 create mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringanimation/follow.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/background.png
 delete mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/center.png
 delete mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/clock.png
 delete mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/hour.png
 delete mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/minute.png
 delete mode 100755 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/second.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.10.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.5.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.6.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.7.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.8.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.9.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/clock.qml
new file mode 100644
index 0000000..0e4e642
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/clock.qml
@@ -0,0 +1,64 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: clock
+    color: "gray"
+    width: 200; height: 200
+
+    property variant hours: 10
+    property variant minutes: 28
+    property variant seconds: 0
+
+    Timer {
+        interval: 1000; running: true; repeat: true; triggeredOnStart: true
+        onTriggered: seconds++
+    }
+
+    Image { id: background; source: "content/clock.png" }
+
+    Image {
+        x: 92.5; y: 27
+        source: "content/hour.png"
+        transform: Rotation {
+            id: hourRotation
+            origin.x: 7.5; origin.y: 73
+            angle: (clock.hours * 30) + (clock.minutes * 0.5)
+
+            Behavior on angle {
+                SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+            }
+        }
+    }
+
+    Image {
+        x: 93.5; y: 17
+        source: "content/minute.png"
+        transform: Rotation {
+            id: minuteRotation
+            origin.x: 6.5; origin.y: 83
+            angle: clock.minutes * 6
+
+            Behavior on angle {
+                SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+            }
+        }
+    }
+
+    Image {
+        x: 97.5; y: 20
+        source: "content/second.png"
+        transform: Rotation {
+            id: secondRotation
+            origin.x: 2.5; origin.y: 80
+            angle: clock.seconds * 6
+
+            Behavior on angle {
+                SpringAnimation { spring: 5; damping: 0.25; modulus: 360 }
+            }
+        }
+    }
+
+    Image {
+        anchors.centerIn: background; source: "content/center.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/background.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/background.png
new file mode 100644
index 0000000..a885950
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/background.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png
new file mode 100755
index 0000000..7fbd802
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/center.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png
new file mode 100755
index 0000000..462edac
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/clock.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png
new file mode 100755
index 0000000..f8061a1
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/hour.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png
new file mode 100755
index 0000000..1297ec7
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/minute.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png
new file mode 100755
index 0000000..4aa9fb5
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/content/second.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.0.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.0.png
new file mode 100644
index 0000000..f159b6b
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.1.png
new file mode 100644
index 0000000..d24af1a
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml
new file mode 100644
index 0000000..a3cd66b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml
@@ -0,0 +1,615 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "cb33c89e5108c85e43b53489d1255862"
+    }
+    Frame {
+        msec: 32
+        hash: "cb33c89e5108c85e43b53489d1255862"
+    }
+    Frame {
+        msec: 48
+        hash: "fcf631cb42237d2ce9e57ef5fef85f93"
+    }
+    Frame {
+        msec: 64
+        hash: "a9f1e24d60588ff9b565b15847669438"
+    }
+    Frame {
+        msec: 80
+        hash: "c5a07045cd24b835fdd0653db5b34f9f"
+    }
+    Frame {
+        msec: 96
+        hash: "bce3e9bfa92f81f0c8746a4777ce1b3e"
+    }
+    Frame {
+        msec: 112
+        hash: "6da93132be1be8b42aaf007306ce5990"
+    }
+    Frame {
+        msec: 128
+        hash: "8695e73f009bd20f3f3aae4a6b8f0098"
+    }
+    Frame {
+        msec: 144
+        hash: "172ece19e661999ce48053007a92f107"
+    }
+    Frame {
+        msec: 160
+        hash: "6e02e658d8873dd678dc9cc7cc8035a0"
+    }
+    Frame {
+        msec: 176
+        hash: "d8e9bad91fd91bce0310a24233ecb906"
+    }
+    Frame {
+        msec: 192
+        hash: "9c23533f0a4d47ec192bed2e48f11c60"
+    }
+    Frame {
+        msec: 208
+        hash: "9c23533f0a4d47ec192bed2e48f11c60"
+    }
+    Frame {
+        msec: 224
+        hash: "be0ee20e9eb94b80171f66fa6f1c2441"
+    }
+    Frame {
+        msec: 240
+        hash: "83b841f7ea7a5e92a21ec0d0130b4281"
+    }
+    Frame {
+        msec: 256
+        hash: "3bbf822e403f4198fbfaa6973726947d"
+    }
+    Frame {
+        msec: 272
+        hash: "172ece19e661999ce48053007a92f107"
+    }
+    Frame {
+        msec: 288
+        hash: "602ca5ac2fc928b831d8e10de01f5bf7"
+    }
+    Frame {
+        msec: 304
+        hash: "9f07659e63a5b3412ede3c8400678cc6"
+    }
+    Frame {
+        msec: 320
+        hash: "6104f86706bd11cee6b5aeef495eacfa"
+    }
+    Frame {
+        msec: 336
+        hash: "b564cfe8c73b3d51e07bbcf5320868f8"
+    }
+    Frame {
+        msec: 352
+        hash: "b2136411eee23d64718a63269071499f"
+    }
+    Frame {
+        msec: 368
+        hash: "7f610f3b80c2cf002c6565ac4b7a8325"
+    }
+    Frame {
+        msec: 384
+        hash: "5480e79cc96fdaffecb2d9dec254c8d4"
+    }
+    Frame {
+        msec: 400
+        hash: "50eea6c6f135c21ecf05fc83ad1ae9a8"
+    }
+    Frame {
+        msec: 416
+        hash: "2d3634d621782194674da127abe66039"
+    }
+    Frame {
+        msec: 432
+        hash: "285180aa632c9247c3b7aa26f5544da6"
+    }
+    Frame {
+        msec: 448
+        hash: "8695e73f009bd20f3f3aae4a6b8f0098"
+    }
+    Frame {
+        msec: 464
+        hash: "914dc6254f29a6cffc80e90a23b61130"
+    }
+    Frame {
+        msec: 480
+        hash: "a564dc3a53b607ca7e9fc6920b65abc3"
+    }
+    Frame {
+        msec: 496
+        hash: "6104f86706bd11cee6b5aeef495eacfa"
+    }
+    Frame {
+        msec: 512
+        hash: "6f34176630c5d9d421a1a31cb3b97a28"
+    }
+    Frame {
+        msec: 528
+        hash: "62199c5663263fee08ba5ce560c7429d"
+    }
+    Frame {
+        msec: 544
+        hash: "1110cb0281044eb0679e9dc373a7d063"
+    }
+    Frame {
+        msec: 560
+        hash: "0ec354101faf6603c9ca56fe82dc8ac3"
+    }
+    Frame {
+        msec: 576
+        hash: "0ec354101faf6603c9ca56fe82dc8ac3"
+    }
+    Frame {
+        msec: 592
+        hash: "1110cb0281044eb0679e9dc373a7d063"
+    }
+    Frame {
+        msec: 608
+        hash: "1110cb0281044eb0679e9dc373a7d063"
+    }
+    Frame {
+        msec: 624
+        hash: "62199c5663263fee08ba5ce560c7429d"
+    }
+    Frame {
+        msec: 640
+        hash: "1716d50c65b4319845fdc7ea1ceafe4d"
+    }
+    Frame {
+        msec: 656
+        hash: "d087befa8f95f70e33604748230d5dd5"
+    }
+    Frame {
+        msec: 672
+        hash: "7ae892fbab85d76e713ab70ca13d3f1f"
+    }
+    Frame {
+        msec: 688
+        hash: "fb069bfb88b35f9f15273e04a62a9534"
+    }
+    Frame {
+        msec: 704
+        hash: "41c69834e756bafc051ff65e149f8994"
+    }
+    Frame {
+        msec: 720
+        hash: "f0c13b542b9ee9b0c9f4ef800900db16"
+    }
+    Frame {
+        msec: 736
+        hash: "f0c13b542b9ee9b0c9f4ef800900db16"
+    }
+    Frame {
+        msec: 752
+        hash: "f0c13b542b9ee9b0c9f4ef800900db16"
+    }
+    Frame {
+        msec: 768
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 784
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 800
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 816
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 832
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 848
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 864
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 880
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 896
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 912
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 928
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 944
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 960
+        image: "clock.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 992
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 1008
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 1024
+        hash: "2ff4e8f394a62892adb348271435205c"
+    }
+    Frame {
+        msec: 1040
+        hash: "0ec9e1163fe8284ab27aa55f94bf3b14"
+    }
+    Frame {
+        msec: 1056
+        hash: "9b6efbb358b1c7928e005620a60ab4a9"
+    }
+    Frame {
+        msec: 1072
+        hash: "5be6fe791a3bb6f72a6c6a3d1e2fa86e"
+    }
+    Frame {
+        msec: 1088
+        hash: "41fefdc45bd52600f7f108d4163d484b"
+    }
+    Frame {
+        msec: 1104
+        hash: "45828a5bef6c4ad4d274c0ea46f72e44"
+    }
+    Frame {
+        msec: 1120
+        hash: "17f0925ae38ee4c523713592d6b9f541"
+    }
+    Frame {
+        msec: 1136
+        hash: "ed3acc723c29321751702903b57a557a"
+    }
+    Frame {
+        msec: 1152
+        hash: "ded71422852eec4464f54e9c1b01b28a"
+    }
+    Frame {
+        msec: 1168
+        hash: "0318d105aa5f7d3bebb0d24a85065f90"
+    }
+    Frame {
+        msec: 1184
+        hash: "9abe4cb4e8ff6ffafd993b10ac55aad9"
+    }
+    Frame {
+        msec: 1200
+        hash: "b92dba35b477ce11822277ba64582232"
+    }
+    Frame {
+        msec: 1216
+        hash: "3a9a6106e1f12ffbc81ae9d4b30376fe"
+    }
+    Frame {
+        msec: 1232
+        hash: "4647b6e6c95e3339094c7e2641458137"
+    }
+    Frame {
+        msec: 1248
+        hash: "0977f3ed3ab6426423f7a7bfb0bd1726"
+    }
+    Frame {
+        msec: 1264
+        hash: "930002bcd6986af36678d23c3dc17330"
+    }
+    Frame {
+        msec: 1280
+        hash: "ded71422852eec4464f54e9c1b01b28a"
+    }
+    Frame {
+        msec: 1296
+        hash: "16164138479aed4db7fd9a1c785556cb"
+    }
+    Frame {
+        msec: 1312
+        hash: "0b884e6a8a1c93d62fcee037f9ad8745"
+    }
+    Frame {
+        msec: 1328
+        hash: "dd1323c721a0ede74910c16df4b47074"
+    }
+    Frame {
+        msec: 1344
+        hash: "ed3acc723c29321751702903b57a557a"
+    }
+    Frame {
+        msec: 1360
+        hash: "e8c528178425f7c6089ed6d094e734fb"
+    }
+    Frame {
+        msec: 1376
+        hash: "f2954641b11004bc4d29a217791e3833"
+    }
+    Frame {
+        msec: 1392
+        hash: "5d4d4086c4aebf04eb5b0045cf9a36a8"
+    }
+    Frame {
+        msec: 1408
+        hash: "f2954641b11004bc4d29a217791e3833"
+    }
+    Frame {
+        msec: 1424
+        hash: "c2e47da0e709c9ddeee01ae29d3ad059"
+    }
+    Frame {
+        msec: 1440
+        hash: "e539f0142b3f6c2f7de084ddedbe979e"
+    }
+    Frame {
+        msec: 1456
+        hash: "ed3acc723c29321751702903b57a557a"
+    }
+    Frame {
+        msec: 1472
+        hash: "ae191ede94be250b60744d81179c5054"
+    }
+    Frame {
+        msec: 1488
+        hash: "f985b1ab4feae3bd7066e15bdd026c1a"
+    }
+    Frame {
+        msec: 1504
+        hash: "dd1323c721a0ede74910c16df4b47074"
+    }
+    Frame {
+        msec: 1520
+        hash: "c99c541e424ebe82f1cceea204f3ffdc"
+    }
+    Frame {
+        msec: 1536
+        hash: "dcdeb76d6e4c676e736ec9fcf68f993b"
+    }
+    Frame {
+        msec: 1552
+        hash: "599bfdb42d46a31bf8639e7b1c89526b"
+    }
+    Frame {
+        msec: 1568
+        hash: "bef384984df19143de0c290a6621146d"
+    }
+    Frame {
+        msec: 1584
+        hash: "bef384984df19143de0c290a6621146d"
+    }
+    Frame {
+        msec: 1600
+        hash: "04192a5408bc1aff5431b4ea0be94b27"
+    }
+    Frame {
+        msec: 1616
+        hash: "8da64659fb7f532eac43a67accd319ee"
+    }
+    Frame {
+        msec: 1632
+        hash: "dcdeb76d6e4c676e736ec9fcf68f993b"
+    }
+    Frame {
+        msec: 1648
+        hash: "fba3a7729e46d8e78d203188ef29d829"
+    }
+    Frame {
+        msec: 1664
+        hash: "c99c541e424ebe82f1cceea204f3ffdc"
+    }
+    Frame {
+        msec: 1680
+        hash: "c99c541e424ebe82f1cceea204f3ffdc"
+    }
+    Frame {
+        msec: 1696
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1712
+        hash: "7f62ba22b5567d4ea96725a6215ff98a"
+    }
+    Frame {
+        msec: 1728
+        hash: "a21cc4fa347929fd816ad36f4b33efab"
+    }
+    Frame {
+        msec: 1744
+        hash: "a21cc4fa347929fd816ad36f4b33efab"
+    }
+    Frame {
+        msec: 1760
+        hash: "a21cc4fa347929fd816ad36f4b33efab"
+    }
+    Frame {
+        msec: 1776
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1792
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1808
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1824
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1840
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1856
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1872
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1888
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1904
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1920
+        image: "clock.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1952
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1968
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 1984
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 2000
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 2016
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
+    }
+    Frame {
+        msec: 2032
+        hash: "dba66886121f802a4a49ee1e220279db"
+    }
+    Frame {
+        msec: 2048
+        hash: "b43648a05b6900bd0402bb56c98692df"
+    }
+    Frame {
+        msec: 2064
+        hash: "8213e39455c952a589a90eea0040edfe"
+    }
+    Frame {
+        msec: 2080
+        hash: "0d72dcbb2de67c84c0cf802e1de2b32b"
+    }
+    Frame {
+        msec: 2096
+        hash: "db5b4994b46f3e0de86149af8b99abb6"
+    }
+    Frame {
+        msec: 2112
+        hash: "440f7414e3db5339f2180bf1fcdc1c55"
+    }
+    Frame {
+        msec: 2128
+        hash: "f757740304369ac45bb88657f79f304e"
+    }
+    Frame {
+        msec: 2144
+        hash: "4521da9bcf198f78f7270cca959adfe4"
+    }
+    Frame {
+        msec: 2160
+        hash: "92d602d139aedf31180f12349a1edcad"
+    }
+    Frame {
+        msec: 2176
+        hash: "4092500cb913f0c9ae49d61e53553371"
+    }
+    Frame {
+        msec: 2192
+        hash: "dee122e2c46b398c48a7ef1619683a6f"
+    }
+    Frame {
+        msec: 2208
+        hash: "1817fa481e8648dd092e29403b0f887e"
+    }
+    Frame {
+        msec: 2224
+        hash: "93a69d88553709c0f164b11d8d765805"
+    }
+    Frame {
+        msec: 2240
+        hash: "92d602d139aedf31180f12349a1edcad"
+    }
+    Frame {
+        msec: 2256
+        hash: "4ff6679a9615ca8bd5dd63c296cca3d5"
+    }
+    Frame {
+        msec: 2272
+        hash: "4521da9bcf198f78f7270cca959adfe4"
+    }
+    Frame {
+        msec: 2288
+        hash: "127b93b536f6266965941af5888a63dd"
+    }
+    Frame {
+        msec: 2304
+        hash: "1a3e36e44069a8bf29b73acfd8340044"
+    }
+    Frame {
+        msec: 2320
+        hash: "1065e18d2b41af8b0b5c4f5ae2a30d4d"
+    }
+    Frame {
+        msec: 2336
+        hash: "37144e92ba8c7edd2ef87ecb6525ed5f"
+    }
+    Frame {
+        msec: 2352
+        hash: "d6445d8270ddbf5fcd196b3d71393da4"
+    }
+    Frame {
+        msec: 2368
+        hash: "b55cc8bdf97531912fa1df1f379e623c"
+    }
+    Frame {
+        msec: 2384
+        hash: "fdb86be92fa17fd4e773e5fd65f249a3"
+    }
+    Frame {
+        msec: 2400
+        hash: "b55cc8bdf97531912fa1df1f379e623c"
+    }
+    Frame {
+        msec: 2416
+        hash: "eb0de8259f7a6be756102f79b5220f56"
+    }
+    Frame {
+        msec: 2432
+        hash: "5afbb87fe77112b86282252a2ffe3821"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
new file mode 100644
index 0000000..c79ac9c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
new file mode 100644
index 0000000..d00d78d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
new file mode 100644
index 0000000..c01c980
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
new file mode 100644
index 0000000..6bca85f
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
new file mode 100644
index 0000000..5f024d2
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
new file mode 100644
index 0000000..b244fbe
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
new file mode 100644
index 0000000..141753c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
new file mode 100644
index 0000000..e5c55a4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
@@ -0,0 +1,1763 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "e94ba580322887dbbbf9cb6309e39c23"
+    }
+    Frame {
+        msec: 32
+        hash: "e94ba580322887dbbbf9cb6309e39c23"
+    }
+    Frame {
+        msec: 48
+        hash: "787a59cda2c0b27d8959026e6d1b9427"
+    }
+    Frame {
+        msec: 64
+        hash: "9ca724d4b31aa16015b5cbb50eea0c3a"
+    }
+    Frame {
+        msec: 80
+        hash: "8a2c62a0190da1b7c1bade243baea6b8"
+    }
+    Frame {
+        msec: 96
+        hash: "e129bebca7ad348c3134569d8eee4efc"
+    }
+    Frame {
+        msec: 112
+        hash: "fd6387415e1c02fe6d17d9c3aa1d1ed8"
+    }
+    Frame {
+        msec: 128
+        hash: "a82a4042fdca7c30facd2c4740c455f7"
+    }
+    Frame {
+        msec: 144
+        hash: "62195722eb3acbfbad137ec71fd50bfe"
+    }
+    Frame {
+        msec: 160
+        hash: "449819cdc880d59650732b5447ec6237"
+    }
+    Frame {
+        msec: 176
+        hash: "552a838ebcacc0e08fa93b64a2433831"
+    }
+    Frame {
+        msec: 192
+        hash: "3984992606d54f05eb31dd0974af2183"
+    }
+    Frame {
+        msec: 208
+        hash: "3fd7225bbb0215ca8b6397580f2352a5"
+    }
+    Frame {
+        msec: 224
+        hash: "0fd8f26f40a9049de1cf2a9493d579d1"
+    }
+    Frame {
+        msec: 240
+        hash: "d08f0c57f071dc42e79fc5e0e3c32eeb"
+    }
+    Frame {
+        msec: 256
+        hash: "084c2db330ee82cd032df248ecc9629d"
+    }
+    Frame {
+        msec: 272
+        hash: "98da0d7f280d7fc4579c970c9a173b51"
+    }
+    Frame {
+        msec: 288
+        hash: "4c819c54ced1b6ef0574417a7e11f2e7"
+    }
+    Frame {
+        msec: 304
+        hash: "3dc5f7b412cb176c3b23d37cda3ef87c"
+    }
+    Frame {
+        msec: 320
+        hash: "c368a01b43d94205c03f9c750c37f330"
+    }
+    Frame {
+        msec: 336
+        hash: "8842bd0c8b17cac4fc9df84835999174"
+    }
+    Frame {
+        msec: 352
+        hash: "26829e9c7ca44dfcb0c03852f4158a18"
+    }
+    Frame {
+        msec: 368
+        hash: "ecffdb0888f1721e27b163e1f29a1950"
+    }
+    Frame {
+        msec: 384
+        hash: "eaead96f2683c464a12df8aadba20691"
+    }
+    Frame {
+        msec: 400
+        hash: "1e931963925bd208dce1ec9011372a3b"
+    }
+    Frame {
+        msec: 416
+        hash: "1c3fd049001c1e883f21d0d1e0e32cba"
+    }
+    Frame {
+        msec: 432
+        hash: "e8c3422ca637750ac52565594737d092"
+    }
+    Frame {
+        msec: 448
+        hash: "b1c36322cf89e15a80af7c43f2aebca1"
+    }
+    Frame {
+        msec: 464
+        hash: "f676c3171495f7bb2cb1812cfebaa17a"
+    }
+    Frame {
+        msec: 480
+        hash: "255119e2efa99c8e31fee611aaaa5137"
+    }
+    Frame {
+        msec: 496
+        hash: "e0bd32e3d44cfc2351db105f4595f18a"
+    }
+    Frame {
+        msec: 512
+        hash: "b7f23b8f3769f929b42491efda7ebe19"
+    }
+    Frame {
+        msec: 528
+        hash: "718cee11d869a8a8c5191cc0c09f2d30"
+    }
+    Frame {
+        msec: 544
+        hash: "fbdbf92f8c5f507605ff50abc594682b"
+    }
+    Frame {
+        msec: 560
+        hash: "c07fdc69c72b40d3c8dd1cc499008888"
+    }
+    Frame {
+        msec: 576
+        hash: "38e17ecd537dc0f51211ad672a2ebb21"
+    }
+    Frame {
+        msec: 592
+        hash: "2cbdc8728ef779c62f9938672986658a"
+    }
+    Frame {
+        msec: 608
+        hash: "7fb66509d5d1df34861e9c70f9a579f0"
+    }
+    Frame {
+        msec: 624
+        hash: "410b89392e859058718a08b79ec3d8fa"
+    }
+    Frame {
+        msec: 640
+        hash: "9bd90f80700217d08dafed93b81ee9cf"
+    }
+    Frame {
+        msec: 656
+        hash: "6d83671504a4274887b4e0d9bd2b24e7"
+    }
+    Frame {
+        msec: 672
+        hash: "51ff7bd3fd4a776af33fce7b935b145c"
+    }
+    Frame {
+        msec: 688
+        hash: "20f27392368b63b248bcd455cf3c9106"
+    }
+    Frame {
+        msec: 704
+        hash: "1a5ab296bd55aa215c9b04a7ff6c73a1"
+    }
+    Frame {
+        msec: 720
+        hash: "020fd7b14e8662fc006b0c39adca7c6a"
+    }
+    Frame {
+        msec: 736
+        hash: "2619120bdb25a153963bdf05c4a16d44"
+    }
+    Frame {
+        msec: 752
+        hash: "fd321314031efeb9ce71146764289d9f"
+    }
+    Frame {
+        msec: 768
+        hash: "378a71f09445dfff284db919787cbf87"
+    }
+    Frame {
+        msec: 784
+        hash: "d59eefe82ab8a00c903141dd9ea767ef"
+    }
+    Frame {
+        msec: 800
+        hash: "0a65004d69a4567f2a5c7e84dab3a905"
+    }
+    Frame {
+        msec: 816
+        hash: "92a4631716a51ff484ca14d9cfe05b2e"
+    }
+    Frame {
+        msec: 832
+        hash: "87203f627cf410cad56d6ba38a140efa"
+    }
+    Frame {
+        msec: 848
+        hash: "054cc085998cc059a6b7b4a7300dd36b"
+    }
+    Frame {
+        msec: 864
+        hash: "af3fefeb908a0485c723d36f61eff0a4"
+    }
+    Frame {
+        msec: 880
+        hash: "3f905d1e1ea79858b5a9bbfeab4eb255"
+    }
+    Frame {
+        msec: 896
+        hash: "f935f1fc5f26a201098d894fca9a4d1f"
+    }
+    Frame {
+        msec: 912
+        hash: "42b003dbb531da514716b9c32bdd3614"
+    }
+    Frame {
+        msec: 928
+        hash: "a82fed83ee4efee7896b639c7691b13a"
+    }
+    Frame {
+        msec: 944
+        hash: "31ad8cbf875233ea495330b0d3d4d2dd"
+    }
+    Frame {
+        msec: 960
+        image: "follow.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "78422e0e8d323dea6aa655a2980b7562"
+    }
+    Frame {
+        msec: 992
+        hash: "5d71ff48b865ad4266eb8292f981b04e"
+    }
+    Frame {
+        msec: 1008
+        hash: "df599d934d131c92b209284277009efb"
+    }
+    Frame {
+        msec: 1024
+        hash: "5aaf33d11eb70ffdfe89246c637caed7"
+    }
+    Frame {
+        msec: 1040
+        hash: "9648cf623a66ded145c4fd23a42917b3"
+    }
+    Frame {
+        msec: 1056
+        hash: "9d33c2cc44ceac5a527ddcf809a51df6"
+    }
+    Frame {
+        msec: 1072
+        hash: "6d0ad2e0d012e53a03e246e6d5e49e13"
+    }
+    Frame {
+        msec: 1088
+        hash: "d33fa68796e38b19f44571d11c1bcd33"
+    }
+    Frame {
+        msec: 1104
+        hash: "636680f49bbf30b0fac31a6c581f18dd"
+    }
+    Frame {
+        msec: 1120
+        hash: "66801dbc39301e6b46b244fe502e0340"
+    }
+    Frame {
+        msec: 1136
+        hash: "f8fa6a033483279e78636f26493b10ac"
+    }
+    Frame {
+        msec: 1152
+        hash: "11b46611550173df42986dee4339d907"
+    }
+    Frame {
+        msec: 1168
+        hash: "5c9afdb519006079ee8d28b2b60d0b76"
+    }
+    Frame {
+        msec: 1184
+        hash: "9a55c38b2cd8abf25fbe448c7ef80971"
+    }
+    Frame {
+        msec: 1200
+        hash: "27ebdf1424e892b35c93ec009d942407"
+    }
+    Frame {
+        msec: 1216
+        hash: "2d9e3f0ae56f7337012b51c4dd173108"
+    }
+    Frame {
+        msec: 1232
+        hash: "e6f89ca892131d68ff1f4ca95c95d807"
+    }
+    Frame {
+        msec: 1248
+        hash: "f75791f1b12a217d37acb09bdb114cc5"
+    }
+    Frame {
+        msec: 1264
+        hash: "94c5ab1460fb1b0f957a9718b45bca36"
+    }
+    Frame {
+        msec: 1280
+        hash: "e246c8a0ec3d01ea20258b24a5673fe1"
+    }
+    Frame {
+        msec: 1296
+        hash: "529de7735e73409dff266d8c1275215c"
+    }
+    Frame {
+        msec: 1312
+        hash: "330400763a670580570cb62241ebec62"
+    }
+    Frame {
+        msec: 1328
+        hash: "ae444d1de9c509fc6f74136ca90f927a"
+    }
+    Frame {
+        msec: 1344
+        hash: "c43631ca8ee90ea5dc7664be5bc45429"
+    }
+    Frame {
+        msec: 1360
+        hash: "b366ac4a5b66c331a7667e9df0fc4eda"
+    }
+    Frame {
+        msec: 1376
+        hash: "1c7f4c47a9c57a34787cc9703e99bff1"
+    }
+    Frame {
+        msec: 1392
+        hash: "5555535609d512e8d34549b6624f74b8"
+    }
+    Frame {
+        msec: 1408
+        hash: "be59df714541923494b59f31f57e310e"
+    }
+    Frame {
+        msec: 1424
+        hash: "63e434f053032e54298f6e61c8d4da7d"
+    }
+    Frame {
+        msec: 1440
+        hash: "b0bb838637eceb6f8993ebc5b887afed"
+    }
+    Frame {
+        msec: 1456
+        hash: "fc39f33add4ebcaf578558ecd4aea281"
+    }
+    Frame {
+        msec: 1472
+        hash: "3f36faa7cc1e5898d4d5890c47633ff3"
+    }
+    Frame {
+        msec: 1488
+        hash: "4b328002b4461869b1f7de48e7291902"
+    }
+    Frame {
+        msec: 1504
+        hash: "26252c63924d2abcaebea2c7caf1d7aa"
+    }
+    Frame {
+        msec: 1520
+        hash: "a9a6023484ae439be86b2c2ff59dc40b"
+    }
+    Frame {
+        msec: 1536
+        hash: "620dab11bd4aab84cc0d949c48dd9a5d"
+    }
+    Frame {
+        msec: 1552
+        hash: "3b45ef80ee3e6fbbd3533bfa0d666e2f"
+    }
+    Frame {
+        msec: 1568
+        hash: "b33306abcb6a8402e491b7216495c778"
+    }
+    Frame {
+        msec: 1584
+        hash: "3cc52e8649a02e87785f1dc63f5c1efd"
+    }
+    Frame {
+        msec: 1600
+        hash: "fe21141f48da685213ed9d7641b2e7a0"
+    }
+    Frame {
+        msec: 1616
+        hash: "205aac4e822e20bd32f637256250f3c8"
+    }
+    Frame {
+        msec: 1632
+        hash: "124df0948f36aaf6151556d301f4b930"
+    }
+    Frame {
+        msec: 1648
+        hash: "c1701edd5eaf143fd1dbdc4a5324b48a"
+    }
+    Frame {
+        msec: 1664
+        hash: "117402df55367c918a3835958f4ab1d6"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 195; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1680
+        hash: "73e3b86a1da28490cae4b03fdceefe19"
+    }
+    Frame {
+        msec: 1696
+        hash: "172e329fb47d6db0180242990a84fe3b"
+    }
+    Frame {
+        msec: 1712
+        hash: "82cf704cdfd406bab22689bc888ddc8d"
+    }
+    Frame {
+        msec: 1728
+        hash: "4c288f198a06d1b2815d34c3c8f97051"
+    }
+    Frame {
+        msec: 1744
+        hash: "6404d81456bb95a6b1c1ae55a181e40e"
+    }
+    Frame {
+        msec: 1760
+        hash: "2c01571e523002166ba6ec476bc8a68b"
+    }
+    Frame {
+        msec: 1776
+        hash: "95388037c1f79a9dab951031f1d7c307"
+    }
+    Frame {
+        msec: 1792
+        hash: "c4ee57d9bffbb5f0ff173db48eadf2e3"
+    }
+    Frame {
+        msec: 1808
+        hash: "703ac9672a9c55cf08e6381ef76ac13c"
+    }
+    Frame {
+        msec: 1824
+        hash: "ea7726d2a2923290398262c8f70d511e"
+    }
+    Frame {
+        msec: 1840
+        hash: "5d1af6cbdb4ee5b00045751204408632"
+    }
+    Frame {
+        msec: 1856
+        hash: "a52aa37b10a05382f1b136896b7e00e8"
+    }
+    Frame {
+        msec: 1872
+        hash: "a5acc1a45c95a67725e5e15084b7be18"
+    }
+    Frame {
+        msec: 1888
+        hash: "c9fac8b5a4110493958d49b073ea96ed"
+    }
+    Frame {
+        msec: 1904
+        hash: "6fca3a5c6d1cfbf1b905aca25b7785c5"
+    }
+    Frame {
+        msec: 1920
+        image: "follow.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "379d5c4ced414f856e476095fbedfb7d"
+    }
+    Frame {
+        msec: 1952
+        hash: "b2f980ab19d44ee98ab3e82a19adfe2d"
+    }
+    Frame {
+        msec: 1968
+        hash: "e01732623930aebefd76ab62c81dc722"
+    }
+    Frame {
+        msec: 1984
+        hash: "3a59c6851bc89eb31100092b1ceddbd9"
+    }
+    Frame {
+        msec: 2000
+        hash: "2949de19eacb9f35816aa7ba69614f2c"
+    }
+    Frame {
+        msec: 2016
+        hash: "f2c4c1f4429cbb6bd10f2318b2cb6904"
+    }
+    Frame {
+        msec: 2032
+        hash: "2c48af64162e7e028cd536dba03eab71"
+    }
+    Frame {
+        msec: 2048
+        hash: "7fe13b8f9253f720b6591b396cfba2d1"
+    }
+    Frame {
+        msec: 2064
+        hash: "559947a03e650575a764801366cc504b"
+    }
+    Frame {
+        msec: 2080
+        hash: "a8d09f6c862fd5ec2dcf34f06d1ef744"
+    }
+    Frame {
+        msec: 2096
+        hash: "e3bb4b62209631ff84134f2243bfdb42"
+    }
+    Frame {
+        msec: 2112
+        hash: "a1956a9d1939bc154ea0c88d596948cc"
+    }
+    Frame {
+        msec: 2128
+        hash: "c98a375727860da1e827d4dd74af8f63"
+    }
+    Frame {
+        msec: 2144
+        hash: "df4edcbb2ef5348341ff55c808609b6c"
+    }
+    Frame {
+        msec: 2160
+        hash: "6287564be85b7cbadc6bb6f0232bc837"
+    }
+    Frame {
+        msec: 2176
+        hash: "9826fdb48f7ea770fa5f198ec49d7cb7"
+    }
+    Frame {
+        msec: 2192
+        hash: "56f82641a5591df9bb929cc0d32eb95d"
+    }
+    Frame {
+        msec: 2208
+        hash: "526c55e555fb2e58796561efa3568c50"
+    }
+    Frame {
+        msec: 2224
+        hash: "6b4b74613421c1841a17c369cb316754"
+    }
+    Frame {
+        msec: 2240
+        hash: "37f785c30947d5eec113dcf6af649abf"
+    }
+    Frame {
+        msec: 2256
+        hash: "5ff2c975dd9e261c764537c836627c4d"
+    }
+    Frame {
+        msec: 2272
+        hash: "efe554981583749c3d09988bce7fed02"
+    }
+    Frame {
+        msec: 2288
+        hash: "0f7204b4afb0ea5d58e49650e8027c0c"
+    }
+    Frame {
+        msec: 2304
+        hash: "817291f91f4b309710ad3aed53a7d47a"
+    }
+    Frame {
+        msec: 2320
+        hash: "c15c9cd03089090cf8a777c1f0d88de7"
+    }
+    Frame {
+        msec: 2336
+        hash: "05f45cb8d0856dcc81091351615e35d6"
+    }
+    Frame {
+        msec: 2352
+        hash: "99785a16fed6d6409b4b47ec55afb56b"
+    }
+    Frame {
+        msec: 2368
+        hash: "39032cb4432ee9536af500673fccf526"
+    }
+    Frame {
+        msec: 2384
+        hash: "9057653e3cd6042831037d3590e7595b"
+    }
+    Frame {
+        msec: 2400
+        hash: "76c772eb2ab8f117c260c9c96bc99e1d"
+    }
+    Frame {
+        msec: 2416
+        hash: "b6474665b8f8bcdd76d1a38efecad889"
+    }
+    Frame {
+        msec: 2432
+        hash: "106c2d2efafad0181e3ded3a6805f2c6"
+    }
+    Frame {
+        msec: 2448
+        hash: "5275fa4ffef6c1909f9d03bb1e7b9cae"
+    }
+    Frame {
+        msec: 2464
+        hash: "0c1043c0087d60000dc7259d4ac03618"
+    }
+    Frame {
+        msec: 2480
+        hash: "645748569b4f5cb9b206b0808bb7d23d"
+    }
+    Frame {
+        msec: 2496
+        hash: "dd95dfa80e1b3ff511e7c75efd0d87ce"
+    }
+    Frame {
+        msec: 2512
+        hash: "86b3dd03b04d7610837cdc67cad07e0a"
+    }
+    Frame {
+        msec: 2528
+        hash: "8264f67ac92e4ebcfe4cc8e954f8c5d2"
+    }
+    Frame {
+        msec: 2544
+        hash: "6bf52377d822b09eb28a1ec36d3a36a9"
+    }
+    Frame {
+        msec: 2560
+        hash: "7ae1d65cdaf7fa71eb4ec318b37bb0aa"
+    }
+    Frame {
+        msec: 2576
+        hash: "860f5ce9844c90cf9e6a6d383ff0972f"
+    }
+    Frame {
+        msec: 2592
+        hash: "5502229c038dfc59d966f69ae6ed8957"
+    }
+    Frame {
+        msec: 2608
+        hash: "21843c027bc1434ae60b3bb0fced2c54"
+    }
+    Frame {
+        msec: 2624
+        hash: "962df45680949c3eb6c968f98cd76b20"
+    }
+    Frame {
+        msec: 2640
+        hash: "f313c26fa76a0edce61244bdf92528e4"
+    }
+    Frame {
+        msec: 2656
+        hash: "b7bbde239e98cbd66b1e51b54b747f51"
+    }
+    Frame {
+        msec: 2672
+        hash: "62340707fbc832fcb805c8f80ab353d1"
+    }
+    Frame {
+        msec: 2688
+        hash: "d008a3f7af1810ff70b68b38a4cd0f0d"
+    }
+    Frame {
+        msec: 2704
+        hash: "e651dd628af24faf34d716beb392b052"
+    }
+    Frame {
+        msec: 2720
+        hash: "a97733963c7a7616b25741545b07ffba"
+    }
+    Frame {
+        msec: 2736
+        hash: "3e017cc1db720cf16521bd17308e4f44"
+    }
+    Frame {
+        msec: 2752
+        hash: "13652ebaa610cca71486517e2eed21a5"
+    }
+    Frame {
+        msec: 2768
+        hash: "09f0f500c6f7d11be39c31f9e589b38a"
+    }
+    Frame {
+        msec: 2784
+        hash: "b87968cbc60ddc6a5f5699e830410eab"
+    }
+    Frame {
+        msec: 2800
+        hash: "50e65b043d1f07a321a08ee4c25204f6"
+    }
+    Frame {
+        msec: 2816
+        hash: "122d1ffa1510468e8c4067e0f511588f"
+    }
+    Frame {
+        msec: 2832
+        hash: "585f6c25caaafb99a22a23d8a998d202"
+    }
+    Frame {
+        msec: 2848
+        hash: "9b245a00ad576666c10f509d8a80a61e"
+    }
+    Frame {
+        msec: 2864
+        hash: "9b245a00ad576666c10f509d8a80a61e"
+    }
+    Frame {
+        msec: 2880
+        image: "follow.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "3c5d3d10bacc093afc6a9c0b5aa4cddc"
+    }
+    Frame {
+        msec: 2912
+        hash: "31926d69c2309fdf13fbd7f0e9868c3d"
+    }
+    Frame {
+        msec: 2928
+        hash: "eb3acacce5dd31b0e94b59b9e546ccae"
+    }
+    Frame {
+        msec: 2944
+        hash: "9a51cff3276d75803a0a6e480f7ecb70"
+    }
+    Frame {
+        msec: 2960
+        hash: "fbbd8b9d519993a699815d935bcd2b9f"
+    }
+    Frame {
+        msec: 2976
+        hash: "0314190c6de73f9f374a4eaed0709645"
+    }
+    Frame {
+        msec: 2992
+        hash: "8ca1a203bdb5446094eb948aeb0a333e"
+    }
+    Frame {
+        msec: 3008
+        hash: "301e1b86ce38e11ad9d0d7aba0909985"
+    }
+    Frame {
+        msec: 3024
+        hash: "922095867d0a91b73ab7a63df2041279"
+    }
+    Frame {
+        msec: 3040
+        hash: "ba8275f3ba4633bf64a1f81f630c90f1"
+    }
+    Frame {
+        msec: 3056
+        hash: "efe39545279a7bd015d2de75d2b9d8b1"
+    }
+    Frame {
+        msec: 3072
+        hash: "78926c3c0c6fcf89b9291f9902710964"
+    }
+    Frame {
+        msec: 3088
+        hash: "ea63dcb7f00d3ddede0d8be59ad9d6bc"
+    }
+    Frame {
+        msec: 3104
+        hash: "286ad493301b713a49e378f123482a53"
+    }
+    Frame {
+        msec: 3120
+        hash: "a4bbbb8bb88188d3e99996502e3eebd1"
+    }
+    Frame {
+        msec: 3136
+        hash: "a6100e79f3dc5af594e86ab6cd8dfb76"
+    }
+    Frame {
+        msec: 3152
+        hash: "d9e3f777dc89bcf1b7f712206db768e2"
+    }
+    Frame {
+        msec: 3168
+        hash: "768045c600c0aa0b1e9e6f012733c600"
+    }
+    Frame {
+        msec: 3184
+        hash: "d8b4caa641ddee786f7898359efe9d07"
+    }
+    Frame {
+        msec: 3200
+        hash: "f7c3b76d5bb7c263ac9447eaad685158"
+    }
+    Frame {
+        msec: 3216
+        hash: "f7f97db815d653ec29fa31b87f72af2a"
+    }
+    Frame {
+        msec: 3232
+        hash: "18524623762487b60943312cd8bd4388"
+    }
+    Frame {
+        msec: 3248
+        hash: "5823dee5dd56e9f7515601f9629ccbae"
+    }
+    Frame {
+        msec: 3264
+        hash: "5823dee5dd56e9f7515601f9629ccbae"
+    }
+    Frame {
+        msec: 3280
+        hash: "5823dee5dd56e9f7515601f9629ccbae"
+    }
+    Frame {
+        msec: 3296
+        hash: "5823dee5dd56e9f7515601f9629ccbae"
+    }
+    Frame {
+        msec: 3312
+        hash: "18524623762487b60943312cd8bd4388"
+    }
+    Frame {
+        msec: 3328
+        hash: "430995770b655054aaeda383df8e27f7"
+    }
+    Frame {
+        msec: 3344
+        hash: "16a3a00f2b89aed676f80d63c4933ec3"
+    }
+    Frame {
+        msec: 3360
+        hash: "6c55aa62079ec546522edbf69c37b270"
+    }
+    Frame {
+        msec: 3376
+        hash: "0d68ca3ccecdd831013950cc7405e46e"
+    }
+    Frame {
+        msec: 3392
+        hash: "9da2511bc8b434218695fa74ed543439"
+    }
+    Frame {
+        msec: 3408
+        hash: "05afdd0b99dab81a500cdc2b2f0786fe"
+    }
+    Frame {
+        msec: 3424
+        hash: "e6f8882d146ae60bcc6ea47ff41a637b"
+    }
+    Frame {
+        msec: 3440
+        hash: "154542ed0e88321294f382501819aefc"
+    }
+    Frame {
+        msec: 3456
+        hash: "8f47b6980c387c5020145bf04645fd2d"
+    }
+    Frame {
+        msec: 3472
+        hash: "b34b055c7602f1f4e1cde875b258120c"
+    }
+    Frame {
+        msec: 3488
+        hash: "5a697f675575f05e297d4877604b9a47"
+    }
+    Frame {
+        msec: 3504
+        hash: "729dff1d1b357d19fc81804ec8940d0e"
+    }
+    Frame {
+        msec: 3520
+        hash: "c6f3fee46baa94a6139d2ee40254b160"
+    }
+    Frame {
+        msec: 3536
+        hash: "af0e700bb8ae34834510830f8b44afdb"
+    }
+    Frame {
+        msec: 3552
+        hash: "9c87bb54c2dfe58c2da9194dae6f7502"
+    }
+    Frame {
+        msec: 3568
+        hash: "2132356a92c75d725f9feafb8201b142"
+    }
+    Frame {
+        msec: 3584
+        hash: "50d855d2595eeae2bfd6aaa8c2fa0454"
+    }
+    Frame {
+        msec: 3600
+        hash: "5fde3c62d6e53a9056e3586f9dcda59e"
+    }
+    Frame {
+        msec: 3616
+        hash: "8f04460254a1e9fb949d5165894cd92a"
+    }
+    Frame {
+        msec: 3632
+        hash: "2b514c5e3b20d30f9c7e71092c69f081"
+    }
+    Frame {
+        msec: 3648
+        hash: "2c1ba6224037790e15f5c0f2864ace4d"
+    }
+    Frame {
+        msec: 3664
+        hash: "0d5b8e7bd5f560888aacaf2b3c6827a8"
+    }
+    Frame {
+        msec: 3680
+        hash: "ae25004530e7df134414018e4a34780e"
+    }
+    Frame {
+        msec: 3696
+        hash: "1a8fd9eaf9a91f1b42924f8986fbed9a"
+    }
+    Frame {
+        msec: 3712
+        hash: "2ea6de2025d40ed5beeff12a5b70ccc9"
+    }
+    Frame {
+        msec: 3728
+        hash: "624e417718d3cac1e4b7e4ce258ce6ea"
+    }
+    Frame {
+        msec: 3744
+        hash: "8b56d29391257c7be8966af6be26ea9f"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 195; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3760
+        hash: "5c0d977d8b446d9191bde57335cf1062"
+    }
+    Frame {
+        msec: 3776
+        hash: "100be2b21d069e3a5dbb694a90da4d4f"
+    }
+    Frame {
+        msec: 3792
+        hash: "caab03f6c81080dd8fdbedb4e94ae4a5"
+    }
+    Frame {
+        msec: 3808
+        hash: "3328a4d06f2f80a7e9ccf2ff21522fca"
+    }
+    Frame {
+        msec: 3824
+        hash: "a534e6cc28daf3eff6a9cf8379bd6375"
+    }
+    Frame {
+        msec: 3840
+        image: "follow.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "0aed83364cd59e3f7309c92593894d43"
+    }
+    Frame {
+        msec: 3872
+        hash: "d3f1c3593375ca5c022a1361a7ec70bd"
+    }
+    Frame {
+        msec: 3888
+        hash: "67843e6192e2ecaa3820c37dc2f93106"
+    }
+    Frame {
+        msec: 3904
+        hash: "19a022f678e5b8f4ebdff936162323dc"
+    }
+    Frame {
+        msec: 3920
+        hash: "34e55ae70c9e156db339ae15642359c3"
+    }
+    Frame {
+        msec: 3936
+        hash: "3784778c817f9d9bb73d990cfe12685a"
+    }
+    Frame {
+        msec: 3952
+        hash: "0403fdf79e3ba339c7e3786db0c9c0f0"
+    }
+    Frame {
+        msec: 3968
+        hash: "93e4a0d5645d1cfc916f1e8422655555"
+    }
+    Frame {
+        msec: 3984
+        hash: "29080bfabb87160b7c51385fb36b474b"
+    }
+    Frame {
+        msec: 4000
+        hash: "9da2d83edc9d35f00fb8a159e79de4d9"
+    }
+    Frame {
+        msec: 4016
+        hash: "5505a42d4788f00cfc7499fbfda851ce"
+    }
+    Frame {
+        msec: 4032
+        hash: "bdd3040ab16fa9ffdd2fbc66b06699f8"
+    }
+    Frame {
+        msec: 4048
+        hash: "2a347e30a20c693a9440caa60ade0a0f"
+    }
+    Frame {
+        msec: 4064
+        hash: "0307f1857c091a639d47f112ce1a2f5a"
+    }
+    Frame {
+        msec: 4080
+        hash: "778d18e539bbd562ebe39283a6315df1"
+    }
+    Frame {
+        msec: 4096
+        hash: "0369cf6c3d1f5db2e92ee1f7c5d3b8ed"
+    }
+    Frame {
+        msec: 4112
+        hash: "9f7413587ab50f1abf776bf180ec2d6f"
+    }
+    Frame {
+        msec: 4128
+        hash: "7d04a27236485808e571e8a39f23ea17"
+    }
+    Frame {
+        msec: 4144
+        hash: "a1dff63b723473d5a4c9c59975a2fb81"
+    }
+    Frame {
+        msec: 4160
+        hash: "9795ea70a3b9d3b7805221a58c19e5da"
+    }
+    Frame {
+        msec: 4176
+        hash: "f1392c489e21107136eb8e0d1e8b427e"
+    }
+    Frame {
+        msec: 4192
+        hash: "95c225ef07171a96335e99078195b06a"
+    }
+    Frame {
+        msec: 4208
+        hash: "d46ef3e7f9cec06e8c18afc0d07be4f3"
+    }
+    Frame {
+        msec: 4224
+        hash: "b017f5b51d423bb0fca0d6df3aaded8b"
+    }
+    Frame {
+        msec: 4240
+        hash: "60584d085b0cd6fbc436773be678597e"
+    }
+    Frame {
+        msec: 4256
+        hash: "117951465dfd5c386826b295560d2dec"
+    }
+    Frame {
+        msec: 4272
+        hash: "1b70137da5f4e024593999e93121fe8b"
+    }
+    Frame {
+        msec: 4288
+        hash: "bd50dffd41941fef127f39b55c4748e0"
+    }
+    Frame {
+        msec: 4304
+        hash: "8eec34d8e1d2e22d11b85a671cd4d3aa"
+    }
+    Frame {
+        msec: 4320
+        hash: "9e3c97cfad5002ef5f3fcc365aeb7bd0"
+    }
+    Frame {
+        msec: 4336
+        hash: "28e1cf1ee033915ea2ee39c9ab00a73d"
+    }
+    Frame {
+        msec: 4352
+        hash: "99101a156a553f441f00221f6facbf1f"
+    }
+    Frame {
+        msec: 4368
+        hash: "419023e5d59d16c26b35bee7d3cea559"
+    }
+    Frame {
+        msec: 4384
+        hash: "485d23519293975b04031fe4baa5c276"
+    }
+    Frame {
+        msec: 4400
+        hash: "c8bc60735e0ede26dbaf228294853f9a"
+    }
+    Frame {
+        msec: 4416
+        hash: "ada3680b807d59843e3adf6640704066"
+    }
+    Frame {
+        msec: 4432
+        hash: "3e28f3adf9241512cd0d6918d81ffffb"
+    }
+    Frame {
+        msec: 4448
+        hash: "8f339acc33cbc89ae1c62391ce021bb3"
+    }
+    Frame {
+        msec: 4464
+        hash: "d303960c0853a90557d64a04b8283c94"
+    }
+    Frame {
+        msec: 4480
+        hash: "f907dbdacf2cfa9fdf8f9c8dead5b4c4"
+    }
+    Frame {
+        msec: 4496
+        hash: "30c6e6f283f4a3f538cdda9c2e92de8c"
+    }
+    Frame {
+        msec: 4512
+        hash: "04d2ac55774b43107a43a7d33764199b"
+    }
+    Frame {
+        msec: 4528
+        hash: "cddf3e111cbc59e721725daa1d8a0c31"
+    }
+    Frame {
+        msec: 4544
+        hash: "15b1b63cd1695207ebf9f04387be0739"
+    }
+    Frame {
+        msec: 4560
+        hash: "690769b9bbe86a3c5b1fbdee39615fbd"
+    }
+    Frame {
+        msec: 4576
+        hash: "2bd640d8ddbf878d808f22656fef1ed9"
+    }
+    Frame {
+        msec: 4592
+        hash: "a654f1e4519bf883d554276ebbe96323"
+    }
+    Frame {
+        msec: 4608
+        hash: "68f0313cfc3f51a0bb9b47c5407c19b6"
+    }
+    Frame {
+        msec: 4624
+        hash: "77f29806b084de4cabf7ab9bf1a93d5e"
+    }
+    Frame {
+        msec: 4640
+        hash: "f9991189e3282d107b98fb0ae5f5ef00"
+    }
+    Frame {
+        msec: 4656
+        hash: "0cd1f2f6e347d48feea1b26a4968dec7"
+    }
+    Frame {
+        msec: 4672
+        hash: "e75a6f6a088e2289042572a161ffb0e9"
+    }
+    Frame {
+        msec: 4688
+        hash: "5a541081444c0a71128223a4c4c3144c"
+    }
+    Frame {
+        msec: 4704
+        hash: "6813d442cc610f346a5441ed0cd723e5"
+    }
+    Frame {
+        msec: 4720
+        hash: "24ec539bc57899819915f833f26deacd"
+    }
+    Frame {
+        msec: 4736
+        hash: "3a7ed1b4b533b817674aa141c420cd61"
+    }
+    Frame {
+        msec: 4752
+        hash: "d0a643fae97bb152e97ca60e96299003"
+    }
+    Frame {
+        msec: 4768
+        hash: "c84093931520f4661eff6645091a294b"
+    }
+    Frame {
+        msec: 4784
+        hash: "81e7ceaece82505a4a16ead195a66162"
+    }
+    Frame {
+        msec: 4800
+        image: "follow.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "a510d302d2441b9a07463aed8b592d32"
+    }
+    Frame {
+        msec: 4832
+        hash: "d1824ced8af34ad9edb36a58ae9aa7f5"
+    }
+    Frame {
+        msec: 4848
+        hash: "167b9a49fbb94908e09e7e9c9147cd8b"
+    }
+    Frame {
+        msec: 4864
+        hash: "442d5f0906840de526d59a80ada322c0"
+    }
+    Frame {
+        msec: 4880
+        hash: "78206c4d4d23c7c1ba888b9062b09432"
+    }
+    Frame {
+        msec: 4896
+        hash: "e898202cfebbff1952efc6e01254d855"
+    }
+    Frame {
+        msec: 4912
+        hash: "ab31dc7bbad2b0552359866bb8d92f0c"
+    }
+    Frame {
+        msec: 4928
+        hash: "f093304e88964376baf9721d53d4fb49"
+    }
+    Frame {
+        msec: 4944
+        hash: "3ef76f3e1c44d13c3a469bd192ff7b5d"
+    }
+    Frame {
+        msec: 4960
+        hash: "5d3b6d0d91f8cc5b89e39407bc3b5a15"
+    }
+    Frame {
+        msec: 4976
+        hash: "3c73573f12f49b34e1d990a55ad913fa"
+    }
+    Frame {
+        msec: 4992
+        hash: "d1bac071b01a1c6fddab90cdc435fad4"
+    }
+    Frame {
+        msec: 5008
+        hash: "36a219aadec910f1dbef616c641e1d2b"
+    }
+    Frame {
+        msec: 5024
+        hash: "5871fc67d361cc988551592ee21dfb23"
+    }
+    Frame {
+        msec: 5040
+        hash: "6e65ee6c814b9a9da205c36925e663bf"
+    }
+    Frame {
+        msec: 5056
+        hash: "290b20fa8e91d34000d7c2d81745f6d2"
+    }
+    Frame {
+        msec: 5072
+        hash: "19e7405a9083a8143f7bb040f8837b29"
+    }
+    Frame {
+        msec: 5088
+        hash: "c0a0fa2b4c1ceb6c70594994a1ac8713"
+    }
+    Frame {
+        msec: 5104
+        hash: "c236224c16743fb606deb78bcb8afc8d"
+    }
+    Frame {
+        msec: 5120
+        hash: "7d44db15eb300b4338ffc26e9bcfce20"
+    }
+    Frame {
+        msec: 5136
+        hash: "067a79148a194c45c6f32d85316a1e11"
+    }
+    Frame {
+        msec: 5152
+        hash: "9075c379044476994a87f0fdcce8e332"
+    }
+    Frame {
+        msec: 5168
+        hash: "b2316988fbd51096a4f512e71fe7d0a2"
+    }
+    Frame {
+        msec: 5184
+        hash: "280f70877d93af5f84e178aad6a102d8"
+    }
+    Frame {
+        msec: 5200
+        hash: "3eef4ae7e43a8cf1cd9dd562237296f8"
+    }
+    Frame {
+        msec: 5216
+        hash: "e3184f77ce3a47ca4dca6386f42d7fec"
+    }
+    Frame {
+        msec: 5232
+        hash: "a2a5df66fe4808ea8d466cac84ba910c"
+    }
+    Frame {
+        msec: 5248
+        hash: "9f8a0e54788112d6c30482e840504f35"
+    }
+    Frame {
+        msec: 5264
+        hash: "ae69cf84798844f9f360c86790feaecd"
+    }
+    Frame {
+        msec: 5280
+        hash: "0244526572acb6266db5b7eb9d29c6fc"
+    }
+    Frame {
+        msec: 5296
+        hash: "8fb53d60b95ddb5aef27442934ea9983"
+    }
+    Frame {
+        msec: 5312
+        hash: "930fcfde491b4f5681e3861764003895"
+    }
+    Frame {
+        msec: 5328
+        hash: "bcdcd0a637112d113ebe11dc18823237"
+    }
+    Frame {
+        msec: 5344
+        hash: "65a564d5a5afbc14c0cdad4d52753507"
+    }
+    Frame {
+        msec: 5360
+        hash: "0c5056d438d2d54938f31ef5f996673a"
+    }
+    Frame {
+        msec: 5376
+        hash: "11c157ad2236fc390ffbdf339366cbc1"
+    }
+    Frame {
+        msec: 5392
+        hash: "6cb341b1f281a97a35c2e41bfd4c4d9d"
+    }
+    Frame {
+        msec: 5408
+        hash: "553a945f7f19f70ddae4ebe88e52a79b"
+    }
+    Frame {
+        msec: 5424
+        hash: "d10b42b4095a2474e66a5a322f72e936"
+    }
+    Frame {
+        msec: 5440
+        hash: "0f943d61e8072d70eddee8aa1ba0de5a"
+    }
+    Frame {
+        msec: 5456
+        hash: "3df18e237b666e78d57857739b759e6d"
+    }
+    Frame {
+        msec: 5472
+        hash: "1ddc0bfdb2ca7b6dee63f1024e62f26e"
+    }
+    Frame {
+        msec: 5488
+        hash: "aaa397714528f41238059e3a88833abc"
+    }
+    Frame {
+        msec: 5504
+        hash: "c94bd69f925c782656afc5f9618180a6"
+    }
+    Frame {
+        msec: 5520
+        hash: "824ff8c0e1ab43e3c0eaa79b7cc19b9c"
+    }
+    Frame {
+        msec: 5536
+        hash: "6c440a0b2293811335bdbf2c4f25f47d"
+    }
+    Frame {
+        msec: 5552
+        hash: "bfc7936cdf833d5b720ec9baca740112"
+    }
+    Frame {
+        msec: 5568
+        hash: "375fa305dbae2872dc9b20e59381cc0c"
+    }
+    Frame {
+        msec: 5584
+        hash: "fffd6173aa49e74164dc17a238bcd830"
+    }
+    Frame {
+        msec: 5600
+        hash: "44d9007e00fab161fd393b653255d7f4"
+    }
+    Frame {
+        msec: 5616
+        hash: "f669ee25c58b4fa20a01705d334f0065"
+    }
+    Frame {
+        msec: 5632
+        hash: "2dbb7d57711b67d5d9e1b81f70e22d34"
+    }
+    Frame {
+        msec: 5648
+        hash: "19351b91448265cb95c1670ee283c611"
+    }
+    Frame {
+        msec: 5664
+        hash: "19351b91448265cb95c1670ee283c611"
+    }
+    Frame {
+        msec: 5680
+        hash: "3a24b99d048348a21f4e4bd69393de89"
+    }
+    Frame {
+        msec: 5696
+        hash: "35a6fe955a52950bbfa954a453e4008e"
+    }
+    Frame {
+        msec: 5712
+        hash: "896f4ec28c976237b34fb2725a44460e"
+    }
+    Frame {
+        msec: 5728
+        hash: "ed3008ea950ec84c57518e573ea36d15"
+    }
+    Frame {
+        msec: 5744
+        hash: "3447c7be992759f772c1db2033eead99"
+    }
+    Frame {
+        msec: 5760
+        image: "follow.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "6354ebe3aa919a52902b5a5346b473ae"
+    }
+    Frame {
+        msec: 5792
+        hash: "adc55f2fcf312a90b025a75fa80aa079"
+    }
+    Frame {
+        msec: 5808
+        hash: "3ac85cad400d2b8e4f33798f4f6b7b42"
+    }
+    Frame {
+        msec: 5824
+        hash: "1c115efd84ccbe489d24c3c521c4a61c"
+    }
+    Frame {
+        msec: 5840
+        hash: "39518f1bbc0c4aba6ff517bc3dc7c279"
+    }
+    Frame {
+        msec: 5856
+        hash: "7bd28d32996f4de61c415d3217da16d0"
+    }
+    Frame {
+        msec: 5872
+        hash: "f5d06e25d775bf8db07e95625a712733"
+    }
+    Frame {
+        msec: 5888
+        hash: "4820ea6ea3be88af2f86111c547a19d7"
+    }
+    Frame {
+        msec: 5904
+        hash: "fa6e681c368118b7f135a47ae8fc12ff"
+    }
+    Frame {
+        msec: 5920
+        hash: "f6b30e618aeeb837d2b3eca270b0a060"
+    }
+    Frame {
+        msec: 5936
+        hash: "ac8504bde8d3063a8bf02b9d4b69d755"
+    }
+    Frame {
+        msec: 5952
+        hash: "9670537bb77caa8e23fda7bbfa96ca60"
+    }
+    Frame {
+        msec: 5968
+        hash: "8cd292865ce5c1d240e9ddc93881a0ed"
+    }
+    Frame {
+        msec: 5984
+        hash: "de112013e526203d151c46e6cfba9f92"
+    }
+    Frame {
+        msec: 6000
+        hash: "cd61066e697de8c055aaa168791c2d8c"
+    }
+    Frame {
+        msec: 6016
+        hash: "cd61066e697de8c055aaa168791c2d8c"
+    }
+    Frame {
+        msec: 6032
+        hash: "e68b27ff14aac03c827fd43ac488d23e"
+    }
+    Frame {
+        msec: 6048
+        hash: "e68b27ff14aac03c827fd43ac488d23e"
+    }
+    Frame {
+        msec: 6064
+        hash: "1f61d857a8c26587fbda5895c603441a"
+    }
+    Frame {
+        msec: 6080
+        hash: "1e0dffdd02e05ade1ae444427d4aa345"
+    }
+    Frame {
+        msec: 6096
+        hash: "9a416ee7a1de9ac45ab2d609233c9520"
+    }
+    Frame {
+        msec: 6112
+        hash: "dfa35bf1cd908011c3214a506bcbdcb8"
+    }
+    Frame {
+        msec: 6128
+        hash: "bd502dc72dce4af3036f7af9ed7cf9e9"
+    }
+    Frame {
+        msec: 6144
+        hash: "0506667a14ace4e2edf04956c137e217"
+    }
+    Frame {
+        msec: 6160
+        hash: "a38ed1532a40210ad7da4c0d4d1a7195"
+    }
+    Frame {
+        msec: 6176
+        hash: "8ac8a8df937da526bbffb9a3590d89ac"
+    }
+    Frame {
+        msec: 6192
+        hash: "07527cb9a4494e11f4c9f99eb72598b9"
+    }
+    Frame {
+        msec: 6208
+        hash: "655b0327ef0f8711810714ba50f2f8cc"
+    }
+    Frame {
+        msec: 6224
+        hash: "4c1ce8b4eb16c69614e2560c04ad48cf"
+    }
+    Frame {
+        msec: 6240
+        hash: "7a382ae4e6a48826eaa2c83ee7a73fb2"
+    }
+    Frame {
+        msec: 6256
+        hash: "5acd5f250c5b32d9006ed68dfecbfa1c"
+    }
+    Frame {
+        msec: 6272
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+    Frame {
+        msec: 6288
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+    Frame {
+        msec: 6304
+        hash: "07e5f1277558bfe7638b00cf9d967baf"
+    }
+    Frame {
+        msec: 6320
+        hash: "07e5f1277558bfe7638b00cf9d967baf"
+    }
+    Frame {
+        msec: 6336
+        hash: "07e5f1277558bfe7638b00cf9d967baf"
+    }
+    Frame {
+        msec: 6352
+        hash: "07e5f1277558bfe7638b00cf9d967baf"
+    }
+    Frame {
+        msec: 6368
+        hash: "07e5f1277558bfe7638b00cf9d967baf"
+    }
+    Frame {
+        msec: 6384
+        hash: "877aca1c64e588845329ca8a38222604"
+    }
+    Frame {
+        msec: 6400
+        hash: "877aca1c64e588845329ca8a38222604"
+    }
+    Frame {
+        msec: 6416
+        hash: "877aca1c64e588845329ca8a38222604"
+    }
+    Frame {
+        msec: 6432
+        hash: "877aca1c64e588845329ca8a38222604"
+    }
+    Frame {
+        msec: 6448
+        hash: "877aca1c64e588845329ca8a38222604"
+    }
+    Frame {
+        msec: 6464
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6480
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6496
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6512
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6528
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6544
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6560
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6576
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6592
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6608
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6624
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6640
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6656
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6672
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6688
+        hash: "b0f28e923f93dcdcea8460ca9d8cd674"
+    }
+    Frame {
+        msec: 6704
+        hash: "228920e994ebf71d542c71ce8263614e"
+    }
+    Frame {
+        msec: 6720
+        image: "follow.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "228920e994ebf71d542c71ce8263614e"
+    }
+    Frame {
+        msec: 6752
+        hash: "228920e994ebf71d542c71ce8263614e"
+    }
+    Frame {
+        msec: 6768
+        hash: "228920e994ebf71d542c71ce8263614e"
+    }
+    Frame {
+        msec: 6784
+        hash: "228920e994ebf71d542c71ce8263614e"
+    }
+    Frame {
+        msec: 6800
+        hash: "228920e994ebf71d542c71ce8263614e"
+    }
+    Frame {
+        msec: 6816
+        hash: "228920e994ebf71d542c71ce8263614e"
+    }
+    Frame {
+        msec: 6832
+        hash: "07e5f1277558bfe7638b00cf9d967baf"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6848
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+    Frame {
+        msec: 6864
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+    Frame {
+        msec: 6880
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+    Frame {
+        msec: 6896
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+    Frame {
+        msec: 6912
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+    Frame {
+        msec: 6928
+        hash: "3189e5a89d7b2ba1e6a06f6e3070e8c1"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/follow.qml
new file mode 100644
index 0000000..0097449
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/follow.qml
@@ -0,0 +1,79 @@
+import QtQuick 1.0
+
+Rectangle {
+    color: "#ffffff"
+    width: 320; height: 240
+
+    Rectangle {
+        id: rect
+        color: "#00ff00"
+        y: 200; width: 60; height: 20
+        SequentialAnimation on y {
+            loops: Animation.Infinite
+            NumberAnimation {
+                to: 20; duration: 500
+                easing.type: "InOutQuad"
+            }
+            NumberAnimation {
+                to: 200; duration: 2000
+                easing.type: "OutBounce"
+            }
+            PauseAnimation { duration: 1000 }
+        }
+    }
+
+    // Velocity
+    Rectangle {
+        color: "#ff0000"
+        x: rect.width; width: rect.width; height: 20
+        y: rect.y
+        Behavior on y { SpringAnimation { velocity: 200 } }
+    }
+
+    // Spring
+    Rectangle {
+        color: "#ff0000"
+        x: rect.width * 2; width: rect.width/2; height: 20
+        y: rect.y
+        Behavior on y { SpringAnimation { spring: 1.0; damping: 0.2 } }
+    }
+    Rectangle {
+        color: "#880000"
+        x: rect.width * 2.5; width: rect.width/2; height: 20
+        y: rect.y
+        Behavior on y { SpringAnimation { spring: 1.0; damping: 0.2; mass: 3.0 } } // "heavier" object
+    }
+
+    // Follow mouse
+    MouseArea {
+        id: mouseRegion
+        anchors.fill: parent
+        Rectangle {
+            id: ball
+            property int targetX: mouseRegion.mouseX - 10
+            property int targetY: mouseRegion.mouseY - 10
+
+            x: targetX
+            y: targetY
+            width: 20; height: 20
+            radius: 10
+            color: "#0000ff"
+
+            Behavior on x { SpringAnimation { spring: 1.0; damping: 0.05; epsilon: 0.25 } }
+            Behavior on y { SpringAnimation { spring: 1.0; damping: 0.05; epsilon: 0.25 } }
+
+            states: [
+                State {
+                    name: "following"
+                    when: ball.x != ball.targetX || ball.y != ball.targetY
+                    PropertyChanges { target: ball; color: "#ff0000" }
+                }
+            ]
+            transitions: [
+                Transition {
+                    ColorAnimation { duration: 200 }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
deleted file mode 100644
index 44c4dcd..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
-    id: clock
-    color: "gray"
-    width: 200; height: 200
-
-    property variant hours: 10
-    property variant minutes: 28
-    property variant seconds: 0
-
-    Timer {
-        interval: 1000; running: true; repeat: true; triggeredOnStart: true
-        onTriggered: seconds++
-    }
-
-    Image { id: background; source: "content/clock.png" }
-
-    Image {
-        x: 92.5; y: 27
-        source: "content/hour.png"
-        smooth: true
-        transform: Rotation {
-            id: hourRotation
-            origin.x: 7.5; origin.y: 73
-            angle: (clock.hours * 30) + (clock.minutes * 0.5)
-
-            Behavior on angle {
-                SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
-            }
-        }
-    }
-
-    Image {
-        x: 93.5; y: 17
-        source: "content/minute.png"
-        smooth: true
-        transform: Rotation {
-            id: minuteRotation
-            origin.x: 6.5; origin.y: 83
-            angle: clock.minutes * 6
-
-            Behavior on angle {
-                SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
-            }
-        }
-    }
-
-    Image {
-        x: 97.5; y: 20
-        source: "content/second.png"
-        smooth: true
-        transform: Rotation {
-            id: secondRotation
-            origin.x: 2.5; origin.y: 80
-            angle: clock.seconds * 6
-
-            Behavior on angle {
-                SpringAnimation { spring: 5; damping: 0.25; modulus: 360 }
-            }
-        }
-    }
-
-    Image {
-        anchors.centerIn: background; source: "content/center.png"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/background.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/background.png
deleted file mode 100644
index a885950..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/background.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/center.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/center.png
deleted file mode 100755
index 7fbd802..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/center.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/clock.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/clock.png
deleted file mode 100755
index 462edac..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/clock.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/hour.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/hour.png
deleted file mode 100755
index f8061a1..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/hour.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/minute.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/minute.png
deleted file mode 100755
index 1297ec7..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/minute.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/second.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/second.png
deleted file mode 100755
index 4aa9fb5..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/second.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.0.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.0.png
deleted file mode 100644
index baf1d45..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.1.png
deleted file mode 100644
index 932f63f..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.2.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.2.png
deleted file mode 100644
index a5cb437..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.3.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.3.png
deleted file mode 100644
index 62e895c..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.qml
deleted file mode 100644
index 5da471e..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.qml
+++ /dev/null
@@ -1,1135 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "d17c9cd015b065adf7e36ad0d4f6c00c"
-    }
-    Frame {
-        msec: 32
-        hash: "e759f652c69a06d01837302cc0369a58"
-    }
-    Frame {
-        msec: 48
-        hash: "392855ef490903121fb894858961dfb0"
-    }
-    Frame {
-        msec: 64
-        hash: "5ba4248f606a3a35d840cb98eff30b46"
-    }
-    Frame {
-        msec: 80
-        hash: "3b97e1ab4054c20d19c1d05f795b71de"
-    }
-    Frame {
-        msec: 96
-        hash: "81904d248125cf35249f79da7e94d8d7"
-    }
-    Frame {
-        msec: 112
-        hash: "474179152aad4b64904c8b7c63581a89"
-    }
-    Frame {
-        msec: 128
-        hash: "583a7906d1dc41d8ce8d0c8f28c9b8c5"
-    }
-    Frame {
-        msec: 144
-        hash: "341437083f858e2dca36a8bb39559a1e"
-    }
-    Frame {
-        msec: 160
-        hash: "ed75a933c176ed6ac3fa5b2986cbfade"
-    }
-    Frame {
-        msec: 176
-        hash: "5494c10d3984a9be607b8b5ee659ebfc"
-    }
-    Frame {
-        msec: 192
-        hash: "7af8dfca43036ee69012cbb100d110ad"
-    }
-    Frame {
-        msec: 208
-        hash: "356b8185889e560b5a1a2d6436dac834"
-    }
-    Frame {
-        msec: 224
-        hash: "f601a66de5dc1a388e515ba4ff14be6e"
-    }
-    Frame {
-        msec: 240
-        hash: "4cfb9f3a72070533288b2e50820cbbbd"
-    }
-    Frame {
-        msec: 256
-        hash: "ddcb670af0806dadf5897bcd3fd65cd7"
-    }
-    Frame {
-        msec: 272
-        hash: "3fedf4aa340d7632359273b1eb71c5a3"
-    }
-    Frame {
-        msec: 288
-        hash: "3dab7e1eaccb68b14e30741775db6ff7"
-    }
-    Frame {
-        msec: 304
-        hash: "015ab6c080c2ffab8ac763681bf3f95c"
-    }
-    Frame {
-        msec: 320
-        hash: "74f438510f0d8f64120cc45bca7f4f5d"
-    }
-    Frame {
-        msec: 336
-        hash: "e57666fb224cdbf869e5be4ef3391be9"
-    }
-    Frame {
-        msec: 352
-        hash: "ff8b3dddd4d10b111b38801470fcbfd0"
-    }
-    Frame {
-        msec: 368
-        hash: "e547ee9f1e509d5db980cb91fce5f6ee"
-    }
-    Frame {
-        msec: 384
-        hash: "aaa9fb71bd47ad3a1c753d7ac918e399"
-    }
-    Frame {
-        msec: 400
-        hash: "54a335aac86669138730c0735ea99c8b"
-    }
-    Frame {
-        msec: 416
-        hash: "ff8f30aaa7afd8abfdd147b830e9d6c4"
-    }
-    Frame {
-        msec: 432
-        hash: "07f8fca270953cf815cb0e77534da824"
-    }
-    Frame {
-        msec: 448
-        hash: "30799c12182b2c3eb2f28b05d81ed6fc"
-    }
-    Frame {
-        msec: 464
-        hash: "6244e3b740218aec56c81c92dc57abcb"
-    }
-    Frame {
-        msec: 480
-        hash: "cb10a34e3d234043704e633b49184607"
-    }
-    Frame {
-        msec: 496
-        hash: "66de73779b5f86a6a1692eb74be24201"
-    }
-    Frame {
-        msec: 512
-        hash: "4c4c0b5e75f0f587ace8002720d78309"
-    }
-    Frame {
-        msec: 528
-        hash: "88c774ec272c72457b35b60306c2bc21"
-    }
-    Frame {
-        msec: 544
-        hash: "28ce64adc1d35d6bc34174765beda553"
-    }
-    Frame {
-        msec: 560
-        hash: "37238c3d6dc0c34bf4e00ba2a82ce3aa"
-    }
-    Frame {
-        msec: 576
-        hash: "d14dd306fec80f1a1ff9a85aa51b9a57"
-    }
-    Frame {
-        msec: 592
-        hash: "bfa2ec6fa546c75ee85e2ebeb3af8e3c"
-    }
-    Frame {
-        msec: 608
-        hash: "d1ec3faab47065f34e9397fd73f9edce"
-    }
-    Frame {
-        msec: 624
-        hash: "0b59b5dba365fff38872b520afc84edb"
-    }
-    Frame {
-        msec: 640
-        hash: "3c4ae01b5e878b85a2eea403f3ad478a"
-    }
-    Frame {
-        msec: 656
-        hash: "329111f7079230e8b3cfda1217e8fcdf"
-    }
-    Frame {
-        msec: 672
-        hash: "97761329ac9ba03ec41e3d5b35f245df"
-    }
-    Frame {
-        msec: 688
-        hash: "9d26e3a3357530e903ee89f7bf439357"
-    }
-    Frame {
-        msec: 704
-        hash: "1cf4c130ea3565547ff74280211f10c9"
-    }
-    Frame {
-        msec: 720
-        hash: "d60284711cb557b1dab4d27072c95597"
-    }
-    Frame {
-        msec: 736
-        hash: "98195e02405ee26c0a6a3177cebe9eaa"
-    }
-    Frame {
-        msec: 752
-        hash: "f0a776c39363e340ebfb7736f368f609"
-    }
-    Frame {
-        msec: 768
-        hash: "5a146b4b76f93e3064d5dfa13107b1c3"
-    }
-    Frame {
-        msec: 784
-        hash: "7f7fef3a7ff2047f598bfca0fc7d5935"
-    }
-    Frame {
-        msec: 800
-        hash: "85a2fd48605f8a77764bf96542db14c3"
-    }
-    Frame {
-        msec: 816
-        hash: "89bdc99d16e6605e2106dfa5f53d7c8e"
-    }
-    Frame {
-        msec: 832
-        hash: "d03754d56d85508b7c77959d1ab7b34a"
-    }
-    Frame {
-        msec: 848
-        hash: "8d330472a376b47d65cec0b8e3df25cb"
-    }
-    Frame {
-        msec: 864
-        hash: "401adaeecfd2c0a5598194e9ead4dd5d"
-    }
-    Frame {
-        msec: 880
-        hash: "5c600e940e0a01fec15505fba595df3d"
-    }
-    Frame {
-        msec: 896
-        hash: "b7940b041fbd3df5e6969130bf97da10"
-    }
-    Frame {
-        msec: 912
-        hash: "62314bb115c307eeff4c4c7c91ee74a2"
-    }
-    Frame {
-        msec: 928
-        hash: "54745a8a7ed96a4d5e2d4ec2de605882"
-    }
-    Frame {
-        msec: 944
-        hash: "a4145b63f59d060ac0e0dc32dd22c815"
-    }
-    Frame {
-        msec: 960
-        image: "clock.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "c420b1298329c7eb0d3ec6a90a7eb802"
-    }
-    Frame {
-        msec: 992
-        hash: "e63a5384cde6287c3cd8bdb823f35dca"
-    }
-    Frame {
-        msec: 1008
-        hash: "af708b5e4a2a706385afd43896eeff16"
-    }
-    Frame {
-        msec: 1024
-        hash: "32011e16d4b1c14619820ade020f6416"
-    }
-    Frame {
-        msec: 1040
-        hash: "fbf9f8f075b15922f7306e469075d3cf"
-    }
-    Frame {
-        msec: 1056
-        hash: "bf0fab116eae6e7fb5b3209220a3a52a"
-    }
-    Frame {
-        msec: 1072
-        hash: "7a21aee4bcb99feb12a2a2c6bb3fd893"
-    }
-    Frame {
-        msec: 1088
-        hash: "d721462af9c94e13f12374b2590dad1e"
-    }
-    Frame {
-        msec: 1104
-        hash: "70385b585c2cbf1b2d64f1b9ebb5fb56"
-    }
-    Frame {
-        msec: 1120
-        hash: "fc7adc3dd2f42bfe6cd74c2ee1ea9aa8"
-    }
-    Frame {
-        msec: 1136
-        hash: "232884da74c9843d1349e82a7300cc19"
-    }
-    Frame {
-        msec: 1152
-        hash: "c6790d9c8cbea7bf97cbedf443da330c"
-    }
-    Frame {
-        msec: 1168
-        hash: "1847875f98555ef46a103c107bd5bc37"
-    }
-    Frame {
-        msec: 1184
-        hash: "d7b35992b44a0220bd83a00b7f75dcdd"
-    }
-    Frame {
-        msec: 1200
-        hash: "fc9e1db602c34863088d82ed8f601364"
-    }
-    Frame {
-        msec: 1216
-        hash: "404e2d071f8a6409ba6c6bfd8450693c"
-    }
-    Frame {
-        msec: 1232
-        hash: "dc2b6be9bc4c32460797e94ec617406c"
-    }
-    Frame {
-        msec: 1248
-        hash: "5077b6afd808f7a2c319e66f0aef3002"
-    }
-    Frame {
-        msec: 1264
-        hash: "07f07a04ec7c864196faeb44eff65b4c"
-    }
-    Frame {
-        msec: 1280
-        hash: "5d9089a68ef0b8b78b68c33d3082b597"
-    }
-    Frame {
-        msec: 1296
-        hash: "d955c9f66eaf123351a19947240e8847"
-    }
-    Frame {
-        msec: 1312
-        hash: "f1821cbcb3883a041f22a114f7158532"
-    }
-    Frame {
-        msec: 1328
-        hash: "77f17db09c5a7125c42359c304f274de"
-    }
-    Frame {
-        msec: 1344
-        hash: "bc38a4c859f596f6cf3c399d3a04b1cd"
-    }
-    Frame {
-        msec: 1360
-        hash: "982c43a4a1c9fae8bf3980b5885cee2f"
-    }
-    Frame {
-        msec: 1376
-        hash: "c15bb9b7dd77d505ee9918eb36b75c31"
-    }
-    Frame {
-        msec: 1392
-        hash: "bda534fd941a6f8289bfbec9b8dde717"
-    }
-    Frame {
-        msec: 1408
-        hash: "7ad5c54b481525ace42ae8926a5c0556"
-    }
-    Frame {
-        msec: 1424
-        hash: "2399778158f63481eb8514245277b917"
-    }
-    Frame {
-        msec: 1440
-        hash: "6c200d090b34a0152c7eb233c97c3886"
-    }
-    Frame {
-        msec: 1456
-        hash: "7ba4500e81df31e3e2c5d165bacf771a"
-    }
-    Frame {
-        msec: 1472
-        hash: "c7e13f3d9bdfe35eb905c1d4ed6b73ac"
-    }
-    Frame {
-        msec: 1488
-        hash: "808b72766f5dce71fc983ffa01945665"
-    }
-    Frame {
-        msec: 1504
-        hash: "899ac513755476db1e1304317524a755"
-    }
-    Frame {
-        msec: 1520
-        hash: "27190dce033171966981672e52f07107"
-    }
-    Frame {
-        msec: 1536
-        hash: "5d9ef583b6b3cb5257cb044cf376eff2"
-    }
-    Frame {
-        msec: 1552
-        hash: "77b648fe26a942b246eec0fa018ad86f"
-    }
-    Frame {
-        msec: 1568
-        hash: "744a61493816338113ba4ba7c05f76de"
-    }
-    Frame {
-        msec: 1584
-        hash: "2eb0da64d5937c1a38754fd55ca684d0"
-    }
-    Frame {
-        msec: 1600
-        hash: "6f799c2c0c0e1ed419af03f8bbb9fae1"
-    }
-    Frame {
-        msec: 1616
-        hash: "5b84344f31d5e4d15be6b53ad3bf9c84"
-    }
-    Frame {
-        msec: 1632
-        hash: "997b5967e3e3a35d02f10e1eae417dbf"
-    }
-    Frame {
-        msec: 1648
-        hash: "c522369c836e8d08c56e2e332dd005ac"
-    }
-    Frame {
-        msec: 1664
-        hash: "22f4072da05d261cfcca232ea54d2cb4"
-    }
-    Frame {
-        msec: 1680
-        hash: "7081a90c33785306800b7a57a4a9a75c"
-    }
-    Frame {
-        msec: 1696
-        hash: "32a8bea14c92ce61ede89182765f0759"
-    }
-    Frame {
-        msec: 1712
-        hash: "4bafe476d5301974c616311073763ab4"
-    }
-    Frame {
-        msec: 1728
-        hash: "291188ca795d455ae293437c2fb2303d"
-    }
-    Frame {
-        msec: 1744
-        hash: "99d2658f863c82dd71fde0f0b93b4d62"
-    }
-    Frame {
-        msec: 1760
-        hash: "8a7183e11fde2846d5435847ad9add45"
-    }
-    Frame {
-        msec: 1776
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1792
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1808
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1824
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1840
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1856
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1872
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1888
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1904
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1920
-        image: "clock.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1952
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1968
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1984
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 2000
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 2016
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 2032
-        hash: "150f511972394d8485979a6d9badcee5"
-    }
-    Frame {
-        msec: 2048
-        hash: "50b420f72479ec613fd443b5faa3cb94"
-    }
-    Frame {
-        msec: 2064
-        hash: "a51cbeea7ad5407b2784a3a3c8ca1ecf"
-    }
-    Frame {
-        msec: 2080
-        hash: "0f658f4c91f890cd252d0f9d9bbe064d"
-    }
-    Frame {
-        msec: 2096
-        hash: "c814c99815a91547eff01dc899c275f2"
-    }
-    Frame {
-        msec: 2112
-        hash: "f9dac59029008e52efe4225cf919f013"
-    }
-    Frame {
-        msec: 2128
-        hash: "b87bdcf09b425f2b2d6aed65f96ae8a3"
-    }
-    Frame {
-        msec: 2144
-        hash: "f353bf64e664166a542aa027dc625529"
-    }
-    Frame {
-        msec: 2160
-        hash: "12492b26c2f1c018e034c0fa936fa7b5"
-    }
-    Frame {
-        msec: 2176
-        hash: "33f04d25bced580f15590f12ddafef62"
-    }
-    Frame {
-        msec: 2192
-        hash: "cdd8ee656e4fec3ac6e72b6f7626de3b"
-    }
-    Frame {
-        msec: 2208
-        hash: "22a94ea46fb9ee78830eab79e4adc5c5"
-    }
-    Frame {
-        msec: 2224
-        hash: "64a10c9d4738c004c7f08f95b48a7a4d"
-    }
-    Frame {
-        msec: 2240
-        hash: "ff3300fb49a735e0a958362aead1905f"
-    }
-    Frame {
-        msec: 2256
-        hash: "8289dfdad12a8c13513175e5aad6a2d9"
-    }
-    Frame {
-        msec: 2272
-        hash: "49e5cbb94f7d8bc853ca3c9366d737c9"
-    }
-    Frame {
-        msec: 2288
-        hash: "76d2d8df4ad0359bb8ae102b225b3a68"
-    }
-    Frame {
-        msec: 2304
-        hash: "98d925b3306aa7dd1b1fb9e066cd8a02"
-    }
-    Frame {
-        msec: 2320
-        hash: "3911b53eb0346af1773ad991232e61ee"
-    }
-    Frame {
-        msec: 2336
-        hash: "8991c10234f9f286ebab39d72729525d"
-    }
-    Frame {
-        msec: 2352
-        hash: "ca2c8c6f23b30957a5cc20d9750a3ffe"
-    }
-    Frame {
-        msec: 2368
-        hash: "80abe9b146b31dbedf1fe2357d922dda"
-    }
-    Frame {
-        msec: 2384
-        hash: "0e34091d6bceab00bdabcec78e99e265"
-    }
-    Frame {
-        msec: 2400
-        hash: "ba04053c25e53b3dc790feac9a33e221"
-    }
-    Frame {
-        msec: 2416
-        hash: "cb6f7f2cce4f68ef1d35f765e00bbf7b"
-    }
-    Frame {
-        msec: 2432
-        hash: "1e63fb94f5fbf3b600ec9298cbb97c8a"
-    }
-    Frame {
-        msec: 2448
-        hash: "8991c10234f9f286ebab39d72729525d"
-    }
-    Frame {
-        msec: 2464
-        hash: "00531d4a5fe98bbb487ad835414e7d07"
-    }
-    Frame {
-        msec: 2480
-        hash: "7af9f861cb57c937c87b24eee9fbb558"
-    }
-    Frame {
-        msec: 2496
-        hash: "7ecd1a4a75753e70ad5937e5bc897e03"
-    }
-    Frame {
-        msec: 2512
-        hash: "557766fe964033f6a488574af7306cac"
-    }
-    Frame {
-        msec: 2528
-        hash: "bd0f7164dd0a84ce1a1b2a6acbc2157b"
-    }
-    Frame {
-        msec: 2544
-        hash: "d24ef664cf13519b99d6193bf98fcfd1"
-    }
-    Frame {
-        msec: 2560
-        hash: "6c3626248bbb41cab85ec2a908b7874b"
-    }
-    Frame {
-        msec: 2576
-        hash: "0f9bea8d474690164a09dfd3b13ff80b"
-    }
-    Frame {
-        msec: 2592
-        hash: "e5197674c91de893a970614e650547e5"
-    }
-    Frame {
-        msec: 2608
-        hash: "ce6861e9a7e75b809df026f078c8516b"
-    }
-    Frame {
-        msec: 2624
-        hash: "eb0539e30fd53fb905d7b28ff0bc6cfd"
-    }
-    Frame {
-        msec: 2640
-        hash: "45f70dda0d647119175457fb4d451e85"
-    }
-    Frame {
-        msec: 2656
-        hash: "ca6b75fa4ee612bf6bb1776ef4115b16"
-    }
-    Frame {
-        msec: 2672
-        hash: "c7d6bd687be6d5476300539411b97fc5"
-    }
-    Frame {
-        msec: 2688
-        hash: "27da9137b936d813d3c79a873053ed38"
-    }
-    Frame {
-        msec: 2704
-        hash: "4389a5758bf9df9553300c074aa7bb36"
-    }
-    Frame {
-        msec: 2720
-        hash: "30476b70a29716b359a046f99b6387e5"
-    }
-    Frame {
-        msec: 2736
-        hash: "b91c6f1e57d718e95ab05d1f386aedb9"
-    }
-    Frame {
-        msec: 2752
-        hash: "578b022173dcac39d227ffeb043e53d0"
-    }
-    Frame {
-        msec: 2768
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2784
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2800
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2816
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2832
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2848
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2864
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2880
-        image: "clock.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2912
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2928
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2944
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2960
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2976
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2992
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 3008
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 3024
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 3040
-        hash: "294d542f880356b4cbb171170c28dcd7"
-    }
-    Frame {
-        msec: 3056
-        hash: "946b5937974e28ffd996ce132c8fad15"
-    }
-    Frame {
-        msec: 3072
-        hash: "bb61994ff1dc36d3933084b874073832"
-    }
-    Frame {
-        msec: 3088
-        hash: "ec337c7ae77deeb41f38adb1851720e5"
-    }
-    Frame {
-        msec: 3104
-        hash: "7691c6c048b78e1551b46a37b6e95b16"
-    }
-    Frame {
-        msec: 3120
-        hash: "b3116620d319ae4b681f4ca76c068b32"
-    }
-    Frame {
-        msec: 3136
-        hash: "ed5a27e5be3dbde3867715f877da41db"
-    }
-    Frame {
-        msec: 3152
-        hash: "8dcc220cc652f57aa8ac33364edc96a3"
-    }
-    Frame {
-        msec: 3168
-        hash: "a7832d86283e27ee1523c4808b42fc43"
-    }
-    Frame {
-        msec: 3184
-        hash: "fc90d18b072638f2df1bacee12fe1743"
-    }
-    Frame {
-        msec: 3200
-        hash: "cdd7b5598155eba57783ebe1872db818"
-    }
-    Frame {
-        msec: 3216
-        hash: "b45e32d12bbc2e56f4a3e7e473528d3e"
-    }
-    Frame {
-        msec: 3232
-        hash: "5762a693ea6287e8987c604ef9fac361"
-    }
-    Frame {
-        msec: 3248
-        hash: "2e46a8df5ec0c7070a374186a313f2c6"
-    }
-    Frame {
-        msec: 3264
-        hash: "e612134417f3f901661b658801a72848"
-    }
-    Frame {
-        msec: 3280
-        hash: "5de468fac915894ef34f3fee1c637e01"
-    }
-    Frame {
-        msec: 3296
-        hash: "e29c8713573e49fc98387311d80c7510"
-    }
-    Frame {
-        msec: 3312
-        hash: "6fce67b704f613e6fd9181ccb9ee237f"
-    }
-    Frame {
-        msec: 3328
-        hash: "bf499add3d91d751ffa1cce28bece380"
-    }
-    Frame {
-        msec: 3344
-        hash: "7d50cad7b18a4a37be6aac7796014195"
-    }
-    Frame {
-        msec: 3360
-        hash: "6695208c8d39373ff0846c821c819cb2"
-    }
-    Frame {
-        msec: 3376
-        hash: "0140ec2286b0fb94340d2dd6d418f539"
-    }
-    Frame {
-        msec: 3392
-        hash: "9f92a99737aa6a7da48af7e7a4ed7a6a"
-    }
-    Frame {
-        msec: 3408
-        hash: "8e593e8192d17d07c2265d6fa840f281"
-    }
-    Frame {
-        msec: 3424
-        hash: "ea70e72eb12d5595d9bf0d9cc77efd4d"
-    }
-    Frame {
-        msec: 3440
-        hash: "faeeb9e6e6a260a266ac8965f204b542"
-    }
-    Frame {
-        msec: 3456
-        hash: "d50987082d056997a8e7fe5940cb7968"
-    }
-    Frame {
-        msec: 3472
-        hash: "44089138e01bfee916306ae66ba43e9f"
-    }
-    Frame {
-        msec: 3488
-        hash: "60256356ca6fe8bd323ef36bc149a3ea"
-    }
-    Frame {
-        msec: 3504
-        hash: "6caae71d6bd897d755aeb22f10862171"
-    }
-    Frame {
-        msec: 3520
-        hash: "8ba18bf5df010718f83d6bb25aa1858b"
-    }
-    Frame {
-        msec: 3536
-        hash: "a903996370fb7efcaf295f00b9b4c4b6"
-    }
-    Frame {
-        msec: 3552
-        hash: "cc0b736c8b4d46d3d809dcfe82068c88"
-    }
-    Frame {
-        msec: 3568
-        hash: "037b2f65d162d44c39706d322cd6b6e5"
-    }
-    Frame {
-        msec: 3584
-        hash: "92c2b4f346329ffbcae07db74332ebbe"
-    }
-    Frame {
-        msec: 3600
-        hash: "3f9b2b5aade31333568a7cccf89e3176"
-    }
-    Frame {
-        msec: 3616
-        hash: "b40f9cce4cddf9fa5245276a105a3e0d"
-    }
-    Frame {
-        msec: 3632
-        hash: "74eb3e8a282693bd6bc92f381e380d61"
-    }
-    Frame {
-        msec: 3648
-        hash: "43d85dd9e0de49c639db0d91047c88bb"
-    }
-    Frame {
-        msec: 3664
-        hash: "563a07f4aa618252933e0356cc300bba"
-    }
-    Frame {
-        msec: 3680
-        hash: "73d1e5745154996fd245a91a831d5462"
-    }
-    Frame {
-        msec: 3696
-        hash: "7b2785b605c64135ea6914ad8388eb8f"
-    }
-    Frame {
-        msec: 3712
-        hash: "b2d989af972715a86ca374753d32f757"
-    }
-    Frame {
-        msec: 3728
-        hash: "96311aac52bc9167a7350af29741f3dc"
-    }
-    Frame {
-        msec: 3744
-        hash: "56e4b98816896f7353dddeac090f70d1"
-    }
-    Frame {
-        msec: 3760
-        hash: "7bd8ac36107e9e5db39e1aa37f2c5ca8"
-    }
-    Frame {
-        msec: 3776
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3792
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3808
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3824
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3840
-        image: "clock.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3872
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3888
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3904
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3920
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3936
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3952
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3968
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3984
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 4000
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 4016
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 4032
-        hash: "df3a1204f6243673d567724d27d07a9e"
-    }
-    Frame {
-        msec: 4048
-        hash: "7d0d3e92cb61d868d062bdf173924a4d"
-    }
-    Frame {
-        msec: 4064
-        hash: "29948b5d7807a6ed0076a9637ec3eb79"
-    }
-    Frame {
-        msec: 4080
-        hash: "2986b5e0a4a49bbe9f4ffada30433a48"
-    }
-    Frame {
-        msec: 4096
-        hash: "0d9e3813141a1ee15474380902d87815"
-    }
-    Frame {
-        msec: 4112
-        hash: "c5197a932430d498b7344c1f37454320"
-    }
-    Frame {
-        msec: 4128
-        hash: "c8ef8acf314486c157e74bdd2695ddb2"
-    }
-    Frame {
-        msec: 4144
-        hash: "adeb73de4b967912a9f2b04ba2b6fe4c"
-    }
-    Frame {
-        msec: 4160
-        hash: "da5fddd1e4ab8c096af0acc62114d69f"
-    }
-    Frame {
-        msec: 4176
-        hash: "5ef0784315603da196e66b4628524c5c"
-    }
-    Frame {
-        msec: 4192
-        hash: "1ff2a89c510953d71198056f5ac5b1a6"
-    }
-    Frame {
-        msec: 4208
-        hash: "f63d409e134e59b875099ab11b469d21"
-    }
-    Frame {
-        msec: 4224
-        hash: "e353748e0b0c49a217d6e2d06a9bfeb6"
-    }
-    Frame {
-        msec: 4240
-        hash: "a9d7470902a232d815bd2580e24fdc22"
-    }
-    Frame {
-        msec: 4256
-        hash: "eecbad718aa4eaf5bef7cd921b2ce9f9"
-    }
-    Frame {
-        msec: 4272
-        hash: "7a51cadbfb93eb4a66acc9cb150002ed"
-    }
-    Frame {
-        msec: 4288
-        hash: "2aa511fb96a51a50e3a45b784e349c15"
-    }
-    Frame {
-        msec: 4304
-        hash: "a1ad19593dc6b9f4c027f388e802dcbe"
-    }
-    Frame {
-        msec: 4320
-        hash: "ef6787f03bc1e33ea5f2a54aa1ba3a41"
-    }
-    Frame {
-        msec: 4336
-        hash: "3386337bbc1ab82374d9965b7b0ffdef"
-    }
-    Frame {
-        msec: 4352
-        hash: "c76afb4f412b4d5dd8eca74db6c54fb8"
-    }
-    Frame {
-        msec: 4368
-        hash: "f91ac74ec153152670d43f42b1e2a2db"
-    }
-    Frame {
-        msec: 4384
-        hash: "58f22723fa0c67379972238e0e7ed5e2"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4400
-        hash: "a4730b0a8d6e0dd9e7eb58b51fb631ec"
-    }
-    Frame {
-        msec: 4416
-        hash: "193bf624efefcad70af29f41eeab128e"
-    }
-    Frame {
-        msec: 4432
-        hash: "d692f262facf26c2be2b0f747903d476"
-    }
-    Frame {
-        msec: 4448
-        hash: "e59e43b5d4abebea0a55b1d072d148bc"
-    }
-    Frame {
-        msec: 4464
-        hash: "134ff829e91161146b5f048a50c7eef7"
-    }
-    Frame {
-        msec: 4480
-        hash: "07a80e45e70cb13f45e3858404c5f8dd"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.0.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.0.png
deleted file mode 100644
index 3f42e75..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.1.png
deleted file mode 100644
index d661df6..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.10.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.10.png
deleted file mode 100644
index e8c96e1..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.10.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.2.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.2.png
deleted file mode 100644
index 35bfa43..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.3.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.3.png
deleted file mode 100644
index 74141cf..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.4.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.4.png
deleted file mode 100644
index 9544054..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.5.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.5.png
deleted file mode 100644
index 4b02c79..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.5.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.6.png
deleted file mode 100644
index 8ea8345..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.6.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.7.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.7.png
deleted file mode 100644
index 76a73e8..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.7.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.8.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.8.png
deleted file mode 100644
index 8824940..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.8.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.9.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.9.png
deleted file mode 100644
index f954cc5..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.qml
deleted file mode 100644
index e7e5b3c..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.qml
+++ /dev/null
@@ -1,1763 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "3561ebf22b19c7bd5a70947d36b50b63"
-    }
-    Frame {
-        msec: 32
-        hash: "3561ebf22b19c7bd5a70947d36b50b63"
-    }
-    Frame {
-        msec: 48
-        hash: "bd0006fc34f58ec1ea6aa4c4acbb0070"
-    }
-    Frame {
-        msec: 64
-        hash: "c25f9fb6aea93413bfef5eb176c02476"
-    }
-    Frame {
-        msec: 80
-        hash: "4ce0eb12fb41960e60e208dffb09ed3a"
-    }
-    Frame {
-        msec: 96
-        hash: "75b3375881969710b6eb21f2a93c36cc"
-    }
-    Frame {
-        msec: 112
-        hash: "91e9b13e332959e41a29c0b225675a05"
-    }
-    Frame {
-        msec: 128
-        hash: "8e04a31a953b42903dffe86b37b3f59f"
-    }
-    Frame {
-        msec: 144
-        hash: "837e0e646a2853d3fde571f9dd966fc7"
-    }
-    Frame {
-        msec: 160
-        hash: "7367e25ae1e3a3731d83da76d5795f8c"
-    }
-    Frame {
-        msec: 176
-        hash: "3621846fb85b286a886a02de442e76c4"
-    }
-    Frame {
-        msec: 192
-        hash: "ed20a4c3476b8bb5545d5343747c39c8"
-    }
-    Frame {
-        msec: 208
-        hash: "1fc73efb410e9beb3f791cbff8e814b3"
-    }
-    Frame {
-        msec: 224
-        hash: "199c99a4e3aa14fbc8c8a0d8baacf998"
-    }
-    Frame {
-        msec: 240
-        hash: "513ce5a2f57e40002a26b7722c8a10db"
-    }
-    Frame {
-        msec: 256
-        hash: "b80b51cd4e75bdc799bbe79e66b7d02b"
-    }
-    Frame {
-        msec: 272
-        hash: "e1531b6c5b3ac872563fdfaf49d32a27"
-    }
-    Frame {
-        msec: 288
-        hash: "6d7cfd78ebd56ae6adfc97aad5d11b13"
-    }
-    Frame {
-        msec: 304
-        hash: "4252ebb2fba165e39f025f631e0a676a"
-    }
-    Frame {
-        msec: 320
-        hash: "04d6ae51415b083bbb0eabd1b0304ca4"
-    }
-    Frame {
-        msec: 336
-        hash: "750df1f1626c8b84dd72a35bf081fe00"
-    }
-    Frame {
-        msec: 352
-        hash: "003d7a846e09ba23ee8a7ae6d473be9f"
-    }
-    Frame {
-        msec: 368
-        hash: "5cf3abdbb9a5b8cba6a8afe8abb60ced"
-    }
-    Frame {
-        msec: 384
-        hash: "0669f86043a0c84d0b4672cc5c1136b4"
-    }
-    Frame {
-        msec: 400
-        hash: "94f59435fe4f3ca06699c996b537ae8c"
-    }
-    Frame {
-        msec: 416
-        hash: "211c8ec42a6d6949253af71c6eeffa53"
-    }
-    Frame {
-        msec: 432
-        hash: "6de6c6d1b4a37a864b96c0293be8ebf5"
-    }
-    Frame {
-        msec: 448
-        hash: "468d67d069eaac1968a6ad52e56f3ab5"
-    }
-    Frame {
-        msec: 464
-        hash: "18d8de7a5c73d8c8188e6ae00a701820"
-    }
-    Frame {
-        msec: 480
-        hash: "4387c724ed49bfbbca238bf57a704a14"
-    }
-    Frame {
-        msec: 496
-        hash: "f317c59f65c7266765333048d8545748"
-    }
-    Frame {
-        msec: 512
-        hash: "6575d40c2f27f110443a2ede8a873c77"
-    }
-    Frame {
-        msec: 528
-        hash: "3e65cb675124dbd9db5116fa7584e223"
-    }
-    Frame {
-        msec: 544
-        hash: "df80612a74b33eca81db6f43aa33e411"
-    }
-    Frame {
-        msec: 560
-        hash: "6b2bc20397f3fb452ea14d81e9efd61d"
-    }
-    Frame {
-        msec: 576
-        hash: "e5b8a2476487f6cd9fd37e3b3f54f88d"
-    }
-    Frame {
-        msec: 592
-        hash: "e93f8156e2dc278a5e20d9e28b48d9fa"
-    }
-    Frame {
-        msec: 608
-        hash: "e524d5117888b0b68781ffaf1a3e7303"
-    }
-    Frame {
-        msec: 624
-        hash: "f3b777409534d87c59e60499fd6a3808"
-    }
-    Frame {
-        msec: 640
-        hash: "09d1fa8f1306eb6f51db97d04c2d7ad3"
-    }
-    Frame {
-        msec: 656
-        hash: "acebdcebe6880c8b3b94ad7606181b72"
-    }
-    Frame {
-        msec: 672
-        hash: "347945a94002cd44d7a2df47f82940a1"
-    }
-    Frame {
-        msec: 688
-        hash: "c716014d63ff2a22cab04dadc18b10c1"
-    }
-    Frame {
-        msec: 704
-        hash: "ced019e3f8b5ca079582d01f1f585a8e"
-    }
-    Frame {
-        msec: 720
-        hash: "d61d31de835ea8d1ffa56fd04c873ac1"
-    }
-    Frame {
-        msec: 736
-        hash: "2eec542c5af4c6eecc153cc0fcae7dd3"
-    }
-    Frame {
-        msec: 752
-        hash: "c13b9443e1c000a2877e4586428da308"
-    }
-    Frame {
-        msec: 768
-        hash: "c5c2e30b3dc3298afc201f6045e79e59"
-    }
-    Frame {
-        msec: 784
-        hash: "308f2ca66133d37c2fcb222e68698d25"
-    }
-    Frame {
-        msec: 800
-        hash: "bf820215986a35b56daf07c164fd2a79"
-    }
-    Frame {
-        msec: 816
-        hash: "a0bb21475100fb25b767d055d70b062f"
-    }
-    Frame {
-        msec: 832
-        hash: "bfb0927bcb23689820b0f96ea56426fc"
-    }
-    Frame {
-        msec: 848
-        hash: "8f294742ca9dd6ab10689f1f4ec2ed96"
-    }
-    Frame {
-        msec: 864
-        hash: "f60c232307570fb4ec6e74f18e243553"
-    }
-    Frame {
-        msec: 880
-        hash: "7411970ab72d8b2dbf48ee8d4e6503b3"
-    }
-    Frame {
-        msec: 896
-        hash: "d4d766038daeae2fbec290204ca3983b"
-    }
-    Frame {
-        msec: 912
-        hash: "f85525c3fd784ee7f9a3d9465e37d6f3"
-    }
-    Frame {
-        msec: 928
-        hash: "c5e63da86ddbd2a54c7cd3d03e5428a2"
-    }
-    Frame {
-        msec: 944
-        hash: "369a7405b1717ddf06c99ab1dd6d4cb0"
-    }
-    Frame {
-        msec: 960
-        image: "follow.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "18d5c4378f9daf63bf4cb76d76374548"
-    }
-    Frame {
-        msec: 992
-        hash: "f36e649db2e1ec9fbe15e7711ea13ab5"
-    }
-    Frame {
-        msec: 1008
-        hash: "f68515607dca1bda14b6afa6e05ebb6b"
-    }
-    Frame {
-        msec: 1024
-        hash: "bc5cc4c9050a5bd4c64debd12643fd73"
-    }
-    Frame {
-        msec: 1040
-        hash: "f053a18bca4d8c47a0f181fad8118e9a"
-    }
-    Frame {
-        msec: 1056
-        hash: "9a2218f51faed4fa891c507fe6828d2c"
-    }
-    Frame {
-        msec: 1072
-        hash: "ce671ff4dd1f343243f2fcc263d137f4"
-    }
-    Frame {
-        msec: 1088
-        hash: "8624f8d814094ad25a1482a11f424990"
-    }
-    Frame {
-        msec: 1104
-        hash: "324dad940b3adb54491d6cdd4e7d8aa7"
-    }
-    Frame {
-        msec: 1120
-        hash: "0cd7c53ec5b591053de6769967b8bad5"
-    }
-    Frame {
-        msec: 1136
-        hash: "e9e8f5e9c2dc179498943d0b5912af09"
-    }
-    Frame {
-        msec: 1152
-        hash: "5f1552ccd61f09335a88658ee1c4e97e"
-    }
-    Frame {
-        msec: 1168
-        hash: "866e01eed7e26dd1bd9af8aaddf4d7c0"
-    }
-    Frame {
-        msec: 1184
-        hash: "2efba3c33c4c7b6d89ce7efca2dc516a"
-    }
-    Frame {
-        msec: 1200
-        hash: "2de9d8a2ad64d2491b3444712be032dc"
-    }
-    Frame {
-        msec: 1216
-        hash: "84206972322eae033d05f71b178180c9"
-    }
-    Frame {
-        msec: 1232
-        hash: "8571d11da1a893edcbe5add1a9399d7a"
-    }
-    Frame {
-        msec: 1248
-        hash: "c0d65ecefa77ee7cb1c08a560e3ad572"
-    }
-    Frame {
-        msec: 1264
-        hash: "0f8a8523969713771a6c7984069b15e4"
-    }
-    Frame {
-        msec: 1280
-        hash: "2e80e4b54538b7b586f4a3be55eb6da3"
-    }
-    Frame {
-        msec: 1296
-        hash: "ae028381f311a60946ecd26eab95bb42"
-    }
-    Frame {
-        msec: 1312
-        hash: "ac5902d58bc116a002c093f55cf20278"
-    }
-    Frame {
-        msec: 1328
-        hash: "242f8617718048cfab9950b812eb1b26"
-    }
-    Frame {
-        msec: 1344
-        hash: "b642f2f0d3161f80a702b09a910c589b"
-    }
-    Frame {
-        msec: 1360
-        hash: "d1508034ecd908120c6f58cf08360c3c"
-    }
-    Frame {
-        msec: 1376
-        hash: "ad10a5ea8598616f2ffa633eecfbd43a"
-    }
-    Frame {
-        msec: 1392
-        hash: "1d2c3cfaac1cca868f31872bf4248de8"
-    }
-    Frame {
-        msec: 1408
-        hash: "28da57a6aec84318ff6aa029ac17f1dd"
-    }
-    Frame {
-        msec: 1424
-        hash: "6f9bf89843d5e40f6c282e69337e7d25"
-    }
-    Frame {
-        msec: 1440
-        hash: "1c5733ad9620805127372fb76f5b0228"
-    }
-    Frame {
-        msec: 1456
-        hash: "16f21041e9e475a37c478cf38cdc353b"
-    }
-    Frame {
-        msec: 1472
-        hash: "b39ea2e8a1991b3ea5be818a284ff69f"
-    }
-    Frame {
-        msec: 1488
-        hash: "4f5bdc935080707525a2b74936b41b2e"
-    }
-    Frame {
-        msec: 1504
-        hash: "a39426dc761df1d2ba398aa17d220ded"
-    }
-    Frame {
-        msec: 1520
-        hash: "2e965042273b377958b04190250d273e"
-    }
-    Frame {
-        msec: 1536
-        hash: "51f021c1d50291b425c98dee4894b330"
-    }
-    Frame {
-        msec: 1552
-        hash: "88fea2e6d6898084acb5897833adb182"
-    }
-    Frame {
-        msec: 1568
-        hash: "12f55e64c8ec9825bf6c5cfd5d50d2bb"
-    }
-    Frame {
-        msec: 1584
-        hash: "365b358eb7a678e1076774c36a82f452"
-    }
-    Frame {
-        msec: 1600
-        hash: "a992b326739bff87bf042c711a7fa65c"
-    }
-    Frame {
-        msec: 1616
-        hash: "083aa3c766a3b50492e51aab3ee128d0"
-    }
-    Frame {
-        msec: 1632
-        hash: "16a2db3b3a773e2612bc57f7a7d7fbbe"
-    }
-    Frame {
-        msec: 1648
-        hash: "32a28101a53d308b107d26a30ae7cdd9"
-    }
-    Frame {
-        msec: 1664
-        hash: "da3908e584542ff2f73cb22369f49c1c"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 195; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1680
-        hash: "8ad535bb0c5decd8c970aa36286d57e7"
-    }
-    Frame {
-        msec: 1696
-        hash: "5bfbcab7607622486c350a9117ab0884"
-    }
-    Frame {
-        msec: 1712
-        hash: "17e13c8bfd81081f6400d3e71daecb4c"
-    }
-    Frame {
-        msec: 1728
-        hash: "9411a66b6c3ef9a98bc62dea282d6a51"
-    }
-    Frame {
-        msec: 1744
-        hash: "423cded80165ee13f903460e5396526b"
-    }
-    Frame {
-        msec: 1760
-        hash: "709cc55316e6702c1359b66c06676603"
-    }
-    Frame {
-        msec: 1776
-        hash: "27232931c000a2edb5c3d480a6692e6b"
-    }
-    Frame {
-        msec: 1792
-        hash: "22311fd0903b53f50df824ba345ca350"
-    }
-    Frame {
-        msec: 1808
-        hash: "9bb066e60e7e5b3eaa0a221b8ba1a431"
-    }
-    Frame {
-        msec: 1824
-        hash: "517000255d372d384773dff8c80f5a65"
-    }
-    Frame {
-        msec: 1840
-        hash: "329dbd77ae53ea8e4beb669a976033a8"
-    }
-    Frame {
-        msec: 1856
-        hash: "2acd5d3e878e1db5413270c1a50ffc83"
-    }
-    Frame {
-        msec: 1872
-        hash: "8eb5946ac5d53dfc2813d1f1c6a2b6c5"
-    }
-    Frame {
-        msec: 1888
-        hash: "375299e5b1067e02d5de3238a37659f2"
-    }
-    Frame {
-        msec: 1904
-        hash: "f385c90e585db5555e873996165f55af"
-    }
-    Frame {
-        msec: 1920
-        image: "follow.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "6c13bb69b6483c72463437e102a9dabb"
-    }
-    Frame {
-        msec: 1952
-        hash: "c1b5d10688681c3b2363bb6d4173deca"
-    }
-    Frame {
-        msec: 1968
-        hash: "b434649e4c9b2c184d2f9036f9d041bf"
-    }
-    Frame {
-        msec: 1984
-        hash: "ca32e9f9080983803bb37b7231ed1c84"
-    }
-    Frame {
-        msec: 2000
-        hash: "976eab47b2d6445fdd8293f2c73564c1"
-    }
-    Frame {
-        msec: 2016
-        hash: "e63daea8f3bc79cea7a6b8dcfd31a094"
-    }
-    Frame {
-        msec: 2032
-        hash: "626cbe5e6b79f2fd0ef57c943666b571"
-    }
-    Frame {
-        msec: 2048
-        hash: "4e07255ce12a21966eec33c0cc623d96"
-    }
-    Frame {
-        msec: 2064
-        hash: "94045005de77725c63c62575a6b06852"
-    }
-    Frame {
-        msec: 2080
-        hash: "3b6dcf783c5e9fe99ce3d9ca02bceff6"
-    }
-    Frame {
-        msec: 2096
-        hash: "e901ed7e831e2d012b97b98b3ab6fa1b"
-    }
-    Frame {
-        msec: 2112
-        hash: "74ef03f72d032daaff13114fde02b824"
-    }
-    Frame {
-        msec: 2128
-        hash: "9eb334d7dda3801c1fe292844040e014"
-    }
-    Frame {
-        msec: 2144
-        hash: "82bf8fb5e3a9bf167f3f00b1f6ab3c06"
-    }
-    Frame {
-        msec: 2160
-        hash: "df3a2bc7758d00d595347e62c7e53c4a"
-    }
-    Frame {
-        msec: 2176
-        hash: "e77ac04a6ad9f97226b45d202a0d5196"
-    }
-    Frame {
-        msec: 2192
-        hash: "37411333a28ea840c59cabd96fd1deba"
-    }
-    Frame {
-        msec: 2208
-        hash: "8d1eb90ffd080bcd078b69c9635108d1"
-    }
-    Frame {
-        msec: 2224
-        hash: "68ee5d58b2edeb6b5a64a714115e4499"
-    }
-    Frame {
-        msec: 2240
-        hash: "003ddf0a5dd3d4bb947a34bdd22ad8c1"
-    }
-    Frame {
-        msec: 2256
-        hash: "bf3c89d0a09ed2159a78f10124f5d7bb"
-    }
-    Frame {
-        msec: 2272
-        hash: "6ec994f41d4540db988846416c2f7b4f"
-    }
-    Frame {
-        msec: 2288
-        hash: "9ca7e3ca6ea26e8259d34a8c0f80f7a9"
-    }
-    Frame {
-        msec: 2304
-        hash: "edf5cea581d46400914610213c8503ea"
-    }
-    Frame {
-        msec: 2320
-        hash: "9b96aac3f98cd37a361788be8b81e308"
-    }
-    Frame {
-        msec: 2336
-        hash: "5d304a8398512ebc85bebf973ed6a4f4"
-    }
-    Frame {
-        msec: 2352
-        hash: "cf2a27a395f23f7976a48d69f5e8e120"
-    }
-    Frame {
-        msec: 2368
-        hash: "458323a37208ea14972d8f84cebc66a5"
-    }
-    Frame {
-        msec: 2384
-        hash: "da9c8e4d168b9cd32d5ec3f5857d2942"
-    }
-    Frame {
-        msec: 2400
-        hash: "5d6663be8e02b0a7a4701595c9c26663"
-    }
-    Frame {
-        msec: 2416
-        hash: "4190712a39ca07f810a6d84e15488393"
-    }
-    Frame {
-        msec: 2432
-        hash: "26b22be0a1c2fecec1e25a6513b19484"
-    }
-    Frame {
-        msec: 2448
-        hash: "3e623bc2b9e8cec49671571291cf6afb"
-    }
-    Frame {
-        msec: 2464
-        hash: "3e623bc2b9e8cec49671571291cf6afb"
-    }
-    Frame {
-        msec: 2480
-        hash: "2cb2968d16323af4659b3197d391bb91"
-    }
-    Frame {
-        msec: 2496
-        hash: "5376b1285647950428b29e75f2e27c4f"
-    }
-    Frame {
-        msec: 2512
-        hash: "baaacc3940c8d36f715d90e046346bed"
-    }
-    Frame {
-        msec: 2528
-        hash: "277719afea4c119f17c34c59ef0b7984"
-    }
-    Frame {
-        msec: 2544
-        hash: "00a172ff8afd1e8444fb84249a3af0fd"
-    }
-    Frame {
-        msec: 2560
-        hash: "bf8a0f939a5602a0a9f5a3bc7c8d0d86"
-    }
-    Frame {
-        msec: 2576
-        hash: "b22860751790b3113b2cb299c9f628b8"
-    }
-    Frame {
-        msec: 2592
-        hash: "fdda1e520457974443720bd44f21d929"
-    }
-    Frame {
-        msec: 2608
-        hash: "538af31f9463cd07163d54adc2721345"
-    }
-    Frame {
-        msec: 2624
-        hash: "2ca50398746c8fb1c936fd412c7556b4"
-    }
-    Frame {
-        msec: 2640
-        hash: "63cd898c3e22a29846489e5c47f455a1"
-    }
-    Frame {
-        msec: 2656
-        hash: "1e69cc765c3f2c27c2b6e7f3e47f515a"
-    }
-    Frame {
-        msec: 2672
-        hash: "9d7ce0df7bee9a387917ef228fd50652"
-    }
-    Frame {
-        msec: 2688
-        hash: "afa0b735a9dd0734362b3f3f7d7177c3"
-    }
-    Frame {
-        msec: 2704
-        hash: "91bee07133319a0adbf9a31c430e58ad"
-    }
-    Frame {
-        msec: 2720
-        hash: "6aee88b6391e524bafc15524825ada74"
-    }
-    Frame {
-        msec: 2736
-        hash: "655ce421faa628b3389f084fe675ad53"
-    }
-    Frame {
-        msec: 2752
-        hash: "367fd34b54f12e896839b0ef4fb06925"
-    }
-    Frame {
-        msec: 2768
-        hash: "0b3ac04504bfe876c4338a4dc3721280"
-    }
-    Frame {
-        msec: 2784
-        hash: "c6cdb77888f1a3cbfe4cfec28bfad12d"
-    }
-    Frame {
-        msec: 2800
-        hash: "ef01302544f4da4575035d3e4f2443c9"
-    }
-    Frame {
-        msec: 2816
-        hash: "53f01d26a75f7e91d14b8975c81638d5"
-    }
-    Frame {
-        msec: 2832
-        hash: "10fc7b3f7e5dff21edef4123d252cba0"
-    }
-    Frame {
-        msec: 2848
-        hash: "10fc7b3f7e5dff21edef4123d252cba0"
-    }
-    Frame {
-        msec: 2864
-        hash: "10fc7b3f7e5dff21edef4123d252cba0"
-    }
-    Frame {
-        msec: 2880
-        image: "follow.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "143970d31598c017d7f24e8b09fd0f0a"
-    }
-    Frame {
-        msec: 2912
-        hash: "fc6c38bfdcd2df7a928e83d57dc0b18d"
-    }
-    Frame {
-        msec: 2928
-        hash: "647c09aae23ea5ec7979775d3022cacf"
-    }
-    Frame {
-        msec: 2944
-        hash: "f1ed5cd564be1eed3242997c14a99887"
-    }
-    Frame {
-        msec: 2960
-        hash: "aec3d7f18d6c4002229ef1d36727c4b0"
-    }
-    Frame {
-        msec: 2976
-        hash: "3552e5a3923593a2c66ecd5e2cb2ee25"
-    }
-    Frame {
-        msec: 2992
-        hash: "55a72327b726a3c75383cc5a28ba9503"
-    }
-    Frame {
-        msec: 3008
-        hash: "c25ff06944f8c92006245452e07215ef"
-    }
-    Frame {
-        msec: 3024
-        hash: "cc0187a10a7ccf087838a481f667af6e"
-    }
-    Frame {
-        msec: 3040
-        hash: "ae9d7ff04066eb998d052c2e21b58327"
-    }
-    Frame {
-        msec: 3056
-        hash: "91707fa1aaa267e6d1d56d173a063bde"
-    }
-    Frame {
-        msec: 3072
-        hash: "c076a33b8afcaf915387375f065e49df"
-    }
-    Frame {
-        msec: 3088
-        hash: "c24390ec788b5f34356e7a6507507a93"
-    }
-    Frame {
-        msec: 3104
-        hash: "e42c9800379de3076d00802c68cc99e8"
-    }
-    Frame {
-        msec: 3120
-        hash: "a2d3ba5353b1c967da93d96b61f7927f"
-    }
-    Frame {
-        msec: 3136
-        hash: "fe719953aa3468d373801bb80ae93eff"
-    }
-    Frame {
-        msec: 3152
-        hash: "e89b9bed1ebc7ebdd37d6975ecb0601c"
-    }
-    Frame {
-        msec: 3168
-        hash: "7f3d84f49a7dd4fe39a1ba0ed7f5da3e"
-    }
-    Frame {
-        msec: 3184
-        hash: "b16c9e05f72e7c8fa59f80422b987600"
-    }
-    Frame {
-        msec: 3200
-        hash: "bd0606da0f7bc6c47a361462b3b2dede"
-    }
-    Frame {
-        msec: 3216
-        hash: "88f81db6d705b745c4d2ffe470cb6966"
-    }
-    Frame {
-        msec: 3232
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3248
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3264
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3280
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3296
-        hash: "88f81db6d705b745c4d2ffe470cb6966"
-    }
-    Frame {
-        msec: 3312
-        hash: "88f81db6d705b745c4d2ffe470cb6966"
-    }
-    Frame {
-        msec: 3328
-        hash: "1f112ff43280a208e967e373db8e3f34"
-    }
-    Frame {
-        msec: 3344
-        hash: "6d966dafdfd2cf1927c14f749e24a99c"
-    }
-    Frame {
-        msec: 3360
-        hash: "8ab4ce88e52d7cd2ec9059cdb973590d"
-    }
-    Frame {
-        msec: 3376
-        hash: "62d877f18b8d3fcf6b076946f2ce05f7"
-    }
-    Frame {
-        msec: 3392
-        hash: "efe3729cdeddc4bcee105b27e4062dcd"
-    }
-    Frame {
-        msec: 3408
-        hash: "a2eb63f12d434925d0780f4992155556"
-    }
-    Frame {
-        msec: 3424
-        hash: "5eee7ec87bb399e1395a8d337ede021b"
-    }
-    Frame {
-        msec: 3440
-        hash: "59769ae407be01b016df8d7fbf484243"
-    }
-    Frame {
-        msec: 3456
-        hash: "bbadb689ec5b76f76340905252b2376a"
-    }
-    Frame {
-        msec: 3472
-        hash: "97cd4f34259ac8370e8557ef3ecf5a96"
-    }
-    Frame {
-        msec: 3488
-        hash: "17c1513fe4c0132e15355378c6a6ee11"
-    }
-    Frame {
-        msec: 3504
-        hash: "7b19041638fc7d1cf60512f579f388dd"
-    }
-    Frame {
-        msec: 3520
-        hash: "4d23bbf68cb8b32638b73ac20551ee50"
-    }
-    Frame {
-        msec: 3536
-        hash: "3f0326db5a851887a534e80cc29dc21d"
-    }
-    Frame {
-        msec: 3552
-        hash: "df5902d22a31c4deac1428d2758a0ffa"
-    }
-    Frame {
-        msec: 3568
-        hash: "21badb1464775fa935c2619b91aa6e6e"
-    }
-    Frame {
-        msec: 3584
-        hash: "e8cf87f4a65f6915addc16de29c90108"
-    }
-    Frame {
-        msec: 3600
-        hash: "d3d4487b887695b7bba8e0af7756a0f8"
-    }
-    Frame {
-        msec: 3616
-        hash: "d7f52590e4f51621ad2d62c975a5d1ef"
-    }
-    Frame {
-        msec: 3632
-        hash: "9ebdc2b3ef05748e2cc8988f968f7a37"
-    }
-    Frame {
-        msec: 3648
-        hash: "74bb7974f9315e70e976c21955390b9e"
-    }
-    Frame {
-        msec: 3664
-        hash: "59e16a89e523160f2a482c22f003f87f"
-    }
-    Frame {
-        msec: 3680
-        hash: "d8284c216df0fdd37525f26b88707572"
-    }
-    Frame {
-        msec: 3696
-        hash: "d8711b4444eea59acc544652cea3c4ce"
-    }
-    Frame {
-        msec: 3712
-        hash: "12148c3f2b5f41a4ac4801e990b20114"
-    }
-    Frame {
-        msec: 3728
-        hash: "34429cbdfe581a524b1f9072cc404539"
-    }
-    Frame {
-        msec: 3744
-        hash: "1f6a17b91d73e10bcbdd166d97546822"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 195; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3760
-        hash: "bccd4f135f27199b3a710576e0013c53"
-    }
-    Frame {
-        msec: 3776
-        hash: "6aa4db9ecb8fa4ad4d4f81434c369759"
-    }
-    Frame {
-        msec: 3792
-        hash: "a7f2951411d8f5322ce91b3da7e86d64"
-    }
-    Frame {
-        msec: 3808
-        hash: "25fe19f3398d3d1a74ad8ed4114149d7"
-    }
-    Frame {
-        msec: 3824
-        hash: "05c3dae68897a461de2923824bef9390"
-    }
-    Frame {
-        msec: 3840
-        image: "follow.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "db6265c30dd614720d1532ffc411a28f"
-    }
-    Frame {
-        msec: 3872
-        hash: "f5de8e4ba755bc0a1e4c3f36ed3e6a93"
-    }
-    Frame {
-        msec: 3888
-        hash: "ad68229e5fe9a2570074648005c5e5df"
-    }
-    Frame {
-        msec: 3904
-        hash: "02d894680766289fe659a86b02d6c9ca"
-    }
-    Frame {
-        msec: 3920
-        hash: "4f228534dd909207e8d149c74bd8fd90"
-    }
-    Frame {
-        msec: 3936
-        hash: "f0b5c64f6a50e156452caf6a352c11e1"
-    }
-    Frame {
-        msec: 3952
-        hash: "64d46ff443534dbdb3cca88b7fc3e758"
-    }
-    Frame {
-        msec: 3968
-        hash: "717ad4b8012a21c6ed38dee5ea978f36"
-    }
-    Frame {
-        msec: 3984
-        hash: "ed38c7b528bcbb3e291761104bf1e86e"
-    }
-    Frame {
-        msec: 4000
-        hash: "8cc8674d325a2c72c41654ffbe5bce1f"
-    }
-    Frame {
-        msec: 4016
-        hash: "ab66dd60cc0e58d23bef5c709fe901ad"
-    }
-    Frame {
-        msec: 4032
-        hash: "b3b824cae4ddaac4a224e84f0e282fa4"
-    }
-    Frame {
-        msec: 4048
-        hash: "ead7fe4bec7987c24c305e114797284c"
-    }
-    Frame {
-        msec: 4064
-        hash: "e5e9501f1ca61ea9f99aadfc5ca02214"
-    }
-    Frame {
-        msec: 4080
-        hash: "f74a00eb31e1604f13a6ffb29fbd91b7"
-    }
-    Frame {
-        msec: 4096
-        hash: "539aca62492408ccc1815c67b55cb399"
-    }
-    Frame {
-        msec: 4112
-        hash: "4f548ad0eb7c4ce88a777e3b7ce2d3a8"
-    }
-    Frame {
-        msec: 4128
-        hash: "b0190c5ed53ff812988dd7a2152ffa61"
-    }
-    Frame {
-        msec: 4144
-        hash: "48214bdfbdcba256043e2cec7f5e321b"
-    }
-    Frame {
-        msec: 4160
-        hash: "952614329111d1d83b0304aa919af177"
-    }
-    Frame {
-        msec: 4176
-        hash: "fd874a73062dedfe7b904ad4c9fbcbc9"
-    }
-    Frame {
-        msec: 4192
-        hash: "365b9a18cf37521718ef98589ac23933"
-    }
-    Frame {
-        msec: 4208
-        hash: "32bbbf93d78925ef12f830386f0dbe2b"
-    }
-    Frame {
-        msec: 4224
-        hash: "835d391a498b7d470b317e91453ba2f9"
-    }
-    Frame {
-        msec: 4240
-        hash: "07d0cd82a39bfea2567587745f1e330d"
-    }
-    Frame {
-        msec: 4256
-        hash: "9560a63581007038e1c463b906a4b346"
-    }
-    Frame {
-        msec: 4272
-        hash: "076d25daafe8b582aeff39e247653285"
-    }
-    Frame {
-        msec: 4288
-        hash: "f2e66dad3231250b951388396705c839"
-    }
-    Frame {
-        msec: 4304
-        hash: "f168773343e928b60aad5430b9ca739d"
-    }
-    Frame {
-        msec: 4320
-        hash: "99ed4dc4be1a0e8d98e1a54d51208da3"
-    }
-    Frame {
-        msec: 4336
-        hash: "23b3e73a966f52ce6166bc91955570a1"
-    }
-    Frame {
-        msec: 4352
-        hash: "00cdb999f3d2c6fcad708c37c3059c3d"
-    }
-    Frame {
-        msec: 4368
-        hash: "96f1bef93ba1768afcc42924145d49ff"
-    }
-    Frame {
-        msec: 4384
-        hash: "0a76f6d5ec710e4046f32f76be8e0d68"
-    }
-    Frame {
-        msec: 4400
-        hash: "98f97a6c7eac1a493e81e79956177668"
-    }
-    Frame {
-        msec: 4416
-        hash: "9424ca6ba64d0d0c0bd1ee9da1b5085a"
-    }
-    Frame {
-        msec: 4432
-        hash: "2049a22079ac590aad3c9f6496879bcb"
-    }
-    Frame {
-        msec: 4448
-        hash: "f70f9f6bd3abf3bdcb70038cda5ed311"
-    }
-    Frame {
-        msec: 4464
-        hash: "48d6d01e1d80fea8eb05572ca26b692c"
-    }
-    Frame {
-        msec: 4480
-        hash: "af152dc6de929a8231687611cc301f28"
-    }
-    Frame {
-        msec: 4496
-        hash: "2ec869cd61570b570586870f80ba3832"
-    }
-    Frame {
-        msec: 4512
-        hash: "42be0431c015dcd0f5f6dd59ba7c2d7d"
-    }
-    Frame {
-        msec: 4528
-        hash: "abc112f396c5e504a19dce255437720c"
-    }
-    Frame {
-        msec: 4544
-        hash: "a371c4f49af16bdacc5ab5abbfc99e99"
-    }
-    Frame {
-        msec: 4560
-        hash: "1ebfd139bfabbbaf522acd63e3f47462"
-    }
-    Frame {
-        msec: 4576
-        hash: "b36086718a3dd89500adbf67aa7b0f1d"
-    }
-    Frame {
-        msec: 4592
-        hash: "e3ea2ad4955cb2ab8d503b331b3594c3"
-    }
-    Frame {
-        msec: 4608
-        hash: "4214c9f474d7f11bed74e32f5b3a0e9f"
-    }
-    Frame {
-        msec: 4624
-        hash: "f290e1dbf13ae399a2644eea3715804a"
-    }
-    Frame {
-        msec: 4640
-        hash: "6538c60446e3303dc1126c3c9c47ae42"
-    }
-    Frame {
-        msec: 4656
-        hash: "5319667f181eb5647710ccc6eddf43c9"
-    }
-    Frame {
-        msec: 4672
-        hash: "b98b68ea99d5a107115b50c32aa45c35"
-    }
-    Frame {
-        msec: 4688
-        hash: "2cc38e2915f77a46082c32c9393ae0c5"
-    }
-    Frame {
-        msec: 4704
-        hash: "40c695b17834cbba86d4dde0729f620b"
-    }
-    Frame {
-        msec: 4720
-        hash: "e8d5a95cfc726ce2626951ef1c68a948"
-    }
-    Frame {
-        msec: 4736
-        hash: "ab96c1668890ceffba74219d83e15e99"
-    }
-    Frame {
-        msec: 4752
-        hash: "4d69a73b3940911940b419028dabd223"
-    }
-    Frame {
-        msec: 4768
-        hash: "281043e3c045df177cbfae1abf51a8d1"
-    }
-    Frame {
-        msec: 4784
-        hash: "8adf6d8154d7950efe6b5bd7e2b760b6"
-    }
-    Frame {
-        msec: 4800
-        image: "follow.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "7fba4249c76b7f81c2b88cf906ce8ce6"
-    }
-    Frame {
-        msec: 4832
-        hash: "50b3c89d4d783469843b3acacb9690dd"
-    }
-    Frame {
-        msec: 4848
-        hash: "29f950ab7e6299036e78c8f37d114990"
-    }
-    Frame {
-        msec: 4864
-        hash: "3f8aecc5453406c9d8160eeb9691ed91"
-    }
-    Frame {
-        msec: 4880
-        hash: "ad7ff48fed4ca9e236271d169c3bf696"
-    }
-    Frame {
-        msec: 4896
-        hash: "2a2f872e4ef5c062a61fb59238df8794"
-    }
-    Frame {
-        msec: 4912
-        hash: "87cf2e21d7e56a82437a8ff3fa2bdc8c"
-    }
-    Frame {
-        msec: 4928
-        hash: "c3b04bb24d86d2aebd8fde7845f114cf"
-    }
-    Frame {
-        msec: 4944
-        hash: "3ad95d59a1f1841e3ff2324055ca23c0"
-    }
-    Frame {
-        msec: 4960
-        hash: "b91068fdce1fb2be9a64902a3dfa6b0d"
-    }
-    Frame {
-        msec: 4976
-        hash: "30f0118eb0bba40927a8038da03b652b"
-    }
-    Frame {
-        msec: 4992
-        hash: "ce5f3d15d3536be16b960f02a7335b99"
-    }
-    Frame {
-        msec: 5008
-        hash: "85b853c3f48b915ed6e80815709e8ac2"
-    }
-    Frame {
-        msec: 5024
-        hash: "c3511a76aa6dc2f1422a473ca4d80d0f"
-    }
-    Frame {
-        msec: 5040
-        hash: "deb1df70b4e1801c635356c65c0a5a46"
-    }
-    Frame {
-        msec: 5056
-        hash: "d04983df9b0ffc45e629af55a8e5cc95"
-    }
-    Frame {
-        msec: 5072
-        hash: "2a55c97509819657f5f8604d4789d9d4"
-    }
-    Frame {
-        msec: 5088
-        hash: "94589d594fa2e5ed621459ec2c8bd7e8"
-    }
-    Frame {
-        msec: 5104
-        hash: "a8a1bd7c15a5bdfe15d6580d719bdba6"
-    }
-    Frame {
-        msec: 5120
-        hash: "b4e1a4b1b649820be217c46b5086c8a4"
-    }
-    Frame {
-        msec: 5136
-        hash: "4de7d7ce85717eb9a67c61745ea26c0a"
-    }
-    Frame {
-        msec: 5152
-        hash: "c8ee53b7e659e10c7dbcf44e1a45f794"
-    }
-    Frame {
-        msec: 5168
-        hash: "f46ce03bc5a932c39862577c5a5cd24c"
-    }
-    Frame {
-        msec: 5184
-        hash: "d417370ed6fb99ccfa443eb97e6de331"
-    }
-    Frame {
-        msec: 5200
-        hash: "336af06572992960c829d4a209048263"
-    }
-    Frame {
-        msec: 5216
-        hash: "4066e8eef292abf9b58bc89b4b5f3ce9"
-    }
-    Frame {
-        msec: 5232
-        hash: "360f037a02bf4a337b278886266ff2f1"
-    }
-    Frame {
-        msec: 5248
-        hash: "79e9f387b0ce164057640c0caab8d10d"
-    }
-    Frame {
-        msec: 5264
-        hash: "ee8741d1810303cfe5ecff39c7d52fdd"
-    }
-    Frame {
-        msec: 5280
-        hash: "4cba1c857f0af49d7fe68584f99c89d7"
-    }
-    Frame {
-        msec: 5296
-        hash: "c0ae482a2fbb9f15a2c2ff631cc85c2c"
-    }
-    Frame {
-        msec: 5312
-        hash: "3b6bf6d6a0aeebdc92eff4e336fd3b6e"
-    }
-    Frame {
-        msec: 5328
-        hash: "43033eb8aeba6b49c135a1702f6b8f47"
-    }
-    Frame {
-        msec: 5344
-        hash: "1319c7e3a84484723891ee43a80bc765"
-    }
-    Frame {
-        msec: 5360
-        hash: "838ec693c923565d77b060f262beb1e8"
-    }
-    Frame {
-        msec: 5376
-        hash: "74306669836425de03cec617d4ed849a"
-    }
-    Frame {
-        msec: 5392
-        hash: "c063f4951755c8939399d0d560a0f762"
-    }
-    Frame {
-        msec: 5408
-        hash: "512c739e0ff25f7d6b983a193f7fc2c3"
-    }
-    Frame {
-        msec: 5424
-        hash: "6c5f69cc2ce2992fd2ecb0ea3691e2b8"
-    }
-    Frame {
-        msec: 5440
-        hash: "f5dbc5ce0ba00eafb9379ee86de67150"
-    }
-    Frame {
-        msec: 5456
-        hash: "f62bb7d8d9749272ca3e2bd1931598fb"
-    }
-    Frame {
-        msec: 5472
-        hash: "052fdac05286edcdd7fcd4d6d9582f39"
-    }
-    Frame {
-        msec: 5488
-        hash: "ac4702306e5be156fe7b069cb90e1038"
-    }
-    Frame {
-        msec: 5504
-        hash: "127e94c79f4d33e5f223a0853629245f"
-    }
-    Frame {
-        msec: 5520
-        hash: "dd77216b0a90c46dd5c264d38ab0fd74"
-    }
-    Frame {
-        msec: 5536
-        hash: "a4e50b39aa367d4cd7650d088d186856"
-    }
-    Frame {
-        msec: 5552
-        hash: "6e14946b9b23f0fc137bd61c02af1ca5"
-    }
-    Frame {
-        msec: 5568
-        hash: "8c550d5e4cfbcee2c7bd6c20dba53f41"
-    }
-    Frame {
-        msec: 5584
-        hash: "9f2385fb614bdaafe022712148f786d2"
-    }
-    Frame {
-        msec: 5600
-        hash: "c87903c96ae5a4b91c5bda524bfd4a4f"
-    }
-    Frame {
-        msec: 5616
-        hash: "9a98de9b4237b7c0ccb4468344d410bc"
-    }
-    Frame {
-        msec: 5632
-        hash: "7ff448f395ff50cde1f6e6cfaf0c1541"
-    }
-    Frame {
-        msec: 5648
-        hash: "ab7a6998a5b26e3d58bd1d0a949f3709"
-    }
-    Frame {
-        msec: 5664
-        hash: "ab7a6998a5b26e3d58bd1d0a949f3709"
-    }
-    Frame {
-        msec: 5680
-        hash: "2e1b5636ab75af91bd5b0d48c04828f5"
-    }
-    Frame {
-        msec: 5696
-        hash: "0976b605c78f6f8512acdfb61b9d123a"
-    }
-    Frame {
-        msec: 5712
-        hash: "bb816bfd8bd3972c80c3a76c9ddf785e"
-    }
-    Frame {
-        msec: 5728
-        hash: "c3518990fc7aa5660a9e86034cf4c46f"
-    }
-    Frame {
-        msec: 5744
-        hash: "b27230d8aeb214e18b43de167213ef7b"
-    }
-    Frame {
-        msec: 5760
-        image: "follow.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "fc55f00ae456c2687ed05ab4b6906a33"
-    }
-    Frame {
-        msec: 5792
-        hash: "50051a48d1fae3bc9c9d1f0a964d9561"
-    }
-    Frame {
-        msec: 5808
-        hash: "279a38d7261241c744c2317ea9843567"
-    }
-    Frame {
-        msec: 5824
-        hash: "0b3ed3960713dbda36326b7de492c42e"
-    }
-    Frame {
-        msec: 5840
-        hash: "fff5737541317406c4a0ef06f1cdc041"
-    }
-    Frame {
-        msec: 5856
-        hash: "47aef0d79da45139a3981a75290cc9b8"
-    }
-    Frame {
-        msec: 5872
-        hash: "d79f9f9371c76a855ea4f2cdeed97acd"
-    }
-    Frame {
-        msec: 5888
-        hash: "66610a0d5b926d419da26e20b04b55a5"
-    }
-    Frame {
-        msec: 5904
-        hash: "9891ad954da8535b44cc234bb2588f30"
-    }
-    Frame {
-        msec: 5920
-        hash: "b53056146701fae1598ab49e6399db01"
-    }
-    Frame {
-        msec: 5936
-        hash: "064799027a3f60458a3797c6c87d3e29"
-    }
-    Frame {
-        msec: 5952
-        hash: "81ad252f10e6f8f2a08e7df1d25e8a47"
-    }
-    Frame {
-        msec: 5968
-        hash: "09fbd923da02844f50ad25059f82560c"
-    }
-    Frame {
-        msec: 5984
-        hash: "f41d8370afdce8a154ab42204ca8d92d"
-    }
-    Frame {
-        msec: 6000
-        hash: "748b2d020c28b3ac36b08377b4a2544b"
-    }
-    Frame {
-        msec: 6016
-        hash: "748b2d020c28b3ac36b08377b4a2544b"
-    }
-    Frame {
-        msec: 6032
-        hash: "d8c02a54c0d1df20127025d547c741af"
-    }
-    Frame {
-        msec: 6048
-        hash: "d8c02a54c0d1df20127025d547c741af"
-    }
-    Frame {
-        msec: 6064
-        hash: "d7fd0dab22fec0f68ed01cfd6d32e7f5"
-    }
-    Frame {
-        msec: 6080
-        hash: "f0b035eda10c07f5c3c825784ad96437"
-    }
-    Frame {
-        msec: 6096
-        hash: "54b83800f8a01e1a4d57b8b1d371fb09"
-    }
-    Frame {
-        msec: 6112
-        hash: "19ad51c31e9cfdb314c76f323574806c"
-    }
-    Frame {
-        msec: 6128
-        hash: "dcf269a115781eb4df232a527de87a87"
-    }
-    Frame {
-        msec: 6144
-        hash: "95053206702a6118c23b541ff7fbef0d"
-    }
-    Frame {
-        msec: 6160
-        hash: "933a158398ee746c0465c2e7af9b6b4d"
-    }
-    Frame {
-        msec: 6176
-        hash: "ade4a4aa03f5787dce1331ed27ff9c6e"
-    }
-    Frame {
-        msec: 6192
-        hash: "9ecc7d4cb5cf0dd815e208e13e2c932a"
-    }
-    Frame {
-        msec: 6208
-        hash: "98e40cba2e717e57a5dcd3413e166f65"
-    }
-    Frame {
-        msec: 6224
-        hash: "f68f45b71f6d596eaa76fa2bc46cfe1b"
-    }
-    Frame {
-        msec: 6240
-        hash: "9230c9b1013b83b073ccb90d2633043f"
-    }
-    Frame {
-        msec: 6256
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6272
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6288
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6304
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6320
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6336
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6352
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6368
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6384
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6400
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6416
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6432
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6448
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6464
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6480
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6496
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6512
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6528
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6544
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6560
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6576
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6592
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6608
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6624
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6640
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6656
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6672
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6688
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6704
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6720
-        image: "follow.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6752
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6768
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6784
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6800
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6816
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6832
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6848
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6864
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6880
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6896
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6912
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6928
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
deleted file mode 100644
index 0097449..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
-    color: "#ffffff"
-    width: 320; height: 240
-
-    Rectangle {
-        id: rect
-        color: "#00ff00"
-        y: 200; width: 60; height: 20
-        SequentialAnimation on y {
-            loops: Animation.Infinite
-            NumberAnimation {
-                to: 20; duration: 500
-                easing.type: "InOutQuad"
-            }
-            NumberAnimation {
-                to: 200; duration: 2000
-                easing.type: "OutBounce"
-            }
-            PauseAnimation { duration: 1000 }
-        }
-    }
-
-    // Velocity
-    Rectangle {
-        color: "#ff0000"
-        x: rect.width; width: rect.width; height: 20
-        y: rect.y
-        Behavior on y { SpringAnimation { velocity: 200 } }
-    }
-
-    // Spring
-    Rectangle {
-        color: "#ff0000"
-        x: rect.width * 2; width: rect.width/2; height: 20
-        y: rect.y
-        Behavior on y { SpringAnimation { spring: 1.0; damping: 0.2 } }
-    }
-    Rectangle {
-        color: "#880000"
-        x: rect.width * 2.5; width: rect.width/2; height: 20
-        y: rect.y
-        Behavior on y { SpringAnimation { spring: 1.0; damping: 0.2; mass: 3.0 } } // "heavier" object
-    }
-
-    // Follow mouse
-    MouseArea {
-        id: mouseRegion
-        anchors.fill: parent
-        Rectangle {
-            id: ball
-            property int targetX: mouseRegion.mouseX - 10
-            property int targetY: mouseRegion.mouseY - 10
-
-            x: targetX
-            y: targetY
-            width: 20; height: 20
-            radius: 10
-            color: "#0000ff"
-
-            Behavior on x { SpringAnimation { spring: 1.0; damping: 0.05; epsilon: 0.25 } }
-            Behavior on y { SpringAnimation { spring: 1.0; damping: 0.05; epsilon: 0.25 } }
-
-            states: [
-                State {
-                    name: "following"
-                    when: ball.x != ball.targetX || ball.y != ball.targetY
-                    PropertyChanges { target: ball; color: "#ff0000" }
-                }
-            ]
-            transitions: [
-                Transition {
-                    ColorAnimation { duration: 200 }
-                }
-            ]
-        }
-    }
-}
-- 
cgit v0.12


From 8daae0d2ba5d3aca1d0ab640f30afe8ddc1146f7 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 13:22:15 +1000
Subject: Clean up QML Rect visual tests

Mostly just creating the test scripts.

Task-number: QTBUG-14792
---
 .../qmlvisual/rect/data/GradientRect.0.png         | Bin 0 -> 248 bytes
 .../qmlvisual/rect/data/GradientRect.qml           |  11 +
 .../declarative/qmlvisual/rect/data/MyRect.0.png   | Bin 0 -> 135 bytes
 .../declarative/qmlvisual/rect/data/MyRect.qml     |  11 +
 .../qmlvisual/rect/data/rect-painting.0.png        | Bin 29725 -> 25197 bytes
 .../qmlvisual/rect/data/rect-painting.qml          | 276 ---------------------
 6 files changed, 22 insertions(+), 276 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/rect/data/GradientRect.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/rect/data/GradientRect.qml
 create mode 100644 tests/auto/declarative/qmlvisual/rect/data/MyRect.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/rect/data/MyRect.qml

diff --git a/tests/auto/declarative/qmlvisual/rect/data/GradientRect.0.png b/tests/auto/declarative/qmlvisual/rect/data/GradientRect.0.png
new file mode 100644
index 0000000..2ca5d28
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/rect/data/GradientRect.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/rect/data/GradientRect.qml b/tests/auto/declarative/qmlvisual/rect/data/GradientRect.qml
new file mode 100644
index 0000000..116ab2a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/rect/data/GradientRect.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "GradientRect.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/rect/data/MyRect.0.png b/tests/auto/declarative/qmlvisual/rect/data/MyRect.0.png
new file mode 100644
index 0000000..3eb9a8d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/rect/data/MyRect.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/rect/data/MyRect.qml b/tests/auto/declarative/qmlvisual/rect/data/MyRect.qml
new file mode 100644
index 0000000..72141c8
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/rect/data/MyRect.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "MyRect.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/rect/data/rect-painting.0.png b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.0.png
index 3b7970d..391e760 100644
Binary files a/tests/auto/declarative/qmlvisual/rect/data/rect-painting.0.png and b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/rect/data/rect-painting.qml b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.qml
index 7c42d13..9fc073c 100644
--- a/tests/auto/declarative/qmlvisual/rect/data/rect-painting.qml
+++ b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.qml
@@ -6,282 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 32
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 48
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 64
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 80
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 96
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 112
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 128
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 144
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 160
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 176
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 192
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 208
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 224
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 240
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 256
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 272
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 288
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 304
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 320
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 336
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 352
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 368
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 384
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 400
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 416
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 432
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 448
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 464
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 480
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 496
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 512
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 528
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 544
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 560
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 576
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 592
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 608
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 624
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 640
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 656
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 672
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 688
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 704
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 720
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 736
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 752
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 768
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 784
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 800
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 816
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 832
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 848
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 864
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 880
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 896
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 912
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 928
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 944
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 960
         image: "rect-painting.0.png"
     }
-    Frame {
-        msec: 976
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 992
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 1008
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 1024
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 1040
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 1056
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 1072
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
-    Frame {
-        msec: 1088
-        hash: "79998980caccd4eb479fbd9f2a13c860"
-    }
 }
-- 
cgit v0.12


From 0f09354da8595b39685076f5da79f6820eb6705a Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 13:31:53 +1000
Subject: Clean up repeater visual tests

Replace text with coloured rectangles, for more cross platform stability

Task-number: QTBUG-14792
---
 .../auto/declarative/qmlvisual/repeater/basic1.qml |  24 +-
 .../auto/declarative/qmlvisual/repeater/basic2.qml |  24 +-
 .../auto/declarative/qmlvisual/repeater/basic3.qml |  28 +-
 .../auto/declarative/qmlvisual/repeater/basic4.qml |  28 +-
 .../qmlvisual/repeater/data-MAC/basic1.0.png       | Bin 1550 -> 0 bytes
 .../qmlvisual/repeater/data-MAC/basic1.qml         | 323 ----------------
 .../qmlvisual/repeater/data-MAC/basic2.0.png       | Bin 1550 -> 0 bytes
 .../qmlvisual/repeater/data-MAC/basic2.qml         | 331 ----------------
 .../qmlvisual/repeater/data-MAC/basic3.0.png       | Bin 1550 -> 0 bytes
 .../qmlvisual/repeater/data-MAC/basic3.qml         | 347 -----------------
 .../qmlvisual/repeater/data-MAC/basic4.0.png       | Bin 1550 -> 0 bytes
 .../qmlvisual/repeater/data-MAC/basic4.qml         | 419 ---------------------
 .../qmlvisual/repeater/data-X11/basic1.0.png       | Bin 1354 -> 0 bytes
 .../qmlvisual/repeater/data-X11/basic1.qml         | 323 ----------------
 .../qmlvisual/repeater/data-X11/basic2.0.png       | Bin 1354 -> 0 bytes
 .../qmlvisual/repeater/data-X11/basic2.qml         | 331 ----------------
 .../qmlvisual/repeater/data-X11/basic3.0.png       | Bin 1354 -> 0 bytes
 .../qmlvisual/repeater/data-X11/basic3.qml         | 347 -----------------
 .../qmlvisual/repeater/data-X11/basic4.0.png       | Bin 1354 -> 0 bytes
 .../qmlvisual/repeater/data-X11/basic4.qml         | 419 ---------------------
 .../qmlvisual/repeater/data/basic1.0.png           | Bin 1513 -> 707 bytes
 .../declarative/qmlvisual/repeater/data/basic1.qml | 312 ---------------
 .../qmlvisual/repeater/data/basic2.0.png           | Bin 1513 -> 707 bytes
 .../declarative/qmlvisual/repeater/data/basic2.qml | 320 ----------------
 .../qmlvisual/repeater/data/basic3.0.png           | Bin 1513 -> 707 bytes
 .../declarative/qmlvisual/repeater/data/basic3.qml | 336 -----------------
 .../qmlvisual/repeater/data/basic4.0.png           | Bin 1513 -> 707 bytes
 .../declarative/qmlvisual/repeater/data/basic4.qml | 408 --------------------
 28 files changed, 60 insertions(+), 4260 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.qml

diff --git a/tests/auto/declarative/qmlvisual/repeater/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/basic1.qml
index 7f1ba84..5d994b9 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic1.qml
@@ -1,25 +1,29 @@
 import QtQuick 1.0
 
 Rectangle {
-    color: "blue"
-    width: 300
-    height: 200
-    Row {
-        Repeater {
+    color: "white"
+    width: 120
+    height: 240
+    id: page
+    Column{
+        Repeater{
             delegate: Rectangle {
-                color: "red"
+                color: "thistle"
                 width: 100
                 height: 100
-                Text {
-                    text: name
+                Rectangle {
+                    anchors.centerIn: parent
+                    width: 60
+                    height: 60
+                    color: name 
                 }
             }
             model: ListModel {
                 ListElement {
-                    name: "January"
+                    name: "palegoldenrod"
                 }
                 ListElement {
-                    name: "February"
+                    name: "lightsteelblue"
                 }
             }
         }
diff --git a/tests/auto/declarative/qmlvisual/repeater/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/basic2.qml
index b10420c..ea14e92 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic2.qml
@@ -1,29 +1,33 @@
 import QtQuick 1.0
 
 Rectangle {
-    color: "blue"
-    width: 300
-    height: 200
+    color: "white"
+    width: 120
+    height: 240
+    id: page
     Component {
         id: delegate
         Rectangle {
-            color: "red"
+            color: "thistle"
             width: 100
             height: 100
-            Text {
-                text: name
+            Rectangle {
+                anchors.centerIn: parent
+                width: 60
+                height: 60
+                color: name 
             }
         }
     }
-    Row {
-        Repeater {
+    Column{
+        Repeater{
             delegate: delegate
             model: ListModel {
                 ListElement {
-                    name: "January"
+                    name: "palegoldenrod"
                 }
                 ListElement {
-                    name: "February"
+                    name: "lightsteelblue"
                 }
             }
         }
diff --git a/tests/auto/declarative/qmlvisual/repeater/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/basic3.qml
index a296801..0193db3 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic3.qml
@@ -1,27 +1,31 @@
 import QtQuick 1.0
 
 Rectangle {
-    color: "blue"
-    width: 300
-    height: 200
+    color: "white"
+    width: 120
+    height: 240
+    id: page
     ListModel {
-        id: dataSource
+        id: model
         ListElement {
-            name: "January"
+            name: "palegoldenrod"
         }
         ListElement {
-            name: "February"
+            name: "lightsteelblue"
         }
     }
-    Row {
-        Repeater {
-            model: dataSource
+    Column{
+        Repeater{
+            model: model
             delegate: Rectangle {
-                color: "red"
+                color: "thistle"
                 width: 100
                 height: 100
-                Text {
-                    text: name
+                Rectangle {
+                    anchors.centerIn: parent
+                    width: 60
+                    height: 60
+                    color: name 
                 }
             }
         }
diff --git a/tests/auto/declarative/qmlvisual/repeater/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/basic4.qml
index fa85835..c7c0d29 100644
--- a/tests/auto/declarative/qmlvisual/repeater/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic4.qml
@@ -1,32 +1,36 @@
 import QtQuick 1.0
 
 Rectangle {
-    color: "blue"
-    width: 300
-    height: 200
+    color: "white"
+    width: 120
+    height: 240
+    id: page
     ListModel {
-        id: dataSource
+        id: model
         ListElement {
-            name: "January"
+            name: "palegoldenrod"
         }
         ListElement {
-            name: "February"
+            name: "lightsteelblue"
         }
     }
     Component {
         id: delegate
         Rectangle {
-            color: "red"
+            color: "thistle"
             width: 100
             height: 100
-            Text {
-                text: name
+            Rectangle {
+                anchors.centerIn: parent
+                width: 60
+                height: 60
+                color: name 
             }
         }
     }
-    Row {
-        Repeater {
-            model: dataSource
+    Column{
+        Repeater{
+            model: model
             delegate: delegate
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.0.png
deleted file mode 100644
index 2658b6b..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.qml
deleted file mode 100644
index d11a9dd..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.qml
+++ /dev/null
@@ -1,323 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 32
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 48
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 64
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 80
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 96
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 112
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 128
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 144
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 160
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 176
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 192
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 208
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 224
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 240
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 256
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 272
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 288
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 304
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 320
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 336
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 352
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 368
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 384
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 400
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 416
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 432
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 448
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 464
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 480
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 496
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 512
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 528
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 544
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 560
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 576
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 592
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 608
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 624
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 640
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 656
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 672
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 688
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 704
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 720
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 736
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 752
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 768
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 784
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 800
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 816
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 832
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 848
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 864
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 880
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 896
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 912
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 928
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 944
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 960
-        image: "basic1.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 992
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1008
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1024
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1040
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1056
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1072
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1088
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1104
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1120
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1136
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1152
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1168
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1184
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1216
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1232
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.0.png
deleted file mode 100644
index 2658b6b..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml
deleted file mode 100644
index 9b36f60..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml
+++ /dev/null
@@ -1,331 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 32
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 48
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 64
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 80
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 96
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 112
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 128
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 144
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 160
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 176
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 192
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 208
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 224
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 240
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 256
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 272
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 288
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 304
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 320
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 336
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 352
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 368
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 384
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 400
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 416
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 432
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 448
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 464
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 480
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 496
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 512
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 528
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 544
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 560
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 576
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 592
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 608
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 624
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 640
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 656
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 672
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 688
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 704
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 720
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 736
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 752
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 768
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 784
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 800
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 816
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 832
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 848
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 864
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 880
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 896
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 912
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 928
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 944
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 960
-        image: "basic2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 992
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1008
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1024
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1040
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1056
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1072
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1088
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1104
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1120
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1136
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1152
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1168
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1184
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1200
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1216
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1232
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1248
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1264
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.0.png
deleted file mode 100644
index 2658b6b..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.qml
deleted file mode 100644
index 9752b72..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.qml
+++ /dev/null
@@ -1,347 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 32
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 48
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 64
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 80
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 96
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 112
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 128
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 144
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 160
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 176
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 192
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 208
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 224
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 240
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 256
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 272
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 288
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 304
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 320
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 336
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 352
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 368
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 384
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 400
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 416
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 432
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 448
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 464
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 480
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 496
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 512
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 528
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 544
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 560
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 576
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 592
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 608
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 624
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 640
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 656
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 672
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 688
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 704
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 720
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 736
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 752
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 768
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 784
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 800
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 816
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 832
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 848
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 864
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 880
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 896
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 912
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 928
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 944
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 960
-        image: "basic3.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 992
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1008
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1024
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1040
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1056
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1072
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1088
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1104
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1120
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1136
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1152
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1168
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1184
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1200
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1216
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1232
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1248
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1264
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1280
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1296
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1312
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1328
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.0.png
deleted file mode 100644
index 2658b6b..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.qml
deleted file mode 100644
index 8492621..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.qml
+++ /dev/null
@@ -1,419 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 32
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 48
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 64
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 80
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 96
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 112
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 128
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 144
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 160
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 176
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 192
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 208
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 224
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 240
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 256
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 272
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 288
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 304
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 320
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 336
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 352
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 368
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 384
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 400
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 416
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 432
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 448
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 464
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 480
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 496
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 512
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 528
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 544
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 560
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 576
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 592
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 608
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 624
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 640
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 656
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 672
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 688
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 704
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 720
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 736
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 752
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 768
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 784
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 800
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 816
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 832
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 848
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 864
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 880
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 896
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 912
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 928
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 944
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 960
-        image: "basic4.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 992
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1008
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1024
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1040
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1056
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1072
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1088
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1104
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1120
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1136
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1152
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1168
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1184
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1200
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1216
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1232
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1248
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1264
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1280
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1296
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1312
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1328
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1344
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1360
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1376
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1392
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1408
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1424
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1440
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1456
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1472
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1488
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1504
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1520
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1536
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1552
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1568
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1584
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1600
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-    Frame {
-        msec: 1616
-        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.0.png
deleted file mode 100644
index 18ab543..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.qml
deleted file mode 100644
index f9880f8..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.qml
+++ /dev/null
@@ -1,323 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 32
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 48
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 64
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 80
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 96
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 112
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 128
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 144
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 160
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 176
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 192
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 208
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 224
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 240
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 256
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 272
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 288
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 304
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 320
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 336
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 352
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 368
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 384
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 400
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 416
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 432
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 448
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 464
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 480
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 496
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 512
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 528
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 544
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 560
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 576
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 592
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 608
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 624
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 640
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 656
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 672
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 688
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 704
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 720
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 736
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 752
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 768
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 784
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 800
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 816
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 832
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 848
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 864
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 880
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 896
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 912
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 928
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 944
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 960
-        image: "basic1.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 992
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1008
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1024
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1040
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1056
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1072
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1088
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1104
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1120
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1136
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1152
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1168
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1184
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1216
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1232
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.0.png
deleted file mode 100644
index 18ab543..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.qml
deleted file mode 100644
index cc980e1..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.qml
+++ /dev/null
@@ -1,331 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 32
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 48
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 64
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 80
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 96
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 112
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 128
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 144
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 160
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 176
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 192
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 208
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 224
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 240
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 256
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 272
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 288
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 304
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 320
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 336
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 352
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 368
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 384
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 400
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 416
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 432
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 448
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 464
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 480
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 496
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 512
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 528
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 544
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 560
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 576
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 592
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 608
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 624
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 640
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 656
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 672
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 688
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 704
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 720
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 736
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 752
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 768
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 784
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 800
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 816
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 832
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 848
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 864
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 880
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 896
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 912
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 928
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 944
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 960
-        image: "basic2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 992
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1008
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1024
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1040
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1056
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1072
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1088
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1104
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1120
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1136
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1152
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1168
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1184
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1200
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1216
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1232
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1248
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1264
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.0.png
deleted file mode 100644
index 18ab543..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.qml
deleted file mode 100644
index e395dde..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.qml
+++ /dev/null
@@ -1,347 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 32
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 48
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 64
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 80
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 96
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 112
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 128
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 144
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 160
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 176
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 192
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 208
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 224
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 240
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 256
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 272
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 288
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 304
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 320
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 336
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 352
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 368
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 384
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 400
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 416
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 432
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 448
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 464
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 480
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 496
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 512
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 528
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 544
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 560
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 576
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 592
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 608
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 624
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 640
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 656
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 672
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 688
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 704
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 720
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 736
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 752
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 768
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 784
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 800
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 816
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 832
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 848
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 864
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 880
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 896
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 912
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 928
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 944
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 960
-        image: "basic3.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 992
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1008
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1024
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1040
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1056
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1072
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1088
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1104
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1120
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1136
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1152
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1168
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1184
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1200
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1216
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1232
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1248
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1264
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1280
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1296
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1312
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1328
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.0.png
deleted file mode 100644
index 18ab543..0000000
Binary files a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.qml
deleted file mode 100644
index b0dc6b8..0000000
--- a/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.qml
+++ /dev/null
@@ -1,419 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 32
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 48
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 64
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 80
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 96
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 112
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 128
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 144
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 160
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 176
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 192
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 208
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 224
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 240
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 256
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 272
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 288
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 304
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 320
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 336
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 352
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 368
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 384
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 400
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 416
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 432
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 448
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 464
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 480
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 496
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 512
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 528
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 544
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 560
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 576
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 592
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 608
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 624
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 640
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 656
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 672
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 688
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 704
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 720
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 736
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 752
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 768
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 784
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 800
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 816
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 832
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 848
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 864
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 880
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 896
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 912
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 928
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 944
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 960
-        image: "basic4.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 992
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1008
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1024
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1040
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1056
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1072
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1088
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1104
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1120
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1136
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1152
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1168
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1184
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1200
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1216
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1232
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1248
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1264
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1280
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1296
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1312
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1328
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1344
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1360
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1376
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1392
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1408
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1424
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1440
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1456
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1472
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1488
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1504
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1520
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1536
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1552
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1568
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1584
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1600
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-    Frame {
-        msec: 1616
-        hash: "71dedc2f057c660fa5089de2dd6313a4"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic1.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic1.0.png
index aea0e98..3e8043a 100644
Binary files a/tests/auto/declarative/qmlvisual/repeater/data/basic1.0.png and b/tests/auto/declarative/qmlvisual/repeater/data/basic1.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic1.qml
index f0950d7..aad4858 100644
--- a/tests/auto/declarative/qmlvisual/repeater/data/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic1.qml
@@ -6,318 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 32
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 48
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 64
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 80
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 96
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 112
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 128
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 144
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 160
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 176
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 192
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 208
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 224
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 240
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 256
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 272
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 288
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 304
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 320
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 336
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 352
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 368
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 384
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 400
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 416
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 432
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 448
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 464
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 480
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 496
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 512
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 528
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 544
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 560
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 576
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 592
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 608
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 624
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 640
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 656
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 672
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 688
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 704
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 720
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 736
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 752
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 768
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 784
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 800
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 816
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 832
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 848
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 864
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 880
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 896
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 912
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 928
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 944
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 960
         image: "basic1.0.png"
     }
-    Frame {
-        msec: 976
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 992
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1008
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1024
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1040
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1056
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1072
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1088
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1104
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1120
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1136
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1152
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1168
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1184
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1216
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1232
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
 }
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic2.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic2.0.png
index aea0e98..3e8043a 100644
Binary files a/tests/auto/declarative/qmlvisual/repeater/data/basic2.0.png and b/tests/auto/declarative/qmlvisual/repeater/data/basic2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic2.qml
index fcf3fee..373ad27 100644
--- a/tests/auto/declarative/qmlvisual/repeater/data/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic2.qml
@@ -6,326 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 32
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 48
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 64
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 80
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 96
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 112
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 128
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 144
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 160
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 176
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 192
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 208
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 224
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 240
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 256
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 272
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 288
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 304
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 320
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 336
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 352
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 368
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 384
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 400
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 416
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 432
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 448
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 464
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 480
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 496
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 512
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 528
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 544
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 560
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 576
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 592
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 608
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 624
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 640
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 656
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 672
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 688
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 704
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 720
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 736
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 752
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 768
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 784
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 800
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 816
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 832
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 848
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 864
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 880
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 896
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 912
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 928
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 944
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 960
         image: "basic2.0.png"
     }
-    Frame {
-        msec: 976
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 992
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1008
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1024
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1040
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1056
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1072
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1088
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1104
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1120
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1136
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1152
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1168
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1184
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1200
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1216
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1232
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1248
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1264
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
 }
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic3.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic3.0.png
index aea0e98..3e8043a 100644
Binary files a/tests/auto/declarative/qmlvisual/repeater/data/basic3.0.png and b/tests/auto/declarative/qmlvisual/repeater/data/basic3.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic3.qml
index 8447aca..f5dbf65 100644
--- a/tests/auto/declarative/qmlvisual/repeater/data/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic3.qml
@@ -6,342 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 32
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 48
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 64
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 80
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 96
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 112
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 128
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 144
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 160
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 176
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 192
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 208
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 224
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 240
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 256
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 272
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 288
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 304
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 320
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 336
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 352
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 368
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 384
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 400
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 416
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 432
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 448
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 464
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 480
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 496
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 512
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 528
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 544
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 560
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 576
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 592
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 608
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 624
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 640
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 656
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 672
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 688
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 704
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 720
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 736
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 752
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 768
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 784
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 800
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 816
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 832
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 848
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 864
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 880
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 896
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 912
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 928
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 944
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 960
         image: "basic3.0.png"
     }
-    Frame {
-        msec: 976
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 992
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1008
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1024
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1040
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1056
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1072
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1088
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1104
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1120
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1136
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1152
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1168
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1184
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1200
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1216
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1232
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1248
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1264
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1280
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1296
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1312
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1328
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
 }
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic4.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic4.0.png
index aea0e98..3e8043a 100644
Binary files a/tests/auto/declarative/qmlvisual/repeater/data/basic4.0.png and b/tests/auto/declarative/qmlvisual/repeater/data/basic4.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/repeater/data/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic4.qml
index eeb60fa..5e494d1 100644
--- a/tests/auto/declarative/qmlvisual/repeater/data/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic4.qml
@@ -6,414 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 32
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 48
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 64
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 80
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 96
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 112
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 128
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 144
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 160
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 176
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 192
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 208
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 224
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 240
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 256
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 272
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 288
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 304
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 320
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 336
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 352
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 368
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 384
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 400
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 416
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 432
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 448
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 464
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 480
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 496
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 512
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 528
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 544
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 560
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 576
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 592
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 608
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 624
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 640
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 656
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 672
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 688
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 704
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 720
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 736
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 752
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 768
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 784
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 800
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 816
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 832
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 848
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 864
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 880
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 896
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 912
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 928
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 944
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 960
         image: "basic4.0.png"
     }
-    Frame {
-        msec: 976
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 992
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1008
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1024
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1040
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1056
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1072
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1088
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1104
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1120
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1136
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1152
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1168
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1184
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1200
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1216
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1232
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1248
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1264
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1280
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1296
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1312
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1328
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1344
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1360
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1376
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1392
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1408
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1424
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1440
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1456
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1472
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1488
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1504
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1520
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1536
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1552
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1568
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1584
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1600
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
-    Frame {
-        msec: 1616
-        hash: "539de20cf149353d2677111ea3de5681"
-    }
 }
-- 
cgit v0.12


From 8ba02a8f5a537b9f7e1ff671abe6eed67029db58 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 13:41:51 +1000
Subject: Disable WebView visualtests

Until this element is maintained, all tests are entering expectFail
state.

Task-number: QTBUG-14792
---
 .../qmlvisual/webview/autosize/data/autosize.qml   |  115 -
 .../webview/javascript/data/evaluateJavaScript.qml | 3759 --------------------
 .../webview/javascript/data/windowObjects.qml      | 2643 --------------
 .../qmlvisual/webview/settings/data/fontFamily.qml |  395 --
 .../qmlvisual/webview/settings/data/fontSize.qml   |  339 --
 .../webview/settings/data/noAutoLoadImages.qml     |  595 ----
 .../webview/settings/data/setFontFamily.qml        |  351 --
 .../qmlvisual/webview/zooming/data/pageWidth.qml   |  227 --
 .../webview/zooming/data/renderControl.qml         |  415 ---
 .../qmlvisual/webview/zooming/data/resolution.qml  | 1319 -------
 .../webview/zooming/data/zoomTextOnly.qml          |  655 ----
 .../qmlvisual/webview/zooming/data/zooming.qml     | 2115 -----------
 12 files changed, 12928 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml

diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
deleted file mode 100644
index 6122138..0000000
--- a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b2d863e57dee2a297d038e18acc70f92"
-    }
-    Frame {
-        msec: 32
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 48
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 64
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 80
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 96
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 112
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 128
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 144
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 160
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 176
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 192
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 208
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 224
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 240
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 256
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 272
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 288
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 304
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 320
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 336
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 352
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 368
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 384
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 400
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 416
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 432
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
deleted file mode 100644
index bfe40da..0000000
--- a/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
+++ /dev/null
@@ -1,3759 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 32
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 48
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 64
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 80
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 96
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 112
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 128
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 144
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 160
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 176
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 192
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 208
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 224
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 240
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 256
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 272
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 288
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 304
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 320
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 336
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 352
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 368
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 384
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 400
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 416
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 195; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 187; y: 35
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 432
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 153; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 448
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 145; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 139; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 464
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 135; y: 111
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 129; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 480
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 125; y: 131
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 121; y: 139
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 117; y: 149
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 496
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 111; y: 157
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 512
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 107; y: 165
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 101; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 528
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 97; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 95; y: 185
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 544
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 89; y: 195
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 560
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 85; y: 199
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 201
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 576
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 203
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 81; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 592
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 80; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 608
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 79; y: 205
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 78; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 624
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 77; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 76; y: 208
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 75; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 640
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 71; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 656
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 218
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 220
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 672
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 69; y: 222
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 68; y: 224
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 688
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 67; y: 225
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 704
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 720
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 736
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 752
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 768
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 784
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 67; y: 225
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 800
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 66; y: 224
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 816
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 66; y: 222
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 832
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 65; y: 221
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 61; y: 217
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 848
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 60; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 864
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 59; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 880
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 55; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 896
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 912
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 928
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 944
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 960
-        image: "evaluateJavaScript.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 992
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1008
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 55; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1024
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1040
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1056
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1072
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1088
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 55; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1104
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1120
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1136
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1152
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1168
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1184
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1200
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1216
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1232
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1248
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1264
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1280
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1296
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 212
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1312
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 65; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 67; y: 209
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1328
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 69; y: 208
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 71; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1344
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 73; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 75; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1360
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1376
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1392
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1408
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1424
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1440
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1456
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1472
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1488
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1504
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1520
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1536
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1552
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1568
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1584
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1600
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1616
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1632
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1648
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1664
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1680
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Frame {
-        msec: 1696
-        hash: "f35c69aed43a795ff02b46d7b01ef64a"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1712
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1728
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1744
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1760
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1776
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1792
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1808
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1824
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1840
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1856
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1872
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1888
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1904
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1920
-        image: "evaluateJavaScript.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1952
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Frame {
-        msec: 1968
-        hash: "244200622435603a75f58366496daf8b"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1984
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2000
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2016
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2032
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2048
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2064
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2080
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2096
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2112
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2128
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2144
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2160
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2176
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Frame {
-        msec: 2192
-        hash: "44dc10a2914a391b57e68c2002a95adf"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2208
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2224
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2240
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2256
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2288
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2304
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2320
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2336
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2352
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2368
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2384
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2400
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Frame {
-        msec: 2416
-        hash: "c93921d0611e95373338c14cfcc17481"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2432
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2448
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2464
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2480
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2496
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2512
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2528
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2544
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2560
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2576
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2592
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2608
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2624
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2640
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2656
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2672
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2688
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2704
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2720
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2736
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2752
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2768
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2784
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2800
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2816
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2832
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2848
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2864
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2880
-        image: "evaluateJavaScript.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2912
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2928
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2944
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2960
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2976
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 2992
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3008
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3024
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3040
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3056
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3072
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3088
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3104
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3120
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3136
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3152
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3168
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3184
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3200
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3216
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3232
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3248
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3264
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3280
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3296
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3312
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3328
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 72; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3344
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 68; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 65; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3360
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3376
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 61; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 59; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3392
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 55; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3408
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 54; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 53; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3424
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3440
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3456
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3472
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3488
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3504
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Frame {
-        msec: 3520
-        hash: "9266775c7f2156977ff56fcd45246229"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 52; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 52; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3536
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3552
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3568
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3584
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3600
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3616
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3632
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3648
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 52; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3664
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3680
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3696
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3712
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3728
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3744
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3760
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3776
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3792
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3808
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3824
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3840
-        image: "evaluateJavaScript.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3872
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3888
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3904
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3920
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3936
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3952
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3968
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Frame {
-        msec: 3984
-        hash: "b62d9027299daa6ab8304d812ed00f83"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4000
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4016
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4032
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4048
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4064
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4080
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4096
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4112
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4128
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4144
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4160
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4176
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4192
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4208
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4224
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4240
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4256
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4272
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4288
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4304
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4320
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4336
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4352
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4368
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4384
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4400
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4416
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4432
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4448
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4464
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4480
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4496
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4512
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4528
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4544
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4560
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4576
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4592
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4608
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4624
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4640
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4656
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4672
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4688
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4704
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4720
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4736
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4752
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4768
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Frame {
-        msec: 4784
-        hash: "6cea5b700e402072a9953c81b605ef22"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4800
-        image: "evaluateJavaScript.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4832
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4848
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4864
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4880
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4896
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4912
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4928
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4944
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4960
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4976
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 4992
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5008
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5024
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5040
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5056
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5072
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5088
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5104
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5120
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5136
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5152
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5168
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5184
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5200
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5216
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5232
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5248
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5264
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5280
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5296
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5312
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5328
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5344
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5360
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5376
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5392
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5408
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5424
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5440
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5456
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5472
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5488
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5504
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5520
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5536
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5552
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5568
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5584
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5600
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5616
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5632
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5648
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5664
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5680
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5696
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5712
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5728
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5744
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5760
-        image: "evaluateJavaScript.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5792
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5808
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 5824
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 54; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5840
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 56; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 65; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5856
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 71; y: 202
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 79; y: 200
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5872
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 200
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 90; y: 196
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5888
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 102; y: 188
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5904
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 108; y: 182
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 112; y: 176
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5920
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 116; y: 168
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 120; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5936
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 124; y: 148
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 128; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5952
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 130; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 134; y: 112
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5968
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 138; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 142; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 150; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 154; y: 62
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 158; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 162; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 166; y: 44
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 168; y: 38
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 172; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 174; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 176; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 177; y: 18
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 16
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 14
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 12
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 11
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 10
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 179; y: 9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 180; y: 7
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 181; y: 5
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 181; y: 4
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 182; y: 2
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 183; y: 1
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6208
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6224
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6240
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6256
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6272
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6288
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6304
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6320
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6336
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6352
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6368
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6384
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6400
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6416
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6432
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6448
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6464
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6480
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6496
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6512
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6528
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6544
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6560
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6576
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6592
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6608
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6624
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6640
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6656
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6672
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6688
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6704
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6720
-        image: "evaluateJavaScript.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6752
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6768
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6784
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6800
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6816
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6832
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6848
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6864
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 176; y: 1
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 174; y: 15
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 172; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 166; y: 47
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 162; y: 63
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6896
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 156; y: 81
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 150; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6912
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 107
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 138; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6928
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 132; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 126; y: 133
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6944
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 122; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 120; y: 138
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6960
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 120; y: 139
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6976
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 6992
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7008
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7024
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7040
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7056
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7072
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 119; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7088
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7104
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7120
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 117; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7136
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 116; y: 139
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 115; y: 141
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7152
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 113; y: 149
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 109; y: 155
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7168
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 107; y: 165
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 103; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7184
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 99; y: 179
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 98; y: 181
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7200
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 187
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 95; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7216
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 95; y: 190
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7232
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7248
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7264
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7280
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 188
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7296
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 187
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 186
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 185
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 97; y: 184
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 97; y: 183
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 97; y: 182
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 98; y: 180
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 98; y: 178
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 99; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 99; y: 176
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 99; y: 174
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7392
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7408
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 100; y: 172
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 100; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 100; y: 170
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7440
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 100; y: 169
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 101; y: 167
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7488
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7504
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 101; y: 167
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Frame {
-        msec: 7536
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Frame {
-        msec: 7552
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Frame {
-        msec: 7568
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Frame {
-        msec: 7584
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Frame {
-        msec: 7600
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Frame {
-        msec: 7616
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Frame {
-        msec: 7632
-        hash: "04e2e16813a9cafc37077a675e279f5f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 166
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 101; y: 166
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7648
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7664
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7680
-        image: "evaluateJavaScript.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7712
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7728
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7744
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7760
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7776
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7792
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7808
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7824
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 103; y: 166
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7840
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 7856
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 166
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7872
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 106; y: 165
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 107; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 108; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 109; y: 163
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 111; y: 163
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 112; y: 162
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 116; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7936
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 118; y: 157
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 122; y: 153
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7952
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 128; y: 147
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 134; y: 139
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7968
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 140; y: 133
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 146; y: 125
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 150; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7984
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 156; y: 109
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 160; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8000
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 164; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 166; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8016
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 170; y: 67
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 172; y: 55
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8032
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 176; y: 45
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8048
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 35
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 27
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 180; y: 19
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8064
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 180; y: 11
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 182; y: 5
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8080
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8096
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8112
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8128
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8144
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8160
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8176
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8192
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8208
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8224
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8240
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8256
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8272
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8288
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8304
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8320
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8336
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8352
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8368
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8384
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8400
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8416
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8432
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8448
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8464
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8480
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8496
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8512
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8528
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8544
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8560
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8576
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8592
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8608
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8624
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8640
-        image: "evaluateJavaScript.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-    Frame {
-        msec: 8672
-        hash: "792140067e09d04b31e78be1fc9a40a2"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
deleted file mode 100644
index 07aa13d..0000000
--- a/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
+++ /dev/null
@@ -1,2643 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 32
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 48
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 64
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 80
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 96
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 112
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 128
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 144
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 160
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 176
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 192
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 208
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 224
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 240
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 256
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 272
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 288
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 304
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 320
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 336
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 352
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 368
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 384
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 400
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 416
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 432
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 448
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 464
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 480
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 496
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 512
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 528
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 544
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 560
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 576
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 592
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 608
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 624
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 640
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 656
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 672
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 688
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 704
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 720
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 736
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 752
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 768
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 784
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 800
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 816
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 832
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 848
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 864
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 880
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 896
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 912
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 928
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 944
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 960
-        image: "windowObjects.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 992
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1008
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1024
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1040
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 155; y: 9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 145; y: 23
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1056
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 137; y: 37
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 127; y: 53
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1072
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 119; y: 67
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 111; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1088
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 103; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1104
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 97; y: 93
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 87; y: 109
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1120
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 81; y: 125
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1136
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 81; y: 133
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 79; y: 139
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1152
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 79; y: 142
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 79; y: 145
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1168
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 78; y: 146
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 78; y: 147
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1184
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1200
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1216
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1232
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1248
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 143
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1264
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1280
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 142
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 141
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 139
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1296
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 85; y: 138
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1312
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1328
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1344
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 86; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 87; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1360
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 88; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1376
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 89; y: 138
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 89; y: 139
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1392
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 90; y: 141
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 90; y: 142
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1408
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 144
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1424
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 146
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 148
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 149
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1440
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 151
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 153
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1456
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 90; y: 154
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 90; y: 155
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1472
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 89; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1488
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1504
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1520
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1536
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1552
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1568
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1584
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1600
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1616
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1632
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1648
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1664
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1680
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1696
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1712
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1728
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1744
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1760
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1776
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1792
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1808
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1824
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1840
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1856
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1872
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1888
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1904
-        hash: "b1a19797afefa71e30f4594064aa4951"
-    }
-    Frame {
-        msec: 1920
-        image: "windowObjects.1.png"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 89; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1936
-        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
-    }
-    Frame {
-        msec: 1952
-        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
-    }
-    Frame {
-        msec: 1968
-        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
-    }
-    Frame {
-        msec: 1984
-        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
-    }
-    Frame {
-        msec: 2000
-        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
-    }
-    Frame {
-        msec: 2016
-        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 89; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2032
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2048
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2064
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2080
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2096
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2112
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2128
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2144
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2160
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2176
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2192
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2208
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2224
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2240
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2256
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2272
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2288
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 89; y: 157
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 88; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 87; y: 160
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2304
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 87; y: 161
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 167
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2320
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 169
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 80; y: 175
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2336
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 78; y: 183
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2352
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 72; y: 195
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 68; y: 201
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2368
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 64; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2384
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 61; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 59; y: 221
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2400
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 58; y: 222
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 224
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2416
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2432
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2448
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2464
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2480
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2496
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2512
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2528
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2544
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2560
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2576
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2592
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2608
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2624
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2640
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2656
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2672
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2688
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2704
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2720
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2736
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 49; y: 225
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 50; y: 224
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2752
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 50; y: 223
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2768
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 51; y: 222
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2784
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 51; y: 221
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 52; y: 220
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2800
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 52; y: 218
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2816
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 53; y: 217
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2832
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2848
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2864
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 54; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2880
-        image: "windowObjects.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 55; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2912
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2928
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 56; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2944
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2960
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 2976
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 57; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2992
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3008
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3024
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3040
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3056
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3072
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3088
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3104
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 57; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3120
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3136
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3152
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3168
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3184
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3200
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3216
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Frame {
-        msec: 3232
-        hash: "6927f81ca01ef75d204994aa82c60c4d"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3248
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3264
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3280
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3296
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3312
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3328
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3344
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3360
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 212
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3376
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3392
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Frame {
-        msec: 3408
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3424
-        hash: "2165224e8f66a797ae5c991462fb56d8"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3440
-        hash: "c6ac7e0be8b7b2a80966344389def97a"
-    }
-    Frame {
-        msec: 3456
-        hash: "c6ac7e0be8b7b2a80966344389def97a"
-    }
-    Frame {
-        msec: 3472
-        hash: "c6ac7e0be8b7b2a80966344389def97a"
-    }
-    Frame {
-        msec: 3488
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Frame {
-        msec: 3504
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3520
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Frame {
-        msec: 3536
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Frame {
-        msec: 3552
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Frame {
-        msec: 3568
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Frame {
-        msec: 3584
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Frame {
-        msec: 3600
-        hash: "40f333072bb9f1d334d5ae432d9641b9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 58; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3616
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 60; y: 209
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 61; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3632
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 205
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3648
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 203
-        modifiers: 0
-        sendToViewport: true
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3664
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 202
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 64; y: 200
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3680
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3696
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 65; y: 198
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 66; y: 197
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 67; y: 195
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3712
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 68; y: 194
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 69; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3728
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 190
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 188
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3744
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 186
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 185
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3760
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 71; y: 183
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 71; y: 181
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3776
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 72; y: 179
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 73; y: 178
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3792
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 73; y: 176
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 73; y: 175
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3808
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 174
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 173
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3824
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 172
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3840
-        image: "windowObjects.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3872
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3888
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3904
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3920
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 75; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 76; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3936
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3952
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3968
-        hash: "96f727ef0dacfda9ea77fb5651493030"
-    }
-    Frame {
-        msec: 3984
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Frame {
-        msec: 4000
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Frame {
-        msec: 4016
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Frame {
-        msec: 4032
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 76; y: 170
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4048
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 77; y: 169
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 78; y: 168
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4064
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 79; y: 168
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4080
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 81; y: 167
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 81; y: 166
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4096
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 165
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4112
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4128
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Frame {
-        msec: 4144
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Frame {
-        msec: 4160
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Frame {
-        msec: 4176
-        hash: "ed7b3d93d690df73be5cbee8c41a1931"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 83; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4192
-        hash: "5b3505be865f704640e81cea092d35ba"
-    }
-    Frame {
-        msec: 4208
-        hash: "5b3505be865f704640e81cea092d35ba"
-    }
-    Frame {
-        msec: 4224
-        hash: "5b3505be865f704640e81cea092d35ba"
-    }
-    Frame {
-        msec: 4240
-        hash: "5b3505be865f704640e81cea092d35ba"
-    }
-    Frame {
-        msec: 4256
-        hash: "5b3505be865f704640e81cea092d35ba"
-    }
-    Frame {
-        msec: 4272
-        hash: "5b3505be865f704640e81cea092d35ba"
-    }
-    Frame {
-        msec: 4288
-        hash: "5b3505be865f704640e81cea092d35ba"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 83; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4304
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4320
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4336
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4352
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4368
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4384
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4400
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4416
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4432
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4448
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4464
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 85; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 85; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4480
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 86; y: 154
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 86; y: 152
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4496
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 87; y: 150
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 89; y: 144
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4512
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 93; y: 138
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 99; y: 134
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4528
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 101; y: 128
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 122
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4544
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 109; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 113; y: 108
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4560
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 114; y: 106
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 114; y: 105
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4576
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 115; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 115; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4592
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 115; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 116; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4608
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 120; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 122; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4624
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 126; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 130; y: 66
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4640
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 132; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 134; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4656
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 136; y: 38
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 138; y: 30
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4672
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 140; y: 22
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 141; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4688
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 143; y: 14
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 12
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4704
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 11
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4720
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 7
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 6
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4736
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 143; y: 4
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 143; y: 2
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4752
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 143; y: 1
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4768
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4784
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4800
-        image: "windowObjects.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4832
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4848
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4864
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4880
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4896
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4912
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4928
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4944
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4960
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4976
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 4992
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5008
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5024
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5040
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5056
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5072
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5088
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5104
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5120
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5136
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5152
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5168
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5184
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5200
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5216
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5232
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5248
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5264
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5280
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5296
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5312
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5328
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5344
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5360
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5376
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5392
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5408
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5424
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5440
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5456
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5472
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5488
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5504
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5520
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5536
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5552
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5568
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-    Frame {
-        msec: 5584
-        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
deleted file mode 100644
index 34d1116..0000000
--- a/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
+++ /dev/null
@@ -1,395 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 32
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 48
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 64
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 80
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 96
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 112
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 128
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 144
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 160
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 176
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 192
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 208
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 224
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 240
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 256
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 272
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 288
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 304
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 320
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 336
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 352
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 368
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 384
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 400
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 416
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 432
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 448
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 464
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 480
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 496
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 512
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 528
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 544
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 560
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 576
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 592
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 608
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 624
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 640
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 656
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 672
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 688
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 196; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 194; y: 19
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 190; y: 13
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 704
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 720
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 736
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 752
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 768
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 784
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 800
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 816
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 832
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 848
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 864
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 880
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 896
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 912
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 928
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 944
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 960
-        image: "fontFamily.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 992
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1008
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1024
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1040
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1056
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1072
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1088
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1104
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1120
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1136
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1152
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1168
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1184
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1200
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1216
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1232
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1248
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1264
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1280
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1296
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1312
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1328
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1344
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1360
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1376
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1392
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1408
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1424
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1440
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-    Frame {
-        msec: 1456
-        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
deleted file mode 100644
index efe3875..0000000
--- a/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
+++ /dev/null
@@ -1,339 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 32
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 48
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 64
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 80
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 96
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 112
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 128
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 144
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 160
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 176
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 192
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 208
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 224
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 240
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 256
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 272
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 288
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 304
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 320
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 336
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 352
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 368
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 384
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 400
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 416
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 432
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 448
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 464
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 480
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 496
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 512
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 528
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 544
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 560
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 576
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 592
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 608
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 624
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 640
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 656
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 672
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 688
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 704
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 720
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 736
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 752
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 768
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 784
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 800
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 816
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 832
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 848
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 864
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 880
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 896
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 912
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 928
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 944
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 960
-        image: "fontSize.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 992
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1008
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1024
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1040
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1056
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1072
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1088
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1104
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1120
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1136
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1152
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1168
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1184
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1200
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1216
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1232
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1248
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1264
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1280
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1296
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1312
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-    Frame {
-        msec: 1328
-        hash: "962e77f522956d38f3b1b890df749f0a"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
deleted file mode 100644
index 624a16b..0000000
--- a/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
+++ /dev/null
@@ -1,595 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 32
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 48
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 64
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 80
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 96
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 112
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 128
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 144
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 160
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 176
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 192
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 208
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 224
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 240
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 256
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 272
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 288
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 304
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 320
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 336
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 352
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 368
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 384
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 400
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 416
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 432
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 448
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 464
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 480
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 496
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 512
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 528
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 544
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 560
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 576
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 592
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 608
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 624
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 640
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 656
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 672
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 688
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 704
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 720
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 736
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 752
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 768
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 784
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 800
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 816
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 832
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 848
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 864
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 880
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 896
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 912
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 928
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 944
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 960
-        image: "noAutoLoadImages.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 992
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1008
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1024
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1040
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1056
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1072
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1088
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1104
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1120
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1136
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1152
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1168
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1184
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1200
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1216
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1232
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1248
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1264
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1280
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1296
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1312
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1328
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1344
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1360
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1376
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1392
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1408
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1424
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1440
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1456
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1472
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1488
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1504
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1520
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1536
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1552
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1568
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1584
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1600
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1616
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1632
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1648
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1664
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1680
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1696
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1712
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1728
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1744
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1760
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1776
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1792
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1808
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1824
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1840
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1856
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1872
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1888
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1904
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1920
-        image: "noAutoLoadImages.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1952
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1968
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 1984
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2000
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2016
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2032
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2048
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2064
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2080
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2096
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2112
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2128
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2144
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2160
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2176
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2192
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2208
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2224
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2240
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2256
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2272
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2288
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2304
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2320
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2336
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-    Frame {
-        msec: 2352
-        hash: "5146cfbeefc51268eca7717d84775750"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
deleted file mode 100644
index 414d64f..0000000
--- a/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
+++ /dev/null
@@ -1,351 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 32
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 48
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 64
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 80
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 96
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 112
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 128
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 144
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 160
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 176
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 192
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 208
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 224
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 240
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 256
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 272
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 288
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 304
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 320
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 336
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 352
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 368
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 384
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 400
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 416
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 432
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 448
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 464
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 480
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 496
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 512
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 528
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 544
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 560
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 576
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 592
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 608
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 624
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 640
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 656
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 672
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 688
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 704
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 720
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 736
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 752
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 768
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 784
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 800
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 816
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 832
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 848
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 864
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 880
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 896
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 912
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 928
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 944
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 960
-        image: "setFontFamily.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 992
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1008
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1024
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1040
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1056
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1072
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1088
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1104
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1120
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1136
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1152
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1168
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1184
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1200
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1216
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1232
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1248
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1264
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1280
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1296
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1312
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1328
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1344
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1360
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-    Frame {
-        msec: 1376
-        hash: "7ef8bb83c146898bd75de8951a932b58"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
deleted file mode 100644
index 2e60b7f..0000000
--- a/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
+++ /dev/null
@@ -1,227 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 32
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 48
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 64
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 80
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 96
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 112
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 128
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 144
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 160
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 176
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 192
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 208
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 224
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 240
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 256
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 272
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 288
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 304
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 320
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 336
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 352
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 368
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 384
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 400
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 416
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 432
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 448
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 464
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 480
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 496
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 512
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 528
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 544
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 560
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 576
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 592
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 608
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 624
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 640
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 656
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 672
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 688
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 704
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 720
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 736
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 752
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 768
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 784
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 800
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 816
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 832
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 848
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 864
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-    Frame {
-        msec: 880
-        hash: "9a2554b1b322ea71115fa91d0100d2ff"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
deleted file mode 100644
index 464e009..0000000
--- a/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
+++ /dev/null
@@ -1,415 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
-    }
-    Frame {
-        msec: 32
-        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
-    }
-    Frame {
-        msec: 48
-        hash: "19d5f48f1c73d52483be96c887d3fd76"
-    }
-    Frame {
-        msec: 64
-        hash: "9b85eef4e0746cc43aaefd442efdd824"
-    }
-    Frame {
-        msec: 80
-        hash: "fca0034fb720e40198ede95a0ab0fadb"
-    }
-    Frame {
-        msec: 96
-        hash: "9f63ddbd927a4b08242f3410a9ed7283"
-    }
-    Frame {
-        msec: 112
-        hash: "4f5804c3c3ee195470a462293307cfd5"
-    }
-    Frame {
-        msec: 128
-        hash: "d0434f08a8097b97b76c1194317a38ba"
-    }
-    Frame {
-        msec: 144
-        hash: "921880d300e56f9605923a13fcd8b967"
-    }
-    Frame {
-        msec: 160
-        hash: "f5dc87abf36332c68fd4450a6236dcb4"
-    }
-    Frame {
-        msec: 176
-        hash: "c54f220cd5768afa1c12579007e17eff"
-    }
-    Frame {
-        msec: 192
-        hash: "e1c70c3896d5a937296f205b09991b31"
-    }
-    Frame {
-        msec: 208
-        hash: "d135f70f761add1358062a0386c62d18"
-    }
-    Frame {
-        msec: 224
-        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
-    }
-    Frame {
-        msec: 240
-        hash: "2ff4feb61d958a800b38b282c3400293"
-    }
-    Frame {
-        msec: 256
-        hash: "59f5585ec472efa29c5eba8b972ab3bd"
-    }
-    Frame {
-        msec: 272
-        hash: "3aef5e1ff6da15e0e9f2e620dbabbab2"
-    }
-    Frame {
-        msec: 288
-        hash: "2931299f667752efe9fca727534385e1"
-    }
-    Frame {
-        msec: 304
-        hash: "2ed90e61c41b994ccea924191b66fc71"
-    }
-    Frame {
-        msec: 320
-        hash: "1424c634067c896973c2c10793957933"
-    }
-    Frame {
-        msec: 336
-        hash: "c4d30d511053a7caeefdae753236cf5b"
-    }
-    Frame {
-        msec: 352
-        hash: "32300e07e34e8f316770c790a5ef9f6d"
-    }
-    Frame {
-        msec: 368
-        hash: "95312dc2a4d88a48605fea170712354d"
-    }
-    Frame {
-        msec: 384
-        hash: "3d146357d1532640cefb64fbae75bc0d"
-    }
-    Frame {
-        msec: 400
-        hash: "5b78740511a456a3647d8392b2008f7f"
-    }
-    Frame {
-        msec: 416
-        hash: "dddb065cefa27a862d108429c9984191"
-    }
-    Frame {
-        msec: 432
-        hash: "0857067a0ee381e0f462ef8aceb0b696"
-    }
-    Frame {
-        msec: 448
-        hash: "1f5e7e064cc62ff2e0585c98875351df"
-    }
-    Frame {
-        msec: 464
-        hash: "c7f6bb852bdb2b99cbb5a8ca34f1585a"
-    }
-    Frame {
-        msec: 480
-        hash: "f2284dea5812f167cae08c687fc1a3e9"
-    }
-    Frame {
-        msec: 496
-        hash: "deec54bc32c46921e5032bce7daa1dad"
-    }
-    Frame {
-        msec: 512
-        hash: "1271d3704de17bfe463c76fd73c3132b"
-    }
-    Frame {
-        msec: 528
-        hash: "0568b0ecd47cd1c34b9de477e68e5751"
-    }
-    Frame {
-        msec: 544
-        hash: "f070dd88e42697a9e43573f9f41b3540"
-    }
-    Frame {
-        msec: 560
-        hash: "f5ced2827b06ea514f05866f1e4099f0"
-    }
-    Frame {
-        msec: 576
-        hash: "59f5585ec472efa29c5eba8b972ab3bd"
-    }
-    Frame {
-        msec: 592
-        hash: "2ff4feb61d958a800b38b282c3400293"
-    }
-    Frame {
-        msec: 608
-        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
-    }
-    Frame {
-        msec: 624
-        hash: "d135f70f761add1358062a0386c62d18"
-    }
-    Frame {
-        msec: 640
-        hash: "e1c70c3896d5a937296f205b09991b31"
-    }
-    Frame {
-        msec: 656
-        hash: "c54f220cd5768afa1c12579007e17eff"
-    }
-    Frame {
-        msec: 672
-        hash: "f5dc87abf36332c68fd4450a6236dcb4"
-    }
-    Frame {
-        msec: 688
-        hash: "921880d300e56f9605923a13fcd8b967"
-    }
-    Frame {
-        msec: 704
-        hash: "d0434f08a8097b97b76c1194317a38ba"
-    }
-    Frame {
-        msec: 720
-        hash: "4f5804c3c3ee195470a462293307cfd5"
-    }
-    Frame {
-        msec: 736
-        hash: "9f63ddbd927a4b08242f3410a9ed7283"
-    }
-    Frame {
-        msec: 752
-        hash: "fca0034fb720e40198ede95a0ab0fadb"
-    }
-    Frame {
-        msec: 768
-        hash: "9b85eef4e0746cc43aaefd442efdd824"
-    }
-    Frame {
-        msec: 784
-        hash: "19d5f48f1c73d52483be96c887d3fd76"
-    }
-    Frame {
-        msec: 800
-        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
-    }
-    Frame {
-        msec: 816
-        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
-    }
-    Frame {
-        msec: 832
-        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
-    }
-    Frame {
-        msec: 848
-        hash: "19d5f48f1c73d52483be96c887d3fd76"
-    }
-    Frame {
-        msec: 864
-        hash: "9b85eef4e0746cc43aaefd442efdd824"
-    }
-    Frame {
-        msec: 880
-        hash: "fca0034fb720e40198ede95a0ab0fadb"
-    }
-    Frame {
-        msec: 896
-        hash: "9f63ddbd927a4b08242f3410a9ed7283"
-    }
-    Frame {
-        msec: 912
-        hash: "4f5804c3c3ee195470a462293307cfd5"
-    }
-    Frame {
-        msec: 928
-        hash: "d0434f08a8097b97b76c1194317a38ba"
-    }
-    Frame {
-        msec: 944
-        hash: "921880d300e56f9605923a13fcd8b967"
-    }
-    Frame {
-        msec: 960
-        image: "renderControl.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "c54f220cd5768afa1c12579007e17eff"
-    }
-    Frame {
-        msec: 992
-        hash: "e1c70c3896d5a937296f205b09991b31"
-    }
-    Frame {
-        msec: 1008
-        hash: "d135f70f761add1358062a0386c62d18"
-    }
-    Frame {
-        msec: 1024
-        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
-    }
-    Frame {
-        msec: 1040
-        hash: "2ff4feb61d958a800b38b282c3400293"
-    }
-    Frame {
-        msec: 1056
-        hash: "59f5585ec472efa29c5eba8b972ab3bd"
-    }
-    Frame {
-        msec: 1072
-        hash: "3aef5e1ff6da15e0e9f2e620dbabbab2"
-    }
-    Frame {
-        msec: 1088
-        hash: "2931299f667752efe9fca727534385e1"
-    }
-    Frame {
-        msec: 1104
-        hash: "2ed90e61c41b994ccea924191b66fc71"
-    }
-    Frame {
-        msec: 1120
-        hash: "1424c634067c896973c2c10793957933"
-    }
-    Frame {
-        msec: 1136
-        hash: "c4d30d511053a7caeefdae753236cf5b"
-    }
-    Frame {
-        msec: 1152
-        hash: "32300e07e34e8f316770c790a5ef9f6d"
-    }
-    Frame {
-        msec: 1168
-        hash: "95312dc2a4d88a48605fea170712354d"
-    }
-    Frame {
-        msec: 1184
-        hash: "3d146357d1532640cefb64fbae75bc0d"
-    }
-    Frame {
-        msec: 1200
-        hash: "5b78740511a456a3647d8392b2008f7f"
-    }
-    Frame {
-        msec: 1216
-        hash: "dddb065cefa27a862d108429c9984191"
-    }
-    Frame {
-        msec: 1232
-        hash: "0857067a0ee381e0f462ef8aceb0b696"
-    }
-    Frame {
-        msec: 1248
-        hash: "1f5e7e064cc62ff2e0585c98875351df"
-    }
-    Frame {
-        msec: 1264
-        hash: "c7f6bb852bdb2b99cbb5a8ca34f1585a"
-    }
-    Frame {
-        msec: 1280
-        hash: "f2284dea5812f167cae08c687fc1a3e9"
-    }
-    Frame {
-        msec: 1296
-        hash: "deec54bc32c46921e5032bce7daa1dad"
-    }
-    Frame {
-        msec: 1312
-        hash: "1271d3704de17bfe463c76fd73c3132b"
-    }
-    Frame {
-        msec: 1328
-        hash: "0568b0ecd47cd1c34b9de477e68e5751"
-    }
-    Frame {
-        msec: 1344
-        hash: "f070dd88e42697a9e43573f9f41b3540"
-    }
-    Frame {
-        msec: 1360
-        hash: "f5ced2827b06ea514f05866f1e4099f0"
-    }
-    Frame {
-        msec: 1376
-        hash: "59f5585ec472efa29c5eba8b972ab3bd"
-    }
-    Frame {
-        msec: 1392
-        hash: "2ff4feb61d958a800b38b282c3400293"
-    }
-    Frame {
-        msec: 1408
-        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
-    }
-    Frame {
-        msec: 1424
-        hash: "d135f70f761add1358062a0386c62d18"
-    }
-    Frame {
-        msec: 1440
-        hash: "e1c70c3896d5a937296f205b09991b31"
-    }
-    Frame {
-        msec: 1456
-        hash: "c54f220cd5768afa1c12579007e17eff"
-    }
-    Frame {
-        msec: 1472
-        hash: "f5dc87abf36332c68fd4450a6236dcb4"
-    }
-    Frame {
-        msec: 1488
-        hash: "921880d300e56f9605923a13fcd8b967"
-    }
-    Frame {
-        msec: 1504
-        hash: "d0434f08a8097b97b76c1194317a38ba"
-    }
-    Frame {
-        msec: 1520
-        hash: "4f5804c3c3ee195470a462293307cfd5"
-    }
-    Frame {
-        msec: 1536
-        hash: "9f63ddbd927a4b08242f3410a9ed7283"
-    }
-    Frame {
-        msec: 1552
-        hash: "fca0034fb720e40198ede95a0ab0fadb"
-    }
-    Frame {
-        msec: 1568
-        hash: "9b85eef4e0746cc43aaefd442efdd824"
-    }
-    Frame {
-        msec: 1584
-        hash: "19d5f48f1c73d52483be96c887d3fd76"
-    }
-    Frame {
-        msec: 1600
-        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
-    }
-    Frame {
-        msec: 1616
-        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
-    }
-    Frame {
-        msec: 1632
-        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
deleted file mode 100644
index edf8040..0000000
--- a/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
+++ /dev/null
@@ -1,1319 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "ac1d9c1cc13813b5e94c692a209a4e36"
-    }
-    Frame {
-        msec: 32
-        hash: "1f189a436cf74ae83a03c3bb63c24ec2"
-    }
-    Frame {
-        msec: 48
-        hash: "369f761053d5910e00672aa866f698ba"
-    }
-    Frame {
-        msec: 64
-        hash: "30a191ae899121ae22d10acee6593415"
-    }
-    Frame {
-        msec: 80
-        hash: "7af041898748bb5950643b057ca59eea"
-    }
-    Frame {
-        msec: 96
-        hash: "e0a2ed91e78ff9a994deb9649a8afc16"
-    }
-    Frame {
-        msec: 112
-        hash: "649ad1a3fb57fb088e4e5cfd749bf2e5"
-    }
-    Frame {
-        msec: 128
-        hash: "9053a92e343ebb79bd2831f5ab94a1b5"
-    }
-    Frame {
-        msec: 144
-        hash: "dc78b09e27bbc0a2cfec83436eef4446"
-    }
-    Frame {
-        msec: 160
-        hash: "2aaa3749f93734dd203e1fea91a9f24a"
-    }
-    Frame {
-        msec: 176
-        hash: "8df8dd33eada434231332b81e03430ce"
-    }
-    Frame {
-        msec: 192
-        hash: "b5b1beb4dd4720eaa8b888fbef1ba875"
-    }
-    Frame {
-        msec: 208
-        hash: "e531d33ef14b58ad843a6be6d7cb0961"
-    }
-    Frame {
-        msec: 224
-        hash: "011c0bcca7717b08bc53738718203f7e"
-    }
-    Frame {
-        msec: 240
-        hash: "412a630348aa44d56f36f04982035e36"
-    }
-    Frame {
-        msec: 256
-        hash: "45528cdc62622b6d01e44466cd85bd38"
-    }
-    Frame {
-        msec: 272
-        hash: "0901c99f959d6c10a0b6ea46a282d8fd"
-    }
-    Frame {
-        msec: 288
-        hash: "3f200fca4815d555f22912d9fcdc20ee"
-    }
-    Frame {
-        msec: 304
-        hash: "5e3c58e2f3a57f4ea48f4315d37ed813"
-    }
-    Frame {
-        msec: 320
-        hash: "e8d98ec2d13ef4324feba11be95d0735"
-    }
-    Frame {
-        msec: 336
-        hash: "4f3b79b341b63499a20f1e1e2cd979f9"
-    }
-    Frame {
-        msec: 352
-        hash: "5ddbc3bc10292bec41531e83c0921c59"
-    }
-    Frame {
-        msec: 368
-        hash: "9bc9801e83267689cd2750226f2b08ce"
-    }
-    Frame {
-        msec: 384
-        hash: "f87195f2393914a0bbed9a454de01ff5"
-    }
-    Frame {
-        msec: 400
-        hash: "4e0fd7f45e53a8d44c416eb9235ec877"
-    }
-    Frame {
-        msec: 416
-        hash: "a579d6324fb4bf9ac5ceaba2aa708764"
-    }
-    Frame {
-        msec: 432
-        hash: "b9f3f08168fb55ba01e56e670db565de"
-    }
-    Frame {
-        msec: 448
-        hash: "cbd63ec868578e295a83170f42b23678"
-    }
-    Frame {
-        msec: 464
-        hash: "2ed9d0e09b61dee8b2703e580007d7a5"
-    }
-    Frame {
-        msec: 480
-        hash: "92fa2d9ef05140eb9d0fcf78b55f202e"
-    }
-    Frame {
-        msec: 496
-        hash: "9a3f9dc04a900020f0e488309d7b4757"
-    }
-    Frame {
-        msec: 512
-        hash: "93b4876c3e185ff4875a7447b0bf4f0f"
-    }
-    Frame {
-        msec: 528
-        hash: "41b40e36f77d04e62f72ad34aa50709a"
-    }
-    Frame {
-        msec: 544
-        hash: "2ea69aeb32fee61b61aa9c4efb2834bf"
-    }
-    Frame {
-        msec: 560
-        hash: "0971ac1e05ea2ba387c78d4d103f5ea1"
-    }
-    Frame {
-        msec: 576
-        hash: "98e46dff678f293fd6a4e9313ab3aec7"
-    }
-    Frame {
-        msec: 592
-        hash: "82b94393071d6c32dd8028e1ee69e7fb"
-    }
-    Frame {
-        msec: 608
-        hash: "240df67aa72a24546eb6e043e0d3d205"
-    }
-    Frame {
-        msec: 624
-        hash: "56c4113cc341c254ccab66f3bc313154"
-    }
-    Frame {
-        msec: 640
-        hash: "20d758c1537ed1a9aff657414b50926c"
-    }
-    Frame {
-        msec: 656
-        hash: "ae252d835a05e01c2a12ae820335049a"
-    }
-    Frame {
-        msec: 672
-        hash: "4d53256fbb012e738ba3868e2482250d"
-    }
-    Frame {
-        msec: 688
-        hash: "261a341cab38986fb2f53b8e430f04a3"
-    }
-    Frame {
-        msec: 704
-        hash: "1030f795d310f742ba491a2a90ff52d8"
-    }
-    Frame {
-        msec: 720
-        hash: "59d24ebfedd2a87bdbd755d06c4361d2"
-    }
-    Frame {
-        msec: 736
-        hash: "a6eaa480b3f93d33ae23bb36b7691b92"
-    }
-    Frame {
-        msec: 752
-        hash: "cb6cf1e6e89da3fcbad323f744aef18d"
-    }
-    Frame {
-        msec: 768
-        hash: "33a4f07cf7f5d16f006541c61ae2e4ee"
-    }
-    Frame {
-        msec: 784
-        hash: "6e857b106486ea0aaa5321d4a7a07eae"
-    }
-    Frame {
-        msec: 800
-        hash: "0f80edaf3eecf7a8c015d3fcecc0a494"
-    }
-    Frame {
-        msec: 816
-        hash: "24b45d00d70904694c30ebd422c739ce"
-    }
-    Frame {
-        msec: 832
-        hash: "c0ca66fefb19294852b9be0c4ba36481"
-    }
-    Frame {
-        msec: 848
-        hash: "047846d243e7613193a8ddd526c4268e"
-    }
-    Frame {
-        msec: 864
-        hash: "ca85f90e450ccda6b76e6a29a3187a63"
-    }
-    Frame {
-        msec: 880
-        hash: "fcd803f5640d054190c2ddc9a6406bb9"
-    }
-    Frame {
-        msec: 896
-        hash: "f81152b8a464bfa8343f52efcb0c8b8c"
-    }
-    Frame {
-        msec: 912
-        hash: "e86be73d83699584dca986dfdb030b36"
-    }
-    Frame {
-        msec: 928
-        hash: "d9798e4ebaf72c35b19a56b336d2ea93"
-    }
-    Frame {
-        msec: 944
-        hash: "460f13d8e05b529c0e4fba39b1449ff1"
-    }
-    Frame {
-        msec: 960
-        image: "resolution.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "8b2f13580c6de9ec231809330d2d0362"
-    }
-    Frame {
-        msec: 992
-        hash: "94a2cc520340573557e6a310f2ea125e"
-    }
-    Frame {
-        msec: 1008
-        hash: "a8df78ab2e800349ec887ea6b1f5dcb8"
-    }
-    Frame {
-        msec: 1024
-        hash: "0f3a56dbe26d453847ed4847c0e81d1a"
-    }
-    Frame {
-        msec: 1040
-        hash: "96c89325862a982235b4b75922ec4669"
-    }
-    Frame {
-        msec: 1056
-        hash: "ead6352a4ca47da59422e8d6a5844aa4"
-    }
-    Frame {
-        msec: 1072
-        hash: "b50a6b14f15882e2c1ae6e3babeecdf8"
-    }
-    Frame {
-        msec: 1088
-        hash: "2f32245c3388b86194e8183a290e99b8"
-    }
-    Frame {
-        msec: 1104
-        hash: "2b54d49d30ccbf11ccb5ba8d62ba7d83"
-    }
-    Frame {
-        msec: 1120
-        hash: "495b25d87cb6d1d4bdea4d5ec62c698e"
-    }
-    Frame {
-        msec: 1136
-        hash: "3d45b061939783b6359fa4cdb908ecc0"
-    }
-    Frame {
-        msec: 1152
-        hash: "e9e601c2a65a09b6354fff2c162106d6"
-    }
-    Frame {
-        msec: 1168
-        hash: "8cfba8a724e85403b573caf7bbac9d83"
-    }
-    Frame {
-        msec: 1184
-        hash: "5910765354645b724e14681cbdea227e"
-    }
-    Frame {
-        msec: 1200
-        hash: "4358af7f2ccfc0919614351bfd5a7405"
-    }
-    Frame {
-        msec: 1216
-        hash: "032e064336b458a6de03fdc98684cc34"
-    }
-    Frame {
-        msec: 1232
-        hash: "c81d87bf83ee7e834a4b15dd103f7082"
-    }
-    Frame {
-        msec: 1248
-        hash: "9d4416b55ed3b9e45a2314e9be5a5f2d"
-    }
-    Frame {
-        msec: 1264
-        hash: "5b96da1a52a0413f9e8edbc9291a2502"
-    }
-    Frame {
-        msec: 1280
-        hash: "aaa4008281ebc60b15616c818816e195"
-    }
-    Frame {
-        msec: 1296
-        hash: "81ebf882aeb89648300dfc2e8e2cf11b"
-    }
-    Frame {
-        msec: 1312
-        hash: "4e686e6cee12902f92e0ece915386fb3"
-    }
-    Frame {
-        msec: 1328
-        hash: "6ff8d9bd6ec4dce414cdc7330646156e"
-    }
-    Frame {
-        msec: 1344
-        hash: "dac6334e8b221527ef74b4f93eeef7c3"
-    }
-    Frame {
-        msec: 1360
-        hash: "e58dbf419d1831e001e802600803aaa5"
-    }
-    Frame {
-        msec: 1376
-        hash: "e8685f9b12c9ccb9d0e471946f1f6f9c"
-    }
-    Frame {
-        msec: 1392
-        hash: "0936715ff8d38c2c813ebef0683a3246"
-    }
-    Frame {
-        msec: 1408
-        hash: "37ad0a5532af8b083a7d4c4b044075ca"
-    }
-    Frame {
-        msec: 1424
-        hash: "52ae25414d353d994cba36918644949a"
-    }
-    Frame {
-        msec: 1440
-        hash: "07719485f9a7d0012eb0f3f211f0f21b"
-    }
-    Frame {
-        msec: 1456
-        hash: "2d1a4f2c8d4a8d6316a31a81a2d20c61"
-    }
-    Frame {
-        msec: 1472
-        hash: "3b279fb9e7b3efe05becc1651ba59493"
-    }
-    Frame {
-        msec: 1488
-        hash: "4b9c126dcdf499f9de4e09d4f6ab86bf"
-    }
-    Frame {
-        msec: 1504
-        hash: "6a1b8d8ea46949cb65e8f4155ab94819"
-    }
-    Frame {
-        msec: 1520
-        hash: "6dbd2106b91ffbbb8a845e6cddbd47d7"
-    }
-    Frame {
-        msec: 1536
-        hash: "8244eda92302f2b5cff01f05d438bf20"
-    }
-    Frame {
-        msec: 1552
-        hash: "f939bd80ae865e365e554a532ade38f5"
-    }
-    Frame {
-        msec: 1568
-        hash: "92d135616eee6737333b3d86d0aa5956"
-    }
-    Frame {
-        msec: 1584
-        hash: "ca75854d6e5a77c8e609d65971b5671a"
-    }
-    Frame {
-        msec: 1600
-        hash: "b0a113800cd05768b57bac6b9a338b1d"
-    }
-    Frame {
-        msec: 1616
-        hash: "7af1a2aa6a201e36c3a969be4330af04"
-    }
-    Frame {
-        msec: 1632
-        hash: "e54e8a2cfb0e6678b2a7cc64b8ae08bc"
-    }
-    Frame {
-        msec: 1648
-        hash: "5d212c7efd9cf7d3eb5219b0bbe766d7"
-    }
-    Frame {
-        msec: 1664
-        hash: "f4f2c95380c0f76c9e89820cdbeb5b31"
-    }
-    Frame {
-        msec: 1680
-        hash: "b8eefbf5ade1a6b9eef9608f66a46474"
-    }
-    Frame {
-        msec: 1696
-        hash: "d699ace9babbb152aad2fa852114c099"
-    }
-    Frame {
-        msec: 1712
-        hash: "ceb3dea0d2b93cc5882a2b38ab3d1b95"
-    }
-    Frame {
-        msec: 1728
-        hash: "08175810bfb80e1c5816b0d0aebbac4a"
-    }
-    Frame {
-        msec: 1744
-        hash: "86abce93f50e7e7ebbd90690cfb20dd2"
-    }
-    Frame {
-        msec: 1760
-        hash: "2918979f2682bd32beb5eaf7ecb3e463"
-    }
-    Frame {
-        msec: 1776
-        hash: "b165ab96b0d51d41578bf99cbf7f6d02"
-    }
-    Frame {
-        msec: 1792
-        hash: "d56cfdb2c65372cb36aeb13fd9c73deb"
-    }
-    Frame {
-        msec: 1808
-        hash: "c53f0e4dc8204e5892ed4f367a6bade3"
-    }
-    Frame {
-        msec: 1824
-        hash: "b3ae62e13149160f3695ed5c116411aa"
-    }
-    Frame {
-        msec: 1840
-        hash: "057e4a0428ea2ff9893becd40e6d2977"
-    }
-    Frame {
-        msec: 1856
-        hash: "10c050131093cc0d3f4b80c44eb1218b"
-    }
-    Frame {
-        msec: 1872
-        hash: "17ce5a6dace37f4eb316f37ea26a8a2c"
-    }
-    Frame {
-        msec: 1888
-        hash: "6e00c7e74bfaed5cf06aba54c8b73e57"
-    }
-    Frame {
-        msec: 1904
-        hash: "5a03b1b698ca28d2afd9c67aef3bc2e9"
-    }
-    Frame {
-        msec: 1920
-        image: "resolution.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "0fab102a33521e8893afdb6a11a3c5c9"
-    }
-    Frame {
-        msec: 1952
-        hash: "232e8f1b060ef55e37a372bec4435d11"
-    }
-    Frame {
-        msec: 1968
-        hash: "2107724eac0d1b8735060876f80d303a"
-    }
-    Frame {
-        msec: 1984
-        hash: "cf5d12d2707975ad364750d5ba787944"
-    }
-    Frame {
-        msec: 2000
-        hash: "2457c88828c2cb39feb1d34556077139"
-    }
-    Frame {
-        msec: 2016
-        hash: "5f08d6dab8199b3f0f57d32cf2da4d67"
-    }
-    Frame {
-        msec: 2032
-        hash: "2457c88828c2cb39feb1d34556077139"
-    }
-    Frame {
-        msec: 2048
-        hash: "cf5d12d2707975ad364750d5ba787944"
-    }
-    Frame {
-        msec: 2064
-        hash: "2107724eac0d1b8735060876f80d303a"
-    }
-    Frame {
-        msec: 2080
-        hash: "232e8f1b060ef55e37a372bec4435d11"
-    }
-    Frame {
-        msec: 2096
-        hash: "0a93c515cd328978ebd8103539a2fd63"
-    }
-    Frame {
-        msec: 2112
-        hash: "63d6c7beac12e3bd83f9ef58c233c7d2"
-    }
-    Frame {
-        msec: 2128
-        hash: "5a03b1b698ca28d2afd9c67aef3bc2e9"
-    }
-    Frame {
-        msec: 2144
-        hash: "6e00c7e74bfaed5cf06aba54c8b73e57"
-    }
-    Frame {
-        msec: 2160
-        hash: "17ce5a6dace37f4eb316f37ea26a8a2c"
-    }
-    Frame {
-        msec: 2176
-        hash: "10c050131093cc0d3f4b80c44eb1218b"
-    }
-    Frame {
-        msec: 2192
-        hash: "057e4a0428ea2ff9893becd40e6d2977"
-    }
-    Frame {
-        msec: 2208
-        hash: "b3ae62e13149160f3695ed5c116411aa"
-    }
-    Frame {
-        msec: 2224
-        hash: "c53f0e4dc8204e5892ed4f367a6bade3"
-    }
-    Frame {
-        msec: 2240
-        hash: "d56cfdb2c65372cb36aeb13fd9c73deb"
-    }
-    Frame {
-        msec: 2256
-        hash: "b165ab96b0d51d41578bf99cbf7f6d02"
-    }
-    Frame {
-        msec: 2272
-        hash: "2918979f2682bd32beb5eaf7ecb3e463"
-    }
-    Frame {
-        msec: 2288
-        hash: "86abce93f50e7e7ebbd90690cfb20dd2"
-    }
-    Frame {
-        msec: 2304
-        hash: "08175810bfb80e1c5816b0d0aebbac4a"
-    }
-    Frame {
-        msec: 2320
-        hash: "ceb3dea0d2b93cc5882a2b38ab3d1b95"
-    }
-    Frame {
-        msec: 2336
-        hash: "d699ace9babbb152aad2fa852114c099"
-    }
-    Frame {
-        msec: 2352
-        hash: "b8eefbf5ade1a6b9eef9608f66a46474"
-    }
-    Frame {
-        msec: 2368
-        hash: "f4f2c95380c0f76c9e89820cdbeb5b31"
-    }
-    Frame {
-        msec: 2384
-        hash: "5d212c7efd9cf7d3eb5219b0bbe766d7"
-    }
-    Frame {
-        msec: 2400
-        hash: "e54e8a2cfb0e6678b2a7cc64b8ae08bc"
-    }
-    Frame {
-        msec: 2416
-        hash: "d9408487f747ffb8eff5e1da92207285"
-    }
-    Frame {
-        msec: 2432
-        hash: "e6b3fa1829535ac90d1548f45aadb9be"
-    }
-    Frame {
-        msec: 2448
-        hash: "ca75854d6e5a77c8e609d65971b5671a"
-    }
-    Frame {
-        msec: 2464
-        hash: "92d135616eee6737333b3d86d0aa5956"
-    }
-    Frame {
-        msec: 2480
-        hash: "f939bd80ae865e365e554a532ade38f5"
-    }
-    Frame {
-        msec: 2496
-        hash: "8244eda92302f2b5cff01f05d438bf20"
-    }
-    Frame {
-        msec: 2512
-        hash: "6dbd2106b91ffbbb8a845e6cddbd47d7"
-    }
-    Frame {
-        msec: 2528
-        hash: "6a1b8d8ea46949cb65e8f4155ab94819"
-    }
-    Frame {
-        msec: 2544
-        hash: "4b9c126dcdf499f9de4e09d4f6ab86bf"
-    }
-    Frame {
-        msec: 2560
-        hash: "3b279fb9e7b3efe05becc1651ba59493"
-    }
-    Frame {
-        msec: 2576
-        hash: "bb40b884b56defb61ad86757fd51b9e6"
-    }
-    Frame {
-        msec: 2592
-        hash: "07719485f9a7d0012eb0f3f211f0f21b"
-    }
-    Frame {
-        msec: 2608
-        hash: "52ae25414d353d994cba36918644949a"
-    }
-    Frame {
-        msec: 2624
-        hash: "37ad0a5532af8b083a7d4c4b044075ca"
-    }
-    Frame {
-        msec: 2640
-        hash: "0936715ff8d38c2c813ebef0683a3246"
-    }
-    Frame {
-        msec: 2656
-        hash: "e8685f9b12c9ccb9d0e471946f1f6f9c"
-    }
-    Frame {
-        msec: 2672
-        hash: "e58dbf419d1831e001e802600803aaa5"
-    }
-    Frame {
-        msec: 2688
-        hash: "dac6334e8b221527ef74b4f93eeef7c3"
-    }
-    Frame {
-        msec: 2704
-        hash: "6ff8d9bd6ec4dce414cdc7330646156e"
-    }
-    Frame {
-        msec: 2720
-        hash: "4e686e6cee12902f92e0ece915386fb3"
-    }
-    Frame {
-        msec: 2736
-        hash: "81ebf882aeb89648300dfc2e8e2cf11b"
-    }
-    Frame {
-        msec: 2752
-        hash: "aaa4008281ebc60b15616c818816e195"
-    }
-    Frame {
-        msec: 2768
-        hash: "5b96da1a52a0413f9e8edbc9291a2502"
-    }
-    Frame {
-        msec: 2784
-        hash: "9d4416b55ed3b9e45a2314e9be5a5f2d"
-    }
-    Frame {
-        msec: 2800
-        hash: "c81d87bf83ee7e834a4b15dd103f7082"
-    }
-    Frame {
-        msec: 2816
-        hash: "9fdf30d57c49a6644377ba40140b1969"
-    }
-    Frame {
-        msec: 2832
-        hash: "4358af7f2ccfc0919614351bfd5a7405"
-    }
-    Frame {
-        msec: 2848
-        hash: "5910765354645b724e14681cbdea227e"
-    }
-    Frame {
-        msec: 2864
-        hash: "8cfba8a724e85403b573caf7bbac9d83"
-    }
-    Frame {
-        msec: 2880
-        image: "resolution.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "3d45b061939783b6359fa4cdb908ecc0"
-    }
-    Frame {
-        msec: 2912
-        hash: "495b25d87cb6d1d4bdea4d5ec62c698e"
-    }
-    Frame {
-        msec: 2928
-        hash: "2b54d49d30ccbf11ccb5ba8d62ba7d83"
-    }
-    Frame {
-        msec: 2944
-        hash: "2f32245c3388b86194e8183a290e99b8"
-    }
-    Frame {
-        msec: 2960
-        hash: "b50a6b14f15882e2c1ae6e3babeecdf8"
-    }
-    Frame {
-        msec: 2976
-        hash: "ead6352a4ca47da59422e8d6a5844aa4"
-    }
-    Frame {
-        msec: 2992
-        hash: "96c89325862a982235b4b75922ec4669"
-    }
-    Frame {
-        msec: 3008
-        hash: "0f3a56dbe26d453847ed4847c0e81d1a"
-    }
-    Frame {
-        msec: 3024
-        hash: "a8df78ab2e800349ec887ea6b1f5dcb8"
-    }
-    Frame {
-        msec: 3040
-        hash: "94a2cc520340573557e6a310f2ea125e"
-    }
-    Frame {
-        msec: 3056
-        hash: "8b2f13580c6de9ec231809330d2d0362"
-    }
-    Frame {
-        msec: 3072
-        hash: "5f76ef4f6b8e703fd0822859cd9a1353"
-    }
-    Frame {
-        msec: 3088
-        hash: "460f13d8e05b529c0e4fba39b1449ff1"
-    }
-    Frame {
-        msec: 3104
-        hash: "d9798e4ebaf72c35b19a56b336d2ea93"
-    }
-    Frame {
-        msec: 3120
-        hash: "e86be73d83699584dca986dfdb030b36"
-    }
-    Frame {
-        msec: 3136
-        hash: "f81152b8a464bfa8343f52efcb0c8b8c"
-    }
-    Frame {
-        msec: 3152
-        hash: "fcd803f5640d054190c2ddc9a6406bb9"
-    }
-    Frame {
-        msec: 3168
-        hash: "ca85f90e450ccda6b76e6a29a3187a63"
-    }
-    Frame {
-        msec: 3184
-        hash: "047846d243e7613193a8ddd526c4268e"
-    }
-    Frame {
-        msec: 3200
-        hash: "c0ca66fefb19294852b9be0c4ba36481"
-    }
-    Frame {
-        msec: 3216
-        hash: "d4a075656790c4f2c50addcd2cc660b5"
-    }
-    Frame {
-        msec: 3232
-        hash: "0f80edaf3eecf7a8c015d3fcecc0a494"
-    }
-    Frame {
-        msec: 3248
-        hash: "6e857b106486ea0aaa5321d4a7a07eae"
-    }
-    Frame {
-        msec: 3264
-        hash: "33a4f07cf7f5d16f006541c61ae2e4ee"
-    }
-    Frame {
-        msec: 3280
-        hash: "cb6cf1e6e89da3fcbad323f744aef18d"
-    }
-    Frame {
-        msec: 3296
-        hash: "a6eaa480b3f93d33ae23bb36b7691b92"
-    }
-    Frame {
-        msec: 3312
-        hash: "59d24ebfedd2a87bdbd755d06c4361d2"
-    }
-    Frame {
-        msec: 3328
-        hash: "1030f795d310f742ba491a2a90ff52d8"
-    }
-    Frame {
-        msec: 3344
-        hash: "261a341cab38986fb2f53b8e430f04a3"
-    }
-    Frame {
-        msec: 3360
-        hash: "4d53256fbb012e738ba3868e2482250d"
-    }
-    Frame {
-        msec: 3376
-        hash: "ae252d835a05e01c2a12ae820335049a"
-    }
-    Frame {
-        msec: 3392
-        hash: "20d758c1537ed1a9aff657414b50926c"
-    }
-    Frame {
-        msec: 3408
-        hash: "56c4113cc341c254ccab66f3bc313154"
-    }
-    Frame {
-        msec: 3424
-        hash: "240df67aa72a24546eb6e043e0d3d205"
-    }
-    Frame {
-        msec: 3440
-        hash: "82b94393071d6c32dd8028e1ee69e7fb"
-    }
-    Frame {
-        msec: 3456
-        hash: "98e46dff678f293fd6a4e9313ab3aec7"
-    }
-    Frame {
-        msec: 3472
-        hash: "0971ac1e05ea2ba387c78d4d103f5ea1"
-    }
-    Frame {
-        msec: 3488
-        hash: "2ea69aeb32fee61b61aa9c4efb2834bf"
-    }
-    Frame {
-        msec: 3504
-        hash: "41b40e36f77d04e62f72ad34aa50709a"
-    }
-    Frame {
-        msec: 3520
-        hash: "93b4876c3e185ff4875a7447b0bf4f0f"
-    }
-    Frame {
-        msec: 3536
-        hash: "9a3f9dc04a900020f0e488309d7b4757"
-    }
-    Frame {
-        msec: 3552
-        hash: "92fa2d9ef05140eb9d0fcf78b55f202e"
-    }
-    Frame {
-        msec: 3568
-        hash: "2ed9d0e09b61dee8b2703e580007d7a5"
-    }
-    Frame {
-        msec: 3584
-        hash: "cbd63ec868578e295a83170f42b23678"
-    }
-    Frame {
-        msec: 3600
-        hash: "b9f3f08168fb55ba01e56e670db565de"
-    }
-    Frame {
-        msec: 3616
-        hash: "a579d6324fb4bf9ac5ceaba2aa708764"
-    }
-    Frame {
-        msec: 3632
-        hash: "4e0fd7f45e53a8d44c416eb9235ec877"
-    }
-    Frame {
-        msec: 3648
-        hash: "f87195f2393914a0bbed9a454de01ff5"
-    }
-    Frame {
-        msec: 3664
-        hash: "9bc9801e83267689cd2750226f2b08ce"
-    }
-    Frame {
-        msec: 3680
-        hash: "5ddbc3bc10292bec41531e83c0921c59"
-    }
-    Frame {
-        msec: 3696
-        hash: "4f3b79b341b63499a20f1e1e2cd979f9"
-    }
-    Frame {
-        msec: 3712
-        hash: "e8d98ec2d13ef4324feba11be95d0735"
-    }
-    Frame {
-        msec: 3728
-        hash: "5e3c58e2f3a57f4ea48f4315d37ed813"
-    }
-    Frame {
-        msec: 3744
-        hash: "3f200fca4815d555f22912d9fcdc20ee"
-    }
-    Frame {
-        msec: 3760
-        hash: "0901c99f959d6c10a0b6ea46a282d8fd"
-    }
-    Frame {
-        msec: 3776
-        hash: "a186b8e984c999e8609472a7a5fa0610"
-    }
-    Frame {
-        msec: 3792
-        hash: "412a630348aa44d56f36f04982035e36"
-    }
-    Frame {
-        msec: 3808
-        hash: "011c0bcca7717b08bc53738718203f7e"
-    }
-    Frame {
-        msec: 3824
-        hash: "e531d33ef14b58ad843a6be6d7cb0961"
-    }
-    Frame {
-        msec: 3840
-        image: "resolution.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "8df8dd33eada434231332b81e03430ce"
-    }
-    Frame {
-        msec: 3872
-        hash: "2aaa3749f93734dd203e1fea91a9f24a"
-    }
-    Frame {
-        msec: 3888
-        hash: "dc78b09e27bbc0a2cfec83436eef4446"
-    }
-    Frame {
-        msec: 3904
-        hash: "9053a92e343ebb79bd2831f5ab94a1b5"
-    }
-    Frame {
-        msec: 3920
-        hash: "649ad1a3fb57fb088e4e5cfd749bf2e5"
-    }
-    Frame {
-        msec: 3936
-        hash: "3579849956c1101000ef09949aa4c0f9"
-    }
-    Frame {
-        msec: 3952
-        hash: "7af041898748bb5950643b057ca59eea"
-    }
-    Frame {
-        msec: 3968
-        hash: "30a191ae899121ae22d10acee6593415"
-    }
-    Frame {
-        msec: 3984
-        hash: "369f761053d5910e00672aa866f698ba"
-    }
-    Frame {
-        msec: 4000
-        hash: "1f189a436cf74ae83a03c3bb63c24ec2"
-    }
-    Frame {
-        msec: 4016
-        hash: "ac1d9c1cc13813b5e94c692a209a4e36"
-    }
-    Frame {
-        msec: 4032
-        hash: "f0e0b5c041bcf38d8d9144d466ad74a9"
-    }
-    Frame {
-        msec: 4048
-        hash: "38a35c94ebcf33f6720fea33821a54e1"
-    }
-    Frame {
-        msec: 4064
-        hash: "061d139f43a3dd63daf887b82721f42f"
-    }
-    Frame {
-        msec: 4080
-        hash: "623747b5fe99e5ffaa62f4daa3f840ef"
-    }
-    Frame {
-        msec: 4096
-        hash: "4dd5081a387ffda296811b64b9235d7d"
-    }
-    Frame {
-        msec: 4112
-        hash: "1598cf2fe996f99ab4c15f84d89cd7bd"
-    }
-    Frame {
-        msec: 4128
-        hash: "30cac85bf1a622d438a64b6ccb59a8ca"
-    }
-    Frame {
-        msec: 4144
-        hash: "114e54ae3e1493750a022f1c019e7f77"
-    }
-    Frame {
-        msec: 4160
-        hash: "a585efc3aae3a426e6af5f4a8cc23b10"
-    }
-    Frame {
-        msec: 4176
-        hash: "c0f315549baad93dd885d58b185e7ed7"
-    }
-    Frame {
-        msec: 4192
-        hash: "3a00f5f034bef58ca341bf9e1056f46f"
-    }
-    Frame {
-        msec: 4208
-        hash: "b3022d07dee989499a35aea21e07e4c1"
-    }
-    Frame {
-        msec: 4224
-        hash: "e722464809e94fb7d8c752506f0d3ac2"
-    }
-    Frame {
-        msec: 4240
-        hash: "82ea3d06367ce9dc582dbdbc186cc70a"
-    }
-    Frame {
-        msec: 4256
-        hash: "359040facbe531c7f6b805b8bfc5b17a"
-    }
-    Frame {
-        msec: 4272
-        hash: "264c7b65bae7e3945d87c17edfda6889"
-    }
-    Frame {
-        msec: 4288
-        hash: "d941ec8e363942af02f36d4672521801"
-    }
-    Frame {
-        msec: 4304
-        hash: "e46e145b4d07d1697c1d9efce80c80de"
-    }
-    Frame {
-        msec: 4320
-        hash: "d8bed5c42bc5725d811db4dacdab1581"
-    }
-    Frame {
-        msec: 4336
-        hash: "aa221160b4a11b30cb73eaa8ccaa9dfd"
-    }
-    Frame {
-        msec: 4352
-        hash: "f411483477906d83f872b306cd021406"
-    }
-    Frame {
-        msec: 4368
-        hash: "d9c52e4f99416fa1043a9c34a1c29f5a"
-    }
-    Frame {
-        msec: 4384
-        hash: "ec2890446f34b8a5d47ae97ba2853d0f"
-    }
-    Frame {
-        msec: 4400
-        hash: "6a3e6ef7d832fa7ec813b38171cb3602"
-    }
-    Frame {
-        msec: 4416
-        hash: "6dfd75b6cb780f7d80466f3450d0b255"
-    }
-    Frame {
-        msec: 4432
-        hash: "170774843dc6f28f51f07c445e046bd8"
-    }
-    Frame {
-        msec: 4448
-        hash: "eab348bef656739d9723d3bd659c43ff"
-    }
-    Frame {
-        msec: 4464
-        hash: "f06e546bb710002cdf1cefd51ffa47c4"
-    }
-    Frame {
-        msec: 4480
-        hash: "52f7ff1348d9aa7cdf43cd81f0a71625"
-    }
-    Frame {
-        msec: 4496
-        hash: "55a5b1befa3b7a4674a62d492b5527ea"
-    }
-    Frame {
-        msec: 4512
-        hash: "699c093fddc6b9293a011d8d6eccd36d"
-    }
-    Frame {
-        msec: 4528
-        hash: "b988e1ad7dc7d26ffeea8f71a69a9abf"
-    }
-    Frame {
-        msec: 4544
-        hash: "8dea2b47492f83f961a47536a10aad0c"
-    }
-    Frame {
-        msec: 4560
-        hash: "925ea8105779ffd801a3c62129d64bed"
-    }
-    Frame {
-        msec: 4576
-        hash: "aa5d957c4f452b1f1c70ea672ce4a0b9"
-    }
-    Frame {
-        msec: 4592
-        hash: "85d3ea97a1fb152ae8ad65a17693a16d"
-    }
-    Frame {
-        msec: 4608
-        hash: "069b2bc8b86f822c5e7ceca3664e78a6"
-    }
-    Frame {
-        msec: 4624
-        hash: "209071b7f72d8c25b9ce27c05397fe56"
-    }
-    Frame {
-        msec: 4640
-        hash: "068dea708612620d34bd57c6affb44b1"
-    }
-    Frame {
-        msec: 4656
-        hash: "36b53a0845220645059fed803a6ffcbc"
-    }
-    Frame {
-        msec: 4672
-        hash: "2c84e15006a39a554eb2047bae9d4f6f"
-    }
-    Frame {
-        msec: 4688
-        hash: "1bdab31534f4b5a7e9d27ede3e9acb57"
-    }
-    Frame {
-        msec: 4704
-        hash: "688689eeb584b0c74f0322af35857dd5"
-    }
-    Frame {
-        msec: 4720
-        hash: "024939fea5b6c6f9d3e26a0abf42ae3c"
-    }
-    Frame {
-        msec: 4736
-        hash: "2efb2f47c6f0be3743f0f4dc7a66b08e"
-    }
-    Frame {
-        msec: 4752
-        hash: "4631f3756af880693d3654c16cbe47bb"
-    }
-    Frame {
-        msec: 4768
-        hash: "2fd77649c1e1ade97534ef530ad05612"
-    }
-    Frame {
-        msec: 4784
-        hash: "5d13517bac111c8af49c444d41a42ea1"
-    }
-    Frame {
-        msec: 4800
-        image: "resolution.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "8bd8efe405a42730304dcc120a6e718c"
-    }
-    Frame {
-        msec: 4832
-        hash: "a83c543977e3f1dd4c020375eb3273fd"
-    }
-    Frame {
-        msec: 4848
-        hash: "c52f38469fec77afc7f0a44b992e3d0d"
-    }
-    Frame {
-        msec: 4864
-        hash: "af645449d6ec3f42449ffc59193aaaa4"
-    }
-    Frame {
-        msec: 4880
-        hash: "2eb982cf754c77c109158076957775ae"
-    }
-    Frame {
-        msec: 4896
-        hash: "9bf2fd4a4e45f302b34b7f038937d3d7"
-    }
-    Frame {
-        msec: 4912
-        hash: "5520e309d68c8eedf76a9392714a6150"
-    }
-    Frame {
-        msec: 4928
-        hash: "9dcd043a25e33b788729c0a0531301e7"
-    }
-    Frame {
-        msec: 4944
-        hash: "1475b9bcfe08c66135673f4284c9bbcd"
-    }
-    Frame {
-        msec: 4960
-        hash: "9af1f355bcf4d5f05b42040ebba75e09"
-    }
-    Frame {
-        msec: 4976
-        hash: "8b6e04980ea60ca2ff06053d35c06881"
-    }
-    Frame {
-        msec: 4992
-        hash: "def466e377a44afc4b2a9a9ebb258f86"
-    }
-    Frame {
-        msec: 5008
-        hash: "18f6d6f5a3fdaee0037580df0f4f9ef0"
-    }
-    Frame {
-        msec: 5024
-        hash: "ae2579498558f6f93489999c7c82cbcd"
-    }
-    Frame {
-        msec: 5040
-        hash: "623d8e756c2c131150554272df231bf9"
-    }
-    Frame {
-        msec: 5056
-        hash: "c13146576229848b8a1e1b382fbf749d"
-    }
-    Frame {
-        msec: 5072
-        hash: "f963a399aeea1d34ec3bd30a5b991035"
-    }
-    Frame {
-        msec: 5088
-        hash: "45a4db021ba0a53ad783c14a3b66aa38"
-    }
-    Frame {
-        msec: 5104
-        hash: "2031618470e3bb3a3435fe0e270a15d4"
-    }
-    Frame {
-        msec: 5120
-        hash: "f7cc01c301f29110db8364fecc8751f1"
-    }
-    Frame {
-        msec: 5136
-        hash: "2d366fa500257ec0a12863f3637d0c47"
-    }
-    Frame {
-        msec: 5152
-        hash: "4ba700e7f9ffba4889ca26d903a63029"
-    }
-    Frame {
-        msec: 5168
-        hash: "329bec5e3d6a131b4bd9a056659bdb3e"
-    }
-    Frame {
-        msec: 5184
-        hash: "48f7356707cdbcb401c135207ee38821"
-    }
-    Frame {
-        msec: 5200
-        hash: "5314e448affe60d193d07a784035ecce"
-    }
-    Frame {
-        msec: 5216
-        hash: "c87e98becdf99c214ad4987985b4af07"
-    }
-    Frame {
-        msec: 5232
-        hash: "ea81d2a967b619980d7e42937ec74668"
-    }
-    Frame {
-        msec: 5248
-        hash: "845319d4e0f6ee97697e59c606220e7a"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
deleted file mode 100644
index 4aab708..0000000
--- a/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
+++ /dev/null
@@ -1,655 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "4e401b5ebff6e442fa108e94a5dba668"
-    }
-    Frame {
-        msec: 32
-        hash: "c2f8551d0442d0736b71c54fc965562b"
-    }
-    Frame {
-        msec: 48
-        hash: "4fc1ef611b24ec5737310859b12c83d3"
-    }
-    Frame {
-        msec: 64
-        hash: "7df07aea83bc5c3213e7871854661820"
-    }
-    Frame {
-        msec: 80
-        hash: "0ae4ee18cc675749f008b897fe35cc40"
-    }
-    Frame {
-        msec: 96
-        hash: "0ae4ee18cc675749f008b897fe35cc40"
-    }
-    Frame {
-        msec: 112
-        hash: "f5c917c7ca26bb916dd4df84eafc8e94"
-    }
-    Frame {
-        msec: 128
-        hash: "0696257de0441666bd264f8db6383d15"
-    }
-    Frame {
-        msec: 144
-        hash: "0b43fdee23346c30c60b822a20131cc3"
-    }
-    Frame {
-        msec: 160
-        hash: "98dbd004cf4809dbc90bfa9272378644"
-    }
-    Frame {
-        msec: 176
-        hash: "32d0e9005ebb9dfd410d348e336bcd93"
-    }
-    Frame {
-        msec: 192
-        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
-    }
-    Frame {
-        msec: 208
-        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
-    }
-    Frame {
-        msec: 224
-        hash: "6712be93cf1ed2b7b202367418b6d2d7"
-    }
-    Frame {
-        msec: 240
-        hash: "524840a3453af4e97ac82b559308cce3"
-    }
-    Frame {
-        msec: 256
-        hash: "11436091b24c02af94dfa75a5fd1a001"
-    }
-    Frame {
-        msec: 272
-        hash: "d3689b53474b4b26630d70ba01c057b4"
-    }
-    Frame {
-        msec: 288
-        hash: "16e2b66f28ed80d80d9b5264d89624d5"
-    }
-    Frame {
-        msec: 304
-        hash: "87636076959de7e5a0a8bd8b31354ed4"
-    }
-    Frame {
-        msec: 320
-        hash: "a6916da6bfac27aa87d75da2bbb73f31"
-    }
-    Frame {
-        msec: 336
-        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
-    }
-    Frame {
-        msec: 352
-        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
-    }
-    Frame {
-        msec: 368
-        hash: "14d08c2ca430631af8ede1013f4f4da0"
-    }
-    Frame {
-        msec: 384
-        hash: "ace9db9112d147569dc0cf1a1b680d6c"
-    }
-    Frame {
-        msec: 400
-        hash: "08bc6815601417f3731eaae398d0861d"
-    }
-    Frame {
-        msec: 416
-        hash: "809870dfd9b05ce07170edd945348ddf"
-    }
-    Frame {
-        msec: 432
-        hash: "5784deb0f3270cf7a0d0964cd9d31458"
-    }
-    Frame {
-        msec: 448
-        hash: "2f06ee407e5175d4b954e31c39c9522c"
-    }
-    Frame {
-        msec: 464
-        hash: "48a7dbed293fbbd5ea202190837a411f"
-    }
-    Frame {
-        msec: 480
-        hash: "abf3d90803cfa12d35d2752be7ea02d8"
-    }
-    Frame {
-        msec: 496
-        hash: "a60edcf8d792f93a839e6ddbafbf993f"
-    }
-    Frame {
-        msec: 512
-        hash: "7e8dfe86ea0849022355b12578d4cb1a"
-    }
-    Frame {
-        msec: 528
-        hash: "3c84122b0933ee870f178d39469e51e2"
-    }
-    Frame {
-        msec: 544
-        hash: "25f463e91febf5b6d8819fd5010bc1c2"
-    }
-    Frame {
-        msec: 560
-        hash: "d423a9bc912237d0f20b924849ba0cb1"
-    }
-    Frame {
-        msec: 576
-        hash: "5bd3cc309a5fce6183654975543250b2"
-    }
-    Frame {
-        msec: 592
-        hash: "4e401b5ebff6e442fa108e94a5dba668"
-    }
-    Frame {
-        msec: 608
-        hash: "9a4bf1400da038f2088dd4c49403d852"
-    }
-    Frame {
-        msec: 624
-        hash: "a37024356613bd5d678e0b2f7b8f5959"
-    }
-    Frame {
-        msec: 640
-        hash: "4f37d72c10e51f68a2359086094da249"
-    }
-    Frame {
-        msec: 656
-        hash: "6093bcb7673f8e58fe5a7b0143638822"
-    }
-    Frame {
-        msec: 672
-        hash: "c272aeea2b9c450fbd732305ccc01b93"
-    }
-    Frame {
-        msec: 688
-        hash: "6a4e2ee45b26037421e2a5f2d6ee517e"
-    }
-    Frame {
-        msec: 704
-        hash: "d912afcbce6c9d879a07ffc3c51b36d1"
-    }
-    Frame {
-        msec: 720
-        hash: "2578335ac6f21c8aec2c87515562c321"
-    }
-    Frame {
-        msec: 736
-        hash: "5b77af55f0a723ba762d283f41e91c98"
-    }
-    Frame {
-        msec: 752
-        hash: "b420fc71b22fa608a9c0cdbbbc61c447"
-    }
-    Frame {
-        msec: 768
-        hash: "3f7a9cecf2a590e8728137fabfd3f5f3"
-    }
-    Frame {
-        msec: 784
-        hash: "c51f12a2f438f137785c70e3af4922fd"
-    }
-    Frame {
-        msec: 800
-        hash: "5d97175fc4d986e5b21758d4ac785025"
-    }
-    Frame {
-        msec: 816
-        hash: "94f922f3460ad76cd05cb5b321977a94"
-    }
-    Frame {
-        msec: 832
-        hash: "5747adbc4f0b22ed359793d72d3e7d1f"
-    }
-    Frame {
-        msec: 848
-        hash: "255d1d45d3343972f156dfab7d13ce41"
-    }
-    Frame {
-        msec: 864
-        hash: "e5b54132ffb83acad30622e969405bc0"
-    }
-    Frame {
-        msec: 880
-        hash: "2c05cf00e3417883e789f58c2728dc97"
-    }
-    Frame {
-        msec: 896
-        hash: "9d66290b1aae1de3025d24d3efc4ca1c"
-    }
-    Frame {
-        msec: 912
-        hash: "5e9b0783b1b4221145a4febbae56b30f"
-    }
-    Frame {
-        msec: 928
-        hash: "21eea497c26600b03d868661232b3ebe"
-    }
-    Frame {
-        msec: 944
-        hash: "2383c415170ac6444f1c193ed698f682"
-    }
-    Frame {
-        msec: 960
-        image: "zoomTextOnly.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "4ed0f85dec4eb0bb740ac3780b6872c0"
-    }
-    Frame {
-        msec: 992
-        hash: "0a18bccca4efeadfced8e5cb1715a1f3"
-    }
-    Frame {
-        msec: 1008
-        hash: "823e65df9075eb0e9a3aad6b15ec3342"
-    }
-    Frame {
-        msec: 1024
-        hash: "823e65df9075eb0e9a3aad6b15ec3342"
-    }
-    Frame {
-        msec: 1040
-        hash: "0a18bccca4efeadfced8e5cb1715a1f3"
-    }
-    Frame {
-        msec: 1056
-        hash: "4ed0f85dec4eb0bb740ac3780b6872c0"
-    }
-    Frame {
-        msec: 1072
-        hash: "fae77663566351fa3bb506b459496a9d"
-    }
-    Frame {
-        msec: 1088
-        hash: "2383c415170ac6444f1c193ed698f682"
-    }
-    Frame {
-        msec: 1104
-        hash: "2e05365256bebbdf3229f99b94263b6c"
-    }
-    Frame {
-        msec: 1120
-        hash: "5e9b0783b1b4221145a4febbae56b30f"
-    }
-    Frame {
-        msec: 1136
-        hash: "9d66290b1aae1de3025d24d3efc4ca1c"
-    }
-    Frame {
-        msec: 1152
-        hash: "2c05cf00e3417883e789f58c2728dc97"
-    }
-    Frame {
-        msec: 1168
-        hash: "e5b54132ffb83acad30622e969405bc0"
-    }
-    Frame {
-        msec: 1184
-        hash: "255d1d45d3343972f156dfab7d13ce41"
-    }
-    Frame {
-        msec: 1200
-        hash: "5747adbc4f0b22ed359793d72d3e7d1f"
-    }
-    Frame {
-        msec: 1216
-        hash: "94f922f3460ad76cd05cb5b321977a94"
-    }
-    Frame {
-        msec: 1232
-        hash: "5d97175fc4d986e5b21758d4ac785025"
-    }
-    Frame {
-        msec: 1248
-        hash: "c51f12a2f438f137785c70e3af4922fd"
-    }
-    Frame {
-        msec: 1264
-        hash: "3f7a9cecf2a590e8728137fabfd3f5f3"
-    }
-    Frame {
-        msec: 1280
-        hash: "b420fc71b22fa608a9c0cdbbbc61c447"
-    }
-    Frame {
-        msec: 1296
-        hash: "5b77af55f0a723ba762d283f41e91c98"
-    }
-    Frame {
-        msec: 1312
-        hash: "2578335ac6f21c8aec2c87515562c321"
-    }
-    Frame {
-        msec: 1328
-        hash: "a9b5438bd48dbafd307d571877416003"
-    }
-    Frame {
-        msec: 1344
-        hash: "6a4e2ee45b26037421e2a5f2d6ee517e"
-    }
-    Frame {
-        msec: 1360
-        hash: "c272aeea2b9c450fbd732305ccc01b93"
-    }
-    Frame {
-        msec: 1376
-        hash: "37c7e50c270e8feb4dd9018580284a85"
-    }
-    Frame {
-        msec: 1392
-        hash: "4f37d72c10e51f68a2359086094da249"
-    }
-    Frame {
-        msec: 1408
-        hash: "a37024356613bd5d678e0b2f7b8f5959"
-    }
-    Frame {
-        msec: 1424
-        hash: "9a4bf1400da038f2088dd4c49403d852"
-    }
-    Frame {
-        msec: 1440
-        hash: "4e401b5ebff6e442fa108e94a5dba668"
-    }
-    Frame {
-        msec: 1456
-        hash: "5bd3cc309a5fce6183654975543250b2"
-    }
-    Frame {
-        msec: 1472
-        hash: "d423a9bc912237d0f20b924849ba0cb1"
-    }
-    Frame {
-        msec: 1488
-        hash: "25f463e91febf5b6d8819fd5010bc1c2"
-    }
-    Frame {
-        msec: 1504
-        hash: "3c84122b0933ee870f178d39469e51e2"
-    }
-    Frame {
-        msec: 1520
-        hash: "7e8dfe86ea0849022355b12578d4cb1a"
-    }
-    Frame {
-        msec: 1536
-        hash: "a60edcf8d792f93a839e6ddbafbf993f"
-    }
-    Frame {
-        msec: 1552
-        hash: "abf3d90803cfa12d35d2752be7ea02d8"
-    }
-    Frame {
-        msec: 1568
-        hash: "48a7dbed293fbbd5ea202190837a411f"
-    }
-    Frame {
-        msec: 1584
-        hash: "2f06ee407e5175d4b954e31c39c9522c"
-    }
-    Frame {
-        msec: 1600
-        hash: "5784deb0f3270cf7a0d0964cd9d31458"
-    }
-    Frame {
-        msec: 1616
-        hash: "809870dfd9b05ce07170edd945348ddf"
-    }
-    Frame {
-        msec: 1632
-        hash: "08bc6815601417f3731eaae398d0861d"
-    }
-    Frame {
-        msec: 1648
-        hash: "ace9db9112d147569dc0cf1a1b680d6c"
-    }
-    Frame {
-        msec: 1664
-        hash: "14d08c2ca430631af8ede1013f4f4da0"
-    }
-    Frame {
-        msec: 1680
-        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
-    }
-    Frame {
-        msec: 1696
-        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
-    }
-    Frame {
-        msec: 1712
-        hash: "a6916da6bfac27aa87d75da2bbb73f31"
-    }
-    Frame {
-        msec: 1728
-        hash: "87636076959de7e5a0a8bd8b31354ed4"
-    }
-    Frame {
-        msec: 1744
-        hash: "16e2b66f28ed80d80d9b5264d89624d5"
-    }
-    Frame {
-        msec: 1760
-        hash: "d3689b53474b4b26630d70ba01c057b4"
-    }
-    Frame {
-        msec: 1776
-        hash: "11436091b24c02af94dfa75a5fd1a001"
-    }
-    Frame {
-        msec: 1792
-        hash: "524840a3453af4e97ac82b559308cce3"
-    }
-    Frame {
-        msec: 1808
-        hash: "6712be93cf1ed2b7b202367418b6d2d7"
-    }
-    Frame {
-        msec: 1824
-        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
-    }
-    Frame {
-        msec: 1840
-        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
-    }
-    Frame {
-        msec: 1856
-        hash: "32d0e9005ebb9dfd410d348e336bcd93"
-    }
-    Frame {
-        msec: 1872
-        hash: "98dbd004cf4809dbc90bfa9272378644"
-    }
-    Frame {
-        msec: 1888
-        hash: "0b43fdee23346c30c60b822a20131cc3"
-    }
-    Frame {
-        msec: 1904
-        hash: "0696257de0441666bd264f8db6383d15"
-    }
-    Frame {
-        msec: 1920
-        image: "zoomTextOnly.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "0ae4ee18cc675749f008b897fe35cc40"
-    }
-    Frame {
-        msec: 1952
-        hash: "0ae4ee18cc675749f008b897fe35cc40"
-    }
-    Frame {
-        msec: 1968
-        hash: "7df07aea83bc5c3213e7871854661820"
-    }
-    Frame {
-        msec: 1984
-        hash: "4fc1ef611b24ec5737310859b12c83d3"
-    }
-    Frame {
-        msec: 2000
-        hash: "c2f8551d0442d0736b71c54fc965562b"
-    }
-    Frame {
-        msec: 2016
-        hash: "4ec29787e437f9619ce0f0a0f4889d0f"
-    }
-    Frame {
-        msec: 2032
-        hash: "c2f8551d0442d0736b71c54fc965562b"
-    }
-    Frame {
-        msec: 2048
-        hash: "4fc1ef611b24ec5737310859b12c83d3"
-    }
-    Frame {
-        msec: 2064
-        hash: "7df07aea83bc5c3213e7871854661820"
-    }
-    Frame {
-        msec: 2080
-        hash: "0ae4ee18cc675749f008b897fe35cc40"
-    }
-    Frame {
-        msec: 2096
-        hash: "0ae4ee18cc675749f008b897fe35cc40"
-    }
-    Frame {
-        msec: 2112
-        hash: "f5c917c7ca26bb916dd4df84eafc8e94"
-    }
-    Frame {
-        msec: 2128
-        hash: "0696257de0441666bd264f8db6383d15"
-    }
-    Frame {
-        msec: 2144
-        hash: "0b43fdee23346c30c60b822a20131cc3"
-    }
-    Frame {
-        msec: 2160
-        hash: "98dbd004cf4809dbc90bfa9272378644"
-    }
-    Frame {
-        msec: 2176
-        hash: "32d0e9005ebb9dfd410d348e336bcd93"
-    }
-    Frame {
-        msec: 2192
-        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
-    }
-    Frame {
-        msec: 2208
-        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
-    }
-    Frame {
-        msec: 2224
-        hash: "6712be93cf1ed2b7b202367418b6d2d7"
-    }
-    Frame {
-        msec: 2240
-        hash: "524840a3453af4e97ac82b559308cce3"
-    }
-    Frame {
-        msec: 2256
-        hash: "11436091b24c02af94dfa75a5fd1a001"
-    }
-    Frame {
-        msec: 2272
-        hash: "d3689b53474b4b26630d70ba01c057b4"
-    }
-    Frame {
-        msec: 2288
-        hash: "16e2b66f28ed80d80d9b5264d89624d5"
-    }
-    Frame {
-        msec: 2304
-        hash: "87636076959de7e5a0a8bd8b31354ed4"
-    }
-    Frame {
-        msec: 2320
-        hash: "a6916da6bfac27aa87d75da2bbb73f31"
-    }
-    Frame {
-        msec: 2336
-        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
-    }
-    Frame {
-        msec: 2352
-        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
-    }
-    Frame {
-        msec: 2368
-        hash: "14d08c2ca430631af8ede1013f4f4da0"
-    }
-    Frame {
-        msec: 2384
-        hash: "ace9db9112d147569dc0cf1a1b680d6c"
-    }
-    Frame {
-        msec: 2400
-        hash: "08bc6815601417f3731eaae398d0861d"
-    }
-    Frame {
-        msec: 2416
-        hash: "809870dfd9b05ce07170edd945348ddf"
-    }
-    Frame {
-        msec: 2432
-        hash: "5784deb0f3270cf7a0d0964cd9d31458"
-    }
-    Frame {
-        msec: 2448
-        hash: "2f06ee407e5175d4b954e31c39c9522c"
-    }
-    Frame {
-        msec: 2464
-        hash: "48a7dbed293fbbd5ea202190837a411f"
-    }
-    Frame {
-        msec: 2480
-        hash: "abf3d90803cfa12d35d2752be7ea02d8"
-    }
-    Frame {
-        msec: 2496
-        hash: "a60edcf8d792f93a839e6ddbafbf993f"
-    }
-    Frame {
-        msec: 2512
-        hash: "7e8dfe86ea0849022355b12578d4cb1a"
-    }
-    Frame {
-        msec: 2528
-        hash: "3c84122b0933ee870f178d39469e51e2"
-    }
-    Frame {
-        msec: 2544
-        hash: "25f463e91febf5b6d8819fd5010bc1c2"
-    }
-    Frame {
-        msec: 2560
-        hash: "d423a9bc912237d0f20b924849ba0cb1"
-    }
-    Frame {
-        msec: 2576
-        hash: "5bd3cc309a5fce6183654975543250b2"
-    }
-    Frame {
-        msec: 2592
-        hash: "4e401b5ebff6e442fa108e94a5dba668"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml
deleted file mode 100644
index 080d4d0..0000000
--- a/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml
+++ /dev/null
@@ -1,2115 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 32
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 48
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 64
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 80
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 96
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 112
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 128
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 144
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 160
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 176
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 192
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 208
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 224
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 240
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 256
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 272
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 288
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 304
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 320
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 336
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 352
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 197; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 185; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 368
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 169; y: 38
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 384
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 161; y: 40
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 400
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 155; y: 44
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 147; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 416
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 141; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 138; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 432
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 130; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 127; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 448
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 125; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 123; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 464
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 480
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 121; y: 49
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 496
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 512
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 117; y: 53
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 116; y: 53
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 528
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 115; y: 54
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 544
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 113; y: 54
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 560
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 111; y: 53
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 111; y: 52
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 576
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 110; y: 50
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 592
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 109; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 608
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 108; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 624
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 108; y: 45
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 107; y: 44
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 640
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 106; y: 43
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 656
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 42
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 672
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 41
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 688
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 704
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 720
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 736
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 40
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 752
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 39
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 768
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 37
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 36
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 784
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 35
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 800
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 816
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 106; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 832
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 848
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 864
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 880
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 896
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 106; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 912
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 928
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 944
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 960
-        image: "zooming.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 106; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 992
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1008
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1024
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1040
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1056
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 4
-        button: 1
-        buttons: 1
-        x: 106; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1072
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1088
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1104
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1120
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 106; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1136
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1152
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1168
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1184
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 106; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 106; y: 36
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1200
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 105; y: 38
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1216
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 103; y: 44
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1232
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 102; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 98; y: 50
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1248
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 94; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 90; y: 62
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1264
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 88; y: 70
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1280
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1296
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 86; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1312
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 88; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 92; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1328
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 94; y: 146
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1344
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 172
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1360
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 180
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 188
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1376
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 190
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 193
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1392
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 95; y: 195
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 95; y: 197
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1408
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 95; y: 198
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 95; y: 200
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1424
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 94; y: 201
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 94; y: 202
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1440
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 94; y: 204
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1456
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 93; y: 205
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1472
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 92; y: 206
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1488
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 92; y: 208
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1504
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 92; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1520
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 92; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 212
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1536
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1552
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1568
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1584
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1600
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1616
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1632
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1648
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1664
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1680
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1696
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1712
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 91; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1728
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1744
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1760
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1776
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 91; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1792
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1808
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1824
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1840
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 4
-        button: 1
-        buttons: 1
-        x: 91; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1856
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1872
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1888
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1904
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1920
-        image: "zooming.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 91; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1952
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1968
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 1984
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2000
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2016
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2032
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2048
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2064
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2080
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2096
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2112
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2128
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 212
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2144
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2160
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2176
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2192
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 89; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2208
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 88; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2224
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2240
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 86; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2256
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 85; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2272
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 80; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2288
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 77; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 75; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2304
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 69; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 66; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2320
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 64; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2336
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 60; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 58; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2352
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 56; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 55; y: 212
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2368
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2384
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2400
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2416
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2432
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2448
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2464
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2480
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 56; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2496
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 58; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 59; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2512
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 61; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2528
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2544
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2560
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2576
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2592
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 64; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 64; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2608
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2624
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2640
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2656
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2672
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 63; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 63; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2688
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2704
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2720
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2736
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2752
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 4
-        button: 1
-        buttons: 1
-        x: 62; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2768
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2784
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2800
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2816
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 62; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2832
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2848
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 2864
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2880
-        image: "zooming.2.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 214
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2896
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 213
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2912
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 212
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 211
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2928
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 209
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 64; y: 208
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2944
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 66; y: 202
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 198
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2960
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 72; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 186
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2976
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 76; y: 180
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 80; y: 170
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2992
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 162
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 88; y: 152
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3008
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 94; y: 142
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 98; y: 130
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3024
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 102; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 108; y: 108
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3040
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 112; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 114; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3056
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 120; y: 80
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 122; y: 72
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3072
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 126; y: 66
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 128; y: 58
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3088
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 132; y: 52
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 134; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3104
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 136; y: 40
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 140; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3120
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 144; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 150; y: 18
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3136
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 154; y: 10
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 160; y: 4
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3152
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3168
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3184
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3200
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3216
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3232
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3248
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3264
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3280
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3296
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3312
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3328
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3344
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3360
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3376
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3392
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3408
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3424
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3440
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3456
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3472
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3488
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3504
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3520
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3536
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3552
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3568
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3584
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3600
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3616
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3632
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3648
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3664
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3680
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3696
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3712
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3728
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3744
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3760
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3776
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-    Frame {
-        msec: 3792
-        hash: "c98df558c41f1837398eead42392b780"
-    }
-}
-- 
cgit v0.12


From cb2a108d79b09ec6ea91106e7f33826dceac4a42 Mon Sep 17 00:00:00 2001
From: Charles Yin <charles.yin@nokia.com>
Date: Wed, 27 Oct 2010 12:05:52 +1000
Subject: Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get
 errors

Strange Oracle bug: some Oracle servers crash the server process with non-zero error handle (mostly for 10g).
So pass null error handle pointer to OCIAttrSet when setting OCI_ATTR_CHARSET_FORM to bypass this bug.

Change-Id: Ifcf65994a22783e69a89bebe1adb882cdf36bdbb
Task-number:QTBUG-14132
Reviewed-by: Michael Goddard
---
 src/sql/drivers/oci/qsql_oci.cpp       | 106 +++++++++++++--------------------
 tests/auto/qsqlquery/tst_qsqlquery.cpp |  21 +++++++
 2 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index e11cf75..3f30ea5 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -93,11 +93,13 @@ enum { QOCIEncoding = 2002 }; // AL16UTF16LE
 enum { QOCIEncoding = 2000 }; // AL16UTF16
 #endif
 
+#ifdef OCI_ATTR_CHARSET_FORM
 // Always set the OCI_ATTR_CHARSET_FORM to SQLCS_NCHAR is safe
 // because Oracle server will deal with the implicit Conversion
 // Between CHAR and NCHAR.
 // see: http://download.oracle.com/docs/cd/A91202_01/901_doc/appdev.901/a89857/oci05bnd.htm#422705 
 static const ub1 qOraCharsetForm = SQLCS_NCHAR;
+#endif
 
 #if defined (OCI_UTF16ID)
 static const ub2 qOraCharset = OCI_UTF16ID;
@@ -117,6 +119,8 @@ static // for some reason, Sun CC can't use qOraWarning when it's declared stati
 void qOraWarning(const char* msg, OCIError *err);
 static QSqlError qMakeError(const QString& errString, QSqlError::ErrorType type, OCIError *err);
 
+
+
 class QOCIRowId: public QSharedData
 {
 public:
@@ -164,7 +168,6 @@ struct QOCIResultPrivate
     int serverVersion;
     int prefetchRows, prefetchMem;
 
-    void setCharset(OCIBind* hbnd);
     void setStatementAttributes();
     int bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, int pos,
                   const QVariant &val, dvoid *indPtr, ub2 *tmpSize, QList<QByteArray> &tmpStorage);
@@ -176,6 +179,41 @@ struct QOCIResultPrivate
     { return q->bindValueType(i) & QSql::Out; }
     inline bool isBinaryValue(int i) const
     { return q->bindValueType(i) & QSql::Binary; }
+
+    void setCharset(dvoid* handle, ub4 type) const
+    {
+        int r = 0;
+        Q_ASSERT(handle);
+
+#ifdef OCI_ATTR_CHARSET_FORM
+        r = OCIAttrSet(handle,
+                       type,
+                       // this const cast is safe since OCI doesn't touch
+                       // the charset.
+                       const_cast<void *>(static_cast<const void *>(&qOraCharsetForm)),
+                       0,
+                       OCI_ATTR_CHARSET_FORM,
+                       //Strange Oracle bug: some Oracle servers crash the server process with non-zero error handle (mostly for 10g).
+                       //So ignore the error message here.
+                       0);
+        #ifdef QOCI_DEBUG
+        if (r != 0)
+            qWarning("QOCIResultPrivate::setCharset: Couldn't set OCI_ATTR_CHARSET_FORM.");
+        #endif
+#endif
+
+        r = OCIAttrSet(handle,
+                       type,
+                       // this const cast is safe since OCI doesn't touch
+                       // the charset.
+                       const_cast<void *>(static_cast<const void *>(&qOraCharset)),
+                       0,
+                       OCI_ATTR_CHARSET_ID,
+                       err);
+        if (r != 0)
+            qOraWarning("QOCIResultPrivate::setCharsetI Couldn't set OCI_ATTR_CHARSET_ID: ", err);
+
+    }
 };
 
 void QOCIResultPrivate::setStatementAttributes()
@@ -208,36 +246,6 @@ void QOCIResultPrivate::setStatementAttributes()
     }
 }
 
-void QOCIResultPrivate::setCharset(OCIBind* hbnd)
-{
-    int r = 0;
-
-    Q_ASSERT(hbnd);
-
-    r = OCIAttrSet(hbnd,
-                   OCI_HTYPE_BIND,
-                   // this const cast is safe since OCI doesn't touch
-                   // the charset.
-                   const_cast<void *>(static_cast<const void *>(&qOraCharsetForm)),
-                   0,
-                   OCI_ATTR_CHARSET_FORM,
-                   err);
-    if (r != 0)
-        qOraWarning("QOCIResultPrivate::setCharset: Couldn't set OCI_ATTR_CHARSET_FORM: ", err);
-
-    r = OCIAttrSet(hbnd,
-                   OCI_HTYPE_BIND,
-                   // this const cast is safe since OCI doesn't touch
-                   // the charset.
-                   const_cast<void *>(static_cast<const void *>(&qOraCharset)),
-                   0,
-                   OCI_ATTR_CHARSET_ID,
-                   err);
-    if (r != 0)
-        qOraWarning("QOCIResultPrivate::setCharset: Couldn't set OCI_ATTR_CHARSET_ID: ", err);
-
-}
-
 int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, int pos,
                    const QVariant &val, dvoid *indPtr, ub2 *tmpSize, QList<QByteArray> &tmpStorage)
 {
@@ -325,7 +333,7 @@ int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, in
                              (s.length() + 1) * sizeof(QChar),
                              SQLT_STR, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
             if (r == OCI_SUCCESS)
-                setCharset(*hbnd);
+                setCharset(*hbnd, OCI_HTYPE_BIND);
             break;
         }
     } // fall through for OUT values
@@ -349,7 +357,7 @@ int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, in
                              SQLT_STR, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
         }
         if (r == OCI_SUCCESS)
-            setCharset(*hbnd);
+            setCharset(*hbnd, OCI_HTYPE_BIND);
         tmpStorage.append(ba);
         break;
     } // default case
@@ -688,7 +696,6 @@ class QOCICols
 public:
     QOCICols(int size, QOCIResultPrivate* dp);
     ~QOCICols();
-    void setCharset(OCIDefine* dfn);
     int readPiecewise(QVector<QVariant> &values, int index = 0);
     int readLOBs(QVector<QVariant> &values, int index = 0);
     int fieldFromDefine(OCIDefine* d);
@@ -890,7 +897,7 @@ QOCICols::QOCICols(int size, QOCIResultPrivate* dp)
                         &(fieldInf[idx].ind),
                         0, 0, OCI_DEFAULT);
                 if (r == 0)
-                    setCharset(dfn);
+                    d->setCharset(dfn, OCI_HTYPE_DEFINE);
             }
            break;
         default:
@@ -950,35 +957,6 @@ OCILobLocator **QOCICols::createLobLocator(int position, OCIEnv* env)
     return &lob;
 }
 
-void QOCICols::setCharset(OCIDefine* dfn)
-{
-    int r = 0;
-
-    Q_ASSERT(dfn);
-
-    r = OCIAttrSet(dfn,
-                   OCI_HTYPE_DEFINE,
-                   // this const cast is safe since OCI doesn't touch
-                   // the charset.
-                   const_cast<void *>(static_cast<const void *>(&qOraCharsetForm)),
-                   0,
-                   OCI_ATTR_CHARSET_FORM,
-                   d->err);
-    if (r != 0)
-        qOraWarning("QOCIResultPrivate::setCharset: Couldn't set OCI_ATTR_CHARSET_FORM: ", d->err);
-
-    r = OCIAttrSet(dfn,
-                   OCI_HTYPE_DEFINE,
-                   // this const cast is safe since OCI doesn't touch
-                   // the charset.
-                   const_cast<void *>(static_cast<const void *>(&qOraCharset)),
-                   0,
-                   OCI_ATTR_CHARSET_ID,
-                   d->err);
-        if (r != 0)
-            qOraWarning("QOCICols::setCharset: Couldn't set OCI_ATTR_CHARSET_ID: ", d->err);
-}
-
 int QOCICols::readPiecewise(QVector<QVariant> &values, int index)
 {
     OCIDefine*     dfn;
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index c7a61a5..7c93c7a 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -209,6 +209,8 @@ private slots:
     void QTBUG_6852();
     void QTBUG_5765_data() { generic_data("QMYSQL"); }
     void QTBUG_5765();
+    void QTBUG_14132_data() { generic_data("QOCI"); }
+    void QTBUG_14132();
     void sqlite_constraint_data() { generic_data("QSQLITE"); }
     void sqlite_constraint();
 
@@ -2933,6 +2935,25 @@ void tst_QSqlQuery::QTBUG_551()
     QCOMPARE(res_outLst[2].toString(), QLatin1String("3. Value is 2"));
 }
 
+void tst_QSqlQuery::QTBUG_14132()
+{
+    QFETCH( QString, dbName );
+    QSqlDatabase db = QSqlDatabase::database( dbName );
+    CHECK_DATABASE( db );
+    QSqlQuery q(db);
+    const QString procedureName(qTableName("procedure", __FILE__));
+    QVERIFY_SQL(q, exec("CREATE OR REPLACE PROCEDURE "+ procedureName + " (outStr OUT varchar2)  \n\
+                        is \n\
+                        begin \n\
+                        outStr := 'OUTSTRING'; \n\
+                        end;"));
+    QString outValue = "XXXXXXXXX";
+    q.prepare("CALL "+procedureName+"(?)");
+    q.addBindValue(outValue, QSql::Out);
+    QVERIFY_SQL(q, exec());
+    QCOMPARE(outValue, QLatin1String("OUTSTRING"));
+}
+
 void tst_QSqlQuery::QTBUG_5251()
 {
     QFETCH( QString, dbName );
-- 
cgit v0.12


From 03fa1fb439456428da883133d26038409462aca6 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 14:32:58 +1000
Subject: Almost all visual tests pass on linux

Still looking into text/fonts/plaintext which just developed an issue.

Task-number: QTBUG-14792
---
 .../qmlvisual/ListView/data/listview.qml           | 3079 --------------------
 .../declarative/qmlvisual/ListView/listview.qml    |    1 +
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp |    2 +-
 .../webview/autosize/data-X11/autosize.qml         |  115 -
 4 files changed, 2 insertions(+), 3195 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml

diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.qml b/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
deleted file mode 100644
index bf64029..0000000
--- a/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
+++ /dev/null
@@ -1,3079 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 32
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 48
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 64
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 80
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 96
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 112
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 128
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 144
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 160
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 176
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 192
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 208
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 224
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 240
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 256
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 272
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 288
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 304
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 320
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 336
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 352
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 368
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 384
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 400
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 416
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 432
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 448
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 464
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 480
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 496
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 512
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 528
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 544
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 560
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 576
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 592
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 608
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 624
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 640
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 656
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 672
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 688
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 704
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 720
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 736
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 752
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 768
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 784
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 800
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 816
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 832
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 848
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 864
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 880
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 896
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 912
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 928
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 944
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 960
-        image: "listview.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 992
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1008
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1024
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1040
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1056
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1072
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1088
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1104
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1120
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1136
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1152
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1168
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1184
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1200
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1216
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1232
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1248
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1264
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1280
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1296
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1312
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1328
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1344
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1360
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1376
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1392
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1408
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1424
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1440
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1456
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1472
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1488
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1504
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1520
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1536
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1552
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1568
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1584
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1600
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1616
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1632
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1648
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1664
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1680
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1696
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1712
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1728
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1744
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1760
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1776
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1792
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1808
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1824
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1840
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1856
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1872
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1888
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1904
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1920
-        image: "listview.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1952
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1968
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 1984
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2000
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2016
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2032
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2048
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2064
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2080
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2096
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2112
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2128
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2144
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2160
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2176
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2192
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2208
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2224
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2240
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2256
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2272
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2288
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2304
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2320
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2336
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2352
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2368
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2384
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2400
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2416
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2432
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2448
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2464
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2480
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2496
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2512
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2528
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2544
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2560
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2576
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2592
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 553; y: 267
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2608
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 2624
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 554; y: 267
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 555; y: 266
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2640
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 556; y: 265
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 558; y: 260
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2656
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 560; y: 256
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2672
-        hash: "c315e184c4dcb11d7e9fd4509a8b6a1f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 562; y: 250
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 566; y: 234
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2688
-        hash: "aeef1cacca9518408519b670443e396f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 568; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2704
-        hash: "621626927f83bf7b36b78f5ca7ed4ed0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 572; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 572; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2720
-        hash: "b2aca965b745e98365195c52b9dd9a2c"
-    }
-    Frame {
-        msec: 2736
-        hash: "b80cc493e604c42aca2367e26bc9e844"
-    }
-    Frame {
-        msec: 2752
-        hash: "39165ad87fc687e0f165f8a2675173b5"
-    }
-    Frame {
-        msec: 2768
-        hash: "edd1da7c34c3eb7f1f16b782dfa41a13"
-    }
-    Frame {
-        msec: 2784
-        hash: "d31a7915cdb2a7f392e6edc3047a6606"
-    }
-    Frame {
-        msec: 2800
-        hash: "3038dbb3fe3c255adcbecfc106bacb99"
-    }
-    Frame {
-        msec: 2816
-        hash: "454137c508d76f2c38b8007247420b81"
-    }
-    Frame {
-        msec: 2832
-        hash: "16eb385d3ce3b186745974500f855a97"
-    }
-    Frame {
-        msec: 2848
-        hash: "8871fded1fbbdcb0fdfdaa2e6eecc3d1"
-    }
-    Frame {
-        msec: 2864
-        hash: "f49955dab8341e7ca472c3f547cbeaab"
-    }
-    Frame {
-        msec: 2880
-        image: "listview.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "c0ef41c682fa9802c9eb74fd249cfd40"
-    }
-    Frame {
-        msec: 2912
-        hash: "6174fea6ef04fbcefd32d6a0b35a3514"
-    }
-    Frame {
-        msec: 2928
-        hash: "7b2288a8be7b3c465e725aeb5788e91f"
-    }
-    Frame {
-        msec: 2944
-        hash: "b39d8cb650ee00c245b556235843490b"
-    }
-    Frame {
-        msec: 2960
-        hash: "9478ea0bf640924931d627cd8b607eba"
-    }
-    Frame {
-        msec: 2976
-        hash: "39743788f56c6f5c29fa9549e586d1ae"
-    }
-    Frame {
-        msec: 2992
-        hash: "ec8ab3547e10d18e9493b8fae5125591"
-    }
-    Frame {
-        msec: 3008
-        hash: "169b115d03db8c901db4f4c2909a18d3"
-    }
-    Frame {
-        msec: 3024
-        hash: "bf438b17a1e8df6d6bb05474cacd12a7"
-    }
-    Frame {
-        msec: 3040
-        hash: "2aad06334128659e143c4c6c8415a30b"
-    }
-    Frame {
-        msec: 3056
-        hash: "ea0e8d7387b9b54a47bb99c058093462"
-    }
-    Frame {
-        msec: 3072
-        hash: "e483e585399a47490599ca265cf73000"
-    }
-    Frame {
-        msec: 3088
-        hash: "43bed4aac1a2a9b66eafefc117424500"
-    }
-    Frame {
-        msec: 3104
-        hash: "ba5c36add368938f8134a0a88e599c00"
-    }
-    Frame {
-        msec: 3120
-        hash: "c905be5276a871bd1ac392580231c9e4"
-    }
-    Frame {
-        msec: 3136
-        hash: "0c96d9b0119513c1f327f9e6651e89cd"
-    }
-    Frame {
-        msec: 3152
-        hash: "c4ba0836dbb900600f8f4aed42eb1ea1"
-    }
-    Frame {
-        msec: 3168
-        hash: "253d014f89a616032664f29f268cfd85"
-    }
-    Frame {
-        msec: 3184
-        hash: "a5185192d7db7c4a4c8bec6cb5a2a73a"
-    }
-    Frame {
-        msec: 3200
-        hash: "d453cc5b89d3fa00586cc41d5a9a8092"
-    }
-    Frame {
-        msec: 3216
-        hash: "b3c39c0c06643612681b098101458d32"
-    }
-    Frame {
-        msec: 3232
-        hash: "09beec410a0ca7c47fe08991341aea0c"
-    }
-    Frame {
-        msec: 3248
-        hash: "c13c269b384029d04a05fd0170e5909e"
-    }
-    Frame {
-        msec: 3264
-        hash: "cafe360c512ab92804dc1fddae9b8fb6"
-    }
-    Frame {
-        msec: 3280
-        hash: "26dfe538a7edc8f43af1d78e678f3dfa"
-    }
-    Frame {
-        msec: 3296
-        hash: "11e03f6901a4bdbc1eabe72b1ddbee4b"
-    }
-    Frame {
-        msec: 3312
-        hash: "0ea8886b1256649665a1597f62cc633b"
-    }
-    Frame {
-        msec: 3328
-        hash: "013c34be077fb689333df9b04a931b3a"
-    }
-    Frame {
-        msec: 3344
-        hash: "d0e9f1d147e0767c12a89f33b5f2b5b3"
-    }
-    Frame {
-        msec: 3360
-        hash: "9888bf29cd868bad6b2593842413b283"
-    }
-    Frame {
-        msec: 3376
-        hash: "d8ec307a85cecaacaa908ceb34d5db5b"
-    }
-    Frame {
-        msec: 3392
-        hash: "4afe1df3e802b41d1b89b5fab4e35190"
-    }
-    Frame {
-        msec: 3408
-        hash: "e8f484ed8d2a6745ee87ac9544281d55"
-    }
-    Frame {
-        msec: 3424
-        hash: "48eaa0644a27cb3e53c75bd0ce08bf47"
-    }
-    Frame {
-        msec: 3440
-        hash: "f1523d82dfc5c136fbe8746449bb5013"
-    }
-    Frame {
-        msec: 3456
-        hash: "d664786f1a79f851e72aa48ee6736374"
-    }
-    Frame {
-        msec: 3472
-        hash: "e43bb6d0374c8bab67b5fafcaeb2a205"
-    }
-    Frame {
-        msec: 3488
-        hash: "77ef61827c993b16691a023e99cc7f7e"
-    }
-    Frame {
-        msec: 3504
-        hash: "6198e0d242db79e81fb81f621c78a3c9"
-    }
-    Frame {
-        msec: 3520
-        hash: "a66b4773ef05ca78aa12e2c8a151c53a"
-    }
-    Frame {
-        msec: 3536
-        hash: "52fa0b693c3de208e5943521eef5587c"
-    }
-    Frame {
-        msec: 3552
-        hash: "0e237f706f9c2c4c616271f9b9d014e5"
-    }
-    Frame {
-        msec: 3568
-        hash: "14edd1dc2371a9aadaa3c079d325fab6"
-    }
-    Frame {
-        msec: 3584
-        hash: "1fe873b07ee24edaea224939e10830f1"
-    }
-    Frame {
-        msec: 3600
-        hash: "30804b5eb2a6d99116475cbdc1a9c043"
-    }
-    Frame {
-        msec: 3616
-        hash: "c892c17ec947a910b74f5b8704405e9f"
-    }
-    Frame {
-        msec: 3632
-        hash: "696029b77512943001c9eba64191e633"
-    }
-    Frame {
-        msec: 3648
-        hash: "4c26bb0ca28d74a2bb79d0bfc8127361"
-    }
-    Frame {
-        msec: 3664
-        hash: "2d1539db88647d73b9c53cde7c424dd7"
-    }
-    Frame {
-        msec: 3680
-        hash: "fd20e4259b44357c93f22f35c698fe1b"
-    }
-    Frame {
-        msec: 3696
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3712
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3728
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3744
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3760
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3776
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3792
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3808
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3824
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3840
-        image: "listview.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3872
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3888
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3904
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3920
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3936
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3952
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3968
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 3984
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4000
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4016
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4032
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4048
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4064
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4080
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4096
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4112
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4128
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Frame {
-        msec: 4144
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 521; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4160
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4176
-        hash: "5d49efe1383065f0b88f1bfdbbe5e165"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 37
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4192
-        hash: "a5df688148c264de1d376c9b87ddfa6b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4208
-        hash: "a4e2c1878b0afce0ee1eebd63e9c951a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 66
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4224
-        hash: "2f9a79278d492790ef86a09c77e95ff4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 531; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 531; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4240
-        hash: "5b5ce7206b26528157c426f4e1e3e0a8"
-    }
-    Frame {
-        msec: 4256
-        hash: "65a1e5f81ab89b163aed46b984cca45e"
-    }
-    Frame {
-        msec: 4272
-        hash: "e28253ad5a2415251b68bcda1d7d4bd0"
-    }
-    Frame {
-        msec: 4288
-        hash: "71aae5abb4a9e9077053ea21dd3ec315"
-    }
-    Frame {
-        msec: 4304
-        hash: "33fcea38fc3b328b3294f9ac2a26aa1a"
-    }
-    Frame {
-        msec: 4320
-        hash: "6299eb1d87f371966307668b92de6a0b"
-    }
-    Frame {
-        msec: 4336
-        hash: "4f66d8c7cb6971d0fc24089d123c547b"
-    }
-    Frame {
-        msec: 4352
-        hash: "d9906d61b31fabf968290ebcd6688f34"
-    }
-    Frame {
-        msec: 4368
-        hash: "5a1945993ff8096ba6b933d45586044a"
-    }
-    Frame {
-        msec: 4384
-        hash: "331535e54da9bbdbc2fbf2b244ad0199"
-    }
-    Frame {
-        msec: 4400
-        hash: "4dc39de0c54f6e0b77f94f6ae6c345ec"
-    }
-    Frame {
-        msec: 4416
-        hash: "ec309a298ce246c13eb666488eb75016"
-    }
-    Frame {
-        msec: 4432
-        hash: "a133819f8adc6265eb0e438261c869e3"
-    }
-    Frame {
-        msec: 4448
-        hash: "da4d64fd6b3ae7d49ee5c5c8d0117a37"
-    }
-    Frame {
-        msec: 4464
-        hash: "620dd1c3fc41ce657eac9d1a5b765fd4"
-    }
-    Frame {
-        msec: 4480
-        hash: "ff1c370bd1bf75a98ae7125e7dd5a9db"
-    }
-    Frame {
-        msec: 4496
-        hash: "59c6e4297109b5cc7c197749867dddae"
-    }
-    Frame {
-        msec: 4512
-        hash: "91b1719e86529d0c35a53a2d0a095dd6"
-    }
-    Frame {
-        msec: 4528
-        hash: "2994663d35c9eb453a27c1a1fa9aeeb8"
-    }
-    Frame {
-        msec: 4544
-        hash: "ae4ec37b9f6a00b3c9139e5cfe13d32e"
-    }
-    Frame {
-        msec: 4560
-        hash: "a98340236d1b65f47e88684168c1429d"
-    }
-    Frame {
-        msec: 4576
-        hash: "34848b483ea6a2bd412e29d26beb3ab0"
-    }
-    Frame {
-        msec: 4592
-        hash: "dd9bae0e2fca84b265d8cb59686ff88d"
-    }
-    Frame {
-        msec: 4608
-        hash: "18b6ef6f5913b0612b76e7b2e25073dd"
-    }
-    Frame {
-        msec: 4624
-        hash: "9398aab9478279aed1bc40c9378f8da4"
-    }
-    Frame {
-        msec: 4640
-        hash: "a297a304c12102f23bd1e0f0207e0df9"
-    }
-    Frame {
-        msec: 4656
-        hash: "091db9138cd6ae801ad857105a83c8f9"
-    }
-    Frame {
-        msec: 4672
-        hash: "253938ca4a4f13433ddd502eb94cb7cd"
-    }
-    Frame {
-        msec: 4688
-        hash: "6002df1793d290e4e31ee0c91c37bbe6"
-    }
-    Frame {
-        msec: 4704
-        hash: "212476fa1c3a52fb8eba03ec3aecdcd8"
-    }
-    Frame {
-        msec: 4720
-        hash: "80d4d8434d4e96a2bc23f5ed060d6ddc"
-    }
-    Frame {
-        msec: 4736
-        hash: "2d4add725f31a04558635ce4b73a758a"
-    }
-    Frame {
-        msec: 4752
-        hash: "57c06022ec1e502c4f49f43063c433e7"
-    }
-    Frame {
-        msec: 4768
-        hash: "8393e97990993f9d5f68ea65f8e4a2db"
-    }
-    Frame {
-        msec: 4784
-        hash: "9a1fcd96dffaf5c79ecc7f9427e02499"
-    }
-    Frame {
-        msec: 4800
-        image: "listview.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "5ae722cf541e3453e73bbee57dc379e9"
-    }
-    Frame {
-        msec: 4832
-        hash: "fc7326c2e2e56d9c3036e8dfc2ea77a8"
-    }
-    Frame {
-        msec: 4848
-        hash: "f22a2a68cea158f333b0457025d75490"
-    }
-    Frame {
-        msec: 4864
-        hash: "d684c8aa9b835779080f170cafead40f"
-    }
-    Frame {
-        msec: 4880
-        hash: "dd451e5e421f929d015981bc7aeb8c66"
-    }
-    Frame {
-        msec: 4896
-        hash: "d066f228295db7f46520495167d3e946"
-    }
-    Frame {
-        msec: 4912
-        hash: "ebf640a457e3498bade3220aafa70331"
-    }
-    Frame {
-        msec: 4928
-        hash: "190f5b1f3ce9d200790c34c50bcc62c5"
-    }
-    Frame {
-        msec: 4944
-        hash: "9d4ad865246eb008afa40740b5c9a208"
-    }
-    Frame {
-        msec: 4960
-        hash: "81c8b2c0b4f9e74f24d328a1d9b40a9f"
-    }
-    Frame {
-        msec: 4976
-        hash: "24acc300307e71bee79bce8de76f56cb"
-    }
-    Frame {
-        msec: 4992
-        hash: "1f9d31f94cfce6f868bfcc8a104d2465"
-    }
-    Frame {
-        msec: 5008
-        hash: "7a3cab008dcb7a893ae30797b33df6f2"
-    }
-    Frame {
-        msec: 5024
-        hash: "38d561a2950434e59513439c7f1120ea"
-    }
-    Frame {
-        msec: 5040
-        hash: "8d34131faa15bc126bd4d9ef3be39ef5"
-    }
-    Frame {
-        msec: 5056
-        hash: "85d57ef15791b56deb537795dd87911e"
-    }
-    Frame {
-        msec: 5072
-        hash: "71e932169915a6c8c2cef0b22febf316"
-    }
-    Frame {
-        msec: 5088
-        hash: "8b3452981963aeebadc9ac2013150263"
-    }
-    Frame {
-        msec: 5104
-        hash: "a3fb8abecfeb48ba1cd1fd8f40896fa0"
-    }
-    Frame {
-        msec: 5120
-        hash: "f53ab533f6a58ae45139f3da4bf8ab4e"
-    }
-    Frame {
-        msec: 5136
-        hash: "9ec7012404f3c1c7795810dcee5acc3b"
-    }
-    Frame {
-        msec: 5152
-        hash: "99ca43bab532dd5d7566e596c65053ce"
-    }
-    Frame {
-        msec: 5168
-        hash: "0af83ad2416821cc230cd2856d1a3e39"
-    }
-    Frame {
-        msec: 5184
-        hash: "86fa23ddf2005bbf35238ae04ae554ac"
-    }
-    Frame {
-        msec: 5200
-        hash: "bb52a748f1d85dde410cfa4f24e3ed20"
-    }
-    Frame {
-        msec: 5216
-        hash: "898b96bc5ee9a3ac61764e5cd9af8cfb"
-    }
-    Frame {
-        msec: 5232
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5248
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5264
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5280
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5296
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5312
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5328
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5344
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5360
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5376
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5392
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5408
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5424
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5440
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5456
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5472
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5488
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5504
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5520
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5536
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5552
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5568
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5584
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5600
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5616
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5632
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5648
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5664
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5680
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5696
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5712
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5728
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5744
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5760
-        image: "listview.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5792
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5808
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5824
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5840
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5856
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5872
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5888
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5904
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5920
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5936
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5952
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Frame {
-        msec: 5968
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 111; y: 230
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 227
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 223
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "3b88645092be28037fca4a6034f5b2f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "0076b55d3da4ca365688b6a2c984103f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 112; y: 205
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "db846ad8e3200ca1fce36a38dc7beab8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 112; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "3cb6b25725b4285f9c096d595224c5ca"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 180
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "1832e12fdf3b464b02b296e727b33694"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 173
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "6d18d2b5f65cbba4915d0725d24b40f3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 109; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 140
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "79bc7afc6b1aa5f8904b3e6d5d4a9389"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "4436f2d15304c839aacec486c1fd6d96"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 111
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "c3bffc7c95893cf9bbd8596208b7f657"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 105
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "04231c2fdc02729aa34ed4e403dd373b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "392d75c4b372825e78366eb63a618170"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 83
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "7f91f7bdb0cb62d600ac4aa573681fe3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 79
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "69207181a382650c5e33145555f0d9ba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 72
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6208
-        hash: "65a184b5c49b02e08114e437483f928d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 64
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6224
-        hash: "c22da9ce54d04f51fb55da755753a509"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 61
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6240
-        hash: "59dbd5216847a62f60a1d0701a15bb62"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 57
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 53
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6256
-        hash: "bbfc902db6e6ca253afb1c90306b2a63"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 47
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 106; y: 47
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6272
-        hash: "5c41f194afec5f7e3db9d98673d03d5c"
-    }
-    Frame {
-        msec: 6288
-        hash: "5c41f194afec5f7e3db9d98673d03d5c"
-    }
-    Frame {
-        msec: 6304
-        hash: "deb06d0f915d5f6ec39b1820d57b6af6"
-    }
-    Frame {
-        msec: 6320
-        hash: "deb06d0f915d5f6ec39b1820d57b6af6"
-    }
-    Frame {
-        msec: 6336
-        hash: "2a1a1f9239a6ccb308e51796f9b0bb89"
-    }
-    Frame {
-        msec: 6352
-        hash: "3c1b44201616b8271023bf05a3f3f0f7"
-    }
-    Frame {
-        msec: 6368
-        hash: "87afcef49db8b2b547e85e834f8ec304"
-    }
-    Frame {
-        msec: 6384
-        hash: "290081b4b1272ef09ec9964c128e61b5"
-    }
-    Frame {
-        msec: 6400
-        hash: "19bb3b23ee4b14a5f0a313106ef7c8c1"
-    }
-    Frame {
-        msec: 6416
-        hash: "65a184b5c49b02e08114e437483f928d"
-    }
-    Frame {
-        msec: 6432
-        hash: "832d2aefbcaf776f35039be527d367c5"
-    }
-    Frame {
-        msec: 6448
-        hash: "69207181a382650c5e33145555f0d9ba"
-    }
-    Frame {
-        msec: 6464
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6480
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6496
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6512
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6528
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6544
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6560
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6576
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6592
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6608
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6624
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6640
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6656
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6672
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6688
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6704
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6720
-        image: "listview.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6752
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6768
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6784
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6800
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6816
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6832
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6848
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6864
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6880
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6896
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6912
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6928
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6944
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6960
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6976
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 6992
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7008
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7024
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7040
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7056
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7072
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7088
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7104
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7120
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7136
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7152
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7168
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7184
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7200
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7216
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7232
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7248
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7264
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7280
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Frame {
-        msec: 7296
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 519; y: 276
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 519; y: 275
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 519; y: 274
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 273
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 272
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 271
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 268
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7392
-        hash: "89fe95733476bd000457e36ee4ecfc73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 266
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 265
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7408
-        hash: "9047f597b9e59ca652c172338bed6ef9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 262
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "87476f78daecd6bb49e8d6e673d28100"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 260
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7440
-        hash: "6bfd895c6b7d97e4102eb26608cdfeca"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 254
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "e4c2b75beaee54a5781a5acbeb37ea64"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 249
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "d5e816768e9c3db0631416bd86b1b461"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 243
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7488
-        hash: "22cb512b302afc6c3c9dec1d47b3bf03"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 237
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7504
-        hash: "a7e458e007954bd908cf27a1841d36ea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 231
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "0f9fa53b247f72e9a8ff6201b188b410"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 225
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7536
-        hash: "c986ea3853dd33f7f2b5629f67429423"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: 219
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7552
-        hash: "114ffaa5cf38e4884a1d477884541b44"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 518; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7568
-        hash: "7cdf1bb327484618909ded5411aca4ec"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 519; y: 208
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7584
-        hash: "d4c005194ed510f5d54a811176943dc2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 520; y: 202
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7600
-        hash: "3103351bc83675c877fb6dcd1a6ddbbc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 196
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7616
-        hash: "2c13ddda8d89501c9487b83f8b115570"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7632
-        hash: "476834b6d88077f9983ed358c06bd0c3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 185
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7648
-        hash: "cc2148c6a7ba0bbe6ceea848b7e48621"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7664
-        hash: "5b8824848dd1de3632b26e04e95b5899"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 169
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7680
-        image: "listview.7.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 160
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7696
-        hash: "d0a4a8b631e3494043f261fb8da67938"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7712
-        hash: "985111215c3959a45b293879af701318"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 147
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7728
-        hash: "ed5917a3fe95777f2efdaa154af0c489"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 144
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "6fa9de2983f0e30cb96c035c28757b93"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7760
-        hash: "fd568c7d27618a71b0f0882ca57b685b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 130
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7776
-        hash: "f5b941f5741a9a78122605576809c395"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7792
-        hash: "ffc96a85d7dbbed257b69a0c735e21b8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 122
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7808
-        hash: "cfb6335c5449554e631d6e3106ea8a00"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7824
-        hash: "ff9786e85ee8af6177ac8e5cc1307462"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 111
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7840
-        hash: "3140b49dfee8e690b5c778044385e107"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 106
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7856
-        hash: "0d899af24685a9998a6b961023286fde"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7872
-        hash: "99ee1e8803c05e546a721b0c9ee39499"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "96e7da2f895500a786ed36cb295e9003"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "cd369fc5dc31814208e56cf7cd0decea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "5fee72994b65a45b4900a3073f86a3e1"
-    }
-    Frame {
-        msec: 7936
-        hash: "9a2f8a65d842b8f92998e6411f7cd53c"
-    }
-    Frame {
-        msec: 7952
-        hash: "2848d69017ce71ae101ccdfa7c67f933"
-    }
-    Frame {
-        msec: 7968
-        hash: "6568aa88e81f988f65da435df7166167"
-    }
-    Frame {
-        msec: 7984
-        hash: "d5f15ee08a2d7667786757a378a7a7f4"
-    }
-    Frame {
-        msec: 8000
-        hash: "9b566bd02a561b32d1a4c1ec99c2e2c3"
-    }
-    Frame {
-        msec: 8016
-        hash: "580419e1c9e91046547d913f6b8790a4"
-    }
-    Frame {
-        msec: 8032
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8048
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8064
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 521; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8080
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8096
-        hash: "a5a3cd610ec0b35af1295ee6c41e09e3"
-    }
-    Frame {
-        msec: 8112
-        hash: "83b91a371d682a501bc3a3fceabe4f8c"
-    }
-    Frame {
-        msec: 8128
-        hash: "798b1dbfa0cce362213f426e2c60ac0e"
-    }
-    Frame {
-        msec: 8144
-        hash: "d71b6a693c430a618c23413cb65bb320"
-    }
-    Frame {
-        msec: 8160
-        hash: "2baae394390da39447a67151bc503d65"
-    }
-    Frame {
-        msec: 8176
-        hash: "06688b05c61a7b862d39534207a8adab"
-    }
-    Frame {
-        msec: 8192
-        hash: "a1d3042e16709817906dcdc673ee52c7"
-    }
-    Frame {
-        msec: 8208
-        hash: "236dd41feac1b1a8a4bd7911bb184da2"
-    }
-    Frame {
-        msec: 8224
-        hash: "f3ec821bba1d32e90bdab0e85c07d7d8"
-    }
-    Frame {
-        msec: 8240
-        hash: "e328c35adf7ffc3d7e3af97e798ec8a5"
-    }
-    Frame {
-        msec: 8256
-        hash: "651101db68fd3ed1dc5f441c126dc31b"
-    }
-    Frame {
-        msec: 8272
-        hash: "651101db68fd3ed1dc5f441c126dc31b"
-    }
-    Frame {
-        msec: 8288
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8304
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8320
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8336
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8352
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8368
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8384
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8400
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8416
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8432
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8448
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8464
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8480
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8496
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8512
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8528
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8544
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8560
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8576
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8592
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8608
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8624
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8640
-        image: "listview.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8672
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8688
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8704
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8720
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8736
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8752
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8768
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8784
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8800
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8816
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8832
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8848
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8864
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8880
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8896
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8912
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8928
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8944
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8960
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8976
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 8992
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9008
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9024
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9040
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9056
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9072
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9088
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9104
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9120
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9136
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9152
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9168
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9184
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9200
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9216
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9232
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9248
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9264
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9280
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9296
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9312
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9328
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9344
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9360
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9376
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9392
-        hash: "1171be123a361d72859c25434573482c"
-    }
-    Frame {
-        msec: 9408
-        hash: "1171be123a361d72859c25434573482c"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/ListView/listview.qml b/tests/auto/declarative/qmlvisual/ListView/listview.qml
index 7e7af59..35ec982 100644
--- a/tests/auto/declarative/qmlvisual/ListView/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/listview.qml
@@ -1,5 +1,6 @@
 import QtQuick 1.0
 
+// Broken - QTBUG-14794
 Rectangle {
     width: 600; height: 300; color: "white"
 
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index a2d3273..21c5aa0 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -143,7 +143,7 @@ void tst_qmlvisual::visual_data()
 
     foreach (const QString &file, files) {
         QString testdata = toTestScript(file);
-        if (testdata.isEmpty())
+        if (testdata.isEmpty() || !QFile::exists(testdata+".qml"))
             continue;
 
         QTest::newRow(file.toLatin1().constData()) << file << testdata;
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml
deleted file mode 100644
index 6122138..0000000
--- a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b2d863e57dee2a297d038e18acc70f92"
-    }
-    Frame {
-        msec: 32
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 48
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 64
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 80
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 96
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 112
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 128
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 144
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 160
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 176
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 192
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 208
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 224
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 240
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 256
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 272
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 288
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 304
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 320
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 336
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 352
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 368
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 384
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 400
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 416
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-    Frame {
-        msec: 432
-        hash: "903a4c7e619abba5342c8c827f26a722"
-    }
-}
-- 
cgit v0.12


From 8e3a0c2df1cff2ca960555ad16654ff77f7efcc8 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 14:58:58 +1000
Subject: Add 'skip' property that QML visual tests can use

This property can be set with a reason to skip the test (i.e. known bug)
and the failure will not count for blocking purposes.

This change also alters one of the failing tests to use the new property

Task-number: QTBUG-14792
Reviewed-by: Michael Brasser
---
 .../qmlvisual/ListView/data/listview.0.png         |  Bin 1510 -> 1580 bytes
 .../qmlvisual/ListView/data/listview.1.png         |  Bin 1510 -> 1580 bytes
 .../qmlvisual/ListView/data/listview.10.png        |  Bin 1588 -> 0 bytes
 .../qmlvisual/ListView/data/listview.11.png        |  Bin 1575 -> 0 bytes
 .../qmlvisual/ListView/data/listview.12.png        |  Bin 1502 -> 0 bytes
 .../qmlvisual/ListView/data/listview.13.png        |  Bin 1583 -> 0 bytes
 .../qmlvisual/ListView/data/listview.14.png        |  Bin 1681 -> 0 bytes
 .../qmlvisual/ListView/data/listview.15.png        |  Bin 1524 -> 0 bytes
 .../qmlvisual/ListView/data/listview.16.png        |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data/listview.17.png        |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data/listview.18.png        |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data/listview.19.png        |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data/listview.2.png         |  Bin 1656 -> 1661 bytes
 .../qmlvisual/ListView/data/listview.3.png         |  Bin 1524 -> 1649 bytes
 .../qmlvisual/ListView/data/listview.4.png         |  Bin 1678 -> 1669 bytes
 .../qmlvisual/ListView/data/listview.5.png         |  Bin 1510 -> 1651 bytes
 .../qmlvisual/ListView/data/listview.6.png         |  Bin 1573 -> 1611 bytes
 .../qmlvisual/ListView/data/listview.7.png         |  Bin 1669 -> 1579 bytes
 .../qmlvisual/ListView/data/listview.8.png         |  Bin 1658 -> 1579 bytes
 .../qmlvisual/ListView/data/listview.9.png         |  Bin 1510 -> 0 bytes
 .../qmlvisual/ListView/data/listview.qml           | 2227 ++++++++++++++++++++
 .../declarative/qmlvisual/ListView/listview.qml    |    2 +-
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp |    4 +-
 tools/qml/main.cpp                                 |    3 +
 tools/qml/qdeclarativetester.cpp                   |   32 +-
 tools/qml/qdeclarativetester.h                     |    1 +
 tools/qml/qmlruntime.h                             |    3 +-
 27 files changed, 2263 insertions(+), 9 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.10.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.11.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.12.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.13.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.14.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.15.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.16.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.17.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.18.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.19.png
 delete mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/listview.qml

diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png
index 581e824..78c1c27 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png
index 581e824..ecd1e01 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.10.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.10.png
deleted file mode 100644
index dcfca3f..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.10.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.11.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.11.png
deleted file mode 100644
index 7cc4047..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.11.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.12.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.12.png
deleted file mode 100644
index a97f4ad..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.12.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.13.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.13.png
deleted file mode 100644
index 7a8c6bd..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.13.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.14.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.14.png
deleted file mode 100644
index ae47356..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.14.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.15.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.15.png
deleted file mode 100644
index b3a7260..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.15.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.16.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.16.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.16.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.17.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.17.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.17.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.18.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.18.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.18.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.19.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.19.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.19.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png
index 579c68c..ba1733f 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png
index b3a7260..7a393d1 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png
index 19758b0..cb73ca9 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png
index 581e824..cbbe6d7 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.6.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.6.png
index 82cac48..38ed525 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.6.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.7.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.7.png
index 9277a82..9e7bd6e 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.7.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.8.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.8.png
index 8c36da7..9e7bd6e 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.8.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.9.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.9.png
deleted file mode 100644
index 581e824..0000000
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.9.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.qml b/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
new file mode 100644
index 0000000..1db722f
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
@@ -0,0 +1,2227 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 32
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 48
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 64
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 80
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 96
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 112
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 128
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 144
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 160
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 176
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 192
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 208
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 224
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 240
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 256
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 272
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 288
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 304
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 320
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 336
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 352
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 368
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 384
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 400
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Frame {
+        msec: 416
+        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 432
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 448
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 464
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 480
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 496
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 512
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 528
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 544
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 560
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 576
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 592
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 608
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 624
+        hash: "3b88645092be28037fca4a6034f5b2f7"
+    }
+    Frame {
+        msec: 640
+        hash: "435ac0668ad4d0e196eb040d385053cb"
+    }
+    Frame {
+        msec: 656
+        hash: "e9532fe1acc1c27a2119e6dde3e01637"
+    }
+    Frame {
+        msec: 672
+        hash: "9c757feaf5a8d1e88c659fca97e3b7b2"
+    }
+    Frame {
+        msec: 688
+        hash: "ccc7785a45a41615db01580835a4638e"
+    }
+    Frame {
+        msec: 704
+        hash: "11ad92022bcd5d3fbd28ffb9f51c69eb"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "a8a94e1f95216864c368b8c3d0ae682b"
+    }
+    Frame {
+        msec: 736
+        hash: "d83e213d35e7fcff2580b4e197547f24"
+    }
+    Frame {
+        msec: 752
+        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
+    }
+    Frame {
+        msec: 768
+        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 784
+        hash: "0e9c577fa86d9b3734da0d50040624e0"
+    }
+    Frame {
+        msec: 800
+        hash: "834cf83f0f8d613191cac775b5737664"
+    }
+    Frame {
+        msec: 816
+        hash: "495ea7650b2ae45f9afd7f9f6ecdd793"
+    }
+    Frame {
+        msec: 832
+        hash: "55c761ccee6543bb3b9564bb813df58e"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 848
+        hash: "e29e5f86cb3b1fb5ec77fde696024812"
+    }
+    Frame {
+        msec: 864
+        hash: "f24b7d5a8f5ab03460505d6203269d1b"
+    }
+    Frame {
+        msec: 880
+        hash: "893473965efe9e0540b197cbaa3f765d"
+    }
+    Frame {
+        msec: 896
+        hash: "a541b7be2f370f948048b2101b037ab7"
+    }
+    Frame {
+        msec: 912
+        hash: "a541b7be2f370f948048b2101b037ab7"
+    }
+    Frame {
+        msec: 928
+        hash: "a541b7be2f370f948048b2101b037ab7"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 944
+        hash: "a541b7be2f370f948048b2101b037ab7"
+    }
+    Frame {
+        msec: 960
+        image: "listview.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "e97f78604c0c6d468c8dd225642e2ebd"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 992
+        hash: "7b9d4b14eedfa4ff10dd7e3747c4a7f5"
+    }
+    Frame {
+        msec: 1008
+        hash: "6d55ba6287c720614854d36bb681a9f3"
+    }
+    Frame {
+        msec: 1024
+        hash: "3e7a44811f59bfb81de2f4f884a7af17"
+    }
+    Frame {
+        msec: 1040
+        hash: "101113a7723b9d09275f66152b82142f"
+    }
+    Frame {
+        msec: 1056
+        hash: "0044e068522f912630868476f8bf49f8"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1072
+        hash: "4a50079d15b51758bf39b6d3fc51f337"
+    }
+    Frame {
+        msec: 1088
+        hash: "df659ebf6a5926943de92d6838127b9c"
+    }
+    Frame {
+        msec: 1104
+        hash: "0aa422c4af139023817465090f42f264"
+    }
+    Frame {
+        msec: 1120
+        hash: "fb598a01e5cd9e3655f86a47ff7bda0d"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1136
+        hash: "83a63dfcdbb27035d3e5208b066a2e1e"
+    }
+    Frame {
+        msec: 1152
+        hash: "c8250f4cf69642e78523412b7b75501c"
+    }
+    Frame {
+        msec: 1168
+        hash: "c57e421c803e8bfa1a85409cbb858829"
+    }
+    Frame {
+        msec: 1184
+        hash: "f7611692216c0519b9188924e8a6b92e"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "0f9495c9f9f91c409f868959854824ed"
+    }
+    Frame {
+        msec: 1216
+        hash: "d4a752aa1c4112a3b60f40468932945d"
+    }
+    Frame {
+        msec: 1232
+        hash: "fbe2d7c160132f312911aabe4cad8bf5"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1248
+        hash: "2d3c7dc0d0efac613a32860968d166ac"
+    }
+    Frame {
+        msec: 1264
+        hash: "fa0891d8c22dd26c1cb27d86864a8225"
+    }
+    Frame {
+        msec: 1280
+        hash: "5d26f27061b319c391961dc30d985593"
+    }
+    Frame {
+        msec: 1296
+        hash: "e038ae877e8dddd3d99bf97475f59b3d"
+    }
+    Frame {
+        msec: 1312
+        hash: "f44adc5e46d320c62095e1285ca8848b"
+    }
+    Frame {
+        msec: 1328
+        hash: "f44adc5e46d320c62095e1285ca8848b"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1344
+        hash: "17f6b13e0556ac07dc527a9013a307a1"
+    }
+    Frame {
+        msec: 1360
+        hash: "70a1cc3b6dd3be4e30bb6763344fb980"
+    }
+    Frame {
+        msec: 1376
+        hash: "097c37d2243a27b8e800b5d4ec94b2e3"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "15839227c002b1c71eb516f6653a7531"
+    }
+    Frame {
+        msec: 1408
+        hash: "f4a8103ef9010c651368d325fe9eee98"
+    }
+    Frame {
+        msec: 1424
+        hash: "d158ec1c83719c58c1d0a2e4cc90998f"
+    }
+    Frame {
+        msec: 1440
+        hash: "6f66a44f5dc3fe150db2291b8cbc7327"
+    }
+    Frame {
+        msec: 1456
+        hash: "8a016eac5befb215a157f7fe5bc743de"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1472
+        hash: "807129a4c578b1a5f0d3d84686eb0553"
+    }
+    Frame {
+        msec: 1488
+        hash: "f9f2da990518048f0b050cc193567a20"
+    }
+    Frame {
+        msec: 1504
+        hash: "762de7b1f4e56df6d7a245a23446884b"
+    }
+    Frame {
+        msec: 1520
+        hash: "84ba7354badc3dca92974933c3610010"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1536
+        hash: "36c3018870d74cff638d00acd03a0cf0"
+    }
+    Frame {
+        msec: 1552
+        hash: "82b756a14eb0e802cd3e2d2d2a07f28e"
+    }
+    Frame {
+        msec: 1568
+        hash: "74af1c12613130dc53533fe1178d5534"
+    }
+    Frame {
+        msec: 1584
+        hash: "c32818b0ba24f11295580d1ccffffdc0"
+    }
+    Frame {
+        msec: 1600
+        hash: "c32818b0ba24f11295580d1ccffffdc0"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1616
+        hash: "b858be109fac6852234bf1db161e515b"
+    }
+    Frame {
+        msec: 1632
+        hash: "9b3f8cffd3e79241d8a3b1f7d80790db"
+    }
+    Frame {
+        msec: 1648
+        hash: "840dc72aabc4a9b28bae641354676324"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "c60bfd5cc8b26a841035db29baba5dab"
+    }
+    Frame {
+        msec: 1680
+        hash: "88d80dc8b0d968aa718ff464e507f53b"
+    }
+    Frame {
+        msec: 1696
+        hash: "f7ffc82d3448c415b4997401fb61b96b"
+    }
+    Frame {
+        msec: 1712
+        hash: "df8e9a09752fe2b2eff9184ba8e88ef1"
+    }
+    Frame {
+        msec: 1728
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1744
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1776
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1808
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1824
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1840
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1856
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1872
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1888
+        hash: "97330e949a609f5f33832dd17e0c3716"
+    }
+    Frame {
+        msec: 1904
+        hash: "15e45e1f64438d7c31e79a9602e1db7a"
+    }
+    Frame {
+        msec: 1920
+        image: "listview.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "fae571933c4eafb33bb764bd1cddfc30"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1952
+        hash: "33091359f9e6f21a14bf415d32d4d3b1"
+    }
+    Frame {
+        msec: 1968
+        hash: "0fdcffa304f3eadde5cd7866d0a74e72"
+    }
+    Frame {
+        msec: 1984
+        hash: "024539dbf8e66f1ba7d5d8c91bd278f0"
+    }
+    Frame {
+        msec: 2000
+        hash: "4900babcc0a7bbd622a72590dcb0eea4"
+    }
+    Frame {
+        msec: 2016
+        hash: "d6f68d576fe46bb832accf5e9e590f7e"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "5a54bcb9a59268d70a2bb99bd32395be"
+    }
+    Frame {
+        msec: 2048
+        hash: "72fbb18da8c5ef3e98390796dad31390"
+    }
+    Frame {
+        msec: 2064
+        hash: "ac073b398e3d50ef10c92d8e6b4b3fa0"
+    }
+    Frame {
+        msec: 2080
+        hash: "41e38d866d65bf1d42448b07a133cd93"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2096
+        hash: "c45310b94cd2ff276e97be1706e1d432"
+    }
+    Frame {
+        msec: 2112
+        hash: "aefc6994644d266d4be0310f01c28be7"
+    }
+    Frame {
+        msec: 2128
+        hash: "f07bcb1d8ad693e1ddd79bf651126554"
+    }
+    Frame {
+        msec: 2144
+        hash: "62ff227caab71d2d98daf0da302ec796"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "72350eeeaefd043354c82ca2039cff59"
+    }
+    Frame {
+        msec: 2176
+        hash: "d89f288f0b231b4ec4a634b3856ecf8e"
+    }
+    Frame {
+        msec: 2192
+        hash: "bc7d7e2253651cb3ea1cdebf9f188ae0"
+    }
+    Frame {
+        msec: 2208
+        hash: "7c89cdb693489708fe2db327ae66d083"
+    }
+    Frame {
+        msec: 2224
+        hash: "8ca778c1812ede19545c3c70020faa67"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "bd50cd99f177eb3f70b2ffad9f7a49e1"
+    }
+    Frame {
+        msec: 2256
+        hash: "b439c3576cad17689e7b6b134bb04e14"
+    }
+    Frame {
+        msec: 2272
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2288
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2304
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2320
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2336
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2352
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2368
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2384
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2400
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2416
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 488; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2432
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Frame {
+        msec: 2448
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 489; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2464
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 490; y: 59
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 491; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2480
+        hash: "9489c0e1e8cc5675bbc42b78e567eab6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 494; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2496
+        hash: "6502b3a17af7ebca92d4794f0c2a62ac"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 499; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 501; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2512
+        hash: "8a7ac12d59126b2784fd0af8d6b762a5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 505; y: 170
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2528
+        hash: "12fa9c4e2d6681f3a0643d8243d83e23"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 509; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2544
+        hash: "ccf18952f7c9686bd12fa196af9919e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 516; y: 289
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2560
+        hash: "70d654eecaf2163971596a503d2925a0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 518; y: 316
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 518; y: 316
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2576
+        hash: "01ef888104f290f25612970a91e64620"
+    }
+    Frame {
+        msec: 2592
+        hash: "25b730c7c126875078c64cce118f6277"
+    }
+    Frame {
+        msec: 2608
+        hash: "85c0127315a489cfcf14ec7e16e43f4c"
+    }
+    Frame {
+        msec: 2624
+        hash: "65f1be6c38fa9e024671bfe612c585b4"
+    }
+    Frame {
+        msec: 2640
+        hash: "74b7b60a048d37c38f179d071e9d9730"
+    }
+    Frame {
+        msec: 2656
+        hash: "13c96d066af31d75647b0be21f1ae68d"
+    }
+    Frame {
+        msec: 2672
+        hash: "a1f880a95596f6c82385e51a4853327e"
+    }
+    Frame {
+        msec: 2688
+        hash: "8596123a6b0f234d90869d823448ff8e"
+    }
+    Frame {
+        msec: 2704
+        hash: "1ca65b63eea4034e3889f53c86ac95b7"
+    }
+    Frame {
+        msec: 2720
+        hash: "b847b515d89ad0394ef0fd4954158940"
+    }
+    Frame {
+        msec: 2736
+        hash: "f73f7747115fdda2f0a13734a0dc9446"
+    }
+    Frame {
+        msec: 2752
+        hash: "5b31a1aca62cf654428e4d7fc25208b6"
+    }
+    Frame {
+        msec: 2768
+        hash: "f797d3c0364515138059967e17e185ed"
+    }
+    Frame {
+        msec: 2784
+        hash: "dff0266adf50e30bc2a7674b001d19dc"
+    }
+    Frame {
+        msec: 2800
+        hash: "610c72005c1aa83306fecc9ca34bf5a4"
+    }
+    Frame {
+        msec: 2816
+        hash: "542587ab3dff0cfb3f724096871e925a"
+    }
+    Frame {
+        msec: 2832
+        hash: "fd79c9159a77b1be25d9cfde2e6cecb6"
+    }
+    Frame {
+        msec: 2848
+        hash: "e3d4bb451d6210e6006c54178d406068"
+    }
+    Frame {
+        msec: 2864
+        hash: "3dd3c57049bddb206c0204d7fbf673b0"
+    }
+    Frame {
+        msec: 2880
+        image: "listview.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "44008e30de01ecb1893a0fe4b06ec63a"
+    }
+    Frame {
+        msec: 2912
+        hash: "c593c7e7edab1a034b96f778259b5b91"
+    }
+    Frame {
+        msec: 2928
+        hash: "9ac483cb720fef5783abd4e0072cf71e"
+    }
+    Frame {
+        msec: 2944
+        hash: "bed738f1883a76c5169dd2726456b9ea"
+    }
+    Frame {
+        msec: 2960
+        hash: "c80c45be3189269d8edc5be22db7227d"
+    }
+    Frame {
+        msec: 2976
+        hash: "3dcb08dd8ac8f083ad6aacbafaae05f4"
+    }
+    Frame {
+        msec: 2992
+        hash: "38850ecc15cdcd55b758f94e8ac7fe55"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 517; y: 241
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3008
+        hash: "033c44c51b8ab8f1555e153e20a80699"
+    }
+    Frame {
+        msec: 3024
+        hash: "b6dc510369c679a028bb059e74796f6c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 518; y: 240
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 519; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3040
+        hash: "f3606887493ee9c0db86b1c6cc6fef6d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 524; y: 229
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3056
+        hash: "79975f978ebf4556381d08b500dcab72"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 530; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3072
+        hash: "1345974969c1a56c4c14c74301985289"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 532; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3088
+        hash: "fd623f2bf161f326da6dec8b5d8bf16f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 530; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 530; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3104
+        hash: "f1dfb47c5d4449e6cf7e2e6a2e86b1c5"
+    }
+    Frame {
+        msec: 3120
+        hash: "26b31d08a1d50614771bec0458a2776b"
+    }
+    Frame {
+        msec: 3136
+        hash: "dd017925e34f942c279ceb18b5e222da"
+    }
+    Frame {
+        msec: 3152
+        hash: "be400b4ad1d9a1ccca56b8ff6b809272"
+    }
+    Frame {
+        msec: 3168
+        hash: "4a4faa75155bb2c260f3a35675bd113e"
+    }
+    Frame {
+        msec: 3184
+        hash: "3884c5d0d4c127876ba92a7b3a416339"
+    }
+    Frame {
+        msec: 3200
+        hash: "b3d15196484410e24084b0f0d8fd683f"
+    }
+    Frame {
+        msec: 3216
+        hash: "ed636ae433d185338ddbf7bffae731e1"
+    }
+    Frame {
+        msec: 3232
+        hash: "45bacd56ecaeefd9c80c7bd77e79cff0"
+    }
+    Frame {
+        msec: 3248
+        hash: "ad5239583e3924c98358e0ec7d12fd39"
+    }
+    Frame {
+        msec: 3264
+        hash: "8e0fbae41165c553af4a49ed5691dfbb"
+    }
+    Frame {
+        msec: 3280
+        hash: "c697930f45e23628c83a248de44472fb"
+    }
+    Frame {
+        msec: 3296
+        hash: "840e1f8ba5fe6e42d6dc41c1e42dc3dc"
+    }
+    Frame {
+        msec: 3312
+        hash: "e071cd254b69da678997eeb7ac0a13f8"
+    }
+    Frame {
+        msec: 3328
+        hash: "27954d55c9772aa0ba237e7bdff75517"
+    }
+    Frame {
+        msec: 3344
+        hash: "5879feff61f02a9322b8620c84be4462"
+    }
+    Frame {
+        msec: 3360
+        hash: "feba016bdcdc3f59b70000375a5b4242"
+    }
+    Frame {
+        msec: 3376
+        hash: "e57ae7048209884fb024481318c88080"
+    }
+    Frame {
+        msec: 3392
+        hash: "93707dc8ec5e02adb691d0c6f3ff7772"
+    }
+    Frame {
+        msec: 3408
+        hash: "ab2d8b822a4e2cd7c6a9cfa2e81d2113"
+    }
+    Frame {
+        msec: 3424
+        hash: "a9d0e39b30b16eafec85e08a75e2b50f"
+    }
+    Frame {
+        msec: 3440
+        hash: "8c94d16c8cde9b3d0ac8ccfb1374387d"
+    }
+    Frame {
+        msec: 3456
+        hash: "7f4873f6c773b3d2d814bb1ea5c5dec6"
+    }
+    Frame {
+        msec: 3472
+        hash: "77f91f90744a23bbe172629f311d1a4e"
+    }
+    Frame {
+        msec: 3488
+        hash: "3963753a90d6cbf74bc21c9d06f4227b"
+    }
+    Frame {
+        msec: 3504
+        hash: "042adc29907ca50187d4aad772a7500d"
+    }
+    Frame {
+        msec: 3520
+        hash: "90accd1b4f5bbe5cc59f3a73d697ea18"
+    }
+    Frame {
+        msec: 3536
+        hash: "3ce26e9c0b2ee1b4cb3dc19bbac92736"
+    }
+    Frame {
+        msec: 3552
+        hash: "ca976ad1590e156e155cdba452dbc0ce"
+    }
+    Frame {
+        msec: 3568
+        hash: "b342477cedfb2a3839aa145703f33cb4"
+    }
+    Frame {
+        msec: 3584
+        hash: "8fccdb3fbf637426b8b3df088a5a24a5"
+    }
+    Frame {
+        msec: 3600
+        hash: "973c8d2d2496c5cc871aecc0b6be0bbb"
+    }
+    Frame {
+        msec: 3616
+        hash: "6af9574467c7b565450dc6533dddb0f2"
+    }
+    Frame {
+        msec: 3632
+        hash: "ced3d8a93bf564c0ebec837f1655c202"
+    }
+    Frame {
+        msec: 3648
+        hash: "0a38fe8ac9024b4a30b8efbcf155bbd8"
+    }
+    Frame {
+        msec: 3664
+        hash: "2421dc73fe95e8abb246ae894ac255b2"
+    }
+    Frame {
+        msec: 3680
+        hash: "98789298fcc85a0b3307036c800d80af"
+    }
+    Frame {
+        msec: 3696
+        hash: "6361b512cfd9aa5f97529089ad7d902c"
+    }
+    Frame {
+        msec: 3712
+        hash: "5f26400f45140d634ac49ae5ce6bc2cf"
+    }
+    Frame {
+        msec: 3728
+        hash: "49586dcf6a4c7a80563e9cc67b16a520"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 487; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3744
+        hash: "fa8827f2a5eefaa9f740e36e4eb05083"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 488; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3760
+        hash: "5f2e33f8b436686840a124ba71f7d203"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 489; y: 49
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3776
+        hash: "b0093a1f538381e79f43c91192437be5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 490; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3792
+        hash: "9a8e645817c214a0353beadc0bc2e3f8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 490; y: 60
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3808
+        hash: "3f059fefcb7908e6f89a4b245bd0c948"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 491; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3824
+        hash: "48ccbb037ebe01dc9c73fafa54aa6175"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 491; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3840
+        image: "listview.3.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 493; y: 93
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3856
+        hash: "3398c59636fc02358fc0b22d7bc2afd3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 493; y: 123
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3872
+        hash: "86ebc9911fc2da29a1960ae3999e4329"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 494; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 494; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3888
+        hash: "7e910c843f531af6d08a0c7ea890c823"
+    }
+    Frame {
+        msec: 3904
+        hash: "7e92be7beeba33541e16305d5cb7b3b6"
+    }
+    Frame {
+        msec: 3920
+        hash: "1e7caa1bb4627bea028cdd2ef2260d9f"
+    }
+    Frame {
+        msec: 3936
+        hash: "a7d77ec36935d8d8c8a6120d373d714c"
+    }
+    Frame {
+        msec: 3952
+        hash: "770e16a5c7bf17522445bdae41d170df"
+    }
+    Frame {
+        msec: 3968
+        hash: "d5c93bb61aeef777bb91dd504e91ecf6"
+    }
+    Frame {
+        msec: 3984
+        hash: "2247494cb67e7f0cade508b6ef46cb3e"
+    }
+    Frame {
+        msec: 4000
+        hash: "61a480c3a29f37b4383b430b02eb5dc1"
+    }
+    Frame {
+        msec: 4016
+        hash: "f741ede20b0ad51f81c7aba44705a08e"
+    }
+    Frame {
+        msec: 4032
+        hash: "73bb52725e3906ac3074371936e9f3f3"
+    }
+    Frame {
+        msec: 4048
+        hash: "a915081e3c6ca9397567cb3df2aed517"
+    }
+    Frame {
+        msec: 4064
+        hash: "79b514577bcc36db6de4db2e8b284a4c"
+    }
+    Frame {
+        msec: 4080
+        hash: "5412571baa69b8e0c3b4daf52796482a"
+    }
+    Frame {
+        msec: 4096
+        hash: "7f739333fdc9c3457461e7fcf49bf650"
+    }
+    Frame {
+        msec: 4112
+        hash: "ed9a9fdd4bea6e9f7f7078934337b4a6"
+    }
+    Frame {
+        msec: 4128
+        hash: "4fbc687f1a5b4364a90441134162c817"
+    }
+    Frame {
+        msec: 4144
+        hash: "7c91ad050f31e30b7f16b99dd1ed19df"
+    }
+    Frame {
+        msec: 4160
+        hash: "44777e9a08d5f112b922272227b22558"
+    }
+    Frame {
+        msec: 4176
+        hash: "c4f7523d0a214e188c95d7cbd4455a9d"
+    }
+    Frame {
+        msec: 4192
+        hash: "7703b85f0bda71fa8ff84a557b015458"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 491; y: 193
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4208
+        hash: "0bd445389e69d1d758a9b17eee69d584"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 491; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4224
+        hash: "13bfb19a05b5aef65f7f70b2c0b01424"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 493; y: 187
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4240
+        hash: "9d6a81d6f7df8aa93c9421fa3cdc3a7d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 494; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 495; y: 180
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4256
+        hash: "4d88acb157fdeb0c608b6c9d75e999e8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 496; y: 174
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4272
+        hash: "fe506e31923e1feb2d2b3c105444f61f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 496; y: 168
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4288
+        hash: "72c0ccbbf296742f67139bd9a4abcf6b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 159
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4304
+        hash: "75b083e391afb3cdb8e4bcd885f17966"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 147
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4320
+        hash: "2babcf0e4d434120e0a7eb7d8716baa7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4336
+        hash: "676e6a7587781146f58f82ca1ceac2b3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4352
+        hash: "58ecd6234c3c0f7ceec942098e3ae0fc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 120
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4368
+        hash: "25a8af71ba1cf4581682cbec3b9baf8a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4384
+        hash: "11c305643f2ed535a6dc0a7a54caf17c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 498; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4400
+        hash: "29b33349f90286b2c078ae8d5896a338"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 498; y: 112
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4416
+        hash: "af917864d02b49bef4190ee1fca607dc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 498; y: 110
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4432
+        hash: "7b1af6cddd2f78615354f747dfd016b9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 498; y: 109
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 498; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4448
+        hash: "84f1757af8c26b4f00298090e09f7f68"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 498; y: 106
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4464
+        hash: "fd214ddbd1f60dc733994ba7a2048951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 499; y: 105
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4480
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4496
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4512
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4528
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4544
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4560
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4576
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4592
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4608
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4624
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4640
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4656
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4672
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4688
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4704
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4720
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4736
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4752
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4768
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4784
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4800
+        image: "listview.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4832
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Frame {
+        msec: 4848
+        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 499; y: 106
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 498; y: 107
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4864
+        hash: "1dc57bc129f3a6d5287ec0fa2a99d62e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 110
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4880
+        hash: "7b1af6cddd2f78615354f747dfd016b9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 496; y: 113
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4896
+        hash: "a890208c702b9fde41584a33b3038940"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 495; y: 115
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4912
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 494; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4928
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 4944
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 4960
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 4976
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 4992
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5008
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5024
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5040
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5056
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 494; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5072
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5088
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5104
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5120
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5136
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5152
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5168
+        hash: "cdc2d0868771429226c74e77676f55f1"
+    }
+    Frame {
+        msec: 5184
+        hash: "768d6d504470ce841e51022dd514edc5"
+    }
+    Frame {
+        msec: 5200
+        hash: "768d6d504470ce841e51022dd514edc5"
+    }
+    Frame {
+        msec: 5216
+        hash: "768d6d504470ce841e51022dd514edc5"
+    }
+    Frame {
+        msec: 5232
+        hash: "768d6d504470ce841e51022dd514edc5"
+    }
+    Frame {
+        msec: 5248
+        hash: "768d6d504470ce841e51022dd514edc5"
+    }
+    Frame {
+        msec: 5264
+        hash: "768d6d504470ce841e51022dd514edc5"
+    }
+    Frame {
+        msec: 5280
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5296
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5312
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5328
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5344
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5360
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5376
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5392
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5408
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5424
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5440
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5456
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5472
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5488
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5504
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5520
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5536
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5552
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5568
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5584
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5600
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5616
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5632
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5648
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5664
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5680
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5696
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5712
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5728
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5744
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5760
+        image: "listview.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5792
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5808
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5824
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5840
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5856
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5872
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5888
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5904
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5920
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5936
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5952
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5968
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 5984
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6000
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6016
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6032
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6048
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6064
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6080
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6096
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6112
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+    Frame {
+        msec: 6128
+        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/ListView/listview.qml b/tests/auto/declarative/qmlvisual/ListView/listview.qml
index 35ec982..43c86a0 100644
--- a/tests/auto/declarative/qmlvisual/ListView/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/listview.qml
@@ -1,7 +1,7 @@
 import QtQuick 1.0
 
-// Broken - QTBUG-14794
 Rectangle {
+    property string skip: "Incorrect start: QTBUG-14794"
     width: 600; height: 300; color: "white"
 
     ListModel {
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 21c5aa0..7cd96e2 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -157,7 +157,7 @@ void tst_qmlvisual::visual()
 
     QStringList arguments;
     arguments << "-script" << testdata
-              << "-scriptopts" << "play,testimages,testerror,exitoncomplete,exitonfailure" 
+              << "-scriptopts" << "play,testimages,testerror,testskip,exitoncomplete,exitonfailure"
               << file;
 #ifdef Q_WS_QWS
     arguments << "-qws";
@@ -278,7 +278,7 @@ void action(Mode mode, const QString &file)
             break;
         case Play:
             arguments << "-script" << testdata
-                  << "-scriptopts" << "play,testimages,testerror,exitoncomplete"
+                  << "-scriptopts" << "play,testimages,testerror,testskip,exitoncomplete"
                   << file;
             break;
         case TestVisuals:
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 00d43c1..579f1ab 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -172,6 +172,7 @@ void scriptOptsUsage()
     qWarning("  play ..................................... playback an existing script");
     qWarning("  testimages ............................... record images or compare images on playback");
     qWarning("  testerror ................................ test 'error' property of root item on playback");
+    qWarning("  testskip  ................................ test 'skip' property of root item on playback");
     qWarning("  snapshot ................................. file being recorded is static,");
     qWarning("                                             only one frame will be recorded or tested");
     qWarning("  exitoncomplete ........................... cleanly exit the viewer on script completion");
@@ -305,6 +306,8 @@ static void parseScriptOptions()
             scriptOptions |= QDeclarativeViewer::TestImages;
         } else if (option == QLatin1String("testerror")) {
             scriptOptions |= QDeclarativeViewer::TestErrorProperty;
+        } else if (option == QLatin1String("testskip")) {
+            scriptOptions |= QDeclarativeViewer::TestSkipProperty;
         } else if (option == QLatin1String("exitoncomplete")) {
             scriptOptions |= QDeclarativeViewer::ExitOnComplete;
         } else if (option == QLatin1String("exitonfailure")) {
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index 9864df6..a0ef4a1 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -128,16 +128,35 @@ void QDeclarativeTester::executefailure()
 {
     hasFailed = true;
 
-    if (options & QDeclarativeViewer::ExitOnFailure)
-        exit(-1);
+    if (options & QDeclarativeViewer::ExitOnFailure){
+        testSkip();
+        exit(hasFailed?-1:0);
+    }
 }
 
 void QDeclarativeTester::imagefailure()
 {
     hasFailed = true;
 
-    if (options & QDeclarativeViewer::ExitOnFailure)
-        exit(-1);
+    if (options & QDeclarativeViewer::ExitOnFailure){
+        testSkip();
+        exit(hasFailed?-1:0);
+    }
+}
+
+void QDeclarativeTester::testSkip()
+{
+    if (options & QDeclarativeViewer::TestSkipProperty){
+        QString e = m_view->rootObject()->property("skip").toString();
+        if (!e.isEmpty()) {
+            if(hasFailed){
+                qWarning() << "Test failed, but skipping it: " << e;
+            }else{
+                qWarning() << "Test skipped: " << e;
+            }
+            hasFailed = 0;
+        }
+    }
 }
 
 void QDeclarativeTester::complete()
@@ -149,7 +168,10 @@ void QDeclarativeTester::complete()
             hasFailed = true;
         }
     }
-    if (options & QDeclarativeViewer::ExitOnComplete) 
+
+
+    testSkip();
+    if (options & QDeclarativeViewer::ExitOnComplete)
         QApplication::exit(hasFailed?-1:0);
 
     if (hasCompleted)
diff --git a/tools/qml/qdeclarativetester.h b/tools/qml/qdeclarativetester.h
index 021869d..0cf508a 100644
--- a/tools/qml/qdeclarativetester.h
+++ b/tools/qml/qdeclarativetester.h
@@ -228,6 +228,7 @@ private:
 
     void imagefailure();
     void complete();
+    void testSkip();
 
     enum Destination { View, ViewPort };
     void addKeyEvent(Destination, QKeyEvent *);
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index d1ec26d..b43aa54 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -83,7 +83,8 @@ public:
         SaveOnExit = 0x00000010,
         ExitOnComplete = 0x00000020,
         ExitOnFailure = 0x00000040,
-        Snapshot = 0x00000080
+        Snapshot = 0x00000080,
+        TestSkipProperty = 0x00000100
     };
     Q_DECLARE_FLAGS(ScriptOptions, ScriptOption)
     void setScript(const QString &s) { m_script = s; }
-- 
cgit v0.12


From ef7906d0c89cf155aec89dac4a8655911eb055e5 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 15:14:40 +1000
Subject: Revert "Mark qdeclarativegridview autotests as expect-fail"

This reverts commit b6ee57e14e145d9caa3f572d55447ec92f78cea4.
Changed our mind about how to mark tests as expect-fail
---
 .../qdeclarativegridview/data/gridview.0.png       |  Bin 0 -> 1303 bytes
 .../qdeclarativegridview/data/gridview.1.png       |  Bin 0 -> 1317 bytes
 .../qdeclarativegridview/data/gridview.2.png       |  Bin 0 -> 1318 bytes
 .../qdeclarativegridview/data/gridview.3.png       |  Bin 0 -> 1306 bytes
 .../qdeclarativegridview/data/gridview.4.png       |  Bin 0 -> 1308 bytes
 .../qdeclarativegridview/data/gridview.5.png       |  Bin 0 -> 1303 bytes
 .../qdeclarativegridview/data/gridview.6.png       |  Bin 0 -> 1323 bytes
 .../qdeclarativegridview/data/gridview.7.png       |  Bin 0 -> 1325 bytes
 .../qdeclarativegridview/data/gridview.8.png       |  Bin 0 -> 1346 bytes
 .../qdeclarativegridview/data/gridview.9.png       |  Bin 0 -> 1303 bytes
 .../qdeclarativegridview/data/gridview.qml         | 2859 ++++++++++++++++++++
 .../qdeclarativegridview/data/gridview2.0.png      |  Bin 0 -> 1310 bytes
 .../qdeclarativegridview/data/gridview2.1.png      |  Bin 0 -> 1322 bytes
 .../qdeclarativegridview/data/gridview2.10.png     |  Bin 0 -> 1313 bytes
 .../qdeclarativegridview/data/gridview2.2.png      |  Bin 0 -> 1341 bytes
 .../qdeclarativegridview/data/gridview2.3.png      |  Bin 0 -> 1368 bytes
 .../qdeclarativegridview/data/gridview2.4.png      |  Bin 0 -> 1319 bytes
 .../qdeclarativegridview/data/gridview2.5.png      |  Bin 0 -> 1352 bytes
 .../qdeclarativegridview/data/gridview2.6.png      |  Bin 0 -> 1309 bytes
 .../qdeclarativegridview/data/gridview2.7.png      |  Bin 0 -> 1347 bytes
 .../qdeclarativegridview/data/gridview2.8.png      |  Bin 0 -> 1310 bytes
 .../qdeclarativegridview/data/gridview2.9.png      |  Bin 0 -> 1354 bytes
 .../qdeclarativegridview/data/gridview2.qml        | 2479 +++++++++++++++++
 .../qmlvisual/qdeclarativegridview/gridview.qml    |    2 -
 .../qmlvisual/qdeclarativegridview/gridview2.qml   |    2 -
 25 files changed, 5338 insertions(+), 4 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png
new file mode 100644
index 0000000..6c82777
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png
new file mode 100644
index 0000000..07b1f7c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png
new file mode 100644
index 0000000..f2f08c0
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png
new file mode 100644
index 0000000..08649f9
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png
new file mode 100644
index 0000000..f9c2f17
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png
new file mode 100644
index 0000000..52ec0bd
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png
new file mode 100644
index 0000000..3fe25be
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png
new file mode 100644
index 0000000..4cc12a6
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png
new file mode 100644
index 0000000..2267f23
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png
new file mode 100644
index 0000000..6c82777
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
new file mode 100644
index 0000000..67aa10a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
@@ -0,0 +1,2859 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 32
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 48
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 64
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 80
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 96
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 112
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 128
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 144
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 160
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 176
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 192
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 208
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 224
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 240
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 256
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 272
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 288
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 304
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 320
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 336
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 352
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 368
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 384
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 400
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 416
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 432
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "96ad89eafa7f99269518a192573af91b"
+    }
+    Frame {
+        msec: 464
+        hash: "735b00b968d0e2ea1f34cc0bdc028a8e"
+    }
+    Frame {
+        msec: 480
+        hash: "ce37c8e15fbb1aea72aff9629683fa96"
+    }
+    Frame {
+        msec: 496
+        hash: "a3f2471ef4ceac77a1c20ac327550d8d"
+    }
+    Frame {
+        msec: 512
+        hash: "28f120bd3bda9552dbc8cc908409c67d"
+    }
+    Frame {
+        msec: 528
+        hash: "f21cf0ed746fa48e67dc90c70c5bbae8"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "485d55730366b68e01582879f6970fa1"
+    }
+    Frame {
+        msec: 560
+        hash: "700e53c78b28993dce5dafb4035f4760"
+    }
+    Frame {
+        msec: 576
+        hash: "1e538e175a5e402e2334cf354392e8a7"
+    }
+    Frame {
+        msec: 592
+        hash: "0fbfba93eebaf05ae60067b365b6b4bc"
+    }
+    Frame {
+        msec: 608
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 624
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 640
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 656
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 672
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 688
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 704
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "25e48099a8194ed2674651818d854c61"
+    }
+    Frame {
+        msec: 736
+        hash: "b75d02dfc238ba2292306ca1421279c3"
+    }
+    Frame {
+        msec: 752
+        hash: "7e48b7d9c1291b4e438c81f44228d8ad"
+    }
+    Frame {
+        msec: 768
+        hash: "fe4b009abe081a6eaeab6ef9e996f3fd"
+    }
+    Frame {
+        msec: 784
+        hash: "edea8c305fe88708dbafc03e427caa09"
+    }
+    Frame {
+        msec: 800
+        hash: "7b58803f12d0ab893acf539799d79e31"
+    }
+    Frame {
+        msec: 816
+        hash: "9b56c3d1d140114dcc57d0a8568e9b95"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 832
+        hash: "35e38e273dbc8e565917b21d00fc1530"
+    }
+    Frame {
+        msec: 848
+        hash: "116e294391333e8780daeca54c3d51ea"
+    }
+    Frame {
+        msec: 864
+        hash: "6219676215f82540d7a53b2a8aa60279"
+    }
+    Frame {
+        msec: 880
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 896
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 912
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 928
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 944
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 960
+        image: "gridview.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 992
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1008
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1024
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1040
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1056
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1072
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1088
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1104
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1120
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1136
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1152
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1168
+        hash: "2667c2596de97dc15353158eba03495f"
+    }
+    Frame {
+        msec: 1184
+        hash: "6a7b64e1427dcb7e438aa09a739cbc7b"
+    }
+    Frame {
+        msec: 1200
+        hash: "5bad6dc745958f5827403ea593c78752"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1216
+        hash: "b393401219ada7d094a451dba8af3f1a"
+    }
+    Frame {
+        msec: 1232
+        hash: "ba656452f8adf3d1ca7db9286274c37f"
+    }
+    Frame {
+        msec: 1248
+        hash: "1e9725c8c364a491f34035fad1f77c63"
+    }
+    Frame {
+        msec: 1264
+        hash: "a0aef0b65446dec0673b5cec3a260390"
+    }
+    Frame {
+        msec: 1280
+        hash: "d60c11a5d376af0831d6f05f2a839a92"
+    }
+    Frame {
+        msec: 1296
+        hash: "1dd2c456c6ee9cc8f9be0e9f3617d44b"
+    }
+    Frame {
+        msec: 1312
+        hash: "56208e6551e2f4202bab2d62a1cf46a2"
+    }
+    Frame {
+        msec: 1328
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1344
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1360
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1376
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1392
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1408
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1424
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1440
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1456
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1472
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1488
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1504
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1520
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1536
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1552
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1568
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1584
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1600
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1616
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1632
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1648
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "f0f00d22d15ed9828db7b5f3a3669fe9"
+    }
+    Frame {
+        msec: 1680
+        hash: "153e7984089530bbd052c9e4f62eb14c"
+    }
+    Frame {
+        msec: 1696
+        hash: "0525d40cc58d054a3abd7ee2486576f8"
+    }
+    Frame {
+        msec: 1712
+        hash: "8c23d5245774ab5252c98c19c33f8171"
+    }
+    Frame {
+        msec: 1728
+        hash: "5ca243794d1350f04cf973d4bfc8ab89"
+    }
+    Frame {
+        msec: 1744
+        hash: "d19b7f4c0897aba498e122d83b4cbbf1"
+    }
+    Frame {
+        msec: 1760
+        hash: "99e41460dd8efc6e5c3faf54b14c3d43"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1776
+        hash: "703469f8b133156ed3aabe02762d66c3"
+    }
+    Frame {
+        msec: 1792
+        hash: "1cc2c383e988048db76a80d8d7f5a0e2"
+    }
+    Frame {
+        msec: 1808
+        hash: "8e87117c19eb9d6e600c44e0f3869ae1"
+    }
+    Frame {
+        msec: 1824
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1840
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1856
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1872
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1888
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1904
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1920
+        image: "gridview.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1952
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1968
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1984
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2000
+        hash: "4924037ce643d0748b8b2c666e61fd62"
+    }
+    Frame {
+        msec: 2016
+        hash: "ef9750584e669a8b2d415d13854e12a6"
+    }
+    Frame {
+        msec: 2032
+        hash: "69937eacef6e6b11ad1d5741c69a1faa"
+    }
+    Frame {
+        msec: 2048
+        hash: "a1bd870fffd95a0604dd8e170e571632"
+    }
+    Frame {
+        msec: 2064
+        hash: "a3a72386594aacc88977cdaa6441df48"
+    }
+    Frame {
+        msec: 2080
+        hash: "6d8e89de38d52f0f0f871dfa18361cb5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2096
+        hash: "96cfb1eb6893fac86c9434d1ffb82fcb"
+    }
+    Frame {
+        msec: 2112
+        hash: "5e11df1660634ff317be474118174ec5"
+    }
+    Frame {
+        msec: 2128
+        hash: "2eb75858b50c3a9a80673ab89014ed63"
+    }
+    Frame {
+        msec: 2144
+        hash: "3ff5d66f7902af92d49ebebf04d16c26"
+    }
+    Frame {
+        msec: 2160
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2176
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2192
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2208
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2224
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2240
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2256
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2272
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2288
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2304
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2320
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2336
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "efeda5b2d97e1b7c22e2308250501cb7"
+    }
+    Frame {
+        msec: 2368
+        hash: "d6158379b699279f66b94a8418e53af1"
+    }
+    Frame {
+        msec: 2384
+        hash: "ab960b0669fa594e0552df623a9136ea"
+    }
+    Frame {
+        msec: 2400
+        hash: "0ebf6be1305ee1eb8740f4d0365ef4c5"
+    }
+    Frame {
+        msec: 2416
+        hash: "46cde47dffc6f2687c8c643eca09b95d"
+    }
+    Frame {
+        msec: 2432
+        hash: "2b8698ce02a6964115d960ae19f40c37"
+    }
+    Frame {
+        msec: 2448
+        hash: "ff1e7d800bb27b41710c50554adc1091"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2464
+        hash: "5837b3aca09038cae23dcb149acc8b0b"
+    }
+    Frame {
+        msec: 2480
+        hash: "dbe7c571cdbdb9de4fd01faa6d5374cf"
+    }
+    Frame {
+        msec: 2496
+        hash: "f431abcaf05f49ead909296d7649f8a9"
+    }
+    Frame {
+        msec: 2512
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2528
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2544
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2560
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2576
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2592
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2608
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2624
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2640
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2656
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2672
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2688
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2704
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2720
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2736
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2752
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2768
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2784
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "4f2fafdb59db544352e3067d67c0a714"
+    }
+    Frame {
+        msec: 2816
+        hash: "4dcd4cdf6f4e305732185ec52cd2f2f6"
+    }
+    Frame {
+        msec: 2832
+        hash: "dfd3c29b0520edbbee57dfacfa7e2b30"
+    }
+    Frame {
+        msec: 2848
+        hash: "257d3d8bcf78671d35a898befec091cb"
+    }
+    Frame {
+        msec: 2864
+        hash: "20e89c544284603943396694abe86756"
+    }
+    Frame {
+        msec: 2880
+        image: "gridview.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "b88c6af89423b32b3a4413035711df03"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2912
+        hash: "e34de13af44c449c9ecc86e06ce01ed2"
+    }
+    Frame {
+        msec: 2928
+        hash: "98ffe81129aa7cc7325764221f1dae59"
+    }
+    Frame {
+        msec: 2944
+        hash: "db2d545de9879362738e71a02a3d1d26"
+    }
+    Frame {
+        msec: 2960
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 2976
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 2992
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3008
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3024
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3040
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3056
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3072
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3088
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3104
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3120
+        hash: "02d8c90faf56c65252e4f938944bda7b"
+    }
+    Frame {
+        msec: 3136
+        hash: "a32994e2320e357241f63b956b6db236"
+    }
+    Frame {
+        msec: 3152
+        hash: "9ada466c26c217adbcd7a93df264ed75"
+    }
+    Frame {
+        msec: 3168
+        hash: "79d1a3489be95d113e8c611a2ba63456"
+    }
+    Frame {
+        msec: 3184
+        hash: "d3aa82455c4ae3ac25097354e132a30f"
+    }
+    Frame {
+        msec: 3200
+        hash: "62d12e5933ed4ed048ccafd229f4b2b7"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3216
+        hash: "5bc4ac94ae20e425084d0811dee1ba08"
+    }
+    Frame {
+        msec: 3232
+        hash: "6d5113e3732dc7a9172eea3667a01f7b"
+    }
+    Frame {
+        msec: 3248
+        hash: "e435a2588b25d3336f290331931f5981"
+    }
+    Frame {
+        msec: 3264
+        hash: "bce201adbeb319b181cce139f179d7f0"
+    }
+    Frame {
+        msec: 3280
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3296
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3312
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3328
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3344
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3360
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3376
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3392
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3408
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3424
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3440
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3456
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3472
+        hash: "8f0f3cd35ae92047f23084f447046eb8"
+    }
+    Frame {
+        msec: 3488
+        hash: "ceb12e6c5e9f0566039040d9f3ff587f"
+    }
+    Frame {
+        msec: 3504
+        hash: "dfd0c89c3ea73aceefcdafa71609c720"
+    }
+    Frame {
+        msec: 3520
+        hash: "8d8ed1a9dc6a9f74dfc81b79f02af4c5"
+    }
+    Frame {
+        msec: 3536
+        hash: "d450bd62e03e1e4c7cb66e98ece05f97"
+    }
+    Frame {
+        msec: 3552
+        hash: "d1ece2210cd24eedd5361e5c3a162236"
+    }
+    Frame {
+        msec: 3568
+        hash: "77589e48b9db95e702055753046319e5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3584
+        hash: "7793263ecb831a1e63fbd76c8addde03"
+    }
+    Frame {
+        msec: 3600
+        hash: "bfa9675f981c37fed27dea100226f61a"
+    }
+    Frame {
+        msec: 3616
+        hash: "9780849fe8abd22c32ccafcdd46b0d65"
+    }
+    Frame {
+        msec: 3632
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3648
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3664
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3680
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3696
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3712
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3728
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3744
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3760
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3776
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3792
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3808
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3824
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3840
+        image: "gridview.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3872
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3888
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3904
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3920
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3936
+        hash: "a61dbcb7d914afe34009085bf37fb8e2"
+    }
+    Frame {
+        msec: 3952
+        hash: "89175b83b4f7ee4b5d99219cdc97aa59"
+    }
+    Frame {
+        msec: 3968
+        hash: "f524421286503f6175e4ad71dd89145f"
+    }
+    Frame {
+        msec: 3984
+        hash: "ca5af7d98a008eccba1e21be0da61f3c"
+    }
+    Frame {
+        msec: 4000
+        hash: "77c19e7e17e00787ff0d7a4e7bad7bc8"
+    }
+    Frame {
+        msec: 4016
+        hash: "04c8db761e324101ad92e0ac9ceed7d4"
+    }
+    Frame {
+        msec: 4032
+        hash: "97a3dcb81349efab6b44d458e83ce5c4"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4048
+        hash: "e86ebc276b88705c97cc9efb66ccc6b2"
+    }
+    Frame {
+        msec: 4064
+        hash: "a134bbfd14879f13b288a04d23382348"
+    }
+    Frame {
+        msec: 4080
+        hash: "9530ad3f58ad1c66401572869f7d91bc"
+    }
+    Frame {
+        msec: 4096
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4112
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4128
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4144
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4160
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4176
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4192
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4208
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4224
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4240
+        hash: "980e0fa84fd3bab496623936f5f220a2"
+    }
+    Frame {
+        msec: 4256
+        hash: "ed3268911723d664699bbc31317befc1"
+    }
+    Frame {
+        msec: 4272
+        hash: "3bfda4b3b0b2d2a97ec1c0b5b3f4da63"
+    }
+    Frame {
+        msec: 4288
+        hash: "1616c6def28659d51905564ff83cc112"
+    }
+    Frame {
+        msec: 4304
+        hash: "68342f34c18956d3a093f8eeeae6977e"
+    }
+    Frame {
+        msec: 4320
+        hash: "ac1b12959e9055a28fe2bda0a12b75bc"
+    }
+    Frame {
+        msec: 4336
+        hash: "009b85ff6b86e418c78ed33a5e88d3f1"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4352
+        hash: "59753bc7dc69767fe2109fdc41f20dae"
+    }
+    Frame {
+        msec: 4368
+        hash: "1c87d3d8c8d564d4d95a26f57fd28f38"
+    }
+    Frame {
+        msec: 4384
+        hash: "4e43b7b6787002c9013010dd74c83f49"
+    }
+    Frame {
+        msec: 4400
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4416
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4432
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4448
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4464
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4480
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4496
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4512
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4528
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4544
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4560
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4576
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4592
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4608
+        hash: "84de5b5e8b0fba190a783c72967661c7"
+    }
+    Frame {
+        msec: 4624
+        hash: "60b696f4913379d28f300fd1b531c6cb"
+    }
+    Frame {
+        msec: 4640
+        hash: "d01e651d9094332fd82ad1cea3e93e9d"
+    }
+    Frame {
+        msec: 4656
+        hash: "87be4cd7c894b03b2b64c996e915d71f"
+    }
+    Frame {
+        msec: 4672
+        hash: "b07fccb0c5565d2feed5a9fcdf8acead"
+    }
+    Frame {
+        msec: 4688
+        hash: "3dca3165fd34be549d21fb6c414c67d8"
+    }
+    Frame {
+        msec: 4704
+        hash: "5f69f3298f8ca73fa9b3b6e630c60186"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4720
+        hash: "d7f41e9a29d550a7d9a41bb947569abe"
+    }
+    Frame {
+        msec: 4736
+        hash: "4ede2e90ad216a2d44580c50a25dea23"
+    }
+    Frame {
+        msec: 4752
+        hash: "9b339845ee588b789dc9095c272e0bdf"
+    }
+    Frame {
+        msec: 4768
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4784
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4800
+        image: "gridview.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4832
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4848
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4864
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4880
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4896
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4912
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4928
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4944
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4960
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4976
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4992
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5008
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5024
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5040
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5056
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5072
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5088
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5104
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5120
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5136
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5152
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5168
+        hash: "d6f0a6d7604bad811eeba13fd7c45368"
+    }
+    Frame {
+        msec: 5184
+        hash: "5f92e1531a3f6c21ec82e3c908167fc7"
+    }
+    Frame {
+        msec: 5200
+        hash: "5214e99ff052dcdc8f85bad29de92e03"
+    }
+    Frame {
+        msec: 5216
+        hash: "d4abed9f0f1115c9a45b0b9b4f54754e"
+    }
+    Frame {
+        msec: 5232
+        hash: "cfae8a0281e704b0e62f6bf31b32800f"
+    }
+    Frame {
+        msec: 5248
+        hash: "c203f0674596ae690bf19f2d49be62ac"
+    }
+    Frame {
+        msec: 5264
+        hash: "2e2c7e05aade104bdc4f6c489b6f0601"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5280
+        hash: "b4b2148b0557dcab3a441165e5e4de5f"
+    }
+    Frame {
+        msec: 5296
+        hash: "c5e791d27a42a63d25cdbd492b4af29a"
+    }
+    Frame {
+        msec: 5312
+        hash: "0f94ebcb407f8e6ae263bd954f2c8177"
+    }
+    Frame {
+        msec: 5328
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5344
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5360
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5376
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5392
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5408
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5424
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5440
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5456
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5472
+        hash: "6fdfe69e377da72e04dc130f5677ed2c"
+    }
+    Frame {
+        msec: 5488
+        hash: "c041d26d43766fa1735f2ada2a43225b"
+    }
+    Frame {
+        msec: 5504
+        hash: "aa62dbd6c6256665ee1b4ef468607978"
+    }
+    Frame {
+        msec: 5520
+        hash: "987fcdf6483a83b1242053f4e7fb7a26"
+    }
+    Frame {
+        msec: 5536
+        hash: "fbde70c34709b68eb22f5460a8815fba"
+    }
+    Frame {
+        msec: 5552
+        hash: "911ddc838ebaf5ade1bb026dff2741ba"
+    }
+    Frame {
+        msec: 5568
+        hash: "120bbf35b2a3b756bdeaea0df43e49b2"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5584
+        hash: "ea93e33c079d6dc5fb18c69fb4fed441"
+    }
+    Frame {
+        msec: 5600
+        hash: "b9ac8ab01cb59b1fee11967bdb6d2dd6"
+    }
+    Frame {
+        msec: 5616
+        hash: "3ff266bf29cbcaa30bc1e7af5dd9866b"
+    }
+    Frame {
+        msec: 5632
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5648
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5664
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5680
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5696
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5712
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5728
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5744
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5760
+        image: "gridview.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5792
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5808
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5824
+        hash: "de1f83d25751639dff42f1755a6534c3"
+    }
+    Frame {
+        msec: 5840
+        hash: "edefdea8b2461d03fb97cf5ed66e9b6d"
+    }
+    Frame {
+        msec: 5856
+        hash: "cef1886397e3932a511f37571b5011f4"
+    }
+    Frame {
+        msec: 5872
+        hash: "05589ad354314d9e04ef90c1addd99f5"
+    }
+    Frame {
+        msec: 5888
+        hash: "ff88b52e3755b9b4785d2719ddd4f090"
+    }
+    Frame {
+        msec: 5904
+        hash: "f59edc3016b177a2e8faa6612d718b17"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5920
+        hash: "dc673a7cdd927f70b28ebcfe51cd3d89"
+    }
+    Frame {
+        msec: 5936
+        hash: "3abec0da85fb663e63ab22188e092827"
+    }
+    Frame {
+        msec: 5952
+        hash: "50c2c8ac68cafad7c47b576cd8f4a037"
+    }
+    Frame {
+        msec: 5968
+        hash: "06c31b861e2b96e6595b2244d7b3f4d5"
+    }
+    Frame {
+        msec: 5984
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6000
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6016
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6032
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6048
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6064
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6080
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6096
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6112
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6128
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6144
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6160
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6176
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6192
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6208
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6224
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6240
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6256
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6272
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6288
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6304
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6320
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6336
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6352
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6368
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6384
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6400
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6416
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6432
+        hash: "7f52a770775c19e10784b4c5f7874210"
+    }
+    Frame {
+        msec: 6448
+        hash: "827cfb74286a2a80aca8b6c5277d6cfd"
+    }
+    Frame {
+        msec: 6464
+        hash: "8399231eda9b66821d43a3d8c4c7d645"
+    }
+    Frame {
+        msec: 6480
+        hash: "fc163583671f3c4023361460b436c895"
+    }
+    Frame {
+        msec: 6496
+        hash: "893dea6496c95c32095ad1d673e500c2"
+    }
+    Frame {
+        msec: 6512
+        hash: "808c7403b2cdcc882059da56a2f806fe"
+    }
+    Frame {
+        msec: 6528
+        hash: "7466b2e5b86ba8ad46be75818659786c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6544
+        hash: "dd2561cd780e24401130305d47757a53"
+    }
+    Frame {
+        msec: 6560
+        hash: "bee89299532d43fc3e6c3e69c343b381"
+    }
+    Frame {
+        msec: 6576
+        hash: "94f8474aedee94098592c05d8fc7d868"
+    }
+    Frame {
+        msec: 6592
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6608
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6624
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6640
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6656
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6672
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6688
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6704
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6720
+        image: "gridview.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "ccd58be20d47422121d6ef799b927a7a"
+    }
+    Frame {
+        msec: 6752
+        hash: "e090c7f39649786a1796870e25bd0f0d"
+    }
+    Frame {
+        msec: 6768
+        hash: "acf3dcd9f4a869169dbc1ae7fe60e9d0"
+    }
+    Frame {
+        msec: 6784
+        hash: "51795e9a720845e8305d23507785e1ca"
+    }
+    Frame {
+        msec: 6800
+        hash: "0d34a43e177e6b73e2ff9155747d0385"
+    }
+    Frame {
+        msec: 6816
+        hash: "1876c3cdffc1af01da1aaa0ac636d0a8"
+    }
+    Frame {
+        msec: 6832
+        hash: "3131296b6edf4190520e2cdb3f8b936e"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6848
+        hash: "ee92f0a764e5081b130e205a5c362b07"
+    }
+    Frame {
+        msec: 6864
+        hash: "8737ea2c60aeb215228c00a7fddd1baa"
+    }
+    Frame {
+        msec: 6880
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6896
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6912
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6928
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6944
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6960
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6976
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6992
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7008
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7024
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7040
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7056
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7072
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7088
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7104
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7120
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7136
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7152
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7168
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7184
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7200
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7216
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7232
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7248
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7264
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7280
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7296
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7312
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7328
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7344
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7360
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7376
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7392
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7408
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7424
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7440
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7456
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7472
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7488
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7504
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7520
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7536
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7552
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7568
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7584
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7600
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7616
+        hash: "eb0d1be15f63af6eaf6634b02e5f240a"
+    }
+    Frame {
+        msec: 7632
+        hash: "2423c305bebb3449e87c78e8fb447c88"
+    }
+    Frame {
+        msec: 7648
+        hash: "f0ede6ea85647728db80878b3e525edc"
+    }
+    Frame {
+        msec: 7664
+        hash: "387d127b2b000dc344ee4768cf2d29b2"
+    }
+    Frame {
+        msec: 7680
+        image: "gridview.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "1d0d8100e994c16d7973ad9a97b0068f"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7712
+        hash: "95fb4a6d0331ffc4773e39ec8c3e6511"
+    }
+    Frame {
+        msec: 7728
+        hash: "34738f16150228d971972833d4bd5c8f"
+    }
+    Frame {
+        msec: 7744
+        hash: "9b71c8dacc530f32d7c6f409928caf5c"
+    }
+    Frame {
+        msec: 7760
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7776
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7792
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7808
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7824
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7840
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7856
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7872
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7888
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7904
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7920
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7936
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7952
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7968
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7984
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 8000
+        hash: "0587fc809c38c3bbe1fbac2960596974"
+    }
+    Frame {
+        msec: 8016
+        hash: "d20eba806cf4730a850db4c095fa36f9"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8032
+        hash: "c1663e75ba05b341e1e970a451958ea0"
+    }
+    Frame {
+        msec: 8048
+        hash: "ea40cc33b689d6b42fc5a69fa30178e4"
+    }
+    Frame {
+        msec: 8064
+        hash: "a07a1c61de1813158ff743cd326ee427"
+    }
+    Frame {
+        msec: 8080
+        hash: "6dfddaa340df8999ca77f6a6e4c6c3ce"
+    }
+    Frame {
+        msec: 8096
+        hash: "76ca40bb169c1ddc291847d4be2d38d7"
+    }
+    Frame {
+        msec: 8112
+        hash: "e44778541b76208981a3944a64235cac"
+    }
+    Frame {
+        msec: 8128
+        hash: "fdf45ea650d31957cc675c3bec8bf53e"
+    }
+    Frame {
+        msec: 8144
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8160
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8176
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8192
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8208
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8224
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8240
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8256
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8272
+        hash: "338481e6390f2a61e975084c16427584"
+    }
+    Frame {
+        msec: 8288
+        hash: "8923c45c23b1f4250b7d1e483b07a4da"
+    }
+    Frame {
+        msec: 8304
+        hash: "b21de834906d0eecea985561e2e41e4f"
+    }
+    Frame {
+        msec: 8320
+        hash: "a8c9761cfb20631520ed890cd2648c4b"
+    }
+    Frame {
+        msec: 8336
+        hash: "abf96a042ef12190bc48ff49732ef55a"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8352
+        hash: "5b9506dfb038cd26dfc81ecd2406ada9"
+    }
+    Frame {
+        msec: 8368
+        hash: "be75b8d39f81b2fdaff01469bfc67d4a"
+    }
+    Frame {
+        msec: 8384
+        hash: "488aa2977f349df82b5f6ae5e3619d35"
+    }
+    Frame {
+        msec: 8400
+        hash: "d69f17f0ce8537511353d20b59d20de0"
+    }
+    Frame {
+        msec: 8416
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8432
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8448
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8464
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8480
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8496
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8512
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8528
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8544
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8560
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8576
+        hash: "8f74d33bf95cbf37fdb4521c69373a64"
+    }
+    Frame {
+        msec: 8592
+        hash: "e33bb4cd12790c9d9992efdd3e23bee9"
+    }
+    Frame {
+        msec: 8608
+        hash: "36f32e34b4093091c4707f26c52896ad"
+    }
+    Frame {
+        msec: 8624
+        hash: "5ab5e142f8dc883287c116cedbacfd55"
+    }
+    Frame {
+        msec: 8640
+        image: "gridview.8.png"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8656
+        hash: "c74212e45a6c4b6a18caeb6a22350609"
+    }
+    Frame {
+        msec: 8672
+        hash: "8919643a7d13677dd902941860093209"
+    }
+    Frame {
+        msec: 8688
+        hash: "6f2ab4400fadf51b994351f0975e31fc"
+    }
+    Frame {
+        msec: 8704
+        hash: "4798559ce6f9bd7455ed5385d0030763"
+    }
+    Frame {
+        msec: 8720
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8736
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8752
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8768
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8784
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8800
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8816
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8832
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8848
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8864
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8880
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8896
+        hash: "fac81cf6f45cb47abc1fa36d23e39d34"
+    }
+    Frame {
+        msec: 8912
+        hash: "862f4deee01183fd38b094da59048b23"
+    }
+    Frame {
+        msec: 8928
+        hash: "2f3b147221da30d8857d25fc788b3eac"
+    }
+    Frame {
+        msec: 8944
+        hash: "5b295b187c6cfc6aefa51e5efc2c27e3"
+    }
+    Frame {
+        msec: 8960
+        hash: "fe3139ddc8fdbc1b0c25bd641f83e833"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8976
+        hash: "8f2a9585dc6248a403aafd0f151d6ba0"
+    }
+    Frame {
+        msec: 8992
+        hash: "39eca8cc6bb8ea30cc452dc24f8e46dc"
+    }
+    Frame {
+        msec: 9008
+        hash: "8dbbc6026942cb6e572f1cb7e2675713"
+    }
+    Frame {
+        msec: 9024
+        hash: "62dfa07b96dd18c6be89822654bf09f3"
+    }
+    Frame {
+        msec: 9040
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9056
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9072
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9088
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9104
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9120
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9136
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9152
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9168
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9184
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9200
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9216
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9232
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9248
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9264
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9280
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9296
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9312
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9328
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9344
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9360
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9376
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9392
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9408
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9424
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9440
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9456
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9472
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9488
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9504
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9520
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9536
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9552
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9568
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9584
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9600
+        image: "gridview.9.png"
+    }
+    Frame {
+        msec: 9616
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9632
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9648
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9664
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9680
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9696
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9712
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9728
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9744
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9760
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9776
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9792
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9808
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9824
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9840
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png
new file mode 100644
index 0000000..3021d58
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png
new file mode 100644
index 0000000..baeb1a6
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png
new file mode 100644
index 0000000..b0486e5
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png
new file mode 100644
index 0000000..2d0c731
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png
new file mode 100644
index 0000000..af9ed05
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png
new file mode 100644
index 0000000..0b0945d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png
new file mode 100644
index 0000000..618ae0c
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png
new file mode 100644
index 0000000..fc31262
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png
new file mode 100644
index 0000000..22291ac
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png
new file mode 100644
index 0000000..3021d58
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png
new file mode 100644
index 0000000..2f2f5b9
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml
new file mode 100644
index 0000000..1c90af9
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml
@@ -0,0 +1,2479 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "dba2f6f1c773bd4cd9523108fca861c4"
+    }
+    Frame {
+        msec: 32
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 48
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 64
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 80
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 96
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 112
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 128
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 144
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 160
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 176
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 192
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 208
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 224
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 240
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 256
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 272
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 288
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 304
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 320
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 336
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 352
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 368
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 384
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 400
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 416
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 432
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 448
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 464
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 480
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 496
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 512
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 528
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 544
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 560
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 576
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 592
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 608
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 624
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 640
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 656
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 672
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 688
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 704
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 720
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 736
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 752
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 768
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 784
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 800
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 816
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 832
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 848
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 864
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 880
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 896
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 912
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 928
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 944
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 960
+        image: "gridview2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 992
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1008
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1024
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1040
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1056
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1072
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1088
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1104
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1120
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1136
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1152
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1168
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1184
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1200
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1216
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1232
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1248
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1264
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1280
+        hash: "aaec7184a27e6700d96ffff376b8fa53"
+    }
+    Frame {
+        msec: 1296
+        hash: "3fa3a890a4ff4a59336a9a2d478d0dde"
+    }
+    Frame {
+        msec: 1312
+        hash: "3711c6c2f4f9aba7f2c72bd1f1d85016"
+    }
+    Frame {
+        msec: 1328
+        hash: "23da2f9a800b805ce7b77ff08218907d"
+    }
+    Frame {
+        msec: 1344
+        hash: "12e4bc953b06cdaad0720f87fb96a37e"
+    }
+    Frame {
+        msec: 1360
+        hash: "46e69658bda69bab202a2790a76ba1cd"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1376
+        hash: "44608e67c69b92ccbb45e119e1158fe3"
+    }
+    Frame {
+        msec: 1392
+        hash: "97a309b47017d38294644a486a7ce68e"
+    }
+    Frame {
+        msec: 1408
+        hash: "41f42b50b22e0496c8aca5019b24b9cb"
+    }
+    Frame {
+        msec: 1424
+        hash: "8603ea1cb60c804563f50bc41c0180fe"
+    }
+    Frame {
+        msec: 1440
+        hash: "e29777fa70daafe9640c6e9bb7bd63d6"
+    }
+    Frame {
+        msec: 1456
+        hash: "2c4c360320f527e99fee799e68c2c0aa"
+    }
+    Frame {
+        msec: 1472
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1488
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1504
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1520
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1536
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1552
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1568
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1584
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1600
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1616
+        hash: "17027b7c099b11cb5382f30dbbd1e647"
+    }
+    Frame {
+        msec: 1632
+        hash: "0e17461a4ca843f9903b7f03e99a0b00"
+    }
+    Frame {
+        msec: 1648
+        hash: "a5e61901920553e59892fa405beea15a"
+    }
+    Frame {
+        msec: 1664
+        hash: "310eaf71fe8d3807606e58a666c65ccd"
+    }
+    Frame {
+        msec: 1680
+        hash: "76f556d05fb77082f33eb1836c10587a"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1696
+        hash: "4e7e4b7790a96396e7ea3533b5c32ed9"
+    }
+    Frame {
+        msec: 1712
+        hash: "b065287b6490f58ca6f0e9eb2027cf20"
+    }
+    Frame {
+        msec: 1728
+        hash: "907cd9dbdffa1d395caaabd466dc8e86"
+    }
+    Frame {
+        msec: 1744
+        hash: "3b144e5b4867328beafa3020ce931480"
+    }
+    Frame {
+        msec: 1760
+        hash: "b59b2b60b7d55424b61b1b0ed3e227b8"
+    }
+    Frame {
+        msec: 1776
+        hash: "4032e934871b315b68c7c2abea42efee"
+    }
+    Frame {
+        msec: 1792
+        hash: "8f80127b2f8d6fc10aa84062544cc381"
+    }
+    Frame {
+        msec: 1808
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1824
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1840
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1856
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1872
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1888
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1904
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1920
+        image: "gridview2.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1952
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1968
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1984
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 2000
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 2016
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 2048
+        hash: "a45d2630872a14541f39b862e15ff461"
+    }
+    Frame {
+        msec: 2064
+        hash: "714711d7382ef8bba5fb39e2e44bd59c"
+    }
+    Frame {
+        msec: 2080
+        hash: "63deed0356e761f94f88be18a7d10053"
+    }
+    Frame {
+        msec: 2096
+        hash: "d5b4fc1b568a4a1b63a91b422272c704"
+    }
+    Frame {
+        msec: 2112
+        hash: "b6d2c80925cc6b4b7b297bd6ee903c7c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "38117482196360353586cb7ace593894"
+    }
+    Frame {
+        msec: 2144
+        hash: "2301f3a148bf4e311cc8ce011ddf65f8"
+    }
+    Frame {
+        msec: 2160
+        hash: "2a4982a0961f89a15618f8d4c2081f5a"
+    }
+    Frame {
+        msec: 2176
+        hash: "acf8666d6a8a29925f3895aa8e93f713"
+    }
+    Frame {
+        msec: 2192
+        hash: "967ed026bc92a6d2747c5227105543a6"
+    }
+    Frame {
+        msec: 2208
+        hash: "ff72f3fb95f25990c99c1c14cfef57da"
+    }
+    Frame {
+        msec: 2224
+        hash: "0874a4f863596c3860dcf5b1f7f6ceb2"
+    }
+    Frame {
+        msec: 2240
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2256
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2272
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2288
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2304
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2320
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2336
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2352
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2368
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2384
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2400
+        hash: "7c4bbf0423d63d7642d218cac56a6215"
+    }
+    Frame {
+        msec: 2416
+        hash: "e8c77dbc89721b51549f8d46453fe09d"
+    }
+    Frame {
+        msec: 2432
+        hash: "7953503590b639872ac12215695e8cea"
+    }
+    Frame {
+        msec: 2448
+        hash: "edaee946a2e25fed6de9acfda0d44a14"
+    }
+    Frame {
+        msec: 2464
+        hash: "4996ef39bb0122c10d65f8dd8674b386"
+    }
+    Frame {
+        msec: 2480
+        hash: "ede7c6ca9d6deb7819c3715e98755d6e"
+    }
+    Frame {
+        msec: 2496
+        hash: "e703fad2fcf9244ec9865200c7d17ce3"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2512
+        hash: "e2bfc16fd893bb3eb0e5df89a0169af3"
+    }
+    Frame {
+        msec: 2528
+        hash: "cfd0eb2bc378bd46644f3f7820150685"
+    }
+    Frame {
+        msec: 2544
+        hash: "442b05b04762c2bcda291aaa0341398e"
+    }
+    Frame {
+        msec: 2560
+        hash: "55842a6503057eea98e2075ef160873e"
+    }
+    Frame {
+        msec: 2576
+        hash: "730f80233dacf1119660a76d2a34c5fc"
+    }
+    Frame {
+        msec: 2592
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2608
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2624
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2640
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2656
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2672
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2688
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2704
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2720
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2736
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 536870912
+        text: "1c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2752
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2768
+        hash: "4d04c12bc7fab0b22df3135bf3a87a22"
+    }
+    Frame {
+        msec: 2784
+        hash: "fdca5a3f8312452feba7f37b1caa6419"
+    }
+    Frame {
+        msec: 2800
+        hash: "97b955e0f8cde30299b238d9ac0eb308"
+    }
+    Frame {
+        msec: 2816
+        hash: "19664de1a738458810896959ba4087ad"
+    }
+    Frame {
+        msec: 2832
+        hash: "4f9a4b6de6a2969e4639076a8f7c258e"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 536870912
+        text: "1c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2848
+        hash: "a10f18aa686be2681a48082ec9f01df7"
+    }
+    Frame {
+        msec: 2864
+        hash: "b8f39a6cca377dd573429d879286dd63"
+    }
+    Frame {
+        msec: 2880
+        image: "gridview2.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "3301e52a46efbc49882401c77853ffde"
+    }
+    Frame {
+        msec: 2912
+        hash: "0c614597f17496ebc701efe7b0c1fbb6"
+    }
+    Frame {
+        msec: 2928
+        hash: "6dda2d6b034c932e279cf216c9b3e6ad"
+    }
+    Frame {
+        msec: 2944
+        hash: "7bf08cd5fe3ad3f83bbef28f452e0545"
+    }
+    Frame {
+        msec: 2960
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 2976
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 2992
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 3008
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 3024
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3040
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 3056
+        hash: "0fe7d46e7c18ce7bb5a098c5c662d557"
+    }
+    Frame {
+        msec: 3072
+        hash: "cd5df541cc1ed545bc27da9e4a937261"
+    }
+    Frame {
+        msec: 3088
+        hash: "35762467b83fee1870cff9b0436994d3"
+    }
+    Frame {
+        msec: 3104
+        hash: "75a620b42caabf5b1576041dbd4c2808"
+    }
+    Frame {
+        msec: 3120
+        hash: "f1b06290a6cbd48b8d3d4ce1e42ed754"
+    }
+    Frame {
+        msec: 3136
+        hash: "8e1a50dc082828587a4656117760a852"
+    }
+    Frame {
+        msec: 3152
+        hash: "aae8e5f166e736040138d8e222a844dd"
+    }
+    Frame {
+        msec: 3168
+        hash: "f69e5cf2bcb26fe49126776695b0b7e0"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3184
+        hash: "7b482fece0255ea07496ef0545b008a2"
+    }
+    Frame {
+        msec: 3200
+        hash: "3f96eaebfebe8d4eeb347b201b59ab11"
+    }
+    Frame {
+        msec: 3216
+        hash: "9943626d2226c3be711c8213906133f0"
+    }
+    Frame {
+        msec: 3232
+        hash: "fd5fd8177b3957c27f1de0d95621351a"
+    }
+    Frame {
+        msec: 3248
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3264
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3280
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3296
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3312
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3328
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3344
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3360
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3376
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3392
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3408
+        hash: "fb437f6c23561092a124e498f1604ff2"
+    }
+    Frame {
+        msec: 3424
+        hash: "402ba144bbb7260eec4553e68eb35cda"
+    }
+    Frame {
+        msec: 3440
+        hash: "76a983de9e85e0c81dfb8908252bd6c9"
+    }
+    Frame {
+        msec: 3456
+        hash: "09219f55fae47a0afed887ebf68a36bc"
+    }
+    Frame {
+        msec: 3472
+        hash: "344e81cc262093facef2f6a235a734dc"
+    }
+    Frame {
+        msec: 3488
+        hash: "8f1c5544eb537555b1c59a377b15e31d"
+    }
+    Frame {
+        msec: 3504
+        hash: "606b9bb549fe2e4bbd09d67b7dea0d1a"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3520
+        hash: "63e239c97bd01a61cb31ef2869e7f47c"
+    }
+    Frame {
+        msec: 3536
+        hash: "f7c176550c39f8a1ad64590cf33a60a4"
+    }
+    Frame {
+        msec: 3552
+        hash: "8581cb14ed81efdf9abb638b5e542cc3"
+    }
+    Frame {
+        msec: 3568
+        hash: "7a1e9354ecc49d8bc27d303c7bdc81f9"
+    }
+    Frame {
+        msec: 3584
+        hash: "610288b97276ee03702ed8a814ef333d"
+    }
+    Frame {
+        msec: 3600
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3616
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3632
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3648
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3664
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3680
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3696
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3712
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3728
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3744
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3760
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3776
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3792
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3808
+        hash: "9713c6b9aff051dd0cc45c545d34b688"
+    }
+    Frame {
+        msec: 3824
+        hash: "1f8fd4d759e343720a8681b6ad126b72"
+    }
+    Frame {
+        msec: 3840
+        image: "gridview2.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "8550d916d91a40b0c3a886b962e07ffc"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3872
+        hash: "df0c2e474139e79429bfc19c79a65ef8"
+    }
+    Frame {
+        msec: 3888
+        hash: "acfb99d081d754276e5ed59bd590aeab"
+    }
+    Frame {
+        msec: 3904
+        hash: "2b34cd101b442f7a3de2893fd5514c16"
+    }
+    Frame {
+        msec: 3920
+        hash: "df92ced66faa1d59354d8010278438ec"
+    }
+    Frame {
+        msec: 3936
+        hash: "dd39a8e6fa3784453461193a6da416cd"
+    }
+    Frame {
+        msec: 3952
+        hash: "5670e8f91ea2df451f0974a51cd77d7d"
+    }
+    Frame {
+        msec: 3968
+        hash: "74b97a09bfe7400872a2c6214e04a5ac"
+    }
+    Frame {
+        msec: 3984
+        hash: "cfd55b963506ab54cf09a7311e84bcc9"
+    }
+    Frame {
+        msec: 4000
+        hash: "59657ee9293c03f064d62de826931435"
+    }
+    Frame {
+        msec: 4016
+        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
+    }
+    Frame {
+        msec: 4032
+        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
+    }
+    Frame {
+        msec: 4048
+        hash: "9dc38985113124130e2ca7950e0bd144"
+    }
+    Frame {
+        msec: 4064
+        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
+    }
+    Frame {
+        msec: 4080
+        hash: "1f4d59a4e4684aab309363a711b30006"
+    }
+    Frame {
+        msec: 4096
+        hash: "a11e332de151b43051796e16dbcf75c3"
+    }
+    Frame {
+        msec: 4112
+        hash: "1a0e82029ae107cb2a018786752433ff"
+    }
+    Frame {
+        msec: 4128
+        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
+    }
+    Frame {
+        msec: 4144
+        hash: "2b418f811992399c3f87c268db745632"
+    }
+    Frame {
+        msec: 4160
+        hash: "0e9a056207053ca98c4e9f42de244c62"
+    }
+    Frame {
+        msec: 4176
+        hash: "1945c3f9e3a1337e7d111e15adea345f"
+    }
+    Frame {
+        msec: 4192
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4208
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4224
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4240
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4256
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4272
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4288
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4304
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4320
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4336
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4352
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4368
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4384
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4400
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4416
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4432
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4448
+        hash: "1945c3f9e3a1337e7d111e15adea345f"
+    }
+    Frame {
+        msec: 4464
+        hash: "0e9a056207053ca98c4e9f42de244c62"
+    }
+    Frame {
+        msec: 4480
+        hash: "2b418f811992399c3f87c268db745632"
+    }
+    Frame {
+        msec: 4496
+        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
+    }
+    Frame {
+        msec: 4512
+        hash: "1a0e82029ae107cb2a018786752433ff"
+    }
+    Frame {
+        msec: 4528
+        hash: "a11e332de151b43051796e16dbcf75c3"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4544
+        hash: "1f4d59a4e4684aab309363a711b30006"
+    }
+    Frame {
+        msec: 4560
+        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
+    }
+    Frame {
+        msec: 4576
+        hash: "9dc38985113124130e2ca7950e0bd144"
+    }
+    Frame {
+        msec: 4592
+        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
+    }
+    Frame {
+        msec: 4608
+        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
+    }
+    Frame {
+        msec: 4624
+        hash: "59657ee9293c03f064d62de826931435"
+    }
+    Frame {
+        msec: 4640
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4656
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4672
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4688
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4704
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4720
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4736
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4752
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4768
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4784
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4800
+        image: "gridview2.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4832
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4848
+        hash: "d46eea049d6156a5e85d9c6811d9d367"
+    }
+    Frame {
+        msec: 4864
+        hash: "d5796ae85247cb8502f92f0d044e4e1f"
+    }
+    Frame {
+        msec: 4880
+        hash: "90987ac49c1a4e6b668436e3ff631e6c"
+    }
+    Frame {
+        msec: 4896
+        hash: "c38d69759ad80242b1fe83ba191cd421"
+    }
+    Frame {
+        msec: 4912
+        hash: "09d08aed76a04e492d8a39cc4dd2b8f5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4928
+        hash: "9671d2ff9a2ef46ce3c750a1965404a4"
+    }
+    Frame {
+        msec: 4944
+        hash: "f55857816d666ece4a7987a70883b3d1"
+    }
+    Frame {
+        msec: 4960
+        hash: "a2d80527b30316d9120b057bbfcfa666"
+    }
+    Frame {
+        msec: 4976
+        hash: "87ca69287c1469cbc7e65d1673016de7"
+    }
+    Frame {
+        msec: 4992
+        hash: "51588c7ebbe2dcd87a3c9bebf028aee3"
+    }
+    Frame {
+        msec: 5008
+        hash: "917a9a171273fe9fd4c450eeed6f58ed"
+    }
+    Frame {
+        msec: 5024
+        hash: "6e7ade250a9a9692caee2a220dd2ac53"
+    }
+    Frame {
+        msec: 5040
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5056
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5072
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5088
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5104
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5120
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5136
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5152
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5168
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5184
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5200
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5216
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5232
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5248
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5264
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5280
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5296
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5312
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5328
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5344
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5360
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5376
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5392
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5408
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5424
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5440
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5456
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5472
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5488
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5504
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5520
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5536
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5552
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5568
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5584
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5600
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5616
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5632
+        hash: "c5c9aab9bea757f1c451e89df72bd836"
+    }
+    Frame {
+        msec: 5648
+        hash: "a8cf3085f8c3b743f3f15db1ad7b8801"
+    }
+    Frame {
+        msec: 5664
+        hash: "c25a92050eced1c304506572723273a3"
+    }
+    Frame {
+        msec: 5680
+        hash: "cff981039c1a3eb6c3c1a20f142fbae2"
+    }
+    Frame {
+        msec: 5696
+        hash: "930765587fe3355873bbdff66b812b74"
+    }
+    Frame {
+        msec: 5712
+        hash: "6a60f97c7b39add465e1bd366e9c644b"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5728
+        hash: "7a1fd3c488d1064a75dc598c9a773291"
+    }
+    Frame {
+        msec: 5744
+        hash: "e2ecd7e68e27eb3d2dcb5e368d3ee5a0"
+    }
+    Frame {
+        msec: 5760
+        image: "gridview2.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "20f3aaca2efc3066076e73d1d95e5363"
+    }
+    Frame {
+        msec: 5792
+        hash: "b18d476cadc36e22dddc3185f595c123"
+    }
+    Frame {
+        msec: 5808
+        hash: "8cbc47555178c8ee355774eab17b4b19"
+    }
+    Frame {
+        msec: 5824
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5840
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5856
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5872
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5888
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5904
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5920
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5936
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5952
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5968
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5984
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6000
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6016
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6032
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6048
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6064
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6080
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6096
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6112
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6128
+        hash: "8c2fab0c73d1cfbeeb0ec937085d6b3b"
+    }
+    Frame {
+        msec: 6144
+        hash: "5d9353517177ef7c6314d8a65cb009ec"
+    }
+    Frame {
+        msec: 6160
+        hash: "ed8de504f7e2028cd369c1555314fd81"
+    }
+    Frame {
+        msec: 6176
+        hash: "8fe84d8badbe5bd08d097ba6bda10611"
+    }
+    Frame {
+        msec: 6192
+        hash: "d77419a55a3cf933505e793bb258e6af"
+    }
+    Frame {
+        msec: 6208
+        hash: "457ac82be02e2f5e08e51ccc78c94781"
+    }
+    Frame {
+        msec: 6224
+        hash: "e57e2852f065afff9c24c5bc9f29edee"
+    }
+    Frame {
+        msec: 6240
+        hash: "f72cd6ad3324936c3a18c264e23e05a9"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6256
+        hash: "a4bf7eae6fc7a05239d09421ae95304a"
+    }
+    Frame {
+        msec: 6272
+        hash: "423f3bd07df8bee25818644c07201a3c"
+    }
+    Frame {
+        msec: 6288
+        hash: "225e9c698424f287b9458b7839b4479b"
+    }
+    Frame {
+        msec: 6304
+        hash: "0f463db7e4acc184a4efb7b5e5c0d397"
+    }
+    Frame {
+        msec: 6320
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6336
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6352
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6368
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6384
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6400
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6416
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6432
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6448
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6464
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6480
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6496
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6512
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6528
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6544
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6560
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6576
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6592
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6608
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6624
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6640
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6656
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6672
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6688
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6704
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6720
+        image: "gridview2.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6752
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6768
+        hash: "738f6bcc043d221488285c7e529b1d1c"
+    }
+    Frame {
+        msec: 6784
+        hash: "cb0a4e8e79372dd67e8ecfea2143a47c"
+    }
+    Frame {
+        msec: 6800
+        hash: "544d1825b36f4e7950c1a62b26c1fd9b"
+    }
+    Frame {
+        msec: 6816
+        hash: "df99396622342b4f092b0db34a224c3d"
+    }
+    Frame {
+        msec: 6832
+        hash: "47391f51e5df2249a6ca1f1f6e8e80e0"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6848
+        hash: "d8079a874ca18d00aeeb611effcbeb8b"
+    }
+    Frame {
+        msec: 6864
+        hash: "4cfd9264af6935aca425da75ebb2d7cc"
+    }
+    Frame {
+        msec: 6880
+        hash: "aee6547cb653cd2d56d07285d836149d"
+    }
+    Frame {
+        msec: 6896
+        hash: "969720f17eae51258e2e143e14bfa737"
+    }
+    Frame {
+        msec: 6912
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6928
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6944
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6960
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6976
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6992
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7008
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7024
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7040
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7056
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7072
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7088
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7104
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7120
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7136
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7152
+        hash: "beeaec4b983c970ae448e33047dfdfea"
+    }
+    Frame {
+        msec: 7168
+        hash: "7c415ab1b7d8e25b71af75d3eec8ee4a"
+    }
+    Frame {
+        msec: 7184
+        hash: "8913037e57b9a6a58b68f2d6e69b1bd1"
+    }
+    Frame {
+        msec: 7200
+        hash: "19e59e9409fdaf90ccf75606b58688b7"
+    }
+    Frame {
+        msec: 7216
+        hash: "1ae71ef5b1006f637bd8df0769af65a6"
+    }
+    Frame {
+        msec: 7232
+        hash: "1f0aa8b368b2dbccafd54b923d8cce95"
+    }
+    Frame {
+        msec: 7248
+        hash: "c5079fb25a8c80a995d7aa5fbbd91428"
+    }
+    Frame {
+        msec: 7264
+        hash: "59f41220fa5d23db298c9e94f115c17b"
+    }
+    Frame {
+        msec: 7280
+        hash: "48259dfe8b266d9e7f50b187be98c3cb"
+    }
+    Frame {
+        msec: 7296
+        hash: "f7554552598351c3b8dfcbe3ebc32b3b"
+    }
+    Frame {
+        msec: 7312
+        hash: "219e9cd84d7e5c5c0e6cb80100aa3ab5"
+    }
+    Frame {
+        msec: 7328
+        hash: "5578e870ee8ce00bce5a59bb25e3d0a9"
+    }
+    Frame {
+        msec: 7344
+        hash: "4d9cebbf750c03380694245e0e22ab94"
+    }
+    Frame {
+        msec: 7360
+        hash: "a60a8032e97ed0a3caa05012c1283de5"
+    }
+    Frame {
+        msec: 7376
+        hash: "3bee20b349a7e9d67f7770ede6da8673"
+    }
+    Frame {
+        msec: 7392
+        hash: "d8c34576c25fb8b5e4fa12680ac32e99"
+    }
+    Frame {
+        msec: 7408
+        hash: "cd1360aa7db7c3b2f2012dfc44de2198"
+    }
+    Frame {
+        msec: 7424
+        hash: "cd82782f63c9a7d21d51b3440c2f038b"
+    }
+    Frame {
+        msec: 7440
+        hash: "e59061967a841aa45607c0828b687527"
+    }
+    Frame {
+        msec: 7456
+        hash: "01962406c9aaf1aa8bf3ab49e30ddf5f"
+    }
+    Frame {
+        msec: 7472
+        hash: "5a5732a568189e598c7985ee806bc67e"
+    }
+    Frame {
+        msec: 7488
+        hash: "54775aed3a6283c1fa330d65de5bc70c"
+    }
+    Frame {
+        msec: 7504
+        hash: "66640b4a5c1e68924b25de24e3c3f008"
+    }
+    Frame {
+        msec: 7520
+        hash: "76999d3125f20ba47dbdff38ee722a8a"
+    }
+    Frame {
+        msec: 7536
+        hash: "5159c81533bee8825cff11910bcb90dc"
+    }
+    Frame {
+        msec: 7552
+        hash: "ac0295495345987d1e000f6bb2436927"
+    }
+    Frame {
+        msec: 7568
+        hash: "d56b4a04f1d2835a0852ea20e8e2f451"
+    }
+    Frame {
+        msec: 7584
+        hash: "ae41fe23e2ab508d7642973c0d9d35b0"
+    }
+    Frame {
+        msec: 7600
+        hash: "730ca01fbee6ec4928715ec52773c06c"
+    }
+    Frame {
+        msec: 7616
+        hash: "ad1fa52c617a2b119d61eb9fb7d58a82"
+    }
+    Frame {
+        msec: 7632
+        hash: "c74321a822b515a393e8e218bd45e8e3"
+    }
+    Frame {
+        msec: 7648
+        hash: "a9e2f3bee1d47166204c74bdf90cd8c8"
+    }
+    Frame {
+        msec: 7664
+        hash: "e10d4bf08980ea7d079a2f359ee62b95"
+    }
+    Frame {
+        msec: 7680
+        image: "gridview2.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "9f0ba6051e684e54ff4e36d980a7e600"
+    }
+    Frame {
+        msec: 7712
+        hash: "aa6268d8d7fb3d2b91db3e225e8c818a"
+    }
+    Frame {
+        msec: 7728
+        hash: "8e547e55279b1929f42bf51e753f142e"
+    }
+    Frame {
+        msec: 7744
+        hash: "5386c71f8d6701379e177f161d714da2"
+    }
+    Frame {
+        msec: 7760
+        hash: "a184e9e6012c72fc1aeaed9f98b0fb1e"
+    }
+    Frame {
+        msec: 7776
+        hash: "777a6b70ca77c45e2e5e3914cc328dcb"
+    }
+    Frame {
+        msec: 7792
+        hash: "424f73f25a1e91126f951838d45adc3b"
+    }
+    Frame {
+        msec: 7808
+        hash: "3f7f2eb6b9a5d19fbfcd700baf566dfb"
+    }
+    Frame {
+        msec: 7824
+        hash: "c3c4c72b25c2295b82a5fd7454942f77"
+    }
+    Frame {
+        msec: 7840
+        hash: "3b35e93d3eb9d28c5c03d6d353f805d2"
+    }
+    Frame {
+        msec: 7856
+        hash: "5dcad019a1c0eaaab381a7602e1914ff"
+    }
+    Frame {
+        msec: 7872
+        hash: "602a5c569555767413bf445af44c744f"
+    }
+    Frame {
+        msec: 7888
+        hash: "3e9facab95dae772f695b6f7c5175063"
+    }
+    Frame {
+        msec: 7904
+        hash: "0921220ec36ca7b25eaae699872a2006"
+    }
+    Frame {
+        msec: 7920
+        hash: "1d5fa7fd630af62bcc805bdc6686df37"
+    }
+    Frame {
+        msec: 7936
+        hash: "165c02de63604aa118d9f8995e6b45af"
+    }
+    Frame {
+        msec: 7952
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 7968
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 7984
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8000
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8016
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8032
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8048
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8064
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8080
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8096
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8112
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8128
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8144
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8160
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8176
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8192
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8208
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8224
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8240
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8256
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8272
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8288
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8304
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8320
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8336
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8352
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8368
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8384
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8400
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8416
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8432
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8448
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8464
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8480
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8496
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8512
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8528
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8544
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8560
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8576
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8592
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8608
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8624
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8640
+        image: "gridview2.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8672
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8688
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8704
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8720
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8736
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8752
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8768
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8784
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8800
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8816
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8832
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8848
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8864
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8880
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8896
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8912
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8928
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8944
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8960
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8976
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8992
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 9008
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 9024
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
index 4dac63e..c79e19f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
@@ -1,7 +1,5 @@
 import QtQuick 1.0
 
-//Currently doesn't behave right, see QTBUG-14837
-
 Rectangle {
     width: 300; height: 400; color: "black"
 
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
index e27b4df..811e0e4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
@@ -1,7 +1,5 @@
 import QtQuick 1.0
 
-//Currently doesn't behave right: see QTBUG-14838
-
 Rectangle {
     width: 300; height: 400; color: "black"
 
-- 
cgit v0.12


From f513381e22a56dedd340df83bed8a50b7c9591f0 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 15:21:22 +1000
Subject: Update gridview visual tests

The bug found in gridview.qml doesn't actually stop the test from
passing, so it's now updated.

Task-number: QTBUG-14792
---
 .../qdeclarativegridview/data/gridview.0.png       | Bin 1303 -> 1318 bytes
 .../qdeclarativegridview/data/gridview.1.png       | Bin 1317 -> 1332 bytes
 .../qdeclarativegridview/data/gridview.2.png       | Bin 1318 -> 1331 bytes
 .../qdeclarativegridview/data/gridview.3.png       | Bin 1306 -> 1321 bytes
 .../qdeclarativegridview/data/gridview.4.png       | Bin 1308 -> 1325 bytes
 .../qdeclarativegridview/data/gridview.5.png       | Bin 1303 -> 1321 bytes
 .../qdeclarativegridview/data/gridview.6.png       | Bin 1323 -> 1341 bytes
 .../qdeclarativegridview/data/gridview.7.png       | Bin 1325 -> 1341 bytes
 .../qdeclarativegridview/data/gridview.8.png       | Bin 1346 -> 1359 bytes
 .../qdeclarativegridview/data/gridview.9.png       | Bin 1303 -> 1318 bytes
 .../qdeclarativegridview/data/gridview.qml         | 742 ++++++++++-----------
 .../qmlvisual/qdeclarativegridview/gridview.qml    |   2 +-
 .../qmlvisual/qdeclarativegridview/gridview2.qml   |   3 +-
 13 files changed, 374 insertions(+), 373 deletions(-)

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png
index 6c82777..c675be7 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png
index 07b1f7c..9f605c3 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png
index f2f08c0..35572c5 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png
index 08649f9..20146c9 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png
index f9c2f17..85fac89 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png
index 52ec0bd..e522bae 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png
index 3fe25be..ec0ba86 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png
index 4cc12a6..20cacc81 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png
index 2267f23..b2b187d 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png
index 6c82777..c675be7 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
index 67aa10a..a3e5ea0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
@@ -122,27 +122,27 @@ VisualTest {
     }
     Frame {
         msec: 448
-        hash: "96ad89eafa7f99269518a192573af91b"
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
     }
     Frame {
         msec: 464
-        hash: "735b00b968d0e2ea1f34cc0bdc028a8e"
+        hash: "159004854f8c07144034e1265cf6f44a"
     }
     Frame {
         msec: 480
-        hash: "ce37c8e15fbb1aea72aff9629683fa96"
+        hash: "a3f2471ef4ceac77a1c20ac327550d8d"
     }
     Frame {
         msec: 496
-        hash: "a3f2471ef4ceac77a1c20ac327550d8d"
+        hash: "1121efa0df5057387be08fced62fe9eb"
     }
     Frame {
         msec: 512
-        hash: "28f120bd3bda9552dbc8cc908409c67d"
+        hash: "67ad85cda0b8fb382cb536ef880f715b"
     }
     Frame {
         msec: 528
-        hash: "f21cf0ed746fa48e67dc90c70c5bbae8"
+        hash: "4de18d32c93ca5cd77cb45c8c4f3b4fc"
     }
     Key {
         type: 7
@@ -154,19 +154,19 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "485d55730366b68e01582879f6970fa1"
+        hash: "de26f0243101d57f4acf42b256ad75f9"
     }
     Frame {
         msec: 560
-        hash: "700e53c78b28993dce5dafb4035f4760"
+        hash: "119ea359724d5f4ba1e1aa120cddf3ea"
     }
     Frame {
         msec: 576
-        hash: "1e538e175a5e402e2334cf354392e8a7"
+        hash: "65fbee28f9ea68a6f2736d75a65b3ee2"
     }
     Frame {
         msec: 592
-        hash: "0fbfba93eebaf05ae60067b365b6b4bc"
+        hash: "7b1893397b76b0c95094eeca1dd21446"
     }
     Frame {
         msec: 608
@@ -206,31 +206,31 @@ VisualTest {
     }
     Frame {
         msec: 720
-        hash: "25e48099a8194ed2674651818d854c61"
+        hash: "7b1893397b76b0c95094eeca1dd21446"
     }
     Frame {
         msec: 736
-        hash: "b75d02dfc238ba2292306ca1421279c3"
+        hash: "6123118055b4d0678eb2b7cdf8b12592"
     }
     Frame {
         msec: 752
-        hash: "7e48b7d9c1291b4e438c81f44228d8ad"
+        hash: "fe4b009abe081a6eaeab6ef9e996f3fd"
     }
     Frame {
         msec: 768
-        hash: "fe4b009abe081a6eaeab6ef9e996f3fd"
+        hash: "2f23f647daa1c11637d6a21c2668be49"
     }
     Frame {
         msec: 784
-        hash: "edea8c305fe88708dbafc03e427caa09"
+        hash: "62d995a1feb7f600669c1c7ef5f6a5da"
     }
     Frame {
         msec: 800
-        hash: "7b58803f12d0ab893acf539799d79e31"
+        hash: "66e881ee93f4722605a63dccd083635d"
     }
     Frame {
         msec: 816
-        hash: "9b56c3d1d140114dcc57d0a8568e9b95"
+        hash: "27ac08cc4f62552a9d1c1cbf781a00f9"
     }
     Key {
         type: 7
@@ -242,15 +242,15 @@ VisualTest {
     }
     Frame {
         msec: 832
-        hash: "35e38e273dbc8e565917b21d00fc1530"
+        hash: "792be2ec5a08ad74cda4c19b6bc209d0"
     }
     Frame {
         msec: 848
-        hash: "116e294391333e8780daeca54c3d51ea"
+        hash: "0d28add40afd81f768603ea3e396f0b3"
     }
     Frame {
         msec: 864
-        hash: "6219676215f82540d7a53b2a8aa60279"
+        hash: "02c632713d0dc64bff9d8e58f745df95"
     }
     Frame {
         msec: 880
@@ -334,15 +334,15 @@ VisualTest {
     }
     Frame {
         msec: 1168
-        hash: "2667c2596de97dc15353158eba03495f"
+        hash: "02c632713d0dc64bff9d8e58f745df95"
     }
     Frame {
         msec: 1184
-        hash: "6a7b64e1427dcb7e438aa09a739cbc7b"
+        hash: "eac6b1299cb386f2be244b43a0be26ae"
     }
     Frame {
         msec: 1200
-        hash: "5bad6dc745958f5827403ea593c78752"
+        hash: "14350c877f5259a3cb3836fa5f8ff563"
     }
     Key {
         type: 7
@@ -354,31 +354,31 @@ VisualTest {
     }
     Frame {
         msec: 1216
-        hash: "b393401219ada7d094a451dba8af3f1a"
+        hash: "582bfeca87cba0dee21b9551e583ec93"
     }
     Frame {
         msec: 1232
-        hash: "ba656452f8adf3d1ca7db9286274c37f"
+        hash: "cefe1139141fa381e55f1254713a1380"
     }
     Frame {
         msec: 1248
-        hash: "1e9725c8c364a491f34035fad1f77c63"
+        hash: "72e966a995c818b16b48bb193eda241a"
     }
     Frame {
         msec: 1264
-        hash: "a0aef0b65446dec0673b5cec3a260390"
+        hash: "8dfeefd93687861158ca4496e56cdbb9"
     }
     Frame {
         msec: 1280
-        hash: "d60c11a5d376af0831d6f05f2a839a92"
+        hash: "daf8474f1f583039f6a14b822e5dff5e"
     }
     Frame {
         msec: 1296
-        hash: "1dd2c456c6ee9cc8f9be0e9f3617d44b"
+        hash: "eb2b4ba7ffab22660d0b9de4226ea88f"
     }
     Frame {
         msec: 1312
-        hash: "56208e6551e2f4202bab2d62a1cf46a2"
+        hash: "f0f00d22d15ed9828db7b5f3a3669fe9"
     }
     Frame {
         msec: 1328
@@ -474,31 +474,31 @@ VisualTest {
     }
     Frame {
         msec: 1664
-        hash: "f0f00d22d15ed9828db7b5f3a3669fe9"
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
     }
     Frame {
         msec: 1680
-        hash: "153e7984089530bbd052c9e4f62eb14c"
+        hash: "66e158aa7dd78362dffddf2a9e7375ef"
     }
     Frame {
         msec: 1696
-        hash: "0525d40cc58d054a3abd7ee2486576f8"
+        hash: "8c23d5245774ab5252c98c19c33f8171"
     }
     Frame {
         msec: 1712
-        hash: "8c23d5245774ab5252c98c19c33f8171"
+        hash: "bf37dc941e49af9bd1e0e182a4ef6f0a"
     }
     Frame {
         msec: 1728
-        hash: "5ca243794d1350f04cf973d4bfc8ab89"
+        hash: "3fc025193fa6d6db0428ae1fa179bf55"
     }
     Frame {
         msec: 1744
-        hash: "d19b7f4c0897aba498e122d83b4cbbf1"
+        hash: "9efef22e6e29e18b2896982440c7bbae"
     }
     Frame {
         msec: 1760
-        hash: "99e41460dd8efc6e5c3faf54b14c3d43"
+        hash: "380e92b30430d3f589a88e67b7b959bd"
     }
     Key {
         type: 7
@@ -510,15 +510,15 @@ VisualTest {
     }
     Frame {
         msec: 1776
-        hash: "703469f8b133156ed3aabe02762d66c3"
+        hash: "80329cd1548c4ff9ee589d56e9d8cd90"
     }
     Frame {
         msec: 1792
-        hash: "1cc2c383e988048db76a80d8d7f5a0e2"
+        hash: "6030c139032fc80abb5aabb85d8dfa4d"
     }
     Frame {
         msec: 1808
-        hash: "8e87117c19eb9d6e600c44e0f3869ae1"
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
     }
     Frame {
         msec: 1824
@@ -574,27 +574,27 @@ VisualTest {
     }
     Frame {
         msec: 2000
-        hash: "4924037ce643d0748b8b2c666e61fd62"
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
     }
     Frame {
         msec: 2016
-        hash: "ef9750584e669a8b2d415d13854e12a6"
+        hash: "719eabf9ad7e15d5429630c7f7136980"
     }
     Frame {
         msec: 2032
-        hash: "69937eacef6e6b11ad1d5741c69a1faa"
+        hash: "a1bd870fffd95a0604dd8e170e571632"
     }
     Frame {
         msec: 2048
-        hash: "a1bd870fffd95a0604dd8e170e571632"
+        hash: "b406160dda839ee34002190e05ceffac"
     }
     Frame {
         msec: 2064
-        hash: "a3a72386594aacc88977cdaa6441df48"
+        hash: "a139784af7675281f0f3760a932aef0c"
     }
     Frame {
         msec: 2080
-        hash: "6d8e89de38d52f0f0f871dfa18361cb5"
+        hash: "2c7d2f857919deae0a8ad6dc2f7d806f"
     }
     Key {
         type: 7
@@ -606,19 +606,19 @@ VisualTest {
     }
     Frame {
         msec: 2096
-        hash: "96cfb1eb6893fac86c9434d1ffb82fcb"
+        hash: "80af5431f6d9a77f98c23d913c6caad4"
     }
     Frame {
         msec: 2112
-        hash: "5e11df1660634ff317be474118174ec5"
+        hash: "b3ccaf648e09dbfcbaa7609440c63fc9"
     }
     Frame {
         msec: 2128
-        hash: "2eb75858b50c3a9a80673ab89014ed63"
+        hash: "d267f9f4dd471be1cf4718d212c79887"
     }
     Frame {
         msec: 2144
-        hash: "3ff5d66f7902af92d49ebebf04d16c26"
+        hash: "570da61e2d48acd11474fe005110ab4b"
     }
     Frame {
         msec: 2160
@@ -678,31 +678,31 @@ VisualTest {
     }
     Frame {
         msec: 2352
-        hash: "efeda5b2d97e1b7c22e2308250501cb7"
+        hash: "570da61e2d48acd11474fe005110ab4b"
     }
     Frame {
         msec: 2368
-        hash: "d6158379b699279f66b94a8418e53af1"
+        hash: "db27d4cc92c09148675e76459d8ecb15"
     }
     Frame {
         msec: 2384
-        hash: "ab960b0669fa594e0552df623a9136ea"
+        hash: "2c6f60eb170588a8450c679f3b16a6a4"
     }
     Frame {
         msec: 2400
-        hash: "0ebf6be1305ee1eb8740f4d0365ef4c5"
+        hash: "024a4d4fc9a11d352d1e0f5ee7f7dbc8"
     }
     Frame {
         msec: 2416
-        hash: "46cde47dffc6f2687c8c643eca09b95d"
+        hash: "c966b518b881f85a2d1cc86f5284ee1b"
     }
     Frame {
         msec: 2432
-        hash: "2b8698ce02a6964115d960ae19f40c37"
+        hash: "db15811f2d2cff0949213823649ef1d4"
     }
     Frame {
         msec: 2448
-        hash: "ff1e7d800bb27b41710c50554adc1091"
+        hash: "bbd9fad235aa2843bf2b64f3cf24f4e3"
     }
     Key {
         type: 7
@@ -714,15 +714,15 @@ VisualTest {
     }
     Frame {
         msec: 2464
-        hash: "5837b3aca09038cae23dcb149acc8b0b"
+        hash: "ccbc2f09ed263375e7b52f556fb2836f"
     }
     Frame {
         msec: 2480
-        hash: "dbe7c571cdbdb9de4fd01faa6d5374cf"
+        hash: "c3b74e90fa99f4357762b57b9317b6f5"
     }
     Frame {
         msec: 2496
-        hash: "f431abcaf05f49ead909296d7649f8a9"
+        hash: "4f2fafdb59db544352e3067d67c0a714"
     }
     Frame {
         msec: 2512
@@ -806,23 +806,23 @@ VisualTest {
     }
     Frame {
         msec: 2800
-        hash: "4f2fafdb59db544352e3067d67c0a714"
+        hash: "043583b19c921740dbc990afd4f508ed"
     }
     Frame {
         msec: 2816
-        hash: "4dcd4cdf6f4e305732185ec52cd2f2f6"
+        hash: "64fdbc9a930e44dcc38542f720b41b0a"
     }
     Frame {
         msec: 2832
-        hash: "dfd3c29b0520edbbee57dfacfa7e2b30"
+        hash: "257d3d8bcf78671d35a898befec091cb"
     }
     Frame {
         msec: 2848
-        hash: "257d3d8bcf78671d35a898befec091cb"
+        hash: "92a51faf52bdc7f895bdc08f049f6ed3"
     }
     Frame {
         msec: 2864
-        hash: "20e89c544284603943396694abe86756"
+        hash: "5aec71e84a4e9c4962ed73c39d337910"
     }
     Frame {
         msec: 2880
@@ -830,7 +830,7 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "b88c6af89423b32b3a4413035711df03"
+        hash: "534973232974b7ee999172269d16c499"
     }
     Key {
         type: 7
@@ -842,15 +842,15 @@ VisualTest {
     }
     Frame {
         msec: 2912
-        hash: "e34de13af44c449c9ecc86e06ce01ed2"
+        hash: "32faa54e636773747a2ec4065a11c337"
     }
     Frame {
         msec: 2928
-        hash: "98ffe81129aa7cc7325764221f1dae59"
+        hash: "ebe24b814e27cd8a8db78da58c8f86d7"
     }
     Frame {
         msec: 2944
-        hash: "db2d545de9879362738e71a02a3d1d26"
+        hash: "e67ae32a47213b360c1a445bf645dde2"
     }
     Frame {
         msec: 2960
@@ -902,27 +902,27 @@ VisualTest {
     }
     Frame {
         msec: 3120
-        hash: "02d8c90faf56c65252e4f938944bda7b"
+        hash: "e67ae32a47213b360c1a445bf645dde2"
     }
     Frame {
         msec: 3136
-        hash: "a32994e2320e357241f63b956b6db236"
+        hash: "d446b94a2e3d9f7091c5520852d1a215"
     }
     Frame {
         msec: 3152
-        hash: "9ada466c26c217adbcd7a93df264ed75"
+        hash: "79d1a3489be95d113e8c611a2ba63456"
     }
     Frame {
         msec: 3168
-        hash: "79d1a3489be95d113e8c611a2ba63456"
+        hash: "95601b7d8ab689142ca89343743b55b2"
     }
     Frame {
         msec: 3184
-        hash: "d3aa82455c4ae3ac25097354e132a30f"
+        hash: "ad67049e51eafbbc33d1e3763d78b5f9"
     }
     Frame {
         msec: 3200
-        hash: "62d12e5933ed4ed048ccafd229f4b2b7"
+        hash: "69b1d558065ee9b9719c3ae8f08b52ab"
     }
     Key {
         type: 7
@@ -934,19 +934,19 @@ VisualTest {
     }
     Frame {
         msec: 3216
-        hash: "5bc4ac94ae20e425084d0811dee1ba08"
+        hash: "858fd65adb231bf2002bcc25075be261"
     }
     Frame {
         msec: 3232
-        hash: "6d5113e3732dc7a9172eea3667a01f7b"
+        hash: "2dc6fb114e1d2a606efe48f349251504"
     }
     Frame {
         msec: 3248
-        hash: "e435a2588b25d3336f290331931f5981"
+        hash: "e4819f09d6640021408e03c50090e849"
     }
     Frame {
         msec: 3264
-        hash: "bce201adbeb319b181cce139f179d7f0"
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
     }
     Frame {
         msec: 3280
@@ -1006,31 +1006,31 @@ VisualTest {
     }
     Frame {
         msec: 3472
-        hash: "8f0f3cd35ae92047f23084f447046eb8"
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
     }
     Frame {
         msec: 3488
-        hash: "ceb12e6c5e9f0566039040d9f3ff587f"
+        hash: "6c84f5e6d352ed345a0bed12c50bf7a9"
     }
     Frame {
         msec: 3504
-        hash: "dfd0c89c3ea73aceefcdafa71609c720"
+        hash: "15690df807a7c1e9aa9d7e9154c1a492"
     }
     Frame {
         msec: 3520
-        hash: "8d8ed1a9dc6a9f74dfc81b79f02af4c5"
+        hash: "3d6cc3e0d93ddf4b66321fda361f05c0"
     }
     Frame {
         msec: 3536
-        hash: "d450bd62e03e1e4c7cb66e98ece05f97"
+        hash: "8e3526ffeb9873b55b3bae2827391628"
     }
     Frame {
         msec: 3552
-        hash: "d1ece2210cd24eedd5361e5c3a162236"
+        hash: "33097267d43a7e16a78102cb91c9fd42"
     }
     Frame {
         msec: 3568
-        hash: "77589e48b9db95e702055753046319e5"
+        hash: "17ab2623432bba92dc9d99e5764e626e"
     }
     Key {
         type: 7
@@ -1042,15 +1042,15 @@ VisualTest {
     }
     Frame {
         msec: 3584
-        hash: "7793263ecb831a1e63fbd76c8addde03"
+        hash: "9945a723d9a3399bb5311eea3d9b0b77"
     }
     Frame {
         msec: 3600
-        hash: "bfa9675f981c37fed27dea100226f61a"
+        hash: "e6e9251cd6d941a050beaa36b851e314"
     }
     Frame {
         msec: 3616
-        hash: "9780849fe8abd22c32ccafcdd46b0d65"
+        hash: "a61dbcb7d914afe34009085bf37fb8e2"
     }
     Frame {
         msec: 3632
@@ -1138,31 +1138,31 @@ VisualTest {
     }
     Frame {
         msec: 3936
-        hash: "a61dbcb7d914afe34009085bf37fb8e2"
+        hash: "e63d987ba303a42046827f14941b444a"
     }
     Frame {
         msec: 3952
-        hash: "89175b83b4f7ee4b5d99219cdc97aa59"
+        hash: "9942059cb380dbae191850d2e7175906"
     }
     Frame {
         msec: 3968
-        hash: "f524421286503f6175e4ad71dd89145f"
+        hash: "ca5af7d98a008eccba1e21be0da61f3c"
     }
     Frame {
         msec: 3984
-        hash: "ca5af7d98a008eccba1e21be0da61f3c"
+        hash: "abb95ac1408d34e2eb319e5396511d65"
     }
     Frame {
         msec: 4000
-        hash: "77c19e7e17e00787ff0d7a4e7bad7bc8"
+        hash: "183df6d4be489280181f01a0c0ed3cde"
     }
     Frame {
         msec: 4016
-        hash: "04c8db761e324101ad92e0ac9ceed7d4"
+        hash: "64733a4d609c621765d114a6b482dc57"
     }
     Frame {
         msec: 4032
-        hash: "97a3dcb81349efab6b44d458e83ce5c4"
+        hash: "897aa5b42e48a7235ab4fdded5876da2"
     }
     Key {
         type: 7
@@ -1174,15 +1174,15 @@ VisualTest {
     }
     Frame {
         msec: 4048
-        hash: "e86ebc276b88705c97cc9efb66ccc6b2"
+        hash: "c80f01a1e683d84bfa0821832c113820"
     }
     Frame {
         msec: 4064
-        hash: "a134bbfd14879f13b288a04d23382348"
+        hash: "e7065bf6934c7fb7b160ae5c169633e4"
     }
     Frame {
         msec: 4080
-        hash: "9530ad3f58ad1c66401572869f7d91bc"
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
     }
     Frame {
         msec: 4096
@@ -1230,31 +1230,31 @@ VisualTest {
     }
     Frame {
         msec: 4240
-        hash: "980e0fa84fd3bab496623936f5f220a2"
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
     }
     Frame {
         msec: 4256
-        hash: "ed3268911723d664699bbc31317befc1"
+        hash: "917c11b16c6286bea7a37990d7fa078f"
     }
     Frame {
         msec: 4272
-        hash: "3bfda4b3b0b2d2a97ec1c0b5b3f4da63"
+        hash: "1616c6def28659d51905564ff83cc112"
     }
     Frame {
         msec: 4288
-        hash: "1616c6def28659d51905564ff83cc112"
+        hash: "fce04972557736a8dfa8de5f1a605ddb"
     }
     Frame {
         msec: 4304
-        hash: "68342f34c18956d3a093f8eeeae6977e"
+        hash: "6acffcea115f8a777f62c1f68cd25fa6"
     }
     Frame {
         msec: 4320
-        hash: "ac1b12959e9055a28fe2bda0a12b75bc"
+        hash: "f96ae6a4f437cf98b268fc0b0611ddc4"
     }
     Frame {
         msec: 4336
-        hash: "009b85ff6b86e418c78ed33a5e88d3f1"
+        hash: "c9e14157dca547623497a6107f14b73d"
     }
     Key {
         type: 7
@@ -1266,15 +1266,15 @@ VisualTest {
     }
     Frame {
         msec: 4352
-        hash: "59753bc7dc69767fe2109fdc41f20dae"
+        hash: "6489766ed84c4b6ff26de24cb74848cb"
     }
     Frame {
         msec: 4368
-        hash: "1c87d3d8c8d564d4d95a26f57fd28f38"
+        hash: "9d229c10853b30ed048b892953c5d86c"
     }
     Frame {
         msec: 4384
-        hash: "4e43b7b6787002c9013010dd74c83f49"
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
     }
     Frame {
         msec: 4400
@@ -1338,31 +1338,31 @@ VisualTest {
     }
     Frame {
         msec: 4608
-        hash: "84de5b5e8b0fba190a783c72967661c7"
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
     }
     Frame {
         msec: 4624
-        hash: "60b696f4913379d28f300fd1b531c6cb"
+        hash: "12f17d727d70269fd98a0f6524c9f750"
     }
     Frame {
         msec: 4640
-        hash: "d01e651d9094332fd82ad1cea3e93e9d"
+        hash: "e73d64ebe242eae0f412ca463c76085d"
     }
     Frame {
         msec: 4656
-        hash: "87be4cd7c894b03b2b64c996e915d71f"
+        hash: "f37a468e04155c880e707d1d12f71f94"
     }
     Frame {
         msec: 4672
-        hash: "b07fccb0c5565d2feed5a9fcdf8acead"
+        hash: "3789293a6b8791d8e60b5160fc457345"
     }
     Frame {
         msec: 4688
-        hash: "3dca3165fd34be549d21fb6c414c67d8"
+        hash: "7d8377c816f19fa32d847a30d1c71da9"
     }
     Frame {
         msec: 4704
-        hash: "5f69f3298f8ca73fa9b3b6e630c60186"
+        hash: "b9867dbb6f03d5970076251e10e47f16"
     }
     Key {
         type: 7
@@ -1374,23 +1374,23 @@ VisualTest {
     }
     Frame {
         msec: 4720
-        hash: "d7f41e9a29d550a7d9a41bb947569abe"
+        hash: "0604bbd1afdfee5881d9d9d79a67a3df"
     }
     Frame {
         msec: 4736
-        hash: "4ede2e90ad216a2d44580c50a25dea23"
+        hash: "93401cdfa6cc7fbbfc479faa0bc1d63f"
     }
     Frame {
         msec: 4752
-        hash: "9b339845ee588b789dc9095c272e0bdf"
+        hash: "aa379c70dd6a94a55fd8c065331ad47b"
     }
     Frame {
         msec: 4768
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4784
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4800
@@ -1398,91 +1398,91 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4832
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4848
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4864
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4880
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4896
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4912
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4928
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4944
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4960
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4976
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 4992
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5008
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5024
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5040
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5056
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5072
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5088
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5104
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5120
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5136
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5152
-        hash: "9cdea4790972efaecabd52b435107e69"
+        hash: "11150995098af8516513230360d40108"
     }
     Key {
         type: 6
@@ -1494,31 +1494,31 @@ VisualTest {
     }
     Frame {
         msec: 5168
-        hash: "d6f0a6d7604bad811eeba13fd7c45368"
+        hash: "11150995098af8516513230360d40108"
     }
     Frame {
         msec: 5184
-        hash: "5f92e1531a3f6c21ec82e3c908167fc7"
+        hash: "c58f071ae4efde5cd265fa6e82dda56b"
     }
     Frame {
         msec: 5200
-        hash: "5214e99ff052dcdc8f85bad29de92e03"
+        hash: "bea9eadda7b015d0e9a0f05924e723f7"
     }
     Frame {
         msec: 5216
-        hash: "d4abed9f0f1115c9a45b0b9b4f54754e"
+        hash: "c255da63dc59ca7555c91701ed373fd5"
     }
     Frame {
         msec: 5232
-        hash: "cfae8a0281e704b0e62f6bf31b32800f"
+        hash: "fa0a697341baae4b3aa4dee721ef10a2"
     }
     Frame {
         msec: 5248
-        hash: "c203f0674596ae690bf19f2d49be62ac"
+        hash: "2d2148840143772fab6b2405bf5eb609"
     }
     Frame {
         msec: 5264
-        hash: "2e2c7e05aade104bdc4f6c489b6f0601"
+        hash: "3716705b5f7caa86eecc1dfafe31ebcf"
     }
     Key {
         type: 7
@@ -1530,51 +1530,51 @@ VisualTest {
     }
     Frame {
         msec: 5280
-        hash: "b4b2148b0557dcab3a441165e5e4de5f"
+        hash: "35cfea054566eae3bcc9c8a41caadcdc"
     }
     Frame {
         msec: 5296
-        hash: "c5e791d27a42a63d25cdbd492b4af29a"
+        hash: "916858ff0ca4370840d072c389242a2b"
     }
     Frame {
         msec: 5312
-        hash: "0f94ebcb407f8e6ae263bd954f2c8177"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5328
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5344
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5360
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5376
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5392
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5408
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5424
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5440
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5456
-        hash: "d9b56b817a411812789881697a28fe4c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Key {
         type: 6
@@ -1586,31 +1586,31 @@ VisualTest {
     }
     Frame {
         msec: 5472
-        hash: "6fdfe69e377da72e04dc130f5677ed2c"
+        hash: "417f4bce58783f0e677b17b05147a663"
     }
     Frame {
         msec: 5488
-        hash: "c041d26d43766fa1735f2ada2a43225b"
+        hash: "191f2c80617cef61a2890977c3079ad2"
     }
     Frame {
         msec: 5504
-        hash: "aa62dbd6c6256665ee1b4ef468607978"
+        hash: "0902ef220363ad2c08f09199278cecf8"
     }
     Frame {
         msec: 5520
-        hash: "987fcdf6483a83b1242053f4e7fb7a26"
+        hash: "d28ea1b1e01588bbb767a5599c5345d2"
     }
     Frame {
         msec: 5536
-        hash: "fbde70c34709b68eb22f5460a8815fba"
+        hash: "36eeaf2755fffefc32bcd580fade6305"
     }
     Frame {
         msec: 5552
-        hash: "911ddc838ebaf5ade1bb026dff2741ba"
+        hash: "51560b23e44e5548875b13ff6dc6ee8d"
     }
     Frame {
         msec: 5568
-        hash: "120bbf35b2a3b756bdeaea0df43e49b2"
+        hash: "082abbc9ecd0bf39619819aa526c021c"
     }
     Key {
         type: 7
@@ -1622,47 +1622,47 @@ VisualTest {
     }
     Frame {
         msec: 5584
-        hash: "ea93e33c079d6dc5fb18c69fb4fed441"
+        hash: "ab956d21f8ea55dad590b3cafc887585"
     }
     Frame {
         msec: 5600
-        hash: "b9ac8ab01cb59b1fee11967bdb6d2dd6"
+        hash: "9501050f547de1de0d280a839e35e120"
     }
     Frame {
         msec: 5616
-        hash: "3ff266bf29cbcaa30bc1e7af5dd9866b"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5632
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5648
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5664
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5680
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5696
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5712
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5728
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5744
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5760
@@ -1670,15 +1670,15 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5792
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5808
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Key {
         type: 6
@@ -1690,27 +1690,27 @@ VisualTest {
     }
     Frame {
         msec: 5824
-        hash: "de1f83d25751639dff42f1755a6534c3"
+        hash: "3de570332e8a1e01f409d892feb7930e"
     }
     Frame {
         msec: 5840
-        hash: "edefdea8b2461d03fb97cf5ed66e9b6d"
+        hash: "6aefcf9976f5910376a583b020c8dd4b"
     }
     Frame {
         msec: 5856
-        hash: "cef1886397e3932a511f37571b5011f4"
+        hash: "971ca1e2537d52f352c889817e353736"
     }
     Frame {
         msec: 5872
-        hash: "05589ad354314d9e04ef90c1addd99f5"
+        hash: "f1f0599e7f4ba2fb869e886a2e7ff216"
     }
     Frame {
         msec: 5888
-        hash: "ff88b52e3755b9b4785d2719ddd4f090"
+        hash: "8bf62b11cd4ec99ae41752e1a9a9c7ca"
     }
     Frame {
         msec: 5904
-        hash: "f59edc3016b177a2e8faa6612d718b17"
+        hash: "f2fcf6ad484b240373822c2450dd5305"
     }
     Key {
         type: 7
@@ -1722,131 +1722,131 @@ VisualTest {
     }
     Frame {
         msec: 5920
-        hash: "dc673a7cdd927f70b28ebcfe51cd3d89"
+        hash: "f999073e6303ff5658012dabbef4ee8e"
     }
     Frame {
         msec: 5936
-        hash: "3abec0da85fb663e63ab22188e092827"
+        hash: "c35ef3056155d8d30dd4b9e6299ac68f"
     }
     Frame {
         msec: 5952
-        hash: "50c2c8ac68cafad7c47b576cd8f4a037"
+        hash: "0326908135c0d693f2fc99c9e02d8f94"
     }
     Frame {
         msec: 5968
-        hash: "06c31b861e2b96e6595b2244d7b3f4d5"
+        hash: "b0def7204463648dac117ddcc2241c3e"
     }
     Frame {
         msec: 5984
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6000
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6016
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6032
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6048
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6064
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6080
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6096
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6112
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6128
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6144
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6160
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6176
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6192
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6208
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6224
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6240
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6256
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6272
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6288
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6304
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6320
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6336
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6352
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6368
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6384
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6400
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6416
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Key {
         type: 6
@@ -1858,31 +1858,31 @@ VisualTest {
     }
     Frame {
         msec: 6432
-        hash: "7f52a770775c19e10784b4c5f7874210"
+        hash: "5e88aeab16a0ccca400163889851bc45"
     }
     Frame {
         msec: 6448
-        hash: "827cfb74286a2a80aca8b6c5277d6cfd"
+        hash: "5531bf9affacf58945c6c54c5d14c9c9"
     }
     Frame {
         msec: 6464
-        hash: "8399231eda9b66821d43a3d8c4c7d645"
+        hash: "ebc8f36eb0fc7d40bf9f268ef03522a0"
     }
     Frame {
         msec: 6480
-        hash: "fc163583671f3c4023361460b436c895"
+        hash: "621a3c318fc259ed27ae050d70d46d39"
     }
     Frame {
         msec: 6496
-        hash: "893dea6496c95c32095ad1d673e500c2"
+        hash: "688bea0c0c864d9bc4204cf06b480d3a"
     }
     Frame {
         msec: 6512
-        hash: "808c7403b2cdcc882059da56a2f806fe"
+        hash: "8419262c19c40172b93c74d34cad12cb"
     }
     Frame {
         msec: 6528
-        hash: "7466b2e5b86ba8ad46be75818659786c"
+        hash: "57ce65a4ebe51c14ee69083f90ed5b80"
     }
     Key {
         type: 7
@@ -1894,47 +1894,47 @@ VisualTest {
     }
     Frame {
         msec: 6544
-        hash: "dd2561cd780e24401130305d47757a53"
+        hash: "43827ad5cb4173a8a5d434b167f68761"
     }
     Frame {
         msec: 6560
-        hash: "bee89299532d43fc3e6c3e69c343b381"
+        hash: "13e3e00ec3c11d6ca3e51a7aba0e1a97"
     }
     Frame {
         msec: 6576
-        hash: "94f8474aedee94098592c05d8fc7d868"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6592
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6608
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6624
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6640
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6656
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6672
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6688
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Frame {
         msec: 6704
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+        hash: "dcf8c3078973ad99fbbcc763e433de11"
     }
     Key {
         type: 6
@@ -1950,31 +1950,31 @@ VisualTest {
     }
     Frame {
         msec: 6736
-        hash: "ccd58be20d47422121d6ef799b927a7a"
+        hash: "b6c7ad2c8e305ea5478a2307aa71b16b"
     }
     Frame {
         msec: 6752
-        hash: "e090c7f39649786a1796870e25bd0f0d"
+        hash: "bb4674d0de11e4f625e6db940b4ec06c"
     }
     Frame {
         msec: 6768
-        hash: "acf3dcd9f4a869169dbc1ae7fe60e9d0"
+        hash: "26f602a711cea77e5c7be08a93981306"
     }
     Frame {
         msec: 6784
-        hash: "51795e9a720845e8305d23507785e1ca"
+        hash: "5346bc8b1711a6679867d81efb9da563"
     }
     Frame {
         msec: 6800
-        hash: "0d34a43e177e6b73e2ff9155747d0385"
+        hash: "3aa4d335a91be2bf2616d61fa7719ce5"
     }
     Frame {
         msec: 6816
-        hash: "1876c3cdffc1af01da1aaa0ac636d0a8"
+        hash: "2bad8dd039a35f11ba86b409bbcea6fe"
     }
     Frame {
         msec: 6832
-        hash: "3131296b6edf4190520e2cdb3f8b936e"
+        hash: "20e4b381a6bed27e9e64d2eeda7870da"
     }
     Key {
         type: 7
@@ -1986,51 +1986,51 @@ VisualTest {
     }
     Frame {
         msec: 6848
-        hash: "ee92f0a764e5081b130e205a5c362b07"
+        hash: "e96eb16671f26f04a72498bc3ab54f06"
     }
     Frame {
         msec: 6864
-        hash: "8737ea2c60aeb215228c00a7fddd1baa"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6880
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6896
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6912
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6928
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6944
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6960
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6976
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 6992
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7008
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7024
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Key {
         type: 6
@@ -2042,35 +2042,35 @@ VisualTest {
     }
     Frame {
         msec: 7040
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7056
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7072
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7088
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7104
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7120
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7136
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7152
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Key {
         type: 7
@@ -2082,111 +2082,111 @@ VisualTest {
     }
     Frame {
         msec: 7168
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7184
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7200
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7216
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7232
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7248
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7264
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7280
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7296
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7312
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7328
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7344
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7360
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7376
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7392
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7408
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7424
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7440
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7456
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7472
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7488
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7504
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7520
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7536
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7552
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7568
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7584
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Key {
         type: 6
@@ -2198,23 +2198,23 @@ VisualTest {
     }
     Frame {
         msec: 7600
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+        hash: "f0e0fe7c155bbee3957a80077703fadc"
     }
     Frame {
         msec: 7616
-        hash: "eb0d1be15f63af6eaf6634b02e5f240a"
+        hash: "6e26f05f7a2531620ed4a25073e0f0c5"
     }
     Frame {
         msec: 7632
-        hash: "2423c305bebb3449e87c78e8fb447c88"
+        hash: "9fe693b6b53763ffc1b94d157252b18c"
     }
     Frame {
         msec: 7648
-        hash: "f0ede6ea85647728db80878b3e525edc"
+        hash: "49aae47da204d4104757b4420df7413e"
     }
     Frame {
         msec: 7664
-        hash: "387d127b2b000dc344ee4768cf2d29b2"
+        hash: "ecd7456cb5ba2034c766e1ec298c2ebf"
     }
     Frame {
         msec: 7680
@@ -2222,7 +2222,7 @@ VisualTest {
     }
     Frame {
         msec: 7696
-        hash: "1d0d8100e994c16d7973ad9a97b0068f"
+        hash: "e8b6316baae781ca5390bc86528194c0"
     }
     Key {
         type: 7
@@ -2234,71 +2234,71 @@ VisualTest {
     }
     Frame {
         msec: 7712
-        hash: "95fb4a6d0331ffc4773e39ec8c3e6511"
+        hash: "e11fcb0e62d7f6bfb40b7336e89ff014"
     }
     Frame {
         msec: 7728
-        hash: "34738f16150228d971972833d4bd5c8f"
+        hash: "5a07fa8768ebfb938204e500f4a09253"
     }
     Frame {
         msec: 7744
-        hash: "9b71c8dacc530f32d7c6f409928caf5c"
+        hash: "1ee3a4780979f69cd7926df3d4c18731"
     }
     Frame {
         msec: 7760
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7776
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7792
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7808
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7824
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7840
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7856
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7872
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7888
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7904
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7920
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7936
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7952
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 7968
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Key {
         type: 6
@@ -2310,15 +2310,15 @@ VisualTest {
     }
     Frame {
         msec: 7984
-        hash: "831efd0970c5c29fbe10b3be7707f915"
+        hash: "ca4edfecdfc410aca6557b9a3095d92b"
     }
     Frame {
         msec: 8000
-        hash: "0587fc809c38c3bbe1fbac2960596974"
+        hash: "1306bb76c161e84e2e5307a0ebc34393"
     }
     Frame {
         msec: 8016
-        hash: "d20eba806cf4730a850db4c095fa36f9"
+        hash: "a97cbb851cf1fdeb428ee36042be52e1"
     }
     Key {
         type: 7
@@ -2330,59 +2330,59 @@ VisualTest {
     }
     Frame {
         msec: 8032
-        hash: "c1663e75ba05b341e1e970a451958ea0"
+        hash: "e79ccbe112066ded3276aa7feb2e7848"
     }
     Frame {
         msec: 8048
-        hash: "ea40cc33b689d6b42fc5a69fa30178e4"
+        hash: "9cc673f743e2018cf9a6d815fe76dc80"
     }
     Frame {
         msec: 8064
-        hash: "a07a1c61de1813158ff743cd326ee427"
+        hash: "8179262829f88ee4bbb9537b29ab56ee"
     }
     Frame {
         msec: 8080
-        hash: "6dfddaa340df8999ca77f6a6e4c6c3ce"
+        hash: "3810cc1b5902259c22bce0118497aaf3"
     }
     Frame {
         msec: 8096
-        hash: "76ca40bb169c1ddc291847d4be2d38d7"
+        hash: "d41c5a6fdfafb2263e7c35a927f7753c"
     }
     Frame {
         msec: 8112
-        hash: "e44778541b76208981a3944a64235cac"
+        hash: "e54d0179d62b7cdec96218c3a0ef110d"
     }
     Frame {
         msec: 8128
-        hash: "fdf45ea650d31957cc675c3bec8bf53e"
+        hash: "da89e8408417b99582ffd825c2226bf4"
     }
     Frame {
         msec: 8144
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Frame {
         msec: 8160
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Frame {
         msec: 8176
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Frame {
         msec: 8192
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Frame {
         msec: 8208
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Frame {
         msec: 8224
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Frame {
         msec: 8240
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Key {
         type: 6
@@ -2394,27 +2394,27 @@ VisualTest {
     }
     Frame {
         msec: 8256
-        hash: "b78cdb727535ab7e567af08abf25e64c"
+        hash: "5d7b9247aecd4adc939c6fb89d5eac2c"
     }
     Frame {
         msec: 8272
-        hash: "338481e6390f2a61e975084c16427584"
+        hash: "2fcac6c204d45d6fbab76c3d07e2c8ad"
     }
     Frame {
         msec: 8288
-        hash: "8923c45c23b1f4250b7d1e483b07a4da"
+        hash: "78602c9ac9dbd6c34ef539799513d874"
     }
     Frame {
         msec: 8304
-        hash: "b21de834906d0eecea985561e2e41e4f"
+        hash: "02f8d434d50af8fa6063a4f03dabe2b1"
     }
     Frame {
         msec: 8320
-        hash: "a8c9761cfb20631520ed890cd2648c4b"
+        hash: "ff5da7b1a1467418bc712c0ac33c878f"
     }
     Frame {
         msec: 8336
-        hash: "abf96a042ef12190bc48ff49732ef55a"
+        hash: "2aed8048e5040ebda3bdfdf4a57d08eb"
     }
     Key {
         type: 7
@@ -2426,55 +2426,55 @@ VisualTest {
     }
     Frame {
         msec: 8352
-        hash: "5b9506dfb038cd26dfc81ecd2406ada9"
+        hash: "c6b50c1a6a843aa9484c48e4bf073e4b"
     }
     Frame {
         msec: 8368
-        hash: "be75b8d39f81b2fdaff01469bfc67d4a"
+        hash: "a08ef172dfb72151108e81cacfaa964f"
     }
     Frame {
         msec: 8384
-        hash: "488aa2977f349df82b5f6ae5e3619d35"
+        hash: "a2a755231d0eee686aa38cd4d4b417f2"
     }
     Frame {
         msec: 8400
-        hash: "d69f17f0ce8537511353d20b59d20de0"
+        hash: "5c598e26c1b65796b8e68c7d27abbc0f"
     }
     Frame {
         msec: 8416
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8432
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8448
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8464
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8480
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8496
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8512
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8528
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8544
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Key {
         type: 6
@@ -2486,23 +2486,23 @@ VisualTest {
     }
     Frame {
         msec: 8560
-        hash: "7647efcc0152cc3d6544106f969ace26"
+        hash: "290662cda876fccc87971d2cebc69d52"
     }
     Frame {
         msec: 8576
-        hash: "8f74d33bf95cbf37fdb4521c69373a64"
+        hash: "1aface9c3746488496af48caf23af1a5"
     }
     Frame {
         msec: 8592
-        hash: "e33bb4cd12790c9d9992efdd3e23bee9"
+        hash: "c08f9756c9cc453a2544052b15beab5d"
     }
     Frame {
         msec: 8608
-        hash: "36f32e34b4093091c4707f26c52896ad"
+        hash: "b70544dc0d5cc18181f0bf40c068410b"
     }
     Frame {
         msec: 8624
-        hash: "5ab5e142f8dc883287c116cedbacfd55"
+        hash: "7e8fbce1337b0b04beda76ee54c98285"
     }
     Frame {
         msec: 8640
@@ -2518,19 +2518,19 @@ VisualTest {
     }
     Frame {
         msec: 8656
-        hash: "c74212e45a6c4b6a18caeb6a22350609"
+        hash: "4724d0bfd63f248914f18117ba0c6119"
     }
     Frame {
         msec: 8672
-        hash: "8919643a7d13677dd902941860093209"
+        hash: "16013089bfe18b35efbd8cd36d37bb0a"
     }
     Frame {
         msec: 8688
-        hash: "6f2ab4400fadf51b994351f0975e31fc"
+        hash: "57a857a48922cb252bb4ddc77b29825e"
     }
     Frame {
         msec: 8704
-        hash: "4798559ce6f9bd7455ed5385d0030763"
+        hash: "10a46ba67a0c7abe08ea8f80a75040e8"
     }
     Frame {
         msec: 8720
@@ -2586,23 +2586,23 @@ VisualTest {
     }
     Frame {
         msec: 8896
-        hash: "fac81cf6f45cb47abc1fa36d23e39d34"
+        hash: "df1797772003dc3dbdd0e245c447bf20"
     }
     Frame {
         msec: 8912
-        hash: "862f4deee01183fd38b094da59048b23"
+        hash: "70dd7fd50388196706f72a48ac96963c"
     }
     Frame {
         msec: 8928
-        hash: "2f3b147221da30d8857d25fc788b3eac"
+        hash: "439e43c26fc22a6c3a2b8568bfddbfa3"
     }
     Frame {
         msec: 8944
-        hash: "5b295b187c6cfc6aefa51e5efc2c27e3"
+        hash: "77e9ea697690a3e5c3965c0bf76055b0"
     }
     Frame {
         msec: 8960
-        hash: "fe3139ddc8fdbc1b0c25bd641f83e833"
+        hash: "30226190fa4466b3450ff1f810e85635"
     }
     Key {
         type: 7
@@ -2614,19 +2614,19 @@ VisualTest {
     }
     Frame {
         msec: 8976
-        hash: "8f2a9585dc6248a403aafd0f151d6ba0"
+        hash: "9a69afa4de272f00d8a26141fa974f6e"
     }
     Frame {
         msec: 8992
-        hash: "39eca8cc6bb8ea30cc452dc24f8e46dc"
+        hash: "1883a34a21ecc690022a6623c67c8ba1"
     }
     Frame {
         msec: 9008
-        hash: "8dbbc6026942cb6e572f1cb7e2675713"
+        hash: "e5be5b7e7060fffacaf93b6bf8d051a4"
     }
     Frame {
         msec: 9024
-        hash: "62dfa07b96dd18c6be89822654bf09f3"
+        hash: "2667c2596de97dc15353158eba03495f"
     }
     Frame {
         msec: 9040
@@ -2831,7 +2831,7 @@ VisualTest {
     Key {
         type: 6
         key: 16777249
-        modifiers: 67108864
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
index c79e19f..95556f1 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
@@ -38,7 +38,7 @@ Rectangle {
 
     Component {
         id: appHighlight
-        Rectangle { width: 100; height: 100; color: "white"; z: 3000 }
+        Rectangle { width: 100; height: 100; color: "white"; z: 0 }
     }
 
     GridView {
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
index 811e0e4..0dd9d0e 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
@@ -1,6 +1,7 @@
 import QtQuick 1.0
 
 Rectangle {
+    property string skip: "Last bit is wrong (rest is probably right, just bitrot). QTBUG-14838"
     width: 300; height: 400; color: "black"
 
     ListModel {
@@ -45,7 +46,7 @@ Rectangle {
         model: appModel; delegate: appDelegate; focus: true
         keyNavigationWraps: true
 
-        flickableData: [
+        flickableData: [//Presumably the different way of doing highlight tests more things
             Rectangle {
                 color: "transparent"; border.color: "white"; border.width: 8; z: 3000
                 height: 100; width: 100
-- 
cgit v0.12


From 95ef9a3d7eb851d47dabe3248672ea03e5faa0ce Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 29 Oct 2010 15:26:50 +1000
Subject: Regression: horizontal alignment bug with single line text

Task-number: QTBUG-14841
---
 src/declarative/graphicsitems/qdeclarativetext.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 865af2d..03c9765 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -292,12 +292,12 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
     qreal lineWidth = 0;
 
     //set manual width
-    if ((wrapMode != QDeclarativeText::NoWrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid())
+    if (q->widthValid())
         lineWidth = q->width();
 
     QTextOption textOption = layout.textOption();
     textOption.setWrapMode(QTextOption::WrapMode(wrapMode));
-    textOption.setAlignment((Qt::Alignment)hAlign);
+    textOption.setAlignment(Qt::Alignment(hAlign));
     layout.setTextOption(textOption);
 
     layout.beginLayout();
@@ -306,7 +306,7 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
         if (!line.isValid())
             break;
 
-        if ((wrapMode != QDeclarativeText::NoWrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid()) {
+        if (q->widthValid()) {
             line.setLineWidth(lineWidth);
             line.setPosition(QPointF(0, height));
             height += line.height();
-- 
cgit v0.12


From 099a041a69c5c2d27fab0ee70a98107e8a5ae0dc Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 15:32:16 +1000
Subject: Mark dynamic.qml as expect-fail the new way

Also remove the check for the old way in tst_qmlvisual

Task-number: QTBUG-14792
---
 .../qdeclarativepositioners/data/dynamic.0.png     |  Bin 0 -> 1429 bytes
 .../qdeclarativepositioners/data/dynamic.1.png     |  Bin 0 -> 1433 bytes
 .../qdeclarativepositioners/data/dynamic.2.png     |  Bin 0 -> 1431 bytes
 .../qdeclarativepositioners/data/dynamic.3.png     |  Bin 0 -> 1428 bytes
 .../qdeclarativepositioners/data/dynamic.4.png     |  Bin 0 -> 1432 bytes
 .../qdeclarativepositioners/data/dynamic.5.png     |  Bin 0 -> 1434 bytes
 .../qdeclarativepositioners/data/dynamic.qml       | 1603 ++++++++++++++++++++
 .../qmlvisual/qdeclarativepositioners/dynamic.qml  |    2 +-
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp |    2 +-
 9 files changed, 1605 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png
new file mode 100644
index 0000000..f474afe
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png
new file mode 100644
index 0000000..8b7ae74
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png
new file mode 100644
index 0000000..9088bb4
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png
new file mode 100644
index 0000000..18cd429
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png
new file mode 100644
index 0000000..739afc1
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png
new file mode 100644
index 0000000..93f0682
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml
new file mode 100644
index 0000000..4b36e16
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml
@@ -0,0 +1,1603 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 32
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 48
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 64
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 80
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 96
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 112
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 128
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 144
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 160
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 176
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 192
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 208
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 224
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 240
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 256
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 272
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 288
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 304
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 320
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 336
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 352
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 368
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 384
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 400
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 416
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 432
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 448
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 464
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 480
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 496
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 512
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 528
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 544
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 560
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 576
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 592
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 608
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 624
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 640
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 656
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 672
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 688
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 704
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 720
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 736
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 752
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 768
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 784
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 800
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 816
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 832
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 848
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 864
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 880
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 896
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 912
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 928
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 944
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 960
+        image: "dynamic.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 992
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 1008
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 1024
+        hash: "3e52e7d7d428cf1b850cb9c60dbb3c21"
+    }
+    Frame {
+        msec: 1040
+        hash: "64f75ab14c979d33d6e0c0d86b76cd35"
+    }
+    Frame {
+        msec: 1056
+        hash: "c198a48f4050f176465649d203d6e09a"
+    }
+    Frame {
+        msec: 1072
+        hash: "6dd8cee5a585a96e78f2cf7478c4da62"
+    }
+    Frame {
+        msec: 1088
+        hash: "09edfbce2ea4b8a547f769ce709dcb6b"
+    }
+    Frame {
+        msec: 1104
+        hash: "e93d01aa6e4f5d3fc82cf5a008e3ea17"
+    }
+    Frame {
+        msec: 1120
+        hash: "0e2e7b5eec0e62853972b0139b8c17c6"
+    }
+    Frame {
+        msec: 1136
+        hash: "26d4f54628ce20f5665bdc6ddc7f3b6a"
+    }
+    Frame {
+        msec: 1152
+        hash: "59836aa6eff85b0152be352b97076d89"
+    }
+    Frame {
+        msec: 1168
+        hash: "47cc9894096731a52ca342ab04df9aad"
+    }
+    Frame {
+        msec: 1184
+        hash: "ec95dd3b34a0f17f6fb9b5bedab73653"
+    }
+    Frame {
+        msec: 1200
+        hash: "e32c2b70882828b5082ca3ec889a0dde"
+    }
+    Frame {
+        msec: 1216
+        hash: "68d3f8e9c9d5388a6f8360368c8f4d2f"
+    }
+    Frame {
+        msec: 1232
+        hash: "17378b2bd8bde7f357fa5463f457c7b2"
+    }
+    Frame {
+        msec: 1248
+        hash: "03db786cd54ec34ce8db15953a5fc847"
+    }
+    Frame {
+        msec: 1264
+        hash: "9e22a82a622ed0287c44cc629059d5bd"
+    }
+    Frame {
+        msec: 1280
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1296
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1312
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1328
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1344
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1360
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1376
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1392
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1408
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1424
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1440
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1456
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1472
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1488
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1504
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1520
+        hash: "981fb1ee75e307b548a32df08a86f4cd"
+    }
+    Frame {
+        msec: 1536
+        hash: "f77568307e93d8cd9f0ae417cc19d6e3"
+    }
+    Frame {
+        msec: 1552
+        hash: "3bdd4468e26aceee0dad6b3b97b1c1ea"
+    }
+    Frame {
+        msec: 1568
+        hash: "252c9ebc2c32755b2289ee1b03877fe3"
+    }
+    Frame {
+        msec: 1584
+        hash: "64169b7eb7b7ae8573556c5f80230965"
+    }
+    Frame {
+        msec: 1600
+        hash: "4965dfa709a9ac7d8f7dfb4bf8303c65"
+    }
+    Frame {
+        msec: 1616
+        hash: "8c53cf92510154087341ac65a93aae5a"
+    }
+    Frame {
+        msec: 1632
+        hash: "4dd7502e3e238743d2f3cf038270491e"
+    }
+    Frame {
+        msec: 1648
+        hash: "cd9a58316837eb92f4ac92dbd86bdba3"
+    }
+    Frame {
+        msec: 1664
+        hash: "5de043e3ac8696b59293a2fa60ed7e65"
+    }
+    Frame {
+        msec: 1680
+        hash: "1bf42a6f6be5a3468d2f47cccfac761e"
+    }
+    Frame {
+        msec: 1696
+        hash: "ca05510c1ad25e5d3b002603f4379a09"
+    }
+    Frame {
+        msec: 1712
+        hash: "f6904a918a6475f1965d74372e52a4b1"
+    }
+    Frame {
+        msec: 1728
+        hash: "9e2312ddfc1648b615288107a06c9f9c"
+    }
+    Frame {
+        msec: 1744
+        hash: "95c470273b1cb08d4d602efcce339554"
+    }
+    Frame {
+        msec: 1760
+        hash: "dade96f707d4a21885480e13b258b7e9"
+    }
+    Frame {
+        msec: 1776
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1792
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1808
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1824
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1840
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1856
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1872
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1888
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1904
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1920
+        image: "dynamic.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1952
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1968
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1984
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 2000
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 2016
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2032
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2048
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2064
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2080
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2096
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2112
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2128
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2144
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2160
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2176
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2192
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2208
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2224
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2240
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2256
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2272
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2288
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2304
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2320
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2336
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2352
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2368
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2384
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2400
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2416
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2432
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2448
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2464
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2480
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2496
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2512
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2528
+        hash: "fabf4e535bc4cc17497939d2eeae4a2d"
+    }
+    Frame {
+        msec: 2544
+        hash: "a7981035f46869f5ae824d0c58b263b2"
+    }
+    Frame {
+        msec: 2560
+        hash: "86d8e369bdceb499b244f84ed9e80ba3"
+    }
+    Frame {
+        msec: 2576
+        hash: "e28a7dc7ea8690da75670b5a6e93a26b"
+    }
+    Frame {
+        msec: 2592
+        hash: "bf4e815360a67bd80732bd8812269b21"
+    }
+    Frame {
+        msec: 2608
+        hash: "a6f8c56cb93da8acc0c90e35596a60d4"
+    }
+    Frame {
+        msec: 2624
+        hash: "1e60656f0758605169e51b57bd03af36"
+    }
+    Frame {
+        msec: 2640
+        hash: "c069b26b9fae47e0104070d702ba9562"
+    }
+    Frame {
+        msec: 2656
+        hash: "457eb2ca1adff6cbb158afa140b2f20b"
+    }
+    Frame {
+        msec: 2672
+        hash: "4e5e750b0d94b6777aebff85d38225d9"
+    }
+    Frame {
+        msec: 2688
+        hash: "96d9840c2354a8786a8470309be97544"
+    }
+    Frame {
+        msec: 2704
+        hash: "ac7570cc7eeff1acd8c47f2d9328f8be"
+    }
+    Frame {
+        msec: 2720
+        hash: "887f937bb263c54f29659f27f2b7a3e3"
+    }
+    Frame {
+        msec: 2736
+        hash: "616371183c82b97f69a4c6e2367b8066"
+    }
+    Frame {
+        msec: 2752
+        hash: "36de8ffa9abe850fb681b37aea45ef8b"
+    }
+    Frame {
+        msec: 2768
+        hash: "0505101f0edaaf7ff17deeaaddc6bbf9"
+    }
+    Frame {
+        msec: 2784
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2800
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2816
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2832
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2848
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2864
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2880
+        image: "dynamic.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2912
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2928
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2944
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2960
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2976
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2992
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 3008
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 3024
+        hash: "99e4d853d64a381e8db27707b5ff2b25"
+    }
+    Frame {
+        msec: 3040
+        hash: "ab0e62aeffc0d57a5e1d63e6cf49b809"
+    }
+    Frame {
+        msec: 3056
+        hash: "4ab11bbf1fb6adb0eec8895f78a24a41"
+    }
+    Frame {
+        msec: 3072
+        hash: "634ff2ceb39a3f263a3362238a4ae252"
+    }
+    Frame {
+        msec: 3088
+        hash: "7f4856873dc23a02297b2497101de9b9"
+    }
+    Frame {
+        msec: 3104
+        hash: "bca3919e9d8e6dc5badd8090401dc934"
+    }
+    Frame {
+        msec: 3120
+        hash: "824bfe40c3657cfe1368563640e4cfce"
+    }
+    Frame {
+        msec: 3136
+        hash: "f831c1600f68bda139697c406ca70c5e"
+    }
+    Frame {
+        msec: 3152
+        hash: "f8102ca251a9ff46a8fe5a24cff0d2d6"
+    }
+    Frame {
+        msec: 3168
+        hash: "f33407ad684aa16efc6615d1cf6fa4b9"
+    }
+    Frame {
+        msec: 3184
+        hash: "a73d27f776a6ebfc90309b34421700e5"
+    }
+    Frame {
+        msec: 3200
+        hash: "ff2a4e2663fc50dfec35152f0e79f935"
+    }
+    Frame {
+        msec: 3216
+        hash: "4935f5f58f2672e9d240625151044bda"
+    }
+    Frame {
+        msec: 3232
+        hash: "f3ad5c203f621fe4d5d321c3c1880743"
+    }
+    Frame {
+        msec: 3248
+        hash: "d4fb7cd2e1f6a533dae65ddbb50da8ac"
+    }
+    Frame {
+        msec: 3264
+        hash: "91705e9234c4f02d0a730f6270f9e95f"
+    }
+    Frame {
+        msec: 3280
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3296
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3312
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3328
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3344
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3360
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3376
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3392
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3408
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3424
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3440
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3456
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3472
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3488
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3504
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3520
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3536
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3552
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3568
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3584
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3600
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3616
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3632
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3648
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3664
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3680
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3696
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3712
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3728
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3744
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3760
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3776
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3792
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3808
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3824
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3840
+        image: "dynamic.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3872
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3888
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3904
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3920
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3936
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3952
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3968
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3984
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4000
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4016
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4032
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4048
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4064
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4080
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4096
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4112
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4128
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4144
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4160
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4176
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4192
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4208
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4224
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4240
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4256
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4272
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4288
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4304
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4320
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4336
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4352
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4368
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4384
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4400
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4416
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4432
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4448
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4464
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4480
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4496
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4512
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4528
+        hash: "9681be99003f8a14cc5654d06d2c8255"
+    }
+    Frame {
+        msec: 4544
+        hash: "bcb592a2335aa2e35956881fd028f4e6"
+    }
+    Frame {
+        msec: 4560
+        hash: "f914b25fdcb02a02b71220d82b7b2a75"
+    }
+    Frame {
+        msec: 4576
+        hash: "63c82c08eb7f2bd50b54b94c952df3f2"
+    }
+    Frame {
+        msec: 4592
+        hash: "8a8dc82be81fa55605c6c2e749895120"
+    }
+    Frame {
+        msec: 4608
+        hash: "271f8d79b8052dfcd840ffa9ba9ffeec"
+    }
+    Frame {
+        msec: 4624
+        hash: "8f77bbd0585b57e69ac1919bd81ee3b1"
+    }
+    Frame {
+        msec: 4640
+        hash: "b974260a2f90e141ebc33ced98fbca88"
+    }
+    Frame {
+        msec: 4656
+        hash: "77ada180f8a45652a6fa636d7ece4d9d"
+    }
+    Frame {
+        msec: 4672
+        hash: "4c8dc2e33cd989cb3b0938c6c75b5f95"
+    }
+    Frame {
+        msec: 4688
+        hash: "a145954989508b925a444e14f0c27a20"
+    }
+    Frame {
+        msec: 4704
+        hash: "8d27ff203819174747ae4a5cee8d0ae8"
+    }
+    Frame {
+        msec: 4720
+        hash: "830f34b0dab780c6efe2294872ba8508"
+    }
+    Frame {
+        msec: 4736
+        hash: "5d70a4bbd815569cfe5735b596bad080"
+    }
+    Frame {
+        msec: 4752
+        hash: "964527bb82ea006e03b030c787a8597c"
+    }
+    Frame {
+        msec: 4768
+        hash: "1ad54954b818fa9e6032ac4b6114e7db"
+    }
+    Frame {
+        msec: 4784
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4800
+        image: "dynamic.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4832
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4848
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4864
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4880
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4896
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4912
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4928
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4944
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4960
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4976
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4992
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 5008
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 5024
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 5040
+        hash: "baeb8adffc13e230e797e0437f2ad5fa"
+    }
+    Frame {
+        msec: 5056
+        hash: "d2e440fcad0ee2b7b35d7e5c4e581f73"
+    }
+    Frame {
+        msec: 5072
+        hash: "fb8acb2f69234d3ee089281d0297ad7c"
+    }
+    Frame {
+        msec: 5088
+        hash: "7fda29a83dc535ed8d6b35e999400311"
+    }
+    Frame {
+        msec: 5104
+        hash: "6482e3eb10cfdbdeb57dd38ba3e3d67e"
+    }
+    Frame {
+        msec: 5120
+        hash: "4d222549bc2565c1598a532460aae4e6"
+    }
+    Frame {
+        msec: 5136
+        hash: "776d1b0f9945c0e1ceda0cf117264919"
+    }
+    Frame {
+        msec: 5152
+        hash: "f2c362b34a0982ee1a11dea6b063945e"
+    }
+    Frame {
+        msec: 5168
+        hash: "115f02b8893972b5b1d63525ce70762e"
+    }
+    Frame {
+        msec: 5184
+        hash: "7f2d53581fe2c6c45a628fa4cd9b5742"
+    }
+    Frame {
+        msec: 5200
+        hash: "b5ed1120c4edf842b15d5144adbd93b0"
+    }
+    Frame {
+        msec: 5216
+        hash: "3511938df57c4cdce316692de204b057"
+    }
+    Frame {
+        msec: 5232
+        hash: "99583918d068ab5d132fe7a699c2a7a6"
+    }
+    Frame {
+        msec: 5248
+        hash: "c0ce9df18479dbb57fb1dbc777f4f0e5"
+    }
+    Frame {
+        msec: 5264
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5280
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5296
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5312
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5328
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5344
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5360
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5376
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5392
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5408
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5424
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5440
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5456
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5472
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5488
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5504
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5520
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5536
+        hash: "98cc64411264d8a635a6afe6b11cee6e"
+    }
+    Frame {
+        msec: 5552
+        hash: "b86434b7af8ad1db946c43a2791d69ab"
+    }
+    Frame {
+        msec: 5568
+        hash: "f45616f9e33658d1dddb537e842c8768"
+    }
+    Frame {
+        msec: 5584
+        hash: "e49d8955e27cdc19a37c331e56c81af1"
+    }
+    Frame {
+        msec: 5600
+        hash: "b2dbe764906b50195f65dc11a5842515"
+    }
+    Frame {
+        msec: 5616
+        hash: "71ce7c63d65c29cdffd83f5ae07f0b93"
+    }
+    Frame {
+        msec: 5632
+        hash: "901d01e1fc777ec185cd023ad0ace4c1"
+    }
+    Frame {
+        msec: 5648
+        hash: "a3f31de30fc2e92bae1f735504216216"
+    }
+    Frame {
+        msec: 5664
+        hash: "0fc52dd8102506e3e7671fa548551b23"
+    }
+    Frame {
+        msec: 5680
+        hash: "fb92809e728416035dbb91116ad8fe0e"
+    }
+    Frame {
+        msec: 5696
+        hash: "9003dc8ca4f781909035cb03dc45864f"
+    }
+    Frame {
+        msec: 5712
+        hash: "2bff1de793ad8521fd54413849c3cf29"
+    }
+    Frame {
+        msec: 5728
+        hash: "8362e4db7c4446282d844a4fc6632d19"
+    }
+    Frame {
+        msec: 5744
+        hash: "b874fa274c6ec77c106ff4a0288f9169"
+    }
+    Frame {
+        msec: 5760
+        image: "dynamic.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5792
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5808
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5824
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5840
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5856
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5872
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5888
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5904
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5920
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5936
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5952
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5968
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5984
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 6000
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 6016
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 6032
+        hash: "7621e64568058b82bcb6f6b46cee3ebc"
+    }
+    Frame {
+        msec: 6048
+        hash: "f77f6de6fc88813f49427b4888a59dbf"
+    }
+    Frame {
+        msec: 6064
+        hash: "d3a48f596219372ac25941e4c5ec5b2b"
+    }
+    Frame {
+        msec: 6080
+        hash: "d572d932b613f9ca1e0acf144f127dd1"
+    }
+    Frame {
+        msec: 6096
+        hash: "edf317eaf51d933bcd0f57f214921a81"
+    }
+    Frame {
+        msec: 6112
+        hash: "e0cee7959a5a8a08ad03d75e7b5c6ca1"
+    }
+    Frame {
+        msec: 6128
+        hash: "96877a15f44d4a2c8d9974cb28b9e1b6"
+    }
+    Frame {
+        msec: 6144
+        hash: "c0ffb0ef6dd9d007d201feebd2f68e44"
+    }
+    Frame {
+        msec: 6160
+        hash: "209fb930223243fa19c5dde9e85ec518"
+    }
+    Frame {
+        msec: 6176
+        hash: "ae98ac4dba0e78eb8fb7f7dbe29b2832"
+    }
+    Frame {
+        msec: 6192
+        hash: "c94a7d68ce007d83df77a595a5815a96"
+    }
+    Frame {
+        msec: 6208
+        hash: "4c28e409bf5a6c1289bcab8cd59a9e42"
+    }
+    Frame {
+        msec: 6224
+        hash: "ea1009f1a3446dd5ce937e6949794794"
+    }
+    Frame {
+        msec: 6240
+        hash: "940c16766c2f87feef48e1187672ca9b"
+    }
+    Frame {
+        msec: 6256
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6272
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6288
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6304
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6320
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6336
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6352
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6368
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6384
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
index 8a522a5..b5685d1 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
@@ -1,7 +1,7 @@
 import QtQuick 1.0
 
-//Expected to fail until QTBUG-14839 is resolved
 Item {
+    property string skip: "Expected to fail until QTBUG-14839 is resolved"
     width: 120; height: 60;
     property int step: 0
     function tick()
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 7cd96e2..b52b430 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -143,7 +143,7 @@ void tst_qmlvisual::visual_data()
 
     foreach (const QString &file, files) {
         QString testdata = toTestScript(file);
-        if (testdata.isEmpty() || !QFile::exists(testdata+".qml"))
+        if (testdata.isEmpty())
             continue;
 
         QTest::newRow(file.toLatin1().constData()) << file << testdata;
-- 
cgit v0.12


From 05701150d5d8c619288486593363f0b52a8eda49 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 15:33:26 +1000
Subject: Revert "Disable WebView visualtests"

This reverts commit 8ba02a8f5a537b9f7e1ff671abe6eed67029db58.
ExpectFail state has been altered. Redoing that commit.
This commit also adds the new line to indicate tests we don't care about
---
 .../qmlvisual/webview/autosize/autosize.qml        |    1 +
 .../qmlvisual/webview/autosize/data/autosize.qml   |  115 +
 .../webview/javascript/data/evaluateJavaScript.qml | 3759 ++++++++++++++++++++
 .../webview/javascript/data/windowObjects.qml      | 2643 ++++++++++++++
 .../webview/javascript/evaluateJavaScript.qml      |    1 +
 .../qmlvisual/webview/javascript/windowObjects.qml |    1 +
 .../qmlvisual/webview/settings/data/fontFamily.qml |  395 ++
 .../qmlvisual/webview/settings/data/fontSize.qml   |  339 ++
 .../webview/settings/data/noAutoLoadImages.qml     |  595 ++++
 .../webview/settings/data/setFontFamily.qml        |  351 ++
 .../qmlvisual/webview/settings/fontFamily.qml      |    1 +
 .../qmlvisual/webview/settings/fontSize.qml        |    1 +
 .../webview/settings/noAutoLoadImages.qml          |    1 +
 .../qmlvisual/webview/settings/setFontFamily.qml   |    1 +
 .../qmlvisual/webview/zooming/data/pageWidth.qml   |  227 ++
 .../webview/zooming/data/renderControl.qml         |  415 +++
 .../qmlvisual/webview/zooming/data/resolution.qml  | 1319 +++++++
 .../webview/zooming/data/zoomTextOnly.qml          |  655 ++++
 .../qmlvisual/webview/zooming/data/zooming.qml     | 2115 +++++++++++
 .../qmlvisual/webview/zooming/pageWidth.qml        |    1 +
 .../qmlvisual/webview/zooming/renderControl.qml    |    1 +
 .../qmlvisual/webview/zooming/resolution.qml       |    1 +
 .../qmlvisual/webview/zooming/zoomTextOnly.qml     |    1 +
 .../qmlvisual/webview/zooming/zooming.qml          |    1 +
 24 files changed, 12940 insertions(+)
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml

diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
index b6280a6..d3b4e6b 100644
--- a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
@@ -4,6 +4,7 @@ import org.webkit 1.0
 // The WebView size is determined by the width, height,
 // preferredWidth, and preferredHeight properties.
 Rectangle {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     id: rect
     color: "white"
     width: 200
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
new file mode 100644
index 0000000..6122138
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
@@ -0,0 +1,115 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b2d863e57dee2a297d038e18acc70f92"
+    }
+    Frame {
+        msec: 32
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 48
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 64
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 80
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 96
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 112
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 128
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 144
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 160
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 176
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 192
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 208
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 224
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 240
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 256
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 272
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 288
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 304
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 320
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 336
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 352
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 368
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 384
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 400
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 416
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 432
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
new file mode 100644
index 0000000..bfe40da
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
@@ -0,0 +1,3759 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 32
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 48
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 64
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 80
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 96
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 112
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 128
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 144
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 160
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 176
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 192
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 208
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 224
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 240
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 256
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 272
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 288
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 304
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 320
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 336
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 352
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 368
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 384
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 400
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 416
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 195; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 187; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 432
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 153; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 448
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 145; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 139; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 464
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 135; y: 111
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 129; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 480
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 125; y: 131
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 121; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 117; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 496
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 111; y: 157
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 512
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 165
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 101; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 528
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 185
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 544
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 195
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 560
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 85; y: 199
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 201
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 576
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 203
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 81; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 592
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 80; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 608
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 205
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 624
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 77; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 76; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 640
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 656
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 218
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 220
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 672
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 69; y: 222
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 68; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 688
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 225
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 704
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 720
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 736
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 752
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 768
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 784
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 225
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 800
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 816
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 222
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 832
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 221
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 217
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 848
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 60; y: 215
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 864
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 880
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 896
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 912
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 928
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 944
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 960
+        image: "evaluateJavaScript.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 992
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1008
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 55; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1024
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1040
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1056
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1072
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1088
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1104
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1120
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1136
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1152
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1168
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1184
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1200
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1216
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1232
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1248
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1264
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1280
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1296
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 212
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1312
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 209
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1328
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 69; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1344
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 73; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1360
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1376
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1392
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1408
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1424
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1440
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1456
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1472
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1488
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1504
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1520
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1536
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1552
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1568
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1584
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1600
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1616
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1632
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1648
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1664
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1680
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1696
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1712
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1728
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1744
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1760
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1776
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1808
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1824
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1840
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1856
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1872
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1888
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1904
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1920
+        image: "evaluateJavaScript.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1952
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1968
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1984
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2000
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2016
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2032
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2048
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2080
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2096
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2112
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2128
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2144
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2160
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2176
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2192
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2208
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2224
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2240
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2256
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2288
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2304
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2320
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2336
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2352
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2368
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2384
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2400
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2416
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2432
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2448
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2464
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2480
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2496
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2512
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2528
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2544
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2560
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2576
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2592
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2608
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2624
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2640
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2656
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2672
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2688
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2704
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2720
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2736
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2752
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2768
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2784
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2800
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2816
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2832
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2848
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2864
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2880
+        image: "evaluateJavaScript.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2912
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2928
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2944
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2960
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2976
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2992
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3008
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3024
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3040
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3056
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3072
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3088
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3104
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3120
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3136
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3152
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3168
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3184
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3200
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3216
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3232
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3248
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3264
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3280
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3296
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3312
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3328
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 72; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3344
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 68; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3360
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3376
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3392
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3408
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 54; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 53; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3424
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3440
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3456
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3472
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3488
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3504
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3520
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 52; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 52; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3536
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3552
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3568
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3584
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3600
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3616
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3632
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3648
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 52; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3664
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3680
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3696
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3712
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3728
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3744
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3760
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3776
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3792
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3808
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3824
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3840
+        image: "evaluateJavaScript.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3872
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3888
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3904
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3920
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3936
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3952
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3968
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3984
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4000
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4016
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4032
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4048
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4064
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4080
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4096
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4112
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4128
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4144
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4160
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4176
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4192
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4208
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4224
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4240
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4256
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4272
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4288
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4304
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4320
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4336
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4352
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4368
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4384
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4400
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4416
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4432
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4448
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4464
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4480
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4496
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4512
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4528
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4544
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4560
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4576
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4592
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4608
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4624
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4640
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4656
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4672
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4688
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4704
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4720
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4736
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4752
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4768
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4784
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4800
+        image: "evaluateJavaScript.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4832
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4848
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4864
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4880
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4896
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4912
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4928
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4944
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4960
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4976
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4992
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5008
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5024
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5040
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5056
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5072
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5088
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5104
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5120
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5136
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5152
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5168
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5184
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5200
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5216
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5232
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5248
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5264
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5280
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5296
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5312
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5328
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5344
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5360
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5376
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5392
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5408
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5424
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5440
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5456
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5472
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5488
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5504
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5520
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5536
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5552
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5568
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5584
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5600
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5616
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5632
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5648
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5664
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5680
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5696
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5712
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5728
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5744
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5760
+        image: "evaluateJavaScript.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5792
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5808
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5824
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 54; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 56; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 202
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 196
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 102; y: 188
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 112; y: 176
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5920
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 168
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5936
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 124; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 128; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5952
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 130; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 134; y: 112
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5968
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 142; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 150; y: 68
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 154; y: 62
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 158; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 162; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 166; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 168; y: 38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 172; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 174; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 176; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 177; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 16
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 179; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 180; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 181; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 181; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 182; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 183; y: 1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6208
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6224
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6240
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6256
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6272
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6288
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6304
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6320
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6336
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6352
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6368
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6384
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6400
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6416
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6432
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6448
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6464
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6480
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6496
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6512
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6528
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6544
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6560
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6576
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6592
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6608
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6624
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6640
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6656
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6672
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6688
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6704
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6720
+        image: "evaluateJavaScript.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6752
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6768
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6784
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6800
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6816
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6832
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6848
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6864
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 176; y: 1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 174; y: 15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 172; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 166; y: 47
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 162; y: 63
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 156; y: 81
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 150; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6912
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 107
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6928
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 132; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 126; y: 133
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6944
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 122; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6960
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6976
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6992
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7008
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7024
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7040
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7056
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7072
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 119; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7088
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7104
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7120
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 117; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7136
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 115; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7152
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 113; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 109; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7168
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 165
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 103; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7184
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 179
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 181
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7200
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 187
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7216
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7232
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7248
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7264
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7280
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 188
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7296
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 187
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 186
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7312
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 185
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 184
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7328
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 183
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7344
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 180
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7360
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 178
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7376
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 176
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 174
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7392
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7408
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 172
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7424
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 170
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7440
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 169
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7456
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 101; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7472
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7488
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7504
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 101; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7520
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7536
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7552
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7568
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7584
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7600
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7616
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7632
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 101; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7648
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7664
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7680
+        image: "evaluateJavaScript.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7712
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7728
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7744
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7760
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7776
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7792
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7808
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7824
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 103; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7840
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7856
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7872
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 165
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7888
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 109; y: 163
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7904
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 111; y: 163
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 112; y: 162
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7920
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7936
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 118; y: 157
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 122; y: 153
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7952
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 128; y: 147
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 134; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7968
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 140; y: 133
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 146; y: 125
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 150; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7984
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 156; y: 109
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 160; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8000
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 164; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 166; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8016
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 170; y: 67
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 172; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8032
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 176; y: 45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8048
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 27
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 180; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8064
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 180; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 182; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8080
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8096
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8112
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8128
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8144
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8160
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8176
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8192
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8208
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8224
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8240
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8256
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8272
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8288
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8304
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8320
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8336
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8352
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8368
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8384
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8400
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8416
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8432
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8448
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8464
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8480
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8496
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8512
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8528
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8544
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8560
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8576
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8592
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8608
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8624
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8640
+        image: "evaluateJavaScript.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8672
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
new file mode 100644
index 0000000..07aa13d
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
@@ -0,0 +1,2643 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 32
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 48
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 64
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 80
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 96
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 112
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 128
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 144
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 160
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 176
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 192
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 208
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 224
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 240
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 256
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 272
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 288
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 304
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 320
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 336
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 352
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 368
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 384
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 400
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 416
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 432
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 448
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 464
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 480
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 496
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 512
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 528
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 544
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 560
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 576
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 592
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 608
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 624
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 640
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 656
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 672
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 688
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 704
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 720
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 736
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 752
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 768
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 784
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 800
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 816
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 832
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 848
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 864
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 880
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 896
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 912
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 928
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 944
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 960
+        image: "windowObjects.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 992
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1008
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1024
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1040
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 155; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 145; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1056
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 137; y: 37
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 127; y: 53
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1072
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 119; y: 67
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 111; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1088
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 103; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1104
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 93
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 87; y: 109
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1120
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 81; y: 125
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1136
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 81; y: 133
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1152
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 142
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1168
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 146
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 147
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1184
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1200
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1216
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1232
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1248
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 143
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1264
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1280
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 142
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1296
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 85; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1312
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1328
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1344
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 86; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 87; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1360
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 88; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1376
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1392
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 142
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1408
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1424
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 146
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1440
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 153
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1456
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1472
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1488
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1504
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1520
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1536
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1552
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1568
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1584
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1600
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1616
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1632
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1648
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1664
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1680
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1696
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1712
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1728
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1744
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1760
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1776
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1792
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1808
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1824
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1840
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1856
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1872
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1888
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1904
+        hash: "b1a19797afefa71e30f4594064aa4951"
+    }
+    Frame {
+        msec: 1920
+        image: "windowObjects.1.png"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 89; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1936
+        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
+    }
+    Frame {
+        msec: 1952
+        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
+    }
+    Frame {
+        msec: 1968
+        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
+    }
+    Frame {
+        msec: 1984
+        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
+    }
+    Frame {
+        msec: 2000
+        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
+    }
+    Frame {
+        msec: 2016
+        hash: "fca76207a4fa6f2c4bb01d28aa018f0c"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 89; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2032
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2048
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2064
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2080
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2096
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2112
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2128
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2144
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2160
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2176
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2192
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2208
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2224
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2240
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2256
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2272
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2288
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 157
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 88; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 87; y: 160
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2304
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 87; y: 161
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2320
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 169
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 80; y: 175
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2336
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 183
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2352
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 72; y: 195
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 68; y: 201
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2368
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 64; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2384
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 215
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 221
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2400
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 58; y: 222
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2416
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2432
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2448
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2464
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2480
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2496
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2512
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2528
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2544
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2560
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2576
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2592
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2608
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2624
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2640
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2656
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2672
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2688
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2704
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2720
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2736
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 49; y: 225
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 50; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2752
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 50; y: 223
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2768
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 51; y: 222
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2784
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 51; y: 221
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 52; y: 220
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2800
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 52; y: 218
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2816
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 53; y: 217
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2832
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2848
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2864
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 54; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2880
+        image: "windowObjects.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 215
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2912
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2928
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 56; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2944
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2960
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 2976
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 57; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2992
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3008
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3024
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3040
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3056
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3072
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3088
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3104
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 57; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3120
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3136
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3152
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3168
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3184
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3200
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3216
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Frame {
+        msec: 3232
+        hash: "6927f81ca01ef75d204994aa82c60c4d"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3248
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3264
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3280
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3296
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3312
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3328
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3344
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3360
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 212
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3376
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3392
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Frame {
+        msec: 3408
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3424
+        hash: "2165224e8f66a797ae5c991462fb56d8"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3440
+        hash: "c6ac7e0be8b7b2a80966344389def97a"
+    }
+    Frame {
+        msec: 3456
+        hash: "c6ac7e0be8b7b2a80966344389def97a"
+    }
+    Frame {
+        msec: 3472
+        hash: "c6ac7e0be8b7b2a80966344389def97a"
+    }
+    Frame {
+        msec: 3488
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Frame {
+        msec: 3504
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3520
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Frame {
+        msec: 3536
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Frame {
+        msec: 3552
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Frame {
+        msec: 3568
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Frame {
+        msec: 3584
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Frame {
+        msec: 3600
+        hash: "40f333072bb9f1d334d5ae432d9641b9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 58; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3616
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 60; y: 209
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3632
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 205
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3648
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 203
+        modifiers: 0
+        sendToViewport: true
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3664
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 202
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 64; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3680
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3696
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 198
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 197
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 195
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3712
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 68; y: 194
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 69; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3728
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 188
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3744
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 186
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 185
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3760
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 183
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 181
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3776
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 72; y: 179
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 73; y: 178
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3792
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 73; y: 176
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 73; y: 175
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3808
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 174
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 173
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3824
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 172
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3840
+        image: "windowObjects.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3872
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3888
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3904
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3920
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 76; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3936
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3952
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3968
+        hash: "96f727ef0dacfda9ea77fb5651493030"
+    }
+    Frame {
+        msec: 3984
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Frame {
+        msec: 4000
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Frame {
+        msec: 4016
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Frame {
+        msec: 4032
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 76; y: 170
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4048
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 77; y: 169
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 168
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4064
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 168
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4080
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 81; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 81; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4096
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 165
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4112
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4128
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Frame {
+        msec: 4144
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Frame {
+        msec: 4160
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Frame {
+        msec: 4176
+        hash: "ed7b3d93d690df73be5cbee8c41a1931"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 83; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4192
+        hash: "5b3505be865f704640e81cea092d35ba"
+    }
+    Frame {
+        msec: 4208
+        hash: "5b3505be865f704640e81cea092d35ba"
+    }
+    Frame {
+        msec: 4224
+        hash: "5b3505be865f704640e81cea092d35ba"
+    }
+    Frame {
+        msec: 4240
+        hash: "5b3505be865f704640e81cea092d35ba"
+    }
+    Frame {
+        msec: 4256
+        hash: "5b3505be865f704640e81cea092d35ba"
+    }
+    Frame {
+        msec: 4272
+        hash: "5b3505be865f704640e81cea092d35ba"
+    }
+    Frame {
+        msec: 4288
+        hash: "5b3505be865f704640e81cea092d35ba"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 83; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4304
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4320
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4336
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4352
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4368
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4384
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4400
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4416
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4432
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4448
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4464
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 85; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 85; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4480
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 86; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 86; y: 152
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4496
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 87; y: 150
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4512
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 93; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 134
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4528
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 101; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 122
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4544
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 109; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 113; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4560
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 114; y: 106
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 114; y: 105
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4576
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 115; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 115; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4592
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 115; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4608
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 122; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4624
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 126; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 130; y: 66
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4640
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 132; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 134; y: 46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4656
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 136; y: 38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4672
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 140; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 141; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4688
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 143; y: 14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4704
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4720
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4736
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 143; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 143; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4752
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 143; y: 1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4768
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4784
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4800
+        image: "windowObjects.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4832
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4848
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4864
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4880
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4896
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4912
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4928
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4944
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4960
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4976
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 4992
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5008
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5024
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5040
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5056
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5072
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5088
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5104
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5120
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5136
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5152
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5168
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5184
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5200
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5216
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5232
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5248
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5264
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5280
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5296
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5312
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5328
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5344
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5360
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5376
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5392
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5408
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5424
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5440
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5456
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5472
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5488
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5504
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5520
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5536
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5552
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5568
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+    Frame {
+        msec: 5584
+        hash: "cb5a42e7ab70e05a8bbecabb587f9e5e"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
index bee2618..916aa99 100644
--- a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 Column {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     WebView {
         id: webview
         width: 200
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
index 9e22e20..250c80d 100644
--- a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 Column {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     WebView {
         width: 200
         height: 200
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
new file mode 100644
index 0000000..34d1116
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
@@ -0,0 +1,395 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 32
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 48
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 64
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 80
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 96
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 112
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 128
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 144
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 160
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 176
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 192
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 208
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 224
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 240
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 256
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 272
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 288
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 304
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 320
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 336
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 352
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 368
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 384
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 400
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 416
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 432
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 448
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 464
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 480
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 496
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 512
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 528
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 544
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 560
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 576
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 592
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 608
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 624
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 640
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 656
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 672
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 688
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 196; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 194; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 190; y: 13
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 704
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 720
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 736
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 752
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 768
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 784
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 800
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 816
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 832
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 848
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 864
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 880
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 896
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 912
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 928
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 944
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 960
+        image: "fontFamily.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 992
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1008
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1024
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1040
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1056
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1072
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1088
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1104
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1120
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1136
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1152
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1168
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1184
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1200
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1216
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1232
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1248
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1264
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1280
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1296
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1312
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1328
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1344
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1360
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1376
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1392
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1408
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1424
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1440
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+    Frame {
+        msec: 1456
+        hash: "5d66fdee6a0a96bb24e89244f02eacc9"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
new file mode 100644
index 0000000..efe3875
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
@@ -0,0 +1,339 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 32
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 48
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 64
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 80
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 96
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 112
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 128
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 144
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 160
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 176
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 192
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 208
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 224
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 240
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 256
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 272
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 288
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 304
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 320
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 336
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 352
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 368
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 384
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 400
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 416
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 432
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 448
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 464
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 480
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 496
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 512
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 528
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 544
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 560
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 576
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 592
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 608
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 624
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 640
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 656
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 672
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 688
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 704
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 720
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 736
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 752
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 768
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 784
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 800
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 816
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 832
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 848
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 864
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 880
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 896
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 912
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 928
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 944
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 960
+        image: "fontSize.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 992
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1008
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1024
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1040
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1056
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1072
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1088
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1104
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1120
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1136
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1152
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1168
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1184
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1200
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1216
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1232
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1248
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1264
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1280
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1296
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1312
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+    Frame {
+        msec: 1328
+        hash: "962e77f522956d38f3b1b890df749f0a"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
new file mode 100644
index 0000000..624a16b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
@@ -0,0 +1,595 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 32
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 48
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 64
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 80
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 96
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 112
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 128
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 144
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 160
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 176
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 192
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 208
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 224
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 240
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 256
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 272
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 288
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 304
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 320
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 336
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 352
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 368
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 384
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 400
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 416
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 432
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 448
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 464
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 480
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 496
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 512
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 528
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 544
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 560
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 576
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 592
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 608
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 624
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 640
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 656
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 672
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 688
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 704
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 720
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 736
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 752
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 768
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 784
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 800
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 816
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 832
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 848
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 864
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 880
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 896
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 912
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 928
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 944
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 960
+        image: "noAutoLoadImages.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 992
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1008
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1024
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1040
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1056
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1072
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1088
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1104
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1120
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1136
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1152
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1168
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1184
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1200
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1216
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1232
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1248
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1264
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1280
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1296
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1312
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1328
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1344
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1360
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1376
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1392
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1408
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1424
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1440
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1456
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1472
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1488
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1504
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1520
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1536
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1552
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1568
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1584
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1600
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1616
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1632
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1648
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1664
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1680
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1696
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1712
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1728
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1744
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1760
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1776
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1792
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1808
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1824
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1840
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1856
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1872
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1888
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1904
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1920
+        image: "noAutoLoadImages.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1952
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1968
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 1984
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2000
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2016
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2032
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2048
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2064
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2080
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2096
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2112
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2128
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2144
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2160
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2176
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2192
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2208
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2224
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2240
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2256
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2272
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2288
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2304
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2320
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2336
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+    Frame {
+        msec: 2352
+        hash: "5146cfbeefc51268eca7717d84775750"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
new file mode 100644
index 0000000..414d64f
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
@@ -0,0 +1,351 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 32
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 48
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 64
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 80
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 96
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 112
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 128
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 144
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 160
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 176
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 192
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 208
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 224
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 240
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 256
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 272
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 288
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 304
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 320
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 336
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 352
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 368
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 384
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 400
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 416
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 432
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 448
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 464
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 480
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 496
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 512
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 528
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 544
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 560
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 576
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 592
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 608
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 624
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 640
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 656
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 672
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 688
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 704
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 720
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 736
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 752
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 768
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 784
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 800
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 816
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 832
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 848
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 864
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 880
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 896
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 912
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 928
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 944
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 960
+        image: "setFontFamily.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 992
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1008
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1024
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1040
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1056
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1072
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1088
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1104
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1120
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1136
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1152
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1168
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1184
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1200
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1216
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1232
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1248
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1264
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1280
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1296
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1312
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1328
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1344
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1360
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+    Frame {
+        msec: 1376
+        hash: "7ef8bb83c146898bd75de8951a932b58"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
index 68acced..df08666 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     id: web
     width: 200
     height: 200
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
index 4a0db01..2403616 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 Grid {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     columns: 3
     Rectangle {
         Text { color: "green"; text: "Normal" }
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
index 3d50664..ec503bf 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 Grid {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     columns: 2
     Rectangle {
         Text { id: label; x:10; y:170; color: "green"; text: "No image" }
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
index ae5ddd2..f353fb4 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     url: "test.html"
     width: 300
     height: 300
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
new file mode 100644
index 0000000..2e60b7f
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
@@ -0,0 +1,227 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 32
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 48
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 64
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 80
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 96
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 112
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 128
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 144
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 160
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 176
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 192
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 208
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 224
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 240
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 256
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 272
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 288
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 304
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 320
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 336
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 352
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 368
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 384
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 400
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 416
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 432
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 448
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 464
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 480
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 496
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 512
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 528
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 544
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 560
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 576
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 592
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 608
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 624
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 640
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 656
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 672
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 688
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 704
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 720
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 736
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 752
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 768
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 784
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 800
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 816
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 832
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 848
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 864
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 880
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
new file mode 100644
index 0000000..464e009
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
@@ -0,0 +1,415 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
+    }
+    Frame {
+        msec: 32
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 48
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 64
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 80
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 96
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 112
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 128
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 144
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 160
+        hash: "f5dc87abf36332c68fd4450a6236dcb4"
+    }
+    Frame {
+        msec: 176
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 192
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 208
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 224
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 240
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 256
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 272
+        hash: "3aef5e1ff6da15e0e9f2e620dbabbab2"
+    }
+    Frame {
+        msec: 288
+        hash: "2931299f667752efe9fca727534385e1"
+    }
+    Frame {
+        msec: 304
+        hash: "2ed90e61c41b994ccea924191b66fc71"
+    }
+    Frame {
+        msec: 320
+        hash: "1424c634067c896973c2c10793957933"
+    }
+    Frame {
+        msec: 336
+        hash: "c4d30d511053a7caeefdae753236cf5b"
+    }
+    Frame {
+        msec: 352
+        hash: "32300e07e34e8f316770c790a5ef9f6d"
+    }
+    Frame {
+        msec: 368
+        hash: "95312dc2a4d88a48605fea170712354d"
+    }
+    Frame {
+        msec: 384
+        hash: "3d146357d1532640cefb64fbae75bc0d"
+    }
+    Frame {
+        msec: 400
+        hash: "5b78740511a456a3647d8392b2008f7f"
+    }
+    Frame {
+        msec: 416
+        hash: "dddb065cefa27a862d108429c9984191"
+    }
+    Frame {
+        msec: 432
+        hash: "0857067a0ee381e0f462ef8aceb0b696"
+    }
+    Frame {
+        msec: 448
+        hash: "1f5e7e064cc62ff2e0585c98875351df"
+    }
+    Frame {
+        msec: 464
+        hash: "c7f6bb852bdb2b99cbb5a8ca34f1585a"
+    }
+    Frame {
+        msec: 480
+        hash: "f2284dea5812f167cae08c687fc1a3e9"
+    }
+    Frame {
+        msec: 496
+        hash: "deec54bc32c46921e5032bce7daa1dad"
+    }
+    Frame {
+        msec: 512
+        hash: "1271d3704de17bfe463c76fd73c3132b"
+    }
+    Frame {
+        msec: 528
+        hash: "0568b0ecd47cd1c34b9de477e68e5751"
+    }
+    Frame {
+        msec: 544
+        hash: "f070dd88e42697a9e43573f9f41b3540"
+    }
+    Frame {
+        msec: 560
+        hash: "f5ced2827b06ea514f05866f1e4099f0"
+    }
+    Frame {
+        msec: 576
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 592
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 608
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 624
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 640
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 656
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 672
+        hash: "f5dc87abf36332c68fd4450a6236dcb4"
+    }
+    Frame {
+        msec: 688
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 704
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 720
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 736
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 752
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 768
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 784
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 800
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 816
+        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
+    }
+    Frame {
+        msec: 832
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 848
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 864
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 880
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 896
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 912
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 928
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 944
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 960
+        image: "renderControl.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 992
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 1008
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 1024
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 1040
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 1056
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 1072
+        hash: "3aef5e1ff6da15e0e9f2e620dbabbab2"
+    }
+    Frame {
+        msec: 1088
+        hash: "2931299f667752efe9fca727534385e1"
+    }
+    Frame {
+        msec: 1104
+        hash: "2ed90e61c41b994ccea924191b66fc71"
+    }
+    Frame {
+        msec: 1120
+        hash: "1424c634067c896973c2c10793957933"
+    }
+    Frame {
+        msec: 1136
+        hash: "c4d30d511053a7caeefdae753236cf5b"
+    }
+    Frame {
+        msec: 1152
+        hash: "32300e07e34e8f316770c790a5ef9f6d"
+    }
+    Frame {
+        msec: 1168
+        hash: "95312dc2a4d88a48605fea170712354d"
+    }
+    Frame {
+        msec: 1184
+        hash: "3d146357d1532640cefb64fbae75bc0d"
+    }
+    Frame {
+        msec: 1200
+        hash: "5b78740511a456a3647d8392b2008f7f"
+    }
+    Frame {
+        msec: 1216
+        hash: "dddb065cefa27a862d108429c9984191"
+    }
+    Frame {
+        msec: 1232
+        hash: "0857067a0ee381e0f462ef8aceb0b696"
+    }
+    Frame {
+        msec: 1248
+        hash: "1f5e7e064cc62ff2e0585c98875351df"
+    }
+    Frame {
+        msec: 1264
+        hash: "c7f6bb852bdb2b99cbb5a8ca34f1585a"
+    }
+    Frame {
+        msec: 1280
+        hash: "f2284dea5812f167cae08c687fc1a3e9"
+    }
+    Frame {
+        msec: 1296
+        hash: "deec54bc32c46921e5032bce7daa1dad"
+    }
+    Frame {
+        msec: 1312
+        hash: "1271d3704de17bfe463c76fd73c3132b"
+    }
+    Frame {
+        msec: 1328
+        hash: "0568b0ecd47cd1c34b9de477e68e5751"
+    }
+    Frame {
+        msec: 1344
+        hash: "f070dd88e42697a9e43573f9f41b3540"
+    }
+    Frame {
+        msec: 1360
+        hash: "f5ced2827b06ea514f05866f1e4099f0"
+    }
+    Frame {
+        msec: 1376
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 1392
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 1408
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 1424
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 1440
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 1456
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 1472
+        hash: "f5dc87abf36332c68fd4450a6236dcb4"
+    }
+    Frame {
+        msec: 1488
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 1504
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 1520
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 1536
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 1552
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 1568
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 1584
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 1600
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 1616
+        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
+    }
+    Frame {
+        msec: 1632
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
new file mode 100644
index 0000000..edf8040
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
@@ -0,0 +1,1319 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "ac1d9c1cc13813b5e94c692a209a4e36"
+    }
+    Frame {
+        msec: 32
+        hash: "1f189a436cf74ae83a03c3bb63c24ec2"
+    }
+    Frame {
+        msec: 48
+        hash: "369f761053d5910e00672aa866f698ba"
+    }
+    Frame {
+        msec: 64
+        hash: "30a191ae899121ae22d10acee6593415"
+    }
+    Frame {
+        msec: 80
+        hash: "7af041898748bb5950643b057ca59eea"
+    }
+    Frame {
+        msec: 96
+        hash: "e0a2ed91e78ff9a994deb9649a8afc16"
+    }
+    Frame {
+        msec: 112
+        hash: "649ad1a3fb57fb088e4e5cfd749bf2e5"
+    }
+    Frame {
+        msec: 128
+        hash: "9053a92e343ebb79bd2831f5ab94a1b5"
+    }
+    Frame {
+        msec: 144
+        hash: "dc78b09e27bbc0a2cfec83436eef4446"
+    }
+    Frame {
+        msec: 160
+        hash: "2aaa3749f93734dd203e1fea91a9f24a"
+    }
+    Frame {
+        msec: 176
+        hash: "8df8dd33eada434231332b81e03430ce"
+    }
+    Frame {
+        msec: 192
+        hash: "b5b1beb4dd4720eaa8b888fbef1ba875"
+    }
+    Frame {
+        msec: 208
+        hash: "e531d33ef14b58ad843a6be6d7cb0961"
+    }
+    Frame {
+        msec: 224
+        hash: "011c0bcca7717b08bc53738718203f7e"
+    }
+    Frame {
+        msec: 240
+        hash: "412a630348aa44d56f36f04982035e36"
+    }
+    Frame {
+        msec: 256
+        hash: "45528cdc62622b6d01e44466cd85bd38"
+    }
+    Frame {
+        msec: 272
+        hash: "0901c99f959d6c10a0b6ea46a282d8fd"
+    }
+    Frame {
+        msec: 288
+        hash: "3f200fca4815d555f22912d9fcdc20ee"
+    }
+    Frame {
+        msec: 304
+        hash: "5e3c58e2f3a57f4ea48f4315d37ed813"
+    }
+    Frame {
+        msec: 320
+        hash: "e8d98ec2d13ef4324feba11be95d0735"
+    }
+    Frame {
+        msec: 336
+        hash: "4f3b79b341b63499a20f1e1e2cd979f9"
+    }
+    Frame {
+        msec: 352
+        hash: "5ddbc3bc10292bec41531e83c0921c59"
+    }
+    Frame {
+        msec: 368
+        hash: "9bc9801e83267689cd2750226f2b08ce"
+    }
+    Frame {
+        msec: 384
+        hash: "f87195f2393914a0bbed9a454de01ff5"
+    }
+    Frame {
+        msec: 400
+        hash: "4e0fd7f45e53a8d44c416eb9235ec877"
+    }
+    Frame {
+        msec: 416
+        hash: "a579d6324fb4bf9ac5ceaba2aa708764"
+    }
+    Frame {
+        msec: 432
+        hash: "b9f3f08168fb55ba01e56e670db565de"
+    }
+    Frame {
+        msec: 448
+        hash: "cbd63ec868578e295a83170f42b23678"
+    }
+    Frame {
+        msec: 464
+        hash: "2ed9d0e09b61dee8b2703e580007d7a5"
+    }
+    Frame {
+        msec: 480
+        hash: "92fa2d9ef05140eb9d0fcf78b55f202e"
+    }
+    Frame {
+        msec: 496
+        hash: "9a3f9dc04a900020f0e488309d7b4757"
+    }
+    Frame {
+        msec: 512
+        hash: "93b4876c3e185ff4875a7447b0bf4f0f"
+    }
+    Frame {
+        msec: 528
+        hash: "41b40e36f77d04e62f72ad34aa50709a"
+    }
+    Frame {
+        msec: 544
+        hash: "2ea69aeb32fee61b61aa9c4efb2834bf"
+    }
+    Frame {
+        msec: 560
+        hash: "0971ac1e05ea2ba387c78d4d103f5ea1"
+    }
+    Frame {
+        msec: 576
+        hash: "98e46dff678f293fd6a4e9313ab3aec7"
+    }
+    Frame {
+        msec: 592
+        hash: "82b94393071d6c32dd8028e1ee69e7fb"
+    }
+    Frame {
+        msec: 608
+        hash: "240df67aa72a24546eb6e043e0d3d205"
+    }
+    Frame {
+        msec: 624
+        hash: "56c4113cc341c254ccab66f3bc313154"
+    }
+    Frame {
+        msec: 640
+        hash: "20d758c1537ed1a9aff657414b50926c"
+    }
+    Frame {
+        msec: 656
+        hash: "ae252d835a05e01c2a12ae820335049a"
+    }
+    Frame {
+        msec: 672
+        hash: "4d53256fbb012e738ba3868e2482250d"
+    }
+    Frame {
+        msec: 688
+        hash: "261a341cab38986fb2f53b8e430f04a3"
+    }
+    Frame {
+        msec: 704
+        hash: "1030f795d310f742ba491a2a90ff52d8"
+    }
+    Frame {
+        msec: 720
+        hash: "59d24ebfedd2a87bdbd755d06c4361d2"
+    }
+    Frame {
+        msec: 736
+        hash: "a6eaa480b3f93d33ae23bb36b7691b92"
+    }
+    Frame {
+        msec: 752
+        hash: "cb6cf1e6e89da3fcbad323f744aef18d"
+    }
+    Frame {
+        msec: 768
+        hash: "33a4f07cf7f5d16f006541c61ae2e4ee"
+    }
+    Frame {
+        msec: 784
+        hash: "6e857b106486ea0aaa5321d4a7a07eae"
+    }
+    Frame {
+        msec: 800
+        hash: "0f80edaf3eecf7a8c015d3fcecc0a494"
+    }
+    Frame {
+        msec: 816
+        hash: "24b45d00d70904694c30ebd422c739ce"
+    }
+    Frame {
+        msec: 832
+        hash: "c0ca66fefb19294852b9be0c4ba36481"
+    }
+    Frame {
+        msec: 848
+        hash: "047846d243e7613193a8ddd526c4268e"
+    }
+    Frame {
+        msec: 864
+        hash: "ca85f90e450ccda6b76e6a29a3187a63"
+    }
+    Frame {
+        msec: 880
+        hash: "fcd803f5640d054190c2ddc9a6406bb9"
+    }
+    Frame {
+        msec: 896
+        hash: "f81152b8a464bfa8343f52efcb0c8b8c"
+    }
+    Frame {
+        msec: 912
+        hash: "e86be73d83699584dca986dfdb030b36"
+    }
+    Frame {
+        msec: 928
+        hash: "d9798e4ebaf72c35b19a56b336d2ea93"
+    }
+    Frame {
+        msec: 944
+        hash: "460f13d8e05b529c0e4fba39b1449ff1"
+    }
+    Frame {
+        msec: 960
+        image: "resolution.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "8b2f13580c6de9ec231809330d2d0362"
+    }
+    Frame {
+        msec: 992
+        hash: "94a2cc520340573557e6a310f2ea125e"
+    }
+    Frame {
+        msec: 1008
+        hash: "a8df78ab2e800349ec887ea6b1f5dcb8"
+    }
+    Frame {
+        msec: 1024
+        hash: "0f3a56dbe26d453847ed4847c0e81d1a"
+    }
+    Frame {
+        msec: 1040
+        hash: "96c89325862a982235b4b75922ec4669"
+    }
+    Frame {
+        msec: 1056
+        hash: "ead6352a4ca47da59422e8d6a5844aa4"
+    }
+    Frame {
+        msec: 1072
+        hash: "b50a6b14f15882e2c1ae6e3babeecdf8"
+    }
+    Frame {
+        msec: 1088
+        hash: "2f32245c3388b86194e8183a290e99b8"
+    }
+    Frame {
+        msec: 1104
+        hash: "2b54d49d30ccbf11ccb5ba8d62ba7d83"
+    }
+    Frame {
+        msec: 1120
+        hash: "495b25d87cb6d1d4bdea4d5ec62c698e"
+    }
+    Frame {
+        msec: 1136
+        hash: "3d45b061939783b6359fa4cdb908ecc0"
+    }
+    Frame {
+        msec: 1152
+        hash: "e9e601c2a65a09b6354fff2c162106d6"
+    }
+    Frame {
+        msec: 1168
+        hash: "8cfba8a724e85403b573caf7bbac9d83"
+    }
+    Frame {
+        msec: 1184
+        hash: "5910765354645b724e14681cbdea227e"
+    }
+    Frame {
+        msec: 1200
+        hash: "4358af7f2ccfc0919614351bfd5a7405"
+    }
+    Frame {
+        msec: 1216
+        hash: "032e064336b458a6de03fdc98684cc34"
+    }
+    Frame {
+        msec: 1232
+        hash: "c81d87bf83ee7e834a4b15dd103f7082"
+    }
+    Frame {
+        msec: 1248
+        hash: "9d4416b55ed3b9e45a2314e9be5a5f2d"
+    }
+    Frame {
+        msec: 1264
+        hash: "5b96da1a52a0413f9e8edbc9291a2502"
+    }
+    Frame {
+        msec: 1280
+        hash: "aaa4008281ebc60b15616c818816e195"
+    }
+    Frame {
+        msec: 1296
+        hash: "81ebf882aeb89648300dfc2e8e2cf11b"
+    }
+    Frame {
+        msec: 1312
+        hash: "4e686e6cee12902f92e0ece915386fb3"
+    }
+    Frame {
+        msec: 1328
+        hash: "6ff8d9bd6ec4dce414cdc7330646156e"
+    }
+    Frame {
+        msec: 1344
+        hash: "dac6334e8b221527ef74b4f93eeef7c3"
+    }
+    Frame {
+        msec: 1360
+        hash: "e58dbf419d1831e001e802600803aaa5"
+    }
+    Frame {
+        msec: 1376
+        hash: "e8685f9b12c9ccb9d0e471946f1f6f9c"
+    }
+    Frame {
+        msec: 1392
+        hash: "0936715ff8d38c2c813ebef0683a3246"
+    }
+    Frame {
+        msec: 1408
+        hash: "37ad0a5532af8b083a7d4c4b044075ca"
+    }
+    Frame {
+        msec: 1424
+        hash: "52ae25414d353d994cba36918644949a"
+    }
+    Frame {
+        msec: 1440
+        hash: "07719485f9a7d0012eb0f3f211f0f21b"
+    }
+    Frame {
+        msec: 1456
+        hash: "2d1a4f2c8d4a8d6316a31a81a2d20c61"
+    }
+    Frame {
+        msec: 1472
+        hash: "3b279fb9e7b3efe05becc1651ba59493"
+    }
+    Frame {
+        msec: 1488
+        hash: "4b9c126dcdf499f9de4e09d4f6ab86bf"
+    }
+    Frame {
+        msec: 1504
+        hash: "6a1b8d8ea46949cb65e8f4155ab94819"
+    }
+    Frame {
+        msec: 1520
+        hash: "6dbd2106b91ffbbb8a845e6cddbd47d7"
+    }
+    Frame {
+        msec: 1536
+        hash: "8244eda92302f2b5cff01f05d438bf20"
+    }
+    Frame {
+        msec: 1552
+        hash: "f939bd80ae865e365e554a532ade38f5"
+    }
+    Frame {
+        msec: 1568
+        hash: "92d135616eee6737333b3d86d0aa5956"
+    }
+    Frame {
+        msec: 1584
+        hash: "ca75854d6e5a77c8e609d65971b5671a"
+    }
+    Frame {
+        msec: 1600
+        hash: "b0a113800cd05768b57bac6b9a338b1d"
+    }
+    Frame {
+        msec: 1616
+        hash: "7af1a2aa6a201e36c3a969be4330af04"
+    }
+    Frame {
+        msec: 1632
+        hash: "e54e8a2cfb0e6678b2a7cc64b8ae08bc"
+    }
+    Frame {
+        msec: 1648
+        hash: "5d212c7efd9cf7d3eb5219b0bbe766d7"
+    }
+    Frame {
+        msec: 1664
+        hash: "f4f2c95380c0f76c9e89820cdbeb5b31"
+    }
+    Frame {
+        msec: 1680
+        hash: "b8eefbf5ade1a6b9eef9608f66a46474"
+    }
+    Frame {
+        msec: 1696
+        hash: "d699ace9babbb152aad2fa852114c099"
+    }
+    Frame {
+        msec: 1712
+        hash: "ceb3dea0d2b93cc5882a2b38ab3d1b95"
+    }
+    Frame {
+        msec: 1728
+        hash: "08175810bfb80e1c5816b0d0aebbac4a"
+    }
+    Frame {
+        msec: 1744
+        hash: "86abce93f50e7e7ebbd90690cfb20dd2"
+    }
+    Frame {
+        msec: 1760
+        hash: "2918979f2682bd32beb5eaf7ecb3e463"
+    }
+    Frame {
+        msec: 1776
+        hash: "b165ab96b0d51d41578bf99cbf7f6d02"
+    }
+    Frame {
+        msec: 1792
+        hash: "d56cfdb2c65372cb36aeb13fd9c73deb"
+    }
+    Frame {
+        msec: 1808
+        hash: "c53f0e4dc8204e5892ed4f367a6bade3"
+    }
+    Frame {
+        msec: 1824
+        hash: "b3ae62e13149160f3695ed5c116411aa"
+    }
+    Frame {
+        msec: 1840
+        hash: "057e4a0428ea2ff9893becd40e6d2977"
+    }
+    Frame {
+        msec: 1856
+        hash: "10c050131093cc0d3f4b80c44eb1218b"
+    }
+    Frame {
+        msec: 1872
+        hash: "17ce5a6dace37f4eb316f37ea26a8a2c"
+    }
+    Frame {
+        msec: 1888
+        hash: "6e00c7e74bfaed5cf06aba54c8b73e57"
+    }
+    Frame {
+        msec: 1904
+        hash: "5a03b1b698ca28d2afd9c67aef3bc2e9"
+    }
+    Frame {
+        msec: 1920
+        image: "resolution.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "0fab102a33521e8893afdb6a11a3c5c9"
+    }
+    Frame {
+        msec: 1952
+        hash: "232e8f1b060ef55e37a372bec4435d11"
+    }
+    Frame {
+        msec: 1968
+        hash: "2107724eac0d1b8735060876f80d303a"
+    }
+    Frame {
+        msec: 1984
+        hash: "cf5d12d2707975ad364750d5ba787944"
+    }
+    Frame {
+        msec: 2000
+        hash: "2457c88828c2cb39feb1d34556077139"
+    }
+    Frame {
+        msec: 2016
+        hash: "5f08d6dab8199b3f0f57d32cf2da4d67"
+    }
+    Frame {
+        msec: 2032
+        hash: "2457c88828c2cb39feb1d34556077139"
+    }
+    Frame {
+        msec: 2048
+        hash: "cf5d12d2707975ad364750d5ba787944"
+    }
+    Frame {
+        msec: 2064
+        hash: "2107724eac0d1b8735060876f80d303a"
+    }
+    Frame {
+        msec: 2080
+        hash: "232e8f1b060ef55e37a372bec4435d11"
+    }
+    Frame {
+        msec: 2096
+        hash: "0a93c515cd328978ebd8103539a2fd63"
+    }
+    Frame {
+        msec: 2112
+        hash: "63d6c7beac12e3bd83f9ef58c233c7d2"
+    }
+    Frame {
+        msec: 2128
+        hash: "5a03b1b698ca28d2afd9c67aef3bc2e9"
+    }
+    Frame {
+        msec: 2144
+        hash: "6e00c7e74bfaed5cf06aba54c8b73e57"
+    }
+    Frame {
+        msec: 2160
+        hash: "17ce5a6dace37f4eb316f37ea26a8a2c"
+    }
+    Frame {
+        msec: 2176
+        hash: "10c050131093cc0d3f4b80c44eb1218b"
+    }
+    Frame {
+        msec: 2192
+        hash: "057e4a0428ea2ff9893becd40e6d2977"
+    }
+    Frame {
+        msec: 2208
+        hash: "b3ae62e13149160f3695ed5c116411aa"
+    }
+    Frame {
+        msec: 2224
+        hash: "c53f0e4dc8204e5892ed4f367a6bade3"
+    }
+    Frame {
+        msec: 2240
+        hash: "d56cfdb2c65372cb36aeb13fd9c73deb"
+    }
+    Frame {
+        msec: 2256
+        hash: "b165ab96b0d51d41578bf99cbf7f6d02"
+    }
+    Frame {
+        msec: 2272
+        hash: "2918979f2682bd32beb5eaf7ecb3e463"
+    }
+    Frame {
+        msec: 2288
+        hash: "86abce93f50e7e7ebbd90690cfb20dd2"
+    }
+    Frame {
+        msec: 2304
+        hash: "08175810bfb80e1c5816b0d0aebbac4a"
+    }
+    Frame {
+        msec: 2320
+        hash: "ceb3dea0d2b93cc5882a2b38ab3d1b95"
+    }
+    Frame {
+        msec: 2336
+        hash: "d699ace9babbb152aad2fa852114c099"
+    }
+    Frame {
+        msec: 2352
+        hash: "b8eefbf5ade1a6b9eef9608f66a46474"
+    }
+    Frame {
+        msec: 2368
+        hash: "f4f2c95380c0f76c9e89820cdbeb5b31"
+    }
+    Frame {
+        msec: 2384
+        hash: "5d212c7efd9cf7d3eb5219b0bbe766d7"
+    }
+    Frame {
+        msec: 2400
+        hash: "e54e8a2cfb0e6678b2a7cc64b8ae08bc"
+    }
+    Frame {
+        msec: 2416
+        hash: "d9408487f747ffb8eff5e1da92207285"
+    }
+    Frame {
+        msec: 2432
+        hash: "e6b3fa1829535ac90d1548f45aadb9be"
+    }
+    Frame {
+        msec: 2448
+        hash: "ca75854d6e5a77c8e609d65971b5671a"
+    }
+    Frame {
+        msec: 2464
+        hash: "92d135616eee6737333b3d86d0aa5956"
+    }
+    Frame {
+        msec: 2480
+        hash: "f939bd80ae865e365e554a532ade38f5"
+    }
+    Frame {
+        msec: 2496
+        hash: "8244eda92302f2b5cff01f05d438bf20"
+    }
+    Frame {
+        msec: 2512
+        hash: "6dbd2106b91ffbbb8a845e6cddbd47d7"
+    }
+    Frame {
+        msec: 2528
+        hash: "6a1b8d8ea46949cb65e8f4155ab94819"
+    }
+    Frame {
+        msec: 2544
+        hash: "4b9c126dcdf499f9de4e09d4f6ab86bf"
+    }
+    Frame {
+        msec: 2560
+        hash: "3b279fb9e7b3efe05becc1651ba59493"
+    }
+    Frame {
+        msec: 2576
+        hash: "bb40b884b56defb61ad86757fd51b9e6"
+    }
+    Frame {
+        msec: 2592
+        hash: "07719485f9a7d0012eb0f3f211f0f21b"
+    }
+    Frame {
+        msec: 2608
+        hash: "52ae25414d353d994cba36918644949a"
+    }
+    Frame {
+        msec: 2624
+        hash: "37ad0a5532af8b083a7d4c4b044075ca"
+    }
+    Frame {
+        msec: 2640
+        hash: "0936715ff8d38c2c813ebef0683a3246"
+    }
+    Frame {
+        msec: 2656
+        hash: "e8685f9b12c9ccb9d0e471946f1f6f9c"
+    }
+    Frame {
+        msec: 2672
+        hash: "e58dbf419d1831e001e802600803aaa5"
+    }
+    Frame {
+        msec: 2688
+        hash: "dac6334e8b221527ef74b4f93eeef7c3"
+    }
+    Frame {
+        msec: 2704
+        hash: "6ff8d9bd6ec4dce414cdc7330646156e"
+    }
+    Frame {
+        msec: 2720
+        hash: "4e686e6cee12902f92e0ece915386fb3"
+    }
+    Frame {
+        msec: 2736
+        hash: "81ebf882aeb89648300dfc2e8e2cf11b"
+    }
+    Frame {
+        msec: 2752
+        hash: "aaa4008281ebc60b15616c818816e195"
+    }
+    Frame {
+        msec: 2768
+        hash: "5b96da1a52a0413f9e8edbc9291a2502"
+    }
+    Frame {
+        msec: 2784
+        hash: "9d4416b55ed3b9e45a2314e9be5a5f2d"
+    }
+    Frame {
+        msec: 2800
+        hash: "c81d87bf83ee7e834a4b15dd103f7082"
+    }
+    Frame {
+        msec: 2816
+        hash: "9fdf30d57c49a6644377ba40140b1969"
+    }
+    Frame {
+        msec: 2832
+        hash: "4358af7f2ccfc0919614351bfd5a7405"
+    }
+    Frame {
+        msec: 2848
+        hash: "5910765354645b724e14681cbdea227e"
+    }
+    Frame {
+        msec: 2864
+        hash: "8cfba8a724e85403b573caf7bbac9d83"
+    }
+    Frame {
+        msec: 2880
+        image: "resolution.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "3d45b061939783b6359fa4cdb908ecc0"
+    }
+    Frame {
+        msec: 2912
+        hash: "495b25d87cb6d1d4bdea4d5ec62c698e"
+    }
+    Frame {
+        msec: 2928
+        hash: "2b54d49d30ccbf11ccb5ba8d62ba7d83"
+    }
+    Frame {
+        msec: 2944
+        hash: "2f32245c3388b86194e8183a290e99b8"
+    }
+    Frame {
+        msec: 2960
+        hash: "b50a6b14f15882e2c1ae6e3babeecdf8"
+    }
+    Frame {
+        msec: 2976
+        hash: "ead6352a4ca47da59422e8d6a5844aa4"
+    }
+    Frame {
+        msec: 2992
+        hash: "96c89325862a982235b4b75922ec4669"
+    }
+    Frame {
+        msec: 3008
+        hash: "0f3a56dbe26d453847ed4847c0e81d1a"
+    }
+    Frame {
+        msec: 3024
+        hash: "a8df78ab2e800349ec887ea6b1f5dcb8"
+    }
+    Frame {
+        msec: 3040
+        hash: "94a2cc520340573557e6a310f2ea125e"
+    }
+    Frame {
+        msec: 3056
+        hash: "8b2f13580c6de9ec231809330d2d0362"
+    }
+    Frame {
+        msec: 3072
+        hash: "5f76ef4f6b8e703fd0822859cd9a1353"
+    }
+    Frame {
+        msec: 3088
+        hash: "460f13d8e05b529c0e4fba39b1449ff1"
+    }
+    Frame {
+        msec: 3104
+        hash: "d9798e4ebaf72c35b19a56b336d2ea93"
+    }
+    Frame {
+        msec: 3120
+        hash: "e86be73d83699584dca986dfdb030b36"
+    }
+    Frame {
+        msec: 3136
+        hash: "f81152b8a464bfa8343f52efcb0c8b8c"
+    }
+    Frame {
+        msec: 3152
+        hash: "fcd803f5640d054190c2ddc9a6406bb9"
+    }
+    Frame {
+        msec: 3168
+        hash: "ca85f90e450ccda6b76e6a29a3187a63"
+    }
+    Frame {
+        msec: 3184
+        hash: "047846d243e7613193a8ddd526c4268e"
+    }
+    Frame {
+        msec: 3200
+        hash: "c0ca66fefb19294852b9be0c4ba36481"
+    }
+    Frame {
+        msec: 3216
+        hash: "d4a075656790c4f2c50addcd2cc660b5"
+    }
+    Frame {
+        msec: 3232
+        hash: "0f80edaf3eecf7a8c015d3fcecc0a494"
+    }
+    Frame {
+        msec: 3248
+        hash: "6e857b106486ea0aaa5321d4a7a07eae"
+    }
+    Frame {
+        msec: 3264
+        hash: "33a4f07cf7f5d16f006541c61ae2e4ee"
+    }
+    Frame {
+        msec: 3280
+        hash: "cb6cf1e6e89da3fcbad323f744aef18d"
+    }
+    Frame {
+        msec: 3296
+        hash: "a6eaa480b3f93d33ae23bb36b7691b92"
+    }
+    Frame {
+        msec: 3312
+        hash: "59d24ebfedd2a87bdbd755d06c4361d2"
+    }
+    Frame {
+        msec: 3328
+        hash: "1030f795d310f742ba491a2a90ff52d8"
+    }
+    Frame {
+        msec: 3344
+        hash: "261a341cab38986fb2f53b8e430f04a3"
+    }
+    Frame {
+        msec: 3360
+        hash: "4d53256fbb012e738ba3868e2482250d"
+    }
+    Frame {
+        msec: 3376
+        hash: "ae252d835a05e01c2a12ae820335049a"
+    }
+    Frame {
+        msec: 3392
+        hash: "20d758c1537ed1a9aff657414b50926c"
+    }
+    Frame {
+        msec: 3408
+        hash: "56c4113cc341c254ccab66f3bc313154"
+    }
+    Frame {
+        msec: 3424
+        hash: "240df67aa72a24546eb6e043e0d3d205"
+    }
+    Frame {
+        msec: 3440
+        hash: "82b94393071d6c32dd8028e1ee69e7fb"
+    }
+    Frame {
+        msec: 3456
+        hash: "98e46dff678f293fd6a4e9313ab3aec7"
+    }
+    Frame {
+        msec: 3472
+        hash: "0971ac1e05ea2ba387c78d4d103f5ea1"
+    }
+    Frame {
+        msec: 3488
+        hash: "2ea69aeb32fee61b61aa9c4efb2834bf"
+    }
+    Frame {
+        msec: 3504
+        hash: "41b40e36f77d04e62f72ad34aa50709a"
+    }
+    Frame {
+        msec: 3520
+        hash: "93b4876c3e185ff4875a7447b0bf4f0f"
+    }
+    Frame {
+        msec: 3536
+        hash: "9a3f9dc04a900020f0e488309d7b4757"
+    }
+    Frame {
+        msec: 3552
+        hash: "92fa2d9ef05140eb9d0fcf78b55f202e"
+    }
+    Frame {
+        msec: 3568
+        hash: "2ed9d0e09b61dee8b2703e580007d7a5"
+    }
+    Frame {
+        msec: 3584
+        hash: "cbd63ec868578e295a83170f42b23678"
+    }
+    Frame {
+        msec: 3600
+        hash: "b9f3f08168fb55ba01e56e670db565de"
+    }
+    Frame {
+        msec: 3616
+        hash: "a579d6324fb4bf9ac5ceaba2aa708764"
+    }
+    Frame {
+        msec: 3632
+        hash: "4e0fd7f45e53a8d44c416eb9235ec877"
+    }
+    Frame {
+        msec: 3648
+        hash: "f87195f2393914a0bbed9a454de01ff5"
+    }
+    Frame {
+        msec: 3664
+        hash: "9bc9801e83267689cd2750226f2b08ce"
+    }
+    Frame {
+        msec: 3680
+        hash: "5ddbc3bc10292bec41531e83c0921c59"
+    }
+    Frame {
+        msec: 3696
+        hash: "4f3b79b341b63499a20f1e1e2cd979f9"
+    }
+    Frame {
+        msec: 3712
+        hash: "e8d98ec2d13ef4324feba11be95d0735"
+    }
+    Frame {
+        msec: 3728
+        hash: "5e3c58e2f3a57f4ea48f4315d37ed813"
+    }
+    Frame {
+        msec: 3744
+        hash: "3f200fca4815d555f22912d9fcdc20ee"
+    }
+    Frame {
+        msec: 3760
+        hash: "0901c99f959d6c10a0b6ea46a282d8fd"
+    }
+    Frame {
+        msec: 3776
+        hash: "a186b8e984c999e8609472a7a5fa0610"
+    }
+    Frame {
+        msec: 3792
+        hash: "412a630348aa44d56f36f04982035e36"
+    }
+    Frame {
+        msec: 3808
+        hash: "011c0bcca7717b08bc53738718203f7e"
+    }
+    Frame {
+        msec: 3824
+        hash: "e531d33ef14b58ad843a6be6d7cb0961"
+    }
+    Frame {
+        msec: 3840
+        image: "resolution.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "8df8dd33eada434231332b81e03430ce"
+    }
+    Frame {
+        msec: 3872
+        hash: "2aaa3749f93734dd203e1fea91a9f24a"
+    }
+    Frame {
+        msec: 3888
+        hash: "dc78b09e27bbc0a2cfec83436eef4446"
+    }
+    Frame {
+        msec: 3904
+        hash: "9053a92e343ebb79bd2831f5ab94a1b5"
+    }
+    Frame {
+        msec: 3920
+        hash: "649ad1a3fb57fb088e4e5cfd749bf2e5"
+    }
+    Frame {
+        msec: 3936
+        hash: "3579849956c1101000ef09949aa4c0f9"
+    }
+    Frame {
+        msec: 3952
+        hash: "7af041898748bb5950643b057ca59eea"
+    }
+    Frame {
+        msec: 3968
+        hash: "30a191ae899121ae22d10acee6593415"
+    }
+    Frame {
+        msec: 3984
+        hash: "369f761053d5910e00672aa866f698ba"
+    }
+    Frame {
+        msec: 4000
+        hash: "1f189a436cf74ae83a03c3bb63c24ec2"
+    }
+    Frame {
+        msec: 4016
+        hash: "ac1d9c1cc13813b5e94c692a209a4e36"
+    }
+    Frame {
+        msec: 4032
+        hash: "f0e0b5c041bcf38d8d9144d466ad74a9"
+    }
+    Frame {
+        msec: 4048
+        hash: "38a35c94ebcf33f6720fea33821a54e1"
+    }
+    Frame {
+        msec: 4064
+        hash: "061d139f43a3dd63daf887b82721f42f"
+    }
+    Frame {
+        msec: 4080
+        hash: "623747b5fe99e5ffaa62f4daa3f840ef"
+    }
+    Frame {
+        msec: 4096
+        hash: "4dd5081a387ffda296811b64b9235d7d"
+    }
+    Frame {
+        msec: 4112
+        hash: "1598cf2fe996f99ab4c15f84d89cd7bd"
+    }
+    Frame {
+        msec: 4128
+        hash: "30cac85bf1a622d438a64b6ccb59a8ca"
+    }
+    Frame {
+        msec: 4144
+        hash: "114e54ae3e1493750a022f1c019e7f77"
+    }
+    Frame {
+        msec: 4160
+        hash: "a585efc3aae3a426e6af5f4a8cc23b10"
+    }
+    Frame {
+        msec: 4176
+        hash: "c0f315549baad93dd885d58b185e7ed7"
+    }
+    Frame {
+        msec: 4192
+        hash: "3a00f5f034bef58ca341bf9e1056f46f"
+    }
+    Frame {
+        msec: 4208
+        hash: "b3022d07dee989499a35aea21e07e4c1"
+    }
+    Frame {
+        msec: 4224
+        hash: "e722464809e94fb7d8c752506f0d3ac2"
+    }
+    Frame {
+        msec: 4240
+        hash: "82ea3d06367ce9dc582dbdbc186cc70a"
+    }
+    Frame {
+        msec: 4256
+        hash: "359040facbe531c7f6b805b8bfc5b17a"
+    }
+    Frame {
+        msec: 4272
+        hash: "264c7b65bae7e3945d87c17edfda6889"
+    }
+    Frame {
+        msec: 4288
+        hash: "d941ec8e363942af02f36d4672521801"
+    }
+    Frame {
+        msec: 4304
+        hash: "e46e145b4d07d1697c1d9efce80c80de"
+    }
+    Frame {
+        msec: 4320
+        hash: "d8bed5c42bc5725d811db4dacdab1581"
+    }
+    Frame {
+        msec: 4336
+        hash: "aa221160b4a11b30cb73eaa8ccaa9dfd"
+    }
+    Frame {
+        msec: 4352
+        hash: "f411483477906d83f872b306cd021406"
+    }
+    Frame {
+        msec: 4368
+        hash: "d9c52e4f99416fa1043a9c34a1c29f5a"
+    }
+    Frame {
+        msec: 4384
+        hash: "ec2890446f34b8a5d47ae97ba2853d0f"
+    }
+    Frame {
+        msec: 4400
+        hash: "6a3e6ef7d832fa7ec813b38171cb3602"
+    }
+    Frame {
+        msec: 4416
+        hash: "6dfd75b6cb780f7d80466f3450d0b255"
+    }
+    Frame {
+        msec: 4432
+        hash: "170774843dc6f28f51f07c445e046bd8"
+    }
+    Frame {
+        msec: 4448
+        hash: "eab348bef656739d9723d3bd659c43ff"
+    }
+    Frame {
+        msec: 4464
+        hash: "f06e546bb710002cdf1cefd51ffa47c4"
+    }
+    Frame {
+        msec: 4480
+        hash: "52f7ff1348d9aa7cdf43cd81f0a71625"
+    }
+    Frame {
+        msec: 4496
+        hash: "55a5b1befa3b7a4674a62d492b5527ea"
+    }
+    Frame {
+        msec: 4512
+        hash: "699c093fddc6b9293a011d8d6eccd36d"
+    }
+    Frame {
+        msec: 4528
+        hash: "b988e1ad7dc7d26ffeea8f71a69a9abf"
+    }
+    Frame {
+        msec: 4544
+        hash: "8dea2b47492f83f961a47536a10aad0c"
+    }
+    Frame {
+        msec: 4560
+        hash: "925ea8105779ffd801a3c62129d64bed"
+    }
+    Frame {
+        msec: 4576
+        hash: "aa5d957c4f452b1f1c70ea672ce4a0b9"
+    }
+    Frame {
+        msec: 4592
+        hash: "85d3ea97a1fb152ae8ad65a17693a16d"
+    }
+    Frame {
+        msec: 4608
+        hash: "069b2bc8b86f822c5e7ceca3664e78a6"
+    }
+    Frame {
+        msec: 4624
+        hash: "209071b7f72d8c25b9ce27c05397fe56"
+    }
+    Frame {
+        msec: 4640
+        hash: "068dea708612620d34bd57c6affb44b1"
+    }
+    Frame {
+        msec: 4656
+        hash: "36b53a0845220645059fed803a6ffcbc"
+    }
+    Frame {
+        msec: 4672
+        hash: "2c84e15006a39a554eb2047bae9d4f6f"
+    }
+    Frame {
+        msec: 4688
+        hash: "1bdab31534f4b5a7e9d27ede3e9acb57"
+    }
+    Frame {
+        msec: 4704
+        hash: "688689eeb584b0c74f0322af35857dd5"
+    }
+    Frame {
+        msec: 4720
+        hash: "024939fea5b6c6f9d3e26a0abf42ae3c"
+    }
+    Frame {
+        msec: 4736
+        hash: "2efb2f47c6f0be3743f0f4dc7a66b08e"
+    }
+    Frame {
+        msec: 4752
+        hash: "4631f3756af880693d3654c16cbe47bb"
+    }
+    Frame {
+        msec: 4768
+        hash: "2fd77649c1e1ade97534ef530ad05612"
+    }
+    Frame {
+        msec: 4784
+        hash: "5d13517bac111c8af49c444d41a42ea1"
+    }
+    Frame {
+        msec: 4800
+        image: "resolution.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "8bd8efe405a42730304dcc120a6e718c"
+    }
+    Frame {
+        msec: 4832
+        hash: "a83c543977e3f1dd4c020375eb3273fd"
+    }
+    Frame {
+        msec: 4848
+        hash: "c52f38469fec77afc7f0a44b992e3d0d"
+    }
+    Frame {
+        msec: 4864
+        hash: "af645449d6ec3f42449ffc59193aaaa4"
+    }
+    Frame {
+        msec: 4880
+        hash: "2eb982cf754c77c109158076957775ae"
+    }
+    Frame {
+        msec: 4896
+        hash: "9bf2fd4a4e45f302b34b7f038937d3d7"
+    }
+    Frame {
+        msec: 4912
+        hash: "5520e309d68c8eedf76a9392714a6150"
+    }
+    Frame {
+        msec: 4928
+        hash: "9dcd043a25e33b788729c0a0531301e7"
+    }
+    Frame {
+        msec: 4944
+        hash: "1475b9bcfe08c66135673f4284c9bbcd"
+    }
+    Frame {
+        msec: 4960
+        hash: "9af1f355bcf4d5f05b42040ebba75e09"
+    }
+    Frame {
+        msec: 4976
+        hash: "8b6e04980ea60ca2ff06053d35c06881"
+    }
+    Frame {
+        msec: 4992
+        hash: "def466e377a44afc4b2a9a9ebb258f86"
+    }
+    Frame {
+        msec: 5008
+        hash: "18f6d6f5a3fdaee0037580df0f4f9ef0"
+    }
+    Frame {
+        msec: 5024
+        hash: "ae2579498558f6f93489999c7c82cbcd"
+    }
+    Frame {
+        msec: 5040
+        hash: "623d8e756c2c131150554272df231bf9"
+    }
+    Frame {
+        msec: 5056
+        hash: "c13146576229848b8a1e1b382fbf749d"
+    }
+    Frame {
+        msec: 5072
+        hash: "f963a399aeea1d34ec3bd30a5b991035"
+    }
+    Frame {
+        msec: 5088
+        hash: "45a4db021ba0a53ad783c14a3b66aa38"
+    }
+    Frame {
+        msec: 5104
+        hash: "2031618470e3bb3a3435fe0e270a15d4"
+    }
+    Frame {
+        msec: 5120
+        hash: "f7cc01c301f29110db8364fecc8751f1"
+    }
+    Frame {
+        msec: 5136
+        hash: "2d366fa500257ec0a12863f3637d0c47"
+    }
+    Frame {
+        msec: 5152
+        hash: "4ba700e7f9ffba4889ca26d903a63029"
+    }
+    Frame {
+        msec: 5168
+        hash: "329bec5e3d6a131b4bd9a056659bdb3e"
+    }
+    Frame {
+        msec: 5184
+        hash: "48f7356707cdbcb401c135207ee38821"
+    }
+    Frame {
+        msec: 5200
+        hash: "5314e448affe60d193d07a784035ecce"
+    }
+    Frame {
+        msec: 5216
+        hash: "c87e98becdf99c214ad4987985b4af07"
+    }
+    Frame {
+        msec: 5232
+        hash: "ea81d2a967b619980d7e42937ec74668"
+    }
+    Frame {
+        msec: 5248
+        hash: "845319d4e0f6ee97697e59c606220e7a"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
new file mode 100644
index 0000000..4aab708
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
@@ -0,0 +1,655 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+    Frame {
+        msec: 32
+        hash: "c2f8551d0442d0736b71c54fc965562b"
+    }
+    Frame {
+        msec: 48
+        hash: "4fc1ef611b24ec5737310859b12c83d3"
+    }
+    Frame {
+        msec: 64
+        hash: "7df07aea83bc5c3213e7871854661820"
+    }
+    Frame {
+        msec: 80
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 96
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 112
+        hash: "f5c917c7ca26bb916dd4df84eafc8e94"
+    }
+    Frame {
+        msec: 128
+        hash: "0696257de0441666bd264f8db6383d15"
+    }
+    Frame {
+        msec: 144
+        hash: "0b43fdee23346c30c60b822a20131cc3"
+    }
+    Frame {
+        msec: 160
+        hash: "98dbd004cf4809dbc90bfa9272378644"
+    }
+    Frame {
+        msec: 176
+        hash: "32d0e9005ebb9dfd410d348e336bcd93"
+    }
+    Frame {
+        msec: 192
+        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
+    }
+    Frame {
+        msec: 208
+        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
+    }
+    Frame {
+        msec: 224
+        hash: "6712be93cf1ed2b7b202367418b6d2d7"
+    }
+    Frame {
+        msec: 240
+        hash: "524840a3453af4e97ac82b559308cce3"
+    }
+    Frame {
+        msec: 256
+        hash: "11436091b24c02af94dfa75a5fd1a001"
+    }
+    Frame {
+        msec: 272
+        hash: "d3689b53474b4b26630d70ba01c057b4"
+    }
+    Frame {
+        msec: 288
+        hash: "16e2b66f28ed80d80d9b5264d89624d5"
+    }
+    Frame {
+        msec: 304
+        hash: "87636076959de7e5a0a8bd8b31354ed4"
+    }
+    Frame {
+        msec: 320
+        hash: "a6916da6bfac27aa87d75da2bbb73f31"
+    }
+    Frame {
+        msec: 336
+        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
+    }
+    Frame {
+        msec: 352
+        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
+    }
+    Frame {
+        msec: 368
+        hash: "14d08c2ca430631af8ede1013f4f4da0"
+    }
+    Frame {
+        msec: 384
+        hash: "ace9db9112d147569dc0cf1a1b680d6c"
+    }
+    Frame {
+        msec: 400
+        hash: "08bc6815601417f3731eaae398d0861d"
+    }
+    Frame {
+        msec: 416
+        hash: "809870dfd9b05ce07170edd945348ddf"
+    }
+    Frame {
+        msec: 432
+        hash: "5784deb0f3270cf7a0d0964cd9d31458"
+    }
+    Frame {
+        msec: 448
+        hash: "2f06ee407e5175d4b954e31c39c9522c"
+    }
+    Frame {
+        msec: 464
+        hash: "48a7dbed293fbbd5ea202190837a411f"
+    }
+    Frame {
+        msec: 480
+        hash: "abf3d90803cfa12d35d2752be7ea02d8"
+    }
+    Frame {
+        msec: 496
+        hash: "a60edcf8d792f93a839e6ddbafbf993f"
+    }
+    Frame {
+        msec: 512
+        hash: "7e8dfe86ea0849022355b12578d4cb1a"
+    }
+    Frame {
+        msec: 528
+        hash: "3c84122b0933ee870f178d39469e51e2"
+    }
+    Frame {
+        msec: 544
+        hash: "25f463e91febf5b6d8819fd5010bc1c2"
+    }
+    Frame {
+        msec: 560
+        hash: "d423a9bc912237d0f20b924849ba0cb1"
+    }
+    Frame {
+        msec: 576
+        hash: "5bd3cc309a5fce6183654975543250b2"
+    }
+    Frame {
+        msec: 592
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+    Frame {
+        msec: 608
+        hash: "9a4bf1400da038f2088dd4c49403d852"
+    }
+    Frame {
+        msec: 624
+        hash: "a37024356613bd5d678e0b2f7b8f5959"
+    }
+    Frame {
+        msec: 640
+        hash: "4f37d72c10e51f68a2359086094da249"
+    }
+    Frame {
+        msec: 656
+        hash: "6093bcb7673f8e58fe5a7b0143638822"
+    }
+    Frame {
+        msec: 672
+        hash: "c272aeea2b9c450fbd732305ccc01b93"
+    }
+    Frame {
+        msec: 688
+        hash: "6a4e2ee45b26037421e2a5f2d6ee517e"
+    }
+    Frame {
+        msec: 704
+        hash: "d912afcbce6c9d879a07ffc3c51b36d1"
+    }
+    Frame {
+        msec: 720
+        hash: "2578335ac6f21c8aec2c87515562c321"
+    }
+    Frame {
+        msec: 736
+        hash: "5b77af55f0a723ba762d283f41e91c98"
+    }
+    Frame {
+        msec: 752
+        hash: "b420fc71b22fa608a9c0cdbbbc61c447"
+    }
+    Frame {
+        msec: 768
+        hash: "3f7a9cecf2a590e8728137fabfd3f5f3"
+    }
+    Frame {
+        msec: 784
+        hash: "c51f12a2f438f137785c70e3af4922fd"
+    }
+    Frame {
+        msec: 800
+        hash: "5d97175fc4d986e5b21758d4ac785025"
+    }
+    Frame {
+        msec: 816
+        hash: "94f922f3460ad76cd05cb5b321977a94"
+    }
+    Frame {
+        msec: 832
+        hash: "5747adbc4f0b22ed359793d72d3e7d1f"
+    }
+    Frame {
+        msec: 848
+        hash: "255d1d45d3343972f156dfab7d13ce41"
+    }
+    Frame {
+        msec: 864
+        hash: "e5b54132ffb83acad30622e969405bc0"
+    }
+    Frame {
+        msec: 880
+        hash: "2c05cf00e3417883e789f58c2728dc97"
+    }
+    Frame {
+        msec: 896
+        hash: "9d66290b1aae1de3025d24d3efc4ca1c"
+    }
+    Frame {
+        msec: 912
+        hash: "5e9b0783b1b4221145a4febbae56b30f"
+    }
+    Frame {
+        msec: 928
+        hash: "21eea497c26600b03d868661232b3ebe"
+    }
+    Frame {
+        msec: 944
+        hash: "2383c415170ac6444f1c193ed698f682"
+    }
+    Frame {
+        msec: 960
+        image: "zoomTextOnly.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "4ed0f85dec4eb0bb740ac3780b6872c0"
+    }
+    Frame {
+        msec: 992
+        hash: "0a18bccca4efeadfced8e5cb1715a1f3"
+    }
+    Frame {
+        msec: 1008
+        hash: "823e65df9075eb0e9a3aad6b15ec3342"
+    }
+    Frame {
+        msec: 1024
+        hash: "823e65df9075eb0e9a3aad6b15ec3342"
+    }
+    Frame {
+        msec: 1040
+        hash: "0a18bccca4efeadfced8e5cb1715a1f3"
+    }
+    Frame {
+        msec: 1056
+        hash: "4ed0f85dec4eb0bb740ac3780b6872c0"
+    }
+    Frame {
+        msec: 1072
+        hash: "fae77663566351fa3bb506b459496a9d"
+    }
+    Frame {
+        msec: 1088
+        hash: "2383c415170ac6444f1c193ed698f682"
+    }
+    Frame {
+        msec: 1104
+        hash: "2e05365256bebbdf3229f99b94263b6c"
+    }
+    Frame {
+        msec: 1120
+        hash: "5e9b0783b1b4221145a4febbae56b30f"
+    }
+    Frame {
+        msec: 1136
+        hash: "9d66290b1aae1de3025d24d3efc4ca1c"
+    }
+    Frame {
+        msec: 1152
+        hash: "2c05cf00e3417883e789f58c2728dc97"
+    }
+    Frame {
+        msec: 1168
+        hash: "e5b54132ffb83acad30622e969405bc0"
+    }
+    Frame {
+        msec: 1184
+        hash: "255d1d45d3343972f156dfab7d13ce41"
+    }
+    Frame {
+        msec: 1200
+        hash: "5747adbc4f0b22ed359793d72d3e7d1f"
+    }
+    Frame {
+        msec: 1216
+        hash: "94f922f3460ad76cd05cb5b321977a94"
+    }
+    Frame {
+        msec: 1232
+        hash: "5d97175fc4d986e5b21758d4ac785025"
+    }
+    Frame {
+        msec: 1248
+        hash: "c51f12a2f438f137785c70e3af4922fd"
+    }
+    Frame {
+        msec: 1264
+        hash: "3f7a9cecf2a590e8728137fabfd3f5f3"
+    }
+    Frame {
+        msec: 1280
+        hash: "b420fc71b22fa608a9c0cdbbbc61c447"
+    }
+    Frame {
+        msec: 1296
+        hash: "5b77af55f0a723ba762d283f41e91c98"
+    }
+    Frame {
+        msec: 1312
+        hash: "2578335ac6f21c8aec2c87515562c321"
+    }
+    Frame {
+        msec: 1328
+        hash: "a9b5438bd48dbafd307d571877416003"
+    }
+    Frame {
+        msec: 1344
+        hash: "6a4e2ee45b26037421e2a5f2d6ee517e"
+    }
+    Frame {
+        msec: 1360
+        hash: "c272aeea2b9c450fbd732305ccc01b93"
+    }
+    Frame {
+        msec: 1376
+        hash: "37c7e50c270e8feb4dd9018580284a85"
+    }
+    Frame {
+        msec: 1392
+        hash: "4f37d72c10e51f68a2359086094da249"
+    }
+    Frame {
+        msec: 1408
+        hash: "a37024356613bd5d678e0b2f7b8f5959"
+    }
+    Frame {
+        msec: 1424
+        hash: "9a4bf1400da038f2088dd4c49403d852"
+    }
+    Frame {
+        msec: 1440
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+    Frame {
+        msec: 1456
+        hash: "5bd3cc309a5fce6183654975543250b2"
+    }
+    Frame {
+        msec: 1472
+        hash: "d423a9bc912237d0f20b924849ba0cb1"
+    }
+    Frame {
+        msec: 1488
+        hash: "25f463e91febf5b6d8819fd5010bc1c2"
+    }
+    Frame {
+        msec: 1504
+        hash: "3c84122b0933ee870f178d39469e51e2"
+    }
+    Frame {
+        msec: 1520
+        hash: "7e8dfe86ea0849022355b12578d4cb1a"
+    }
+    Frame {
+        msec: 1536
+        hash: "a60edcf8d792f93a839e6ddbafbf993f"
+    }
+    Frame {
+        msec: 1552
+        hash: "abf3d90803cfa12d35d2752be7ea02d8"
+    }
+    Frame {
+        msec: 1568
+        hash: "48a7dbed293fbbd5ea202190837a411f"
+    }
+    Frame {
+        msec: 1584
+        hash: "2f06ee407e5175d4b954e31c39c9522c"
+    }
+    Frame {
+        msec: 1600
+        hash: "5784deb0f3270cf7a0d0964cd9d31458"
+    }
+    Frame {
+        msec: 1616
+        hash: "809870dfd9b05ce07170edd945348ddf"
+    }
+    Frame {
+        msec: 1632
+        hash: "08bc6815601417f3731eaae398d0861d"
+    }
+    Frame {
+        msec: 1648
+        hash: "ace9db9112d147569dc0cf1a1b680d6c"
+    }
+    Frame {
+        msec: 1664
+        hash: "14d08c2ca430631af8ede1013f4f4da0"
+    }
+    Frame {
+        msec: 1680
+        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
+    }
+    Frame {
+        msec: 1696
+        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
+    }
+    Frame {
+        msec: 1712
+        hash: "a6916da6bfac27aa87d75da2bbb73f31"
+    }
+    Frame {
+        msec: 1728
+        hash: "87636076959de7e5a0a8bd8b31354ed4"
+    }
+    Frame {
+        msec: 1744
+        hash: "16e2b66f28ed80d80d9b5264d89624d5"
+    }
+    Frame {
+        msec: 1760
+        hash: "d3689b53474b4b26630d70ba01c057b4"
+    }
+    Frame {
+        msec: 1776
+        hash: "11436091b24c02af94dfa75a5fd1a001"
+    }
+    Frame {
+        msec: 1792
+        hash: "524840a3453af4e97ac82b559308cce3"
+    }
+    Frame {
+        msec: 1808
+        hash: "6712be93cf1ed2b7b202367418b6d2d7"
+    }
+    Frame {
+        msec: 1824
+        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
+    }
+    Frame {
+        msec: 1840
+        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
+    }
+    Frame {
+        msec: 1856
+        hash: "32d0e9005ebb9dfd410d348e336bcd93"
+    }
+    Frame {
+        msec: 1872
+        hash: "98dbd004cf4809dbc90bfa9272378644"
+    }
+    Frame {
+        msec: 1888
+        hash: "0b43fdee23346c30c60b822a20131cc3"
+    }
+    Frame {
+        msec: 1904
+        hash: "0696257de0441666bd264f8db6383d15"
+    }
+    Frame {
+        msec: 1920
+        image: "zoomTextOnly.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 1952
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 1968
+        hash: "7df07aea83bc5c3213e7871854661820"
+    }
+    Frame {
+        msec: 1984
+        hash: "4fc1ef611b24ec5737310859b12c83d3"
+    }
+    Frame {
+        msec: 2000
+        hash: "c2f8551d0442d0736b71c54fc965562b"
+    }
+    Frame {
+        msec: 2016
+        hash: "4ec29787e437f9619ce0f0a0f4889d0f"
+    }
+    Frame {
+        msec: 2032
+        hash: "c2f8551d0442d0736b71c54fc965562b"
+    }
+    Frame {
+        msec: 2048
+        hash: "4fc1ef611b24ec5737310859b12c83d3"
+    }
+    Frame {
+        msec: 2064
+        hash: "7df07aea83bc5c3213e7871854661820"
+    }
+    Frame {
+        msec: 2080
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 2096
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 2112
+        hash: "f5c917c7ca26bb916dd4df84eafc8e94"
+    }
+    Frame {
+        msec: 2128
+        hash: "0696257de0441666bd264f8db6383d15"
+    }
+    Frame {
+        msec: 2144
+        hash: "0b43fdee23346c30c60b822a20131cc3"
+    }
+    Frame {
+        msec: 2160
+        hash: "98dbd004cf4809dbc90bfa9272378644"
+    }
+    Frame {
+        msec: 2176
+        hash: "32d0e9005ebb9dfd410d348e336bcd93"
+    }
+    Frame {
+        msec: 2192
+        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
+    }
+    Frame {
+        msec: 2208
+        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
+    }
+    Frame {
+        msec: 2224
+        hash: "6712be93cf1ed2b7b202367418b6d2d7"
+    }
+    Frame {
+        msec: 2240
+        hash: "524840a3453af4e97ac82b559308cce3"
+    }
+    Frame {
+        msec: 2256
+        hash: "11436091b24c02af94dfa75a5fd1a001"
+    }
+    Frame {
+        msec: 2272
+        hash: "d3689b53474b4b26630d70ba01c057b4"
+    }
+    Frame {
+        msec: 2288
+        hash: "16e2b66f28ed80d80d9b5264d89624d5"
+    }
+    Frame {
+        msec: 2304
+        hash: "87636076959de7e5a0a8bd8b31354ed4"
+    }
+    Frame {
+        msec: 2320
+        hash: "a6916da6bfac27aa87d75da2bbb73f31"
+    }
+    Frame {
+        msec: 2336
+        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
+    }
+    Frame {
+        msec: 2352
+        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
+    }
+    Frame {
+        msec: 2368
+        hash: "14d08c2ca430631af8ede1013f4f4da0"
+    }
+    Frame {
+        msec: 2384
+        hash: "ace9db9112d147569dc0cf1a1b680d6c"
+    }
+    Frame {
+        msec: 2400
+        hash: "08bc6815601417f3731eaae398d0861d"
+    }
+    Frame {
+        msec: 2416
+        hash: "809870dfd9b05ce07170edd945348ddf"
+    }
+    Frame {
+        msec: 2432
+        hash: "5784deb0f3270cf7a0d0964cd9d31458"
+    }
+    Frame {
+        msec: 2448
+        hash: "2f06ee407e5175d4b954e31c39c9522c"
+    }
+    Frame {
+        msec: 2464
+        hash: "48a7dbed293fbbd5ea202190837a411f"
+    }
+    Frame {
+        msec: 2480
+        hash: "abf3d90803cfa12d35d2752be7ea02d8"
+    }
+    Frame {
+        msec: 2496
+        hash: "a60edcf8d792f93a839e6ddbafbf993f"
+    }
+    Frame {
+        msec: 2512
+        hash: "7e8dfe86ea0849022355b12578d4cb1a"
+    }
+    Frame {
+        msec: 2528
+        hash: "3c84122b0933ee870f178d39469e51e2"
+    }
+    Frame {
+        msec: 2544
+        hash: "25f463e91febf5b6d8819fd5010bc1c2"
+    }
+    Frame {
+        msec: 2560
+        hash: "d423a9bc912237d0f20b924849ba0cb1"
+    }
+    Frame {
+        msec: 2576
+        hash: "5bd3cc309a5fce6183654975543250b2"
+    }
+    Frame {
+        msec: 2592
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml
new file mode 100644
index 0000000..080d4d0
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml
@@ -0,0 +1,2115 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 32
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 48
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 64
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 80
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 96
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 112
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 128
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 144
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 160
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 176
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 192
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 208
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 224
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 240
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 256
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 272
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 288
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 304
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 320
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 336
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 352
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 197; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 185; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 368
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 169; y: 38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 384
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 161; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 400
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 155; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 147; y: 46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 416
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 141; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 432
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 130; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 127; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 448
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 125; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 123; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 464
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 480
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 121; y: 49
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 496
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 512
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 117; y: 53
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 53
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 528
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 115; y: 54
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 544
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 113; y: 54
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 560
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 111; y: 53
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 111; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 576
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 110; y: 50
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 592
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 109; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 608
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 624
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 640
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 43
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 656
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 672
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 41
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 688
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 704
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 720
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 736
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 752
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 39
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 768
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 37
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 784
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 800
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 816
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 832
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 848
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 864
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 880
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 896
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 106; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 912
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 928
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 944
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 960
+        image: "zooming.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 106; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 992
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1008
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1024
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1040
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1056
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 106; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1072
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1088
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1104
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1120
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 106; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1136
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1152
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1168
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1184
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1200
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1216
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 103; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1232
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 102; y: 46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 50
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1248
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 94; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 62
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1264
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 88; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1280
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1296
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 86; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1312
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 88; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 92; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1328
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 94; y: 146
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1344
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 172
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1360
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 180
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 188
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1376
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 193
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1392
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 195
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 197
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1408
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 198
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1424
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 94; y: 201
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 94; y: 202
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1440
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 94; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1456
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 93; y: 205
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1472
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 92; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1488
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 92; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1504
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 92; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1520
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 92; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 212
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1536
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1552
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1568
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1584
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1600
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1616
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1632
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1648
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1664
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1680
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1696
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1712
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 91; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1728
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1744
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1760
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1776
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 91; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1792
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1808
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1824
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1840
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 91; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1856
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1872
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1888
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1904
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1920
+        image: "zooming.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 91; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1952
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1968
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 1984
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2000
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2016
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2032
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2048
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2064
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2080
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2096
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2112
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2128
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 212
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2144
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2160
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2176
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2192
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2208
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 88; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2224
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2240
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 86; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2256
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 85; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2272
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 80; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2288
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 77; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2304
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 69; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2320
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 64; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2336
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 60; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 58; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2352
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 56; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 212
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2368
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2384
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2400
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2416
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2432
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2448
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2464
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2480
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 56; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2496
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 58; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2512
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 215
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2528
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2544
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2560
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2576
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2592
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 64; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 64; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2608
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2624
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2640
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2656
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2672
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 63; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 63; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2688
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2704
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2720
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2736
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2752
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 62; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2768
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2784
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2800
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2816
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 62; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2832
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2848
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 2864
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 215
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2880
+        image: "zooming.2.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2896
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2912
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 212
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 211
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2928
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 209
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 64; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2944
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 202
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 198
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2960
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 72; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 186
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2976
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 76; y: 180
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 80; y: 170
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2992
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 162
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 88; y: 152
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3008
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 94; y: 142
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 130
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3024
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 102; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3040
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 112; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 114; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3056
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 122; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3072
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 126; y: 66
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 128; y: 58
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3088
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 132; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 134; y: 46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3104
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 136; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 140; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3120
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 150; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3136
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 154; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 160; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3152
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3168
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3184
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3200
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3216
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3232
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3248
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3264
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3280
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3296
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3312
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3328
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3344
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3360
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3376
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3392
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3408
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3424
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3440
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3456
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3472
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3488
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3504
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3520
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3536
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3552
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3568
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3584
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3600
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3616
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3632
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3648
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3664
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3680
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3696
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3712
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3728
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3744
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3760
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3776
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+    Frame {
+        msec: 3792
+        hash: "c98df558c41f1837398eead42392b780"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
index 1617bda..5e55d46 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     width: 200
     height: 250
     url: "resolution.html"
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
index e46f726..a8e5b59 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 Rectangle {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     width: 200
     height: 250
     clip: true
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
index e9189db..fe33f3f 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     width: 200 * zoomFactor
     height: 250 * zoomFactor
     scale: 1/zoomFactor
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
index 52222be..43551e5 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
@@ -2,6 +2,7 @@ import QtQuick 1.0
 import org.webkit 1.0
 
 WebView {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     width: 200
     height: 250
     url: "zoomTextOnly.html"
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
index dc973c2..6cfd5eb 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
@@ -5,6 +5,7 @@ import org.webkit 1.0
 // control of rendering to avoid excessive re-rendering during
 // zoom animations. This test is written for simplicity.
 WebView {
+    property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
     width: 200
     height: 250
     Behavior on x { NumberAnimation { } }
-- 
cgit v0.12


From 3e6349e6b23d1ac5a8991370f0866ebd95556111 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 29 Oct 2010 15:58:48 +1000
Subject: Update visual tests for Mac

Task-number: QTBUG-14792
---
 .../qdeclarativetext/font/data-MAC/plaintext.0.png     | Bin 0 -> 98050 bytes
 .../qdeclarativetext/font/data-MAC/plaintext.qml       |  11 +++++++++++
 .../qdeclarativetext/font/data-MAC/richtext.0.png      | Bin 0 -> 125068 bytes
 .../qdeclarativetext/font/data-MAC/richtext.qml        |  11 +++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
new file mode 100644
index 0000000..6c610ea
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
new file mode 100644
index 0000000..fdf2310
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
new file mode 100644
index 0000000..c4c56f3
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml
new file mode 100644
index 0000000..3da391d
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "richtext.0.png"
+    }
+}
-- 
cgit v0.12


From 5ad00389fd411992b042c07990dd681018f58c36 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Fri, 29 Oct 2010 14:10:11 +1000
Subject: Remove unnecessary QML import project dependency to Symbian
 deployment pri file used by Qt demos

Task-number: QT-4197
Reviewed-by: Jason Barron

* breaks compilation of releases that omit Qt demos directory
* qt import plugins have different deployment configuration than demo applications
* declarative import plugins already get their symbian-related settings from src\imports\qimportbase.pri
   that is basically a copy from qpluginbase.pri written for plugins
---
 src/imports/folderlistmodel/folderlistmodel.pro | 1 -
 src/imports/gestures/gestures.pro               | 1 -
 src/imports/particles/particles.pro             | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index b2e5360..8964ab0 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -15,7 +15,6 @@ qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 symbian:{
     TARGET.UID3 = 0x20021320
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 
     isEmpty(DESTDIR):importFiles.sources = qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir
     else:importFiles.sources = $$DESTDIR/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro
index 18ffcb9..a4c914d 100644
--- a/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@ -15,7 +15,6 @@ qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 symbian:{
     TARGET.UID3 = 0x2002131F
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     
     isEmpty(DESTDIR):importFiles.sources = qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir
     else:importFiles.sources = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index a3eb0d1..bb9da01 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -19,7 +19,6 @@ qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 symbian:{
     TARGET.UID3 = 0x2002131E
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     
     isEmpty(DESTDIR):importFiles.sources = qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir
     else:importFiles.sources = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir
-- 
cgit v0.12


From 2ce656569946f31d0da6b4f5877b69d7afe06d93 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 29 Oct 2010 18:03:21 +1000
Subject: Update webview visual tests to new skip mode

New mode requires them to at least compile.
Now that I've noticed this, removing that check on compile failures in
QDeclarativeTester.

Task-number: QTBUG-14792
---
 .../auto/declarative/qmlvisual/webview/autosize/autosize.qml |  2 +-
 .../qmlvisual/webview/javascript/evaluateJavaScript.qml      |  2 +-
 .../qmlvisual/webview/javascript/windowObjects.qml           |  2 +-
 .../declarative/qmlvisual/webview/settings/fontFamily.qml    |  2 +-
 .../auto/declarative/qmlvisual/webview/settings/fontSize.qml |  2 +-
 .../qmlvisual/webview/settings/noAutoLoadImages.qml          |  2 +-
 .../declarative/qmlvisual/webview/settings/setFontFamily.qml |  2 +-
 .../auto/declarative/qmlvisual/webview/zooming/pageWidth.qml | 12 ++++++------
 .../declarative/qmlvisual/webview/zooming/renderControl.qml  |  2 +-
 .../declarative/qmlvisual/webview/zooming/resolution.qml     |  4 +++-
 .../declarative/qmlvisual/webview/zooming/zoomTextOnly.qml   |  4 +++-
 tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml |  2 +-
 tools/qml/qdeclarativetester.cpp                             |  6 ++----
 13 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
index d3b4e6b..1cd0c7b 100644
--- a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 // The WebView size is determined by the width, height,
 // preferredWidth, and preferredHeight properties.
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
index 916aa99..9ea2b64 100644
--- a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 Column {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
index 250c80d..0b78539 100644
--- a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 Column {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
index df08666..7c32704 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 WebView {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
index 2403616..988ff64 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 Grid {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
index ec503bf..c465be8 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 Grid {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
index f353fb4..11de161 100644
--- a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 WebView {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
index 5e55d46..a2b11ac 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
@@ -1,11 +1,11 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 WebView {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
-    width: 200
-    height: 250
-    url: "resolution.html"
-    webPageWidth: 400
-    preferredWidth: 200
+    //width: 200
+    //height: 250
+    //url: "resolution.html"
+   // webPageWidth: 400
+   // preferredWidth: 200
 }
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
index a8e5b59..c07f1e1 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 Rectangle {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
index fe33f3f..cf5f50f 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
@@ -1,8 +1,9 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 WebView {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
+    /*
     width: 200 * zoomFactor
     height: 250 * zoomFactor
     scale: 1/zoomFactor
@@ -14,4 +15,5 @@ WebView {
         NumberAnimation { from: 1; to: 5; duration: 2000 }
         NumberAnimation { from: 5; to: 1; duration: 2000 }
     }
+    */
 }
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
index 43551e5..03c925f 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 WebView {
     property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
@@ -7,9 +7,11 @@ WebView {
     height: 250
     url: "zoomTextOnly.html"
     settings.zoomTextOnly: true
+    /*
     SequentialAnimation on zoomFactor {
         loops: Animation.Infinite
         NumberAnimation { from: 2; to: 0.25; duration: 1000 }
         NumberAnimation { from: 0.25; to: 2; duration: 1000 }
     }
+    */
 }
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
index 6cfd5eb..03fd780 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
 
 // Note that zooming is better done using zoomFactor and careful
 // control of rendering to avoid excessive re-rendering during
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index a0ef4a1..67ea03d 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -128,10 +128,8 @@ void QDeclarativeTester::executefailure()
 {
     hasFailed = true;
 
-    if (options & QDeclarativeViewer::ExitOnFailure){
-        testSkip();
-        exit(hasFailed?-1:0);
-    }
+    if (options & QDeclarativeViewer::ExitOnFailure)
+        exit(-1);
 }
 
 void QDeclarativeTester::imagefailure()
-- 
cgit v0.12


From 60948c48adc376cefa774bd101de34c60db52dea Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Fri, 29 Oct 2010 10:23:07 +0200
Subject: QNAM: Fix doc rendering of QNetworkRequest

Reviewed-by: Morten Engvoldsen
---
 src/network/access/qnetworkrequest.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index d3084cf..b761af5 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -194,16 +194,12 @@ QT_BEGIN_NAMESPACE
     \value CookieLoadControlAttribute
         Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic)
         Indicates whether to send 'Cookie' headers in the request.
-
         This attribute is set to false by QtWebKit when creating a cross-origin
         XMLHttpRequest where withCredentials has not been set explicitly to true by the
         Javascript that created the request.
-
         See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag}{here} for more information.
-
         (This value was introduced in 4.7.)
 
-
     \value CookieSaveControlAttribute
         Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic)
         Indicates whether to save 'Cookie' headers received from the server in reply
@@ -211,9 +207,7 @@ QT_BEGIN_NAMESPACE
         This attribute is set to false by QtWebKit when creating a cross-origin
         XMLHttpRequest where withCredentials has not been set explicitly to true by the
         Javascript that created the request.
-
         See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information.
-
         (This value was introduced in 4.7.)
 
     \value AuthenticationReuseAttribute
@@ -225,16 +219,12 @@ QT_BEGIN_NAMESPACE
         This attribute is set to QNetworkRequest::Manual by QtWebKit when creating a cross-origin
         XMLHttpRequest where withCredentials has not been set explicitly to true by the
         Javascript that created the request.
-
         See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information.
-
         (This value was introduced in 4.7.)
 
     \omitvalue MaximumDownloadBufferSizeAttribute
-        (This value was introduced in 4.7.)
 
     \omitvalue DownloadBufferAttribute
-        (This value was introduced in 4.7.)
 
     \value User
         Special type. Additional information can be passed in
-- 
cgit v0.12


From 177960b77ce7b02b853c45278b7c7068783be49f Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Fri, 29 Oct 2010 12:52:21 +0300
Subject: Support tactile feeedback from QS60Style for QWidgets

Currently tactile feedback is not given for QWidgets running on Symbian
even if the native side supports this (Sym^3 and 5th Edition devices).

This task adds support for QWidgets having QS60Style. The tactile
feedback has been implemented as a plugin that the style loads when
instantiating itself for touch devices. NOTE that the feedback
is NOT supported by the emulated style, nor is the plugin interface
public, so it cannot be used outside of style.

The implementation is simplistic, since we only want to provide
stop-gap solution until 4.8 when real Qt feedback implementation
is ready. The implementation will only give feedback for touch-down
events for visible, interactive and enabled widgets. Sliders and
scrollbars will use sensitive feedback (slightly less aggressive)
and all others will use basic feedback. Note that Sym^3 adds tens
of different feedback categories, which this plugin ignores
as we want to share the same implementation for Sym^3 and 5th ed.

In distributed Qt package there is no tactile feedback for 5th edition,
due to package creation limitations. Support can be added manually by
re-compiling Qt on top of 5th Edition SDK.

Task-number: QT-4037
Reviewed-by: Jani Hautakangas
Reviewed-by: Janne Koskinen
---
 src/gui/styles/qs60style.cpp                      |  5 +-
 src/gui/styles/qs60style_feedbackinterface_p.h    | 50 ++++++++++++++
 src/gui/styles/qs60style_p.h                      |  4 ++
 src/gui/styles/qs60style_s60.cpp                  | 24 ++++++-
 src/plugins/s60/feedback/feedback.pro             | 16 +++++
 src/plugins/s60/feedback/qtactileFeedback.h       | 54 +++++++++++++++
 src/plugins/s60/feedback/qtactileFeedback_s60.cpp | 83 +++++++++++++++++++++++
 src/plugins/s60/s60.pro                           |  4 ++
 src/s60installs/qt.iby                            |  5 ++
 src/s60installs/s60installs.pro                   |  6 ++
 10 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 src/gui/styles/qs60style_feedbackinterface_p.h
 create mode 100644 src/plugins/s60/feedback/feedback.pro
 create mode 100644 src/plugins/s60/feedback/qtactileFeedback.h
 create mode 100644 src/plugins/s60/feedback/qtactileFeedback_s60.cpp

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index ca3a9d0..d39a2ba 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -3424,8 +3424,11 @@ bool QS60Style::eventFilter(QObject *object, QEvent *event)
                         qobject_cast<QCheckBox *>(w))
                     d->m_pressedWidget = w;
 
-                if ( d->m_pressedWidget)
+                if (d->m_pressedWidget)
                     d->m_pressedWidget->update();
+#ifdef Q_WS_S60
+                d->touchFeedback(event, w);
+#endif
             }
             break;
         }
diff --git a/src/gui/styles/qs60style_feedbackinterface_p.h b/src/gui/styles/qs60style_feedbackinterface_p.h
new file mode 100644
index 0000000..81fcdc3
--- /dev/null
+++ b/src/gui/styles/qs60style_feedbackinterface_p.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QObject>
+
+class TactileFeedbackInterface : public QObject
+{
+    public:
+        virtual void touchFeedback(QEvent *event, const QWidget *widget) = 0;
+};
+
+Q_DECLARE_INTERFACE(TactileFeedbackInterface, "com.trolltech.Qt.TactileFeedbackInterface/1.0")
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index b3f4160..b46f75e 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -387,6 +387,7 @@ private: //data members
 class QFocusFrame;
 class QProgressBar;
 class QS60StyleAnimation;
+class TactileFeedbackInterface;
 
 // Private class
 #ifdef Q_OS_SYMBIAN
@@ -572,6 +573,8 @@ public:
     void stopAnimation(QS60StyleEnums::SkinParts animation);
     static QS60StyleAnimation* animationDefinition(QS60StyleEnums::SkinParts part);
     static void removeAnimations();
+    //No support for tactile feedback in emulated style
+    void touchFeedback(QEvent *event, const QWidget *widget);
 
 #endif
 
@@ -626,6 +629,7 @@ private:
 #ifdef Q_WS_S60
     //list of progress bars having animation running
     QList<QProgressBar *> m_bars;
+    TactileFeedbackInterface *m_feedbackPlugin;
 #endif
 
 };
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 5dda42e..a1ea308 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -49,6 +49,10 @@
 #include "private/qcore_symbian_p.h"
 #include "qapplication.h"
 
+#include "qpluginloader.h"
+#include "qlibraryinfo.h"
+#include "private/qs60style_feedbackinterface_p.h"
+
 #include <w32std.h>
 #include <AknsConstants.h>
 #include <aknconsts.h>
@@ -1143,13 +1147,25 @@ void QS60StylePrivate::setActiveLayout()
 
 Q_GLOBAL_STATIC(QList<QS60StyleAnimation *>, m_animations)
 
-QS60StylePrivate::QS60StylePrivate()
+QS60StylePrivate::QS60StylePrivate() : m_feedbackPlugin(0)
 {
     //Animation defaults need to be created when style is instantiated
     QS60StyleAnimation* progressBarAnimation = new QS60StyleAnimation(QS60StyleEnums::SP_QgnGrafBarWaitAnim, 7, 100);
     m_animations()->append(progressBarAnimation);
     // No need to set active layout, if dynamic metrics API is available
     setActiveLayout();
+
+    //Tactile feedback plugin is only available for touch devices.
+    if (isTouchSupported()) {
+        QString pluginsPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        pluginsPath += QLatin1String("/feedback/qtactilefeedback.dll");
+
+        // Create plugin loader
+        QPluginLoader pluginLoader(pluginsPath);
+        // Load plugin and store pointer to the plugin implementation
+        if (pluginLoader.load())
+            m_feedbackPlugin = qobject_cast<TactileFeedbackInterface*>(pluginLoader.instance());
+    }
 }
 
 void QS60StylePrivate::removeAnimations()
@@ -1439,6 +1455,12 @@ void QS60StylePrivate::stopAnimation(QS60StyleEnums::SkinParts animationPart)
     }
 }
 
+void QS60StylePrivate::touchFeedback(QEvent *event, const QWidget *widget)
+{
+    if (m_feedbackPlugin)
+        m_feedbackPlugin->touchFeedback(event, widget);
+}
+
 QVariant QS60StyleModeSpecifics::themeDefinition(
     QS60StyleEnums::ThemeDefinitions definition, QS60StyleEnums::SkinParts part)
 {
diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro
new file mode 100644
index 0000000..32ddf6f
--- /dev/null
+++ b/src/plugins/s60/feedback/feedback.pro
@@ -0,0 +1,16 @@
+include(../../qpluginbase.pri)
+
+TARGET = qtactilefeedback$${QT_LIBINFIX}
+
+INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
+contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
+    HEADERS += qtactileFeedback.h
+    SOURCES += qtactileFeedback_s60.cpp
+
+    LIBS += -ltouchfeedback
+}
+
+load(data_caging_paths)
+
+TARGET.UID3=0x200315B4
diff --git a/src/plugins/s60/feedback/qtactileFeedback.h b/src/plugins/s60/feedback/qtactileFeedback.h
new file mode 100644
index 0000000..7c4cc29
--- /dev/null
+++ b/src/plugins/s60/feedback/qtactileFeedback.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QEvent>
+#include <QWidget>
+
+#include "private/qs60style_feedbackinterface_p.h"
+
+class QTactileFeedback : public TactileFeedbackInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(TactileFeedbackInterface)
+
+    public:
+        void touchFeedback(QEvent *event, const QWidget *widget);
+ };
diff --git a/src/plugins/s60/feedback/qtactileFeedback_s60.cpp b/src/plugins/s60/feedback/qtactileFeedback_s60.cpp
new file mode 100644
index 0000000..c2f1d34
--- /dev/null
+++ b/src/plugins/s60/feedback/qtactileFeedback_s60.cpp
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QObject>
+#include <QSlider>
+#include <QScrollBar>
+
+#include <QtCore/qplugin.h>
+#include "qtactileFeedback.h"
+
+#include <touchfeedback.h>
+
+void QTactileFeedback::touchFeedback(QEvent *event, const QWidget *widget)
+{
+    //Lets share the global instance for touch feedback (you are NOT allowed to try and delete it!).
+    MTouchFeedback* feedback = MTouchFeedback::Instance();
+
+    //If the widget itself is not handling focus, try to use focusProxy widget.
+    const QWidget *w = ((widget->focusPolicy() == Qt::NoFocus) && (widget->focusProxy())) ? widget->focusProxy() : widget;
+
+    //Only give tactile feedback for enabled widgets that take focus.
+    if (feedback && w && w->isEnabled() && w->isWidgetType() && w->isVisible()) {
+        //Scrollbars are 'special' that they don't take focus (nor they have focusProxy), yet we'd like to have tactile feedback for them
+        if (w->focusPolicy() == Qt::NoFocus)
+            if (!qobject_cast<const QScrollBar *>(w))
+                return;
+
+        //Don't give tactile feedback for widgets that are outside topmost dialog.
+        QWidget *dialog = QApplication::activeModalWidget();
+        if (dialog) {
+            QList<const QWidget *> allChildren = dialog->findChildren<const QWidget *>();
+            if (!allChildren.contains(w))
+                return;
+        }
+
+        //Widget specific tactile feedback.
+        if (qobject_cast<const QSlider *>(w) || qobject_cast<const QScrollBar *>(w))
+            feedback->InstantFeedback(ETouchFeedbackSensitive);
+        else
+            feedback->InstantFeedback(ETouchFeedbackBasic);
+    }
+}
+
+Q_EXPORT_PLUGIN2("feedback", QTactileFeedback);
diff --git a/src/plugins/s60/s60.pro b/src/plugins/s60/s60.pro
index c999fff..ffcd170 100644
--- a/src/plugins/s60/s60.pro
+++ b/src/plugins/s60/s60.pro
@@ -6,6 +6,10 @@ symbian {
         SUBDIRS += 3_1 3_2
     }
 
+    contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
+        SUBDIRS += feedback
+    }
+
     # 5.0 is used also for Symbian3 and later
     SUBDIRS += 5_0
 }
\ No newline at end of file
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby
index 4afbf05..2b3be0a 100644
--- a/src/s60installs/qt.iby
+++ b/src/s60installs/qt.iby
@@ -60,6 +60,8 @@ file=ABI_DIR\BUILD_DIR\qsymbianbearer.dll    SHARED_LIB_DIR\qsymbianbearer.dll
 // so don't bother including those plugins
 file=ABI_DIR\BUILD_DIR\qts60plugin_5_0.dll   SHARED_LIB_DIR\qts60plugin_5_0.dll
 
+file=ABI_DIR\BUILD_DIR\qtactilefeedback.dll   SHARED_LIB_DIR\qtactilefeedback.dll
+
 S60_APP_RESOURCE(s60main)
 
 // imageformats stubs
@@ -105,6 +107,9 @@ data=\epoc32\data\z\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplug
 // bearer stub
 data=\epoc32\data\z\resource\qt\plugins\bearer\qsymbianbearer.qtplugin resource\qt\plugins\bearer\qsymbianbearer.qtplugin
 
+// feedback
+data=\epoc32\data\z\resource\qt\plugins\feedback\qtactilefeedback.qtplugin              resource\qt\plugins\feedback\qtactilefeedback.qtplugin
+
 // Stub sis file
 data=ZSYSTEM\install\qt_stub.sis    System\Install\qt_stub.sis
 data=ZSYSTEM\install\qtwebkit_stub.sis    System\Install\qtwebkit_stub.sis
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 9559da6..23b3d8f 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -86,6 +86,12 @@ symbian: {
         bearer_plugin.path = c:$$QT_PLUGINS_BASE_DIR/bearer
         DEPLOYMENT += bearer_plugin
     }
+    
+    contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
+        feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll
+        feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback
+        DEPLOYMENT += feedback_plugin
+    }
 
     qtlibraries.pkg_postrules += qts60plugindeployment
 
-- 
cgit v0.12


From c76f9f15d1c604cdf3d68d2147a4a06d227871fa Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Thu, 28 Oct 2010 09:27:24 +0200
Subject: Fix possible crash in QStaticText and QDeclarativeTextLayout

The QStaticTextItem held an uncounted reference to QFontEngine. The
pointer would dangle in some cases where there was no font object
referencing the engine and the cache was cleaned out (e.g. when a
new application font is added.) Properly count the reference, and also
add reference counting to userData to make it harder to shoot yourself
in the foot, since the QStaticTextItem class is now being used in
different places,

Task-number: QTBUG-14446
Reviewed-by: Martin Jones
---
 .../graphicsitems/qdeclarativetextlayout.cpp       |  4 +-
 src/gui/painting/qpaintengine_raster.cpp           |  2 +-
 src/gui/painting/qpainter.cpp                      |  4 +-
 src/gui/text/qstatictext.cpp                       | 22 ++++++++-
 src/gui/text/qstatictext_p.h                       | 54 ++++++++++++++++++----
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 24 +++++-----
 src/opengl/qpaintengine_opengl.cpp                 |  8 ++--
 src/openvg/qpaintengine_vg.cpp                     |  2 +-
 8 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
index 89a2158..635ceab 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
@@ -94,7 +94,7 @@ class DrawTextItemRecorder: public QPaintEngine
             if (!m_inertText->items.isEmpty()) {
                 QStaticTextItem &last = m_inertText->items[m_inertText->items.count() - 1];
 
-                if (last.fontEngine == ti.fontEngine && last.font == ti.font() && 
+                if (last.fontEngine() == ti.fontEngine && last.font == ti.font() &&
                     (!m_dirtyPen || last.color == state->pen().color())) {
                     needFreshCurrentItem = false;
 
@@ -107,7 +107,7 @@ class DrawTextItemRecorder: public QPaintEngine
             if (needFreshCurrentItem) {
                 QStaticTextItem currentItem;
 
-                currentItem.fontEngine = ti.fontEngine;
+                currentItem.setFontEngine(ti.fontEngine);
                 currentItem.font = ti.font();
                 currentItem.charOffset = charOffset;
                 currentItem.numChars = ti.num_chars;
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 8f9d8ba..d4b044b 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3300,7 +3300,7 @@ void QRasterPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
     ensureState();
 
     drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->glyphPositions,
-                     textItem->fontEngine);
+                     textItem->fontEngine());
 }
 
 /*!
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 7fed7e4..ab9707d 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5746,7 +5746,7 @@ void QPainterPrivate::drawGlyphs(const quint32 *glyphArray, const QPointF *posit
         QStaticTextItem staticTextItem;
         staticTextItem.color = state->pen.color();
         staticTextItem.font = state->font;
-        staticTextItem.fontEngine = fontEngine;
+        staticTextItem.setFontEngine(fontEngine);
         staticTextItem.numGlyphs = glyphCount;
         staticTextItem.glyphs = reinterpret_cast<glyph_t *>(const_cast<glyph_t *>(glyphArray));
         staticTextItem.glyphPositions = positions.data();
@@ -5938,7 +5938,7 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText
         d->extended->drawStaticTextItem(item);
 
         drawDecorationForGlyphs(this, item->glyphs, item->glyphPositions,
-                                item->numGlyphs, item->fontEngine, staticText_d->font,
+                                item->numGlyphs, item->fontEngine(), staticText_d->font,
                                 QTextCharFormat());
     }
     if (currentColor != oldPen.color())
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 9506006..edf248a 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -445,7 +445,7 @@ namespace {
             const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
 
             QStaticTextItem currentItem;
-            currentItem.fontEngine = ti.fontEngine;
+            currentItem.setFontEngine(ti.fontEngine);
             currentItem.font = ti.font();
             currentItem.charOffset = m_chars.size();
             currentItem.numChars = ti.num_chars;
@@ -713,4 +713,24 @@ void QStaticTextPrivate::init()
     needsRelayout = false;
 }
 
+QStaticTextItem::~QStaticTextItem()
+{
+    if (m_userData != 0 && !m_userData->ref.deref())
+        delete m_userData;
+    if (!m_fontEngine->ref.deref())
+        delete m_fontEngine;
+}
+
+void QStaticTextItem::setFontEngine(QFontEngine *fe)
+{
+    if (m_fontEngine != 0) {
+        if (!m_fontEngine->ref.deref())
+            delete m_fontEngine;
+    }
+
+    m_fontEngine = fe;
+    if (m_fontEngine != 0)
+        m_fontEngine->ref.ref();
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index cb60626..87ef0d5 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -68,27 +68,60 @@ public:
         OpenGLUserData
     };
 
-    QStaticTextUserData(Type t) : type(t) {}
+    QStaticTextUserData(Type t) : type(t) { ref = 0; }
     virtual ~QStaticTextUserData() {}
 
+    QAtomicInt ref;
     Type type;
 };
 
 class Q_GUI_EXPORT QStaticTextItem
 {
 public:    
-    QStaticTextItem() : chars(0), numChars(0), fontEngine(0), userData(0),
-                        useBackendOptimizations(false), userDataNeedsUpdate(0) {}
-    ~QStaticTextItem() { delete userData; }
+    QStaticTextItem() : chars(0), numChars(0), useBackendOptimizations(false),
+                        userDataNeedsUpdate(0), m_fontEngine(0), m_userData(0) {}
+
+    QStaticTextItem(const QStaticTextItem &other)
+    {
+        operator=(other);
+    }
+
+    void operator=(const QStaticTextItem &other)
+    {
+        glyphPositions = other.glyphPositions;
+        glyphs = other.glyphs;
+        chars = other.chars;
+        numGlyphs = other.numGlyphs;
+        numChars = other.numChars;
+        font = other.font;
+        color = other.color;
+        useBackendOptimizations = other.useBackendOptimizations;
+        userDataNeedsUpdate = other.userDataNeedsUpdate;
+
+        m_fontEngine = 0;
+        m_userData = 0;
+        setUserData(other.userData());
+        setFontEngine(other.fontEngine());
+    }
+
+    ~QStaticTextItem();
 
     void setUserData(QStaticTextUserData *newUserData)
     {
-        if (userData == newUserData)
+        if (m_userData == newUserData)
             return;
 
-        delete userData;
-        userData = newUserData;
+        if (m_userData != 0 && !m_userData->ref.deref())
+            delete m_userData;
+
+        m_userData = newUserData;
+        if (m_userData != 0)
+            m_userData->ref.ref();
     }
+    QStaticTextUserData *userData() const { return m_userData; }
+
+    void setFontEngine(QFontEngine *fe);
+    QFontEngine *fontEngine() const { return m_fontEngine; }
 
     union {
         QFixedPoint *glyphPositions;             // 8 bytes per glyph
@@ -108,14 +141,17 @@ public:
                                                  // 12 bytes for pointers
     int numGlyphs;                               // 4 bytes per item
     int numChars;                                // 4 bytes per item
-    QFontEngine *fontEngine;                     // 4 bytes per item
     QFont font;                                  // 8 bytes per item
     QColor color;                                // 10 bytes per item
-    QStaticTextUserData *userData;               // 8 bytes per item
     char useBackendOptimizations : 1;            // 1 byte per item
     char userDataNeedsUpdate : 1;                //
                                                  // ================
                                                  // 51 bytes per item
+
+private: // Needs special handling in setters, so private to avoid abuse
+    QFontEngine *m_fontEngine;                     // 4 bytes per item
+    QStaticTextUserData *m_userData;               // 8 bytes per item
+
 };
 
 class QStaticText;
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 84c7fed..1dcb773 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1350,8 +1350,8 @@ void QGL2PaintEngineEx::drawStaticTextItem(QStaticTextItem *textItem)
 
     ensureActive();
 
-    QFontEngineGlyphCache::Type glyphType = textItem->fontEngine->glyphFormat >= 0
-                                            ? QFontEngineGlyphCache::Type(textItem->fontEngine->glyphFormat)
+    QFontEngineGlyphCache::Type glyphType = textItem->fontEngine()->glyphFormat >= 0
+                                            ? QFontEngineGlyphCache::Type(textItem->fontEngine()->glyphFormat)
                                             : d->glyphCacheType;
     if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) {
         if (d->device->alphaRequested() || state()->matrix.type() > QTransform::TxTranslate
@@ -1430,7 +1430,7 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
         {
             QStaticTextItem staticTextItem;
             staticTextItem.chars = const_cast<QChar *>(ti.chars);
-            staticTextItem.fontEngine = ti.fontEngine;
+            staticTextItem.setFontEngine(ti.fontEngine);
             staticTextItem.glyphs = glyphs.data();
             staticTextItem.numChars = ti.num_chars;
             staticTextItem.numGlyphs = glyphs.size();
@@ -1475,18 +1475,18 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
     QOpenGL2PaintEngineState *s = q->state();
 
     QGLTextureGlyphCache *cache =
-        (QGLTextureGlyphCache *) staticTextItem->fontEngine->glyphCache(ctx, glyphType, QTransform());
+        (QGLTextureGlyphCache *) staticTextItem->fontEngine()->glyphCache(ctx, glyphType, QTransform());
     if (!cache || cache->cacheType() != glyphType) {
         cache = new QGLTextureGlyphCache(ctx, glyphType, QTransform());
-        staticTextItem->fontEngine->setGlyphCache(ctx, cache);
+        staticTextItem->fontEngine()->setGlyphCache(ctx, cache);
     }
 
     bool recreateVertexArrays = false;
     if (staticTextItem->userDataNeedsUpdate)
         recreateVertexArrays = true;
-    else if (staticTextItem->userData == 0)
+    else if (staticTextItem->userData() == 0)
         recreateVertexArrays = true;
-    else if (staticTextItem->userData->type != QStaticTextUserData::OpenGLUserData)
+    else if (staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData)
         recreateVertexArrays = true;
 
     // We only need to update the cache with new glyphs if we are actually going to recreate the vertex arrays.
@@ -1494,8 +1494,8 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
     // cache so this text is performed before we test if the cache size has changed.
     if (recreateVertexArrays) {
         cache->setPaintEnginePrivate(this);
-        cache->populate(staticTextItem->fontEngine, staticTextItem->numGlyphs, staticTextItem->glyphs,
-                        staticTextItem->glyphPositions);
+        cache->populate(staticTextItem->fontEngine(), staticTextItem->numGlyphs,
+                        staticTextItem->glyphs, staticTextItem->glyphPositions);
     }
 
     if (cache->width() == 0 || cache->height() == 0)
@@ -1515,14 +1515,14 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
     if (staticTextItem->useBackendOptimizations) {
         QOpenGLStaticTextUserData *userData = 0;
 
-        if (staticTextItem->userData == 0
-            || staticTextItem->userData->type != QStaticTextUserData::OpenGLUserData) {
+        if (staticTextItem->userData() == 0
+            || staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData) {
 
             userData = new QOpenGLStaticTextUserData();
             staticTextItem->setUserData(userData);
 
         } else {
-            userData = static_cast<QOpenGLStaticTextUserData*>(staticTextItem->userData);
+            userData = static_cast<QOpenGLStaticTextUserData*>(staticTextItem->userData());
         }
 
         // Use cache if backend optimizations is turned on
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 74b6b9a..a04d930 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -4918,7 +4918,7 @@ void QOpenGLPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
     d->flushDrawQueue();
 
     // make sure the glyphs we want to draw are in the cache
-    qt_glyph_cache()->cacheGlyphs(d->device->context(), textItem->fontEngine, textItem->glyphs,
+    qt_glyph_cache()->cacheGlyphs(d->device->context(), textItem->fontEngine(), textItem->glyphs,
                                   textItem->numGlyphs);
 
     d->setGradientOps(Qt::SolidPattern, QRectF()); // turns off gradient ops
@@ -4941,13 +4941,13 @@ void QOpenGLPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
 
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    bool antialias = !(textItem->fontEngine->fontDef.styleStrategy & QFont::NoAntialias)
+    bool antialias = !(textItem->fontEngine()->fontDef.styleStrategy & QFont::NoAntialias)
 				   && (d->matrix.type() > QTransform::TxTranslate);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, antialias ? GL_LINEAR : GL_NEAREST);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, antialias ? GL_LINEAR : GL_NEAREST);
 
     for (int i=0; i< textItem->numGlyphs; ++i) {
-        QGLGlyphCoord *g = qt_glyph_cache()->lookup(textItem->fontEngine, textItem->glyphs[i]);
+        QGLGlyphCoord *g = qt_glyph_cache()->lookup(textItem->fontEngine(), textItem->glyphs[i]);
 
         // we don't cache glyphs with no width/height
         if (!g)
@@ -5003,7 +5003,7 @@ void QOpenGLPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte
     {
         QStaticTextItem staticTextItem;
         staticTextItem.chars = const_cast<QChar *>(ti.chars);
-        staticTextItem.fontEngine = ti.fontEngine;
+        staticTextItem.setFontEngine(ti.fontEngine);
         staticTextItem.glyphs = glyphs.data();
         staticTextItem.numChars = ti.num_chars;
         staticTextItem.numGlyphs = glyphs.size();
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index ce9d11a..f8788b0 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -3407,7 +3407,7 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem)
 
 void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
 {
-    drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->font, textItem->fontEngine,
+    drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->font, textItem->fontEngine(),
                      QPointF(0, 0), textItem->glyphPositions);
 }
 
-- 
cgit v0.12


From 30524cf5c745d07372b66df90235bab0080148a3 Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Fri, 29 Oct 2010 13:12:47 +0300
Subject: Support tactile feedback in QWidgets from QS60Style

Addition to previous task. Remove white-space from .pro-file.

Task-number: QT-4037
Reviewed-by: Janne Koskinen
---
 src/s60installs/s60installs.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 23b3d8f..65b8781 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -86,7 +86,7 @@ symbian: {
         bearer_plugin.path = c:$$QT_PLUGINS_BASE_DIR/bearer
         DEPLOYMENT += bearer_plugin
     }
-    
+
     contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
         feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll
         feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback
-- 
cgit v0.12


From 7955c4351e163a98d78cf419b44ab6ce231cb6dc Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani.hautakangas@nokia.com>
Date: Fri, 29 Oct 2010 13:23:45 +0300
Subject: Revert function renaming in QtOpenVG.

Functions were accidentally thought to be in private scope.
Renaming broke BC.

Reviewed-by: Jason Barron
---
 src/openvg/qpixmapdata_vg.cpp | 18 +++++++++---------
 src/openvg/qpixmapdata_vg_p.h |  4 ++--
 src/openvg/qvg_symbian.cpp    |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 724d06d..509882b 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -75,13 +75,13 @@ QVGPixmapData::QVGPixmapData(PixelType type)
 
 QVGPixmapData::~QVGPixmapData()
 {
-    destroyVGImageAndVGContext();
+    destroyImageAndContext();
 #if !defined(QT_NO_EGL)
     qt_vg_unregister_pixmap(this);
 #endif
 }
 
-void QVGPixmapData::destroyVGImages()
+void QVGPixmapData::destroyImages()
 {
     if (inImagePool) {
         QVGImagePool *pool = QVGImagePool::instance();
@@ -100,23 +100,23 @@ void QVGPixmapData::destroyVGImages()
     inImagePool = false;
 }
 
-void QVGPixmapData::destroyVGImageAndVGContext()
+void QVGPixmapData::destroyImageAndContext()
 {
     if (vgImage != VG_INVALID_HANDLE) {
         // We need to have a context current to destroy the image.
 #if !defined(QT_NO_EGL)
         if (context->isCurrent()) {
-            destroyVGImages();
+            destroyImages();
         } else {
             // We don't currently have a widget surface active, but we
             // need a surface to make the context current.  So use the
             // shared pbuffer surface instead.
             context->makeCurrent(qt_vg_shared_surface());
-            destroyVGImages();
+            destroyImages();
             context->lazyDoneCurrent();
         }
 #else
-        destroyVGImages();
+        destroyImages();
 #endif
     }
 #if !defined(QT_NO_EGL)
@@ -301,7 +301,7 @@ VGImage QVGPixmapData::toVGImage()
 #endif
 
     if (recreate && prevSize != QSize(w, h))
-        destroyVGImages();
+        destroyImages();
     else if (recreate)
         cachedOpacity = -1.0f;  // Force opacity image to be refreshed later.
 
@@ -393,7 +393,7 @@ void QVGPixmapData::hibernate()
         return;
 
     forceToImage();
-    destroyVGImageAndVGContext();
+    destroyImageAndContext();
 }
 
 void QVGPixmapData::reclaimImages()
@@ -401,7 +401,7 @@ void QVGPixmapData::reclaimImages()
     if (!inImagePool)
         return;
     forceToImage();
-    destroyVGImages();
+    destroyImages();
 }
 
 Q_DECL_IMPORT extern int qt_defaultDpiX();
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index b8f01eb..7ffdc85 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -171,8 +171,8 @@ protected:
     void forceToImage();
     QImage::Format sourceFormat() const;
 
-    void destroyVGImageAndVGContext();
-    void destroyVGImages();
+    void destroyImageAndContext();
+    void destroyImages();
 };
 
 QT_END_NAMESPACE
diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp
index b6bf858..c608c81 100644
--- a/src/openvg/qvg_symbian.cpp
+++ b/src/openvg/qvg_symbian.cpp
@@ -144,7 +144,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
     if (type == QPixmapData::SgImage && pixmap) {
 #if defined(QT_SYMBIAN_SUPPORTS_SGIMAGE) && !defined(QT_NO_EGL)
         RSgImage *sgImage = reinterpret_cast<RSgImage*>(pixmap);
-        destroyVGImages();
+        destroyImages();
         prevSize = QSize();
 
         VGImage vgImage = sgImageToVGImage(context, *sgImage);
-- 
cgit v0.12


From aaba8c808d02bfd8a5208260320ce522b84954a1 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Fri, 29 Oct 2010 13:57:18 +0200
Subject: Fix memory leak on exit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The confFile was lost if the cache was already gone (e.g. on app exit).
This patch ensures that the confFile is always deleted.

Reviewed-by: João Abecasis
---
 src/corelib/io/qsettings.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 53af822..8ee42e7 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -1231,16 +1231,21 @@ QConfFileSettingsPrivate::~QConfFileSettingsPrivate()
         if (confFiles[i] && !confFiles[i]->ref.deref()) {
             if (confFiles[i]->size == 0) {
                 delete confFiles[i].take();
-            } else if (unusedCache) {
+            } else {
                 if (usedHash)
                     usedHash->remove(confFiles[i]->name);
-                QT_TRY {
-                    // compute a better size?
-                    unusedCache->insert(confFiles[i]->name, confFiles[i].data(),
-                                    10 + (confFiles[i]->originalKeys.size() / 4));
-                    confFiles[i].take();
-                } QT_CATCH(...) {
-                    // out of memory. Do not cache the file.
+                if (unusedCache) {
+                    QT_TRY {
+                        // compute a better size?
+                        unusedCache->insert(confFiles[i]->name, confFiles[i].data(),
+                                        10 + (confFiles[i]->originalKeys.size() / 4));
+                        confFiles[i].take();
+                    } QT_CATCH(...) {
+                        // out of memory. Do not cache the file.
+                        delete confFiles[i].take();
+                    }
+                } else {
+                    // unusedCache is gone - delete the entry to prevent a memory leak
                     delete confFiles[i].take();
                 }
             }
-- 
cgit v0.12


From 9680a442876867ab779023e59e1092268eea74e4 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Fri, 29 Oct 2010 14:04:54 +0200
Subject: Doc: Fixed basic language.

---
 doc/src/index.qdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e42dfca..57fc18a 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -45,7 +45,7 @@
                   <li><a href="how-to-learn-qt.html">How to learn Qt</a></li>
                   <li><a href="tutorials.html">Tutorials</a></li>
                   <li><a href="all-examples.html">Examples</a></li>
-                  <li><a href="qt4-7-intro.html">Whats new in Qt 4.7</a></li>
+                  <li><a href="qt4-7-intro.html">What's new in Qt 4.7</a></li>
                 </ul>
               </div>
             </div>
-- 
cgit v0.12


From c4d715260bd0ed5f3b6d38a63a2659715342c90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 29 Oct 2010 13:37:43 +0200
Subject: Prevented threading related crash in OpenGL module.

If the last shallow copy of a QImage which is cached in the
QGLTextureCache is destroyed in a thread at the same time as the
QGLContext which the texture was initialized in is active in a different
thread, the QImage thread incorrectly tries to make the context active
in two threads at once. To prevent this from happening it's best to
always do the texture clean-up in the main thread.

Task-number: QT-4238
Reviewed-by: Eskil Abrahamsen Blomfeldt
---
 src/opengl/qgl.cpp         |   7 ++-
 src/opengl/qgl_p.h         |  68 +++++++++++++++++---------
 tests/auto/qgl/tst_qgl.cpp | 118 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+), 24 deletions(-)

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index dbd295f..84cfa97 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -127,7 +127,12 @@ Q_GLOBAL_STATIC(QGLDefaultOverlayFormat, defaultOverlayFormatInstance)
 Q_GLOBAL_STATIC(QGLSignalProxy, theSignalProxy)
 QGLSignalProxy *QGLSignalProxy::instance()
 {
-    return theSignalProxy();
+    QGLSignalProxy *proxy = theSignalProxy();
+    if (proxy && proxy->thread() != qApp->thread()) {
+        if (proxy->thread() == QThread::currentThread())
+            proxy->moveToThread(qApp->thread());
+    }
+    return proxy;
 }
 
 
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index f86c77f..18b2765 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -434,20 +434,6 @@ public:
     static void setCurrentContext(QGLContext *context);
 };
 
-// ### make QGLContext a QObject in 5.0 and remove the proxy stuff
-class Q_OPENGL_EXPORT QGLSignalProxy : public QObject
-{
-    Q_OBJECT
-public:
-    QGLSignalProxy() : QObject() {}
-    void emitAboutToDestroyContext(const QGLContext *context) {
-        emit aboutToDestroyContext(context);
-    }
-    static QGLSignalProxy *instance();
-Q_SIGNALS:
-    void aboutToDestroyContext(const QGLContext *context);
-};
-
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGLExtensions::Extensions)
 
 // Temporarily make a context current if not already current or
@@ -490,6 +476,48 @@ private:
     QGLContext *m_ctx;
 };
 
+// ### make QGLContext a QObject in 5.0 and remove the proxy stuff
+class Q_OPENGL_EXPORT QGLSignalProxy : public QObject
+{
+    Q_OBJECT
+public:
+    QGLSignalProxy() : QObject() {
+        qRegisterMetaType<GLuint>("GLuint");
+        connect(this, SIGNAL(freeTexture(QGLContext *, QPixmapData *, GLuint)),
+                this, SLOT(freeTexture_slot(QGLContext *, QPixmapData *, GLuint)));
+    }
+    void emitAboutToDestroyContext(const QGLContext *context) {
+        emit aboutToDestroyContext(context);
+    }
+    void emitFreeTexture(QGLContext *context, QPixmapData *boundPixmap, GLuint id) {
+        emit freeTexture(context, boundPixmap, id);
+    }
+    static QGLSignalProxy *instance();
+Q_SIGNALS:
+    void aboutToDestroyContext(const QGLContext *context);
+    void freeTexture(QGLContext *context, QPixmapData *boundPixmap, GLuint id);
+
+private slots:
+    void freeTexture_slot(QGLContext *context, QPixmapData *boundPixmap, GLuint id) {
+#if defined(Q_WS_X11)
+        if (boundPixmap) {
+            QGLContext *oldContext = const_cast<QGLContext *>(QGLContext::currentContext());
+            context->makeCurrent();
+            // Although glXReleaseTexImage is a glX call, it must be called while there
+            // is a current context - the context the pixmap was bound to a texture in.
+            // Otherwise the release doesn't do anything and you get BadDrawable errors
+            // when you come to delete the context.
+            QGLContextPrivate::unbindPixmapFromTexture(boundPixmap);
+            glDeleteTextures(1, &id);
+            oldContext->makeCurrent();
+            return;
+        }
+#endif
+        QGLShareContextScope scope(context);
+        glDeleteTextures(1, &id);
+    }
+};
+
 class QGLTexture {
 public:
     QGLTexture(QGLContext *ctx = 0, GLuint tx_id = 0, GLenum tx_target = GL_TEXTURE_2D,
@@ -506,16 +534,10 @@ public:
     ~QGLTexture() {
         if (options & QGLContext::MemoryManagedBindOption) {
             Q_ASSERT(context);
-            QGLShareContextScope scope(context);
-#if defined(Q_WS_X11)
-            // Although glXReleaseTexImage is a glX call, it must be called while there
-            // is a current context - the context the pixmap was bound to a texture in.
-            // Otherwise the release doesn't do anything and you get BadDrawable errors
-            // when you come to delete the context.
-            if (boundPixmap)
-                QGLContextPrivate::unbindPixmapFromTexture(boundPixmap);
+#if !defined(Q_WS_X11)
+            QPixmapData *boundPixmap = 0;
 #endif
-            glDeleteTextures(1, &id);
+            QGLSignalProxy::instance()->emitFreeTexture(context, boundPixmap, id);
         }
      }
 
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index e411508..4220b45 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -96,6 +96,7 @@ private slots:
     void shareRegister();
     void qglContextDefaultBindTexture();
     void textureCleanup();
+    void threadImages();
 };
 
 tst_QGL::tst_QGL()
@@ -2253,6 +2254,123 @@ void tst_QGL::textureCleanup()
 #endif
 }
 
+namespace ThreadImages {
+
+class Producer : public QObject
+{
+    Q_OBJECT
+public:
+    Producer()
+    {
+        startTimer(20);
+
+        QThread *thread = new QThread;
+        thread->start();
+
+        connect(this, SIGNAL(destroyed()), thread, SLOT(quit()));
+
+        moveToThread(thread);
+        connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+    }
+
+signals:
+    void imageReady(const QImage &image);
+
+protected:
+    void timerEvent(QTimerEvent *)
+    {
+        QImage image(256, 256, QImage::Format_RGB32);
+        QLinearGradient g(0, 0, 0, 256);
+        g.setColorAt(0, QColor(255, 180, 180));
+        g.setColorAt(1, Qt::white);
+        g.setSpread(QGradient::ReflectSpread);
+
+        QBrush brush(g);
+        brush.setTransform(QTransform::fromTranslate(0, delta));
+        delta += 10;
+
+        QPainter p(&image);
+        p.fillRect(image.rect(), brush);
+
+        if (images.size() > 10)
+            images.removeFirst();
+
+        images.append(image);
+
+        emit imageReady(image);
+    }
+
+private:
+    QList<QImage> images;
+    int delta;
+};
+
+
+class DisplayWidget : public QGLWidget
+{
+    Q_OBJECT
+public:
+    DisplayWidget(QWidget *parent) : QGLWidget(parent) {}
+    void paintEvent(QPaintEvent *)
+    {
+        QPainter p(this);
+        p.drawImage(rect(), m_image);
+    }
+
+public slots:
+    void setImage(const QImage &image)
+    {
+        m_image = image;
+        update();
+    }
+
+private:
+    QImage m_image;
+};
+
+class Widget : public QWidget
+{
+    Q_OBJECT
+public:
+    Widget()
+        : iterations(0)
+        , display(0)
+    {
+        startTimer(400);
+    }
+
+    int iterations;
+
+protected:
+    void timerEvent(QTimerEvent *)
+    {
+        ++iterations;
+
+        delete display;
+        display = new DisplayWidget(this);
+        connect(&producer, SIGNAL(imageReady(const QImage &)), display, SLOT(setImage(const QImage &)));
+
+        display->setGeometry(rect());
+        display->show();
+    }
+
+private:
+    Producer producer;
+    DisplayWidget *display;
+};
+
+}
+
+void tst_QGL::threadImages()
+{
+    ThreadImages::Widget *widget = new ThreadImages::Widget;
+    widget->show();
+
+    while (widget->iterations <= 5) {
+        qApp->processEvents();
+    }
+}
+
 class tst_QGLDummy : public QObject
 {
 Q_OBJECT
-- 
cgit v0.12


From fb94cee1a10c7bfb8e73dd0a094ae71fe96bf3e7 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 29 Oct 2010 14:06:28 +0200
Subject: Fix gcc bug in qReallocAligned

the line
    faked.pptr[-1] = real.ptr;
was ignored by the GCC 4.5. (optimized out)

Workaround by using proper reinterpret_cast casting instead of union casting.

Fixes crash in tst_Collections::alignment

The crash would occurs for any use of qReallocAligned with alignement > sizeof(void*)
(fortunately this is not often called)

Reviewed-by: thiago
---
 src/corelib/global/qmalloc.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp
index 090998c..028a0a5 100644
--- a/src/corelib/global/qmalloc.cpp
+++ b/src/corelib/global/qmalloc.cpp
@@ -90,8 +90,6 @@ void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t align
         return newptr + 1;
     }
 
-    union { void *ptr; void **pptr; quintptr n; } real, faked;
-
     // qMalloc returns pointers aligned at least at sizeof(size_t) boundaries
     // but usually more (8- or 16-byte boundaries).
     // So we overallocate by alignment-sizeof(size_t) bytes, so we're guaranteed to find a
@@ -100,19 +98,21 @@ void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t align
     // However, we need to store the actual pointer, so we need to allocate actually size +
     // alignment anyway.
 
-    real.ptr = qRealloc(actualptr, newsize + alignment);
-    if (!real.ptr)
+    void *real = qRealloc(actualptr, newsize + alignment);
+    if (!real)
         return 0;
 
-    faked.n = real.n + alignment;
-    faked.n &= ~(alignment - 1);
+    quintptr faked = reinterpret_cast<quintptr>(real) + alignment;
+    faked &= ~(alignment - 1);
+
+    void **faked_ptr = reinterpret_cast<void **>(faked);
 
     // now save the value of the real pointer at faked-sizeof(void*)
     // by construction, alignment > sizeof(void*) and is a power of 2, so
     // faked-sizeof(void*) is properly aligned for a pointer
-    faked.pptr[-1] = real.ptr;
+    faked_ptr[-1] = real;
 
-    return faked.ptr;
+    return faked_ptr;
 }
 
 void qFreeAligned(void *ptr)
-- 
cgit v0.12


From e78a4b092c86e56099dbed3c3f423028506129d5 Mon Sep 17 00:00:00 2001
From: Jason Barron <jason.barron@nokia.com>
Date: Fri, 29 Oct 2010 09:40:00 +0200
Subject: Avoid being killed by graphics out-of-memory monitor.

When an application requests more graphics memory, the GOOM monitor
will start looking for other applications to kill in order to recover
the requested graphics memory. The first step in this process is to
send a custom event to the application indicating that it is a
candidate for termination. If the application does not acknowledge this
event, it will be killed immediately. However, since Qt releases its
graphics memory when the app is obscured, we should indicate that we
handle this event such that Qt has a chance to finish freeing
resources. If after a certain time, the app has not freed its resources
it will be killed anyway. This essentially buys Qt some time to
avoid the case where Qt apps are killed while they are cleaning up.

Task: QTBUG-14858
Reviewed-by: Jani Hautakangas
---
 src/gui/kernel/qapplication_s60.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 5ff2fd4..ae7070e 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -2055,6 +2055,17 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent
         }
 #endif
         break;
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+    case EEventUser:
+        {
+            // GOOM is looking for candidates to kill so indicate that we are
+            // capable of cleaning up by handling this event
+            TInt32 *data = reinterpret_cast<TInt32 *>(event->EventData());
+            if (data[0] == EApaSystemEventShutdown && data[1] == KGoomMemoryLowEvent)
+                return 1;
+        }
+        break;
+#endif
     default:
         break;
     }
-- 
cgit v0.12


From dd5ec222ce0285bd9419c9a47a8329bda41b5dd8 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Wed, 27 Oct 2010 11:22:31 +0100
Subject: Set SpectrumAnalyserThread parent to 0 before calling moveToThread()

QObjects with a parent cannot be moved to a different thread.
---
 demos/spectrum/app/spectrumanalyser.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demos/spectrum/app/spectrumanalyser.cpp b/demos/spectrum/app/spectrumanalyser.cpp
index 1cc47a6..2fa17b1 100644
--- a/demos/spectrum/app/spectrumanalyser.cpp
+++ b/demos/spectrum/app/spectrumanalyser.cpp
@@ -64,6 +64,8 @@ SpectrumAnalyserThread::SpectrumAnalyserThread(QObject *parent)
 #endif
 {
 #ifdef SPECTRUM_ANALYSER_SEPARATE_THREAD
+    // moveToThread() cannot be called on a QObject with a parent
+    setParent(0);
     moveToThread(m_thread);
     m_thread->start();
 #endif
-- 
cgit v0.12


From a53df3596e2061c202845f9f1c183177ca8a7eda Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Tue, 26 Oct 2010 15:15:14 +0100
Subject: Do not unnecessarily reset state of spectrum demo

This patch ensures that the state of the application is not reset when:
	- Any of the 'Play generated tone', 'Play file' or settings
	dialogs are opened
	- Any of the 'Play generated tone', 'Play file' or settings
	dialogs are dismissed by pressing the Cancel button
	- A new input or output device is selected via the settings
	dialog, and that new device supports the data format which
	is currently being used within the application
	- The window function is changed via the settings dialog

Note that the application is still reset if a new input or output
device is selected via the settings dialog, and this device does not
support the current data format.

Task-number: QTBUG-12935
Task-number: QTBUG-14810
---
 demos/spectrum/app/engine.cpp     | 84 +++++++++++++++++++++------------------
 demos/spectrum/app/mainwidget.cpp | 21 ++++++----
 demos/spectrum/app/mainwidget.h   |  1 +
 3 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/demos/spectrum/app/engine.cpp b/demos/spectrum/app/engine.cpp
index 119a0e3..0495fe3 100644
--- a/demos/spectrum/app/engine.cpp
+++ b/demos/spectrum/app/engine.cpp
@@ -453,44 +453,50 @@ bool Engine::initialize()
 {
     bool result = false;
 
-    reset();
+    QAudioFormat format = m_format;
 
     if (selectFormat()) {
-        const qint64 bufferLength = audioLength(m_format, BufferDurationUs);
-        m_buffer.resize(bufferLength);
-        m_buffer.fill(0);
-        emit bufferDurationChanged(BufferDurationUs);
-
-        if (m_generateTone) {
-            if (0 == m_tone.endFreq) {
-                const qreal nyquist = nyquistFrequency(m_format);
-                m_tone.endFreq = qMin(qreal(SpectrumHighFreq), nyquist);
-            }
+        if (m_format != format) {
+            format = m_format;
+            reset();
+            m_format = format;
+
+            const qint64 bufferLength = audioLength(m_format, BufferDurationUs);
+            m_buffer.resize(bufferLength);
+            m_buffer.fill(0);
+            emit bufferDurationChanged(BufferDurationUs);
+
+            if (m_generateTone) {
+                if (0 == m_tone.endFreq) {
+                    const qreal nyquist = nyquistFrequency(m_format);
+                    m_tone.endFreq = qMin(qreal(SpectrumHighFreq), nyquist);
+                }
 
-            // Call function defined in utils.h, at global scope
-            ::generateTone(m_tone, m_format, m_buffer);
-            m_dataLength = m_buffer.size();
-            emit dataDurationChanged(bufferDuration());
-            setRecordPosition(bufferDuration());
-            result = true;
-        } else if (m_file) {
-            const qint64 length = m_wavFile.readData(*m_file, m_buffer, m_format);
-            if (length) {
-                m_dataLength = length;
-                emit dataDurationChanged(dataDuration());
-                setRecordPosition(dataDuration());
+                // Call function defined in utils.h, at global scope
+                ::generateTone(m_tone, m_format, m_buffer);
+                m_dataLength = m_buffer.size();
+                emit dataDurationChanged(bufferDuration());
+                setRecordPosition(bufferDuration());
+                result = true;
+            } else if (m_file) {
+                const qint64 length = m_wavFile.readData(*m_file, m_buffer, m_format);
+                if (length) {
+                    m_dataLength = length;
+                    emit dataDurationChanged(dataDuration());
+                    setRecordPosition(dataDuration());
+                    result = true;
+                }
+            } else {
+                m_audioInput = new QAudioInput(m_audioInputDevice, m_format, this);
+                m_audioInput->setNotifyInterval(NotifyIntervalMs);
                 result = true;
             }
-        } else {
-            m_audioInput = new QAudioInput(m_audioInputDevice, m_format, this);
-            m_audioInput->setNotifyInterval(NotifyIntervalMs);
-            result = true;
-        }
 
-        m_audioOutput = new QAudioOutput(m_audioOutputDevice, m_format, this);
-        m_audioOutput->setNotifyInterval(NotifyIntervalMs);
-        m_spectrumLengthBytes = SpectrumLengthSamples *
-                                (m_format.sampleSize() / 8) * m_format.channels();
+            m_audioOutput = new QAudioOutput(m_audioOutputDevice, m_format, this);
+            m_audioOutput->setNotifyInterval(NotifyIntervalMs);
+            m_spectrumLengthBytes = SpectrumLengthSamples *
+                                    (m_format.sampleSize() / 8) * m_format.channels();
+        }
     } else {
         if (m_file)
             emit errorMessage(tr("Audio format not supported"),
@@ -510,12 +516,14 @@ bool Engine::selectFormat()
 {
     bool foundSupportedFormat = false;
 
-    if (m_file) {
-        // Header is read from the WAV file; just need to check whether
-        // it is supported by the audio output device
-        QAudioFormat format = m_wavFile.format();
-        if (m_audioOutputDevice.isFormatSupported(m_wavFile.format())) {
-            setFormat(m_wavFile.format());
+    if (m_file || QAudioFormat() != m_format) {
+        QAudioFormat format = m_format;
+        if (m_file)
+            // Header is read from the WAV file; just need to check whether
+            // it is supported by the audio output device
+            format = m_wavFile.format();
+        if (m_audioOutputDevice.isFormatSupported(format)) {
+            setFormat(format);
             foundSupportedFormat = true;
         } else {
             // Try flipping mono <-> stereo
diff --git a/demos/spectrum/app/mainwidget.cpp b/demos/spectrum/app/mainwidget.cpp
index dd51a91..fba28c6 100644
--- a/demos/spectrum/app/mainwidget.cpp
+++ b/demos/spectrum/app/mainwidget.cpp
@@ -200,19 +200,20 @@ void MainWidget::dataDurationChanged(qint64 duration)
 
 void MainWidget::showFileDialog()
 {
-    reset();
     const QString dir;
     const QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open WAV file"), dir, "*.wav");
     if (fileNames.count()) {
+        reset();
         setMode(LoadFileMode);
         m_engine->loadFile(fileNames.front());
         updateButtonStates();
+    } else {
+        updateModeMenu();
     }
 }
 
 void MainWidget::showSettingsDialog()
 {
-    reset();
     m_settingsDialog->exec();
     if (m_settingsDialog->result() == QDialog::Accepted) {
         m_engine->setAudioInputDevice(m_settingsDialog->inputDevice());
@@ -223,9 +224,9 @@ void MainWidget::showSettingsDialog()
 
 void MainWidget::showToneGeneratorDialog()
 {
-    reset();
     m_toneGeneratorDialog->exec();
     if (m_toneGeneratorDialog->result() == QDialog::Accepted) {
+        reset();
         setMode(GenerateToneMode);
         const qreal amplitude = m_toneGeneratorDialog->amplitude();
         if (m_toneGeneratorDialog->isFrequencySweepEnabled()) {
@@ -236,6 +237,8 @@ void MainWidget::showToneGeneratorDialog()
             m_engine->generateTone(tone);
             updateButtonStates();
         }
+    } else {
+        updateModeMenu();
     }
 }
 
@@ -445,10 +448,14 @@ void MainWidget::reset()
 
 void MainWidget::setMode(Mode mode)
 {
-
     m_mode = mode;
-    m_loadFileAction->setChecked(LoadFileMode == mode);
-    m_generateToneAction->setChecked(GenerateToneMode == mode);
-    m_recordAction->setChecked(RecordMode == mode);
+    updateModeMenu();
+}
+
+void MainWidget::updateModeMenu()
+{
+    m_loadFileAction->setChecked(LoadFileMode == m_mode);
+    m_generateToneAction->setChecked(GenerateToneMode == m_mode);
+    m_recordAction->setChecked(RecordMode == m_mode);
 }
 
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h
index ddab8b7..cc1f9ed 100644
--- a/demos/spectrum/app/mainwidget.h
+++ b/demos/spectrum/app/mainwidget.h
@@ -89,6 +89,7 @@ private slots:
     void showToneGeneratorDialog();
     void initializeRecord();
     void dataDurationChanged(qint64 duration);
+    void updateModeMenu();
 
 private:
     void createUi();
-- 
cgit v0.12


From 3cf35876400cb008fb25c8a3191c996af6059264 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Tue, 26 Oct 2010 17:15:29 +0100
Subject: Play whole file in spectrum analyzer demo

This change required a significant refactoring of the application,
including:

* Re-write WavFile class so that it inherits from QFile rather
  than taking a QIODevice as an argument to its method calls.

* Modified Engine class so that its internal QByteArray buffer
  (m_buffer) need not correspond to the entire clip.  This was done
  by introducing the m_bufferPosition variable, which indicates the
  offset from the start of the clip to the start of the region of
  the clip which is currently held in memory.  For tone generation
  and record/playback modes, the buffer does still map directly to
  the whole clip, so m_bufferPosition is always zero.  For file
  playback, the WavFile instance is the QIODevice which is passed
  to QAudioOutput; m_buffer is just the part of the file which is
  currently in memory for spectrum analysis, level calculation and
  waveform rendering.

* For file playback, introduced a second WavFile instance as a
  member of the Engine class.  This is because QFile::seek() is
  called in order to read the part of the file currently required
  for analysis.  If the QAudioOutput implementation passes its
  QIODevice across a thread boundary, this seeking causes playback
  to jump around within the file rather than progressing smoothly
  forward.

* Modified the audioLength utility function so that its return
  value is always a multiple of the sample size.

In the process of making the above changes, a few other minor
modifications were made:

* Modify all internal APIs concerned with buffer offsets and lengths
  to deal in bytes.  Previously, some calls passed values in
  microseconds and others in bytes, which was confusing.

* Remove write functionality from WavFile class, since it is not
  used in this application.

Task-number: QTBUG-12936
---
 demos/spectrum/app/engine.cpp      | 315 +++++++++++++++++++------------------
 demos/spectrum/app/engine.h        |  57 +++----
 demos/spectrum/app/mainwidget.cpp  |  46 +++---
 demos/spectrum/app/mainwidget.h    |   9 +-
 demos/spectrum/app/progressbar.cpp |  26 +--
 demos/spectrum/app/progressbar.h   |   4 +-
 demos/spectrum/app/utils.cpp       |   4 +-
 demos/spectrum/app/waveform.cpp    | 120 ++++++++------
 demos/spectrum/app/waveform.h      |  14 +-
 demos/spectrum/app/wavfile.cpp     | 205 ++++++------------------
 demos/spectrum/app/wavfile.h       |  36 ++---
 11 files changed, 369 insertions(+), 467 deletions(-)

diff --git a/demos/spectrum/app/engine.cpp b/demos/spectrum/app/engine.cpp
index 0495fe3..cd847fe 100644
--- a/demos/spectrum/app/engine.cpp
+++ b/demos/spectrum/app/engine.cpp
@@ -85,6 +85,7 @@ Engine::Engine(QObject *parent)
     ,   m_state(QAudio::StoppedState)
     ,   m_generateTone(false)
     ,   m_file(0)
+    ,   m_analysisFile(0)
     ,   m_availableAudioInputDevices
             (QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
     ,   m_audioInputDevice(QAudioDeviceInfo::defaultInputDevice())
@@ -96,15 +97,19 @@ Engine::Engine(QObject *parent)
     ,   m_audioOutputDevice(QAudioDeviceInfo::defaultOutputDevice())
     ,   m_audioOutput(0)
     ,   m_playPosition(0)
+    ,   m_bufferPosition(0)
+    ,   m_bufferLength(0)
     ,   m_dataLength(0)
+    ,   m_levelBufferLength(0)
     ,   m_rmsLevel(0.0)
     ,   m_peakLevel(0.0)
-    ,   m_spectrumLengthBytes(0)
+    ,   m_spectrumBufferLength(0)
     ,   m_spectrumAnalyser()
     ,   m_spectrumPosition(0)
     ,   m_count(0)
 {
     qRegisterMetaType<FrequencySpectrum>("FrequencySpectrum");
+    qRegisterMetaType<WindowFunction>("WindowFunction");
     CHECKED_CONNECT(&m_spectrumAnalyser,
                     SIGNAL(spectrumChanged(FrequencySpectrum)),
                     this,
@@ -132,34 +137,33 @@ Engine::~Engine()
 
 bool Engine::loadFile(const QString &fileName)
 {
+    reset();
     bool result = false;
-    m_generateTone = false;
-
-    Q_ASSERT(!fileName.isEmpty());
+    Q_ASSERT(!m_generateTone);
     Q_ASSERT(!m_file);
-    m_file = new QFile(fileName, this);
-    m_file->setFileName(fileName);
-    Q_ASSERT(m_file->exists());
-    if (m_file->open(QFile::ReadOnly)) {
-        m_wavFile.readHeader(*m_file);
-        if (isPCMS16LE(m_wavFile.format())) {
+    Q_ASSERT(!fileName.isEmpty());
+    m_file = new WavFile(this);
+    if (m_file->open(fileName)) {
+        if (isPCMS16LE(m_file->fileFormat())) {
             result = initialize();
         } else {
             emit errorMessage(tr("Audio format not supported"),
-                              formatToString(m_wavFile.format()));
+                              formatToString(m_file->fileFormat()));
         }
     } else {
         emit errorMessage(tr("Could not open file"), fileName);
     }
-
-    delete m_file;
-    m_file = 0;
-
+    if (result) {
+        m_analysisFile = new WavFile(this);
+        m_analysisFile->open(fileName);
+    }
     return result;
 }
 
 bool Engine::generateTone(const Tone &tone)
 {
+    reset();
+    Q_ASSERT(!m_generateTone);
     Q_ASSERT(!m_file);
     m_generateTone = true;
     m_tone = tone;
@@ -172,6 +176,7 @@ bool Engine::generateTone(const Tone &tone)
 
 bool Engine::generateSweptTone(qreal amplitude)
 {
+    Q_ASSERT(!m_generateTone);
     Q_ASSERT(!m_file);
     m_generateTone = true;
     m_tone.startFreq = 1;
@@ -185,41 +190,18 @@ bool Engine::generateSweptTone(qreal amplitude)
 
 bool Engine::initializeRecord()
 {
+    reset();
     ENGINE_DEBUG << "Engine::initializeRecord";
+    Q_ASSERT(!m_generateTone);
     Q_ASSERT(!m_file);
     m_generateTone = false;
     m_tone = SweptTone();
     return initialize();
 }
 
-qint64 Engine::bufferDuration() const
-{
-    return BufferDurationUs;
-}
-
-qint64 Engine::dataDuration() const
-{
-    qint64 result = 0;
-    if (QAudioFormat() != m_format)
-        result = audioDuration(m_format, m_dataLength);
-    return result;
-}
-
-qint64 Engine::audioBufferLength() const
+qint64 Engine::bufferLength() const
 {
-    qint64 length = 0;
-    if (QAudio::ActiveState == m_state || QAudio::IdleState == m_state) {
-        Q_ASSERT(QAudioFormat() != m_format);
-        switch (m_mode) {
-        case QAudio::AudioInput:
-            length = m_audioInput->bufferSize();
-            break;
-        case QAudio::AudioOutput:
-            length = m_audioOutput->bufferSize();
-            break;
-        }
-    }
-    return length;
+    return m_file ? m_file->size() : m_bufferLength;
 }
 
 void Engine::setWindowFunction(WindowFunction type)
@@ -252,7 +234,7 @@ void Engine::startRecording()
                             this, SLOT(audioNotify()));
             m_count = 0;
             m_dataLength = 0;
-            emit dataDurationChanged(0);
+            emit dataLengthChanged(0);
             m_audioInputIODevice = m_audioInput->start();
             CHECKED_CONNECT(m_audioInputIODevice, SIGNAL(readyRead()),
                             this, SLOT(audioDataReady()));
@@ -275,7 +257,6 @@ void Engine::startPlayback()
         } else {
             m_spectrumAnalyser.cancelCalculation();
             spectrumChanged(0, 0, FrequencySpectrum());
-
             setPlayPosition(0, true);
             stopRecording();
             m_mode = QAudio::AudioOutput;
@@ -284,10 +265,17 @@ void Engine::startPlayback()
             CHECKED_CONNECT(m_audioOutput, SIGNAL(notify()),
                             this, SLOT(audioNotify()));
             m_count = 0;
-            m_audioOutputIODevice.close();
-            m_audioOutputIODevice.setBuffer(&m_buffer);
-            m_audioOutputIODevice.open(QIODevice::ReadOnly);
-            m_audioOutput->start(&m_audioOutputIODevice);
+            if (m_file) {
+                m_file->seek(0);
+                m_bufferPosition = 0;
+                m_dataLength = 0;
+                m_audioOutput->start(m_file);
+            } else {
+                m_audioOutputIODevice.close();
+                m_audioOutputIODevice.setBuffer(&m_buffer);
+                m_audioOutputIODevice.open(QIODevice::ReadOnly);
+                m_audioOutput->start(&m_audioOutputIODevice);
+            }
         }
     }
 }
@@ -332,40 +320,55 @@ void Engine::audioNotify()
 {
     switch (m_mode) {
     case QAudio::AudioInput: {
-            const qint64 recordPosition =
-                    qMin(BufferDurationUs, m_audioInput->processedUSecs());
+            const qint64 recordPosition = qMin(m_bufferLength, audioLength(m_format, m_audioInput->processedUSecs()));
             setRecordPosition(recordPosition);
-
-            // Calculate level of most recently captured data
-            qint64 levelLength = audioLength(m_format, LevelWindowUs);
-            levelLength = qMin(m_dataLength, levelLength);
-            const qint64 levelPosition = m_dataLength - levelLength;
-            calculateLevel(levelPosition, levelLength);
-
-            // Calculate spectrum of most recently captured data
-            if (m_dataLength >= m_spectrumLengthBytes) {
-                const qint64 spectrumPosition = m_dataLength - m_spectrumLengthBytes;
+            const qint64 levelPosition = m_dataLength - m_levelBufferLength;
+            if (levelPosition >= 0)
+                calculateLevel(levelPosition, m_levelBufferLength);
+            if (m_dataLength >= m_spectrumBufferLength) {
+                const qint64 spectrumPosition = m_dataLength - m_spectrumBufferLength;
                 calculateSpectrum(spectrumPosition);
             }
+            emit bufferChanged(0, m_dataLength, m_buffer);
         }
         break;
     case QAudio::AudioOutput: {
-            const qint64 playPosition =
-                    qMin(dataDuration(), m_audioOutput->processedUSecs());
-            setPlayPosition(playPosition);
-
-            qint64 analysisPosition = audioLength(m_format, playPosition);
-
-            // Calculate level of data starting at current playback position
-            const qint64 levelLength = audioLength(m_format, LevelWindowUs);
-            if (analysisPosition + levelLength < m_dataLength)
-                calculateLevel(analysisPosition, levelLength);
-
-            if (analysisPosition + m_spectrumLengthBytes < m_dataLength)
-                calculateSpectrum(analysisPosition);
-
-            if (dataDuration() == playPosition)
-                stopPlayback();
+            const qint64 playPosition = audioLength(m_format, m_audioOutput->processedUSecs());
+            setPlayPosition(qMin(bufferLength(), playPosition));
+            const qint64 levelPosition = playPosition - m_levelBufferLength;
+            const qint64 spectrumPosition = playPosition - m_spectrumBufferLength;
+            if (m_file) {
+                if (levelPosition > m_bufferPosition ||
+                    spectrumPosition > m_bufferPosition ||
+                    qMax(m_levelBufferLength, m_spectrumBufferLength) > m_dataLength) {
+                    m_bufferPosition = 0;
+                    m_dataLength = 0;
+                    // Data needs to be read into m_buffer in order to be analysed
+                    const qint64 readPos = qMax(qint64(0), qMin(levelPosition, spectrumPosition));
+                    const qint64 readEnd = qMin(m_analysisFile->size(), qMax(levelPosition + m_levelBufferLength, spectrumPosition + m_spectrumBufferLength));
+                    const qint64 readLen = readEnd - readPos + audioLength(m_format, WaveformWindowDuration);
+                    qDebug() << "Engine::audioNotify [1]"
+                             << "analysisFileSize" << m_analysisFile->size()
+                             << "readPos" << readPos
+                             << "readLen" << readLen;
+                    if (m_analysisFile->seek(readPos + m_analysisFile->headerLength())) {
+                        m_buffer.resize(readLen);
+                        m_bufferPosition = readPos;
+                        m_dataLength = m_analysisFile->read(m_buffer.data(), readLen);
+                        qDebug() << "Engine::audioNotify [2]" << "bufferPosition" << m_bufferPosition << "dataLength" << m_dataLength;
+                    } else {
+                        qDebug() << "Engine::audioNotify [2]" << "file seek error";
+                    }
+                    emit bufferChanged(m_bufferPosition, m_dataLength, m_buffer);
+                }
+            } else {
+                if (playPosition >= m_dataLength)
+                    stopPlayback();
+            }
+            if (levelPosition >= 0 && levelPosition + m_levelBufferLength < m_bufferPosition + m_dataLength)
+                calculateLevel(levelPosition, m_levelBufferLength);
+            if (spectrumPosition >= 0 && spectrumPosition + m_spectrumBufferLength < m_bufferPosition + m_dataLength)
+                calculateSpectrum(spectrumPosition);
         }
         break;
     }
@@ -376,27 +379,32 @@ void Engine::audioStateChanged(QAudio::State state)
     ENGINE_DEBUG << "Engine::audioStateChanged from" << m_state
                  << "to" << state;
 
-    if (QAudio::StoppedState == state) {
-        // Check error
-        QAudio::Error error = QAudio::NoError;
-        switch (m_mode) {
-        case QAudio::AudioInput:
-            error = m_audioInput->error();
-            break;
-        case QAudio::AudioOutput:
-            error = m_audioOutput->error();
-            break;
-        }
-        if (QAudio::NoError != error) {
-            reset();
-            return;
+    if (QAudio::IdleState == state && m_file && m_file->pos() == m_file->size()) {
+        stopPlayback();
+    } else {
+        if (QAudio::StoppedState == state) {
+            // Check error
+            QAudio::Error error = QAudio::NoError;
+            switch (m_mode) {
+            case QAudio::AudioInput:
+                error = m_audioInput->error();
+                break;
+            case QAudio::AudioOutput:
+                error = m_audioOutput->error();
+                break;
+            }
+            if (QAudio::NoError != error) {
+                reset();
+                return;
+            }
         }
+        setState(state);
     }
-    setState(state);
 }
 
 void Engine::audioDataReady()
 {
+    Q_ASSERT(0 == m_bufferPosition);
     const qint64 bytesReady = m_audioInput->bytesReady();
     const qint64 bytesSpace = m_buffer.size() - m_dataLength;
     const qint64 bytesToRead = qMin(bytesReady, bytesSpace);
@@ -407,9 +415,7 @@ void Engine::audioDataReady()
 
     if (bytesRead) {
         m_dataLength += bytesRead;
-
-        const qint64 duration = audioDuration(m_format, m_dataLength);
-        emit dataDurationChanged(duration);
+        emit dataLengthChanged(dataLength());
     }
 
     if (m_buffer.size() == m_dataLength)
@@ -419,9 +425,7 @@ void Engine::audioDataReady()
 void Engine::spectrumChanged(const FrequencySpectrum &spectrum)
 {
     ENGINE_DEBUG << "Engine::spectrumChanged" << "pos" << m_spectrumPosition;
-    const qint64 positionUs = audioDuration(m_format, m_spectrumPosition);
-    const qint64 lengthUs = audioDuration(m_format, m_spectrumLengthBytes);
-    emit spectrumChanged(positionUs, lengthUs, spectrum);
+    emit spectrumChanged(m_spectrumPosition, m_spectrumBufferLength, spectrum);
 }
 
 
@@ -429,12 +433,8 @@ void Engine::spectrumChanged(const FrequencySpectrum &spectrum)
 // Private functions
 //-----------------------------------------------------------------------------
 
-void Engine::reset()
+void Engine::resetAudioDevices()
 {
-    stopRecording();
-    stopPlayback();
-    setState(QAudio::AudioInput, QAudio::StoppedState);
-    setFormat(QAudioFormat());
     delete m_audioInput;
     m_audioInput = 0;
     m_audioInputIODevice = 0;
@@ -442,13 +442,29 @@ void Engine::reset()
     delete m_audioOutput;
     m_audioOutput = 0;
     setPlayPosition(0);
-    m_buffer.clear();
-    m_dataLength = 0;
     m_spectrumPosition = 0;
-    emit dataDurationChanged(0);
     setLevel(0.0, 0.0, 0);
 }
 
+void Engine::reset()
+{
+    stopRecording();
+    stopPlayback();
+    setState(QAudio::AudioInput, QAudio::StoppedState);
+    setFormat(QAudioFormat());
+    m_generateTone = false;
+    delete m_file;
+    m_file = 0;
+    delete m_analysisFile;
+    m_analysisFile = 0;
+    m_buffer.clear();
+    m_bufferPosition = 0;
+    m_bufferLength = 0;
+    m_dataLength = 0;
+    emit dataLengthChanged(0);
+    resetAudioDevices();
+}
+
 bool Engine::initialize()
 {
     bool result = false;
@@ -457,45 +473,39 @@ bool Engine::initialize()
 
     if (selectFormat()) {
         if (m_format != format) {
-            format = m_format;
-            reset();
-            m_format = format;
-
-            const qint64 bufferLength = audioLength(m_format, BufferDurationUs);
-            m_buffer.resize(bufferLength);
-            m_buffer.fill(0);
-            emit bufferDurationChanged(BufferDurationUs);
-
-            if (m_generateTone) {
-                if (0 == m_tone.endFreq) {
-                    const qreal nyquist = nyquistFrequency(m_format);
-                    m_tone.endFreq = qMin(qreal(SpectrumHighFreq), nyquist);
-                }
-
-                // Call function defined in utils.h, at global scope
-                ::generateTone(m_tone, m_format, m_buffer);
-                m_dataLength = m_buffer.size();
-                emit dataDurationChanged(bufferDuration());
-                setRecordPosition(bufferDuration());
+            resetAudioDevices();
+            if (m_file) {
+                emit bufferLengthChanged(bufferLength());
+                emit dataLengthChanged(dataLength());
+                emit bufferChanged(0, 0, m_buffer);
+                setRecordPosition(bufferLength());
                 result = true;
-            } else if (m_file) {
-                const qint64 length = m_wavFile.readData(*m_file, m_buffer, m_format);
-                if (length) {
-                    m_dataLength = length;
-                    emit dataDurationChanged(dataDuration());
-                    setRecordPosition(dataDuration());
+            } else {
+                m_bufferLength = audioLength(m_format, BufferDurationUs);
+                m_buffer.resize(m_bufferLength);
+                m_buffer.fill(0);
+                emit bufferLengthChanged(bufferLength());
+                if (m_generateTone) {
+                    if (0 == m_tone.endFreq) {
+                        const qreal nyquist = nyquistFrequency(m_format);
+                        m_tone.endFreq = qMin(qreal(SpectrumHighFreq), nyquist);
+                    }
+                    // Call function defined in utils.h, at global scope
+                    ::generateTone(m_tone, m_format, m_buffer);
+                    m_dataLength = m_bufferLength;
+                    emit dataLengthChanged(dataLength());
+                    emit bufferChanged(0, m_dataLength, m_buffer);
+                    setRecordPosition(m_bufferLength);
+                    result = true;
+                } else {
+                    emit bufferChanged(0, 0, m_buffer);
+                    m_audioInput = new QAudioInput(m_audioInputDevice, m_format, this);
+                    m_audioInput->setNotifyInterval(NotifyIntervalMs);
                     result = true;
                 }
-            } else {
-                m_audioInput = new QAudioInput(m_audioInputDevice, m_format, this);
-                m_audioInput->setNotifyInterval(NotifyIntervalMs);
-                result = true;
             }
-
             m_audioOutput = new QAudioOutput(m_audioOutputDevice, m_format, this);
             m_audioOutput->setNotifyInterval(NotifyIntervalMs);
-            m_spectrumLengthBytes = SpectrumLengthSamples *
-                                    (m_format.sampleSize() / 8) * m_format.channels();
         }
     } else {
         if (m_file)
@@ -507,6 +517,8 @@ bool Engine::initialize()
             emit errorMessage(tr("No common input / output format found"), "");
     }
 
+    ENGINE_DEBUG << "Engine::initialize" << "m_bufferLength" << m_bufferLength;
+    ENGINE_DEBUG << "Engine::initialize" << "m_dataLength" << m_dataLength;
     ENGINE_DEBUG << "Engine::initialize" << "format" << m_format;
 
     return result;
@@ -521,18 +533,10 @@ bool Engine::selectFormat()
         if (m_file)
             // Header is read from the WAV file; just need to check whether
             // it is supported by the audio output device
-            format = m_wavFile.format();
+            format = m_file->fileFormat();
         if (m_audioOutputDevice.isFormatSupported(format)) {
             setFormat(format);
             foundSupportedFormat = true;
-        } else {
-            // Try flipping mono <-> stereo
-            const int channels = (format.channels() == 1) ? 2 : 1;
-            format.setChannels(channels);
-            if (m_audioOutputDevice.isFormatSupported(format)) {
-                setFormat(format);
-                foundSupportedFormat = true;
-            }
         }
     } else {
 
@@ -656,12 +660,12 @@ void Engine::calculateLevel(qint64 position, qint64 length)
     Q_UNUSED(position)
     Q_UNUSED(length)
 #else
-    Q_ASSERT(position + length <= m_dataLength);
+    Q_ASSERT(position + length <= m_bufferPosition + m_dataLength);
 
     qreal peakLevel = 0.0;
 
     qreal sum = 0.0;
-    const char *ptr = m_buffer.constData() + position;
+    const char *ptr = m_buffer.constData() + position - m_bufferPosition;
     const char *const end = ptr + length;
     while (ptr < end) {
         const qint16 value = *reinterpret_cast<const qint16*>(ptr);
@@ -687,18 +691,18 @@ void Engine::calculateSpectrum(qint64 position)
 #ifdef DISABLE_SPECTRUM
     Q_UNUSED(position)
 #else
-    Q_ASSERT(position + m_spectrumLengthBytes <= m_dataLength);
-    Q_ASSERT(0 == m_spectrumLengthBytes % 2); // constraint of FFT algorithm
+    Q_ASSERT(position + m_spectrumBufferLength <= m_bufferPosition + m_dataLength);
+    Q_ASSERT(0 == m_spectrumBufferLength % 2); // constraint of FFT algorithm
 
     // QThread::currentThread is marked 'for internal use only', but
     // we're only using it for debug output here, so it's probably OK :)
     ENGINE_DEBUG << "Engine::calculateSpectrum" << QThread::currentThread()
-                 << "count" << m_count << "pos" << position << "len" << m_spectrumLengthBytes
+                 << "count" << m_count << "pos" << position << "len" << m_spectrumBufferLength
                  << "spectrumAnalyser.isReady" << m_spectrumAnalyser.isReady();
 
     if(m_spectrumAnalyser.isReady()) {
-        m_spectrumBuffer = QByteArray::fromRawData(m_buffer.constData() + position,
-                                                   m_spectrumLengthBytes);
+        m_spectrumBuffer = QByteArray::fromRawData(m_buffer.constData() + position - m_bufferPosition,
+                                                   m_spectrumBufferLength);
         m_spectrumPosition = position;
         m_spectrumAnalyser.calculate(m_spectrumBuffer, m_format);
     }
@@ -709,6 +713,9 @@ void Engine::setFormat(const QAudioFormat &format)
 {
     const bool changed = (format != m_format);
     m_format = format;
+    m_levelBufferLength = audioLength(m_format, LevelWindowUs);
+    m_spectrumBufferLength = SpectrumLengthSamples *
+                            (m_format.sampleSize() / 8) * m_format.channels();
     if (changed)
         emit formatChanged(m_format);
 }
diff --git a/demos/spectrum/app/engine.h b/demos/spectrum/app/engine.h
index e14ac83..c97083e 100644
--- a/demos/spectrum/app/engine.h
+++ b/demos/spectrum/app/engine.h
@@ -91,12 +91,6 @@ public:
     QAudio::State state() const     { return m_state; }
 
     /**
-     * \return Reference to internal audio buffer
-     * \note This reference is valid for the lifetime of the Engine
-     */
-    const QByteArray& buffer() const    { return m_buffer; }
-
-    /**
      * \return Current audio format
      * \note May be QAudioFormat() if engine is not initialized
      */
@@ -129,7 +123,7 @@ public:
 
     /**
      * Position of the audio input device.
-     * \return Position in microseconds.
+     * \return Position in bytes.
      */
     qint64 recordPosition() const   { return m_recordPosition; }
 
@@ -147,27 +141,21 @@ public:
 
     /**
      * Position of the audio output device.
-     * \return Position in microseconds.
+     * \return Position in bytes.
      */
     qint64 playPosition() const     { return m_playPosition; }
 
     /**
      * Length of the internal engine buffer.
-     * \return Buffer length in microseconds.
+     * \return Buffer length in bytes.
      */
-    qint64 bufferDuration() const;
+    qint64 bufferLength() const;
 
     /**
      * Amount of data held in the buffer.
-     * \return Data duration in microseconds.
+     * \return Data length in bytes.
      */
-    qint64 dataDuration() const;
-
-    /**
-     * Returns the size of the underlying audio buffer in bytes.
-     * This should be an approximation of the capture latency.
-     */
-    qint64 audioBufferLength() const;
+    qint64 dataLength() const       { return m_dataLength; }
 
     /**
      * Set window function applied to audio data before spectral analysis.
@@ -203,23 +191,23 @@ signals:
      * Length of buffer has changed.
      * \param duration Duration in microseconds
      */
-    void bufferDurationChanged(qint64 duration);
+    void bufferLengthChanged(qint64 duration);
 
     /**
      * Amount of data in buffer has changed.
-     * \param duration Duration of data in microseconds
+     * \param Length of data in bytes
      */
-    void dataDurationChanged(qint64 duration);
+    void dataLengthChanged(qint64 duration);
 
     /**
      * Position of the audio input device has changed.
-     * \param position Position in microseconds
+     * \param position Position in bytes
      */
     void recordPositionChanged(qint64 position);
 
     /**
      * Position of the audio output device has changed.
-     * \param position Position in microseconds
+     * \param position Position in bytes
      */
     void playPositionChanged(qint64 position);
 
@@ -233,12 +221,19 @@ signals:
 
     /**
      * Spectrum has changed.
-     * \param position Position of start of window in microseconds
-     * \param length   Length of window in microseconds
+     * \param position Position of start of window in bytes
+     * \param length   Length of window in bytes
      * \param spectrum Resulting frequency spectrum
      */
     void spectrumChanged(qint64 position, qint64 length, const FrequencySpectrum &spectrum);
 
+    /**
+     * Buffer containing audio data has changed.
+     * \param position Position of start of buffer in bytes
+     * \param buffer   Buffer
+     */
+    void bufferChanged(qint64 position, qint64 length, const QByteArray &buffer);
+
 private slots:
     void audioNotify();
     void audioStateChanged(QAudio::State state);
@@ -246,6 +241,7 @@ private slots:
     void spectrumChanged(const FrequencySpectrum &spectrum);
 
 private:
+    void resetAudioDevices();
     bool initialize();
     bool selectFormat();
     void stopRecording();
@@ -275,8 +271,10 @@ private:
     bool                m_generateTone;
     SweptTone           m_tone;
 
-    QFile*              m_file;
-    WavFile             m_wavFile;
+    WavFile*            m_file;
+    // We need a second file handle via which to read data into m_buffer
+    // for analysis
+    WavFile*            m_analysisFile;
 
     QAudioFormat        m_format;
 
@@ -293,12 +291,15 @@ private:
     QBuffer             m_audioOutputIODevice;
 
     QByteArray          m_buffer;
+    qint64              m_bufferPosition;
+    qint64              m_bufferLength;
     qint64              m_dataLength;
 
+    int                 m_levelBufferLength;
     qreal               m_rmsLevel;
     qreal               m_peakLevel;
 
-    int                 m_spectrumLengthBytes;
+    int                 m_spectrumBufferLength;
     QByteArray          m_spectrumBuffer;
     SpectrumAnalyser    m_spectrumAnalyser;
     qint64              m_spectrumPosition;
diff --git a/demos/spectrum/app/mainwidget.cpp b/demos/spectrum/app/mainwidget.cpp
index fba28c6..4b53bbe 100644
--- a/demos/spectrum/app/mainwidget.cpp
+++ b/demos/spectrum/app/mainwidget.cpp
@@ -65,7 +65,7 @@ MainWidget::MainWidget(QWidget *parent)
     ,   m_mode(NoMode)
     ,   m_engine(new Engine(this))
 #ifndef DISABLE_WAVEFORM
-    ,   m_waveform(new Waveform(m_engine->buffer(), this))
+    ,   m_waveform(new Waveform(this))
 #endif
     ,   m_progressBar(new ProgressBar(this))
     ,   m_spectrograph(new Spectrograph(this))
@@ -166,19 +166,18 @@ void MainWidget::timerEvent(QTimerEvent *event)
     m_infoMessage->setText("");
 }
 
-void MainWidget::positionChanged(qint64 positionUs)
+void MainWidget::audioPositionChanged(qint64 position)
 {
 #ifndef DISABLE_WAVEFORM
-    qint64 positionBytes = audioLength(m_engine->format(), positionUs);
-    m_waveform->positionChanged(positionBytes);
+    m_waveform->audioPositionChanged(position);
 #else
-    Q_UNUSED(positionUs)
+    Q_UNUSED(position)
 #endif
 }
 
-void MainWidget::bufferDurationChanged(qint64 durationUs)
+void MainWidget::bufferLengthChanged(qint64 length)
 {
-    m_progressBar->bufferDurationChanged(durationUs);
+    m_progressBar->bufferLengthChanged(length);
 }
 
 
@@ -186,18 +185,6 @@ void MainWidget::bufferDurationChanged(qint64 durationUs)
 // Private slots
 //-----------------------------------------------------------------------------
 
-void MainWidget::dataDurationChanged(qint64 duration)
-{
-#ifndef DISABLE_WAVEFORM
-    const qint64 dataLength = audioLength(m_engine->format(), duration);
-    m_waveform->dataLengthChanged(dataLength);
-#else
-    Q_UNUSED(duration)
-#endif
-
-    updateButtonStates();
-}
-
 void MainWidget::showFileDialog()
 {
     const QString dir;
@@ -363,13 +350,13 @@ void MainWidget::connectUi()
     CHECKED_CONNECT(m_engine, SIGNAL(formatChanged(const QAudioFormat &)),
             this, SLOT(formatChanged(const QAudioFormat &)));
 
-    m_progressBar->bufferDurationChanged(m_engine->bufferDuration());
+    m_progressBar->bufferLengthChanged(m_engine->bufferLength());
 
-    CHECKED_CONNECT(m_engine, SIGNAL(bufferDurationChanged(qint64)),
-            this, SLOT(bufferDurationChanged(qint64)));
+    CHECKED_CONNECT(m_engine, SIGNAL(bufferLengthChanged(qint64)),
+            this, SLOT(bufferLengthChanged(qint64)));
 
-    CHECKED_CONNECT(m_engine, SIGNAL(dataDurationChanged(qint64)),
-            this, SLOT(dataDurationChanged(qint64)));
+    CHECKED_CONNECT(m_engine, SIGNAL(dataLengthChanged(qint64)),
+            this, SLOT(updateButtonStates()));
 
     CHECKED_CONNECT(m_engine, SIGNAL(recordPositionChanged(qint64)),
             m_progressBar, SLOT(recordPositionChanged(qint64)));
@@ -378,10 +365,10 @@ void MainWidget::connectUi()
             m_progressBar, SLOT(playPositionChanged(qint64)));
 
     CHECKED_CONNECT(m_engine, SIGNAL(recordPositionChanged(qint64)),
-            this, SLOT(positionChanged(qint64)));
+            this, SLOT(audioPositionChanged(qint64)));
 
     CHECKED_CONNECT(m_engine, SIGNAL(playPositionChanged(qint64)),
-            this, SLOT(positionChanged(qint64)));
+            this, SLOT(audioPositionChanged(qint64)));
 
     CHECKED_CONNECT(m_engine, SIGNAL(levelChanged(qreal, qreal, int)),
             m_levelMeter, SLOT(levelChanged(qreal, qreal, int)));
@@ -397,6 +384,11 @@ void MainWidget::connectUi()
 
     CHECKED_CONNECT(m_spectrograph, SIGNAL(infoMessage(QString, int)),
             this, SLOT(infoMessage(QString, int)));
+
+#ifndef DISABLE_WAVEFORM
+    CHECKED_CONNECT(m_engine, SIGNAL(bufferChanged(qint64, qint64, const QByteArray &)),
+            m_waveform, SLOT(bufferChanged(qint64, qint64, const QByteArray &)));
+#endif
 }
 
 void MainWidget::createMenus()
@@ -428,7 +420,7 @@ void MainWidget::updateButtonStates()
                                QAudio::IdleState == m_engine->state());
     m_pauseButton->setEnabled(pauseEnabled);
 
-    const bool playEnabled = (m_engine->dataDuration() &&
+    const bool playEnabled = (/*m_engine->dataLength() &&*/
                               (QAudio::AudioOutput != m_engine->mode() ||
                                (QAudio::ActiveState != m_engine->state() &&
                                 QAudio::IdleState != m_engine->state())));
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h
index cc1f9ed..13131c0 100644
--- a/demos/spectrum/app/mainwidget.h
+++ b/demos/spectrum/app/mainwidget.h
@@ -80,22 +80,21 @@ public slots:
                          const FrequencySpectrum &spectrum);
     void infoMessage(const QString &message, int timeoutMs);
     void errorMessage(const QString &heading, const QString &detail);
-    void positionChanged(qint64 position);
-    void bufferDurationChanged(qint64 duration);
+    void audioPositionChanged(qint64 position);
+    void bufferLengthChanged(qint64 length);
 
 private slots:
     void showFileDialog();
     void showSettingsDialog();
     void showToneGeneratorDialog();
     void initializeRecord();
-    void dataDurationChanged(qint64 duration);
     void updateModeMenu();
+    void updateButtonStates();
 
 private:
     void createUi();
     void createMenus();
     void connectUi();
-    void updateButtonStates();
     void reset();
 
     enum Mode {
@@ -112,7 +111,9 @@ private:
 
     Engine*                 m_engine;
 
+#ifndef DISABLE_WAVEFORM
     Waveform*               m_waveform;
+#endif
     ProgressBar*            m_progressBar;
     Spectrograph*           m_spectrograph;
     LevelMeter*             m_levelMeter;
diff --git a/demos/spectrum/app/progressbar.cpp b/demos/spectrum/app/progressbar.cpp
index 6bfc690..0ac76f1 100644
--- a/demos/spectrum/app/progressbar.cpp
+++ b/demos/spectrum/app/progressbar.cpp
@@ -44,7 +44,7 @@
 
 ProgressBar::ProgressBar(QWidget *parent)
     :   QWidget(parent)
-    ,   m_bufferDuration(0)
+    ,   m_bufferLength(0)
     ,   m_recordPosition(0)
     ,   m_playPosition(0)
     ,   m_windowPosition(0)
@@ -64,7 +64,7 @@ ProgressBar::~ProgressBar()
 
 void ProgressBar::reset()
 {
-    m_bufferDuration = 0;
+    m_bufferLength = 0;
     m_recordPosition = 0;
     m_playPosition = 0;
     m_windowPosition = 0;
@@ -86,26 +86,26 @@ void ProgressBar::paintEvent(QPaintEvent * /*event*/)
     painter.fillRect(rect(), Qt::black);
 #endif
 
-    if (m_bufferDuration) {
+    if (m_bufferLength) {
         QRect bar = rect();
-        const qreal play = qreal(m_playPosition) / m_bufferDuration;
+        const qreal play = qreal(m_playPosition) / m_bufferLength;
         bar.setLeft(rect().left() + play * rect().width());
-        const qreal record = qreal(m_recordPosition) / m_bufferDuration;
+        const qreal record = qreal(m_recordPosition) / m_bufferLength;
         bar.setRight(rect().left() + record * rect().width());
         painter.fillRect(bar, bufferColor);
 
         QRect window = rect();
-        const qreal windowLeft = qreal(m_windowPosition) / m_bufferDuration;
+        const qreal windowLeft = qreal(m_windowPosition) / m_bufferLength;
         window.setLeft(rect().left() + windowLeft * rect().width());
-        const qreal windowWidth = qreal(m_windowLength) / m_bufferDuration;
+        const qreal windowWidth = qreal(m_windowLength) / m_bufferLength;
         window.setWidth(windowWidth * rect().width());
         painter.fillRect(window, windowColor);
     }
 }
 
-void ProgressBar::bufferDurationChanged(qint64 bufferSize)
+void ProgressBar::bufferLengthChanged(qint64 bufferSize)
 {
-    m_bufferDuration = bufferSize;
+    m_bufferLength = bufferSize;
     m_recordPosition = 0;
     m_playPosition = 0;
     m_windowPosition = 0;
@@ -116,7 +116,7 @@ void ProgressBar::bufferDurationChanged(qint64 bufferSize)
 void ProgressBar::recordPositionChanged(qint64 recordPosition)
 {
     Q_ASSERT(recordPosition >= 0);
-    Q_ASSERT(recordPosition <= m_bufferDuration);
+    Q_ASSERT(recordPosition <= m_bufferLength);
     m_recordPosition = recordPosition;
     repaint();
 }
@@ -124,7 +124,7 @@ void ProgressBar::recordPositionChanged(qint64 recordPosition)
 void ProgressBar::playPositionChanged(qint64 playPosition)
 {
     Q_ASSERT(playPosition >= 0);
-    Q_ASSERT(playPosition <= m_bufferDuration);
+    Q_ASSERT(playPosition <= m_bufferLength);
     m_playPosition = playPosition;
     repaint();
 }
@@ -132,8 +132,8 @@ void ProgressBar::playPositionChanged(qint64 playPosition)
 void ProgressBar::windowChanged(qint64 position, qint64 length)
 {
     Q_ASSERT(position >= 0);
-    Q_ASSERT(position <= m_bufferDuration);
-    Q_ASSERT(position + length <= m_bufferDuration);
+    Q_ASSERT(position <= m_bufferLength);
+    Q_ASSERT(position + length <= m_bufferLength);
     m_windowPosition = position;
     m_windowLength = length;
     repaint();
diff --git a/demos/spectrum/app/progressbar.h b/demos/spectrum/app/progressbar.h
index 8514adb..e715cf5 100644
--- a/demos/spectrum/app/progressbar.h
+++ b/demos/spectrum/app/progressbar.h
@@ -57,13 +57,13 @@ public:
     void paintEvent(QPaintEvent *event);
 
 public slots:
-    void bufferDurationChanged(qint64 bufferSize);
+    void bufferLengthChanged(qint64 length);
     void recordPositionChanged(qint64 recordPosition);
     void playPositionChanged(qint64 playPosition);
     void windowChanged(qint64 position, qint64 length);
 
 private:
-    qint64 m_bufferDuration;
+    qint64 m_bufferLength;
     qint64 m_recordPosition;
     qint64 m_playPosition;
     qint64 m_windowPosition;
diff --git a/demos/spectrum/app/utils.cpp b/demos/spectrum/app/utils.cpp
index 4ead6c2..49a7626 100644
--- a/demos/spectrum/app/utils.cpp
+++ b/demos/spectrum/app/utils.cpp
@@ -49,8 +49,10 @@ qint64 audioDuration(const QAudioFormat &format, qint64 bytes)
 
 qint64 audioLength(const QAudioFormat &format, qint64 microSeconds)
 {
-   return (format.frequency() * format.channels() * (format.sampleSize() / 8))
+   qint64 result = (format.frequency() * format.channels() * (format.sampleSize() / 8))
        * microSeconds / 1000000;
+   result -= result % (format.channelCount() * format.sampleSize());
+   return result;
 }
 
 qreal nyquistFrequency(const QAudioFormat &format)
diff --git a/demos/spectrum/app/waveform.cpp b/demos/spectrum/app/waveform.cpp
index 1f7d315..bd854c0 100644
--- a/demos/spectrum/app/waveform.cpp
+++ b/demos/spectrum/app/waveform.cpp
@@ -44,12 +44,18 @@
 #include <QResizeEvent>
 #include <QDebug>
 
-
-Waveform::Waveform(const QByteArray &buffer, QWidget *parent)
+//#define PAINT_EVENT_TRACE
+#ifdef PAINT_EVENT_TRACE
+#   define WAVEFORM_PAINT_DEBUG qDebug()
+#else
+#   define WAVEFORM_PAINT_DEBUG nullDebug()
+#endif
+
+Waveform::Waveform(QWidget *parent)
     :   QWidget(parent)
-    ,   m_buffer(buffer)
-    ,   m_dataLength(0)
-    ,   m_position(0)
+    ,   m_bufferPosition(0)
+    ,   m_bufferLength(0)
+    ,   m_audioPosition(0)
     ,   m_active(false)
     ,   m_tileLength(0)
     ,   m_tileArrayStart(0)
@@ -72,19 +78,19 @@ void Waveform::paintEvent(QPaintEvent * /*event*/)
     painter.fillRect(rect(), Qt::black);
 
     if (m_active) {
-        WAVEFORM_DEBUG << "Waveform::paintEvent"
-                       << "windowPosition" << m_windowPosition
-                       << "windowLength" << m_windowLength;
+        WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent"
+                             << "windowPosition" << m_windowPosition
+                             << "windowLength" << m_windowLength;
         qint64 pos = m_windowPosition;
         const qint64 windowEnd = m_windowPosition + m_windowLength;
         int destLeft = 0;
         int destRight = 0;
         while (pos < windowEnd) {
             const TilePoint point = tilePoint(pos);
-            WAVEFORM_DEBUG << "Waveform::paintEvent" << "pos" << pos
-                           << "tileIndex" << point.index
-                           << "positionOffset" << point.positionOffset
-                           << "pixelOffset" << point.pixelOffset;
+            WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent" << "pos" << pos
+                                 << "tileIndex" << point.index
+                                 << "positionOffset" << point.positionOffset
+                                 << "pixelOffset" << point.pixelOffset;
 
             if (point.index != NullIndex) {
                 const Tile &tile = m_tiles[point.index];
@@ -104,9 +110,9 @@ void Waveform::paintEvent(QPaintEvent * /*event*/)
                     sourceRect.setLeft(point.pixelOffset);
                     sourceRect.setRight(sourceRight);
 
-                    WAVEFORM_DEBUG << "Waveform::paintEvent" << "tileIndex" << point.index
-                                   << "source" << point.pixelOffset << sourceRight
-                                   << "dest" << destLeft << destRight;
+                    WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent" << "tileIndex" << point.index
+                                         << "source" << point.pixelOffset << sourceRight
+                                         << "dest" << destLeft << destRight;
 
                     painter.drawPixmap(destRect, *tile.pixmap, sourceRect);
 
@@ -114,25 +120,25 @@ void Waveform::paintEvent(QPaintEvent * /*event*/)
 
                     if (point.index < m_tiles.count()) {
                         pos = tilePosition(point.index + 1);
-                        WAVEFORM_DEBUG << "Waveform::paintEvent" << "pos ->" << pos;
+                        WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent" << "pos ->" << pos;
                     } else {
                         // Reached end of tile array
-                        WAVEFORM_DEBUG << "Waveform::paintEvent" << "reached end of tile array";
+                        WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent" << "reached end of tile array";
                         break;
                     }
                 } else {
                     // Passed last tile which is painted
-                    WAVEFORM_DEBUG << "Waveform::paintEvent" << "tile" << point.index << "not painted";
+                    WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent" << "tile" << point.index << "not painted";
                     break;
                 }
             } else {
                 // pos is past end of tile array
-                WAVEFORM_DEBUG << "Waveform::paintEvent" << "pos" << pos << "past end of tile array";
+                WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent" << "pos" << pos << "past end of tile array";
                 break;
             }
         }
 
-        WAVEFORM_DEBUG << "Waveform::paintEvent" << "final pos" << pos << "final x" << destRight;
+        WAVEFORM_PAINT_DEBUG << "Waveform::paintEvent" << "final pos" << pos << "final x" << destRight;
     }
 }
 
@@ -146,7 +152,6 @@ void Waveform::initialize(const QAudioFormat &format, qint64 audioBufferSize, qi
 {
     WAVEFORM_DEBUG << "Waveform::initialize"
                    << "audioBufferSize" << audioBufferSize
-                   << "m_buffer.size()" << m_buffer.size()
                    << "windowDurationUs" << windowDurationUs;
 
     reset();
@@ -186,8 +191,9 @@ void Waveform::reset()
 {
     WAVEFORM_DEBUG << "Waveform::reset";
 
-    m_dataLength = 0;
-    m_position = 0;
+    m_bufferPosition = 0;
+    m_buffer = QByteArray();
+    m_audioPosition = 0;
     m_format = QAudioFormat();
     m_active = false;
     deletePixmaps();
@@ -198,30 +204,31 @@ void Waveform::reset()
     m_windowLength = 0;
 }
 
-void Waveform::dataLengthChanged(qint64 length)
+void Waveform::bufferChanged(qint64 position, qint64 length, const QByteArray &buffer)
 {
-    WAVEFORM_DEBUG << "Waveform::dataLengthChanged" << length;
-    const qint64 oldLength = m_dataLength;
-    m_dataLength = length;
-
-    if (m_active) {
-        if (m_dataLength < oldLength)
-            positionChanged(m_dataLength);
-        else
-            paintTiles();
-    }
+    WAVEFORM_DEBUG << "Waveform::bufferChanged"
+                   << "audioPosition" << m_audioPosition
+                   << "bufferPosition" << position
+                   << "bufferLength" << length;
+    m_bufferPosition = position;
+    m_bufferLength = length;
+    m_buffer = buffer;
+    paintTiles();
 }
 
-void Waveform::positionChanged(qint64 position)
+void Waveform::audioPositionChanged(qint64 position)
 {
-    WAVEFORM_DEBUG << "Waveform::positionChanged" << position;
-
-    if (position + m_windowLength > m_dataLength)
-        position = m_dataLength - m_windowLength;
-
-    m_position = position;
-
-    setWindowPosition(position);
+    WAVEFORM_DEBUG << "Waveform::audioPositionChanged"
+                   << "audioPosition" << position
+                   << "bufferPosition" << m_bufferPosition
+                   << "bufferLength" << m_bufferLength;
+
+    if (position >= m_bufferPosition) {
+        if (position + m_windowLength > m_bufferPosition + m_bufferLength)
+            position = qMax(qint64(0), m_bufferPosition + m_bufferLength - m_windowLength);
+        m_audioPosition = position;
+        setWindowPosition(position);
+    }
 }
 
 void Waveform::deletePixmaps()
@@ -255,8 +262,6 @@ void Waveform::createPixmaps(const QSize &widgetSize)
         m_tiles[i].pixmap = m_pixmaps[i];
         m_tiles[i].painted = false;
     }
-
-    paintTiles();
 }
 
 void Waveform::setWindowPosition(qint64 position)
@@ -327,8 +332,9 @@ bool Waveform::paintTiles()
     for (int i=0; i<m_tiles.count(); ++i) {
         const Tile &tile = m_tiles[i];
         if (!tile.painted) {
-            const qint64 tileEnd = m_tileArrayStart + (i + 1) * m_tileLength;
-            if (m_dataLength >= tileEnd) {
+            const qint64 tileStart = m_tileArrayStart + i * m_tileLength;
+            const qint64 tileEnd = tileStart + m_tileLength;
+            if (m_bufferPosition <= tileStart && m_bufferPosition + m_bufferLength >= tileEnd) {
                 paintTile(i);
                 updateRequired = true;
             }
@@ -343,16 +349,23 @@ bool Waveform::paintTiles()
 
 void Waveform::paintTile(int index)
 {
-    WAVEFORM_DEBUG << "Waveform::paintTile" << "index" << index;
-
     const qint64 tileStart = m_tileArrayStart + index * m_tileLength;
-    Q_ASSERT(m_dataLength >= tileStart + m_tileLength);
+
+    WAVEFORM_DEBUG << "Waveform::paintTile"
+                   << "index" << index
+                   << "bufferPosition" << m_bufferPosition
+                   << "bufferLength" << m_bufferLength
+                   << "start" << tileStart
+                   << "end" << tileStart + m_tileLength;
+
+    Q_ASSERT(m_bufferPosition <= tileStart);
+    Q_ASSERT(m_bufferPosition + m_bufferLength >= tileStart + m_tileLength);
 
     Tile &tile = m_tiles[index];
     Q_ASSERT(!tile.painted);
 
     const qint16* base = reinterpret_cast<const qint16*>(m_buffer.constData());
-    const qint16* buffer = base + (tileStart / 2);
+    const qint16* buffer = base + ((tileStart - m_bufferPosition) / 2);
     const int numSamples = m_tileLength / (2 * m_format.channels());
 
     QPainter painter(tile.pixmap);
@@ -376,6 +389,11 @@ void Waveform::paintTile(int index)
 
     for (int i=0; i<numSamples; ++i) {
         const qint16* ptr = buffer + i * m_format.channels();
+
+        const int offset = reinterpret_cast<const char*>(ptr) - m_buffer.constData();
+        Q_ASSERT(offset >= 0);
+        Q_ASSERT(offset < m_bufferLength);
+
         const qint16 pcmValue = *ptr;
         const qreal realValue = pcmToReal(pcmValue);
 
diff --git a/demos/spectrum/app/waveform.h b/demos/spectrum/app/waveform.h
index 57c9eec..1c54c86 100644
--- a/demos/spectrum/app/waveform.h
+++ b/demos/spectrum/app/waveform.h
@@ -60,7 +60,7 @@ QT_FORWARD_DECLARE_CLASS(QByteArray)
 class Waveform : public QWidget {
     Q_OBJECT
 public:
-    Waveform(const QByteArray &buffer, QWidget *parent = 0);
+    Waveform(QWidget *parent = 0);
     ~Waveform();
 
     // QWidget
@@ -73,8 +73,8 @@ public:
     void setAutoUpdatePosition(bool enabled);
 
 public slots:
-    void dataLengthChanged(qint64 length);
-    void positionChanged(qint64 position);
+    void bufferChanged(qint64 position, qint64 length, const QByteArray &buffer);
+    void audioPositionChanged(qint64 position);
 
 private:
     static const int NullIndex = -1;
@@ -167,9 +167,11 @@ private:
     void resetTiles(qint64 newStartPos);
 
 private:
-    const QByteArray&       m_buffer;
-    qint64                  m_dataLength;
-    qint64                  m_position;
+    qint64                  m_bufferPosition;
+    qint64                  m_bufferLength;
+    QByteArray              m_buffer;
+
+    qint64                  m_audioPosition;
     QAudioFormat            m_format;
 
     bool                    m_active;
diff --git a/demos/spectrum/app/wavfile.cpp b/demos/spectrum/app/wavfile.cpp
index 74d5918..44c3ac5 100644
--- a/demos/spectrum/app/wavfile.cpp
+++ b/demos/spectrum/app/wavfile.cpp
@@ -78,179 +78,74 @@ struct CombinedHeader
     WAVEHeader  wave;
 };
 
-
-
-WavFile::WavFile(const QAudioFormat &format, qint64 dataLength)
-    : m_format(format)
-    , m_dataLength(dataLength)
-    , m_dataPosition(0)
-{
-}
-
-bool WavFile::readHeader(QIODevice &device)
-{
-    if (!device.isSequential()) {
-        if (!device.seek(0))
-            return false;
-        // XXX: else, assume that current position is the start of the header
-    }
-
-    CombinedHeader header;
-    if (device.read(reinterpret_cast<char *>(&header), sizeof(CombinedHeader)) != sizeof(CombinedHeader))
-        return false;
-
-    if ((memcmp(&header.riff.descriptor.id, "RIFF", 4) == 0
-        || memcmp(&header.riff.descriptor.id, "RIFX", 4) == 0)
-        && memcmp(&header.riff.type, "WAVE", 4) == 0
-        && memcmp(&header.wave.descriptor.id, "fmt ", 4) == 0
-        && (header.wave.audioFormat == 1 || header.wave.audioFormat == 0)) {
-
-        // Read off remaining header information
-        DATAHeader dataHeader;
-
-        if (qFromLittleEndian<quint32>(header.wave.descriptor.size) > sizeof(WAVEHeader)) {
-            // Extended data available
-            quint16 extraFormatBytes;
-            if (device.peek((char*)&extraFormatBytes, sizeof(quint16)) != sizeof(quint16))
-                return false;
-            const qint64 throwAwayBytes = sizeof(quint16) + qFromLittleEndian<quint16>(extraFormatBytes);
-            if (device.read(throwAwayBytes).size() != throwAwayBytes)
-                return false;
-        }
-
-        if (device.read((char*)&dataHeader, sizeof(DATAHeader)) != sizeof(DATAHeader))
-            return false;
-
-        // Establish format
-        if (memcmp(&header.riff.descriptor.id, "RIFF", 4) == 0)
-            m_format.setByteOrder(QAudioFormat::LittleEndian);
-        else
-            m_format.setByteOrder(QAudioFormat::BigEndian);
-
-        int bps = qFromLittleEndian<quint16>(header.wave.bitsPerSample);
-        m_format.setChannels(qFromLittleEndian<quint16>(header.wave.numChannels));
-        m_format.setCodec("audio/pcm");
-        m_format.setFrequency(qFromLittleEndian<quint32>(header.wave.sampleRate));
-        m_format.setSampleSize(qFromLittleEndian<quint16>(header.wave.bitsPerSample));
-        m_format.setSampleType(bps == 8 ? QAudioFormat::UnSignedInt : QAudioFormat::SignedInt);
-
-        m_dataLength = qFromLittleEndian<quint32>(dataHeader.descriptor.size);
-        m_dataPosition = 0;
-    }
-
-    return true;
-}
-
-bool WavFile::writeHeader(QIODevice &device)
+WavFile::WavFile(QObject *parent)
+    : QFile(parent)
+    , m_headerLength(0)
 {
-    CombinedHeader header;
-    DATAHeader dataHeader;
-
-    memset(&header, 0, sizeof(CombinedHeader));
-
-    // RIFF header
-    if (m_format.byteOrder() == QAudioFormat::LittleEndian)
-        strncpy(&header.riff.descriptor.id[0], "RIFF", 4);
-    else
-        strncpy(&header.riff.descriptor.id[0], "RIFX", 4);
-    qToLittleEndian<quint32>(quint32(m_dataLength + sizeof(CombinedHeader) + sizeof(DATAHeader) - sizeof(chunk)),
-                             reinterpret_cast<unsigned char*>(&header.riff.descriptor.size));
-    strncpy(&header.riff.type[0], "WAVE", 4);
-
-    // WAVE header
-    strncpy(&header.wave.descriptor.id[0], "fmt ", 4);
-    qToLittleEndian<quint32>(quint32(16),
-                             reinterpret_cast<unsigned char*>(&header.wave.descriptor.size));
-    qToLittleEndian<quint16>(quint16(1),
-                             reinterpret_cast<unsigned char*>(&header.wave.audioFormat));
-    qToLittleEndian<quint16>(quint16(m_format.channels()),
-                             reinterpret_cast<unsigned char*>(&header.wave.numChannels));
-    qToLittleEndian<quint32>(quint32(m_format.frequency()),
-                             reinterpret_cast<unsigned char*>(&header.wave.sampleRate));
-    qToLittleEndian<quint32>(quint32(m_format.frequency() * m_format.channels() * m_format.sampleSize() / 8),
-                             reinterpret_cast<unsigned char*>(&header.wave.byteRate));
-    qToLittleEndian<quint16>(quint16(m_format.channels() * m_format.sampleSize() / 8),
-                             reinterpret_cast<unsigned char*>(&header.wave.blockAlign));
-    qToLittleEndian<quint16>(quint16(m_format.sampleSize()),
-                             reinterpret_cast<unsigned char*>(&header.wave.bitsPerSample));
-
-    // DATA header
-    strncpy(dataHeader.descriptor.id, "data", 4);
-    qToLittleEndian<quint32>(quint32(m_dataLength),
-                             reinterpret_cast<unsigned char*>(&dataHeader.descriptor.size));
 
-    return device.write(reinterpret_cast<const char *>(&header), sizeof(CombinedHeader)) == sizeof(CombinedHeader)
-           && device.write(reinterpret_cast<const char*>(&dataHeader), sizeof(DATAHeader)) == sizeof(DATAHeader);
 }
 
-const QAudioFormat& WavFile::format() const
+bool WavFile::open(const QString &fileName)
 {
-    return m_format;
+    close();
+    setFileName(fileName);
+    return QFile::open(QIODevice::ReadOnly) && readHeader();
 }
 
-qint64 WavFile::dataLength() const
+const QAudioFormat &WavFile::fileFormat() const
 {
-    return m_dataLength;
+    return m_fileFormat;
 }
 
-qint64 WavFile::headerLength()
+qint64 WavFile::headerLength() const
 {
-    return sizeof(CombinedHeader);
-}
-
-bool WavFile::writeDataLength(QIODevice &device, qint64 dataLength)
-{
-    bool result = false;
-    if (!device.isSequential()) {
-        device.seek(40);
-        unsigned char dataLengthLE[4];
-        qToLittleEndian<quint32>(quint32(dataLength), dataLengthLE);
-        result = (device.write(reinterpret_cast<const char *>(dataLengthLE), 4) == 4);
-    }
-    return result;
+return m_headerLength;
 }
 
-qint64 WavFile::readData(QIODevice &device, QByteArray &buffer,
-                         QAudioFormat outputFormat)
+bool WavFile::readHeader()
 {
-    // Sanity checks
-    if (!outputFormat.isValid())
-        outputFormat = m_format;
-
-    if (!isPCMS16LE(outputFormat) || !isPCMS16LE(m_format))
-        return 0;
-
-    if (m_dataPosition == m_dataLength)
-        return 0;
-
-    // Process
-    qint64 result = 0;
-
-    const int frameSize = 2 * m_format.channels(); // 16 bit samples
-    QVector<char> inputSample(frameSize);
-
-    qint16 *output = reinterpret_cast<qint16*>(buffer.data());
+    seek(0);
+    CombinedHeader header;
+    bool result = read(reinterpret_cast<char *>(&header), sizeof(CombinedHeader)) == sizeof(CombinedHeader);
+    if (result) {
+        if ((memcmp(&header.riff.descriptor.id, "RIFF", 4) == 0
+            || memcmp(&header.riff.descriptor.id, "RIFX", 4) == 0)
+            && memcmp(&header.riff.type, "WAVE", 4) == 0
+            && memcmp(&header.wave.descriptor.id, "fmt ", 4) == 0
+            && (header.wave.audioFormat == 1 || header.wave.audioFormat == 0)) {
+
+            // Read off remaining header information
+            DATAHeader dataHeader;
+
+            if (qFromLittleEndian<quint32>(header.wave.descriptor.size) > sizeof(WAVEHeader)) {
+                // Extended data available
+                quint16 extraFormatBytes;
+                if (peek((char*)&extraFormatBytes, sizeof(quint16)) != sizeof(quint16))
+                    return false;
+                const qint64 throwAwayBytes = sizeof(quint16) + qFromLittleEndian<quint16>(extraFormatBytes);
+                if (read(throwAwayBytes).size() != throwAwayBytes)
+                    return false;
+            }
 
-    while (result < buffer.size()) {
-        if (m_dataPosition == m_dataLength)
-            break;
+            if (read((char*)&dataHeader, sizeof(DATAHeader)) != sizeof(DATAHeader))
+                return false;
 
-        // XXX only working with particular alignments
-        if (device.read(inputSample.data(), inputSample.count())) {
-            int inputIdx = 0;
-            for (int outputIdx = 0; outputIdx < outputFormat.channels(); ++outputIdx) {
-                const qint16* input = reinterpret_cast<const qint16*>(inputSample.data() + 2 * inputIdx);
-                *output++ = qFromLittleEndian<qint16>(*input);
-                result += 2;
-                if (inputIdx < m_format.channels())
-                    ++inputIdx;
-            }
-            m_dataPosition += frameSize;
+            // Establish format
+            if (memcmp(&header.riff.descriptor.id, "RIFF", 4) == 0)
+                m_fileFormat.setByteOrder(QAudioFormat::LittleEndian);
+            else
+                m_fileFormat.setByteOrder(QAudioFormat::BigEndian);
+
+            int bps = qFromLittleEndian<quint16>(header.wave.bitsPerSample);
+            m_fileFormat.setChannels(qFromLittleEndian<quint16>(header.wave.numChannels));
+            m_fileFormat.setCodec("audio/pcm");
+            m_fileFormat.setFrequency(qFromLittleEndian<quint32>(header.wave.sampleRate));
+            m_fileFormat.setSampleSize(qFromLittleEndian<quint16>(header.wave.bitsPerSample));
+            m_fileFormat.setSampleType(bps == 8 ? QAudioFormat::UnSignedInt : QAudioFormat::SignedInt);
         } else {
-            break;
+            result = false;
         }
     }
-
+    m_headerLength = pos();
     return result;
 }
-
diff --git a/demos/spectrum/app/wavfile.h b/demos/spectrum/app/wavfile.h
index fc14b08..935e935 100644
--- a/demos/spectrum/app/wavfile.h
+++ b/demos/spectrum/app/wavfile.h
@@ -46,38 +46,22 @@
 #include <QtCore/qfile.h>
 #include <QtMultimedia/qaudioformat.h>
 
-/**
- * Helper class for reading WAV files
- *
- * See https://ccrma.stanford.edu/courses/422/projects/WaveFormat/
- */
-class WavFile
+class WavFile : public QFile
 {
 public:
-    WavFile(const QAudioFormat &format = QAudioFormat(),
-              qint64 dataLength = 0);
+    WavFile(QObject *parent = 0);
 
-    // Reads WAV header and seeks to start of data
-    bool readHeader(QIODevice &device);
+    bool open(const QString &fileName);
+    const QAudioFormat &fileFormat() const;
+    qint64 headerLength() const;
 
-    // Writes WAV header
-    bool writeHeader(QIODevice &device);
-
-    // Read PCM data
-    qint64 readData(QIODevice &device, QByteArray &buffer,
-                    QAudioFormat outputFormat = QAudioFormat());
-
-    const QAudioFormat& format() const;
-    qint64 dataLength() const;
-
-    static qint64 headerLength();
-
-    static bool writeDataLength(QIODevice &device, qint64 dataLength);
+private:
+    bool readHeader();
 
 private:
-    QAudioFormat m_format;
-    qint64 m_dataLength;
-    qint64 m_dataPosition;
+    QAudioFormat m_fileFormat;
+    qint64 m_headerLength;
+
 };
 
 #endif
-- 
cgit v0.12


From 1fff0c3c764500c755c615f9eb8dc90433406a10 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Fri, 29 Oct 2010 16:01:55 +0200
Subject: 32bit => 16bit conversion has 4byte-aligned output.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/dithering.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/dithering.cpp b/src/plugins/graphicssystems/meego/dithering.cpp
index b50826c..c0b4b53 100644
--- a/src/plugins/graphicssystems/meego/dithering.cpp
+++ b/src/plugins/graphicssystems/meego/dithering.cpp
@@ -76,8 +76,13 @@
 // Converts incoming RGB32 (QImage::Format_RGB32) to RGB565. Returns the newly allocated data.
 unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int height, int stride)
 {
+    // Output line stride. Alligned to 4 bytes.
+    int alignedWidth = width;
+    if (alignedWidth % 2 > 0)
+        alignedWidth++;
+
     // Will store output
-    unsigned short *out = (unsigned short *) malloc(width * height * 2);
+    unsigned short *out = (unsigned short *) malloc(alignedWidth * height * 2);
 
     // Lookup tables for the 8bit => 6bit and 8bit => 5bit conversion
     unsigned char lookup_8bit_to_5bit[256];
@@ -174,7 +179,7 @@ unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int h
             }
 
             // Write the newly produced pixel
-            PUT_565(out, x, y, width, component[2], component[1], component[0]);
+            PUT_565(out, x, y, alignedWidth, component[2], component[1], component[0]);
         }
     }
 
@@ -183,10 +188,16 @@ unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int h
 
 // Converts incoming RGBA32 (QImage::Format_ARGB32_Premultiplied) to RGB565. Returns the newly allocated data.
 // This function is similar (yet different) to the _565 variant but it makes sense to duplicate it here for simplicity.
+// The output has each scan line aligned to 4 bytes (as expected by GL by default).
 unsigned short* convertARGB32_to_RGBA4444(const unsigned char *in, int width, int height, int stride)
 {
+    // Output line stride. Alligned to 4 bytes.
+    int alignedWidth = width;
+    if (alignedWidth % 2 > 0)
+        alignedWidth++;
+
     // Will store output
-    unsigned short *out = (unsigned short *) malloc(width * height * 2);
+    unsigned short *out = (unsigned short *) malloc(alignedWidth * 2 * height);
 
     // Lookup tables for the 8bit => 4bit conversion
     unsigned char lookup_8bit_to_4bit[256];
@@ -269,7 +280,7 @@ unsigned short* convertARGB32_to_RGBA4444(const unsigned char *in, int width, in
             }
 
             // Write the newly produced pixel
-            PUT_4444(out, x, y, width, component[0], component[1], component[2], component[3]);
+            PUT_4444(out, x, y, alignedWidth, component[0], component[1], component[2], component[3]);
         }
     }
 
-- 
cgit v0.12


From 66b9f79a9577ee50ca0a9ef8a2ac7a09a3e68a50 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Sat, 30 Oct 2010 05:15:30 +1000
Subject: dbus does not use this. fix build.

Reviewed-by: trust me
---
 src/plugins/bearer/connman/qconnmanservice_linux.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 46b6e80..952a444 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -79,7 +79,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
                                QLatin1String(CONNMAN_MANAGER_PATH),
                                QLatin1String(CONNMAN_MANAGER_INTERFACE),
                                QLatin1String("PropertyChanged"),
-                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & ))), Qt::UniqueConnection) {
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
             qWarning() << "PropertyCHanged not connected";
         }
     }
@@ -89,7 +89,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
                                     QLatin1String(CONNMAN_MANAGER_PATH),
                                     QLatin1String(CONNMAN_MANAGER_INTERFACE),
                                     QLatin1String("StateChanged"),
-                                    this,SIGNAL(stateChanged(const QString&))), Qt::UniqueConnection) {
+                                    this,SIGNAL(stateChanged(const QString&)))) {
             qWarning() << "StateChanged not connected";
 
         }
@@ -338,7 +338,7 @@ void QConnmanNetworkInterface::connectNotify(const char *signal)
                                this->path(),
                                QLatin1String(CONNMAN_NETWORK_INTERFACE),
                                QLatin1String("PropertyChanged"),
-                               this,SIGNAL(propertyChanged(QString,QDBusVariant))), Qt::UniqueConnection) {
+                               this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
             qWarning() << "network properties not connected";
         }
     }
@@ -350,7 +350,7 @@ void QConnmanNetworkInterface::connectNotify(const char *signal)
                                this->path(),
                                QLatin1String(CONNMAN_NETWORK_INTERFACE),
                                QLatin1String("PropertyChanged"),
-                               helper,SLOT(propertyChanged(QString,QDBusVariant))), Qt::UniqueConnection;
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
 
         QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
                 this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
-- 
cgit v0.12


From 81fc8ec995a07909e59602b9281fbebfff4bd94c Mon Sep 17 00:00:00 2001
From: Charles Yin <charles.yin@nokia.com>
Date: Thu, 28 Oct 2010 10:13:34 +1000
Subject: Fix QTBUG-14640:oci performance problem with qlonglong

missing qlonglong switch case in bindValue(), so all qlonglong value
fall back into QString, which makes the query slow.

Change-Id: I7d8bf1c44ce3aaa15ee85be325a5c98dc3ed3ce1
Task-number:QTBUG-14640
Reviewed-by: Michael Goddard
---
 src/sql/drivers/oci/qsql_oci.cpp       |  8 ++++++++
 tests/auto/qsqlquery/tst_qsqlquery.cpp | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index 3f30ea5..2392a17 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -291,6 +291,14 @@ int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, in
                          sizeof(uint),
                          SQLT_UIN, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
         break;
+    case QVariant::LongLong:
+        r = OCIBindByPos(sql, hbnd, err,
+                           pos + 1,
+                           // if it's an out value, the data is already detached
+                           // so the const cast is safe.
+                           const_cast<void *>(data),
+                           sizeof(OCINumber),
+                           SQLT_VNU, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
     case QVariant::Double:
         r = OCIBindByPos(sql, hbnd, err,
                          pos + 1,
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index 7c93c7a..5367bd6 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -211,6 +211,8 @@ private slots:
     void QTBUG_5765();
     void QTBUG_14132_data() { generic_data("QOCI"); }
     void QTBUG_14132();
+    void QTBUG_14640_data() { generic_data("QOCI"); }
+    void QTBUG_14640();
     void sqlite_constraint_data() { generic_data("QSQLITE"); }
     void sqlite_constraint();
 
@@ -329,7 +331,8 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
                << qTableName( "Planet", __FILE__ )
                << qTableName( "task_250026", __FILE__ )
                << qTableName( "task_234422", __FILE__ )
-               << qTableName("test141895", __FILE__);
+               << qTableName("test141895", __FILE__)
+               << qTableName("qtest_QTBUG14640", __FILE__);
 
     if ( db.driverName().startsWith("QPSQL") )
         tablenames << qTableName("task_233829", __FILE__);
@@ -3101,6 +3104,32 @@ void tst_QSqlQuery::QTBUG_5765()
     QCOMPARE(q.value(0).toInt(), 123);
 }
 
+void tst_QSqlQuery::QTBUG_14640()
+{
+    QFETCH( QString, dbName );
+    QSqlDatabase db = QSqlDatabase::database( dbName );
+    CHECK_DATABASE( db );
+    const QString qtest_QTBUG14640(qTableName("qtest_QTBUG14640", __FILE__));
+
+    QSqlQuery q( db );
+    q.setForwardOnly( true );
+    QVERIFY_SQL( q, exec( "create table " + qtest_QTBUG14640 +
+                            " (col1 number, col2 number)" ) );
+    QVERIFY_SQL( q, exec( "insert into " + qtest_QTBUG14640 + " values (1, 1111)" ) );
+    QVERIFY_SQL( q, exec( "insert into " + qtest_QTBUG14640 + " values (2, 2222)" ) );
+    QVERIFY_SQL( q, exec( "insert into " + qtest_QTBUG14640 + " values (3, 3333)" ) );
+
+    QString sqlStr = "select * from " + qtest_QTBUG14640 +  " where col1 == :bindValue0 AND col2 == :bindValue1";
+    q.prepare(sqlStr);
+    q.bindValue(":bindValue0", qlonglong(1), QSql::In);
+    q.bindValue(":bindValue1", qlonglong(1111), QSql::In);
+    QVERIFY_SQL( q, exec() );
+
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toLongLong(),  qlonglong(1));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  qlonglong(1111));
+}
+
 void tst_QSqlQuery::sqlite_constraint()
 {
     QFETCH( QString, dbName );
-- 
cgit v0.12


From 95e00f7d712ee51389948a018b27c0d1dde4fa99 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Mon, 1 Nov 2010 11:11:58 +1000
Subject: Fix QML visual tests on Mac.

Task-number: QTBUG-14792
---
 .../qmlvisual/focusscope/data-MAC/test3.0.png      |  Bin 0 -> 1549 bytes
 .../qmlvisual/focusscope/data-MAC/test3.1.png      |  Bin 0 -> 1140 bytes
 .../qmlvisual/focusscope/data-MAC/test3.2.png      |  Bin 0 -> 1338 bytes
 .../qmlvisual/focusscope/data-MAC/test3.3.png      |  Bin 0 -> 1221 bytes
 .../qmlvisual/focusscope/data-MAC/test3.qml        | 1327 ++++++
 .../align/data-MAC/multilineAlign.0.png            |  Bin 0 -> 2434 bytes
 .../align/data-MAC/multilineAlign.qml              |  247 ++
 .../baseline/data-MAC/parentanchor.qml             |  131 +
 .../qdeclarativetext/elide/data-MAC/elide.0.png    |  Bin 2276 -> 1613 bytes
 .../qdeclarativetext/elide/data-MAC/elide.qml      |  132 +-
 .../qdeclarativetext/elide/data-MAC/elide2.0.png   |  Bin 4818 -> 3477 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.1.png   |  Bin 4089 -> 3080 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.2.png   |  Bin 3128 -> 2501 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.3.png   |  Bin 1963 -> 1574 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.qml     |  482 +-
 .../elide/data-MAC/multilength.0.png               |  Bin 736 -> 2877 bytes
 .../elide/data-MAC/multilength.qml                 |  146 +-
 .../qdeclarativetext/font/data-MAC/plaintext.0.png |  Bin 98050 -> 95506 bytes
 .../qdeclarativetext/font/data-MAC/richtext.0.png  |  Bin 125068 -> 121473 bytes
 .../data-MAC/cursorDelegate.0.png                  |  Bin 793 -> 3542 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 795 -> 3566 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 803 -> 3592 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 805 -> 3570 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 805 -> 3569 bytes
 .../data-MAC/cursorDelegate.5.png                  |  Bin 805 -> 3147 bytes
 .../data-MAC/cursorDelegate.6.png                  |  Bin 799 -> 3145 bytes
 .../data-MAC/cursorDelegate.7.png                  |  Bin 799 -> 3146 bytes
 .../data-MAC/cursorDelegate.8.png                  |  Bin 803 -> 3144 bytes
 .../data-MAC/cursorDelegate.9.png                  |  Bin 0 -> 3135 bytes
 .../data-MAC/cursorDelegate.qml                    | 3050 +++----------
 .../qdeclarativetextedit/data-MAC/qt-669.0.png     |  Bin 365 -> 3293 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.1.png     |  Bin 365 -> 3298 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.2.png     |  Bin 366 -> 3290 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.3.png     |  Bin 362 -> 3295 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.qml       |  530 +--
 .../data-MAC/usingMultilineEdit.0.png              |  Bin 0 -> 4954 bytes
 .../data-MAC/usingMultilineEdit.1.png              |  Bin 0 -> 5289 bytes
 .../data-MAC/usingMultilineEdit.10.png             |  Bin 0 -> 8028 bytes
 .../data-MAC/usingMultilineEdit.11.png             |  Bin 0 -> 8028 bytes
 .../data-MAC/usingMultilineEdit.2.png              |  Bin 0 -> 5820 bytes
 .../data-MAC/usingMultilineEdit.3.png              |  Bin 0 -> 6293 bytes
 .../data-MAC/usingMultilineEdit.4.png              |  Bin 0 -> 6484 bytes
 .../data-MAC/usingMultilineEdit.5.png              |  Bin 0 -> 6657 bytes
 .../data-MAC/usingMultilineEdit.6.png              |  Bin 0 -> 7006 bytes
 .../data-MAC/usingMultilineEdit.7.png              |  Bin 0 -> 6792 bytes
 .../data-MAC/usingMultilineEdit.8.png              |  Bin 0 -> 7844 bytes
 .../data-MAC/usingMultilineEdit.9.png              |  Bin 0 -> 8028 bytes
 .../data-MAC/usingMultilineEdit.qml                | 4687 ++++++++++++++++++++
 .../qdeclarativetextedit/data-MAC/wrap.0.png       |  Bin 0 -> 11729 bytes
 .../qdeclarativetextedit/data-MAC/wrap.1.png       |  Bin 0 -> 11956 bytes
 .../qdeclarativetextedit/data-MAC/wrap.2.png       |  Bin 0 -> 12323 bytes
 .../qdeclarativetextedit/data-MAC/wrap.3.png       |  Bin 0 -> 12931 bytes
 .../qdeclarativetextedit/data-MAC/wrap.4.png       |  Bin 0 -> 13447 bytes
 .../qdeclarativetextedit/data-MAC/wrap.5.png       |  Bin 0 -> 13478 bytes
 .../qdeclarativetextedit/data-MAC/wrap.6.png       |  Bin 0 -> 13478 bytes
 .../qdeclarativetextedit/data-MAC/wrap.qml         | 2467 +++++++++++
 .../data-MAC/cursorDelegate.0.png                  |  Bin 793 -> 3557 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 796 -> 4062 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 804 -> 3529 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 805 -> 3563 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 805 -> 3566 bytes
 .../data-MAC/cursorDelegate.qml                    | 2966 +++----------
 .../qdeclarativetextinput/data-MAC/echoMode.0.png  |  Bin 0 -> 681 bytes
 .../qdeclarativetextinput/data-MAC/echoMode.1.png  |  Bin 0 -> 1299 bytes
 .../qdeclarativetextinput/data-MAC/echoMode.2.png  |  Bin 0 -> 1968 bytes
 .../qdeclarativetextinput/data-MAC/echoMode.qml    | 1043 +++++
 .../qdeclarativetextinput/data-MAC/hAlign.qml      |  107 +
 tools/qml/qdeclarativetester.cpp                   |    8 +
 68 files changed, 11728 insertions(+), 5595 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml

diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png
new file mode 100644
index 0000000..e469a79
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png
new file mode 100644
index 0000000..905603f
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png
new file mode 100644
index 0000000..5cbd3bd
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png
new file mode 100644
index 0000000..851c1ba
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
new file mode 100644
index 0000000..0c9747e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
@@ -0,0 +1,1327 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 32
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 48
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 64
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 80
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 96
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 112
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 128
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 144
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 160
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 176
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 192
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 208
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 224
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 240
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 256
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 272
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 288
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 304
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 320
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 336
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 352
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 368
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 384
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 400
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 416
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 432
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 448
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 464
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 480
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 496
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 512
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 528
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "be06cc567f08fbc0cd60d753a19df162"
+    }
+    Frame {
+        msec: 560
+        hash: "c4cf6807b423553872e848146e79efb3"
+    }
+    Frame {
+        msec: 576
+        hash: "b83923f1eef68a4a8dd36acad0f4b592"
+    }
+    Frame {
+        msec: 592
+        hash: "5599829a04f2c2a6c6181c5857762ba0"
+    }
+    Frame {
+        msec: 608
+        hash: "95da52b5add95150dd446bc5055a2b60"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 624
+        hash: "9bb2757c3b1bbc051edd9ebd240611f8"
+    }
+    Frame {
+        msec: 640
+        hash: "25213fbced4c67f42ce35d07db93bb32"
+    }
+    Frame {
+        msec: 656
+        hash: "2a9ded25ed2dbb9563f9c14084234a22"
+    }
+    Frame {
+        msec: 672
+        hash: "2f532511a50d743aa1c7ebcc9b2b7350"
+    }
+    Frame {
+        msec: 688
+        hash: "2f532511a50d743aa1c7ebcc9b2b7350"
+    }
+    Frame {
+        msec: 704
+        hash: "2f532511a50d743aa1c7ebcc9b2b7350"
+    }
+    Frame {
+        msec: 720
+        hash: "2f532511a50d743aa1c7ebcc9b2b7350"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 736
+        hash: "8c9f7d72e077a7e75d185a2ecbdcc77c"
+    }
+    Frame {
+        msec: 752
+        hash: "55a417e91f182ebd28dd7264d8b76363"
+    }
+    Frame {
+        msec: 768
+        hash: "01a637de9f60c82bfd9140e852e17574"
+    }
+    Frame {
+        msec: 784
+        hash: "01194b2c3489ea7298e961979064aab3"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 800
+        hash: "f6126328d483536d3f161f71d40821df"
+    }
+    Frame {
+        msec: 816
+        hash: "b99dd9793a63bbdab37cfe236d56c589"
+    }
+    Frame {
+        msec: 832
+        hash: "825f39b42d0b2e0d894874713b731cfc"
+    }
+    Frame {
+        msec: 848
+        hash: "7729b9c2133c52e50f43d6100a24e9c2"
+    }
+    Frame {
+        msec: 864
+        hash: "e2f3bec9571b08b451309221b34ace5e"
+    }
+    Frame {
+        msec: 880
+        hash: "e2f3bec9571b08b451309221b34ace5e"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 896
+        hash: "8e59b002437ec17043d11c92556365fd"
+    }
+    Frame {
+        msec: 912
+        hash: "3809a54af9c9a4b15aa8b82caa5b703f"
+    }
+    Frame {
+        msec: 928
+        hash: "96cb1ab7123c54d4fa0d93b6501a439d"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 944
+        hash: "de74cd5be709954522dd02945d6da9c9"
+    }
+    Frame {
+        msec: 960
+        image: "test3.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "d3ff94471da3620701d62b87f37fca8b"
+    }
+    Frame {
+        msec: 992
+        hash: "15bccb078b9061ef50c73a974e2f43fa"
+    }
+    Frame {
+        msec: 1008
+        hash: "ea2059d511fdab60e77e9261f81aadfb"
+    }
+    Frame {
+        msec: 1024
+        hash: "ea2059d511fdab60e77e9261f81aadfb"
+    }
+    Frame {
+        msec: 1040
+        hash: "ea2059d511fdab60e77e9261f81aadfb"
+    }
+    Frame {
+        msec: 1056
+        hash: "ea2059d511fdab60e77e9261f81aadfb"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1072
+        hash: "5b68568968d0de3a9bad8d053045f45c"
+    }
+    Frame {
+        msec: 1088
+        hash: "6b6da385fbc00e3542d7007524ff87f6"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1104
+        hash: "bba5021ad78a5a142cf54d4db8d8689e"
+    }
+    Frame {
+        msec: 1120
+        hash: "5c223d5dcf028cd3bac18b21359253f3"
+    }
+    Frame {
+        msec: 1136
+        hash: "c5b09a11d466fd90e1014f58755ec77b"
+    }
+    Frame {
+        msec: 1152
+        hash: "f4ba8fcc4f955e25c2364d8ee1054d0d"
+    }
+    Frame {
+        msec: 1168
+        hash: "2a6009e790cd98e3a67c107b0f08e00b"
+    }
+    Frame {
+        msec: 1184
+        hash: "caa1b5ee40dc20c87516b7292a86f79b"
+    }
+    Frame {
+        msec: 1200
+        hash: "200dd4ac9c40c6eb32ad43570995f17d"
+    }
+    Frame {
+        msec: 1216
+        hash: "200dd4ac9c40c6eb32ad43570995f17d"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1232
+        hash: "2333dcdf0f46ade554e036caa5e3cb31"
+    }
+    Frame {
+        msec: 1248
+        hash: "9b09c65db96f483dec7ba3a55b5a91e6"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1264
+        hash: "49fc76245e741968095ab689195da40c"
+    }
+    Frame {
+        msec: 1280
+        hash: "4e991b92348d813f5a3a1080270a88a3"
+    }
+    Frame {
+        msec: 1296
+        hash: "1e4a07fc966dab9ee0d39b25a4c43c09"
+    }
+    Frame {
+        msec: 1312
+        hash: "ade33b908f2a5e6916a74bc00b08414e"
+    }
+    Frame {
+        msec: 1328
+        hash: "481b41b7bc8fafcb40b7d09fcfc2e86e"
+    }
+    Frame {
+        msec: 1344
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1360
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1376
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1392
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1408
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1424
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1440
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1456
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1472
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 1488
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "2a8a2867f38ff05a9ef5fa50fe7de229"
+    }
+    Frame {
+        msec: 1520
+        hash: "824ec4f9e596a67fe6ca17ea03529c1f"
+    }
+    Frame {
+        msec: 1536
+        hash: "bf7d9c49d0a0ff4d03ceadf8d797a774"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1552
+        hash: "3e3c62601c2965e851e8b5c0adb73651"
+    }
+    Frame {
+        msec: 1568
+        hash: "ed7357b2596da4683bb19cbf1dcd6458"
+    }
+    Frame {
+        msec: 1584
+        hash: "32ed0774f926341af504b716bd9394e1"
+    }
+    Frame {
+        msec: 1600
+        hash: "2d4ffbd7cf53ca4824d206d4a4608ebb"
+    }
+    Frame {
+        msec: 1616
+        hash: "a7a0b6bd336f00a10818bdd9992a29bb"
+    }
+    Frame {
+        msec: 1632
+        hash: "55801794958126a1890bc0122084ee20"
+    }
+    Frame {
+        msec: 1648
+        hash: "55801794958126a1890bc0122084ee20"
+    }
+    Frame {
+        msec: 1664
+        hash: "55801794958126a1890bc0122084ee20"
+    }
+    Frame {
+        msec: 1680
+        hash: "55801794958126a1890bc0122084ee20"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1696
+        hash: "49573efd5a0bc65107a074fb35d67f63"
+    }
+    Frame {
+        msec: 1712
+        hash: "c9bf07bc12f97c6d0eef816ce4423f5b"
+    }
+    Frame {
+        msec: 1728
+        hash: "ab91f24c27d52123502815381e926cdc"
+    }
+    Frame {
+        msec: 1744
+        hash: "32ca7e06569a63d56ab71c67c9f82d60"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "9e5f04f019ccd1f27b511faeb7470e10"
+    }
+    Frame {
+        msec: 1776
+        hash: "5544186a3338dd788367fa4262815204"
+    }
+    Frame {
+        msec: 1792
+        hash: "c01aa7b7363faf99f69b90be8843f059"
+    }
+    Frame {
+        msec: 1808
+        hash: "6bd1ec848b817ef978b4dfae4eb23c1e"
+    }
+    Frame {
+        msec: 1824
+        hash: "b75bd8d4e4f3fb5067b05ebf37f92e9b"
+    }
+    Frame {
+        msec: 1840
+        hash: "b75bd8d4e4f3fb5067b05ebf37f92e9b"
+    }
+    Frame {
+        msec: 1856
+        hash: "b75bd8d4e4f3fb5067b05ebf37f92e9b"
+    }
+    Frame {
+        msec: 1872
+        hash: "b75bd8d4e4f3fb5067b05ebf37f92e9b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1888
+        hash: "04a3efd4b810417632726048bdffa904"
+    }
+    Frame {
+        msec: 1904
+        hash: "c347e7d3dccba41102e2b669c9e9c0a0"
+    }
+    Frame {
+        msec: 1920
+        image: "test3.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "47c9794374c383e1f595e60ea6890e11"
+    }
+    Frame {
+        msec: 1952
+        hash: "73cdfe34edab93baea779896169b4195"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1968
+        hash: "53add51d9e11a1fc4d0f6e3d1c6a70bc"
+    }
+    Frame {
+        msec: 1984
+        hash: "90143346b171faf5bdb7d4d0c0556b24"
+    }
+    Frame {
+        msec: 2000
+        hash: "e4e642507d3a631f5813a11cb7673c91"
+    }
+    Frame {
+        msec: 2016
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2032
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2048
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2064
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2080
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2096
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2112
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2128
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2144
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2160
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2176
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2192
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2208
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2224
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2240
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2256
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2272
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2288
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2304
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2320
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2336
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2352
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2368
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2384
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2400
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2416
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2432
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2448
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Frame {
+        msec: 2464
+        hash: "f5f1725edd19f1735139d178955533f8"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2480
+        hash: "512e992c6d621225735c37e2626714ad"
+    }
+    Frame {
+        msec: 2496
+        hash: "1a708d62af48302e93dda0ef0822aebb"
+    }
+    Frame {
+        msec: 2512
+        hash: "220660969092ba1b17addc6ba7148e06"
+    }
+    Frame {
+        msec: 2528
+        hash: "9dcdd42efc9beb957abdeaf2ee01fc43"
+    }
+    Frame {
+        msec: 2544
+        hash: "5995ac01ee680d6747dc78c36f70b577"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "c6eb964d8f4bf849df63eebdfbf6e286"
+    }
+    Frame {
+        msec: 2576
+        hash: "cff1925a172e278a36068886f0efbcbf"
+    }
+    Frame {
+        msec: 2592
+        hash: "4c725a05332806387713ab54302c559f"
+    }
+    Frame {
+        msec: 2608
+        hash: "b75bd8d4e4f3fb5067b05ebf37f92e9b"
+    }
+    Frame {
+        msec: 2624
+        hash: "b75bd8d4e4f3fb5067b05ebf37f92e9b"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2640
+        hash: "0cb7eeb24a6845d43ce0662c91b72bd3"
+    }
+    Frame {
+        msec: 2656
+        hash: "6dedbf7dc59b05dc57355141de0b660d"
+    }
+    Frame {
+        msec: 2672
+        hash: "5f82259afdabef688dd76729b5f847c7"
+    }
+    Frame {
+        msec: 2688
+        hash: "b67d418427db34726ddada60f76178a6"
+    }
+    Frame {
+        msec: 2704
+        hash: "780c9551f55fd46d294a1eef3b34aa34"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2720
+        hash: "521efe1778b2d2031071b55f30999de9"
+    }
+    Frame {
+        msec: 2736
+        hash: "49539356de68b7cd2cea52986ed2bb67"
+    }
+    Frame {
+        msec: 2752
+        hash: "55801794958126a1890bc0122084ee20"
+    }
+    Frame {
+        msec: 2768
+        hash: "55801794958126a1890bc0122084ee20"
+    }
+    Frame {
+        msec: 2784
+        hash: "55801794958126a1890bc0122084ee20"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "b08ee15bfd1916b9619a0a3eeeec90b6"
+    }
+    Frame {
+        msec: 2816
+        hash: "3b4e65a0d4ee764d418d82a055ba9c87"
+    }
+    Frame {
+        msec: 2832
+        hash: "269d37497b0cd292a5b03124d1687ff6"
+    }
+    Frame {
+        msec: 2848
+        hash: "59fecd7ec62bf8c89e2222744d36e194"
+    }
+    Frame {
+        msec: 2864
+        hash: "71deceeac8b42a70868bb3ff788543b5"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2880
+        image: "test3.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "ad790d242e84fec0bd75e1d7771682d7"
+    }
+    Frame {
+        msec: 2912
+        hash: "c09f4fca4ae14e0e41d9b58c1b83096f"
+    }
+    Frame {
+        msec: 2928
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Frame {
+        msec: 2944
+        hash: "68b528414ba662f14ea71511a01f8d33"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2960
+        hash: "015bf8203d45e5d477242055a3f19bfb"
+    }
+    Frame {
+        msec: 2976
+        hash: "ba2fb1258a2f3a81882780d3c7d5320a"
+    }
+    Frame {
+        msec: 2992
+        hash: "3637ffd219d403ed433fd72cd68a9b23"
+    }
+    Frame {
+        msec: 3008
+        hash: "b0d858f1d51872969022f717c12480ed"
+    }
+    Frame {
+        msec: 3024
+        hash: "0504b13a8f7cd68a1d64a22e46ea8654"
+    }
+    Frame {
+        msec: 3040
+        hash: "d07cffa36609433e4a677e373ee7a3ff"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3056
+        hash: "c1fd98ebc22e512f7199e0f319e88728"
+    }
+    Frame {
+        msec: 3072
+        hash: "200dd4ac9c40c6eb32ad43570995f17d"
+    }
+    Frame {
+        msec: 3088
+        hash: "200dd4ac9c40c6eb32ad43570995f17d"
+    }
+    Frame {
+        msec: 3104
+        hash: "200dd4ac9c40c6eb32ad43570995f17d"
+    }
+    Frame {
+        msec: 3120
+        hash: "200dd4ac9c40c6eb32ad43570995f17d"
+    }
+    Frame {
+        msec: 3136
+        hash: "200dd4ac9c40c6eb32ad43570995f17d"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3152
+        hash: "5822b744b64944c515e8a01f52c7429f"
+    }
+    Frame {
+        msec: 3168
+        hash: "7d4ab5a17e7d6184f124299053cf94e3"
+    }
+    Frame {
+        msec: 3184
+        hash: "253cfd5001e4e4541d9cfd6370291cd2"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3200
+        hash: "1b1cab9d331c613dde896829027110f5"
+    }
+    Frame {
+        msec: 3216
+        hash: "8127f681a5c475133cfca95483fef2ce"
+    }
+    Frame {
+        msec: 3232
+        hash: "1a944877735fe3531d95b418dd75d576"
+    }
+    Frame {
+        msec: 3248
+        hash: "47ddcfaed130bf7dd539d965ebebedc1"
+    }
+    Frame {
+        msec: 3264
+        hash: "d0c37d1a7e97034d0f41ea6c2fff8f34"
+    }
+    Frame {
+        msec: 3280
+        hash: "ea2059d511fdab60e77e9261f81aadfb"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3296
+        hash: "11a907436350afa5ff592880303b4344"
+    }
+    Frame {
+        msec: 3312
+        hash: "39801aef92c2b1e0ca39bede36840911"
+    }
+    Frame {
+        msec: 3328
+        hash: "93463b61a00078f488f3941bc4729100"
+    }
+    Frame {
+        msec: 3344
+        hash: "f8d9cbe20b87017d81fbf627f3a3b2cd"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3360
+        hash: "2b8d37e7dcfb14394caf19aa8bc4b956"
+    }
+    Frame {
+        msec: 3376
+        hash: "bf91006930a3f22f12b62787c57bb91b"
+    }
+    Frame {
+        msec: 3392
+        hash: "7ce1d106e9d78a4a64f35f5982d32298"
+    }
+    Frame {
+        msec: 3408
+        hash: "e2f3bec9571b08b451309221b34ace5e"
+    }
+    Frame {
+        msec: 3424
+        hash: "e2f3bec9571b08b451309221b34ace5e"
+    }
+    Frame {
+        msec: 3440
+        hash: "e2f3bec9571b08b451309221b34ace5e"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3456
+        hash: "71cd749e039a54aaaa05e1d3ccc738b4"
+    }
+    Frame {
+        msec: 3472
+        hash: "39e7afb00d53e098c005a1d96a8cc727"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3488
+        hash: "a9d2fa99fc70919e55293c07427147a2"
+    }
+    Frame {
+        msec: 3504
+        hash: "96bb62cd9ebc2eba9797605190820349"
+    }
+    Frame {
+        msec: 3520
+        hash: "111b0d230c44d5d156e082a50c2a2a66"
+    }
+    Frame {
+        msec: 3536
+        hash: "1085cebcc8fdaefb2ec03392763c7657"
+    }
+    Frame {
+        msec: 3552
+        hash: "451d670f44ae42d8cbb6a12cc6469d61"
+    }
+    Frame {
+        msec: 3568
+        hash: "5c65a7b6ed7b4e85bb883c671aae5136"
+    }
+    Frame {
+        msec: 3584
+        hash: "2f532511a50d743aa1c7ebcc9b2b7350"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3600
+        hash: "41424200cb76a0d5d64f8919645f6afb"
+    }
+    Frame {
+        msec: 3616
+        hash: "7a910e4b17fb7f5d10308e07ea8ce0a3"
+    }
+    Frame {
+        msec: 3632
+        hash: "4d9cc5670105acf3bc080cba8e100376"
+    }
+    Frame {
+        msec: 3648
+        hash: "a09d3b45bef532ed86d737839592ffc8"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3664
+        hash: "70179b7be24acd6d5d0d0de9d8fff74d"
+    }
+    Frame {
+        msec: 3680
+        hash: "95964eef01bfc86216a8e91261b867ed"
+    }
+    Frame {
+        msec: 3696
+        hash: "12b5e2bbfd573b2b8e33a745cd5af5a6"
+    }
+    Frame {
+        msec: 3712
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3728
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3744
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3760
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3776
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3792
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3808
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3824
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3840
+        image: "test3.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3872
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3888
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3904
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3920
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3936
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3952
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3968
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 3984
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4000
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4016
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4032
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4048
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4064
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4080
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4096
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4112
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4128
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4144
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4160
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4176
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4192
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4208
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4224
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4240
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+    Frame {
+        msec: 4256
+        hash: "cb8a5743fd3c5093740bb2a4f57ade81"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
new file mode 100644
index 0000000..5243f4a
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
new file mode 100644
index 0000000..ad7f35e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
@@ -0,0 +1,247 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 32
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 48
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 64
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 80
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 96
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 112
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 128
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 144
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 160
+        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+    }
+    Frame {
+        msec: 176
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 192
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 208
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 224
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 240
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 256
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 272
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 288
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 304
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 320
+        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+    }
+    Frame {
+        msec: 336
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 352
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 368
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 384
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 400
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 416
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 432
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 448
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 464
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 480
+        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+    }
+    Frame {
+        msec: 496
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 512
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 528
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 544
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 560
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 576
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 592
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 608
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 624
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 640
+        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+    }
+    Frame {
+        msec: 656
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 672
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 688
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 704
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 720
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 736
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 752
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 768
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 784
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 800
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 816
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 832
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 848
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 864
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 880
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 896
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 912
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 928
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 944
+        hash: "52f90c22e44475fac04559164c044aee"
+    }
+    Frame {
+        msec: 960
+        image: "multilineAlign.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
new file mode 100644
index 0000000..56527d1
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
@@ -0,0 +1,131 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 32
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 48
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 64
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 80
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 96
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 112
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 128
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 144
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 160
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 176
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 192
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 208
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 224
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 240
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 256
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 272
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 288
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 304
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 320
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 336
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 352
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 368
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 384
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 400
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 416
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 432
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 448
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 464
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 480
+        hash: "01ef07707e44ea079350128454209892"
+    }
+    Frame {
+        msec: 496
+        hash: "01ef07707e44ea079350128454209892"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png
index eea3362..91ee2e5 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
index 9439f73..718375a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 32
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 48
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 64
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 80
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 96
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 112
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 128
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 144
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 160
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 176
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 192
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 208
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 224
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 240
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 256
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 272
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 288
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 304
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 320
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 336
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 352
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 368
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 384
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 400
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 416
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 432
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 448
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 464
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 480
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 496
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 512
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 528
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 544
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 560
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 576
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 592
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 608
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 624
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 640
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 656
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 672
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 688
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 704
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 720
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 736
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 752
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 768
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 784
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 800
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 816
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 832
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 848
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 864
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 880
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 896
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 912
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 928
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 944
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 960
@@ -246,34 +246,34 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 992
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1008
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1024
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1040
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1056
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png
index 3dfade5..0f9a0aa 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png
index 1ee2076..f3bb7b9 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png
index ae680be..b2f09de 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png
index c2859be..bca63db 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
index 3e34f04..48a0ff4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 32
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 48
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 64
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 80
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 96
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 112
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 128
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 144
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 160
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 176
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 192
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 208
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 224
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 240
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 256
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 272
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 288
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 304
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 320
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 336
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 352
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 368
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 384
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 400
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 416
-        hash: "086a46352aa1221b5e57f5624b0c256b"
+        hash: "083c607c9b66240f445611a18f3025b3"
     }
     Frame {
         msec: 432
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
     }
     Frame {
         msec: 448
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
     }
     Frame {
         msec: 464
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
     }
     Frame {
         msec: 480
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+        hash: "45086d8e81c178855fc1e8fd283b7157"
     }
     Frame {
         msec: 496
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+        hash: "45086d8e81c178855fc1e8fd283b7157"
     }
     Frame {
         msec: 512
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+        hash: "45086d8e81c178855fc1e8fd283b7157"
     }
     Frame {
         msec: 528
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+        hash: "45086d8e81c178855fc1e8fd283b7157"
     }
     Frame {
         msec: 544
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+        hash: "45086d8e81c178855fc1e8fd283b7157"
     }
     Frame {
         msec: 560
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+        hash: "45086d8e81c178855fc1e8fd283b7157"
     }
     Frame {
         msec: 576
-        hash: "4daa612cd7e7ee455ff1a93329202865"
+        hash: "c859ff5a516792a614008d0d3d096060"
     }
     Frame {
         msec: 592
-        hash: "4daa612cd7e7ee455ff1a93329202865"
+        hash: "c859ff5a516792a614008d0d3d096060"
     }
     Frame {
         msec: 608
-        hash: "4daa612cd7e7ee455ff1a93329202865"
+        hash: "c859ff5a516792a614008d0d3d096060"
     }
     Frame {
         msec: 624
-        hash: "4daa612cd7e7ee455ff1a93329202865"
+        hash: "c859ff5a516792a614008d0d3d096060"
     }
     Frame {
         msec: 640
-        hash: "4daa612cd7e7ee455ff1a93329202865"
+        hash: "c859ff5a516792a614008d0d3d096060"
     }
     Frame {
         msec: 656
-        hash: "3f362ad550db910f1d9f261557c65913"
+        hash: "02d4eb733c7249f2c38c1768a9988739"
     }
     Frame {
         msec: 672
-        hash: "3f362ad550db910f1d9f261557c65913"
+        hash: "02d4eb733c7249f2c38c1768a9988739"
     }
     Frame {
         msec: 688
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
+        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
     }
     Frame {
         msec: 704
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
+        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
     }
     Frame {
         msec: 720
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
+        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
     }
     Frame {
         msec: 736
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
+        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
     }
     Frame {
         msec: 752
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
+        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
     }
     Frame {
         msec: 768
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
+        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
     }
     Frame {
         msec: 784
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
+        hash: "3262cf6b60e56028056b81db17cfef61"
     }
     Frame {
         msec: 800
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
+        hash: "3262cf6b60e56028056b81db17cfef61"
     }
     Frame {
         msec: 816
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
+        hash: "3262cf6b60e56028056b81db17cfef61"
     }
     Frame {
         msec: 832
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+        hash: "31c337926e645ad93699a223c7ad223e"
     }
     Frame {
         msec: 848
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+        hash: "31c337926e645ad93699a223c7ad223e"
     }
     Frame {
         msec: 864
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+        hash: "31c337926e645ad93699a223c7ad223e"
     }
     Frame {
         msec: 880
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+        hash: "31c337926e645ad93699a223c7ad223e"
     }
     Frame {
         msec: 896
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+        hash: "31c337926e645ad93699a223c7ad223e"
     }
     Frame {
         msec: 912
-        hash: "a7dc1d7dde956d62834de0968261386f"
+        hash: "64253f08448ad6884b76271afe7831ab"
     }
     Frame {
         msec: 928
-        hash: "a7dc1d7dde956d62834de0968261386f"
+        hash: "64253f08448ad6884b76271afe7831ab"
     }
     Frame {
         msec: 944
-        hash: "a7dc1d7dde956d62834de0968261386f"
+        hash: "64253f08448ad6884b76271afe7831ab"
     }
     Frame {
         msec: 960
@@ -246,247 +246,247 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "a7dc1d7dde956d62834de0968261386f"
+        hash: "64253f08448ad6884b76271afe7831ab"
     }
     Frame {
         msec: 992
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
+        hash: "f463cbd97856cd3cb0316cfbbc4c960f"
     }
     Frame {
         msec: 1008
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
+        hash: "f463cbd97856cd3cb0316cfbbc4c960f"
     }
     Frame {
         msec: 1024
-        hash: "778d34ca89b5db88fe26619576e9d337"
+        hash: "06731429ea2d012364b2fd6177e4fcb1"
     }
     Frame {
         msec: 1040
-        hash: "778d34ca89b5db88fe26619576e9d337"
+        hash: "06731429ea2d012364b2fd6177e4fcb1"
     }
     Frame {
         msec: 1056
-        hash: "778d34ca89b5db88fe26619576e9d337"
+        hash: "06731429ea2d012364b2fd6177e4fcb1"
     }
     Frame {
         msec: 1072
-        hash: "778d34ca89b5db88fe26619576e9d337"
+        hash: "06731429ea2d012364b2fd6177e4fcb1"
     }
     Frame {
         msec: 1088
-        hash: "778d34ca89b5db88fe26619576e9d337"
+        hash: "06731429ea2d012364b2fd6177e4fcb1"
     }
     Frame {
         msec: 1104
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
+        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
     }
     Frame {
         msec: 1120
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
+        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
     }
     Frame {
         msec: 1136
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
+        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
     }
     Frame {
         msec: 1152
-        hash: "000061a140ab71a44c0480a92ad3bc70"
+        hash: "2cb79791e784739b5c4a12578df47205"
     }
     Frame {
         msec: 1168
-        hash: "000061a140ab71a44c0480a92ad3bc70"
+        hash: "2cb79791e784739b5c4a12578df47205"
     }
     Frame {
         msec: 1184
-        hash: "000061a140ab71a44c0480a92ad3bc70"
+        hash: "2cb79791e784739b5c4a12578df47205"
     }
     Frame {
         msec: 1200
-        hash: "5dec9638853165428cd15ae02e1d03ce"
+        hash: "c040d9e9494193164206890e8dd79508"
     }
     Frame {
         msec: 1216
-        hash: "5dec9638853165428cd15ae02e1d03ce"
+        hash: "c040d9e9494193164206890e8dd79508"
     }
     Frame {
         msec: 1232
-        hash: "5dec9638853165428cd15ae02e1d03ce"
+        hash: "c040d9e9494193164206890e8dd79508"
     }
     Frame {
         msec: 1248
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+        hash: "daaa92c4049a1ef9d290d99b0c83306e"
     }
     Frame {
         msec: 1264
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+        hash: "daaa92c4049a1ef9d290d99b0c83306e"
     }
     Frame {
         msec: 1280
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+        hash: "daaa92c4049a1ef9d290d99b0c83306e"
     }
     Frame {
         msec: 1296
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+        hash: "daaa92c4049a1ef9d290d99b0c83306e"
     }
     Frame {
         msec: 1312
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+        hash: "daaa92c4049a1ef9d290d99b0c83306e"
     }
     Frame {
         msec: 1328
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+        hash: "afedb8f328ae31f2e5d68cd917d652ff"
     }
     Frame {
         msec: 1344
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+        hash: "afedb8f328ae31f2e5d68cd917d652ff"
     }
     Frame {
         msec: 1360
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+        hash: "afedb8f328ae31f2e5d68cd917d652ff"
     }
     Frame {
         msec: 1376
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+        hash: "afedb8f328ae31f2e5d68cd917d652ff"
     }
     Frame {
         msec: 1392
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+        hash: "afedb8f328ae31f2e5d68cd917d652ff"
     }
     Frame {
         msec: 1408
-        hash: "d4230a476237f9e13a132e775f1b960c"
+        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
     }
     Frame {
         msec: 1424
-        hash: "d4230a476237f9e13a132e775f1b960c"
+        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
     }
     Frame {
         msec: 1440
-        hash: "d4230a476237f9e13a132e775f1b960c"
+        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
     }
     Frame {
         msec: 1456
-        hash: "d4230a476237f9e13a132e775f1b960c"
+        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
     }
     Frame {
         msec: 1472
-        hash: "d4230a476237f9e13a132e775f1b960c"
+        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
     }
     Frame {
         msec: 1488
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+        hash: "79e56686d52dad27374fe45933f7e045"
     }
     Frame {
         msec: 1504
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+        hash: "79e56686d52dad27374fe45933f7e045"
     }
     Frame {
         msec: 1520
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+        hash: "79e56686d52dad27374fe45933f7e045"
     }
     Frame {
         msec: 1536
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+        hash: "79e56686d52dad27374fe45933f7e045"
     }
     Frame {
         msec: 1552
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+        hash: "79e56686d52dad27374fe45933f7e045"
     }
     Frame {
         msec: 1568
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+        hash: "79e56686d52dad27374fe45933f7e045"
     }
     Frame {
         msec: 1584
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+        hash: "ad8f8e33731a8861016c3c9567419fff"
     }
     Frame {
         msec: 1600
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+        hash: "ad8f8e33731a8861016c3c9567419fff"
     }
     Frame {
         msec: 1616
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+        hash: "ad8f8e33731a8861016c3c9567419fff"
     }
     Frame {
         msec: 1632
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+        hash: "609e9d64c3e376b37cf0833333d57a0b"
     }
     Frame {
         msec: 1648
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+        hash: "609e9d64c3e376b37cf0833333d57a0b"
     }
     Frame {
         msec: 1664
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+        hash: "609e9d64c3e376b37cf0833333d57a0b"
     }
     Frame {
         msec: 1680
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+        hash: "609e9d64c3e376b37cf0833333d57a0b"
     }
     Frame {
         msec: 1696
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+        hash: "f3a64e17c082529f753292a722a2b3e8"
     }
     Frame {
         msec: 1712
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+        hash: "f3a64e17c082529f753292a722a2b3e8"
     }
     Frame {
         msec: 1728
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+        hash: "f3a64e17c082529f753292a722a2b3e8"
     }
     Frame {
         msec: 1744
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+        hash: "76627f7257d24b08a9011c806d4c8458"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 1760
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+        hash: "76627f7257d24b08a9011c806d4c8458"
     }
     Frame {
         msec: 1776
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+        hash: "76627f7257d24b08a9011c806d4c8458"
     }
     Frame {
         msec: 1792
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+        hash: "76627f7257d24b08a9011c806d4c8458"
     }
     Frame {
         msec: 1808
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
     }
     Frame {
         msec: 1824
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
     }
     Frame {
         msec: 1840
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
     }
     Frame {
         msec: 1856
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
     }
     Frame {
         msec: 1872
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
     }
     Frame {
         msec: 1888
-        hash: "976dd5bc154522438f92790f28639512"
+        hash: "9005e33c220aaadb6c1b756c496140b5"
     }
     Frame {
         msec: 1904
-        hash: "976dd5bc154522438f92790f28639512"
+        hash: "9005e33c220aaadb6c1b756c496140b5"
     }
     Frame {
         msec: 1920
@@ -494,239 +494,239 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "976dd5bc154522438f92790f28639512"
+        hash: "9005e33c220aaadb6c1b756c496140b5"
     }
     Frame {
         msec: 1952
-        hash: "976dd5bc154522438f92790f28639512"
+        hash: "9005e33c220aaadb6c1b756c496140b5"
     }
     Frame {
         msec: 1968
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+        hash: "1664ce25b0e427b89e64c00668797dc1"
     }
     Frame {
         msec: 1984
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+        hash: "1664ce25b0e427b89e64c00668797dc1"
     }
     Frame {
         msec: 2000
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+        hash: "1664ce25b0e427b89e64c00668797dc1"
     }
     Frame {
         msec: 2016
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+        hash: "1664ce25b0e427b89e64c00668797dc1"
     }
     Frame {
         msec: 2032
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+        hash: "1664ce25b0e427b89e64c00668797dc1"
     }
     Frame {
         msec: 2048
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+        hash: "4421ad90c93cca320b790c0432745a5e"
     }
     Frame {
         msec: 2064
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+        hash: "4421ad90c93cca320b790c0432745a5e"
     }
     Frame {
         msec: 2080
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+        hash: "4421ad90c93cca320b790c0432745a5e"
     }
     Frame {
         msec: 2096
-        hash: "1a978ed6951afe40912efcfb54dcce65"
+        hash: "c21285318beec99e9afd1dde46a5497b"
     }
     Frame {
         msec: 2112
-        hash: "1a978ed6951afe40912efcfb54dcce65"
+        hash: "c21285318beec99e9afd1dde46a5497b"
     }
     Frame {
         msec: 2128
-        hash: "1a978ed6951afe40912efcfb54dcce65"
+        hash: "c21285318beec99e9afd1dde46a5497b"
     }
     Frame {
         msec: 2144
-        hash: "a57eea59fe6475164e24688489977869"
+        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
     }
     Frame {
         msec: 2160
-        hash: "a57eea59fe6475164e24688489977869"
+        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
     }
     Frame {
         msec: 2176
-        hash: "a57eea59fe6475164e24688489977869"
+        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
     }
     Frame {
         msec: 2192
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+        hash: "ad984149e44b3be55e420b1be3c0b8c3"
     }
     Frame {
         msec: 2208
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+        hash: "ad984149e44b3be55e420b1be3c0b8c3"
     }
     Frame {
         msec: 2224
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+        hash: "ad984149e44b3be55e420b1be3c0b8c3"
     }
     Frame {
         msec: 2240
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+        hash: "ad984149e44b3be55e420b1be3c0b8c3"
     }
     Frame {
         msec: 2256
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+        hash: "ad984149e44b3be55e420b1be3c0b8c3"
     }
     Frame {
         msec: 2272
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
+        hash: "cd016ce04572119cf89263091ae55b2f"
     }
     Frame {
         msec: 2288
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
+        hash: "cd016ce04572119cf89263091ae55b2f"
     }
     Frame {
         msec: 2304
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+        hash: "e621ae81e0da861323efe03d1a6f2ac4"
     }
     Frame {
         msec: 2320
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+        hash: "e621ae81e0da861323efe03d1a6f2ac4"
     }
     Frame {
         msec: 2336
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+        hash: "e621ae81e0da861323efe03d1a6f2ac4"
     }
     Frame {
         msec: 2352
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+        hash: "e621ae81e0da861323efe03d1a6f2ac4"
     }
     Frame {
         msec: 2368
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+        hash: "e621ae81e0da861323efe03d1a6f2ac4"
     }
     Frame {
         msec: 2384
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+        hash: "b9f9502b8acbd59927b78104dc39b3ea"
     }
     Frame {
         msec: 2400
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+        hash: "b9f9502b8acbd59927b78104dc39b3ea"
     }
     Frame {
         msec: 2416
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+        hash: "b9f9502b8acbd59927b78104dc39b3ea"
     }
     Frame {
         msec: 2432
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+        hash: "b9f9502b8acbd59927b78104dc39b3ea"
     }
     Frame {
         msec: 2448
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+        hash: "b9f9502b8acbd59927b78104dc39b3ea"
     }
     Frame {
         msec: 2464
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+        hash: "69bc7470ddd917ec73a075ba16715ccf"
     }
     Frame {
         msec: 2480
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+        hash: "69bc7470ddd917ec73a075ba16715ccf"
     }
     Frame {
         msec: 2496
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+        hash: "69bc7470ddd917ec73a075ba16715ccf"
     }
     Frame {
         msec: 2512
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+        hash: "69bc7470ddd917ec73a075ba16715ccf"
     }
     Frame {
         msec: 2528
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+        hash: "69bc7470ddd917ec73a075ba16715ccf"
     }
     Frame {
         msec: 2544
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
     }
     Frame {
         msec: 2560
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
     }
     Frame {
         msec: 2576
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
     }
     Frame {
         msec: 2592
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
     }
     Frame {
         msec: 2608
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+        hash: "c82742c641c411df5d9ecb4d19b7a30d"
     }
     Frame {
         msec: 2624
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+        hash: "c82742c641c411df5d9ecb4d19b7a30d"
     }
     Frame {
         msec: 2640
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+        hash: "c82742c641c411df5d9ecb4d19b7a30d"
     }
     Frame {
         msec: 2656
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+        hash: "ae50d41ef5289fc31b5cd18462905379"
     }
     Frame {
         msec: 2672
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+        hash: "ae50d41ef5289fc31b5cd18462905379"
     }
     Frame {
         msec: 2688
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+        hash: "ae50d41ef5289fc31b5cd18462905379"
     }
     Frame {
         msec: 2704
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+        hash: "ae50d41ef5289fc31b5cd18462905379"
     }
     Frame {
         msec: 2720
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+        hash: "38d393df298826121109b6bd2d454bc0"
     }
     Frame {
         msec: 2736
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+        hash: "38d393df298826121109b6bd2d454bc0"
     }
     Frame {
         msec: 2752
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+        hash: "38d393df298826121109b6bd2d454bc0"
     }
     Frame {
         msec: 2768
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+        hash: "38d393df298826121109b6bd2d454bc0"
     }
     Frame {
         msec: 2784
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+        hash: "38d393df298826121109b6bd2d454bc0"
     }
     Frame {
         msec: 2800
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+        hash: "38d393df298826121109b6bd2d454bc0"
     }
     Frame {
         msec: 2816
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+        hash: "38d393df298826121109b6bd2d454bc0"
     }
     Frame {
         msec: 2832
-        hash: "f44b88b80219497370b5d2ad380d03bf"
+        hash: "50a47e20ff34a2935b1dde36c85f7f54"
     }
     Frame {
         msec: 2848
-        hash: "f44b88b80219497370b5d2ad380d03bf"
+        hash: "50a47e20ff34a2935b1dde36c85f7f54"
     }
     Frame {
         msec: 2864
-        hash: "a093510751799f3466156f9775988044"
+        hash: "4daa350f9385217b9eef714f40b4e6d0"
     }
     Frame {
         msec: 2880
@@ -734,239 +734,239 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "a093510751799f3466156f9775988044"
+        hash: "4daa350f9385217b9eef714f40b4e6d0"
     }
     Frame {
         msec: 2912
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+        hash: "0e36ea4104aa509455555796262ea30d"
     }
     Frame {
         msec: 2928
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+        hash: "0e36ea4104aa509455555796262ea30d"
     }
     Frame {
         msec: 2944
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+        hash: "0e36ea4104aa509455555796262ea30d"
     }
     Frame {
         msec: 2960
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+        hash: "0e36ea4104aa509455555796262ea30d"
     }
     Frame {
         msec: 2976
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+        hash: "0e36ea4104aa509455555796262ea30d"
     }
     Frame {
         msec: 2992
-        hash: "d7da3826914ad1d2696803b659992e73"
+        hash: "4dd59519884c4aa19834430b2b0a3040"
     }
     Frame {
         msec: 3008
-        hash: "d7da3826914ad1d2696803b659992e73"
+        hash: "4dd59519884c4aa19834430b2b0a3040"
     }
     Frame {
         msec: 3024
-        hash: "d7da3826914ad1d2696803b659992e73"
+        hash: "4dd59519884c4aa19834430b2b0a3040"
     }
     Frame {
         msec: 3040
-        hash: "d7da3826914ad1d2696803b659992e73"
+        hash: "4dd59519884c4aa19834430b2b0a3040"
     }
     Frame {
         msec: 3056
-        hash: "d7da3826914ad1d2696803b659992e73"
+        hash: "4dd59519884c4aa19834430b2b0a3040"
     }
     Frame {
         msec: 3072
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+        hash: "5e2e943b2ab6f798660b32e132ec6bef"
     }
     Frame {
         msec: 3088
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+        hash: "5e2e943b2ab6f798660b32e132ec6bef"
     }
     Frame {
         msec: 3104
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+        hash: "5e2e943b2ab6f798660b32e132ec6bef"
     }
     Frame {
         msec: 3120
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
+        hash: "a64b8d6bae4b6445d5de78b126e3af63"
     }
     Frame {
         msec: 3136
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
+        hash: "a64b8d6bae4b6445d5de78b126e3af63"
     }
     Frame {
         msec: 3152
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+        hash: "8732d4c3b6ea276079794d2c892d14a9"
     }
     Frame {
         msec: 3168
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+        hash: "8732d4c3b6ea276079794d2c892d14a9"
     }
     Frame {
         msec: 3184
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+        hash: "8732d4c3b6ea276079794d2c892d14a9"
     }
     Frame {
         msec: 3200
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+        hash: "931f767d8c733d2262b8c73003629fd1"
     }
     Frame {
         msec: 3216
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+        hash: "931f767d8c733d2262b8c73003629fd1"
     }
     Frame {
         msec: 3232
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+        hash: "931f767d8c733d2262b8c73003629fd1"
     }
     Frame {
         msec: 3248
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+        hash: "931f767d8c733d2262b8c73003629fd1"
     }
     Frame {
         msec: 3264
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+        hash: "931f767d8c733d2262b8c73003629fd1"
     }
     Frame {
         msec: 3280
-        hash: "39f1b201715413f13a60f449eef29706"
+        hash: "526f7d87bdce834a8d4396df4406d4c7"
     }
     Frame {
         msec: 3296
-        hash: "39f1b201715413f13a60f449eef29706"
+        hash: "526f7d87bdce834a8d4396df4406d4c7"
     }
     Frame {
         msec: 3312
-        hash: "39f1b201715413f13a60f449eef29706"
+        hash: "526f7d87bdce834a8d4396df4406d4c7"
     }
     Frame {
         msec: 3328
-        hash: "39f1b201715413f13a60f449eef29706"
+        hash: "526f7d87bdce834a8d4396df4406d4c7"
     }
     Frame {
         msec: 3344
-        hash: "39f1b201715413f13a60f449eef29706"
+        hash: "526f7d87bdce834a8d4396df4406d4c7"
     }
     Frame {
         msec: 3360
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
+        hash: "0c9bb37ebb01a6127b60d26792cc3524"
     }
     Frame {
         msec: 3376
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
+        hash: "0c9bb37ebb01a6127b60d26792cc3524"
     }
     Frame {
         msec: 3392
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
+        hash: "0c9bb37ebb01a6127b60d26792cc3524"
     }
     Frame {
         msec: 3408
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
+        hash: "04b580975c168ef07b11496a18b55582"
     }
     Frame {
         msec: 3424
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
+        hash: "04b580975c168ef07b11496a18b55582"
     }
     Frame {
         msec: 3440
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
     }
     Frame {
         msec: 3456
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
     }
     Frame {
         msec: 3472
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
     }
     Frame {
         msec: 3488
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
     }
     Frame {
         msec: 3504
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
     }
     Frame {
         msec: 3520
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
     }
     Frame {
         msec: 3536
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+        hash: "179c36c797dfd91fdc6bd373f5331cbb"
     }
     Frame {
         msec: 3552
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+        hash: "179c36c797dfd91fdc6bd373f5331cbb"
     }
     Frame {
         msec: 3568
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+        hash: "179c36c797dfd91fdc6bd373f5331cbb"
     }
     Frame {
         msec: 3584
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+        hash: "179c36c797dfd91fdc6bd373f5331cbb"
     }
     Frame {
         msec: 3600
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+        hash: "179c36c797dfd91fdc6bd373f5331cbb"
     }
     Frame {
         msec: 3616
-        hash: "b8853dc109d063d982952780aa80419a"
+        hash: "49b9d5168c3fa5e09953251ffb509743"
     }
     Frame {
         msec: 3632
-        hash: "b8853dc109d063d982952780aa80419a"
+        hash: "49b9d5168c3fa5e09953251ffb509743"
     }
     Frame {
         msec: 3648
-        hash: "b8853dc109d063d982952780aa80419a"
+        hash: "49b9d5168c3fa5e09953251ffb509743"
     }
     Frame {
         msec: 3664
-        hash: "b8853dc109d063d982952780aa80419a"
+        hash: "49b9d5168c3fa5e09953251ffb509743"
     }
     Frame {
         msec: 3680
-        hash: "b8853dc109d063d982952780aa80419a"
+        hash: "49b9d5168c3fa5e09953251ffb509743"
     }
     Frame {
         msec: 3696
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
+        hash: "da74be0adb46300cac7ba9bfe3660c33"
     }
     Frame {
         msec: 3712
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
+        hash: "da74be0adb46300cac7ba9bfe3660c33"
     }
     Frame {
         msec: 3728
-        hash: "b6dba4a456cd8d1b62501039cb796625"
+        hash: "9276749ab90c7da1eb62c6277613f75a"
     }
     Frame {
         msec: 3744
-        hash: "b6dba4a456cd8d1b62501039cb796625"
+        hash: "9276749ab90c7da1eb62c6277613f75a"
     }
     Frame {
         msec: 3760
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+        hash: "b85b7f367d4da5bd01fe87a292a356fd"
     }
     Frame {
         msec: 3776
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+        hash: "b85b7f367d4da5bd01fe87a292a356fd"
     }
     Frame {
         msec: 3792
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+        hash: "b85b7f367d4da5bd01fe87a292a356fd"
     }
     Frame {
         msec: 3808
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+        hash: "b85b7f367d4da5bd01fe87a292a356fd"
     }
     Frame {
         msec: 3824
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+        hash: "b85b7f367d4da5bd01fe87a292a356fd"
     }
     Frame {
         msec: 3840
@@ -974,18 +974,18 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
+        hash: "e871d5f9d6437154ef85a60fe5a6a08e"
     }
     Frame {
         msec: 3872
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
+        hash: "e871d5f9d6437154ef85a60fe5a6a08e"
     }
     Frame {
         msec: 3888
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
+        hash: "f66f5d470e913f4bec6c8982702b8a60"
     }
     Frame {
         msec: 3904
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
+        hash: "f66f5d470e913f4bec6c8982702b8a60"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png
index 80549b4..944208b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
index 76c2ee1..e76ad11 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "17f39c541a0b5bf958c3fdaa51b72fec"
+        hash: "fa4edc25cc530be81c5c18c089c76643"
     }
     Frame {
         msec: 32
-        hash: "da61bb1afef532688045116bcce1da40"
+        hash: "d543f734101d89c6d4e4a5992bd34cb3"
     }
     Frame {
         msec: 48
-        hash: "04ddcb158ce8ade4ea9ad16405c7d81a"
+        hash: "fc96f61ab3f8235d96c815f8876728f5"
     }
     Frame {
         msec: 64
-        hash: "7ca43ec7a6e630c9bc07478abf5c2686"
+        hash: "0bdeb73a4cfbe216ca795756baa353c8"
     }
     Frame {
         msec: 80
-        hash: "ae2c4e73395cf4a5663110ba1b9996b2"
+        hash: "4451049db7f7d0b62325af6d27073f16"
     }
     Frame {
         msec: 96
-        hash: "5059426cced6ff6f92102100416b34d8"
+        hash: "ef51f1424db831f962960e468b547cc5"
     }
     Frame {
         msec: 112
-        hash: "e816cb366ba9498d0ae194b789c25f12"
+        hash: "c79ffb52d5aa11e2ee99e9db57c58c3e"
     }
     Frame {
         msec: 128
-        hash: "fd8cd9b2916b7045086df92d19e8b436"
+        hash: "3827b0ca877b214ceffdc7444f9eae14"
     }
     Frame {
         msec: 144
-        hash: "965dfe4cad0a3d07c0b086d6351a43a1"
+        hash: "8e375f05606f04f81c2ff0551ce7a290"
     }
     Frame {
         msec: 160
-        hash: "56759a670c864d5f2ae392fa8545f3a4"
+        hash: "8d48743f9d3c02cdb342c57b080ab52a"
     }
     Frame {
         msec: 176
-        hash: "8d3c2be4fcef526650cc84b5c2d29170"
+        hash: "a8d1cae0e817ca059a73594f35eeccaf"
     }
     Frame {
         msec: 192
-        hash: "6d9f995bef186a69b259b8d18470f0e7"
+        hash: "71d024907815100b5ea74e072e167384"
     }
     Frame {
         msec: 208
-        hash: "670c68a0943c5f037f8bf4c9ca0df501"
+        hash: "8f294501a7d0dff60233c922161f0b8d"
     }
     Frame {
         msec: 224
-        hash: "6218cf02cb762aa6c33985fe1b2e47bb"
+        hash: "303deae49dd99baba31af8915dd43d4d"
     }
     Frame {
         msec: 240
-        hash: "6e3424f2b72d6582ceb5a6c1bfe3dba4"
+        hash: "41f34af1ca4417e546d40057727a24b8"
     }
     Frame {
         msec: 256
-        hash: "fb819344ab1d2966b043be790831e680"
+        hash: "baf5102132a01cb44925f7fc1532f8fb"
     }
     Frame {
         msec: 272
-        hash: "a729845b780cc708ddd578eab3bc0ab1"
+        hash: "559c5e92b2cc8f20c2289bdabc7d2a3c"
     }
     Frame {
         msec: 288
-        hash: "543f6566c4dfaecb70007848cc4f8525"
+        hash: "39a50d44ae47e6c358d6ebaa2234cbfb"
     }
     Frame {
         msec: 304
-        hash: "5497699414bd8a428ead9703dc7273d5"
+        hash: "4bdfe9e04c2ee21a584dc7612603fe62"
     }
     Frame {
         msec: 320
-        hash: "e9230e525bb0ce33fe4bf3a2c948357d"
+        hash: "e3ff2c98c9309964ccc612c4499817ff"
     }
     Frame {
         msec: 336
-        hash: "ef6a6989f013d444547c0b98a65a34bf"
+        hash: "f3509a8a9fe255e30e1b23ca36803169"
     }
     Frame {
         msec: 352
-        hash: "ee89f5163fe269884d59acac7fc23336"
+        hash: "644629a42f8a2c8dc1f84e274e25df52"
     }
     Frame {
         msec: 368
-        hash: "0ffb11ceccdc607c1a072dde4aa40f93"
+        hash: "e169e2e67b0ebffc2181463a1e155e5c"
     }
     Frame {
         msec: 384
-        hash: "97a51d7916e04815724506e289040e2a"
+        hash: "74ccb97fe629c48211543e885930f18e"
     }
     Frame {
         msec: 400
-        hash: "a63d6d73827e1b40a7fec76e6555d7ab"
+        hash: "14d97918485475971a832002a333722d"
     }
     Frame {
         msec: 416
-        hash: "d3eaf72442852317a48dc2b638ad48be"
+        hash: "4e768d02555701df2109d07259228b05"
     }
     Frame {
         msec: 432
-        hash: "fa867a486d51089ddfeb60b9d44b329e"
+        hash: "ceeeeffb00e1f74ace1a11832d183c81"
     }
     Frame {
         msec: 448
-        hash: "834ee944cfc63209bcba94153ccd2c4e"
+        hash: "3e6660aff9dfd72e5bd7e67d547af8b5"
     }
     Frame {
         msec: 464
-        hash: "6d637d4763ae457233ab669f9f124bc1"
+        hash: "991a782f939dbfe96b316254177f34ad"
     }
     Frame {
         msec: 480
-        hash: "66c60bd9de1870f46b726c404ab924d5"
+        hash: "ce4adfec222428d3fd7dd6069c69674c"
     }
     Frame {
         msec: 496
-        hash: "088499b53390e3a2c3ca7f42cac101a4"
+        hash: "27d658710bdeb0395052291bb736fdac"
     }
     Frame {
         msec: 512
-        hash: "19d41f7696c86120460c4db7a0f9be1a"
+        hash: "a448c7c9fc2b4cf62f57ced461e39a05"
     }
     Frame {
         msec: 528
-        hash: "cd3ae14964e174db94e3e6c8609f366a"
+        hash: "0e1fd2a517db3a3fafb2840bbe550592"
     }
     Frame {
         msec: 544
-        hash: "0c2172e091c2fb42d7c016779fa543d7"
+        hash: "2ff7fe0c183fddc88d0daaabb866d78b"
     }
     Frame {
         msec: 560
-        hash: "7534175e24b2cbab08518de8fc691003"
+        hash: "73c952ed17daaf19755728185d999f96"
     }
     Frame {
         msec: 576
-        hash: "a9ef64d20b4f93e60f25753e2d7dd2e0"
+        hash: "85e9928b19d66b8ab1ee6b10d8b2b401"
     }
     Frame {
         msec: 592
-        hash: "d8e62a9fec27bfc892b0f3034bc73c3f"
+        hash: "0c6fa7c70f98d53f2f0425e79083dc2c"
     }
     Frame {
         msec: 608
-        hash: "f8eee41f72e17693074a2ac250bb850e"
+        hash: "589813b70ea86dd5ebe47ccf2121b5a8"
     }
     Frame {
         msec: 624
-        hash: "3a08b62a8aa1f410415afbd7b8ee8728"
+        hash: "7b94db2fd4f35fda4183a4351581a931"
     }
     Frame {
         msec: 640
-        hash: "0c4fba2bc8b7e440736f4a23d048c23c"
+        hash: "5769822d37ed1e88aacbbaaddbd7520a"
     }
     Frame {
         msec: 656
-        hash: "521264dbeec0fbe3a467739f0c3f7b85"
+        hash: "36ab6549d745c1d0e7a7b47b9d1f6887"
     }
     Frame {
         msec: 672
-        hash: "2c455560a624acfb7f316eae8926d765"
+        hash: "d130cecb02cdacc0cdbcce80e492d21b"
     }
     Frame {
         msec: 688
-        hash: "c9fa632a0998cfae39d434b623b3060d"
+        hash: "d1395dbf450e90c4f18c872cd50fca8f"
     }
     Frame {
         msec: 704
-        hash: "506ea16572fa0ee72cddcedfe5b4b9ea"
+        hash: "7415bda155a9287ba22eac9c0548f10e"
     }
     Frame {
         msec: 720
-        hash: "83ae06a3ad24d2a6d49c71df2a287716"
+        hash: "b65b886a632b042c00317a4013071f6c"
     }
     Frame {
         msec: 736
-        hash: "d4b11b45b4f97de0c0b878b97b804f09"
+        hash: "cf4289cd85cb18bbf1a677008d8f1f0a"
     }
     Frame {
         msec: 752
-        hash: "868aac6c273b7cc90c31c14298ab9a3b"
+        hash: "97a6e76519c522854ec88cc9e40165da"
     }
     Frame {
         msec: 768
-        hash: "03d4222586194bb6513305d1837d3467"
+        hash: "bb80a571507cdc994f79ef05b0ad3b68"
     }
     Frame {
         msec: 784
-        hash: "21e6cd89f06077bd5d346c7ccb8fa1e9"
+        hash: "823d647182b73e0f57ff7aca373160f1"
     }
     Frame {
         msec: 800
-        hash: "326092c4c29217f5afb5730ab3984353"
+        hash: "29b649d6cc3510a904561050bea9aa5b"
     }
     Frame {
         msec: 816
-        hash: "4963d64093e65fe1973ffab5b7a15abc"
+        hash: "195089eb803c1eef039bac097e446ae6"
     }
     Frame {
         msec: 832
-        hash: "3125e6e553bbf3f2fcf8fbf797a0c1f8"
+        hash: "eb5d4b8a47cec6940c5c5019e1ca2fae"
     }
     Frame {
         msec: 848
-        hash: "879b24c994d4a9854d08bda2bbf2ceda"
+        hash: "e8aebb115dba21f631ad6bce87615fd3"
     }
     Frame {
         msec: 864
-        hash: "03c4320dc2aa030c341d54899869b561"
+        hash: "15c9982c4c71542788e563db6e069fd1"
     }
     Frame {
         msec: 880
-        hash: "ae0e91975aecc6a416b4a23504fced32"
+        hash: "8124924f33282195f0a04cb178a332b1"
     }
     Frame {
         msec: 896
-        hash: "e4150bdf0d4bab9bddc4605a9bde5b69"
+        hash: "0134d4df0b3b524107baa4068c64af7f"
     }
     Frame {
         msec: 912
-        hash: "dc961cb82a0e58603b3914f16f0a3f52"
+        hash: "bd3015b94540bafebfc9a7190b0e3d6c"
     }
     Frame {
         msec: 928
-        hash: "5339507c303e42ecab853ca1688881f3"
+        hash: "3edcdf689225edcba379775c86390609"
     }
     Frame {
         msec: 944
-        hash: "a7c616c57f98eb03c1501747ea1a8b45"
+        hash: "407d4d439efec4cb07c80a5bc6638b51"
     }
     Frame {
         msec: 960
@@ -246,58 +246,58 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "773ad6bc56f80bd5f6ce346ae0bc79c9"
+        hash: "7b58d2d0726bb994d9e651411d76cbe4"
     }
     Frame {
         msec: 992
-        hash: "18b9ebfb9e5beac337143cc625fdfad7"
+        hash: "15801c5e1e470c8c45c24debfb9b478b"
     }
     Frame {
         msec: 1008
-        hash: "efb9f12a98ea137e2b50d344c21c4a89"
+        hash: "e257158a1da8908df7522bede4e9c4d9"
     }
     Frame {
         msec: 1024
-        hash: "5b880958b3d20c09a10189cfc5f7b671"
+        hash: "3cb21bef1761c2f70b880b54ca9234fc"
     }
     Frame {
         msec: 1040
-        hash: "edf2d8c174ac6e2e3a887336dc04df8c"
+        hash: "b5effa369f0ab095f4345e2b9f6caa5f"
     }
     Frame {
         msec: 1056
-        hash: "ad04b9e0e88695a13032abae8fef6f32"
+        hash: "aaafb43e6290a9e7b351dd7c13b8aaaf"
     }
     Frame {
         msec: 1072
-        hash: "e4ad91c9da3e954cac33ce98832fee1c"
+        hash: "8a4b622539868188f40f8c7fe75c6ddf"
     }
     Frame {
         msec: 1088
-        hash: "a853212cf0ddc17cb0eb9be7f2ac5475"
+        hash: "365c2f7c0d1c718cf326864c3ba75d2e"
     }
     Frame {
         msec: 1104
-        hash: "a03f7ac2553fe114c4591ed98dab3ceb"
+        hash: "bac17384d4f375652bbc574459554835"
     }
     Frame {
         msec: 1120
-        hash: "5de7491803582e0d13d2ff3e2eb3df82"
+        hash: "6bf6917ee323a05824bd6d071459d0b2"
     }
     Frame {
         msec: 1136
-        hash: "0685263ac468ce39b468d37a20f7e5f8"
+        hash: "7aee8af3ef6b6592011b29281fb0e545"
     }
     Frame {
         msec: 1152
-        hash: "14d4ab3f40dc6a0835c56c0f84256182"
+        hash: "5351b508cbd2e0352f230d211b864c4f"
     }
     Frame {
         msec: 1168
-        hash: "6a8c61c31c3d00592863ad356c45b354"
+        hash: "5a051f26ba6287707dbff8422d1eb9f3"
     }
     Frame {
         msec: 1184
-        hash: "08b3e3388469b1a62d3fc7f7a94f85a2"
+        hash: "67611596f75fe97b13a9cf0dc0313727"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
index 6c610ea..22863cf 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
index c4c56f3..aac7c8d 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
index 464a578..3f2c403 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
index 9beb1ca..e94c97b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
index 001be30..847f8a5 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
index fc3e4b3..9002e80 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
index 24f43e6..0a399c8 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
index 001223b..3d8709f 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
index 7126e07..80b960c 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
index f0bea88..7247277 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
index 4381b8d..af5a996 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.9.png
new file mode 100644
index 0000000..b254164
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
index 1241d14..f714adc 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
@@ -6,239 +6,287 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "fd83046af94eac26d394a5da986e734c"
     }
     Frame {
         msec: 32
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "c9bf546976fc17de9ea9e877f4978f02"
     }
     Frame {
         msec: 48
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "c711fd5d0c3900494493f8309b79ad0c"
     }
     Frame {
         msec: 64
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "b297d098f02fbbeac830b20b0a5194c5"
     }
     Frame {
         msec: 80
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "b5e956f236ba52cb673af22417d1aabc"
     }
     Frame {
         msec: 96
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
     }
     Frame {
         msec: 112
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "315734f8f38efbc810ca2e65bd752ddd"
     }
     Frame {
         msec: 128
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
     }
     Frame {
         msec: 144
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "56cc00965e12254e0133fe1d914fffb2"
     }
     Frame {
         msec: 160
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "690aa50862a887edcc9392d1c3ca0424"
     }
     Frame {
         msec: 176
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "c3df3735586ed103d137d4902d7a1cc3"
     }
     Frame {
         msec: 192
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "0a2c07dc17922651d2abd6400fff6e43"
     }
     Frame {
         msec: 208
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
     }
     Frame {
         msec: 224
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "7937850b86f3611ee1d75da9deb7420d"
     }
     Frame {
         msec: 240
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "ecd42368bf2a9058185b9b25b659f4c6"
     }
     Frame {
         msec: 256
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "e545c6ba42edd1e6a055b48f162315ab"
     }
     Frame {
         msec: 272
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
     }
     Frame {
         msec: 288
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "49de66674e8f38f925f3505c64201076"
     }
     Frame {
         msec: 304
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "b33880917cae07d038620065ec2c1d1c"
     }
     Frame {
         msec: 320
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "97c8af8dc7e5372a3a0f5bed0050127e"
     }
     Frame {
         msec: 336
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "b0236b8c44398cb9f97324f6ca9ce5c4"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 352
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "2695b45a1ea89518d236ef3b8dccd89e"
     }
     Frame {
         msec: 368
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "61370b1d04626facfd243176cb4bb79b"
     }
     Frame {
         msec: 384
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "53c53e501469ca0ef0f0325a13aa4aa4"
     }
     Frame {
         msec: 400
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "c56717a79ccffe756c5423bc5e44a53f"
     }
     Frame {
         msec: 416
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b"
     }
     Frame {
         msec: 432
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "4ccb9af28572e13f961f2057eb98482d"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 448
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "0b8ce455fd40c3cd74fb05d4b603cceb"
     }
     Frame {
         msec: 464
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "f5c3754201dbb6f4ca4f4c1611036c5a"
     }
     Frame {
         msec: 480
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 496
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 512
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 528
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 544
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 560
-        hash: "ff5fac70804eb01da28c2988aba520a4"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 576
-        hash: "a6bdf56b4f8783969935488e1955e59c"
+        hash: "9e887b7206f31bbb95573ea4ff157579"
     }
     Frame {
         msec: 592
-        hash: "d0ad97647c5092a64426187406ec5316"
+        hash: "0d66c3a6c2df2a2ffe95901e55a5f945"
     }
     Frame {
         msec: 608
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+        hash: "af497d287a3cc1637da43f3cad97a479"
     }
     Frame {
         msec: 624
-        hash: "0285340a2e03568810a76d840369f5c8"
+        hash: "e7c4f22fcc84e1fdf09191b3ae8529fa"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 640
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+        hash: "ec6b2062c0dc274febc63aa3a2313299"
     }
     Frame {
         msec: 656
-        hash: "3caa36cc3857803248d12ec09ea357df"
+        hash: "de8e8c97aef11ee03bec315fc82a46f8"
     }
     Frame {
         msec: 672
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+        hash: "2f9e1a13c276282fd70b3242ec136b22"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 688
-        hash: "aadc71923926885ccce87e6be1c742d7"
+        hash: "60e390b7bb10dc756c83d5d52c7832f7"
     }
     Frame {
         msec: 704
-        hash: "9b7503189ecf2999934716f227469463"
+        hash: "76bf44fbfcac0c8a6615ef4ba67ee91d"
     }
     Frame {
         msec: 720
-        hash: "874296e182abe96e58f9c0463a0f32c9"
+        hash: "614e3712c8b91bcbadaedca209fc80dc"
     }
     Frame {
         msec: 736
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+        hash: "eb2204890d51b1112ea79f37768bb74e"
     }
     Frame {
         msec: 752
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+        hash: "d5b0d7d19ae4d9df059002e619726266"
     }
     Frame {
         msec: 768
-        hash: "0034ef8851c9810ed5d50496aea367da"
+        hash: "9bd5a7fde4e26a5913c41c61175a2fba"
     }
     Frame {
         msec: 784
-        hash: "24cebf60ade86469a154abaa64f3b40d"
+        hash: "533e6355f554cfc324f90c70484632ab"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 800
-        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
+        hash: "bf05da75483bdc6c4945c1c3a4f8b72a"
     }
     Frame {
         msec: 816
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+        hash: "9b7468ba9c2d9e354d15f60ca7ecf6b6"
     }
     Frame {
         msec: 832
-        hash: "5c1000fdc279742cbe46987045c0a92b"
+        hash: "5d57dbc8d8996c2275da30a6f22ea37f"
     }
     Frame {
         msec: 848
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+        hash: "3efa002ab3b856b0b8d4849b8bb6e567"
     }
     Frame {
         msec: 864
-        hash: "228551c38b567f1550b44f9dac08786b"
+        hash: "84471ddf06c2c90a17bbef9d634ffabc"
     }
     Frame {
         msec: 880
-        hash: "531c5ca6992c4a12927c61e22c02dd6b"
+        hash: "cf8460f68815510416dc1cd86dd80c19"
     }
     Frame {
         msec: 896
-        hash: "127cc30967f95cb88f4238e0b33c741d"
+        hash: "7e1e02e0795e695a423ee3518c9e8e8f"
     }
     Frame {
         msec: 912
-        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
+        hash: "ca5ea92767f31f7fb7e04894edadb73b"
     }
     Frame {
         msec: 928
-        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
+        hash: "616e57b513b4e950803c49584de106bd"
     }
     Frame {
         msec: 944
-        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
+        hash: "718badb44982d10fe92b646aa5dc3d96"
     }
     Frame {
         msec: 960
@@ -246,271 +294,287 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4acc383cecec9d65dafa3b75b2711577"
     }
     Frame {
         msec: 992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e26dd446fe8ed2b8a57888bc7f2f643"
     }
     Frame {
         msec: 1008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "369f454d8f387320423f2b2e568d6ad6"
     }
     Frame {
         msec: 1024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "369f454d8f387320423f2b2e568d6ad6"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "9e26dd446fe8ed2b8a57888bc7f2f643"
     }
     Frame {
         msec: 1056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4acc383cecec9d65dafa3b75b2711577"
     }
     Frame {
         msec: 1072
-        hash: "90ac5ad7ce23786fe838426605e737e1"
+        hash: "2909eabaad28f76c37c780d0e0d9e357"
     }
     Frame {
         msec: 1088
-        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
+        hash: "718badb44982d10fe92b646aa5dc3d96"
     }
     Frame {
         msec: 1104
-        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
+        hash: "616e57b513b4e950803c49584de106bd"
     }
     Frame {
         msec: 1120
-        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
+        hash: "ca5ea92767f31f7fb7e04894edadb73b"
     }
     Frame {
         msec: 1136
-        hash: "127cc30967f95cb88f4238e0b33c741d"
+        hash: "7e1e02e0795e695a423ee3518c9e8e8f"
     }
     Frame {
         msec: 1152
-        hash: "531c5ca6992c4a12927c61e22c02dd6b"
+        hash: "cf8460f68815510416dc1cd86dd80c19"
     }
     Frame {
         msec: 1168
-        hash: "228551c38b567f1550b44f9dac08786b"
+        hash: "84471ddf06c2c90a17bbef9d634ffabc"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1184
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+        hash: "0e4120f723b1b1d879065f0324ba18fa"
     }
     Frame {
         msec: 1200
-        hash: "5c1000fdc279742cbe46987045c0a92b"
+        hash: "2a8c575dbe68797c8a909df9f1166ff8"
     }
     Frame {
         msec: 1216
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+        hash: "e26abb9311a2b25ed32efb0da41a4d53"
     }
     Frame {
         msec: 1232
-        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
+        hash: "d35ae7b04e8ddf1962a20f8593c9c18c"
     }
     Frame {
         msec: 1248
-        hash: "24cebf60ade86469a154abaa64f3b40d"
+        hash: "afbbcee5ea4c854aebb7ba56856cf9c8"
     }
     Frame {
         msec: 1264
-        hash: "0034ef8851c9810ed5d50496aea367da"
+        hash: "2d97ae4f3657617d4f4df55090c2d0e1"
     }
     Frame {
         msec: 1280
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+        hash: "dc024030252b263dc7dd3c05580d7ec6"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1296
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+        hash: "c9072651fd565ed8c6d69a258e464fca"
     }
     Frame {
         msec: 1312
-        hash: "874296e182abe96e58f9c0463a0f32c9"
+        hash: "bb6a90fd1cb94ed4b590c9ae65d31f86"
     }
     Frame {
         msec: 1328
-        hash: "9b7503189ecf2999934716f227469463"
+        hash: "d3e5054c8b0a25adb9bd0fe78bd72153"
     }
     Frame {
         msec: 1344
-        hash: "aadc71923926885ccce87e6be1c742d7"
+        hash: "158e31266eae1718958d37d2096b32af"
     }
     Frame {
         msec: 1360
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+        hash: "6986bbfaedae3838de7a92f911d1e4d1"
     }
     Frame {
         msec: 1376
-        hash: "3caa36cc3857803248d12ec09ea357df"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "8ab83b3b3038150036d6d6135d6e2d8d"
     }
     Frame {
         msec: 1392
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+        hash: "6749a62f9d9eadc33e2d109c140bfdde"
     }
     Frame {
         msec: 1408
-        hash: "0285340a2e03568810a76d840369f5c8"
+        hash: "7519758a28f49b3a669f6676a1b47253"
     }
     Frame {
         msec: 1424
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+        hash: "a8470fa7ddf69b4f86c5933f85256684"
     }
     Frame {
         msec: 1440
-        hash: "d0ad97647c5092a64426187406ec5316"
+        hash: "1f2f34e0dfeb38bd568915718627abf5"
     }
     Frame {
         msec: 1456
-        hash: "a6bdf56b4f8783969935488e1955e59c"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "d843ec499de0a7c0094a479f75cab4c6"
     }
     Frame {
         msec: 1472
-        hash: "ff5fac70804eb01da28c2988aba520a4"
+        hash: "25cf1c1efce5ad53695099ffeb93d27f"
     }
     Frame {
         msec: 1488
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
+        hash: "25cf1c1efce5ad53695099ffeb93d27f"
     }
     Frame {
         msec: 1504
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
+        hash: "25cf1c1efce5ad53695099ffeb93d27f"
     }
     Frame {
         msec: 1520
-        hash: "907c6363d1e524f391d001944febe1ac"
+        hash: "25cf1c1efce5ad53695099ffeb93d27f"
     }
     Frame {
         msec: 1536
-        hash: "313a06d40274e46453342e66236f09f8"
+        hash: "25cf1c1efce5ad53695099ffeb93d27f"
     }
     Frame {
         msec: 1552
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+        hash: "25cf1c1efce5ad53695099ffeb93d27f"
     }
     Frame {
         msec: 1568
-        hash: "a9911e076af337fe30e322f03d84a528"
+        hash: "444090b334e856ff4f9b9938c7676666"
     }
     Frame {
         msec: 1584
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
+        hash: "6064d9310e5d660c8e1aae9e9cfc6bd3"
     }
     Frame {
         msec: 1600
-        hash: "479f192c8cf7b8e4407655382402700f"
+        hash: "fc562db867e30ac63a9992b3cf554553"
     }
     Frame {
         msec: 1616
-        hash: "63dc16e66def35abba5159d5650f165d"
+        hash: "e127594d11d3e4c0d1f3e4585ef3a901"
     }
     Frame {
         msec: 1632
-        hash: "26e88aae512304c28d425c311febce1b"
+        hash: "6d3d43b6a38cf1c64289282bbcaf2ac2"
+    }
+    Frame {
+        msec: 1648
+        hash: "bd58d75020a5272ae3cdcb0ed780e496"
     }
     Key {
         type: 6
-        key: 16777233
-        modifiers: 0
+        key: 16777249
+        modifiers: 33554432
         text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 1648
-        hash: "8dca7a7912ddaa853dff9c09882082b1"
-    }
-    Frame {
         msec: 1664
-        hash: "5c3ebee155e29a0ba4a45706dd87396a"
+        hash: "655cdefae8b30a40e6baaa04b790f811"
     }
     Frame {
         msec: 1680
-        hash: "29a517a66867f6f527c6db5bb5651f92"
+        hash: "a654e6c9c5414593425bd2ccc6a0f916"
     }
     Frame {
         msec: 1696
-        hash: "a4fde31f55f866224eca2b51586b601f"
+        hash: "88e3865dcb7da6be36cff12a1da7c94b"
     }
     Frame {
         msec: 1712
-        hash: "9c9c7fb9fb8aab8c24f2eb03df791a00"
+        hash: "4d85866e40d8118081d2747af7343c42"
     }
     Frame {
         msec: 1728
-        hash: "dd972e37166d1186a717a956343a7758"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "d84111903e76a53be7b55d7dc3847914"
     }
     Frame {
         msec: 1744
-        hash: "1af5e24651ef422ff93dab7bd2a8f832"
+        hash: "4f7b708a511dc7a882af661ca3282404"
     }
     Frame {
         msec: 1760
-        hash: "885473be4e44bb1f4b014f9b3d4d2e74"
+        hash: "29d940c479f0c76c6f4d88e417672878"
     }
     Frame {
         msec: 1776
-        hash: "1f6e0407392322c34567caaecae5b449"
+        hash: "ade916241f4b2a50e6b84f8ae41369ef"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1792
-        hash: "dcae85a4b05c450b6b1619f9fd7e17b0"
+        hash: "ecd42368bf2a9058185b9b25b659f4c6"
     }
     Frame {
         msec: 1808
-        hash: "3b872e5030e34edf678ac2547df48699"
+        hash: "7937850b86f3611ee1d75da9deb7420d"
     }
     Frame {
         msec: 1824
-        hash: "5d76b324496297d08cff57b4c21ce592"
+        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
     }
     Frame {
         msec: 1840
-        hash: "4acfe3c4cf2f4e477f1a72817af556d2"
+        hash: "0a2c07dc17922651d2abd6400fff6e43"
     }
     Frame {
         msec: 1856
-        hash: "a04671fe8d28cfb629f2090e342747fb"
+        hash: "c3df3735586ed103d137d4902d7a1cc3"
     }
     Frame {
         msec: 1872
-        hash: "2474db802c7d8e0ec8fa7f958c04bf30"
+        hash: "690aa50862a887edcc9392d1c3ca0424"
     }
     Frame {
         msec: 1888
-        hash: "11a1e1f38c407de4bc069aa192319fe4"
+        hash: "56cc00965e12254e0133fe1d914fffb2"
     }
     Frame {
         msec: 1904
-        hash: "ec8aacc8d2280068dd7f020e8648afea"
+        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1920
@@ -518,271 +582,271 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "fbbe4d0fed6274968a89e02bb1ca5685"
+        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
     }
     Frame {
         msec: 1952
-        hash: "13d478424a8f0cab8bab6a157efce318"
+        hash: "b5e956f236ba52cb673af22417d1aabc"
     }
     Frame {
         msec: 1968
-        hash: "ea6bc9ec217fb80b86276a2675c08a0f"
+        hash: "b297d098f02fbbeac830b20b0a5194c5"
     }
     Frame {
         msec: 1984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c711fd5d0c3900494493f8309b79ad0c"
     }
     Frame {
         msec: 2000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c9bf546976fc17de9ea9e877f4978f02"
     }
     Frame {
         msec: 2016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "fd83046af94eac26d394a5da986e734c"
     }
     Frame {
         msec: 2032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c9bf546976fc17de9ea9e877f4978f02"
     }
     Frame {
         msec: 2048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c711fd5d0c3900494493f8309b79ad0c"
     }
     Frame {
         msec: 2064
-        hash: "ea6bc9ec217fb80b86276a2675c08a0f"
+        hash: "b297d098f02fbbeac830b20b0a5194c5"
     }
     Frame {
         msec: 2080
-        hash: "13d478424a8f0cab8bab6a157efce318"
+        hash: "b5e956f236ba52cb673af22417d1aabc"
     }
     Frame {
         msec: 2096
-        hash: "fbbe4d0fed6274968a89e02bb1ca5685"
+        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
     }
     Frame {
         msec: 2112
-        hash: "00dedd48bd6861cb4bf4953162a67cc0"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "315734f8f38efbc810ca2e65bd752ddd"
     }
     Frame {
         msec: 2128
-        hash: "ec8aacc8d2280068dd7f020e8648afea"
+        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
     }
     Frame {
         msec: 2144
-        hash: "11a1e1f38c407de4bc069aa192319fe4"
+        hash: "56cc00965e12254e0133fe1d914fffb2"
     }
     Frame {
         msec: 2160
-        hash: "2474db802c7d8e0ec8fa7f958c04bf30"
+        hash: "690aa50862a887edcc9392d1c3ca0424"
     }
     Frame {
         msec: 2176
-        hash: "a04671fe8d28cfb629f2090e342747fb"
+        hash: "c3df3735586ed103d137d4902d7a1cc3"
     }
     Frame {
         msec: 2192
-        hash: "4acfe3c4cf2f4e477f1a72817af556d2"
+        hash: "0a2c07dc17922651d2abd6400fff6e43"
     }
     Frame {
         msec: 2208
-        hash: "5d76b324496297d08cff57b4c21ce592"
+        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
     }
     Frame {
         msec: 2224
-        hash: "3b872e5030e34edf678ac2547df48699"
+        hash: "7937850b86f3611ee1d75da9deb7420d"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2240
-        hash: "dcae85a4b05c450b6b1619f9fd7e17b0"
+        hash: "ecd42368bf2a9058185b9b25b659f4c6"
     }
     Frame {
         msec: 2256
-        hash: "1f6e0407392322c34567caaecae5b449"
+        hash: "e545c6ba42edd1e6a055b48f162315ab"
     }
     Frame {
         msec: 2272
-        hash: "885473be4e44bb1f4b014f9b3d4d2e74"
+        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
     }
     Frame {
         msec: 2288
-        hash: "1af5e24651ef422ff93dab7bd2a8f832"
+        hash: "49de66674e8f38f925f3505c64201076"
     }
     Frame {
         msec: 2304
-        hash: "dd972e37166d1186a717a956343a7758"
+        hash: "b33880917cae07d038620065ec2c1d1c"
     }
     Frame {
         msec: 2320
-        hash: "9c9c7fb9fb8aab8c24f2eb03df791a00"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+        hash: "97c8af8dc7e5372a3a0f5bed0050127e"
     }
     Frame {
         msec: 2336
-        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
+        hash: "b0236b8c44398cb9f97324f6ca9ce5c4"
     }
     Frame {
         msec: 2352
-        hash: "63c6a7810dec832f1b8288807f1d932a"
+        hash: "2695b45a1ea89518d236ef3b8dccd89e"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2368
-        hash: "70409eeee50fbb54097a3c430e1e1f21"
+        hash: "61370b1d04626facfd243176cb4bb79b"
     }
     Frame {
         msec: 2384
-        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
+        hash: "53c53e501469ca0ef0f0325a13aa4aa4"
     }
     Frame {
         msec: 2400
-        hash: "26e88aae512304c28d425c311febce1b"
+        hash: "c56717a79ccffe756c5423bc5e44a53f"
     }
     Frame {
         msec: 2416
-        hash: "63dc16e66def35abba5159d5650f165d"
+        hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b"
     }
     Frame {
         msec: 2432
-        hash: "479f192c8cf7b8e4407655382402700f"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+        hash: "4ccb9af28572e13f961f2057eb98482d"
     }
     Frame {
         msec: 2448
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
+        hash: "0b8ce455fd40c3cd74fb05d4b603cceb"
     }
     Frame {
         msec: 2464
-        hash: "a9911e076af337fe30e322f03d84a528"
+        hash: "f5c3754201dbb6f4ca4f4c1611036c5a"
     }
     Frame {
         msec: 2480
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2496
-        hash: "313a06d40274e46453342e66236f09f8"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 2512
-        hash: "907c6363d1e524f391d001944febe1ac"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 2528
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 2544
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 2560
-        hash: "ff5fac70804eb01da28c2988aba520a4"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 2576
-        hash: "a6bdf56b4f8783969935488e1955e59c"
+        hash: "3c1972940b70a388ebfd007b0b5d9860"
     }
     Frame {
         msec: 2592
-        hash: "d0ad97647c5092a64426187406ec5316"
+        hash: "674707d6ae5ef5109940f1bd62427a63"
     }
     Frame {
         msec: 2608
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+        hash: "8f512390b74d7a545eb60a86d4b8dee6"
     }
     Frame {
         msec: 2624
-        hash: "0285340a2e03568810a76d840369f5c8"
+        hash: "0502cfe70da38a6ebccd7fdf799be464"
     }
     Frame {
         msec: 2640
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+        hash: "23c45beae15b893ec4450b0d380aeb17"
     }
     Frame {
         msec: 2656
-        hash: "3caa36cc3857803248d12ec09ea357df"
+        hash: "45de58892db757e76c95ddb76e267f6f"
     }
     Frame {
         msec: 2672
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+        hash: "ff3f1529c937c4d95cf4dfb8592759dc"
     }
     Frame {
         msec: 2688
-        hash: "aadc71923926885ccce87e6be1c742d7"
+        hash: "236c6e16bbfab9268f488d6dbf9544be"
     }
     Frame {
         msec: 2704
-        hash: "9b7503189ecf2999934716f227469463"
+        hash: "3bb19cbddf5e66c08bdd5c881e93db3e"
     }
     Frame {
         msec: 2720
-        hash: "874296e182abe96e58f9c0463a0f32c9"
+        hash: "057ea6d1007993908c9c398391b85072"
     }
     Frame {
         msec: 2736
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+        hash: "faa124cd5d0a027dc5e3b92125bc9cc5"
     }
     Frame {
         msec: 2752
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+        hash: "234ac2e7f0b87a86e0678e3cbc5a1e30"
     }
     Frame {
         msec: 2768
-        hash: "0034ef8851c9810ed5d50496aea367da"
+        hash: "bdee3016f1811188691786bafe305196"
     }
     Frame {
         msec: 2784
-        hash: "24cebf60ade86469a154abaa64f3b40d"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+        hash: "9ecc192aec9b15314132b16dd3f43860"
     }
     Frame {
         msec: 2800
-        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
+        hash: "26dc03cf86d6812cfb788599b1c34de0"
     }
     Frame {
         msec: 2816
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+        hash: "8752b33ae49ea6d1ee27376d8585776e"
     }
     Frame {
         msec: 2832
-        hash: "5c1000fdc279742cbe46987045c0a92b"
+        hash: "a181b264ba729ad1d8ff91a0c56fb98a"
     }
     Frame {
         msec: 2848
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+        hash: "af426cd28c90ac2d46d2b2478ce616f3"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2864
-        hash: "228551c38b567f1550b44f9dac08786b"
+        hash: "7462f7f9c339fc4d8b0c08e54b0ed71d"
     }
     Frame {
         msec: 2880
@@ -790,511 +854,527 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "127cc30967f95cb88f4238e0b33c741d"
+        hash: "10f5b360c3809fbe51de55f47199c541"
     }
     Frame {
         msec: 2912
-        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
+        hash: "ecab3f62c89e1cb9ff9b10ace4cdb40b"
     }
     Frame {
         msec: 2928
-        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
+        hash: "d3eac9d8cd01bbb44fd61fca497230c0"
     }
     Frame {
         msec: 2944
-        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
+        hash: "33ff6af85e783c617a42ca5021d1463b"
     }
     Frame {
         msec: 2960
-        hash: "90ac5ad7ce23786fe838426605e737e1"
+        hash: "a53cccc463d6f6fc24dc0d6309246640"
     }
     Frame {
         msec: 2976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8fc354dd6ddbd829240a3c2c9dcafdeb"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0529a6cb7083caf513de4677970ed33f"
     }
     Frame {
         msec: 3008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "bb38f9cdd67d18bc9297b353d499bb35"
     }
     Frame {
         msec: 3024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "bb38f9cdd67d18bc9297b353d499bb35"
     }
     Frame {
         msec: 3040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0529a6cb7083caf513de4677970ed33f"
     }
     Frame {
         msec: 3056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "8fc354dd6ddbd829240a3c2c9dcafdeb"
     }
     Frame {
         msec: 3072
-        hash: "90ac5ad7ce23786fe838426605e737e1"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "a53cccc463d6f6fc24dc0d6309246640"
     }
     Frame {
         msec: 3088
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
+        hash: "33ff6af85e783c617a42ca5021d1463b"
     }
     Frame {
         msec: 3104
-        hash: "df6f025130dc82f4764def81cec5fa7b"
+        hash: "d3eac9d8cd01bbb44fd61fca497230c0"
     }
     Frame {
         msec: 3120
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
+        hash: "ecab3f62c89e1cb9ff9b10ace4cdb40b"
     }
     Frame {
         msec: 3136
-        hash: "14b328c8ec6276e022643102af80fa44"
+        hash: "10f5b360c3809fbe51de55f47199c541"
     }
     Frame {
         msec: 3152
-        hash: "078d75d72bff036574b85ac0aeaaf2b6"
+        hash: "2a0b3f5170c31a2f2ae512ab3c4268fc"
     }
     Frame {
         msec: 3168
-        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
+        hash: "7462f7f9c339fc4d8b0c08e54b0ed71d"
     }
     Frame {
         msec: 3184
-        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "0367ee5e3204a54d225791fbd833fc21"
     }
     Frame {
         msec: 3200
-        hash: "3462a3e166120515e67430600e4653f8"
+        hash: "86f96b2b846cad8660d80f7dbda24806"
     }
     Frame {
         msec: 3216
-        hash: "7f2d9959323f0707e36ecb2252c89727"
-    }
-    Frame {
-        msec: 3232
-        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
-    }
-    Frame {
-        msec: 3248
-        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
+        hash: "ce05bb9e0a7bd884c12f100b9d219461"
     }
     Key {
         type: 6
-        key: 16777234
-        modifiers: 0
+        key: 16777236
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 3232
+        hash: "8b04473fad0ffec6b56d2dca8d4dd81c"
+    }
+    Frame {
+        msec: 3248
+        hash: "cedcf233a83047beef7a8aa3486df671"
+    }
+    Frame {
         msec: 3264
-        hash: "0034ef8851c9810ed5d50496aea367da"
+        hash: "8117b9590a36bbb4fd0d73c1df2e655e"
     }
     Frame {
         msec: 3280
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+        hash: "5c3168c676a7dc35913e365b2acafea1"
     }
     Frame {
         msec: 3296
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+        hash: "4314ebdafbfbad5f108a4cb9874ed06c"
     }
     Frame {
         msec: 3312
-        hash: "874296e182abe96e58f9c0463a0f32c9"
+        hash: "d2ffe99b443ecf1188bd3639ddbccda3"
     }
     Frame {
         msec: 3328
-        hash: "9b7503189ecf2999934716f227469463"
-    }
-    Frame {
-        msec: 3344
-        hash: "aadc71923926885ccce87e6be1c742d7"
-    }
-    Frame {
-        msec: 3360
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+        hash: "a0894a3492ed7e5bf5b834db890325e2"
     }
     Key {
         type: 7
-        key: 16777234
-        modifiers: 0
+        key: 16777236
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 3344
+        hash: "57498e86bdc3cfd37bf29505c289d100"
+    }
+    Frame {
+        msec: 3360
+        hash: "57d77411f30c4733f2afec2fc99f3d0b"
+    }
+    Frame {
         msec: 3376
-        hash: "3caa36cc3857803248d12ec09ea357df"
+        hash: "a3c4b4fef44c4019daba366c1e3a58b1"
     }
     Frame {
         msec: 3392
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+        hash: "f8461558248b7da3bdf2df641154171a"
     }
     Frame {
         msec: 3408
-        hash: "0285340a2e03568810a76d840369f5c8"
+        hash: "13e84656ef70bf07e2a444d60ac933e1"
     }
     Frame {
         msec: 3424
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+        hash: "186d8a59092cfe4128b46a3c87eb347b"
     }
     Frame {
         msec: 3440
-        hash: "d0ad97647c5092a64426187406ec5316"
+        hash: "ac4898002fdc5ea7894d741cac863c8d"
     }
     Frame {
         msec: 3456
-        hash: "a6bdf56b4f8783969935488e1955e59c"
+        hash: "2e95c1966c94acccd2a44a6c2942d36d"
     }
     Frame {
         msec: 3472
-        hash: "ff5fac70804eb01da28c2988aba520a4"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 3488
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 3504
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 3520
-        hash: "907c6363d1e524f391d001944febe1ac"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 3536
-        hash: "313a06d40274e46453342e66236f09f8"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 3552
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 3568
-        hash: "a9911e076af337fe30e322f03d84a528"
+        hash: "7f83ba29fd27aa4817b7b84afbc8d6d7"
     }
     Frame {
         msec: 3584
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
+        hash: "8575a99b28bb5b8c2d01a5ed91f25d47"
     }
     Frame {
         msec: 3600
-        hash: "479f192c8cf7b8e4407655382402700f"
+        hash: "eda67cb2d32f3f605a74a01148f04c99"
     }
     Frame {
         msec: 3616
-        hash: "63dc16e66def35abba5159d5650f165d"
+        hash: "1d65e6e7160f092fe65f683df7c10f92"
     }
     Frame {
         msec: 3632
-        hash: "26e88aae512304c28d425c311febce1b"
+        hash: "274c59f268f667a1f11b8ea04a4f88a0"
     }
     Frame {
         msec: 3648
-        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
+        hash: "e46d917e79910b3319c4579776bbdd60"
     }
     Frame {
         msec: 3664
-        hash: "70409eeee50fbb54097a3c430e1e1f21"
+        hash: "42b7662aad44804653101117ca698023"
     }
     Frame {
         msec: 3680
-        hash: "63c6a7810dec832f1b8288807f1d932a"
+        hash: "dda5147cb6e4e8f61819de6a90dcb165"
     }
     Frame {
         msec: 3696
-        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
+        hash: "b4a5dcd0bb667d3a42c8f0703d753ed6"
     }
     Frame {
         msec: 3712
-        hash: "2e6dd79fc23acbf710e757f3d0999ab8"
+        hash: "4ae70de6785fdbecf7650637c8e99a71"
     }
     Frame {
         msec: 3728
-        hash: "4d9dd9e515a21478cb3364032acf8c15"
+        hash: "22dc8343eab28b0526d5486405b68478"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3744
-        hash: "5dc2129cac6e667d39da3304a37a76f2"
+        hash: "49de66674e8f38f925f3505c64201076"
     }
     Frame {
         msec: 3760
-        hash: "ab5eb4750139875586a346b1c3a84f42"
+        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
     }
     Frame {
         msec: 3776
-        hash: "96d3bd62d4a0bf39a672b97fcc050bd5"
+        hash: "e545c6ba42edd1e6a055b48f162315ab"
     }
     Frame {
         msec: 3792
-        hash: "546cec655631b5802eb4d7008093eb69"
+        hash: "ecd42368bf2a9058185b9b25b659f4c6"
     }
     Frame {
         msec: 3808
-        hash: "85f33f1bf1b1e11be450ab85bf6dab3d"
+        hash: "7937850b86f3611ee1d75da9deb7420d"
     }
     Frame {
         msec: 3824
-        hash: "44b195297acd1bf59e43751df8dc1c1d"
+        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
     }
     Frame {
         msec: 3840
         image: "cursorDelegate.3.png"
     }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
     Frame {
         msec: 3856
-        hash: "47942253c07fd39894445ff5e5b9608c"
+        hash: "c3df3735586ed103d137d4902d7a1cc3"
     }
     Frame {
         msec: 3872
-        hash: "d26d71b1c03fb21550820dd1586a7a8e"
+        hash: "690aa50862a887edcc9392d1c3ca0424"
     }
     Frame {
         msec: 3888
-        hash: "37ec2ed29006575e8bd41a1989b75e27"
+        hash: "56cc00965e12254e0133fe1d914fffb2"
     }
     Frame {
         msec: 3904
-        hash: "5ad1ab34572f9ef339774134bc0ab407"
+        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
     }
     Frame {
         msec: 3920
-        hash: "a4f68f6ee46642e7cc5a542b9f8a2464"
+        hash: "315734f8f38efbc810ca2e65bd752ddd"
     }
     Frame {
         msec: 3936
-        hash: "fce95d18a0efee74554209ca39637062"
+        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
     }
     Frame {
         msec: 3952
-        hash: "1587fc2668f1f44e76f252bfd75f2708"
+        hash: "b5e956f236ba52cb673af22417d1aabc"
     }
     Frame {
         msec: 3968
-        hash: "e0a6eb42de552281e297ca5c50c1df23"
+        hash: "b297d098f02fbbeac830b20b0a5194c5"
     }
     Frame {
         msec: 3984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c711fd5d0c3900494493f8309b79ad0c"
     }
     Frame {
         msec: 4000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c9bf546976fc17de9ea9e877f4978f02"
     }
     Frame {
         msec: 4016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "fd83046af94eac26d394a5da986e734c"
     }
     Frame {
         msec: 4032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c9bf546976fc17de9ea9e877f4978f02"
     }
     Frame {
         msec: 4048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "c711fd5d0c3900494493f8309b79ad0c"
     }
     Frame {
         msec: 4064
-        hash: "e0a6eb42de552281e297ca5c50c1df23"
+        hash: "b297d098f02fbbeac830b20b0a5194c5"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 4080
-        hash: "1587fc2668f1f44e76f252bfd75f2708"
+        hash: "b5e956f236ba52cb673af22417d1aabc"
     }
     Frame {
         msec: 4096
-        hash: "fce95d18a0efee74554209ca39637062"
+        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
     }
     Frame {
         msec: 4112
-        hash: "a4f68f6ee46642e7cc5a542b9f8a2464"
+        hash: "315734f8f38efbc810ca2e65bd752ddd"
     }
     Frame {
         msec: 4128
-        hash: "5ad1ab34572f9ef339774134bc0ab407"
+        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
     }
     Frame {
         msec: 4144
-        hash: "37ec2ed29006575e8bd41a1989b75e27"
+        hash: "56cc00965e12254e0133fe1d914fffb2"
     }
     Frame {
         msec: 4160
-        hash: "d26d71b1c03fb21550820dd1586a7a8e"
+        hash: "690aa50862a887edcc9392d1c3ca0424"
     }
     Frame {
         msec: 4176
-        hash: "47942253c07fd39894445ff5e5b9608c"
+        hash: "c3df3735586ed103d137d4902d7a1cc3"
     }
     Frame {
         msec: 4192
-        hash: "a62f1cbf43da0381c7c9099d47ded882"
+        hash: "0a2c07dc17922651d2abd6400fff6e43"
     }
     Frame {
         msec: 4208
-        hash: "44b195297acd1bf59e43751df8dc1c1d"
+        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
     }
     Frame {
         msec: 4224
-        hash: "85f33f1bf1b1e11be450ab85bf6dab3d"
+        hash: "7937850b86f3611ee1d75da9deb7420d"
     }
     Frame {
         msec: 4240
-        hash: "546cec655631b5802eb4d7008093eb69"
+        hash: "ecd42368bf2a9058185b9b25b659f4c6"
     }
     Frame {
         msec: 4256
-        hash: "96d3bd62d4a0bf39a672b97fcc050bd5"
+        hash: "e545c6ba42edd1e6a055b48f162315ab"
     }
     Frame {
         msec: 4272
-        hash: "ab5eb4750139875586a346b1c3a84f42"
+        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
     }
     Frame {
         msec: 4288
-        hash: "5dc2129cac6e667d39da3304a37a76f2"
+        hash: "49de66674e8f38f925f3505c64201076"
     }
     Frame {
         msec: 4304
-        hash: "4d9dd9e515a21478cb3364032acf8c15"
+        hash: "b33880917cae07d038620065ec2c1d1c"
     }
     Frame {
         msec: 4320
-        hash: "2e6dd79fc23acbf710e757f3d0999ab8"
+        hash: "97c8af8dc7e5372a3a0f5bed0050127e"
     }
     Frame {
         msec: 4336
-        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
+        hash: "b0236b8c44398cb9f97324f6ca9ce5c4"
     }
     Frame {
         msec: 4352
-        hash: "63c6a7810dec832f1b8288807f1d932a"
+        hash: "2695b45a1ea89518d236ef3b8dccd89e"
     }
     Frame {
         msec: 4368
-        hash: "70409eeee50fbb54097a3c430e1e1f21"
+        hash: "61370b1d04626facfd243176cb4bb79b"
     }
     Frame {
         msec: 4384
-        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
+        hash: "53c53e501469ca0ef0f0325a13aa4aa4"
     }
     Frame {
         msec: 4400
-        hash: "26e88aae512304c28d425c311febce1b"
+        hash: "c56717a79ccffe756c5423bc5e44a53f"
     }
     Frame {
         msec: 4416
-        hash: "63dc16e66def35abba5159d5650f165d"
+        hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b"
     }
     Frame {
         msec: 4432
-        hash: "479f192c8cf7b8e4407655382402700f"
+        hash: "4ccb9af28572e13f961f2057eb98482d"
     }
     Frame {
         msec: 4448
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
+        hash: "0b8ce455fd40c3cd74fb05d4b603cceb"
     }
     Frame {
         msec: 4464
-        hash: "a9911e076af337fe30e322f03d84a528"
+        hash: "f5c3754201dbb6f4ca4f4c1611036c5a"
     }
     Frame {
         msec: 4480
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4496
-        hash: "313a06d40274e46453342e66236f09f8"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4512
-        hash: "907c6363d1e524f391d001944febe1ac"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4528
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4544
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4560
-        hash: "ff5fac70804eb01da28c2988aba520a4"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4576
-        hash: "a6bdf56b4f8783969935488e1955e59c"
+        hash: "3c1972940b70a388ebfd007b0b5d9860"
     }
     Frame {
         msec: 4592
-        hash: "d0ad97647c5092a64426187406ec5316"
+        hash: "674707d6ae5ef5109940f1bd62427a63"
     }
     Frame {
         msec: 4608
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+        hash: "8f512390b74d7a545eb60a86d4b8dee6"
     }
     Frame {
         msec: 4624
-        hash: "0285340a2e03568810a76d840369f5c8"
+        hash: "0502cfe70da38a6ebccd7fdf799be464"
     }
     Frame {
         msec: 4640
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+        hash: "23c45beae15b893ec4450b0d380aeb17"
     }
     Frame {
         msec: 4656
-        hash: "3caa36cc3857803248d12ec09ea357df"
+        hash: "45de58892db757e76c95ddb76e267f6f"
     }
     Frame {
         msec: 4672
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+        hash: "ff3f1529c937c4d95cf4dfb8592759dc"
     }
     Frame {
         msec: 4688
-        hash: "aadc71923926885ccce87e6be1c742d7"
+        hash: "236c6e16bbfab9268f488d6dbf9544be"
     }
     Frame {
         msec: 4704
-        hash: "9b7503189ecf2999934716f227469463"
+        hash: "3bb19cbddf5e66c08bdd5c881e93db3e"
     }
     Frame {
         msec: 4720
-        hash: "874296e182abe96e58f9c0463a0f32c9"
+        hash: "057ea6d1007993908c9c398391b85072"
     }
     Frame {
         msec: 4736
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+        hash: "faa124cd5d0a027dc5e3b92125bc9cc5"
     }
     Frame {
         msec: 4752
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+        hash: "234ac2e7f0b87a86e0678e3cbc5a1e30"
     }
     Frame {
         msec: 4768
-        hash: "0034ef8851c9810ed5d50496aea367da"
+        hash: "bdee3016f1811188691786bafe305196"
     }
     Frame {
         msec: 4784
-        hash: "24cebf60ade86469a154abaa64f3b40d"
+        hash: "9ecc192aec9b15314132b16dd3f43860"
     }
     Frame {
         msec: 4800
@@ -1302,2254 +1382,118 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+        hash: "8752b33ae49ea6d1ee27376d8585776e"
     }
     Frame {
         msec: 4832
-        hash: "5c1000fdc279742cbe46987045c0a92b"
+        hash: "a181b264ba729ad1d8ff91a0c56fb98a"
     }
     Frame {
         msec: 4848
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+        hash: "af426cd28c90ac2d46d2b2478ce616f3"
     }
     Frame {
         msec: 4864
-        hash: "228551c38b567f1550b44f9dac08786b"
+        hash: "d062f03ccc0eb1f56aba411e1078c4ab"
     }
     Frame {
         msec: 4880
-        hash: "531c5ca6992c4a12927c61e22c02dd6b"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 130; y: 101
-        modifiers: 0
-        sendToViewport: true
+        hash: "793cb0a98cac4a0f5d9a1dc5df5cd0ce"
     }
     Frame {
         msec: 4896
-        hash: "14b328c8ec6276e022643102af80fa44"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 102
-        modifiers: 0
-        sendToViewport: true
+        hash: "da1f9732e1d7cd0b82f0c0949937067e"
     }
     Frame {
         msec: 4912
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 102
-        modifiers: 0
-        sendToViewport: true
+        hash: "35d38ce67e19453f255241473294f7e9"
     }
     Frame {
         msec: 4928
-        hash: "df6f025130dc82f4764def81cec5fa7b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 132; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "e8c5d9895119167f2fcb4a15b0f1b65e"
     }
     Frame {
         msec: 4944
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 133; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 134; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "26c0d91942f1cb3313d604804d1e4b9e"
     }
     Frame {
         msec: 4960
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 135; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "eaf1ba458119f6d3dedcd581d5c04f8c"
     }
     Frame {
         msec: 4976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 136; y: 103
-        modifiers: 0
-        sendToViewport: true
+        hash: "a54c778d78c9a715ce0429e9c366ef8b"
     }
     Frame {
         msec: 4992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 137; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 102
-        modifiers: 0
-        sendToViewport: true
+        hash: "f3a8edba1311c54a12024dbcf1656b85"
     }
     Frame {
         msec: 5008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 139; y: 101
-        modifiers: 0
-        sendToViewport: true
+        hash: "7c5c30318c41ab5c5874239bbcfbaae2"
     }
     Frame {
         msec: 5024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 101
-        modifiers: 0
-        sendToViewport: true
+        hash: "7c5c30318c41ab5c5874239bbcfbaae2"
     }
     Frame {
         msec: 5040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 141; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 143; y: 100
-        modifiers: 0
-        sendToViewport: true
+        hash: "f3a8edba1311c54a12024dbcf1656b85"
     }
     Frame {
         msec: 5056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 100
-        modifiers: 0
-        sendToViewport: true
+        hash: "a54c778d78c9a715ce0429e9c366ef8b"
     }
     Frame {
         msec: 5072
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "eaf1ba458119f6d3dedcd581d5c04f8c"
     }
     Frame {
         msec: 5088
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "26c0d91942f1cb3313d604804d1e4b9e"
     }
     Frame {
         msec: 5104
-        hash: "7643fcfb740d33b87915300684e85a44"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 150; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "e8c5d9895119167f2fcb4a15b0f1b65e"
     }
     Frame {
         msec: 5120
-        hash: "1bd041a5e8d2237b51720fed82250303"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 99
-        modifiers: 0
-        sendToViewport: true
+        hash: "35d38ce67e19453f255241473294f7e9"
     }
     Frame {
         msec: 5136
-        hash: "1a00c9d3ce747e3bc7ee5878d21260b4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "da1f9732e1d7cd0b82f0c0949937067e"
     }
     Frame {
         msec: 5152
-        hash: "803896c1be68588ba2cddd7effbb8d62"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "793cb0a98cac4a0f5d9a1dc5df5cd0ce"
     }
     Frame {
         msec: 5168
-        hash: "282ab572698088fba3aba8e6a091aa38"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "d062f03ccc0eb1f56aba411e1078c4ab"
     }
     Frame {
         msec: 5184
-        hash: "24402d9e4fabd78bc8f3921db82e554e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "af426cd28c90ac2d46d2b2478ce616f3"
     }
     Frame {
         msec: 5200
-        hash: "39a89e9ca7c4edd9c8503927d639df0f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "a181b264ba729ad1d8ff91a0c56fb98a"
     }
     Frame {
         msec: 5216
-        hash: "b984b7d032544acd4dab8901e0af1ef5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "8752b33ae49ea6d1ee27376d8585776e"
     }
     Frame {
         msec: 5232
-        hash: "e014414626407b0446939ad2ce38b7dd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 98
-        modifiers: 0
-        sendToViewport: true
+        hash: "26dc03cf86d6812cfb788599b1c34de0"
     }
     Frame {
         msec: 5248
-        hash: "beccb93613279e2f48507ddc9a4418e8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 97
-        modifiers: 0
-        sendToViewport: true
+        hash: "9ecc192aec9b15314132b16dd3f43860"
     }
     Frame {
         msec: 5264
-        hash: "dd861f8dc89587301e860217fdf2a701"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5280
-        hash: "1ae0b7a18a7d3ebe4871a0045005e2b7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "071e1f8bcc0e541b23d134f32c19d20b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "e8ce2716f4595bc5bf68c24c8a63bbfe"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5328
-        hash: "d36a35503af76b12fe5cec65e3f22eda"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 178; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5344
-        hash: "cea0f90a56fd5789b3e166f09f2bfcec"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 179; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5360
-        hash: "151f5357d9c1a3f1fe09380a287abab0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 180; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5376
-        hash: "bdab9d7077734087cb7f9516e9c517bc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "6d6d929a7c7be1d2e7d1b2f98a6866be"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "3fbe3f45afc5aa40fff7f795ced8a05d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5424
-        hash: "b35b4dc480aeb76912d927b0ff8676c6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 189; y: 93
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5440
-        hash: "94e82e888280f20cce3ac38b353b79f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 192; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5456
-        hash: "4674fbd35e467bed780a5ea2fe2e258b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5472
-        hash: "698827bfa7ff2eae6b0e0efa99bb15bb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5488
-        hash: "67c7adef5e41481d631f54d34423b93d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5504
-        hash: "097512c005127fa3ebfcbc52808264a8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5520
-        hash: "ad64b5913350e6c6fda199ecb34278f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5536
-        hash: "3237e88e0f40595d2fde62723c00b7fa"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5552
-        hash: "18db89296849f22a7af0a1ffc9762a32"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5568
-        hash: "7f6ac84baaa2c5fcd22ba45172611840"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5584
-        hash: "7b887d3aa44229d9f25fdde8f5ccf471"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5600
-        hash: "b0c08726d0f2a460d5862cd2d7ee6230"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5616
-        hash: "d99389a3287d453b942f070d8c1e86e8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5632
-        hash: "a0751fa826b03cb25e615c6a1435d92a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5648
-        hash: "f33da88ae881c846bd86ab3dc4f12efc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5664
-        hash: "7049bee9a984a2c2d3101eb6d3cce31e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5680
-        hash: "72757a5099748b70241a0d4279e42313"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5696
-        hash: "705feb098ebb2d689526d9271098d6b5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5712
-        hash: "49de92770edb0aae82cf66ae42b31caa"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5728
-        hash: "70fe89f9dce556ec1859f325aa27b7db"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5744
-        hash: "1ededcc625a0e9e317c5aefc238a175a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5776
-        hash: "f1ae53071836512830f7284c4ac884b3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5792
-        hash: "f73c2b66b61bdcb080f8be6607079729"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5808
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 226; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5824
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5840
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5856
-        hash: "bdd0d1bea8590b40cdce2fb45e17901b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5872
-        hash: "007a5d123eea589264e22f862f1bcac6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5888
-        hash: "3a83635e8371f3e26baf83c285b7801d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5904
-        hash: "6615931007ab0f9da070b6316068ad12"
-    }
-    Frame {
-        msec: 5920
-        hash: "be695ab0dced25c1c498d977fc822cef"
-    }
-    Frame {
-        msec: 5936
-        hash: "46dea7348473bc6ce4ea696292e5aae0"
-    }
-    Frame {
-        msec: 5952
-        hash: "23ce0ba723ffe4253610fdc635df9ae2"
-    }
-    Frame {
-        msec: 5968
-        hash: "9d6243396fd98b7efd14ae8a67297e79"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 230; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "be488252ce6c39317c33706f7febe7b5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 225; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "58e53a9cb886d6d90c0b5987d0693904"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "bea9d0338212c01474b25ee637aa8fd0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "b509c0cdea6b1352ff1e146a8f243820"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "9c968354773878009af2f176b1e38d42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6208
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6224
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6240
-        hash: "707f51caadf24d3ed88b69c290d56971"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6256
-        hash: "c23b2afed7fa0e3dbce1183cf8e8d724"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 205; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6272
-        hash: "653b2e2d711c1abc1893d0068f4c531c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6288
-        hash: "246a73b19421f0ea8ec444429bd6704e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6304
-        hash: "3878df64c0cecb2051e04dafe16ad407"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6320
-        hash: "1cf92a793a4d145acce08c61cca3ba4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6336
-        hash: "6c5f70c941a04172aae855eed1516971"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6352
-        hash: "5f4b8d6ad49de0ea1a2ee057e783b363"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6368
-        hash: "dc185cf4a14801d7bcc24ceadffe312b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6384
-        hash: "6934c069d1b7daf1c2dd76739941c7c2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6400
-        hash: "415510947b49a08459523fa2221d3609"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6416
-        hash: "9586619df75f07cc1f01201abd0f1f43"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6432
-        hash: "d016b14c9d5e5cd2545f1c85aa1edc4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6448
-        hash: "4100837adeaf1557534f5c243eeacc37"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6464
-        hash: "a9351f624dc7de55ca8e799cf4371e75"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6480
-        hash: "8f2f9ba7de4e01767dda2c6d8f09e218"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6496
-        hash: "fb9b7d7e1aa140efc7e39cbca7299d34"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6512
-        hash: "eb1c2399d5779cc3382f02e69e5a31f1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6528
-        hash: "3bd98dc8a8cfb7af8a5f2ab11f387065"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6544
-        hash: "1eea9af6e5f359b96df86d56d74f8375"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6560
-        hash: "74c68b948d8e1d3c716eba5f1a186464"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6576
-        hash: "7103ecc0c21208d210938b0cd86fa4e2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6592
-        hash: "187b7801be7cd9643c707016166fcb38"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6608
-        hash: "571fe7704d5d95e91d4bd411ab00edf0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6624
-        hash: "2b6fd25a47274ffa56c3d0020babfdfc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6640
-        hash: "febcd6b5fc1806ff57d1669c79aa4cb2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6656
-        hash: "5c731fc4a2aeccf55a0af2b7171f25ce"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6672
-        hash: "7d9df9dd9a99eabaa4b426438e44d612"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "48278540489142f8a63ed120f4b956c2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "d08abdfb587a7ec07872cb662526b6d8"
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "4622738082ac75e00b6c63e846b7e98b"
-    }
-    Frame {
-        msec: 6752
-        hash: "87a9f2facbaba462c562f09947bb7ded"
-    }
-    Frame {
-        msec: 6768
-        hash: "77e730ece9f195c3627508d1c2a126fc"
-    }
-    Frame {
-        msec: 6784
-        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
-    }
-    Frame {
-        msec: 6800
-        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
-    }
-    Frame {
-        msec: 6816
-        hash: "7f2d9959323f0707e36ecb2252c89727"
-    }
-    Frame {
-        msec: 6832
-        hash: "3462a3e166120515e67430600e4653f8"
-    }
-    Frame {
-        msec: 6848
-        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
-    }
-    Frame {
-        msec: 6864
-        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
-    }
-    Frame {
-        msec: 6880
-        hash: "078d75d72bff036574b85ac0aeaaf2b6"
-    }
-    Frame {
-        msec: 6896
-        hash: "14b328c8ec6276e022643102af80fa44"
-    }
-    Frame {
-        msec: 6912
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
-    }
-    Frame {
-        msec: 6928
-        hash: "df6f025130dc82f4764def81cec5fa7b"
-    }
-    Frame {
-        msec: 6944
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Frame {
-        msec: 6960
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Frame {
-        msec: 6976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7072
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Frame {
-        msec: 7088
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Frame {
-        msec: 7104
-        hash: "df6f025130dc82f4764def81cec5fa7b"
-    }
-    Frame {
-        msec: 7120
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
-    }
-    Frame {
-        msec: 7136
-        hash: "14b328c8ec6276e022643102af80fa44"
-    }
-    Frame {
-        msec: 7152
-        hash: "078d75d72bff036574b85ac0aeaaf2b6"
-    }
-    Frame {
-        msec: 7168
-        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
-    }
-    Frame {
-        msec: 7184
-        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
-    }
-    Frame {
-        msec: 7200
-        hash: "3462a3e166120515e67430600e4653f8"
-    }
-    Frame {
-        msec: 7216
-        hash: "7f2d9959323f0707e36ecb2252c89727"
-    }
-    Frame {
-        msec: 7232
-        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
-    }
-    Frame {
-        msec: 7248
-        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
-    }
-    Frame {
-        msec: 7264
-        hash: "77e730ece9f195c3627508d1c2a126fc"
-    }
-    Frame {
-        msec: 7280
-        hash: "87a9f2facbaba462c562f09947bb7ded"
-    }
-    Frame {
-        msec: 7296
-        hash: "4622738082ac75e00b6c63e846b7e98b"
-    }
-    Frame {
-        msec: 7312
-        hash: "9fcec7616e28cb8317709656fd94f480"
-    }
-    Frame {
-        msec: 7328
-        hash: "d08abdfb587a7ec07872cb662526b6d8"
-    }
-    Frame {
-        msec: 7344
-        hash: "48278540489142f8a63ed120f4b956c2"
-    }
-    Frame {
-        msec: 7360
-        hash: "7d9df9dd9a99eabaa4b426438e44d612"
-    }
-    Frame {
-        msec: 7376
-        hash: "5c731fc4a2aeccf55a0af2b7171f25ce"
-    }
-    Frame {
-        msec: 7392
-        hash: "febcd6b5fc1806ff57d1669c79aa4cb2"
-    }
-    Frame {
-        msec: 7408
-        hash: "4ad2c0877360b0e1bf2212f9455f741e"
-    }
-    Frame {
-        msec: 7424
-        hash: "4df1951aac4ed1957925c95e112b0766"
-    }
-    Frame {
-        msec: 7440
-        hash: "bfbb624abe63639f2a7cb826b6b47393"
-    }
-    Frame {
-        msec: 7456
-        hash: "538cf4ee98145b3801e198b036e24a46"
-    }
-    Frame {
-        msec: 7472
-        hash: "5602c039a304ac0b1fd99957970a825b"
-    }
-    Frame {
-        msec: 7488
-        hash: "9ddd7709269b9a008e15d942e156e13a"
-    }
-    Frame {
-        msec: 7504
-        hash: "91d7c43f5f985d624e77da43ba5fb90f"
-    }
-    Frame {
-        msec: 7520
-        hash: "9153b0419d28e3c8137b58f95451cd58"
-    }
-    Frame {
-        msec: 7536
-        hash: "c5aad5ea4db81cf72f1ff390ed1dc868"
-    }
-    Frame {
-        msec: 7552
-        hash: "47b52ce9e5c705017e94b419b53d20d9"
-    }
-    Frame {
-        msec: 7568
-        hash: "f968e3289a2a6343cdb64e37b83f142a"
-    }
-    Frame {
-        msec: 7584
-        hash: "6fe898a37b17b6b6fa9a2971b518d185"
-    }
-    Frame {
-        msec: 7600
-        hash: "90ced2e487b6e760f2ad2c7d6375a36f"
-    }
-    Frame {
-        msec: 7616
-        hash: "b2d87713d12a54d4d7b6fd6ba2671704"
-    }
-    Frame {
-        msec: 7632
-        hash: "edce9857bd0e93ab841ae62ffba0149f"
-    }
-    Frame {
-        msec: 7648
-        hash: "13ce69facee6bf01c9712db1781c5ef9"
-    }
-    Frame {
-        msec: 7664
-        hash: "64924e43e004f0d9e90c23f61813c732"
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "9c384359c664a71b5b6b9f9d62dd38bf"
-    }
-    Frame {
-        msec: 7712
-        hash: "5998579d228bcf0efdbcee805796ec23"
-    }
-    Frame {
-        msec: 7728
-        hash: "fe69cab70ad5b25f757bc413b895ff94"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "1ededcc625a0e9e317c5aefc238a175a"
-    }
-    Frame {
-        msec: 7760
-        hash: "460a4cbee55ccdeda1941c8dccf08cbd"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7776
-        hash: "f1ae53071836512830f7284c4ac884b3"
-    }
-    Frame {
-        msec: 7792
-        hash: "f73c2b66b61bdcb080f8be6607079729"
-    }
-    Frame {
-        msec: 7808
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Frame {
-        msec: 7824
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Frame {
-        msec: 7840
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Frame {
-        msec: 7856
-        hash: "9c968354773878009af2f176b1e38d42"
-    }
-    Frame {
-        msec: 7872
-        hash: "b509c0cdea6b1352ff1e146a8f243820"
-    }
-    Frame {
-        msec: 7888
-        hash: "bea9d0338212c01474b25ee637aa8fd0"
-    }
-    Frame {
-        msec: 7904
-        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
-    }
-    Frame {
-        msec: 7920
-        hash: "58e53a9cb886d6d90c0b5987d0693904"
-    }
-    Frame {
-        msec: 7936
-        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
-    }
-    Frame {
-        msec: 7952
-        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
-    }
-    Frame {
-        msec: 7968
-        hash: "be488252ce6c39317c33706f7febe7b5"
-    }
-    Frame {
-        msec: 7984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8064
-        hash: "be488252ce6c39317c33706f7febe7b5"
-    }
-    Frame {
-        msec: 8080
-        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
-    }
-    Frame {
-        msec: 8096
-        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
-    }
-    Frame {
-        msec: 8112
-        hash: "58e53a9cb886d6d90c0b5987d0693904"
-    }
-    Frame {
-        msec: 8128
-        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
-    }
-    Frame {
-        msec: 8144
-        hash: "bea9d0338212c01474b25ee637aa8fd0"
-    }
-    Frame {
-        msec: 8160
-        hash: "b509c0cdea6b1352ff1e146a8f243820"
-    }
-    Frame {
-        msec: 8176
-        hash: "9c968354773878009af2f176b1e38d42"
-    }
-    Frame {
-        msec: 8192
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Frame {
-        msec: 8208
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Frame {
-        msec: 8224
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Frame {
-        msec: 8240
-        hash: "f73c2b66b61bdcb080f8be6607079729"
-    }
-    Frame {
-        msec: 8256
-        hash: "f1ae53071836512830f7284c4ac884b3"
-    }
-    Frame {
-        msec: 8272
-        hash: "460a4cbee55ccdeda1941c8dccf08cbd"
-    }
-    Frame {
-        msec: 8288
-        hash: "1ededcc625a0e9e317c5aefc238a175a"
-    }
-    Frame {
-        msec: 8304
-        hash: "70fe89f9dce556ec1859f325aa27b7db"
-    }
-    Frame {
-        msec: 8320
-        hash: "49de92770edb0aae82cf66ae42b31caa"
-    }
-    Frame {
-        msec: 8336
-        hash: "705feb098ebb2d689526d9271098d6b5"
-    }
-    Frame {
-        msec: 8352
-        hash: "72757a5099748b70241a0d4279e42313"
-    }
-    Frame {
-        msec: 8368
-        hash: "7049bee9a984a2c2d3101eb6d3cce31e"
-    }
-    Frame {
-        msec: 8384
-        hash: "f33da88ae881c846bd86ab3dc4f12efc"
-    }
-    Frame {
-        msec: 8400
-        hash: "a0751fa826b03cb25e615c6a1435d92a"
-    }
-    Frame {
-        msec: 8416
-        hash: "d99389a3287d453b942f070d8c1e86e8"
-    }
-    Frame {
-        msec: 8432
-        hash: "e3219357e73a2dfd5b80dfbd6feb79e2"
-    }
-    Frame {
-        msec: 8448
-        hash: "c0953accd856883c813d4ecf99fb632b"
-    }
-    Frame {
-        msec: 8464
-        hash: "185743339cba9dfc1a2c2ff1efd23855"
-    }
-    Frame {
-        msec: 8480
-        hash: "30a4419de779037fd84bd70a99c4d6de"
-    }
-    Frame {
-        msec: 8496
-        hash: "1d9cbd0814831c518e9e8041fe8285c9"
-    }
-    Frame {
-        msec: 8512
-        hash: "81d660df1b0eab7c382991b600f88ba3"
-    }
-    Frame {
-        msec: 8528
-        hash: "7ee1467525b9fe3b6a32fba8c2454df1"
-    }
-    Frame {
-        msec: 8544
-        hash: "28dd72957652cf130d28d30203b36c59"
-    }
-    Frame {
-        msec: 8560
-        hash: "e9697d06a22958cea4f766dd3ec31ca9"
-    }
-    Frame {
-        msec: 8576
-        hash: "81970c31a0a1e42929c83ef5140401c2"
-    }
-    Frame {
-        msec: 8592
-        hash: "ebb5be43955725bef66bf99bd7288c04"
-    }
-    Frame {
-        msec: 8608
-        hash: "afbf0645ea651b2c459eeb43bdc65992"
-    }
-    Frame {
-        msec: 8624
-        hash: "42bf6ab3963652617f2feb96ee170af5"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "4a5966f600f9b27bf7a65fcc6c1c5d17"
-    }
-    Frame {
-        msec: 8672
-        hash: "ecdc1d89af1e76648c8298e2b9940549"
-    }
-    Frame {
-        msec: 8688
-        hash: "0ba1e105a7ae41926e2106b60eafdec9"
-    }
-    Frame {
-        msec: 8704
-        hash: "96e4f277d4ff76afe0c2d58b4aed3acb"
-    }
-    Frame {
-        msec: 8720
-        hash: "f41c6fd9e22354b8f5c940c04930a591"
-    }
-    Frame {
-        msec: 8736
-        hash: "00b522554cf6c0c09e5425f4d3c3fcf9"
-    }
-    Frame {
-        msec: 8752
-        hash: "e8549c0c361f20d167cab128dc996274"
-    }
-    Frame {
-        msec: 8768
-        hash: "976c61615250f9bfa3b4c02ee88bee03"
-    }
-    Frame {
-        msec: 8784
-        hash: "06c95d2fa5e2b4751e5693b179e76eb4"
-    }
-    Frame {
-        msec: 8800
-        hash: "a3d79197235c4717b1f9af3582118ca6"
-    }
-    Frame {
-        msec: 8816
-        hash: "68b23db8f519aa161278074aa318eaa1"
-    }
-    Frame {
-        msec: 8832
-        hash: "af967462be12d0b6ddd3571b00804c12"
-    }
-    Frame {
-        msec: 8848
-        hash: "46f5c0baa2b95fd418984eebe308157e"
-    }
-    Frame {
-        msec: 8864
-        hash: "0a7407c6c751b3f1380a99883e95f1dd"
-    }
-    Frame {
-        msec: 8880
-        hash: "9969c206488671c45c43f3a3dd3f5994"
-    }
-    Frame {
-        msec: 8896
-        hash: "89efa872ce2e71935b47cac101bf15c9"
-    }
-    Frame {
-        msec: 8912
-        hash: "a4545a0c50fb071d267b06bf2d114802"
-    }
-    Frame {
-        msec: 8928
-        hash: "f4df98459c18399e1c6b2d8a43bdd678"
-    }
-    Frame {
-        msec: 8944
-        hash: "027eb091eea8bf51d7ad3ff44120e075"
-    }
-    Frame {
-        msec: 8960
-        hash: "138ec35b850d20664f905a4eea6f7456"
-    }
-    Frame {
-        msec: 8976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9072
-        hash: "138ec35b850d20664f905a4eea6f7456"
-    }
-    Frame {
-        msec: 9088
-        hash: "027eb091eea8bf51d7ad3ff44120e075"
-    }
-    Frame {
-        msec: 9104
-        hash: "f4df98459c18399e1c6b2d8a43bdd678"
-    }
-    Frame {
-        msec: 9120
-        hash: "a4545a0c50fb071d267b06bf2d114802"
-    }
-    Frame {
-        msec: 9136
-        hash: "89efa872ce2e71935b47cac101bf15c9"
+        hash: "bdee3016f1811188691786bafe305196"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png
index cc1774f..c4bf75d 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png
index 60eba16..f28b342 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png
index d4663f7..955aed7 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png
index dc1bb52..02ac575 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
index f1099c8..8d14a2b 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
@@ -6,99 +6,99 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 32
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 48
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 64
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 80
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 96
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 112
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 128
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 144
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 160
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 176
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 192
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 208
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 224
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 240
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 256
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 272
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 288
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 304
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 320
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 336
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 352
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 368
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 384
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Key {
         type: 6
@@ -110,15 +110,15 @@ VisualTest {
     }
     Frame {
         msec: 400
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 416
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 432
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Key {
         type: 7
@@ -130,27 +130,27 @@ VisualTest {
     }
     Frame {
         msec: 448
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 464
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 480
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 496
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 512
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 528
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Key {
         type: 6
@@ -162,15 +162,15 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 560
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 576
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Key {
         type: 7
@@ -182,27 +182,27 @@ VisualTest {
     }
     Frame {
         msec: 592
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 608
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 624
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 640
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 656
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 672
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Key {
         type: 6
@@ -214,19 +214,19 @@ VisualTest {
     }
     Frame {
         msec: 688
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 704
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 720
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 736
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Key {
         type: 7
@@ -238,23 +238,23 @@ VisualTest {
     }
     Frame {
         msec: 752
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 768
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 784
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 800
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 816
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Key {
         type: 6
@@ -266,19 +266,19 @@ VisualTest {
     }
     Frame {
         msec: 832
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 848
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 864
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 880
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Key {
         type: 7
@@ -290,19 +290,19 @@ VisualTest {
     }
     Frame {
         msec: 896
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 912
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 928
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 944
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Key {
         type: 6
@@ -318,15 +318,15 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 992
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 1008
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Key {
         type: 7
@@ -338,23 +338,23 @@ VisualTest {
     }
     Frame {
         msec: 1024
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 1040
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 1056
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 1072
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 1088
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Key {
         type: 6
@@ -366,15 +366,15 @@ VisualTest {
     }
     Frame {
         msec: 1104
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 1120
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 1136
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Key {
         type: 7
@@ -386,23 +386,23 @@ VisualTest {
     }
     Frame {
         msec: 1152
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 1168
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 1184
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 1200
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 1216
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Key {
         type: 6
@@ -414,19 +414,19 @@ VisualTest {
     }
     Frame {
         msec: 1232
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 1248
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 1264
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 1280
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Key {
         type: 7
@@ -438,19 +438,19 @@ VisualTest {
     }
     Frame {
         msec: 1296
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 1312
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 1328
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 1344
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Key {
         type: 6
@@ -462,19 +462,19 @@ VisualTest {
     }
     Frame {
         msec: 1360
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1376
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1392
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1408
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Key {
         type: 7
@@ -486,23 +486,23 @@ VisualTest {
     }
     Frame {
         msec: 1424
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1440
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1456
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1472
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1488
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Key {
         type: 6
@@ -514,15 +514,15 @@ VisualTest {
     }
     Frame {
         msec: 1504
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1520
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1536
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Key {
         type: 7
@@ -534,79 +534,79 @@ VisualTest {
     }
     Frame {
         msec: 1552
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1568
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1584
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1600
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1616
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1632
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1648
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1664
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1680
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1696
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1712
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1728
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1744
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1760
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1776
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1792
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1808
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1824
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Frame {
         msec: 1840
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+        hash: "2723a5a18241fd8787c2e298673e61e3"
     }
     Key {
         type: 6
@@ -618,19 +618,19 @@ VisualTest {
     }
     Frame {
         msec: 1856
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1872
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1888
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1904
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1920
@@ -638,19 +638,19 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1952
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1968
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 1984
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Key {
         type: 7
@@ -662,23 +662,23 @@ VisualTest {
     }
     Frame {
         msec: 2000
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 2016
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 2032
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 2048
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Frame {
         msec: 2064
-        hash: "2718ab36551a20d36664f26e408f8f24"
+        hash: "730ff91304bee489409ea616678a9877"
     }
     Key {
         type: 6
@@ -690,23 +690,23 @@ VisualTest {
     }
     Frame {
         msec: 2080
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2096
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2112
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2128
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2144
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Key {
         type: 7
@@ -718,23 +718,23 @@ VisualTest {
     }
     Frame {
         msec: 2160
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2176
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2192
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2208
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Frame {
         msec: 2224
-        hash: "823ccdc677997c96e4ae16891ffffa77"
+        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
     }
     Key {
         type: 6
@@ -746,11 +746,11 @@ VisualTest {
     }
     Frame {
         msec: 2240
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 2256
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Key {
         type: 7
@@ -762,23 +762,23 @@ VisualTest {
     }
     Frame {
         msec: 2272
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 2288
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 2304
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 2320
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Frame {
         msec: 2336
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+        hash: "d9af8bbbe324c23f69251847c64497d9"
     }
     Key {
         type: 6
@@ -790,15 +790,15 @@ VisualTest {
     }
     Frame {
         msec: 2352
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2368
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2384
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Key {
         type: 7
@@ -810,55 +810,55 @@ VisualTest {
     }
     Frame {
         msec: 2400
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2416
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2432
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2448
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2464
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2480
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2496
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2512
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2528
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2544
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2560
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2576
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Frame {
         msec: 2592
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+        hash: "9a3654cf08a913058fd47c072e09a5c8"
     }
     Key {
         type: 6
@@ -870,23 +870,23 @@ VisualTest {
     }
     Frame {
         msec: 2608
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2624
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2640
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2656
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2672
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Key {
         type: 7
@@ -898,23 +898,23 @@ VisualTest {
     }
     Frame {
         msec: 2688
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2704
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2720
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2736
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Frame {
         msec: 2752
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+        hash: "dc2b08893d3ec12e2da923215eedf2de"
     }
     Key {
         type: 6
@@ -926,15 +926,15 @@ VisualTest {
     }
     Frame {
         msec: 2768
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 2784
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 2800
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Key {
         type: 7
@@ -946,19 +946,19 @@ VisualTest {
     }
     Frame {
         msec: 2816
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 2832
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 2848
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Frame {
         msec: 2864
-        hash: "c602a6535ef86125615307d9d187eb3f"
+        hash: "755c3478a46c430b058e99cf433942b8"
     }
     Key {
         type: 6
@@ -974,15 +974,15 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 2912
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 2928
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Key {
         type: 7
@@ -994,23 +994,23 @@ VisualTest {
     }
     Frame {
         msec: 2944
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 2960
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 2976
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 2992
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Frame {
         msec: 3008
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+        hash: "dbc65e33a133cd8fa7669175de83d94a"
     }
     Key {
         type: 6
@@ -1022,23 +1022,23 @@ VisualTest {
     }
     Frame {
         msec: 3024
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3040
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3056
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3072
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3088
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Key {
         type: 7
@@ -1050,155 +1050,155 @@ VisualTest {
     }
     Frame {
         msec: 3104
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3120
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3136
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3152
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3168
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3184
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3200
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3216
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3232
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3248
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3264
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3280
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3296
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3312
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3328
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3344
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3360
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3376
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3392
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3408
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3424
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3440
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3456
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3472
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3488
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3504
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3520
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3536
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3552
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3568
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3584
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3600
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3616
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3632
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3648
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3664
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3680
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Frame {
         msec: 3696
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+        hash: "1e5621ab02591170fabc0d91c4a09c69"
     }
     Key {
         type: 6
@@ -1210,27 +1210,27 @@ VisualTest {
     }
     Frame {
         msec: 3712
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3728
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3744
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3760
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3776
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3792
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Key {
         type: 7
@@ -1242,11 +1242,11 @@ VisualTest {
     }
     Frame {
         msec: 3808
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3824
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3840
@@ -1254,118 +1254,118 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3872
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3888
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3904
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3920
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3936
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3952
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3968
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 3984
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4000
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4016
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4032
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4048
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4064
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4080
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4096
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4112
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4128
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4144
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4160
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4176
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4192
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4208
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4224
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4240
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4256
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4272
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4288
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
     Frame {
         msec: 4304
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
new file mode 100644
index 0000000..a3f0089
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
new file mode 100644
index 0000000..95772a9
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
new file mode 100644
index 0000000..1b280eb
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
new file mode 100644
index 0000000..1b280eb
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
new file mode 100644
index 0000000..cdd3dc0
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
new file mode 100644
index 0000000..a3115f6
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
new file mode 100644
index 0000000..d2c895b
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
new file mode 100644
index 0000000..e0e1ced
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
new file mode 100644
index 0000000..bde3d7d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
new file mode 100644
index 0000000..38bf8be
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
new file mode 100644
index 0000000..7475f96
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
new file mode 100644
index 0000000..1b280eb
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml
new file mode 100644
index 0000000..c12ee51
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml
@@ -0,0 +1,4687 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 32
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 48
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 64
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 80
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 96
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 112
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 128
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 144
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 160
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 176
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 192
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 208
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 224
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 240
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 256
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 272
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 288
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 304
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 320
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 118; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 336
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 352
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 368
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 384
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 400
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 118; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 416
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 432
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 448
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 464
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 480
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 496
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 512
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 528
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 544
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 560
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 576
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 592
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 608
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 624
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Frame {
+        msec: 640
+        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 117; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 656
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 672
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 117; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 688
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 704
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 720
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 736
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 752
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 768
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 784
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 800
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 816
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 832
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 848
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 864
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 880
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 896
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 912
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 928
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 944
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 960
+        image: "usingMultilineEdit.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 992
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1008
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1024
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1040
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1056
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1072
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1088
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1104
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1120
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1136
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1152
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1168
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1184
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1200
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1216
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1232
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1248
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1264
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1280
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Frame {
+        msec: 1296
+        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+    }
+    Key {
+        type: 6
+        key: 44
+        modifiers: 0
+        text: "2c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1312
+        hash: "bac01431244974a1768d84318f49bf89"
+    }
+    Frame {
+        msec: 1328
+        hash: "bac01431244974a1768d84318f49bf89"
+    }
+    Frame {
+        msec: 1344
+        hash: "bac01431244974a1768d84318f49bf89"
+    }
+    Frame {
+        msec: 1360
+        hash: "bac01431244974a1768d84318f49bf89"
+    }
+    Frame {
+        msec: 1376
+        hash: "bac01431244974a1768d84318f49bf89"
+    }
+    Key {
+        type: 7
+        key: 44
+        modifiers: 0
+        text: "2c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "bac01431244974a1768d84318f49bf89"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1408
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1424
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1440
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1456
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1472
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1488
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1504
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1520
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1536
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Frame {
+        msec: 1552
+        hash: "e22c6376c05d52c8997a67bf21d82a83"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "47f630d2cc3a3fa15309f5f631a36690"
+    }
+    Frame {
+        msec: 1584
+        hash: "47f630d2cc3a3fa15309f5f631a36690"
+    }
+    Frame {
+        msec: 1600
+        hash: "47f630d2cc3a3fa15309f5f631a36690"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1616
+        hash: "47f630d2cc3a3fa15309f5f631a36690"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1632
+        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+    }
+    Frame {
+        msec: 1648
+        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+    }
+    Frame {
+        msec: 1664
+        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+    }
+    Frame {
+        msec: 1680
+        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+    }
+    Frame {
+        msec: 1696
+        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1712
+        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+    }
+    Frame {
+        msec: 1728
+        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "f73e5dc997ddc56554f914014c376f24"
+    }
+    Frame {
+        msec: 1760
+        hash: "f73e5dc997ddc56554f914014c376f24"
+    }
+    Frame {
+        msec: 1776
+        hash: "f73e5dc997ddc56554f914014c376f24"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "f73e5dc997ddc56554f914014c376f24"
+    }
+    Frame {
+        msec: 1808
+        hash: "f73e5dc997ddc56554f914014c376f24"
+    }
+    Frame {
+        msec: 1824
+        hash: "f73e5dc997ddc56554f914014c376f24"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1840
+        hash: "d089f840e514b68fad1edbbce686525f"
+    }
+    Frame {
+        msec: 1856
+        hash: "d089f840e514b68fad1edbbce686525f"
+    }
+    Frame {
+        msec: 1872
+        hash: "d089f840e514b68fad1edbbce686525f"
+    }
+    Frame {
+        msec: 1888
+        hash: "d089f840e514b68fad1edbbce686525f"
+    }
+    Frame {
+        msec: 1904
+        hash: "d089f840e514b68fad1edbbce686525f"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1920
+        image: "usingMultilineEdit.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "9751cdca40cadacfc28de757b20ed639"
+    }
+    Frame {
+        msec: 1952
+        hash: "9751cdca40cadacfc28de757b20ed639"
+    }
+    Frame {
+        msec: 1968
+        hash: "9751cdca40cadacfc28de757b20ed639"
+    }
+    Key {
+        type: 6
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1984
+        hash: "8fb457eb7c17974786ff239c09101d27"
+    }
+    Frame {
+        msec: 2000
+        hash: "8fb457eb7c17974786ff239c09101d27"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2016
+        hash: "8fb457eb7c17974786ff239c09101d27"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Frame {
+        msec: 2048
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Key {
+        type: 7
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Frame {
+        msec: 2080
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Frame {
+        msec: 2096
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Frame {
+        msec: 2112
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Frame {
+        msec: 2144
+        hash: "eeb022c3dd997ce86c3a60146d19b540"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "ba2033e83b5aef2408197ebf7db543a6"
+    }
+    Frame {
+        msec: 2176
+        hash: "ba2033e83b5aef2408197ebf7db543a6"
+    }
+    Frame {
+        msec: 2192
+        hash: "ba2033e83b5aef2408197ebf7db543a6"
+    }
+    Frame {
+        msec: 2208
+        hash: "ba2033e83b5aef2408197ebf7db543a6"
+    }
+    Frame {
+        msec: 2224
+        hash: "ba2033e83b5aef2408197ebf7db543a6"
+    }
+    Frame {
+        msec: 2240
+        hash: "ba2033e83b5aef2408197ebf7db543a6"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2256
+        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+    }
+    Frame {
+        msec: 2272
+        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+    }
+    Frame {
+        msec: 2288
+        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+    }
+    Frame {
+        msec: 2304
+        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+    }
+    Frame {
+        msec: 2320
+        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2336
+        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+    }
+    Frame {
+        msec: 2352
+        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "c3d6b261447c0fa65722c697b60ef415"
+    }
+    Frame {
+        msec: 2384
+        hash: "c3d6b261447c0fa65722c697b60ef415"
+    }
+    Frame {
+        msec: 2400
+        hash: "c3d6b261447c0fa65722c697b60ef415"
+    }
+    Frame {
+        msec: 2416
+        hash: "c3d6b261447c0fa65722c697b60ef415"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2432
+        hash: "c3d6b261447c0fa65722c697b60ef415"
+    }
+    Key {
+        type: 6
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "7899672516311904cc7108f975290615"
+    }
+    Frame {
+        msec: 2464
+        hash: "7899672516311904cc7108f975290615"
+    }
+    Frame {
+        msec: 2480
+        hash: "7899672516311904cc7108f975290615"
+    }
+    Frame {
+        msec: 2496
+        hash: "7899672516311904cc7108f975290615"
+    }
+    Frame {
+        msec: 2512
+        hash: "7899672516311904cc7108f975290615"
+    }
+    Frame {
+        msec: 2528
+        hash: "7899672516311904cc7108f975290615"
+    }
+    Key {
+        type: 7
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2544
+        hash: "7899672516311904cc7108f975290615"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Frame {
+        msec: 2576
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Frame {
+        msec: 2592
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Frame {
+        msec: 2608
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2624
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Frame {
+        msec: 2640
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Frame {
+        msec: 2656
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Frame {
+        msec: 2672
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Frame {
+        msec: 2688
+        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2704
+        hash: "0e583b5b8c82af7fe74ff845abb57069"
+    }
+    Frame {
+        msec: 2720
+        hash: "0e583b5b8c82af7fe74ff845abb57069"
+    }
+    Frame {
+        msec: 2736
+        hash: "0e583b5b8c82af7fe74ff845abb57069"
+    }
+    Frame {
+        msec: 2752
+        hash: "0e583b5b8c82af7fe74ff845abb57069"
+    }
+    Frame {
+        msec: 2768
+        hash: "0e583b5b8c82af7fe74ff845abb57069"
+    }
+    Frame {
+        msec: 2784
+        hash: "0e583b5b8c82af7fe74ff845abb57069"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2816
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Frame {
+        msec: 2832
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Frame {
+        msec: 2848
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Frame {
+        msec: 2864
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2880
+        image: "usingMultilineEdit.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Frame {
+        msec: 2912
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Frame {
+        msec: 2928
+        hash: "5b282d8041386acfd94eab03a0d40fe8"
+    }
+    Key {
+        type: 6
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "9b19fe7f4665fdbd471e22cac9d97bab"
+    }
+    Frame {
+        msec: 2960
+        hash: "9b19fe7f4665fdbd471e22cac9d97bab"
+    }
+    Frame {
+        msec: 2976
+        hash: "9b19fe7f4665fdbd471e22cac9d97bab"
+    }
+    Key {
+        type: 7
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2992
+        hash: "ed57767e75c850ad9bf2d08050419c56"
+    }
+    Frame {
+        msec: 3008
+        hash: "ed57767e75c850ad9bf2d08050419c56"
+    }
+    Frame {
+        msec: 3024
+        hash: "ed57767e75c850ad9bf2d08050419c56"
+    }
+    Frame {
+        msec: 3040
+        hash: "ed57767e75c850ad9bf2d08050419c56"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3056
+        hash: "ed57767e75c850ad9bf2d08050419c56"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3072
+        hash: "225820f0472a6af17f56687a655b382a"
+    }
+    Frame {
+        msec: 3088
+        hash: "225820f0472a6af17f56687a655b382a"
+    }
+    Frame {
+        msec: 3104
+        hash: "225820f0472a6af17f56687a655b382a"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3120
+        hash: "225820f0472a6af17f56687a655b382a"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 33554432
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3136
+        hash: "225820f0472a6af17f56687a655b382a"
+    }
+    Frame {
+        msec: 3152
+        hash: "225820f0472a6af17f56687a655b382a"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 33554432
+        text: "49"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3168
+        hash: "719effbf9211edc87c56cb5628a57ded"
+    }
+    Frame {
+        msec: 3184
+        hash: "719effbf9211edc87c56cb5628a57ded"
+    }
+    Frame {
+        msec: 3200
+        hash: "719effbf9211edc87c56cb5628a57ded"
+    }
+    Frame {
+        msec: 3216
+        hash: "719effbf9211edc87c56cb5628a57ded"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 33554432
+        text: "49"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3232
+        hash: "719effbf9211edc87c56cb5628a57ded"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3248
+        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+    }
+    Frame {
+        msec: 3264
+        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+    }
+    Frame {
+        msec: 3280
+        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+    }
+    Frame {
+        msec: 3296
+        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3312
+        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3328
+        hash: "4df9946eb277ca403fd63a2e19535369"
+    }
+    Frame {
+        msec: 3344
+        hash: "4df9946eb277ca403fd63a2e19535369"
+    }
+    Frame {
+        msec: 3360
+        hash: "4df9946eb277ca403fd63a2e19535369"
+    }
+    Frame {
+        msec: 3376
+        hash: "4df9946eb277ca403fd63a2e19535369"
+    }
+    Frame {
+        msec: 3392
+        hash: "4df9946eb277ca403fd63a2e19535369"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3408
+        hash: "4df9946eb277ca403fd63a2e19535369"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3424
+        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+    }
+    Frame {
+        msec: 3440
+        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+    }
+    Frame {
+        msec: 3456
+        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+    }
+    Frame {
+        msec: 3472
+        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+    }
+    Frame {
+        msec: 3488
+        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 78
+        modifiers: 0
+        text: "6e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3504
+        hash: "60225c94dc1e1485406d8ba59737d383"
+    }
+    Frame {
+        msec: 3520
+        hash: "60225c94dc1e1485406d8ba59737d383"
+    }
+    Frame {
+        msec: 3536
+        hash: "60225c94dc1e1485406d8ba59737d383"
+    }
+    Frame {
+        msec: 3552
+        hash: "60225c94dc1e1485406d8ba59737d383"
+    }
+    Frame {
+        msec: 3568
+        hash: "60225c94dc1e1485406d8ba59737d383"
+    }
+    Frame {
+        msec: 3584
+        hash: "60225c94dc1e1485406d8ba59737d383"
+    }
+    Key {
+        type: 7
+        key: 78
+        modifiers: 0
+        text: "6e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3600
+        hash: "60225c94dc1e1485406d8ba59737d383"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3616
+        hash: "8321580dd92a92edbf12df43259999f4"
+    }
+    Frame {
+        msec: 3632
+        hash: "8321580dd92a92edbf12df43259999f4"
+    }
+    Frame {
+        msec: 3648
+        hash: "8321580dd92a92edbf12df43259999f4"
+    }
+    Frame {
+        msec: 3664
+        hash: "8321580dd92a92edbf12df43259999f4"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3680
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3696
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3712
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3728
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3744
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3760
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3776
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3792
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3808
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3824
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3840
+        image: "usingMultilineEdit.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3872
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3888
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3904
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3920
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3936
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3952
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Frame {
+        msec: 3968
+        hash: "d704cc8d5bbdc8768d25372aa654925c"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3984
+        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+    }
+    Frame {
+        msec: 4000
+        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+    }
+    Frame {
+        msec: 4016
+        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+    }
+    Frame {
+        msec: 4032
+        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+    }
+    Frame {
+        msec: 4048
+        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4064
+        hash: "89613ce626a22573fa41191fcede3273"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "89613ce626a22573fa41191fcede3273"
+    }
+    Frame {
+        msec: 4096
+        hash: "89613ce626a22573fa41191fcede3273"
+    }
+    Frame {
+        msec: 4112
+        hash: "89613ce626a22573fa41191fcede3273"
+    }
+    Frame {
+        msec: 4128
+        hash: "89613ce626a22573fa41191fcede3273"
+    }
+    Key {
+        type: 6
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4144
+        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+    }
+    Frame {
+        msec: 4160
+        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4176
+        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+    }
+    Frame {
+        msec: 4192
+        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+    }
+    Frame {
+        msec: 4208
+        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4224
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Frame {
+        msec: 4240
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Key {
+        type: 7
+        key: 85
+        modifiers: 0
+        text: "75"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4256
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Frame {
+        msec: 4272
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4288
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Frame {
+        msec: 4304
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Frame {
+        msec: 4320
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Frame {
+        msec: 4336
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Frame {
+        msec: 4352
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Frame {
+        msec: 4368
+        hash: "9653692fe9292ef0d0559412f68e9cf7"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4384
+        hash: "902831b5d2a134629e04b53c87cdc709"
+    }
+    Frame {
+        msec: 4400
+        hash: "902831b5d2a134629e04b53c87cdc709"
+    }
+    Frame {
+        msec: 4416
+        hash: "902831b5d2a134629e04b53c87cdc709"
+    }
+    Frame {
+        msec: 4432
+        hash: "902831b5d2a134629e04b53c87cdc709"
+    }
+    Frame {
+        msec: 4448
+        hash: "902831b5d2a134629e04b53c87cdc709"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4464
+        hash: "902831b5d2a134629e04b53c87cdc709"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4480
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4496
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4512
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4528
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4544
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4560
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4576
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4592
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4608
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4624
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4640
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4656
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4672
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4688
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4704
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4720
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4736
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4752
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4768
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4784
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4800
+        image: "usingMultilineEdit.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Frame {
+        msec: 4832
+        hash: "cc1dc01f123309c70743535f61b18278"
+    }
+    Key {
+        type: 6
+        key: 63
+        modifiers: 33554432
+        text: "3f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4848
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4864
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4880
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4896
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4912
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4928
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4944
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Key {
+        type: 7
+        key: 63
+        modifiers: 33554432
+        text: "3f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4960
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4976
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 4992
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5008
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5024
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5040
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5056
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5072
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5088
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5104
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5120
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5136
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5152
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5168
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5184
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5200
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5216
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5232
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5248
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5264
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5280
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5296
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5312
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5328
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5344
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5360
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5376
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5392
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5408
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5424
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5440
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5456
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5472
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5488
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5504
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5520
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5536
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5552
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5568
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5584
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5600
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5616
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5632
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5648
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5664
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5680
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5696
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5712
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5728
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5744
+        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+    }
+    Frame {
+        msec: 5760
+        image: "usingMultilineEdit.5.png"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 48; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5776
+        hash: "a8710131aa2cfcedeb1956319174bd44"
+    }
+    Frame {
+        msec: 5792
+        hash: "a8710131aa2cfcedeb1956319174bd44"
+    }
+    Frame {
+        msec: 5808
+        hash: "a8710131aa2cfcedeb1956319174bd44"
+    }
+    Frame {
+        msec: 5824
+        hash: "a8710131aa2cfcedeb1956319174bd44"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "a8710131aa2cfcedeb1956319174bd44"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "069e40e23640f303e24f8821907bf907"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "069e40e23640f303e24f8821907bf907"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 56; y: 41
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "3aba0fbccdbbbfc6b452464a35941f01"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 56; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "8d68c5797a7a3be6ab1bc83a1adea983"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 58; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 58
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5920
+        hash: "633201d777634e5a2e4ccc0ba7a84ada"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 69
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5936
+        hash: "e1d36d4dbdff47e6b6f864dae077bc7f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 62; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5952
+        hash: "905419e116b2c93145c85456e6e7ccac"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5968
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 105
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 111
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 122
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 130
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 132
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 134
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 140
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 153
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Frame {
+        msec: 6208
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Frame {
+        msec: 6224
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Frame {
+        msec: 6240
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Frame {
+        msec: 6256
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6272
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 152
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6288
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6304
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6320
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 63; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6336
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6352
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6368
+        hash: "f851ebbbab70e4f283caefc26f304946"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 58
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 51
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6384
+        hash: "ca385b53209d35e0c78e8124c782d03f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 37
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6400
+        hash: "ca385b53209d35e0c78e8124c782d03f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6416
+        hash: "730fa19a0deb6e210ee7ca136ecfb4e0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 16
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6432
+        hash: "e749a531bb6b30611bed794e2630555f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6448
+        hash: "4d7a02eeb0d0ed7eb29fbfb72bce9ba1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 48; y: -23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6464
+        hash: "2476a4d7038b9f1c50557cf077ea4412"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6480
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6496
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6512
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6528
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6544
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6560
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6576
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6592
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Frame {
+        msec: 6608
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Frame {
+        msec: 6624
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Frame {
+        msec: 6640
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Frame {
+        msec: 6656
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Frame {
+        msec: 6672
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -47
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: -45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 44; y: -42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 44; y: -39
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6720
+        image: "usingMultilineEdit.6.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: -33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 46; y: -28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: -21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6752
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 48; y: -18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: -14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6768
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: -10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6784
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: -6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: -3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6800
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: -1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 0
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6816
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6832
+        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6848
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 54; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6864
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 6912
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 6928
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 6944
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 6960
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 6976
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 6992
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 7008
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 7024
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 7040
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 7056
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 7072
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Frame {
+        msec: 7088
+        hash: "2b0458102c2231777202e66e0eaa8c8c"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 59; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7104
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7120
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7136
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7152
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7168
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 59; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7184
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7200
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7216
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7232
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7248
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7264
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7280
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7296
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7312
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7328
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7344
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7360
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7376
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7392
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7408
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7424
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7440
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7456
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7472
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7488
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7504
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7520
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7536
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7552
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Frame {
+        msec: 7568
+        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7584
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Frame {
+        msec: 7600
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Frame {
+        msec: 7616
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7632
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Frame {
+        msec: 7648
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Frame {
+        msec: 7664
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Frame {
+        msec: 7680
+        image: "usingMultilineEdit.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Frame {
+        msec: 7712
+        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7728
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7744
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7760
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7776
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7792
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7808
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7824
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7840
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7856
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7872
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7888
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7904
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7920
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7936
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Frame {
+        msec: 7952
+        hash: "16829fffc675d304661b9ff844a675f3"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 7968
+        hash: "45cfab0823b20b5dc206b42781cd9fb0"
+    }
+    Frame {
+        msec: 7984
+        hash: "45cfab0823b20b5dc206b42781cd9fb0"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8000
+        hash: "01069fb12c399f4d22d4d4ec79779752"
+    }
+    Frame {
+        msec: 8016
+        hash: "01069fb12c399f4d22d4d4ec79779752"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8032
+        hash: "88b6c6cca32a6d4adfc51cc7cce5e4bb"
+    }
+    Frame {
+        msec: 8048
+        hash: "88b6c6cca32a6d4adfc51cc7cce5e4bb"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 0
+        text: ""
+        autorep: true
+        count: 1
+    }
+    Frame {
+        msec: 8064
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Frame {
+        msec: 8080
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8096
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Frame {
+        msec: 8112
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Frame {
+        msec: 8128
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Frame {
+        msec: 8144
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Frame {
+        msec: 8160
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Frame {
+        msec: 8176
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Frame {
+        msec: 8192
+        hash: "7b8423cfd0806b7d29cdb366133ef828"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8208
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Frame {
+        msec: 8224
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Frame {
+        msec: 8240
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Frame {
+        msec: 8256
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8272
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Frame {
+        msec: 8288
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Frame {
+        msec: 8304
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Frame {
+        msec: 8320
+        hash: "45feb9f7c516693224505726324e07f1"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8336
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Frame {
+        msec: 8352
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Frame {
+        msec: 8368
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Frame {
+        msec: 8384
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8400
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Frame {
+        msec: 8416
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Frame {
+        msec: 8432
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Frame {
+        msec: 8448
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Frame {
+        msec: 8464
+        hash: "592811b385809e02c02e5925191fbc0c"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8480
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8496
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8512
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8528
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8544
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8560
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8576
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8592
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8608
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8624
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8640
+        image: "usingMultilineEdit.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8672
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8688
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8704
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8720
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8736
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8752
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8768
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8784
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8800
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8816
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8832
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8848
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8864
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8880
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8896
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8912
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8928
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8944
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8960
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8976
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 8992
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9008
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9024
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9040
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9056
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9072
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9088
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9104
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9120
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9136
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9152
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9168
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9184
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9200
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 70; y: 73
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9216
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9232
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9248
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9264
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 70; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9280
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 70; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9296
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9312
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9328
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9344
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9360
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9376
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9392
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9408
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9424
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Frame {
+        msec: 9440
+        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 71; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9456
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9472
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9488
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9504
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9520
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9536
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 71; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9552
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9568
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9584
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9600
+        image: "usingMultilineEdit.9.png"
+    }
+    Frame {
+        msec: 9616
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9632
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9648
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9664
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9680
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9696
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9712
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9728
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9744
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9760
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9776
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9792
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9808
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9824
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9840
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9856
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9872
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9888
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9904
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9920
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9936
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9952
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9968
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 9984
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10000
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10016
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10032
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10048
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10064
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10080
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10096
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10112
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10128
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10144
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10160
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10176
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10192
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10208
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10224
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10240
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10256
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10272
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10288
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10304
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10320
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10336
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Frame {
+        msec: 10352
+        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10368
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10384
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10400
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10416
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10432
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10448
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10464
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10480
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10496
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10512
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10528
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10544
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10560
+        image: "usingMultilineEdit.10.png"
+    }
+    Frame {
+        msec: 10576
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10592
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10608
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10624
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10640
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 10656
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10672
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10688
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10704
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10720
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10736
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10752
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10768
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10784
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10800
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10816
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10832
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10848
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10864
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10880
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10896
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10912
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10928
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10944
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10960
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10976
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 10992
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11008
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11024
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11040
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11056
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11072
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11088
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11104
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11120
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11136
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11152
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11168
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11184
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11200
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11216
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11232
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11248
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11264
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11280
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11296
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11312
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11328
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11344
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11360
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11376
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11392
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11408
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11424
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11440
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11456
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11472
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11488
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11504
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11520
+        image: "usingMultilineEdit.11.png"
+    }
+    Frame {
+        msec: 11536
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11552
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11568
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11584
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11600
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+    Frame {
+        msec: 11616
+        hash: "94c707f2778a4f327f0c49265a42dfb4"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
new file mode 100644
index 0000000..0d1fa54
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
new file mode 100644
index 0000000..bedf721
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
new file mode 100644
index 0000000..f17abe2
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
new file mode 100644
index 0000000..a98e8ef
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
new file mode 100644
index 0000000..36801d8
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
new file mode 100644
index 0000000..35c39e7
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
new file mode 100644
index 0000000..35c39e7
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml
new file mode 100644
index 0000000..3e36073
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml
@@ -0,0 +1,2467 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "2bfc2ce5462c1b2e8177159590e8bf9d"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 33554432
+        text: "54"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 32
+        hash: "2aebd6f552933d74ad64e953728c44a6"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 48
+        hash: "2aebd6f552933d74ad64e953728c44a6"
+    }
+    Frame {
+        msec: 64
+        hash: "2aebd6f552933d74ad64e953728c44a6"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 80
+        hash: "2aebd6f552933d74ad64e953728c44a6"
+    }
+    Frame {
+        msec: 96
+        hash: "2aebd6f552933d74ad64e953728c44a6"
+    }
+    Key {
+        type: 6
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 112
+        hash: "96f0f1c8ddc760ddb454c374faa75239"
+    }
+    Frame {
+        msec: 128
+        hash: "96f0f1c8ddc760ddb454c374faa75239"
+    }
+    Frame {
+        msec: 144
+        hash: "96f0f1c8ddc760ddb454c374faa75239"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 160
+        hash: "5660942e66cdc499a067b1209b46a593"
+    }
+    Frame {
+        msec: 176
+        hash: "5660942e66cdc499a067b1209b46a593"
+    }
+    Frame {
+        msec: 192
+        hash: "5660942e66cdc499a067b1209b46a593"
+    }
+    Key {
+        type: 7
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 208
+        hash: "5660942e66cdc499a067b1209b46a593"
+    }
+    Frame {
+        msec: 224
+        hash: "5660942e66cdc499a067b1209b46a593"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 240
+        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 256
+        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+    }
+    Frame {
+        msec: 272
+        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+    }
+    Frame {
+        msec: 288
+        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+    }
+    Frame {
+        msec: 304
+        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 320
+        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+    }
+    Frame {
+        msec: 336
+        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 352
+        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+    }
+    Frame {
+        msec: 368
+        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+    }
+    Frame {
+        msec: 384
+        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+    }
+    Frame {
+        msec: 400
+        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 416
+        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+    }
+    Frame {
+        msec: 432
+        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+    }
+    Frame {
+        msec: 448
+        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+    }
+    Frame {
+        msec: 464
+        hash: "c9f5b9e45b0bb040e669daccf8bb1eb0"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 480
+        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+    }
+    Frame {
+        msec: 496
+        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+    }
+    Frame {
+        msec: 512
+        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+    }
+    Frame {
+        msec: 528
+        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "15313caf999d43a079e51c69323682f3"
+    }
+    Frame {
+        msec: 560
+        hash: "15313caf999d43a079e51c69323682f3"
+    }
+    Frame {
+        msec: 576
+        hash: "15313caf999d43a079e51c69323682f3"
+    }
+    Frame {
+        msec: 592
+        hash: "15313caf999d43a079e51c69323682f3"
+    }
+    Frame {
+        msec: 608
+        hash: "15313caf999d43a079e51c69323682f3"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 624
+        hash: "80cbbe525c033083248e4a5d636f875c"
+    }
+    Frame {
+        msec: 640
+        hash: "80cbbe525c033083248e4a5d636f875c"
+    }
+    Frame {
+        msec: 656
+        hash: "80cbbe525c033083248e4a5d636f875c"
+    }
+    Frame {
+        msec: 672
+        hash: "80cbbe525c033083248e4a5d636f875c"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 688
+        hash: "80cbbe525c033083248e4a5d636f875c"
+    }
+    Frame {
+        msec: 704
+        hash: "80cbbe525c033083248e4a5d636f875c"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+    }
+    Frame {
+        msec: 736
+        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+    }
+    Frame {
+        msec: 752
+        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+    }
+    Frame {
+        msec: 768
+        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+    }
+    Frame {
+        msec: 784
+        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 800
+        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 816
+        hash: "d13548c95a838350f2b3011e643e0182"
+    }
+    Frame {
+        msec: 832
+        hash: "d13548c95a838350f2b3011e643e0182"
+    }
+    Frame {
+        msec: 848
+        hash: "d13548c95a838350f2b3011e643e0182"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 864
+        hash: "d13548c95a838350f2b3011e643e0182"
+    }
+    Frame {
+        msec: 880
+        hash: "d13548c95a838350f2b3011e643e0182"
+    }
+    Frame {
+        msec: 896
+        hash: "d13548c95a838350f2b3011e643e0182"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 912
+        hash: "1c61611fc6386736782b7d61619ae9af"
+    }
+    Frame {
+        msec: 928
+        hash: "1c61611fc6386736782b7d61619ae9af"
+    }
+    Frame {
+        msec: 944
+        hash: "1c61611fc6386736782b7d61619ae9af"
+    }
+    Frame {
+        msec: 960
+        image: "wrap.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "224079eaeb708f8cd27326a06857f6aa"
+    }
+    Frame {
+        msec: 992
+        hash: "224079eaeb708f8cd27326a06857f6aa"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1008
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1024
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1040
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1056
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1072
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1088
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1104
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1120
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1136
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1152
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1168
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Frame {
+        msec: 1184
+        hash: "07681c5879322e7ac093c9324b45520d"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+    }
+    Frame {
+        msec: 1216
+        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+    }
+    Frame {
+        msec: 1232
+        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+    }
+    Frame {
+        msec: 1248
+        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+    }
+    Frame {
+        msec: 1264
+        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1280
+        hash: "95c62fa8d99d29999ce84b975d6858bc"
+    }
+    Frame {
+        msec: 1296
+        hash: "95c62fa8d99d29999ce84b975d6858bc"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1312
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Frame {
+        msec: 1328
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Frame {
+        msec: 1344
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1360
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Frame {
+        msec: 1376
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Frame {
+        msec: 1408
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Frame {
+        msec: 1424
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Frame {
+        msec: 1440
+        hash: "c98dada1c82e867bd0d0ff56de86574f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1456
+        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+    }
+    Frame {
+        msec: 1472
+        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+    }
+    Frame {
+        msec: 1488
+        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+    }
+    Frame {
+        msec: 1504
+        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+    }
+    Frame {
+        msec: 1520
+        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1536
+        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+    }
+    Frame {
+        msec: 1552
+        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+    }
+    Key {
+        type: 6
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+    }
+    Frame {
+        msec: 1584
+        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+    }
+    Frame {
+        msec: 1600
+        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+    }
+    Frame {
+        msec: 1616
+        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+    }
+    Frame {
+        msec: 1632
+        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1648
+        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+    }
+    Frame {
+        msec: 1664
+        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+    }
+    Frame {
+        msec: 1680
+        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+    }
+    Frame {
+        msec: 1696
+        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+    }
+    Frame {
+        msec: 1712
+        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1728
+        hash: "acf73c003e786ca1756f43a2e20962d3"
+    }
+    Frame {
+        msec: 1744
+        hash: "acf73c003e786ca1756f43a2e20962d3"
+    }
+    Frame {
+        msec: 1760
+        hash: "acf73c003e786ca1756f43a2e20962d3"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1776
+        hash: "acf73c003e786ca1756f43a2e20962d3"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Frame {
+        msec: 1808
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1824
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Frame {
+        msec: 1840
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Frame {
+        msec: 1856
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Frame {
+        msec: 1872
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1888
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Frame {
+        msec: 1904
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Frame {
+        msec: 1920
+        image: "wrap.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Frame {
+        msec: 1952
+        hash: "715cce5efb512e76e65b6dd53de988c6"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1968
+        hash: "eb9217410ea88877b037c9f8d38413ab"
+    }
+    Frame {
+        msec: 1984
+        hash: "eb9217410ea88877b037c9f8d38413ab"
+    }
+    Frame {
+        msec: 2000
+        hash: "eb9217410ea88877b037c9f8d38413ab"
+    }
+    Frame {
+        msec: 2016
+        hash: "eb9217410ea88877b037c9f8d38413ab"
+    }
+    Frame {
+        msec: 2032
+        hash: "eb9217410ea88877b037c9f8d38413ab"
+    }
+    Frame {
+        msec: 2048
+        hash: "eb9217410ea88877b037c9f8d38413ab"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2080
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Frame {
+        msec: 2096
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Frame {
+        msec: 2112
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Frame {
+        msec: 2144
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Frame {
+        msec: 2160
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Frame {
+        msec: 2176
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Frame {
+        msec: 2192
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Frame {
+        msec: 2208
+        hash: "d4b86b88d417e168139671f762a129a9"
+    }
+    Key {
+        type: 6
+        key: 88
+        modifiers: 0
+        text: "78"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2224
+        hash: "bce77452be7f54a1f42685acb79ca5a3"
+    }
+    Frame {
+        msec: 2240
+        hash: "bce77452be7f54a1f42685acb79ca5a3"
+    }
+    Frame {
+        msec: 2256
+        hash: "bce77452be7f54a1f42685acb79ca5a3"
+    }
+    Frame {
+        msec: 2272
+        hash: "bce77452be7f54a1f42685acb79ca5a3"
+    }
+    Frame {
+        msec: 2288
+        hash: "bce77452be7f54a1f42685acb79ca5a3"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2304
+        hash: "c8040808e2d582a32d447eb885b6a72d"
+    }
+    Key {
+        type: 7
+        key: 88
+        modifiers: 0
+        text: "78"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2320
+        hash: "c8040808e2d582a32d447eb885b6a72d"
+    }
+    Frame {
+        msec: 2336
+        hash: "c8040808e2d582a32d447eb885b6a72d"
+    }
+    Frame {
+        msec: 2352
+        hash: "c8040808e2d582a32d447eb885b6a72d"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+    }
+    Frame {
+        msec: 2384
+        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2400
+        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+    }
+    Frame {
+        msec: 2416
+        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+    }
+    Frame {
+        msec: 2432
+        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+    }
+    Frame {
+        msec: 2464
+        hash: "e1020b6bb8ca2e9f0ce93f9047695f48"
+    }
+    Frame {
+        msec: 2480
+        hash: "e1020b6bb8ca2e9f0ce93f9047695f48"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2496
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2512
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2528
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2544
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2576
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2592
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2608
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2624
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Frame {
+        msec: 2640
+        hash: "429296196c5ebf0094d5e76379f929c5"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2656
+        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+    }
+    Frame {
+        msec: 2672
+        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+    }
+    Frame {
+        msec: 2688
+        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+    }
+    Frame {
+        msec: 2704
+        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2720
+        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+    }
+    Frame {
+        msec: 2736
+        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+    }
+    Frame {
+        msec: 2752
+        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "4a2af150d069abfff098673375469b08"
+    }
+    Frame {
+        msec: 2784
+        hash: "4a2af150d069abfff098673375469b08"
+    }
+    Frame {
+        msec: 2800
+        hash: "4a2af150d069abfff098673375469b08"
+    }
+    Frame {
+        msec: 2816
+        hash: "4a2af150d069abfff098673375469b08"
+    }
+    Frame {
+        msec: 2832
+        hash: "4a2af150d069abfff098673375469b08"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2848
+        hash: "f1909371c6f44fb7547916340d043ac7"
+    }
+    Frame {
+        msec: 2864
+        hash: "f1909371c6f44fb7547916340d043ac7"
+    }
+    Frame {
+        msec: 2880
+        image: "wrap.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "f1909371c6f44fb7547916340d043ac7"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2912
+        hash: "35fecf3c5feda6afbd4eac5935dca7af"
+    }
+    Frame {
+        msec: 2928
+        hash: "35fecf3c5feda6afbd4eac5935dca7af"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "35fecf3c5feda6afbd4eac5935dca7af"
+    }
+    Frame {
+        msec: 2960
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2976
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Frame {
+        msec: 2992
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Frame {
+        msec: 3008
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Frame {
+        msec: 3024
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Frame {
+        msec: 3040
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Frame {
+        msec: 3056
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Frame {
+        msec: 3072
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Frame {
+        msec: 3088
+        hash: "d8e23c87332aed5105cb6d488efd4a63"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3104
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3120
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3136
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3152
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3168
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3184
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3200
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3216
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3232
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Frame {
+        msec: 3248
+        hash: "6c3f38c1180f392082e3879e35a23c5e"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3264
+        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+    }
+    Frame {
+        msec: 3280
+        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+    }
+    Frame {
+        msec: 3296
+        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3312
+        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+    }
+    Frame {
+        msec: 3328
+        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+    }
+    Frame {
+        msec: 3344
+        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3360
+        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+    }
+    Frame {
+        msec: 3376
+        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+    }
+    Frame {
+        msec: 3392
+        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+    }
+    Frame {
+        msec: 3408
+        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+    }
+    Frame {
+        msec: 3424
+        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3440
+        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+    }
+    Frame {
+        msec: 3456
+        hash: "4928b737a83471181066d043b51e939f"
+    }
+    Frame {
+        msec: 3472
+        hash: "4928b737a83471181066d043b51e939f"
+    }
+    Key {
+        type: 6
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3488
+        hash: "541901e223b7129edcbd2264da7e13cd"
+    }
+    Frame {
+        msec: 3504
+        hash: "541901e223b7129edcbd2264da7e13cd"
+    }
+    Frame {
+        msec: 3520
+        hash: "541901e223b7129edcbd2264da7e13cd"
+    }
+    Frame {
+        msec: 3536
+        hash: "541901e223b7129edcbd2264da7e13cd"
+    }
+    Key {
+        type: 7
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3552
+        hash: "541901e223b7129edcbd2264da7e13cd"
+    }
+    Frame {
+        msec: 3568
+        hash: "541901e223b7129edcbd2264da7e13cd"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3584
+        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+    }
+    Frame {
+        msec: 3600
+        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+    }
+    Frame {
+        msec: 3616
+        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+    }
+    Frame {
+        msec: 3632
+        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+    }
+    Frame {
+        msec: 3648
+        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+    }
+    Frame {
+        msec: 3664
+        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3680
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3696
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3712
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3728
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3744
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3760
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3776
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3792
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3808
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3824
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3840
+        image: "wrap.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3872
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3888
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Frame {
+        msec: 3904
+        hash: "af1a78eca66ce7523306aaf324a59af6"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3920
+        hash: "c72ed9cecd1144b7e937c2c3c33ab0b8"
+    }
+    Frame {
+        msec: 3936
+        hash: "c72ed9cecd1144b7e937c2c3c33ab0b8"
+    }
+    Frame {
+        msec: 3952
+        hash: "c72ed9cecd1144b7e937c2c3c33ab0b8"
+    }
+    Frame {
+        msec: 3968
+        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+    }
+    Frame {
+        msec: 3984
+        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4000
+        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+    }
+    Frame {
+        msec: 4016
+        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4032
+        hash: "9b129865b81189be8c2e59178c009cd9"
+    }
+    Frame {
+        msec: 4048
+        hash: "9b129865b81189be8c2e59178c009cd9"
+    }
+    Frame {
+        msec: 4064
+        hash: "9b129865b81189be8c2e59178c009cd9"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "9b129865b81189be8c2e59178c009cd9"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4096
+        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+    }
+    Frame {
+        msec: 4112
+        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+    }
+    Frame {
+        msec: 4128
+        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+    }
+    Frame {
+        msec: 4144
+        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4160
+        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+    }
+    Frame {
+        msec: 4176
+        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+    }
+    Frame {
+        msec: 4192
+        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4208
+        hash: "3532604c4d8bb23fc8fd44a153708f23"
+    }
+    Frame {
+        msec: 4224
+        hash: "3532604c4d8bb23fc8fd44a153708f23"
+    }
+    Frame {
+        msec: 4240
+        hash: "3532604c4d8bb23fc8fd44a153708f23"
+    }
+    Frame {
+        msec: 4256
+        hash: "3532604c4d8bb23fc8fd44a153708f23"
+    }
+    Frame {
+        msec: 4272
+        hash: "3532604c4d8bb23fc8fd44a153708f23"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4288
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4304
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Frame {
+        msec: 4320
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Frame {
+        msec: 4336
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4352
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Frame {
+        msec: 4368
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Frame {
+        msec: 4384
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Frame {
+        msec: 4400
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Frame {
+        msec: 4416
+        hash: "7a951d7233a41e872aa8f8784edc1bff"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4432
+        hash: "41683813bcdc1761003a9bece7752516"
+    }
+    Frame {
+        msec: 4448
+        hash: "41683813bcdc1761003a9bece7752516"
+    }
+    Frame {
+        msec: 4464
+        hash: "be52b6b350696bb8e883bd24750cce06"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4480
+        hash: "be52b6b350696bb8e883bd24750cce06"
+    }
+    Frame {
+        msec: 4496
+        hash: "be52b6b350696bb8e883bd24750cce06"
+    }
+    Frame {
+        msec: 4512
+        hash: "be52b6b350696bb8e883bd24750cce06"
+    }
+    Frame {
+        msec: 4528
+        hash: "be52b6b350696bb8e883bd24750cce06"
+    }
+    Frame {
+        msec: 4544
+        hash: "be52b6b350696bb8e883bd24750cce06"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4560
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Frame {
+        msec: 4576
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Frame {
+        msec: 4592
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Frame {
+        msec: 4608
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4624
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Frame {
+        msec: 4640
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Frame {
+        msec: 4656
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Frame {
+        msec: 4672
+        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4688
+        hash: "4e994f63cd763db43435fd39e864585c"
+    }
+    Frame {
+        msec: 4704
+        hash: "4e994f63cd763db43435fd39e864585c"
+    }
+    Frame {
+        msec: 4720
+        hash: "4e994f63cd763db43435fd39e864585c"
+    }
+    Frame {
+        msec: 4736
+        hash: "4e994f63cd763db43435fd39e864585c"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4752
+        hash: "4e994f63cd763db43435fd39e864585c"
+    }
+    Frame {
+        msec: 4768
+        hash: "4e994f63cd763db43435fd39e864585c"
+    }
+    Frame {
+        msec: 4784
+        hash: "4e994f63cd763db43435fd39e864585c"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4800
+        image: "wrap.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "2b5db83aff14077f625dbfc75830b2b0"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4832
+        hash: "2b5db83aff14077f625dbfc75830b2b0"
+    }
+    Frame {
+        msec: 4848
+        hash: "2b5db83aff14077f625dbfc75830b2b0"
+    }
+    Frame {
+        msec: 4864
+        hash: "2b5db83aff14077f625dbfc75830b2b0"
+    }
+    Frame {
+        msec: 4880
+        hash: "2b5db83aff14077f625dbfc75830b2b0"
+    }
+    Key {
+        type: 6
+        key: 46
+        modifiers: 0
+        text: "2e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4896
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 4912
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 4928
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 4944
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Key {
+        type: 7
+        key: 46
+        modifiers: 0
+        text: "2e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4960
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 4976
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 4992
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5008
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5024
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5040
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5056
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5072
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5088
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5104
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5120
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5136
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5152
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5168
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5184
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5200
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5216
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5232
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5248
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5264
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5280
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5296
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5312
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5328
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5344
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5360
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5376
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5392
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5408
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5424
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5440
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5456
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5472
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5488
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5504
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5520
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5536
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5552
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5568
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5584
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5600
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5616
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5632
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5648
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5664
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5680
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5696
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5712
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5728
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5744
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5760
+        image: "wrap.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5792
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5808
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5824
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5840
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5856
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5872
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5888
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5904
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5920
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5936
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5952
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 5968
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 5984
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6000
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6016
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6032
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6048
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6064
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6080
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6096
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6112
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6128
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6144
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6160
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6176
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6192
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6208
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6224
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6240
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6256
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6272
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6288
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6304
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6320
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6336
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6352
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6368
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6384
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6400
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6416
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6432
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6448
+        hash: "f902766808596ea423cbc0b7e9bdd87a"
+    }
+    Frame {
+        msec: 6464
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6480
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6496
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6512
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6528
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6544
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6560
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6576
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6592
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6608
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6624
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6640
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6656
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6672
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6688
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6704
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6720
+        image: "wrap.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6752
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6768
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6784
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6800
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6816
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6832
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6848
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+    Frame {
+        msec: 6864
+        hash: "566cba616a99c92c228a4c312466b96b"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
index 9d0bab2..d889eef 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
index db66ff7..0c8c250 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
index cbcca68..76b7fce 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
index c22196b..ecc8568 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
index a1d051e..766abaf 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
index 208d05f..37f5e46 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
@@ -6,134 +6,146 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 32
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 48
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 64
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 80
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 96
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 112
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 128
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 144
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 160
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 176
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 192
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 208
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 224
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 240
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 256
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 272
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 288
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 304
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 320
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 336
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 352
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 368
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 384
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 400
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 416
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 432
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
     }
     Frame {
         msec: 448
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 464
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "52c03d5681cadb1df400a0974261e05d"
     }
     Frame {
         msec: 480
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "52c03d5681cadb1df400a0974261e05d"
     }
     Frame {
         msec: 496
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "52c03d5681cadb1df400a0974261e05d"
     }
     Frame {
         msec: 512
-        hash: "701d8c0f72330c0b72df071bd17749e6"
+        hash: "52c03d5681cadb1df400a0974261e05d"
+    }
+    Frame {
+        msec: 528
+        hash: "9c280c469d12fc0bf1ff42883ffd5155"
     }
     Key {
-        type: 6
+        type: 7
         key: 16777234
         modifiers: 0
         text: ""
@@ -141,36 +153,44 @@ VisualTest {
         count: 1
     }
     Frame {
-        msec: 528
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
         msec: 544
-        hash: "6032aada2c48092000ecb93e52656414"
+        hash: "655716f3544c6ae649cbda487ed1916f"
     }
     Frame {
         msec: 560
-        hash: "d23bdd94019477d8378cde580d8765ad"
+        hash: "e9e6a20040bedf4afb670310a7e5c2f0"
     }
     Frame {
         msec: 576
-        hash: "d74f8e44d47710714d4197809fffb622"
+        hash: "842641682f22e370402857b9cb875192"
     }
     Frame {
         msec: 592
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+        hash: "4d8258cd2fea9b4bee647b9480a743e3"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 608
-        hash: "4e875ba8703b690a17e445f2b3810435"
+        hash: "eb7d48cbf4cad403eb7d3fa2d10e0f88"
     }
     Frame {
         msec: 624
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
+        hash: "c6387240c7075e8321fda5348de9b752"
     }
     Frame {
         msec: 640
-        hash: "a2ea272b45d8de225826d9381015ff2e"
+        hash: "98fb4f03db3a574cf96e88ca940fcd07"
+    }
+    Frame {
+        msec: 656
+        hash: "19d450ee21b0c525aba2c38e62c5b117"
     }
     Key {
         type: 7
@@ -181,67 +201,47 @@ VisualTest {
         count: 1
     }
     Frame {
-        msec: 656
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
         msec: 672
-        hash: "788d8962f311adf57a3acc876b0e8804"
+        hash: "9943426dd31b393c4831dcfcdb266f76"
     }
     Frame {
         msec: 688
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
+        hash: "318bd0909d6ab32fc15ee385b69e1dc2"
+    }
+    Frame {
+        msec: 704
+        hash: "ca5f62f289b5f86e6d86afdcb0bc05f5"
+    }
+    Frame {
+        msec: 720
+        hash: "2158851f276862dd1e2a7d3fee9af938"
     }
     Key {
         type: 6
-        key: 16777236
+        key: 16777234
         modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
-        msec: 704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Frame {
-        msec: 720
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
         msec: 736
-        hash: "48969edab07b942480d93ac2d383ca24"
+        hash: "746e28cf8df1bcfd5a07383e4f9e1420"
     }
     Frame {
         msec: 752
-        hash: "ecfd9d6d5873001f0c67806544a14983"
+        hash: "8ae15b54e47c6ba43b6ddad234a65499"
     }
     Frame {
         msec: 768
-        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
+        hash: "8fcb22bd16dafb62a2fdcd40feda5178"
     }
     Frame {
         msec: 784
-        hash: "e337735ad0b42e60c54f16f3da7af3cf"
-    }
-    Frame {
-        msec: 800
-        hash: "c39db081130d269f25dbcb1a19afb8d0"
-    }
-    Frame {
-        msec: 816
-        hash: "c464d501e3935ec0f53eb780bd1a8289"
+        hash: "1ef6e14540615967e7c059fb3299c38a"
     }
     Key {
         type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
         key: 16777234
         modifiers: 0
         text: ""
@@ -249,28 +249,44 @@ VisualTest {
         count: 1
     }
     Frame {
+        msec: 800
+        hash: "cd260f4aa6e9772668b13f1f5e4ab3db"
+    }
+    Frame {
+        msec: 816
+        hash: "44aaa31fe7183e0088eb9ec12cfef69f"
+    }
+    Frame {
         msec: 832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+        hash: "575b1fbc9fa6587ce9811b5074a47a84"
     }
     Frame {
         msec: 848
-        hash: "d94054222fd37a350bd8abd592a332e3"
+        hash: "83b1fe02fdbe16418231c8acbbbebcac"
     }
     Frame {
         msec: 864
-        hash: "46fed264c233490b477e3a7c22183e18"
+        hash: "7bfb6f545fd55e7e336431e6882c9974"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 880
-        hash: "34bc703c915b49b0450ece1d18306df8"
+        hash: "bf3a6677b5f815e1b66f6489032f8e1d"
     }
     Frame {
         msec: 896
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+        hash: "cfcd90f1e97e92b0fbe2595275a64a48"
     }
     Frame {
         msec: 912
-        hash: "4f6dbc7b249c37390518cc263832b587"
+        hash: "397ad28f60e1f5245b59380968ececd2"
     }
     Key {
         type: 7
@@ -282,11 +298,11 @@ VisualTest {
     }
     Frame {
         msec: 928
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
+        hash: "c6ea797bc327a7e31316f44e93d6beb9"
     }
     Frame {
         msec: 944
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+        hash: "0e3c15c5328c85a54826b65ec82007f5"
     }
     Frame {
         msec: 960
@@ -294,207 +310,247 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 1024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 1040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Key {
-        type: 6
-        key: 16777248
+        type: 7
+        key: 16777234
         modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
+    Frame {
+        msec: 1056
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 1072
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+        hash: "676e251f10800c2a8860b43c2546524d"
     }
     Frame {
         msec: 1088
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+        hash: "db99874ab3656663316931ea0ac4c7c3"
     }
     Frame {
         msec: 1104
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
+        hash: "2c4b2205df96e09a9cd91d5efb86d820"
     }
     Frame {
         msec: 1120
-        hash: "4f6dbc7b249c37390518cc263832b587"
+        hash: "25e6e81e4769751e9639ee4a3c4ae839"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1136
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+        hash: "9eaa29386d3ad22b9032b8b345739342"
     }
     Frame {
         msec: 1152
-        hash: "34bc703c915b49b0450ece1d18306df8"
+        hash: "21ebb054c5df6104bb01e0a8abe9b40c"
     }
     Frame {
         msec: 1168
-        hash: "46fed264c233490b477e3a7c22183e18"
+        hash: "3ab8cdbe65ea34868c1a917e42d31c14"
     }
     Frame {
         msec: 1184
-        hash: "d94054222fd37a350bd8abd592a332e3"
+        hash: "05badd00be618fc4395e80936284613f"
     }
     Frame {
         msec: 1200
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+        hash: "8a373ed9798a8dd33aab5191db06f190"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1216
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
+        hash: "2a8c6a7cd20fcf7b5c8b75c59f50276b"
     }
     Frame {
         msec: 1232
-        hash: "0f500339c81ca3621d13910017b84b7b"
+        hash: "2e874a6b741d1cbfde5544fb831bdf84"
     }
     Frame {
         msec: 1248
-        hash: "702864de569e6a5648ee174d5ef891f8"
+        hash: "36e3d3a9a4e7163a1c052f30a97697dc"
     }
     Frame {
         msec: 1264
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
+        hash: "fb18565ab22f6b397aef65a992c0dff8"
     }
     Frame {
         msec: 1280
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+        hash: "13763364dd631556988fe18afce23e84"
     }
     Frame {
         msec: 1296
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+        hash: "2ea2995a7c022a4959eb1128d69907cc"
     }
-    Frame {
-        msec: 1312
-        hash: "4a646d76b706698a02cead560b1f8d57"
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
-        msec: 1328
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
+        msec: 1312
+        hash: "88485c98b946476b52094c85702939d4"
     }
     Key {
         type: 6
-        key: 16777234
-        modifiers: 100663296
+        key: 16777248
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 1328
+        hash: "532586645946f17a274a3f7d1077e55b"
+    }
+    Frame {
         msec: 1344
-        hash: "12b5e016bad990d1f2bf427ee8e3e6d9"
+        hash: "1702f1badb65f4039536c7255220a4b9"
     }
     Frame {
         msec: 1360
-        hash: "66a2ba3f9e005cd58aa50cfa0000cd15"
+        hash: "7cd23a8548d9d2d7da78fa541d1ff9ba"
     }
     Frame {
         msec: 1376
-        hash: "a2e9e42e09dadbd0791f52bb96e0e0dc"
+        hash: "42a4e0f3511d45f56e445737cbda49b5"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1392
-        hash: "ac68396566ea85a157e944e601dd8d18"
+        hash: "e326fff480404a41735b1567a784ba80"
     }
     Frame {
         msec: 1408
-        hash: "b9bfdebec8dd1a93de7ef2768b2542ba"
+        hash: "4d972a5cfa88e86c72dc1fa7430090e4"
     }
     Frame {
         msec: 1424
-        hash: "2e0a4b960803770acb34ef56ccf2be35"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
+        hash: "691c28e265d5cd253c06f6feff7ee536"
     }
     Frame {
         msec: 1440
-        hash: "df1643f0f8b7aa2dc080958822aeb3d0"
+        hash: "3ebb2496ec085b92a8f130e4f54c26c9"
     }
     Frame {
         msec: 1456
-        hash: "15bb91195adfaf83e88fd93e41ff3e17"
+        hash: "2447e98313dc850f58333c7aa630ef28"
     }
     Frame {
         msec: 1472
-        hash: "dc0476c27bd7eef3a59637df9a3fecd8"
+        hash: "9d8bc16d365e534e4e1feee7185db44f"
     }
     Frame {
         msec: 1488
-        hash: "a271f69e9dc6d1e0362c3e10760895df"
+        hash: "9a4b9cb5396857f79eac3a0a4e1dc1b3"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1504
-        hash: "7fe66bcc6bada354b4dd7baf8c977740"
+        hash: "2d25e8fc011ec795e1596806a81be60d"
     }
     Frame {
         msec: 1520
-        hash: "6b502dbd5ac8ff010df326cb9b593dce"
+        hash: "2fce48cf607cc3809ee1a9f59323e23a"
     }
     Frame {
         msec: 1536
-        hash: "a9dd21649a95a6a6e8daea91bc6e2a5f"
+        hash: "0fa177b9aa230dbcd5032a6ecddf604a"
     }
     Frame {
         msec: 1552
-        hash: "374686590eaa02b7b436caa40cc0b0a0"
+        hash: "2dd53f15e0787337ce0590223e5ce788"
     }
     Frame {
         msec: 1568
-        hash: "09ac3c5d413b1f650407eaa971aade81"
+        hash: "385d08fa990f40a7a1d5fd61fa9fe7ae"
     }
     Frame {
         msec: 1584
-        hash: "39f84e04f1ae58600591c0de40558d2c"
+        hash: "481401635bd419b8a30435135f61223f"
     }
     Frame {
         msec: 1600
-        hash: "0336ea1799835af2185c361e221a9661"
+        hash: "d6600e6fcfd477100b7aab3509888512"
     }
     Frame {
         msec: 1616
-        hash: "8c7ab13e499d7f31107cf0f899334259"
+        hash: "4ede7ec537b56352dec575bbb7dbd482"
     }
     Frame {
         msec: 1632
-        hash: "bad5899324e52c9e6eadb72f3e7c2150"
+        hash: "d4ff15c0dcf76dd7c97a0bf1901d688e"
     }
     Frame {
         msec: 1648
-        hash: "4b78f451ecb22cfbed9f5998d61018eb"
+        hash: "d15c7df693dfb0ef48c30d5f73b34126"
+    }
+    Frame {
+        msec: 1664
+        hash: "6dee0c6a00fb378692277914d22607e6"
+    }
+    Frame {
+        msec: 1680
+        hash: "8d74e52fca14ec36b266ace5113cac2b"
     }
     Key {
         type: 6
@@ -505,76 +561,84 @@ VisualTest {
         count: 1
     }
     Frame {
-        msec: 1664
-        hash: "6c913bc712eee18947a43dd1c0a6516b"
-    }
-    Frame {
-        msec: 1680
-        hash: "4e566abf1e0696e72b2a4beab5a53d6e"
-    }
-    Frame {
         msec: 1696
-        hash: "6ad579c289c63a6b90a1517765fc041e"
+        hash: "a33b648bc08e2b0db4e04a28dc7f64a2"
     }
     Frame {
         msec: 1712
-        hash: "cef43f349cf221a1aa6e6e70f1fa6339"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
+        hash: "04af2732e95351448a3a4e5a12eb2c0d"
     }
     Frame {
         msec: 1728
-        hash: "d89f7e3e2510fcb34786584747633673"
+        hash: "72795cad18792504420251987d814cc5"
     }
     Frame {
         msec: 1744
-        hash: "eb23a3eac684808f73034f4e4ef8984d"
+        hash: "46e3c02ca6ea9c831b276c6f0ef954db"
     }
     Frame {
         msec: 1760
-        hash: "6f2c1f61e58940d9cc1a70c0db903446"
+        hash: "42173174a90d470901cd543e2bd57225"
     }
     Frame {
         msec: 1776
-        hash: "f036a5ecda518be198f3bdf2dbc5baab"
+        hash: "57e7d302246a27430b1e60fdbdfc368a"
     }
     Frame {
         msec: 1792
-        hash: "7411784774fdc3b324644395f7beb013"
+        hash: "896b150b47d87ec3d279ab149195758e"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1808
-        hash: "abfdd1f8440998af2ff7903f49f1bd7c"
+        hash: "041240041c62b4cef6f329328eee2c6f"
     }
     Frame {
         msec: 1824
-        hash: "6edd29f2e8d3d81e912c6b279ecc1885"
+        hash: "46e38ca8d4d827dc71719d662d433983"
     }
     Frame {
         msec: 1840
-        hash: "8eb5ba22793c7cbfa97a64557f2a023f"
+        hash: "7d6ea4d357f0e916eaae3edd662bec9e"
     }
     Frame {
         msec: 1856
-        hash: "9a39470525e6f508228f7e0014e02d64"
+        hash: "b1214158b7f01fde56ec436baf88b98f"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1872
-        hash: "b3ad10cf28151f5f7f5a4c3540f1660e"
+        hash: "22b59737bb8ef5ffc78f1ef4a707d328"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 1888
-        hash: "816203df3cf42fa7a0e8d6730c186444"
+        hash: "70b47f9af5373d4d5e0777eb169cbfe3"
     }
     Frame {
         msec: 1904
-        hash: "a0a7e7ff7960dfe6149e526badf799a6"
+        hash: "d02ddd6f4b7169dcd114c519843eb855"
     }
     Frame {
         msec: 1920
@@ -582,527 +646,623 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "4d245b2285eadfd206409f74e03c7fc9"
+        hash: "5af4a21ba6e3b5e994557831d7063e92"
     }
     Frame {
         msec: 1952
-        hash: "e1d5e6c2e4df1454b5a256c3678ffdef"
+        hash: "97ef4122641ac4c49b9ef9a9dc1e5a0a"
     }
     Frame {
         msec: 1968
-        hash: "781d7fb03a37cb3f297cc0d2df338fd7"
-    }
-    Key {
-        type: 7
-        key: 16777249
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
+        hash: "7794188761d3efa4b47d4ab4c07208a3"
     }
     Frame {
         msec: 1984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4ca45c199693e767448016c4ccf1daaf"
     }
     Frame {
         msec: 2000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4ca45c199693e767448016c4ccf1daaf"
     }
     Frame {
         msec: 2016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4ca45c199693e767448016c4ccf1daaf"
     }
     Frame {
         msec: 2032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4ca45c199693e767448016c4ccf1daaf"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "4ca45c199693e767448016c4ccf1daaf"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2064
-        hash: "781d7fb03a37cb3f297cc0d2df338fd7"
+        hash: "7794188761d3efa4b47d4ab4c07208a3"
     }
     Frame {
         msec: 2080
-        hash: "e1d5e6c2e4df1454b5a256c3678ffdef"
+        hash: "97ef4122641ac4c49b9ef9a9dc1e5a0a"
     }
     Frame {
         msec: 2096
-        hash: "4d245b2285eadfd206409f74e03c7fc9"
+        hash: "5af4a21ba6e3b5e994557831d7063e92"
     }
     Frame {
         msec: 2112
-        hash: "5a647962e016d15daa417d88524d6061"
+        hash: "6f0f9bfa49f50ffd18ffe695cdc56d73"
     }
     Frame {
         msec: 2128
-        hash: "a0a7e7ff7960dfe6149e526badf799a6"
+        hash: "d02ddd6f4b7169dcd114c519843eb855"
     }
     Frame {
         msec: 2144
-        hash: "816203df3cf42fa7a0e8d6730c186444"
+        hash: "70b47f9af5373d4d5e0777eb169cbfe3"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2160
-        hash: "b3ad10cf28151f5f7f5a4c3540f1660e"
+        hash: "9e770dcd2f33ad157e86d08752458daf"
     }
     Frame {
         msec: 2176
-        hash: "9a39470525e6f508228f7e0014e02d64"
+        hash: "b6c660ffd14bb756f87adb5cf836e97f"
     }
     Frame {
         msec: 2192
-        hash: "8eb5ba22793c7cbfa97a64557f2a023f"
+        hash: "c498c154fcf2d66fc0981150e575033c"
     }
     Frame {
         msec: 2208
-        hash: "6edd29f2e8d3d81e912c6b279ecc1885"
+        hash: "29277da2d1d6251e18ab89331d5df61d"
     }
     Frame {
         msec: 2224
-        hash: "abfdd1f8440998af2ff7903f49f1bd7c"
+        hash: "3c7588de81cbfbba8735da74de220128"
     }
     Frame {
         msec: 2240
-        hash: "7411784774fdc3b324644395f7beb013"
-    }
-    Frame {
-        msec: 2256
-        hash: "f036a5ecda518be198f3bdf2dbc5baab"
+        hash: "4fa61e0644ce0942a30f05ad8d3f13f6"
     }
     Key {
         type: 7
-        key: 16777248
-        modifiers: 33554432
+        key: 16777236
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 2256
+        hash: "3a90bb8b912d0be07e0e8b78407c54ff"
+    }
+    Frame {
         msec: 2272
-        hash: "6f2c1f61e58940d9cc1a70c0db903446"
+        hash: "3d89454f0af4ab88ea67a075cb4e39b7"
     }
     Frame {
         msec: 2288
-        hash: "eb23a3eac684808f73034f4e4ef8984d"
+        hash: "abdd589312402caea0b1c4f26ff6a1bf"
     }
     Frame {
         msec: 2304
-        hash: "d89f7e3e2510fcb34786584747633673"
+        hash: "e6ab11dfb1965e94f5a42f2642ca0b30"
     }
     Frame {
         msec: 2320
-        hash: "cef43f349cf221a1aa6e6e70f1fa6339"
+        hash: "c9fbfb63e19d1281b0c3a59504cd695c"
     }
     Frame {
         msec: 2336
-        hash: "6ad579c289c63a6b90a1517765fc041e"
+        hash: "bc250ab3f5da66ecb0792a796b197149"
     }
     Frame {
         msec: 2352
-        hash: "4e566abf1e0696e72b2a4beab5a53d6e"
+        hash: "c5d26cd3ac3f87c77d716b912875b9de"
     }
     Key {
         type: 6
-        key: 16777236
+        key: 16777249
         modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
     Frame {
         msec: 2368
-        hash: "6c913bc712eee18947a43dd1c0a6516b"
+        hash: "bbe9837039b7ea1dfab8ed30c8a15724"
     }
     Frame {
         msec: 2384
-        hash: "2c518a32ca3b5ca924709cc6990fb039"
+        hash: "836f9f207d8197f8e6e8e9c49f83aa4e"
     }
     Frame {
         msec: 2400
-        hash: "7f40db00bd3e6d0b39454eefa1403f44"
+        hash: "235d20a347a0f7b331e707ad7de93f95"
     }
     Frame {
         msec: 2416
-        hash: "98db32e0d1812e9584105dc4dbceff80"
+        hash: "7f422b624488525aede06c69996fc583"
     }
     Frame {
         msec: 2432
-        hash: "c2150a67391bb574141c16cb011847bf"
+        hash: "664bef152c87b3eb6729d9b46bad750c"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2448
-        hash: "f9ea21d894fa2dace4d43ce99a580b90"
+        hash: "d32716cb4cb9fc8145029efb3fd1a32a"
     }
     Frame {
         msec: 2464
-        hash: "2f580c3244499fc6ecd2121693f463fd"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "17670e9d61ef2f9a0ec079b413ab546a"
     }
     Frame {
         msec: 2480
-        hash: "2f7f421d3e6a895a9efa6b0e8feb81c4"
+        hash: "6a3cbc70476d4e145a0e187ad7a73c52"
     }
     Frame {
         msec: 2496
-        hash: "35a18447f319431ed0a645d05a1d03d1"
+        hash: "aa0f4cf316026154c940261b4df848e3"
     }
     Frame {
         msec: 2512
-        hash: "54e36fb4014be554d13709b48b9bdce7"
+        hash: "2650d86c6aa82e4cc5e7ec4e2889f028"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2528
-        hash: "dbe3456536a729b268850a6ee5d1fb47"
+        hash: "ab392121c99d4f8f5a3622c26761a57e"
     }
     Frame {
         msec: 2544
-        hash: "4c148434cf3868db5dc98f426d9fb913"
+        hash: "4f1c4006a84d794a7eaf9932a6f7d3ea"
     }
     Frame {
         msec: 2560
-        hash: "2eb6da3ebfd531037523347603a805e2"
+        hash: "f6387eb0678a78894f607a7ff186bd19"
     }
     Frame {
         msec: 2576
-        hash: "fefbb2f4671f8a36f9d2207ced8c0bfb"
+        hash: "b14cb2545cb2cc055b914618d5086425"
     }
     Frame {
         msec: 2592
-        hash: "1ab596339afc1f96136ee69c4b7688e1"
+        hash: "e31ebced4421e9d5092950d373f9a4e9"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2608
-        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
+        hash: "b2177f1eed72624c4f6e4bd59902db16"
     }
     Frame {
         msec: 2624
-        hash: "a7dccada1080487cab2d0a916676c5cb"
+        hash: "9ade9a8b436bb9481e8135b7342070ff"
     }
     Frame {
         msec: 2640
-        hash: "ac5939eb4379394fab829b307cbfe7ec"
+        hash: "4bdbc37f8ecac1a8aae182cb3e6bf1fa"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2656
-        hash: "9329d353c678d2bc61d08f63029d1b9b"
+        hash: "3bf69edaa0eec73246c52f310079a15d"
     }
     Frame {
         msec: 2672
-        hash: "41263f56af7875028bb0c1e7eccf6f5d"
+        hash: "add80b7fde2865bb23ccb46a03b5604c"
     }
     Frame {
         msec: 2688
-        hash: "e2eb18af82c85ea78ba438163e922df3"
+        hash: "6259b8d763f468054f35c87f4ba47d30"
     }
     Frame {
         msec: 2704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
+        hash: "1dd94dcd8c7f651811f1b962a75962be"
     }
     Frame {
         msec: 2720
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
-        msec: 2736
-        hash: "48969edab07b942480d93ac2d383ca24"
-    }
-    Frame {
-        msec: 2752
-        hash: "ecfd9d6d5873001f0c67806544a14983"
+        hash: "f813c62008a3880d079cb1c0be9a03e1"
     }
     Key {
         type: 6
         key: 16777234
-        modifiers: 0
+        modifiers: 100663296
         text: ""
         autorep: false
         count: 1
     }
     Frame {
+        msec: 2736
+        hash: "4e776b52bce5b0e0ee46f9feff684a90"
+    }
+    Frame {
+        msec: 2752
+        hash: "cd2c2b6e9d05b521214eeab29e89d7c4"
+    }
+    Frame {
         msec: 2768
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
+        hash: "8605360fcf3f24372463827a1d3f93c6"
     }
     Frame {
         msec: 2784
-        hash: "702864de569e6a5648ee174d5ef891f8"
+        hash: "03b734ffb679f8718999c4e060a2febb"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 2800
-        hash: "0f500339c81ca3621d13910017b84b7b"
+        hash: "43e2020cd127ce541b54ba7814c9ba74"
     }
     Frame {
         msec: 2816
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
+        hash: "9c1774f8ae01e37aac05d27567d3cec6"
     }
     Frame {
         msec: 2832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+        hash: "6c4a7a200eba8b6c5c0b5b75d8a88811"
     }
     Frame {
         msec: 2848
-        hash: "d94054222fd37a350bd8abd592a332e3"
+        hash: "21d88afb0f05ace0710da47af275d827"
     }
     Frame {
         msec: 2864
-        hash: "46fed264c233490b477e3a7c22183e18"
+        hash: "42b56667390aa2db6d593b7af9a5021a"
     }
     Frame {
         msec: 2880
         image: "cursorDelegate.2.png"
     }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
     Frame {
         msec: 2896
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+        hash: "5897cafae19f8842f53a54b75e36f22d"
     }
     Frame {
         msec: 2912
-        hash: "4f6dbc7b249c37390518cc263832b587"
+        hash: "11cacddae5d5361b7e87696808ac2905"
     }
     Frame {
         msec: 2928
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
+        hash: "2cc3dcb900ab2bffd52fb61fff108043"
     }
     Frame {
         msec: 2944
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+        hash: "8938b8c7254873197e409206c1c20ad4"
     }
     Frame {
         msec: 2960
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+        hash: "e343d647f236969530d0b076c3375f1a"
     }
     Frame {
         msec: 2976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 2992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 3008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 3024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 3040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 3056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
     }
     Frame {
         msec: 3072
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+        hash: "e343d647f236969530d0b076c3375f1a"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3088
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+        hash: "ac4898002fdc5ea7894d741cac863c8d"
     }
     Frame {
         msec: 3104
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
+        hash: "eda67cb2d32f3f605a74a01148f04c99"
     }
     Frame {
         msec: 3120
-        hash: "4f6dbc7b249c37390518cc263832b587"
+        hash: "13e84656ef70bf07e2a444d60ac933e1"
     }
     Frame {
         msec: 3136
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+        hash: "9d624eebe5824fc5d4a89a04f2d776a3"
     }
     Frame {
         msec: 3152
-        hash: "34bc703c915b49b0450ece1d18306df8"
+        hash: "2c7d542f60c68e16377d3c5afea0f4e3"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3168
-        hash: "46fed264c233490b477e3a7c22183e18"
+        hash: "7db8d678bd1890010b2a1b9bb732c17c"
     }
     Frame {
         msec: 3184
-        hash: "d94054222fd37a350bd8abd592a332e3"
+        hash: "6d6f4cc1193b73c65db893c3f983d9f0"
     }
     Frame {
         msec: 3200
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+        hash: "d4e8985ad4d14436a87db45585fca946"
     }
     Frame {
         msec: 3216
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
+        hash: "495b67926e9002a43e2d251b8c96564f"
     }
     Frame {
         msec: 3232
-        hash: "0f500339c81ca3621d13910017b84b7b"
+        hash: "3b2dd937cfb6cd57884f3b813f3d4129"
     }
     Frame {
         msec: 3248
-        hash: "702864de569e6a5648ee174d5ef891f8"
+        hash: "02a5902af43990021465a7df9d479982"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3264
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
+        hash: "5b14b471fffa401affc954871662e6a8"
     }
     Frame {
         msec: 3280
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+        hash: "bbe03a2ea1e5b788c79d9551bd317a2d"
     }
     Frame {
         msec: 3296
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+        hash: "10b49692f820311b8bfbc0f87c05e993"
     }
     Frame {
         msec: 3312
-        hash: "4a646d76b706698a02cead560b1f8d57"
+        hash: "928ee5d4ca3c31a879f82b5b4f6d1912"
     }
     Frame {
         msec: 3328
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
+        hash: "9f3ea4149963d467be28fcf26a43e6d6"
     }
     Frame {
         msec: 3344
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
+        hash: "f2ec87d7c4f6bbecc771270062e25d14"
     }
     Frame {
         msec: 3360
-        hash: "788d8962f311adf57a3acc876b0e8804"
+        hash: "f181b9aeccdecd486550c2a69e57a63f"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3376
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
+        hash: "ce871b1784464b56728eeb0140ad689c"
     }
     Frame {
         msec: 3392
-        hash: "a2ea272b45d8de225826d9381015ff2e"
+        hash: "8d1b19921c7ee633f423b3f8c1f07e6a"
     }
     Frame {
         msec: 3408
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
+        hash: "451973c72f86fc3425c31da3311d625c"
     }
     Frame {
         msec: 3424
-        hash: "4e875ba8703b690a17e445f2b3810435"
+        hash: "64301801af58f7a9c5ea32c33eb988e2"
     }
     Frame {
         msec: 3440
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+        hash: "3406ff52f3829c56ff3b29558d6fd11c"
     }
     Frame {
         msec: 3456
-        hash: "d74f8e44d47710714d4197809fffb622"
+        hash: "0952802094d7d7f105d7f50f36c02530"
     }
     Frame {
         msec: 3472
-        hash: "d23bdd94019477d8378cde580d8765ad"
+        hash: "daddc3aa8ae9970cc111e981adcdd9bb"
     }
     Frame {
         msec: 3488
-        hash: "6032aada2c48092000ecb93e52656414"
+        hash: "491e3241705cdc2917c6560cece6188e"
     }
     Frame {
         msec: 3504
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
+        hash: "cefbdc87c704e72145e878fc944c621f"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3520
-        hash: "3af60972e7d5d4320a549e5df52a1228"
+        hash: "3427e88f200a1ac2d4596cb2fec0ae66"
     }
     Frame {
         msec: 3536
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
+        hash: "62eef650b45f3c2fa425d1bff88a01a7"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
     }
     Frame {
         msec: 3552
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
+        hash: "9945cda3cf5c22d8c83b19b0f69e4e09"
     }
     Frame {
         msec: 3568
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
+        hash: "80fcd1194d1bc3e010ddc6ba224f3d40"
     }
     Frame {
         msec: 3584
-        hash: "bdfb42dc3879099e402784238c2cdddb"
+        hash: "59da897870a7e235a67defaff1f8f4e4"
     }
     Frame {
         msec: 3600
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
+        hash: "664bef152c87b3eb6729d9b46bad750c"
     }
     Frame {
         msec: 3616
-        hash: "8159bda651d95a320ac09aa6feb377a1"
+        hash: "7f422b624488525aede06c69996fc583"
     }
     Frame {
         msec: 3632
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
+        hash: "235d20a347a0f7b331e707ad7de93f95"
     }
     Frame {
         msec: 3648
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
+        hash: "836f9f207d8197f8e6e8e9c49f83aa4e"
     }
     Frame {
         msec: 3664
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
+        hash: "bbe9837039b7ea1dfab8ed30c8a15724"
     }
     Frame {
         msec: 3680
-        hash: "9b174cd9a87ff193ce646408946b310c"
+        hash: "c5d26cd3ac3f87c77d716b912875b9de"
     }
     Frame {
         msec: 3696
-        hash: "89fa590b47ee77021dedf7938439ce69"
+        hash: "bc250ab3f5da66ecb0792a796b197149"
     }
     Frame {
         msec: 3712
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
+        hash: "c9fbfb63e19d1281b0c3a59504cd695c"
     }
     Frame {
         msec: 3728
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
+        hash: "e6ab11dfb1965e94f5a42f2642ca0b30"
     }
     Frame {
         msec: 3744
-        hash: "198f8e912c19debd51f837627d1171e9"
+        hash: "abdd589312402caea0b1c4f26ff6a1bf"
     }
     Frame {
         msec: 3760
-        hash: "3b380dcb6815698241f3dcccb52785c2"
+        hash: "3d89454f0af4ab88ea67a075cb4e39b7"
     }
     Frame {
         msec: 3776
-        hash: "254942e12b8a31420d2243b7e2529ae8"
+        hash: "3a90bb8b912d0be07e0e8b78407c54ff"
     }
     Frame {
         msec: 3792
-        hash: "ebf121910a5318c284f8e964d63aed40"
+        hash: "4fa61e0644ce0942a30f05ad8d3f13f6"
     }
     Frame {
         msec: 3808
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
+        hash: "3c7588de81cbfbba8735da74de220128"
     }
     Frame {
         msec: 3824
-        hash: "4a6596da390380dbafc1cdaceca1101e"
+        hash: "29277da2d1d6251e18ab89331d5df61d"
     }
     Frame {
         msec: 3840
@@ -1110,271 +1270,239 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
+        hash: "b6c660ffd14bb756f87adb5cf836e97f"
     }
     Frame {
         msec: 3872
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
+        hash: "9e770dcd2f33ad157e86d08752458daf"
     }
     Frame {
         msec: 3888
-        hash: "f286a35d7f4a022315f69a5db72da388"
+        hash: "4c9421ff4dc80e555ac5ba4a02d0c5be"
     }
     Frame {
         msec: 3904
-        hash: "aa329519eba4dad9589bff095528c535"
+        hash: "dcbfc9f6300363d03aa869ce3d58e6fe"
     }
     Frame {
         msec: 3920
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
+        hash: "491f07f2498598cf57b368ff880f85f5"
     }
     Frame {
         msec: 3936
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
+        hash: "ea356dc3ef6aa6ca67e58b7b2f6912e4"
     }
     Frame {
         msec: 3952
-        hash: "3655b992097b433071ec9dd69e086c70"
+        hash: "8575a99b28bb5b8c2d01a5ed91f25d47"
     }
     Frame {
         msec: 3968
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
+        hash: "7f83ba29fd27aa4817b7b84afbc8d6d7"
     }
     Frame {
         msec: 3984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+        hash: "0173dd60a64da4c06fa9a398d2c98206"
     }
     Frame {
         msec: 4064
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "7f83ba29fd27aa4817b7b84afbc8d6d7"
     }
     Frame {
         msec: 4080
-        hash: "3655b992097b433071ec9dd69e086c70"
+        hash: "8575a99b28bb5b8c2d01a5ed91f25d47"
     }
     Frame {
         msec: 4096
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
+        hash: "ea356dc3ef6aa6ca67e58b7b2f6912e4"
     }
     Frame {
         msec: 4112
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
+        hash: "491f07f2498598cf57b368ff880f85f5"
     }
     Frame {
         msec: 4128
-        hash: "aa329519eba4dad9589bff095528c535"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "dcbfc9f6300363d03aa869ce3d58e6fe"
     }
     Frame {
         msec: 4144
-        hash: "f286a35d7f4a022315f69a5db72da388"
+        hash: "4c9421ff4dc80e555ac5ba4a02d0c5be"
     }
     Frame {
         msec: 4160
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
+        hash: "9e770dcd2f33ad157e86d08752458daf"
     }
     Frame {
         msec: 4176
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
+        hash: "b6c660ffd14bb756f87adb5cf836e97f"
     }
     Frame {
         msec: 4192
-        hash: "367391b2a124e2c818510567d0884d18"
+        hash: "c498c154fcf2d66fc0981150e575033c"
     }
     Frame {
         msec: 4208
-        hash: "4a6596da390380dbafc1cdaceca1101e"
+        hash: "29277da2d1d6251e18ab89331d5df61d"
     }
     Frame {
         msec: 4224
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
+        hash: "3c7588de81cbfbba8735da74de220128"
     }
     Frame {
         msec: 4240
-        hash: "ebf121910a5318c284f8e964d63aed40"
+        hash: "4fa61e0644ce0942a30f05ad8d3f13f6"
     }
     Frame {
         msec: 4256
-        hash: "254942e12b8a31420d2243b7e2529ae8"
+        hash: "3a90bb8b912d0be07e0e8b78407c54ff"
     }
     Frame {
         msec: 4272
-        hash: "3b380dcb6815698241f3dcccb52785c2"
+        hash: "3d89454f0af4ab88ea67a075cb4e39b7"
     }
     Frame {
         msec: 4288
-        hash: "198f8e912c19debd51f837627d1171e9"
+        hash: "abdd589312402caea0b1c4f26ff6a1bf"
     }
     Frame {
         msec: 4304
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
+        hash: "e6ab11dfb1965e94f5a42f2642ca0b30"
     }
     Frame {
         msec: 4320
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
+        hash: "c9fbfb63e19d1281b0c3a59504cd695c"
     }
     Frame {
         msec: 4336
-        hash: "89fa590b47ee77021dedf7938439ce69"
+        hash: "bc250ab3f5da66ecb0792a796b197149"
     }
     Frame {
         msec: 4352
-        hash: "9b174cd9a87ff193ce646408946b310c"
+        hash: "c5d26cd3ac3f87c77d716b912875b9de"
     }
     Frame {
         msec: 4368
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
+        hash: "bbe9837039b7ea1dfab8ed30c8a15724"
     }
     Frame {
         msec: 4384
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
+        hash: "836f9f207d8197f8e6e8e9c49f83aa4e"
     }
     Frame {
         msec: 4400
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
+        hash: "235d20a347a0f7b331e707ad7de93f95"
     }
     Frame {
         msec: 4416
-        hash: "8159bda651d95a320ac09aa6feb377a1"
+        hash: "7f422b624488525aede06c69996fc583"
     }
     Frame {
         msec: 4432
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
+        hash: "664bef152c87b3eb6729d9b46bad750c"
     }
     Frame {
         msec: 4448
-        hash: "bdfb42dc3879099e402784238c2cdddb"
+        hash: "59da897870a7e235a67defaff1f8f4e4"
     }
     Frame {
         msec: 4464
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
+        hash: "80fcd1194d1bc3e010ddc6ba224f3d40"
     }
     Frame {
         msec: 4480
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
+        hash: "9945cda3cf5c22d8c83b19b0f69e4e09"
     }
     Frame {
         msec: 4496
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
+        hash: "62eef650b45f3c2fa425d1bff88a01a7"
     }
     Frame {
         msec: 4512
-        hash: "3af60972e7d5d4320a549e5df52a1228"
+        hash: "3427e88f200a1ac2d4596cb2fec0ae66"
     }
     Frame {
         msec: 4528
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
+        hash: "cefbdc87c704e72145e878fc944c621f"
     }
     Frame {
         msec: 4544
-        hash: "6032aada2c48092000ecb93e52656414"
+        hash: "491e3241705cdc2917c6560cece6188e"
     }
     Frame {
         msec: 4560
-        hash: "d23bdd94019477d8378cde580d8765ad"
+        hash: "daddc3aa8ae9970cc111e981adcdd9bb"
     }
     Frame {
         msec: 4576
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Key {
-        type: 6
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "0952802094d7d7f105d7f50f36c02530"
     }
     Frame {
         msec: 4592
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+        hash: "3406ff52f3829c56ff3b29558d6fd11c"
     }
     Frame {
         msec: 4608
-        hash: "4e875ba8703b690a17e445f2b3810435"
+        hash: "64301801af58f7a9c5ea32c33eb988e2"
     }
     Frame {
         msec: 4624
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
+        hash: "451973c72f86fc3425c31da3311d625c"
     }
     Frame {
         msec: 4640
-        hash: "a2ea272b45d8de225826d9381015ff2e"
+        hash: "8d1b19921c7ee633f423b3f8c1f07e6a"
     }
     Frame {
         msec: 4656
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
+        hash: "ce871b1784464b56728eeb0140ad689c"
     }
     Frame {
         msec: 4672
-        hash: "788d8962f311adf57a3acc876b0e8804"
+        hash: "f181b9aeccdecd486550c2a69e57a63f"
     }
     Frame {
         msec: 4688
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
+        hash: "f2ec87d7c4f6bbecc771270062e25d14"
     }
     Frame {
         msec: 4704
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
+        hash: "9f3ea4149963d467be28fcf26a43e6d6"
     }
     Frame {
         msec: 4720
-        hash: "4a646d76b706698a02cead560b1f8d57"
+        hash: "928ee5d4ca3c31a879f82b5b4f6d1912"
     }
     Frame {
         msec: 4736
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+        hash: "10b49692f820311b8bfbc0f87c05e993"
     }
     Frame {
         msec: 4752
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+        hash: "bbe03a2ea1e5b788c79d9551bd317a2d"
     }
     Frame {
         msec: 4768
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
+        hash: "5b14b471fffa401affc954871662e6a8"
     }
     Frame {
         msec: 4784
-        hash: "702864de569e6a5648ee174d5ef891f8"
+        hash: "02a5902af43990021465a7df9d479982"
     }
     Frame {
         msec: 4800
@@ -1382,1998 +1510,42 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
+        hash: "495b67926e9002a43e2d251b8c96564f"
     }
     Frame {
         msec: 4832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+        hash: "d4e8985ad4d14436a87db45585fca946"
     }
     Frame {
         msec: 4848
-        hash: "d94054222fd37a350bd8abd592a332e3"
+        hash: "6d6f4cc1193b73c65db893c3f983d9f0"
     }
     Frame {
         msec: 4864
-        hash: "46fed264c233490b477e3a7c22183e18"
+        hash: "7db8d678bd1890010b2a1b9bb732c17c"
     }
     Frame {
         msec: 4880
-        hash: "34bc703c915b49b0450ece1d18306df8"
+        hash: "2c7d542f60c68e16377d3c5afea0f4e3"
     }
     Frame {
         msec: 4896
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+        hash: "9d624eebe5824fc5d4a89a04f2d776a3"
     }
     Frame {
         msec: 4912
-        hash: "4f6dbc7b249c37390518cc263832b587"
+        hash: "13e84656ef70bf07e2a444d60ac933e1"
     }
     Frame {
         msec: 4928
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
+        hash: "eda67cb2d32f3f605a74a01148f04c99"
     }
     Frame {
         msec: 4944
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+        hash: "ac4898002fdc5ea7894d741cac863c8d"
     }
     Frame {
         msec: 4960
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
-    }
-    Frame {
-        msec: 4976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5072
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
-    }
-    Frame {
-        msec: 5088
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
-    }
-    Frame {
-        msec: 5104
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
-    }
-    Frame {
-        msec: 5120
-        hash: "4f6dbc7b249c37390518cc263832b587"
-    }
-    Frame {
-        msec: 5136
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
-    }
-    Frame {
-        msec: 5152
-        hash: "34bc703c915b49b0450ece1d18306df8"
-    }
-    Frame {
-        msec: 5168
-        hash: "46fed264c233490b477e3a7c22183e18"
-    }
-    Frame {
-        msec: 5184
-        hash: "d94054222fd37a350bd8abd592a332e3"
-    }
-    Frame {
-        msec: 5200
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Frame {
-        msec: 5216
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Frame {
-        msec: 5232
-        hash: "0f500339c81ca3621d13910017b84b7b"
-    }
-    Frame {
-        msec: 5248
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Frame {
-        msec: 5264
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Frame {
-        msec: 5280
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
-    }
-    Frame {
-        msec: 5296
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
-    }
-    Frame {
-        msec: 5312
-        hash: "4a646d76b706698a02cead560b1f8d57"
-    }
-    Frame {
-        msec: 5328
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
-    }
-    Frame {
-        msec: 5344
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
-    }
-    Frame {
-        msec: 5360
-        hash: "788d8962f311adf57a3acc876b0e8804"
-    }
-    Frame {
-        msec: 5376
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
-        msec: 5392
-        hash: "a2ea272b45d8de225826d9381015ff2e"
-    }
-    Frame {
-        msec: 5408
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Frame {
-        msec: 5424
-        hash: "4e875ba8703b690a17e445f2b3810435"
-    }
-    Frame {
-        msec: 5440
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
-    }
-    Frame {
-        msec: 5456
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Frame {
-        msec: 5472
-        hash: "d23bdd94019477d8378cde580d8765ad"
-    }
-    Frame {
-        msec: 5488
-        hash: "6032aada2c48092000ecb93e52656414"
-    }
-    Frame {
-        msec: 5504
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
-        msec: 5520
-        hash: "3af60972e7d5d4320a549e5df52a1228"
-    }
-    Frame {
-        msec: 5536
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
-    }
-    Frame {
-        msec: 5552
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
-    }
-    Frame {
-        msec: 5568
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
-    }
-    Frame {
-        msec: 5584
-        hash: "bdfb42dc3879099e402784238c2cdddb"
-    }
-    Frame {
-        msec: 5600
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
-    }
-    Frame {
-        msec: 5616
-        hash: "8159bda651d95a320ac09aa6feb377a1"
-    }
-    Frame {
-        msec: 5632
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
-    }
-    Frame {
-        msec: 5648
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
-    }
-    Frame {
-        msec: 5664
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
-    }
-    Frame {
-        msec: 5680
-        hash: "9b174cd9a87ff193ce646408946b310c"
-    }
-    Frame {
-        msec: 5696
-        hash: "89fa590b47ee77021dedf7938439ce69"
-    }
-    Frame {
-        msec: 5712
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
-    }
-    Frame {
-        msec: 5728
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
-    }
-    Frame {
-        msec: 5744
-        hash: "198f8e912c19debd51f837627d1171e9"
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "254942e12b8a31420d2243b7e2529ae8"
-    }
-    Frame {
-        msec: 5792
-        hash: "ebf121910a5318c284f8e964d63aed40"
-    }
-    Frame {
-        msec: 5808
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
-    }
-    Frame {
-        msec: 5824
-        hash: "4a6596da390380dbafc1cdaceca1101e"
-    }
-    Frame {
-        msec: 5840
-        hash: "367391b2a124e2c818510567d0884d18"
-    }
-    Frame {
-        msec: 5856
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
-    }
-    Frame {
-        msec: 5872
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
-    }
-    Frame {
-        msec: 5888
-        hash: "f286a35d7f4a022315f69a5db72da388"
-    }
-    Frame {
-        msec: 5904
-        hash: "aa329519eba4dad9589bff095528c535"
-    }
-    Frame {
-        msec: 5920
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
-    }
-    Frame {
-        msec: 5936
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
-    }
-    Frame {
-        msec: 5952
-        hash: "3655b992097b433071ec9dd69e086c70"
-    }
-    Frame {
-        msec: 5968
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
-    }
-    Frame {
-        msec: 5984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6064
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
-    }
-    Frame {
-        msec: 6080
-        hash: "3655b992097b433071ec9dd69e086c70"
-    }
-    Frame {
-        msec: 6096
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
-    }
-    Frame {
-        msec: 6112
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
-    }
-    Frame {
-        msec: 6128
-        hash: "aa329519eba4dad9589bff095528c535"
-    }
-    Frame {
-        msec: 6144
-        hash: "f286a35d7f4a022315f69a5db72da388"
-    }
-    Frame {
-        msec: 6160
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
-    }
-    Frame {
-        msec: 6176
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
-    }
-    Frame {
-        msec: 6192
-        hash: "367391b2a124e2c818510567d0884d18"
-    }
-    Frame {
-        msec: 6208
-        hash: "4a6596da390380dbafc1cdaceca1101e"
-    }
-    Frame {
-        msec: 6224
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
-    }
-    Frame {
-        msec: 6240
-        hash: "ebf121910a5318c284f8e964d63aed40"
-    }
-    Frame {
-        msec: 6256
-        hash: "254942e12b8a31420d2243b7e2529ae8"
-    }
-    Frame {
-        msec: 6272
-        hash: "3b380dcb6815698241f3dcccb52785c2"
-    }
-    Frame {
-        msec: 6288
-        hash: "198f8e912c19debd51f837627d1171e9"
-    }
-    Frame {
-        msec: 6304
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
-    }
-    Frame {
-        msec: 6320
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
-    }
-    Frame {
-        msec: 6336
-        hash: "89fa590b47ee77021dedf7938439ce69"
-    }
-    Frame {
-        msec: 6352
-        hash: "9b174cd9a87ff193ce646408946b310c"
-    }
-    Frame {
-        msec: 6368
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
-    }
-    Frame {
-        msec: 6384
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
-    }
-    Frame {
-        msec: 6400
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
-    }
-    Frame {
-        msec: 6416
-        hash: "8159bda651d95a320ac09aa6feb377a1"
-    }
-    Frame {
-        msec: 6432
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
-    }
-    Frame {
-        msec: 6448
-        hash: "bdfb42dc3879099e402784238c2cdddb"
-    }
-    Frame {
-        msec: 6464
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
-    }
-    Frame {
-        msec: 6480
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
-    }
-    Frame {
-        msec: 6496
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
-    }
-    Frame {
-        msec: 6512
-        hash: "3af60972e7d5d4320a549e5df52a1228"
-    }
-    Frame {
-        msec: 6528
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
-        msec: 6544
-        hash: "6032aada2c48092000ecb93e52656414"
-    }
-    Frame {
-        msec: 6560
-        hash: "d23bdd94019477d8378cde580d8765ad"
-    }
-    Frame {
-        msec: 6576
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Frame {
-        msec: 6592
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
-    }
-    Frame {
-        msec: 6608
-        hash: "4e875ba8703b690a17e445f2b3810435"
-    }
-    Frame {
-        msec: 6624
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Frame {
-        msec: 6640
-        hash: "a2ea272b45d8de225826d9381015ff2e"
-    }
-    Frame {
-        msec: 6656
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
-        msec: 6672
-        hash: "788d8962f311adf57a3acc876b0e8804"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 271; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "e2eb18af82c85ea78ba438163e922df3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 270; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 269; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 268; y: 107
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6752
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6768
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6784
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 265; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6800
-        hash: "0f500339c81ca3621d13910017b84b7b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 263; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 261; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6816
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 259; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 256; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6848
-        hash: "58693aa1a3616310b7ae1e529c4c461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 250; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 243; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6864
-        hash: "96afccd7ec697c9c10840f0effaa448d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 235; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "a00d49e2a9069b1be41f95f6ff4c0312"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6896
-        hash: "a0ff4b93291fc12054d3989a20335a87"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6912
-        hash: "a86e1347bb25489547514955762d92d3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6928
-        hash: "e5cba3c1e41e38117508c84e894beb11"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 190; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6944
-        hash: "2560f53b8ac0a84fef895dbb8f0e393e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 181; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 172; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6960
-        hash: "c1b8bfc008319b793b6bd9345d34ccf5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 123; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 118; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 114; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7072
-        hash: "a9f2804ac7918971f237c4cfa6339c24"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 108; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7088
-        hash: "bc9c96855f048cb6c86d480e501322ab"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7104
-        hash: "706730602364bfb4d0193d1728a6d350"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7120
-        hash: "df80fe3e3ba35ab3fafca929b9101e13"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7136
-        hash: "aa8fa1baf61919004a4f14948826882e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7152
-        hash: "1829dfa3615d6ae430ba81a2df9a9e15"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7168
-        hash: "c4ea5c767192bbd3bfac58d07594016a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7184
-        hash: "319aede65b3473f28a4ca62a524e4a76"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7200
-        hash: "e1de653161e3348e083267c9082bc0f0"
-    }
-    Frame {
-        msec: 7216
-        hash: "de5f2d5147c600d2cb44072801c2338e"
-    }
-    Frame {
-        msec: 7232
-        hash: "6db41d704d2e28f36b206bdb317ee361"
-    }
-    Frame {
-        msec: 7248
-        hash: "a500b87efea241cdf8adf97ae86e10c3"
-    }
-    Frame {
-        msec: 7264
-        hash: "86c4eb0164a5b57eb22de4c9d58345f5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7280
-        hash: "2dbb1e3a1374b7c4aecd5a891be4573d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7296
-        hash: "07bcafdf5ca28a1416a20ed375ec3ea6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "e79def41bbf7e544d64cf19d74524d3a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "20aff98618d16c00dc9b76035e9523f5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "12b5e016bad990d1f2bf427ee8e3e6d9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "66a2ba3f9e005cd58aa50cfa0000cd15"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "a2e9e42e09dadbd0791f52bb96e0e0dc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7392
-        hash: "ac68396566ea85a157e944e601dd8d18"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 113; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 117; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7408
-        hash: "b9bfdebec8dd1a93de7ef2768b2542ba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 124; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "2e0a4b960803770acb34ef56ccf2be35"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7440
-        hash: "df1643f0f8b7aa2dc080958822aeb3d0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "af8ce877d953727d37fd6f7e4962f45a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "b9de04c0d7532d67404a5a773d9fab99"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7488
-        hash: "7904312a7efe0b545070c5a5615011df"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7504
-        hash: "0069a8f088c83c6716bac15567a5b38d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 162; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "8c17c78d663097e275ed2f80d6479caf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7536
-        hash: "9e8781569e07fca7def229b76189082d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 165; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7552
-        hash: "8dba2f259740d869bfa20205d2e14433"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7568
-        hash: "4e7ad066aadbad3f71a08962ba1379c0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7584
-        hash: "a5d1554a6fb311239acc077f01adc597"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7600
-        hash: "e91b45c430f7e10c2205af620350ddb6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7616
-        hash: "6c731f4dbdec441cd36b1e9727758d73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7632
-        hash: "31634e757bdec45feb1f021e35746d65"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 193; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7648
-        hash: "846dcb42fa85719223eb19f7af3d0630"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7664
-        hash: "a5826c5d7d1b9161cc7fb76f59021fdd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 211; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7696
-        hash: "bdfb9b949489744bc77905249eb647f9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7712
-        hash: "307d4fb47604c00e213f8d9616e0da13"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7728
-        hash: "74201a80a9032cb18b0c9e26bb67363f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "38ca918199552a525fb7f3a3773761d9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7760
-        hash: "d64c06c25229b3b64b779ca1bef7d2cb"
-    }
-    Frame {
-        msec: 7776
-        hash: "4ba0117db1ff431de20c06c79866d509"
-    }
-    Frame {
-        msec: 7792
-        hash: "ca56899ded0e5ea361aac24493793f58"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7808
-        hash: "ebce1d3b4d088278b6f36dac444c7ca6"
-    }
-    Frame {
-        msec: 7824
-        hash: "16c52065169bffc4648eda0226dba13a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7840
-        hash: "7a5a6a02f57545d9f2336ff18dd118d6"
-    }
-    Frame {
-        msec: 7856
-        hash: "328c8133c68fc2e86dc2193d1bee3259"
-    }
-    Frame {
-        msec: 7872
-        hash: "fcad1d2819e3cede6081b4dfbb5a4a65"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "85ff2968ba06443f300c9c0ef36c7054"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "871025c33fa769a790fc460a95b183ec"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "5b96f2673e0ccd2b198b9f99c65b4b12"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7936
-        hash: "5fc6f30a2dd019c4f2af056b51cfaa27"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7952
-        hash: "fc6bf3bcde1f89f0bff40e3e019aed33"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7968
-        hash: "703beec7b035080146131936da8c0fb3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8064
-        hash: "703beec7b035080146131936da8c0fb3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8080
-        hash: "fc6bf3bcde1f89f0bff40e3e019aed33"
-    }
-    Frame {
-        msec: 8096
-        hash: "5fc6f30a2dd019c4f2af056b51cfaa27"
-    }
-    Frame {
-        msec: 8112
-        hash: "5b96f2673e0ccd2b198b9f99c65b4b12"
-    }
-    Frame {
-        msec: 8128
-        hash: "871025c33fa769a790fc460a95b183ec"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8144
-        hash: "85ff2968ba06443f300c9c0ef36c7054"
-    }
-    Frame {
-        msec: 8160
-        hash: "fcad1d2819e3cede6081b4dfbb5a4a65"
-    }
-    Frame {
-        msec: 8176
-        hash: "328c8133c68fc2e86dc2193d1bee3259"
-    }
-    Frame {
-        msec: 8192
-        hash: "7a5a6a02f57545d9f2336ff18dd118d6"
-    }
-    Frame {
-        msec: 8208
-        hash: "16c52065169bffc4648eda0226dba13a"
-    }
-    Frame {
-        msec: 8224
-        hash: "ebce1d3b4d088278b6f36dac444c7ca6"
-    }
-    Frame {
-        msec: 8240
-        hash: "ca56899ded0e5ea361aac24493793f58"
-    }
-    Frame {
-        msec: 8256
-        hash: "4ba0117db1ff431de20c06c79866d509"
-    }
-    Frame {
-        msec: 8272
-        hash: "d64c06c25229b3b64b779ca1bef7d2cb"
-    }
-    Frame {
-        msec: 8288
-        hash: "38ca918199552a525fb7f3a3773761d9"
-    }
-    Frame {
-        msec: 8304
-        hash: "74201a80a9032cb18b0c9e26bb67363f"
-    }
-    Frame {
-        msec: 8320
-        hash: "307d4fb47604c00e213f8d9616e0da13"
-    }
-    Frame {
-        msec: 8336
-        hash: "9ad660f83ed62b964b676106f8aa7114"
-    }
-    Frame {
-        msec: 8352
-        hash: "457fc0df515f9813e98a6a86f4ab5231"
-    }
-    Frame {
-        msec: 8368
-        hash: "372cbc6ad4edc85319743627ced05671"
-    }
-    Frame {
-        msec: 8384
-        hash: "4e08beac6ee40acaa4de6963522d63d0"
-    }
-    Frame {
-        msec: 8400
-        hash: "5e790c2199a5e95fc17f8c0b49809cc9"
-    }
-    Frame {
-        msec: 8416
-        hash: "e36310e1866d4a95bac60084fa4aa2c1"
-    }
-    Frame {
-        msec: 8432
-        hash: "b7182b171316cc2db4de2b23de93dc41"
-    }
-    Frame {
-        msec: 8448
-        hash: "6aaf7f8e6e238973dfd4030eb146198b"
-    }
-    Frame {
-        msec: 8464
-        hash: "901ead3167e602dfe043c56c6c805d54"
-    }
-    Frame {
-        msec: 8480
-        hash: "5a97542680475b1382ad5b7c3f6fa96a"
-    }
-    Frame {
-        msec: 8496
-        hash: "fb34d93127f3c3ad0c7bacce0200753b"
-    }
-    Frame {
-        msec: 8512
-        hash: "993c97dc85e83e241538356e317b7767"
-    }
-    Frame {
-        msec: 8528
-        hash: "fb11a9edb3a613be5cb6949c76c5c715"
-    }
-    Frame {
-        msec: 8544
-        hash: "e68b7461f94adeaf330f67d36d0d3b3e"
-    }
-    Frame {
-        msec: 8560
-        hash: "7ed043cc027fdb467bd16847187cd48d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 277; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8576
-        hash: "fefbb2f4671f8a36f9d2207ced8c0bfb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 277; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8592
-        hash: "1ab596339afc1f96136ee69c4b7688e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8608
-        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8624
-        hash: "a7dccada1080487cab2d0a916676c5cb"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "9329d353c678d2bc61d08f63029d1b9b"
-    }
-    Frame {
-        msec: 8672
-        hash: "41263f56af7875028bb0c1e7eccf6f5d"
-    }
-    Frame {
-        msec: 8688
-        hash: "e2eb18af82c85ea78ba438163e922df3"
-    }
-    Frame {
-        msec: 8704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Frame {
-        msec: 8720
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
-        msec: 8736
-        hash: "48969edab07b942480d93ac2d383ca24"
-    }
-    Frame {
-        msec: 8752
-        hash: "ecfd9d6d5873001f0c67806544a14983"
-    }
-    Frame {
-        msec: 8768
-        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
-    }
-    Frame {
-        msec: 8784
-        hash: "e337735ad0b42e60c54f16f3da7af3cf"
-    }
-    Frame {
-        msec: 8800
-        hash: "c39db081130d269f25dbcb1a19afb8d0"
-    }
-    Frame {
-        msec: 8816
-        hash: "c464d501e3935ec0f53eb780bd1a8289"
-    }
-    Frame {
-        msec: 8832
-        hash: "2be4fd986de19f6f76dfddec75b26804"
-    }
-    Frame {
-        msec: 8848
-        hash: "a1280e9fb86ca96b2340bb70aa774806"
-    }
-    Frame {
-        msec: 8864
-        hash: "cce4c17a387893478bcfa547f7561aba"
-    }
-    Frame {
-        msec: 8880
-        hash: "7094db3e04895d8d7f5f58caf0658592"
-    }
-    Frame {
-        msec: 8896
-        hash: "edb1f644757f9ba0a39549d77141c280"
-    }
-    Frame {
-        msec: 8912
-        hash: "cd381e847ecfce2db111bdf94a437cbc"
-    }
-    Frame {
-        msec: 8928
-        hash: "6a089603b641b683a744b88f2ebe82d1"
-    }
-    Frame {
-        msec: 8944
-        hash: "8c0e47f7c87a1a11cd733a453b31c780"
-    }
-    Frame {
-        msec: 8960
-        hash: "b53c892d62e787eb2565820d79739de6"
-    }
-    Frame {
-        msec: 8976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9072
-        hash: "b53c892d62e787eb2565820d79739de6"
-    }
-    Frame {
-        msec: 9088
-        hash: "8c0e47f7c87a1a11cd733a453b31c780"
-    }
-    Frame {
-        msec: 9104
-        hash: "6a089603b641b683a744b88f2ebe82d1"
-    }
-    Frame {
-        msec: 9120
-        hash: "cd381e847ecfce2db111bdf94a437cbc"
-    }
-    Frame {
-        msec: 9136
-        hash: "edb1f644757f9ba0a39549d77141c280"
-    }
-    Frame {
-        msec: 9152
-        hash: "7094db3e04895d8d7f5f58caf0658592"
-    }
-    Frame {
-        msec: 9168
-        hash: "cce4c17a387893478bcfa547f7561aba"
-    }
-    Frame {
-        msec: 9184
-        hash: "a1280e9fb86ca96b2340bb70aa774806"
-    }
-    Frame {
-        msec: 9200
-        hash: "2be4fd986de19f6f76dfddec75b26804"
-    }
-    Frame {
-        msec: 9216
-        hash: "c464d501e3935ec0f53eb780bd1a8289"
-    }
-    Frame {
-        msec: 9232
-        hash: "c39db081130d269f25dbcb1a19afb8d0"
-    }
-    Frame {
-        msec: 9248
-        hash: "e337735ad0b42e60c54f16f3da7af3cf"
-    }
-    Frame {
-        msec: 9264
-        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
-    }
-    Frame {
-        msec: 9280
-        hash: "ecfd9d6d5873001f0c67806544a14983"
-    }
-    Frame {
-        msec: 9296
-        hash: "48969edab07b942480d93ac2d383ca24"
-    }
-    Frame {
-        msec: 9312
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
-        msec: 9328
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Frame {
-        msec: 9344
-        hash: "e2eb18af82c85ea78ba438163e922df3"
-    }
-    Frame {
-        msec: 9360
-        hash: "41263f56af7875028bb0c1e7eccf6f5d"
-    }
-    Frame {
-        msec: 9376
-        hash: "9329d353c678d2bc61d08f63029d1b9b"
-    }
-    Frame {
-        msec: 9392
-        hash: "ac5939eb4379394fab829b307cbfe7ec"
-    }
-    Frame {
-        msec: 9408
-        hash: "a7dccada1080487cab2d0a916676c5cb"
-    }
-    Frame {
-        msec: 9424
-        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
+        hash: "2e95c1966c94acccd2a44a6c2942d36d"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
new file mode 100644
index 0000000..a4d7bef
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
new file mode 100644
index 0000000..a8aee18
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
new file mode 100644
index 0000000..799f422
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml
new file mode 100644
index 0000000..bbeb532
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml
@@ -0,0 +1,1043 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 32
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 48
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 64
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 80
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 96
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 112
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 128
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 144
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 160
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 176
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 192
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 208
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 224
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 240
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 256
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 272
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 288
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 304
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 320
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 336
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Frame {
+        msec: 352
+        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+    }
+    Key {
+        type: 6
+        key: 74
+        modifiers: 33554432
+        text: "4a"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 368
+        hash: "d070b6581fd109ce278cf4a8c41a6549"
+    }
+    Frame {
+        msec: 384
+        hash: "d070b6581fd109ce278cf4a8c41a6549"
+    }
+    Frame {
+        msec: 400
+        hash: "d070b6581fd109ce278cf4a8c41a6549"
+    }
+    Frame {
+        msec: 416
+        hash: "d070b6581fd109ce278cf4a8c41a6549"
+    }
+    Frame {
+        msec: 432
+        hash: "d070b6581fd109ce278cf4a8c41a6549"
+    }
+    Key {
+        type: 7
+        key: 74
+        modifiers: 33554432
+        text: "4a"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "d070b6581fd109ce278cf4a8c41a6549"
+    }
+    Frame {
+        msec: 464
+        hash: "d070b6581fd109ce278cf4a8c41a6549"
+    }
+    Frame {
+        msec: 480
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 496
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 512
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 528
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 560
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 576
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 592
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 608
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 624
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 640
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 656
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 672
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Frame {
+        msec: 688
+        hash: "6a80a729e85f8dab98155e115a4193cc"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 704
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 720
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 736
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 752
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 768
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 784
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 800
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 816
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 832
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Frame {
+        msec: 848
+        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 864
+        hash: "b643c026fe7570505e72971d3b3f0ea2"
+    }
+    Frame {
+        msec: 880
+        hash: "b643c026fe7570505e72971d3b3f0ea2"
+    }
+    Frame {
+        msec: 896
+        hash: "b643c026fe7570505e72971d3b3f0ea2"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 912
+        hash: "b643c026fe7570505e72971d3b3f0ea2"
+    }
+    Frame {
+        msec: 928
+        hash: "b643c026fe7570505e72971d3b3f0ea2"
+    }
+    Frame {
+        msec: 944
+        hash: "b643c026fe7570505e72971d3b3f0ea2"
+    }
+    Frame {
+        msec: 960
+        image: "echoMode.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "cba83dfcd44e4ba3ea44dd8d84bde745"
+    }
+    Key {
+        type: 6
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 992
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1008
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1024
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1040
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Key {
+        type: 7
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1056
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1072
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1088
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1104
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1120
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1136
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1152
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1168
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1184
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1200
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1216
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Frame {
+        msec: 1232
+        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1248
+        hash: "55c33f786e6dc14b038dba96cc154859"
+    }
+    Frame {
+        msec: 1264
+        hash: "55c33f786e6dc14b038dba96cc154859"
+    }
+    Frame {
+        msec: 1280
+        hash: "55c33f786e6dc14b038dba96cc154859"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1296
+        hash: "55c33f786e6dc14b038dba96cc154859"
+    }
+    Frame {
+        msec: 1312
+        hash: "55c33f786e6dc14b038dba96cc154859"
+    }
+    Frame {
+        msec: 1328
+        hash: "55c33f786e6dc14b038dba96cc154859"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1344
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1360
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1376
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1392
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1408
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1424
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1440
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1456
+        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+    }
+    Frame {
+        msec: 1472
+        hash: "9be278fc6ebef108857a414ecb292b46"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1488
+        hash: "9be278fc6ebef108857a414ecb292b46"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1520
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1536
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1552
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1584
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1600
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1616
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1632
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Frame {
+        msec: 1648
+        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "46e977b7614ae6316a64106f6e5326c1"
+    }
+    Frame {
+        msec: 1680
+        hash: "46e977b7614ae6316a64106f6e5326c1"
+    }
+    Frame {
+        msec: 1696
+        hash: "46e977b7614ae6316a64106f6e5326c1"
+    }
+    Frame {
+        msec: 1712
+        hash: "46e977b7614ae6316a64106f6e5326c1"
+    }
+    Frame {
+        msec: 1728
+        hash: "46e977b7614ae6316a64106f6e5326c1"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Frame {
+        msec: 1776
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Frame {
+        msec: 1792
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1808
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Frame {
+        msec: 1824
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Frame {
+        msec: 1840
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Frame {
+        msec: 1856
+        hash: "2d7771008d9ec265f70d089bb8436e18"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1872
+        hash: "7d85b2d311514db5988e335110fb8352"
+    }
+    Frame {
+        msec: 1888
+        hash: "7d85b2d311514db5988e335110fb8352"
+    }
+    Frame {
+        msec: 1904
+        hash: "7d85b2d311514db5988e335110fb8352"
+    }
+    Frame {
+        msec: 1920
+        image: "echoMode.1.png"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1936
+        hash: "7d85b2d311514db5988e335110fb8352"
+    }
+    Frame {
+        msec: 1952
+        hash: "7d85b2d311514db5988e335110fb8352"
+    }
+    Frame {
+        msec: 1968
+        hash: "7d85b2d311514db5988e335110fb8352"
+    }
+    Frame {
+        msec: 1984
+        hash: "9f4258905e76a6523e015701c3278cae"
+    }
+    Frame {
+        msec: 2000
+        hash: "9f4258905e76a6523e015701c3278cae"
+    }
+    Frame {
+        msec: 2016
+        hash: "9f4258905e76a6523e015701c3278cae"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+    }
+    Frame {
+        msec: 2048
+        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+    }
+    Frame {
+        msec: 2080
+        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+    }
+    Key {
+        type: 6
+        key: 86
+        modifiers: 0
+        text: "76"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2096
+        hash: "6c679da9b822fefef626c4308fdc9080"
+    }
+    Frame {
+        msec: 2112
+        hash: "6c679da9b822fefef626c4308fdc9080"
+    }
+    Frame {
+        msec: 2128
+        hash: "6c679da9b822fefef626c4308fdc9080"
+    }
+    Frame {
+        msec: 2144
+        hash: "6c679da9b822fefef626c4308fdc9080"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 86
+        modifiers: 0
+        text: "76"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+    }
+    Frame {
+        msec: 2176
+        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+    }
+    Frame {
+        msec: 2192
+        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+    }
+    Frame {
+        msec: 2208
+        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2224
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Frame {
+        msec: 2256
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Frame {
+        msec: 2272
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Frame {
+        msec: 2288
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Frame {
+        msec: 2304
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2320
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Frame {
+        msec: 2336
+        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+    }
+    Key {
+        type: 6
+        key: 77
+        modifiers: 0
+        text: "6d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Frame {
+        msec: 2368
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Frame {
+        msec: 2384
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Frame {
+        msec: 2400
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Frame {
+        msec: 2416
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Frame {
+        msec: 2432
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Key {
+        type: 7
+        key: 77
+        modifiers: 0
+        text: "6d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Frame {
+        msec: 2464
+        hash: "1e9d2117d8392ea494d28f95ddb57213"
+    }
+    Frame {
+        msec: 2480
+        hash: "a016e70b0f98846694ef3ae906faa346"
+    }
+    Frame {
+        msec: 2496
+        hash: "a016e70b0f98846694ef3ae906faa346"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2512
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2528
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2544
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2576
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2592
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2608
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2624
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2640
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2656
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2672
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2688
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2704
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2720
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2736
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2752
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2768
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2784
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2800
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2816
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2832
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2848
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2864
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2880
+        image: "echoMode.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2912
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2928
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2944
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2960
+        hash: "818ad2e56a73599ae69ce5000d5b278f"
+    }
+    Frame {
+        msec: 2976
+        hash: "147568112e60545f440f2109f918a59e"
+    }
+    Frame {
+        msec: 2992
+        hash: "147568112e60545f440f2109f918a59e"
+    }
+    Frame {
+        msec: 3008
+        hash: "147568112e60545f440f2109f918a59e"
+    }
+    Frame {
+        msec: 3024
+        hash: "147568112e60545f440f2109f918a59e"
+    }
+    Frame {
+        msec: 3040
+        hash: "147568112e60545f440f2109f918a59e"
+    }
+    Frame {
+        msec: 3056
+        hash: "147568112e60545f440f2109f918a59e"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml
new file mode 100644
index 0000000..fb56da6
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml
@@ -0,0 +1,107 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 32
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 48
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 64
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 80
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 96
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 112
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 128
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 144
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 160
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 176
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 192
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 208
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 224
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 240
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 256
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 272
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 288
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 304
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 320
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 336
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 352
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 368
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 384
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+    Frame {
+        msec: 400
+        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+    }
+}
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index 67ea03d..eaf3403 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -52,6 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
+extern Q_GUI_EXPORT bool qt_applefontsmoothing_enabled;
 
 QDeclarativeTester::QDeclarativeTester(const QString &script, QDeclarativeViewer::ScriptOptions opts, 
                      QDeclarativeView *parent)
@@ -267,7 +268,14 @@ void QDeclarativeTester::updateCurrentTime(int msec)
 
     if (options & QDeclarativeViewer::TestImages) {
         img.fill(qRgb(255,255,255));
+#ifdef Q_WS_MAC
+        bool oldSmooth = qt_applefontsmoothing_enabled;
+        qt_applefontsmoothing_enabled = false;
+#endif
         QPainter p(&img);
+#ifdef Q_WS_MAC
+        qt_applefontsmoothing_enabled = oldSmooth;
+#endif
         m_view->render(&p);
     }
 
-- 
cgit v0.12


From 0d5e900da30192872cbfba98d81f6b0932d94821 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 1 Nov 2010 11:22:38 +1000
Subject: Fix a few typos in comments and docs.

Task-number: QTBUG-13714
Reviewed-by: Trust Me
---
 src/corelib/kernel/qmimedata.cpp           | 2 +-
 src/gui/kernel/qcocoamenuloader_mac.mm     | 2 +-
 src/gui/painting/qbackingstore.cpp         | 2 +-
 tests/auto/mediaobject/tst_mediaobject.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index bf4001a..899ca7b 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -249,7 +249,7 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty
     \o  We can subclass QMimeData and reimplement hasFormat(),
         formats(), and retrieveData().
 
-    \o  If the drag and drop operation occurs withing a single
+    \o  If the drag and drop operation occurs within a single
         application, we can subclass QMimeData and add extra data in
         it, and use a qobject_cast() in the receiver's drop event
         handler. For example:
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 8d38f45..4bf6ed9 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -89,7 +89,7 @@ QT_USE_NAMESPACE
 - (void)ensureAppMenuInMenu:(NSMenu *)menu
 {
     // The application menu is the menu in the menu bar that contains the
-    // 'Quit' item. When changing menu bar (e.g when swithing between
+    // 'Quit' item. When changing menu bar (e.g when switching between
     // windows with different menu bars), we never recreate this menu, but
     // instead pull it out the current menu bar and place into the new one:
     NSMenu *mainMenu = [NSApp mainMenu];
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index ac9b994..8a1c154 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -446,7 +446,7 @@ QRegion QWidgetBackingStore::dirtyRegion(QWidget *widget) const
 
 /*!
     Returns the static content inside the \a parent if non-zero; otherwise the static content
-    for the entire backing store is returned. The content will be clipped to \a withingClipRect
+    for the entire backing store is returned. The content will be clipped to \a withinClipRect
     if non-empty.
 */
 QRegion QWidgetBackingStore::staticContents(QWidget *parent, const QRect &withinClipRect) const
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp
index 322e2e4..d2c6f0f 100644
--- a/tests/auto/mediaobject/tst_mediaobject.cpp
+++ b/tests/auto/mediaobject/tst_mediaobject.cpp
@@ -682,7 +682,7 @@ void tst_MediaObject::testPauseOnFinish()
 }
 
 void tst_MediaObject::testReconnectBetweenTwoMediaObjects(){
-    // Purpose: Test that phonon can handle swithing the same sink
+    // Purpose: Test that phonon can handle switching the same sink
     // between different media objects.
 
     Phonon::MediaObject obj1;
-- 
cgit v0.12


From c046fc774ebfabfe83f197d8423c37a34404ad9a Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 1 Nov 2010 12:35:46 +1000
Subject: Fix poor English in QStyle::polish documentation.

Task-number: QTBUG-10538
Reviewed-by: Trust Me
---
 src/gui/styles/qstyle.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 0a75492..3ebfab2 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -367,10 +367,10 @@ QStyle::~QStyle()
     Note that the default implementation does nothing. Reasonable
     actions in this function might be to call the
     QWidget::setBackgroundMode() function for the widget. Do not use
-    the function to set, for example, the geometry; reimplementing
-    this function do provide a back-door through which the appearance
-    of a widget can be changed, but with Qt 4.0's style engine there
-    is rarely necessary to implement this function; reimplement the
+    the function to set, for example, the geometry. Reimplementing
+    this function provides a back-door through which the appearance
+    of a widget can be changed, but with Qt's style engine it is
+    rarely necessary to implement this function; reimplement
     drawItemPixmap(), drawItemText(), drawPrimitive(), etc. instead.
 
     The QWidget::inherits() function may provide enough information to
-- 
cgit v0.12


From b438b15b8291ce9591fbe0a64fe452383662bbda Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Mon, 1 Nov 2010 12:32:17 +1000
Subject: Quickly clicking an item that doesn't use double clicking should
 result in two separate clicks

Task-number: QTBUG-14832
Reviewed-by: Martin Jones
---
 .../graphicsitems/qdeclarativemousearea.cpp        |  3 +-
 .../qdeclarativemousearea/data/clicktwice.qml      | 16 +++++++++
 .../tst_qdeclarativemousearea.cpp                  | 42 ++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativemousearea/data/clicktwice.qml

diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 1b7dce0..d9edd11 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -566,7 +566,8 @@ void QDeclarativeMouseArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *even
     if (!d->absorb) {
         QDeclarativeItem::mouseDoubleClickEvent(event);
     } else {
-        d->doubleClick = true;
+        if (d->isDoubleClickConnected())
+            d->doubleClick = true;
         d->saveEvent(event);
         QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false);
         me.setAccepted(d->isDoubleClickConnected());
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/clicktwice.qml b/tests/auto/declarative/qdeclarativemousearea/data/clicktwice.qml
new file mode 100644
index 0000000..c6b1f89
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/data/clicktwice.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0
+
+Item {
+    id: root
+    property int clicked: 0
+    property int pressed: 0
+    property int released: 0
+
+    MouseArea {
+        width: 200; height: 200
+        onPressed: { root.pressed++ }
+        onClicked: { root.clicked++ }
+        onReleased: { root.released++ }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index 5a50e0d..57a58e9 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -63,6 +63,7 @@ private slots:
     void noOnClickedWithPressAndHold();
     void onMousePressRejected();
     void doubleClick();
+    void clickTwice();
 
 private:
     QDeclarativeView *createView();
@@ -426,6 +427,47 @@ void tst_QDeclarativeMouseArea::doubleClick()
     QCOMPARE(canvas->rootObject()->property("clicked").toInt(), 1);
     QCOMPARE(canvas->rootObject()->property("doubleClicked").toInt(), 1);
     QCOMPARE(canvas->rootObject()->property("released").toInt(), 2);
+
+}
+
+// QTBUG-14832
+void tst_QDeclarativeMouseArea::clickTwice()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/clicktwice.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QGraphicsScene *scene = canvas->scene();
+    QGraphicsSceneMouseEvent pressEvent(QEvent::GraphicsSceneMousePress);
+    pressEvent.setScenePos(QPointF(100, 100));
+    pressEvent.setButton(Qt::LeftButton);
+    pressEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &pressEvent);
+
+    QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease);
+    releaseEvent.setScenePos(QPointF(100, 100));
+    releaseEvent.setButton(Qt::LeftButton);
+    releaseEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &releaseEvent);
+
+    QCOMPARE(canvas->rootObject()->property("pressed").toInt(), 1);
+    QCOMPARE(canvas->rootObject()->property("released").toInt(), 1);
+    QCOMPARE(canvas->rootObject()->property("clicked").toInt(), 1);
+
+    QGraphicsSceneMouseEvent dblClickEvent(QEvent::GraphicsSceneMouseDoubleClick);
+    dblClickEvent.setScenePos(QPointF(100, 100));
+    dblClickEvent.setButton(Qt::LeftButton);
+    dblClickEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &dblClickEvent);
+
+    QApplication::sendEvent(scene, &pressEvent);
+    QApplication::sendEvent(scene, &releaseEvent);
+
+    QCOMPARE(canvas->rootObject()->property("pressed").toInt(), 2);
+    QCOMPARE(canvas->rootObject()->property("released").toInt(), 2);
+    QCOMPARE(canvas->rootObject()->property("clicked").toInt(), 2);
 }
 
 QTEST_MAIN(tst_QDeclarativeMouseArea)
-- 
cgit v0.12


From 99ee75f6df588103f83fc807e6ee686971cc18df Mon Sep 17 00:00:00 2001
From: Jason Barron <jason.barron@nokia.com>
Date: Mon, 1 Nov 2010 10:14:02 +0100
Subject: Fix OpenVG painting artifacts after restoreState().

When the state is restored and the 'dirty' flag indicates that the clip
state has changed, the paint engine needs to set 'scissorDirty' flag to
true so that updateScissor() applies the restored clip region to the
scissor rects.

Task-number: QTBUG-14907
Reviewed-by: Jani Hautakangas
---
 src/openvg/qpaintengine_vg.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 9df32d9..ee65e48 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -3678,6 +3678,7 @@ void QVGPaintEngine::restoreState(QPaintEngine::DirtyFlags dirty)
         d->maskIsSet = false;
         d->scissorMask = false;
         d->maskRect = QRect();
+        d->scissorDirty = true;
         clipEnabledChanged();
     }
 
-- 
cgit v0.12


From c5458932611da6349e593b0d07511e0cbaa9ce62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 1 Nov 2010 11:08:20 +0100
Subject: Doc: Fixed typo

---
 src/declarative/qml/qdeclarativeengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 0c99ea8..6906f21 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -608,7 +608,7 @@ QDeclarativeContext *QDeclarativeEngine::rootContext() const
   QNetworkAccessManager with specialized caching, proxy and cookie
   support.
 
-  The factory must be set before exceuting the engine.
+  The factory must be set before executing the engine.
 */
 void QDeclarativeEngine::setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *factory)
 {
-- 
cgit v0.12


From d39e68cf0f3295c290dc132a30e316deb4f2dc85 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 1 Nov 2010 11:04:23 +0100
Subject: Fix compilation on AIX 5.3 with gcc

"error: invalid pointer to bit-field `QAbstractStatePrivate::isMachine'"

The extra qualification is not needed anyway, so remove it.

Task-number: QTBUG-14491
Reviewed-by: Eskil Abrahamsen Blomfeldt
---
 src/corelib/statemachine/qstatemachine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 4b371f7..6324cc9 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -178,7 +178,7 @@ QT_BEGIN_NAMESPACE
 
 QStateMachinePrivate::QStateMachinePrivate()
 {
-    QAbstractStatePrivate::isMachine = true;
+    isMachine = true;
 
     state = NotRunning;
     _startState = 0;
-- 
cgit v0.12


From a1ae7da4cfc007b4ae32504af5b2ca9469b21401 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Mon, 1 Nov 2010 12:56:55 +0100
Subject: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set

This new method tests 4 cases (http/https, with/without buffer size)
and checks the send/receive rates to check that the actual transfer rate
was limited, not just the speed of emission of data to the application.

Task-number: QTBUG-6276
Merge-request: 872
Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
---
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 437 +++++++++++++++++++++----
 1 file changed, 366 insertions(+), 71 deletions(-)

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 88714e6..5196ed2 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -193,6 +193,8 @@ private Q_SLOTS:
     void ioGetFromFtpWithReuse();
     void ioGetFromHttp();
 
+    void ioGetFromBuiltinHttp_data();
+    void ioGetFromBuiltinHttp();
     void ioGetFromHttpWithReuseParallel();
     void ioGetFromHttpWithReuseSequential();
     void ioGetFromHttpWithAuth();
@@ -343,6 +345,14 @@ QT_END_NAMESPACE
             QFAIL(qPrintable(errorMsg));        \
     } while (0);
 
+#ifndef QT_NO_OPENSSL
+static void setupSslServer(QSslSocket* serverSocket)
+{
+    serverSocket->setProtocol(QSsl::AnyProtocol);
+    serverSocket->setLocalCertificate(SRCDIR "/certs/server.pem");
+    serverSocket->setPrivateKey(SRCDIR "/certs/server.key");
+}
+#endif
 
 // Does not work for POST/PUT!
 class MiniHttpServer: public QTcpServer
@@ -353,24 +363,66 @@ public:
     QByteArray dataToTransmit;
     QByteArray receivedData;
     bool doClose;
+    bool doSsl;
     bool multiple;
     int totalConnections;
 
-    MiniHttpServer(const QByteArray &data) : client(0), dataToTransmit(data), doClose(true), multiple(false), totalConnections(0)
+    MiniHttpServer(const QByteArray &data, bool ssl = false)
+        : client(0), dataToTransmit(data), doClose(true), doSsl(ssl),
+          multiple(false), totalConnections(0)
     {
         listen();
-        connect(this, SIGNAL(newConnection()), this, SLOT(doAccept()));
     }
 
-public slots:
-    void doAccept()
+protected:
+    void incomingConnection(int socketDescriptor)
     {
-        client = nextPendingConnection();
+        //qDebug() << "incomingConnection" << socketDescriptor;
+        if (!doSsl) {
+            client = new QTcpSocket;
+            client->setSocketDescriptor(socketDescriptor);
+            connectSocketSignals();
+        } else {
+#ifndef QT_NO_OPENSSL
+            QSslSocket *serverSocket = new QSslSocket;
+            serverSocket->setParent(this);
+            if (serverSocket->setSocketDescriptor(socketDescriptor)) {
+                connect(serverSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+                setupSslServer(serverSocket);
+                serverSocket->startServerEncryption();
+                client = serverSocket;
+                connectSocketSignals();
+            } else {
+                delete serverSocket;
+                return;
+            }
+#endif
+        }
         client->setParent(this);
         ++totalConnections;
+    }
+private:
+    void connectSocketSignals()
+    {
+        //qDebug() << "connectSocketSignals" << client;
         connect(client, SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
+        connect(client, SIGNAL(error(QAbstractSocket::SocketError)),
+                this, SLOT(slotError(QAbstractSocket::SocketError)));
+    }
+
+private slots:
+#ifndef QT_NO_OPENSSL
+    void slotSslErrors(const QList<QSslError>& errors)
+    {
+        qDebug() << "slotSslErrors" << client->errorString() << errors;
+    }
+#endif
+    void slotError(QAbstractSocket::SocketError err)
+    {
+        qDebug() << "slotError" << err << client->errorString();
     }
 
+public slots:
     void readyReadSlot()
     {
         receivedData += client->readAll();
@@ -382,6 +434,9 @@ public slots:
                 receivedData.remove(0, doubleEndlPos+4);
 
             client->write(dataToTransmit);
+            while (client->bytesToWrite() > 0)
+                client->waitForBytesWritten();
+
             if (doClose) {
                 client->disconnectFromHost();
                 disconnect(client, 0, this, 0);
@@ -554,17 +609,89 @@ public:
     }
 };
 
+// A blocking tcp server (must be used in a thread) which supports SSL.
+class BlockingTcpServer : public QTcpServer
+{
+    Q_OBJECT
+public:
+    BlockingTcpServer(bool ssl) : doSsl(ssl), sslSocket(0) {}
+
+    QTcpSocket* waitForNextConnectionSocket() {
+        waitForNewConnection(-1);
+        if (doSsl) {
+            Q_ASSERT(sslSocket);
+            return sslSocket;
+        } else {
+            //qDebug() << "returning nextPendingConnection";
+            return nextPendingConnection();
+        }
+    }
+    virtual void incomingConnection(int socketDescriptor)
+    {
+#ifndef QT_NO_OPENSSL
+        if (doSsl) {
+            QSslSocket *serverSocket = new QSslSocket;
+            serverSocket->setParent(this);
+            serverSocket->setSocketDescriptor(socketDescriptor);
+            connect(serverSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+            setupSslServer(serverSocket);
+            serverSocket->startServerEncryption();
+            sslSocket = serverSocket;
+        } else
+#endif
+        {
+            QTcpServer::incomingConnection(socketDescriptor);
+        }
+    }
+private slots:
+
+#ifndef QT_NO_OPENSSL
+    void slotSslErrors(const QList<QSslError>& errors)
+    {
+        qDebug() << "slotSslErrors" << sslSocket->errorString() << errors;
+    }
+#endif
+
+private:
+    const bool doSsl;
+    QTcpSocket* sslSocket;
+};
+
+// This server tries to send data as fast as possible (like most servers)
+// but it measures how fast it was able to send it, which shows at which
+// rate the reader is processing the data.
 class FastSender: public QThread
 {
     Q_OBJECT
     QSemaphore ready;
     qint64 wantedSize;
     int port;
+    enum Protocol { DebugPipe, ProvidedData };
+    const Protocol protocol;
+    const bool doSsl;
+    const bool fillKernelBuffer;
 public:
     int transferRate;
     QWaitCondition cond;
+
+    QByteArray dataToTransmit;
+    int dataIndex;
+
+    // a server that sends debugpipe data
     FastSender(qint64 size)
-        : wantedSize(size), port(-1), transferRate(-1)
+        : wantedSize(size), port(-1), protocol(DebugPipe),
+          doSsl(false), fillKernelBuffer(true), transferRate(-1),
+          dataIndex(0)
+    {
+        start();
+        ready.acquire();
+    }
+
+    // a server that sends the data provided at construction time, useful for HTTP
+    FastSender(const QByteArray& data, bool https, bool fillBuffer)
+        : wantedSize(data.size()), port(-1), protocol(ProvidedData),
+          doSsl(https), fillKernelBuffer(fillBuffer), transferRate(-1),
+          dataToTransmit(data), dataIndex(0)
     {
         start();
         ready.acquire();
@@ -572,90 +699,121 @@ public:
 
     inline int serverPort() const { return port; }
 
+    int writeNextData(QTcpSocket* socket, qint32 size)
+    {
+        if (protocol == DebugPipe) {
+            QByteArray data;
+            QDataStream stream(&data, QIODevice::WriteOnly);
+            stream << QVariantMap() << QByteArray(size, 'a');
+            socket->write((char*)&size, sizeof size);
+            socket->write(data);
+            dataIndex += size;
+            return size;
+        } else {
+            const QByteArray data = dataToTransmit.mid(dataIndex, size);
+            socket->write(data);
+            dataIndex += data.size();
+            //qDebug() << "wrote" << dataIndex << "/" << dataToTransmit.size();
+            return data.size();
+        }
+    }
+    void writeLastData(QTcpSocket* socket)
+    {
+        if (protocol == DebugPipe) {
+            QByteArray data;
+            QDataStream stream(&data, QIODevice::WriteOnly);
+            stream << QVariantMap() << QByteArray();
+            const qint32 size = data.size();
+            socket->write((char*)&size, sizeof size);
+            socket->write(data);
+        }
+    }
+
 protected:
     void run()
     {
-        QTcpServer server;
+        BlockingTcpServer server(doSsl);
         server.listen();
         port = server.serverPort();
         ready.release();
 
-        server.waitForNewConnection(-1);
-        QTcpSocket *client = server.nextPendingConnection();
+        QTcpSocket *client = server.waitForNextConnectionSocket();
 
         // get the "request" packet
         if (!client->waitForReadyRead(2000)) {
-            qDebug() << client->error() << "waiting for \"request\" packet";
+            qDebug() << "FastSender:" << client->error() << "waiting for \"request\" packet";
             return;
         }
-        client->readAll();      // we're not interested in the actual contents
+        client->readAll();      // we're not interested in the actual contents (e.g. HTTP request)
 
-        enum { BlockSize = 256 };
-        QByteArray data;
-        {
-            QDataStream stream(&data, QIODevice::WriteOnly);
-            stream << QVariantMap() << QByteArray(BlockSize, 'a');
+        enum { BlockSize = 1024 };
+
+        if (fillKernelBuffer) {
+
+            // write a bunch of bytes to fill up the buffers
+            bool done = false;
+            do {
+                if (writeNextData(client, BlockSize) < BlockSize) {
+                    qDebug() << "ERROR: FastSender: not enough data to write in order to fill buffers; or client is reading too fast";
+                    return;
+                }
+                while (client->bytesToWrite() > 0) {
+                    if (!client->waitForBytesWritten(0)) {
+                        done = true;
+                        break;
+                    }
+                }
+                //qDebug() << "Filling kernel buffer: wrote" << dataIndex << "bytes";
+            } while (!done);
+
+            qDebug() << "FastSender: ok, kernel buffer is full after writing" << dataIndex << "bytes";
         }
-        qint32 size = data.size();
 
-        // write a bunch of bytes to fill up the buffers
-        do {
-            client->write((char*)&size, sizeof size);
-            client->write(data);
-            while (client->bytesToWrite() > 0)
-                if (!client->waitForBytesWritten(0))
-                    break;
-        } while (client->bytesToWrite() == 0);
+        // Tell the client to start reading
+        emit dataReady();
 
         // the kernel buffer is full
         // clean up QAbstractSocket's residue:
-        while (client->bytesToWrite() > 0)
+        while (client->bytesToWrite() > 0) {
+            qDebug() << "Still having" << client->bytesToWrite() << "bytes to write, doing that now";
             if (!client->waitForBytesWritten(2000)) {
-                qDebug() << client->error() << "cleaning up residue";
+                qDebug() << "ERROR: FastSender:" << client->error() << "cleaning up residue";
                 return;
             }
+        }
 
-        // now write in "blocking mode"
+        // now write in "blocking mode", this is where the rate measuring starts
         QTime timer;
         timer.start();
-        qint64 totalBytes = 0;
-        while (totalBytes < wantedSize) {
-            int bytesToWrite = wantedSize - totalBytes;
+        //const qint64 writtenBefore = dataIndex;
+        //qint64 measuredTotalBytes = wantedSize - writtenBefore;
+        qint64 measuredSentBytes = 0;
+        while (dataIndex < wantedSize) {
+            const int remainingBytes = wantedSize - measuredSentBytes;
+            const int bytesToWrite = qMin(remainingBytes, static_cast<int>(BlockSize));
             Q_ASSERT(bytesToWrite);
-            if (bytesToWrite > BlockSize) {
-                bytesToWrite = BlockSize;
-            } else {
-                QDataStream stream(&data, QIODevice::WriteOnly);
-                stream << QVariantMap() << QByteArray(bytesToWrite, 'b');
-            }
-            size = data.size();
-            client->write((char*)&size, sizeof size);
-            client->write(data);
-            totalBytes += bytesToWrite;
+            measuredSentBytes += writeNextData(client, bytesToWrite);
 
-            while (client->bytesToWrite() > 0)
+            while (client->bytesToWrite() > 0) {
                 if (!client->waitForBytesWritten(2000)) {
-                    qDebug() << client->error() << "blocking write";
+                    qDebug() << "ERROR: FastSender:" << client->error() << "during blocking write";
                     return;
                 }
-//            qDebug() << bytesToWrite << "bytes written now;"
-//                     << totalBytes << "total ("
-//                     << totalBytes*100/wantedSize << "% complete);"
-//                     << timer.elapsed() << "ms elapsed";
+            }
+            /*qDebug() << "FastSender:" << bytesToWrite << "bytes written now;"
+                     << measuredSentBytes << "measured bytes" << measuredSentBytes + writtenBefore << "total ("
+                     << measuredSentBytes*100/measuredTotalBytes << "% complete);"
+                     << timer.elapsed() << "ms elapsed";*/
         }
 
-        transferRate = totalBytes * 1000 / timer.elapsed();
-        qDebug() << "flushed" << totalBytes << "bytes in" << timer.elapsed() << "ms: rate =" << transferRate;
+        transferRate = measuredSentBytes * 1000 / timer.elapsed();
+        qDebug() << "FastSender: flushed" << measuredSentBytes << "bytes in" << timer.elapsed() << "ms: rate =" << transferRate << "B/s";
 
-        // write a "close connection" packet
-        {
-            QDataStream stream(&data, QIODevice::WriteOnly);
-            stream << QVariantMap() << QByteArray();
-        }
-        size = data.size();
-        client->write((char*)&size, sizeof size);
-        client->write(data);
+        // write a "close connection" packet, if the protocol needs it
+        writeLastData(client);
     }
+signals:
+    void dataReady();
 };
 
 class RateControlledReader: public QObject
@@ -664,40 +822,85 @@ class RateControlledReader: public QObject
     QIODevice *device;
     int bytesToRead;
     int interval;
+    int readBufferSize;
 public:
+    QByteArray data;
     qint64 totalBytesRead;
-    RateControlledReader(QIODevice *dev, int kbPerSec)
-        : device(dev), totalBytesRead(0)
+    RateControlledReader(QObject& senderObj, QIODevice *dev, int kbPerSec, int maxBufferSize = 0)
+        : device(dev), readBufferSize(maxBufferSize), totalBytesRead(0)
     {
         // determine how often we have to wake up
-        bytesToRead = kbPerSec * 1024 / 20;
-        interval = 50;
+        int timesPerSecond;
+        if (readBufferSize == 0) {
+            // The requirement is simply "N KB per seconds"
+            timesPerSecond = 20;
+            bytesToRead = kbPerSec * 1024 / timesPerSecond;
+        } else {
+            // The requirement also includes "<readBufferSize> bytes at a time"
+            bytesToRead = readBufferSize;
+            timesPerSecond = kbPerSec * 1024 / readBufferSize;
+        }
+        interval = 1000 / timesPerSecond; // in ms
 
         qDebug() << "RateControlledReader: going to read" << bytesToRead
                  << "bytes every" << interval << "ms";
-        qDebug() << "actual rate will be"
+        qDebug() << "actual read rate will be"
                  << (bytesToRead * 1000 / interval) << "bytes/sec (wanted"
                  << kbPerSec * 1024 << "bytes/sec)";
+
+        // Wait for data to be readyRead
+        bool ok = connect(&senderObj, SIGNAL(dataReady()), this, SLOT(slotDataReady()));
+        Q_ASSERT(ok);
+    }
+
+    void wrapUp()
+    {
+        QByteArray someData = device->read(device->bytesAvailable());
+        data += someData;
+        totalBytesRead += someData.size();
+        qDebug() << "wrapUp: found" << someData.size() << "bytes left. progress" << data.size();
+        //qDebug() << "wrapUp: now bytesAvailable=" << device->bytesAvailable();
+    }
+
+private slots:
+    void slotDataReady()
+    {
+        //qDebug() << "RateControlledReader: ready to go";
         startTimer(interval);
     }
 
 protected:
     void timerEvent(QTimerEvent *)
     {
+        //qDebug() << "RateControlledReader: timerEvent bytesAvailable=" << device->bytesAvailable();
+        if (readBufferSize > 0) {
+            // This asserts passes all the time, except in the final flush.
+            //Q_ASSERT(device->bytesAvailable() <= readBufferSize);
+        }
+
         qint64 bytesRead = 0;
         QTime stopWatch;
         stopWatch.start();
         do {
-            if (device->bytesAvailable() == 0)
-                if (stopWatch.elapsed() > 10 || !device->waitForReadyRead(5))
+            if (device->bytesAvailable() == 0) {
+                if (stopWatch.elapsed() > 20) {
+                    qDebug() << "RateControlledReader: Not enough data available for reading, waited too much, timing out";
                     break;
-            QByteArray data = device->read(bytesToRead - bytesRead);
-            bytesRead += data.size();
-        } while (bytesRead < bytesToRead);// && stopWatch.elapsed() < interval/4);
+                }
+                if (!device->waitForReadyRead(5)) {
+                    qDebug() << "RateControlledReader: Not enough data available for reading, even after waiting 5ms, bailing out";
+                    break;
+                }
+            }
+            QByteArray someData = device->read(bytesToRead - bytesRead);
+            data += someData;
+            bytesRead += someData.size();
+            //qDebug() << "RateControlledReader: successfully read" << someData.size() << "progress:" << data.size();
+        } while (bytesRead < bytesToRead);
         totalBytesRead += bytesRead;
 
         if (bytesRead < bytesToRead)
-            qWarning() << bytesToRead - bytesRead << "bytes not read";
+            qWarning() << "RateControlledReader: WARNING:" << bytesToRead - bytesRead << "bytes not read";
     }
 };
 
@@ -3157,8 +3360,8 @@ public:
             connect(serverSocket, SIGNAL(encrypted()), this, SLOT(encryptedSlot()));
             serverSocket->setProtocol(QSsl::AnyProtocol);
             connect(serverSocket, SIGNAL(sslErrors(const QList<QSslError>&)), serverSocket, SLOT(ignoreSslErrors()));
-            serverSocket->setLocalCertificate (SRCDIR "/certs/server.pem");
-            serverSocket->setPrivateKey (SRCDIR  "/certs/server.key");
+            serverSocket->setLocalCertificate(SRCDIR "/certs/server.pem");
+            serverSocket->setPrivateKey(SRCDIR  "/certs/server.key");
             serverSocket->startServerEncryption();
         } else {
             delete serverSocket;
@@ -3248,6 +3451,92 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress()
 }
 #endif
 
+void tst_QNetworkReply::ioGetFromBuiltinHttp_data()
+{
+    QTest::addColumn<bool>("https");
+    QTest::addColumn<int>("bufferSize");
+    QTest::newRow("http, no limit") << false << 0;
+    QTest::newRow("http, limited") << false << 4096;
+#ifndef QT_NO_OPENSSL
+    QTest::newRow("https, no limit") << true << 0;
+    QTest::newRow("https, limited") << true << 4096;
+#endif
+}
+
+void tst_QNetworkReply::ioGetFromBuiltinHttp()
+{
+    QFETCH(bool, https);
+    QFETCH(int, bufferSize);
+
+    QByteArray testData;
+    // Make the data big enough so that it can fill the kernel buffer
+    // (which seems to hold 202 KB here)
+    const int wantedSize = 1200 * 1000;
+    testData.reserve(wantedSize);
+    // And in the case of SSL, the compression can fool us and let the
+    // server send the data much faster than expected.
+    // So better provide random data that cannot be compressed.
+    for (int i = 0; i < wantedSize; ++i)
+        testData += (char)qrand();
+
+    QByteArray httpResponse = QByteArray("HTTP/1.0 200 OK\r\nContent-Length: ");
+    httpResponse += QByteArray::number(testData.size());
+    httpResponse += "\r\n\r\n";
+    httpResponse += testData;
+
+    qDebug() << "Server will send" << (httpResponse.size()-testData.size()) << "bytes of header and"
+             << testData.size() << "bytes of data";
+
+    const bool fillKernelBuffer = bufferSize > 0;
+    FastSender server(httpResponse, https, fillKernelBuffer);
+
+    QUrl url(QString("%1://127.0.0.1:%2/qtest/rfc3252.txt")
+             .arg(https?"https":"http")
+             .arg(server.serverPort()));
+    QNetworkRequest request(url);
+    QNetworkReplyPtr reply = manager.get(request);
+    reply->setReadBufferSize(bufferSize);
+    reply->ignoreSslErrors();
+    const int rate = 200; // in kB per sec
+    RateControlledReader reader(server, reply, rate, bufferSize);
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTime loopTime;
+    loopTime.start();
+    QTestEventLoop::instance().enterLoop(11);
+    const int elapsedTime = loopTime.elapsed();
+    server.wait();
+    reader.wrapUp();
+
+    qDebug() << "send rate:" << server.transferRate << "B/s";
+    qDebug() << "receive rate:" << reader.totalBytesRead * 1000 / elapsedTime
+             << "(it received" << reader.totalBytesRead << "bytes in" << elapsedTime << "ms)";
+
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    QCOMPARE(reply->url(), request.url());
+    QCOMPARE(reply->error(), QNetworkReply::NoError);
+    QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
+
+    QCOMPARE(reply->header(QNetworkRequest::ContentLengthHeader).toLongLong(), (qint64)testData.size());
+    if (reader.data.size() < testData.size()) { // oops?
+        QCOMPARE(reader.data, testData.mid(0, reader.data.size()));
+        qDebug() << "The data is incomplete, the last" << testData.size() - reader.data.size() << "bytes are missing";
+    }
+    QCOMPARE(reader.data.size(), testData.size());
+    QCOMPARE(reader.data, testData);
+
+    // OK we got the file alright, but did setReadBufferSize work?
+    QVERIFY(server.transferRate != -1);
+    if (bufferSize > 0) {
+        const int allowedDeviation = 16; // TODO find out why the send rate is 13% faster currently
+        const int minRate = rate * 1024 * (100-allowedDeviation) / 100;
+        const int maxRate = rate * 1024 * (100+allowedDeviation) / 100;
+        QVERIFY(server.transferRate >= minRate);
+        QVERIFY(server.transferRate <= maxRate);
+    }
+}
+
 void tst_QNetworkReply::ioPostToHttpUploadProgress()
 {
     QFile sourceFile(SRCDIR "/bigfile");
@@ -3432,8 +3721,10 @@ void tst_QNetworkReply::rateControl()
     QNetworkReplyPtr reply = manager.get(request);
     reply->setReadBufferSize(32768);
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
+    QSignalSpy errorSpy(reply, SIGNAL(error(QNetworkReply::NetworkError)));
 
-    RateControlledReader reader(reply, rate);
+    RateControlledReader reader(sender, reply, rate, 20);
 
     // this test is designed to run for 25 seconds at most
     QTime loopTime;
@@ -3441,6 +3732,10 @@ void tst_QNetworkReply::rateControl()
     QTestEventLoop::instance().enterLoop(40);
     int elapsedTime = loopTime.elapsed();
 
+    if (!errorSpy.isEmpty()) {
+        qDebug() << "ERROR!" << errorSpy[0][0] << reply->errorString();
+    }
+
     qDebug() << "tst_QNetworkReply::rateControl" << "send rate:" << sender.transferRate;
     qDebug() << "tst_QNetworkReply::rateControl" << "receive rate:" << reader.totalBytesRead * 1000 / elapsedTime
              << "(it received" << reader.totalBytesRead << "bytes in" << elapsedTime << "ms)";
-- 
cgit v0.12


From 6c796c75bfde7e79ec0802e0b7245283fc46d46e Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Mon, 1 Nov 2010 14:43:14 +0100
Subject: Doc: Fixing bug in sorting script for search results.

Reviewed-by: Geir Vattekar
---
 doc/src/template/scripts/functions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 47539d2..62bc535 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -105,17 +105,17 @@ function processNokiaData(response){
 			/* start a new list element */
 			full_li_element = '<li';
 					/* if the pageType element reads APIPage, add class name api */
-      if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
+      if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
       	full_li_element += ' class="api"';
       	apiCount++;
       }
 					/* if the pageType element reads Article, add class name article */
-      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
       	full_li_element += ' class="article"';
       	articleCount++;
       }
 					/* if the pageType element reads Example, add class name example */
-      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
       	full_li_element += ' class="example"';
       	exampleCount++;
       }
-- 
cgit v0.12


From d190802d33b763e7a21b85fb3dc2ed7c039ddbb6 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Mon, 1 Nov 2010 16:19:11 +0100
Subject: Doc: Fixing typo

---
 tools/macdeployqt/shared/shared.cpp       | 2 +-
 tools/porting/src/preprocessorcontrol.cpp | 2 +-
 tools/porting/src/textreplacement.h       | 4 ++--
 tools/qdoc3/ditaxmlgenerator.cpp          | 4 ++--
 tools/qdoc3/tokenizer.h                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp
index 52cf04b..c7d23c0 100644
--- a/tools/macdeployqt/shared/shared.cpp
+++ b/tools/macdeployqt/shared/shared.cpp
@@ -388,7 +388,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
         foreach (FrameworkInfo dependency, dependencies) {
             changeInstallName(dependency.installName, dependency.deployedInstallName, deployedBinaryPath);
 
-            // Deploy framework if neccesary.
+            // Deploy framework if necessary.
             if (copiedFrameworks.contains(dependency.frameworkName) == false && frameworks.contains(dependency) == false) {
                 frameworks.append(dependency);
             }
diff --git a/tools/porting/src/preprocessorcontrol.cpp b/tools/porting/src/preprocessorcontrol.cpp
index 673ed08..31adc32 100644
--- a/tools/porting/src/preprocessorcontrol.cpp
+++ b/tools/porting/src/preprocessorcontrol.cpp
@@ -154,7 +154,7 @@ QByteArray PreprocessorCache::readFile(const QString &filename) const
     // read the file for us.
     if (receivers(SIGNAL(readFile(QByteArray&,QString))) > 0) {
         QByteArray array;
-        // Workaround for "not beeing able to emit from const function"
+        // Workaround for "not being able to emit from const function"
         PreprocessorCache *cache = const_cast<PreprocessorCache *>(this);
         emit cache->readFile(array, filename);
         return array;
diff --git a/tools/porting/src/textreplacement.h b/tools/porting/src/textreplacement.h
index f90fb82..f351552 100644
--- a/tools/porting/src/textreplacement.h
+++ b/tools/porting/src/textreplacement.h
@@ -53,7 +53,7 @@ class TextReplacement
 public:
     QByteArray newText;
     int insertPosition;
-    int currentLenght;    //lenght of the text that is going to be replaced.
+    int currentLenght;    //length of the text that is going to be replaced.
     bool operator<(const TextReplacement &other) const
     {
         return  (insertPosition < other.insertPosition);
@@ -70,7 +70,7 @@ public:
 
         insert maintains the TextReplacement list in sorted order.
 
-        Returns true if the insert was successfull, false otherwise;
+        Returns true if the insert was successful, false otherwise;
     */
     bool insert(QByteArray newText, int insertPosition, int currentLenght);
     void clear();
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index a83a321..d43ad96 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -2015,7 +2015,7 @@ void DitaXmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *mark
 }
 
 /*!
-  Generates a table of contents begining at \a node.
+  Generates a table of contents beginning at \a node.
  */
 void DitaXmlGenerator::generateTableOfContents(const Node *node,
                                             CodeMarker *marker,
@@ -2101,7 +2101,7 @@ void DitaXmlGenerator::generateTableOfContents(const Node *node,
 
 /*!
   Revised for the new doc format.
-  Generates a table of contents begining at \a node.
+  Generates a table of contents beginning at \a node.
  */
 void DitaXmlGenerator::generateTableOfContents(const Node *node,
                                             CodeMarker *marker,
diff --git a/tools/qdoc3/tokenizer.h b/tools/qdoc3/tokenizer.h
index bd35965..af617f1 100644
--- a/tools/qdoc3/tokenizer.h
+++ b/tools/qdoc3/tokenizer.h
@@ -145,7 +145,7 @@ class Tokenizer
         int ch = getch();
         if (ch == EOF)
             return EOF;
-        // cast explicitely to make sure the value of ch 
+        // cast explicitily to make sure the value of ch 
         // is in range [0..255] to avoid assert messages 
         // when using debug CRT that checks its input.
         return int(uint(uchar(ch))); 
-- 
cgit v0.12


From 074501c479de2e7e68c77054ef98b2b787021b55 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 1 Nov 2010 16:25:01 +0100
Subject: fix qdoc doc generation

as a side effect, the target is now named html-docs instead of docs to
be consistent with the qt docs.
---
 tools/qdoc3/qdoc3.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index ae0bf25..d47e066 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -120,9 +120,9 @@ SOURCES += apigenerator.cpp \
 
 qtPrepareTool(QDOC, qdoc3)
 
-docs.commands = $$QDOC qdoc-manual.qdocconf
+html-docs.commands = cd \"$$PWD/doc\" && $$QDOC qdoc-manual.qdocconf
 
-QMAKE_EXTRA_TARGETS += docs
+QMAKE_EXTRA_TARGETS += html-docs
 
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
-- 
cgit v0.12


From 155065cd5c611e2d14357a8ff3180ac14a68e3a0 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 2 Nov 2010 10:41:25 +1000
Subject: Removing a binding while it is being applied caused a crash. Use a
 weak pointer to the binding in case applying the binding (while fast
 forwarding) causes it to be removed.

Task-number: QTBUG-14830
Reviewed-by: Michael Brasser
---
 src/declarative/util/qdeclarativestate.cpp         | 12 ++++-----
 src/declarative/util/qdeclarativestate_p.h         |  3 ++-
 src/declarative/util/qdeclarativestate_p_p.h       |  2 +-
 .../util/qdeclarativetransitionmanager.cpp         | 16 ++++++------
 .../qdeclarativestates/data/QTBUG-14830.qml        | 29 ++++++++++++++++++++++
 .../qdeclarativestates/tst_qdeclarativestates.cpp  | 13 ++++++++++
 6 files changed, 59 insertions(+), 16 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml

diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 0f5413e..3915485 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
 
 QDeclarativeAction::QDeclarativeAction()
-: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), fromBinding(0), toBinding(0), event(0),
+: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), fromBinding(0), event(0),
   specifiedObject(0)
 {
 }
@@ -67,7 +67,7 @@ QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyN
                const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), 
   property(target, propertyName), toValue(value), 
-  fromBinding(0), toBinding(0), event(0), 
+  fromBinding(0), event(0),
   specifiedObject(target), specifiedProperty(propertyName)
 {
     if (property.isValid())
@@ -78,7 +78,7 @@ QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyN
                QDeclarativeContext *context, const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false),
   property(target, propertyName, context), toValue(value),
-  fromBinding(0), toBinding(0), event(0),
+  fromBinding(0), event(0),
   specifiedObject(target), specifiedProperty(propertyName)
 {
     if (property.isValid())
@@ -503,11 +503,11 @@ void QDeclarativeState::addEntriesToRevertList(const QList<QDeclarativeAction> &
             const QDeclarativeAction &action = actionListIterator.next();
             QDeclarativeSimpleAction simpleAction(action);
             action.property.write(action.toValue);
-            if (action.toBinding) {
+            if (!action.toBinding.isNull()) {
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(simpleAction.property());
                 if (oldBinding)
                     QDeclarativePropertyPrivate::setBinding(simpleAction.property(), 0);
-                QDeclarativePropertyPrivate::setBinding(simpleAction.property(), action.toBinding, QDeclarativePropertyPrivate::DontRemoveBinding);
+                QDeclarativePropertyPrivate::setBinding(simpleAction.property(), action.toBinding.data(), QDeclarativePropertyPrivate::DontRemoveBinding);
             }
 
             simpleActionList.append(simpleAction);
@@ -675,7 +675,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit
             a.property = d->revertList.at(ii).property();
             a.fromValue = cur;
             a.toValue = d->revertList.at(ii).value();
-            a.toBinding = d->revertList.at(ii).binding();
+            a.toBinding = QDeclarativeAbstractBinding::getPointer(d->revertList.at(ii).binding());
             a.specifiedObject = d->revertList.at(ii).specifiedObject();
             a.specifiedProperty = d->revertList.at(ii).specifiedProperty();
             a.event = d->revertList.at(ii).event();
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index fc7c940..7b9c18a 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -45,6 +45,7 @@
 #include <qdeclarative.h>
 #include <qdeclarativeproperty.h>
 #include <QtCore/qobject.h>
+#include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativeglobal_p.h>
 
 QT_BEGIN_HEADER
@@ -75,7 +76,7 @@ public:
     QVariant toValue;
 
     QDeclarativeAbstractBinding *fromBinding;
-    QDeclarativeAbstractBinding *toBinding;
+    QDeclarativeAbstractBinding::Pointer toBinding;
     QDeclarativeActionEvent *event;
 
     //strictly for matching
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 4fd8f21..98c3f7b 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -85,7 +85,7 @@ public:
             m_reverseEvent = true;
         } else {
             m_value = a.toValue;
-            m_binding = QDeclarativeAbstractBinding::getPointer(a.toBinding);
+            m_binding = a.toBinding;
             m_reverseEvent = false;
         }
     }
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 89b0044..d19e6f2 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -99,8 +99,8 @@ void QDeclarativeTransitionManager::complete()
 void QDeclarativeTransitionManagerPrivate::applyBindings()
 {
     foreach(const QDeclarativeAction &action, bindingsList) {
-        if (action.toBinding) {
-            QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding);
+        if (!action.toBinding.isNull()) {
+            QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding.data());
         } else if (action.event) {
             if (action.reverseEvent)
                 action.event->reverse();
@@ -145,8 +145,8 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
         // Apply all the property and binding changes
         for (int ii = 0; ii < applyList.size(); ++ii) {
             const QDeclarativeAction &action = applyList.at(ii);
-            if (action.toBinding) {
-                QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+            if (!action.toBinding.isNull()) {
+                QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding.data(), QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             } else if (!action.event) {
                 QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             } else if (action.event->isReversable()) {
@@ -165,7 +165,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
                 continue;
             }
             const QDeclarativeProperty &prop = action->property;
-            if (action->toBinding || !action->toValue.isValid()) {
+            if (!action->toBinding.isNull() || !action->toValue.isValid()) {
                 action->toValue = prop.read();
             }
         }
@@ -259,10 +259,10 @@ void QDeclarativeTransitionManager::cancel()
 
     for(int i = 0; i < d->bindingsList.count(); ++i) {
         QDeclarativeAction action = d->bindingsList[i];
-        if (action.toBinding && action.deletableToBinding) {
+        if (!action.toBinding.isNull() && action.deletableToBinding) {
             QDeclarativePropertyPrivate::setBinding(action.property, 0);
-            action.toBinding->destroy();
-            action.toBinding = 0;
+            action.toBinding.data()->destroy();
+            action.toBinding.clear();
             action.deletableToBinding = false;
         } else if (action.event) {
             //### what do we do here?
diff --git a/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml b/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml
new file mode 100644
index 0000000..5eccdda
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml
@@ -0,0 +1,29 @@
+import Qt 4.7
+
+Rectangle {
+    width: 1024
+    height: 768
+
+    Item {
+        id: area
+        objectName: "area"
+        property int numx: 6
+        property int cellwidth: 1024/numx
+
+        onWidthChanged: {
+            width = width>1024?1024:width;
+        }
+
+        state: 'minimal'
+        states: [
+            State {
+                name: 'minimal'
+                PropertyChanges {
+                    target: area
+                    width: cellwidth
+                }
+            }
+        ]
+
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 0d10c10..b8409a5 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -143,6 +143,7 @@ private slots:
     void returnToBase();
     void extendsBug();
     void editProperties();
+    void QTBUG_14830();
 };
 
 void tst_qdeclarativestates::initTestCase()
@@ -1375,6 +1376,18 @@ void tst_qdeclarativestates::editProperties()
     QCOMPARE(childRect->height(), qreal(40));
 }
 
+void tst_qdeclarativestates::QTBUG_14830()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/QTBUG-14830.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+    QDeclarativeItem *item = rect->findChild<QDeclarativeItem*>("area");
+
+    QCOMPARE(item->width(), qreal(171));
+}
+
 QTEST_MAIN(tst_qdeclarativestates)
 
 #include "tst_qdeclarativestates.moc"
-- 
cgit v0.12


From 11bb4f85ef38270758ec0930709c23c7fcb5840c Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Tue, 2 Nov 2010 16:41:01 +1000
Subject: Regression: Text element breaks when using \n for separating lines

Task-number: QTBUG-14915
Reviewed-by: Michael Brasser
---
 src/declarative/graphicsitems/qdeclarativetext.cpp |  24 ++--
 .../qdeclarativetext/font/data-MAC/plaintext2.qml  | 131 +++++++++++++++++++++
 .../qmlvisual/qdeclarativetext/font/plaintext2.qml |  22 ++++
 3 files changed, 165 insertions(+), 12 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 03c9765..8cb47aa 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -291,30 +291,30 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
     qreal height = 0;
     qreal lineWidth = 0;
 
-    //set manual width
-    if (q->widthValid())
-        lineWidth = q->width();
-
     QTextOption textOption = layout.textOption();
-    textOption.setWrapMode(QTextOption::WrapMode(wrapMode));
+    textOption.setWrapMode(QTextOption::NoWrap);
     textOption.setAlignment(Qt::Alignment(hAlign));
-    layout.setTextOption(textOption);
 
+    // if the item has an explicit width, we set the line width and enable wrapping
+    if (q->widthValid()) {
+        lineWidth = q->width();
+        textOption.setWrapMode(QTextOption::WrapMode(wrapMode));
+    }
+
+    layout.setTextOption(textOption);
     layout.beginLayout();
     while (1) {
         QTextLine line = layout.createLine();
         if (!line.isValid())
             break;
 
-        if (q->widthValid()) {
-            line.setLineWidth(lineWidth);
-            line.setPosition(QPointF(0, height));
-            height += line.height();
-        }
+        line.setLineWidth(lineWidth);
+        line.setPosition(QPointF(0, height));
+        height += line.height();
     }
     layout.endLayout();
 
-    return QSize(qCeil(layout.boundingRect().width()), layout.boundingRect().height());
+    return layout.boundingRect().toAlignedRect().size();
 }
 
 /*!
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
new file mode 100644
index 0000000..1a8af0e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
@@ -0,0 +1,131 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 32
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 48
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 64
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 80
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 96
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 112
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 128
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 144
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 160
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 176
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 192
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 208
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 224
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 240
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 256
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 272
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 288
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 304
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 320
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 336
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 352
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 368
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 384
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 400
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 416
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 432
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+    Frame {
+        msec: 464
+        hash: "c68e50ef84647962481121e2eb1ba4d4"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml
new file mode 100644
index 0000000..901025a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml
@@ -0,0 +1,22 @@
+import QtQuick 1.0
+
+Rectangle {
+    width: 400; height: 200
+
+    Row {
+        spacing: 20
+        anchors.centerIn: parent
+        Text {
+            text: "First line\nSecond line"; wrapMode: Text.Wrap
+        }
+        Text {
+            text: "First line\nSecond line"; width: 70
+        }
+        Text {
+            text: "First Second\nThird Fourth"; wrapMode: Text.Wrap; width: 50
+        }
+        Text {
+            text: "First line<br>Second line"; textFormat: Text.StyledText
+        }
+    }
+}
-- 
cgit v0.12


From a1aee0f169614b31a7fde201a3d1c64010198218 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Tue, 2 Nov 2010 11:35:42 +0100
Subject: One more fix for dithering.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/dithering.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/dithering.cpp b/src/plugins/graphicssystems/meego/dithering.cpp
index c0b4b53..76d15a3 100644
--- a/src/plugins/graphicssystems/meego/dithering.cpp
+++ b/src/plugins/graphicssystems/meego/dithering.cpp
@@ -68,7 +68,7 @@
 
 // Writes(ads) a new value to the diffusion accumulator. accumulator is a short.
 // x, y is a position in the accumulation buffer. y can be 0 or 1 -- we operate on two lines at time.
-#define ACCUMULATE(accumulator, x, y, width, v) if (x < width && x > 0) accumulator[(y * width) + x] += v
+#define ACCUMULATE(accumulator, x, y, width, v) if (x < width && x >= 0) accumulator[(y * width) + x] += v
 
 // Clamps a value to be in 0..255 range.
 #define CLAMP_256(v) if (v > 255) v = 255; if (v < 0) v = 0;
@@ -110,18 +110,18 @@ unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int h
     // Produce the conversion lookup tables.
     for (i = 0; i < 256; i++) {
         lookup_8bit_to_5bit[i] = round(i / 8.0);
-        if (lookup_8bit_to_5bit[i] > 31)
-            lookup_8bit_to_5bit[i] -= 1;
 
         // Before bitshifts: (i * 8) - (... * 8 * 8)
         lookup_8bit_to_5bit_diff[i] = (i << 3) - (lookup_8bit_to_5bit[i] << 6);
+        if (lookup_8bit_to_5bit[i] > 31)
+            lookup_8bit_to_5bit[i] -= 1;
 
         lookup_8bit_to_6bit[i] = round(i / 4.0);
-        if (lookup_8bit_to_6bit[i] > 63)
-            lookup_8bit_to_6bit[i] -= 1;
 
         // Before bitshifts: (i * 8) - (... * 4 * 8)
         lookup_8bit_to_6bit_diff[i] = (i << 3) - (lookup_8bit_to_6bit[i] << 5);
+        if (lookup_8bit_to_6bit[i] > 63)
+            lookup_8bit_to_6bit[i] -= 1;
     }
 
     // Clear the accumulators
@@ -221,11 +221,11 @@ unsigned short* convertARGB32_to_RGBA4444(const unsigned char *in, int width, in
     // Produce the conversion lookup tables.
     for (i = 0; i < 256; i++) {
         lookup_8bit_to_4bit[i] = round(i / 16.0);
-        if (lookup_8bit_to_4bit[i] > 15)
-            lookup_8bit_to_4bit[i] -= 1;
-
         // Before bitshifts: (i * 8) - (... * 16 * 8)
         lookup_8bit_to_4bit_diff[i] = (i << 3) - (lookup_8bit_to_4bit[i] << 7);
+
+        if (lookup_8bit_to_4bit[i] > 15)
+            lookup_8bit_to_4bit[i] = 15;
     }
 
     // Clear the accumulators
-- 
cgit v0.12


From 2f12d81a72fe6abb48cce4d327ecc27d308a8418 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Tue, 2 Nov 2010 11:35:42 +0100
Subject: Use 32bit textures for alpha textures after all.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

4444 16bit are too bad quality-wise.

Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/dithering.cpp        | 18 ++++++++++++++++++
 src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/dithering.cpp b/src/plugins/graphicssystems/meego/dithering.cpp
index 76d15a3..122c51e 100644
--- a/src/plugins/graphicssystems/meego/dithering.cpp
+++ b/src/plugins/graphicssystems/meego/dithering.cpp
@@ -286,3 +286,21 @@ unsigned short* convertARGB32_to_RGBA4444(const unsigned char *in, int width, in
 
     return out;
 }
+
+unsigned char* convertBGRA32_to_RGBA32(const unsigned char *in, int width, int height, int stride)
+{
+    unsigned char *out = (unsigned char *) malloc(stride * height);
+
+    // For each line...
+    for (int y = 0; y < height; y++) {
+        // For each column
+        for (int x = 0; x < width; x++) {
+            out[(stride * y) + (x * 4) + 0] = in[(stride * y) + (x * 4) + 2];
+            out[(stride * y) + (x * 4) + 1] = in[(stride * y) + (x * 4) + 1];
+            out[(stride * y) + (x * 4) + 2] = in[(stride * y) + (x * 4) + 0];
+            out[(stride * y) + (x * 4) + 3] = in[(stride * y) + (x * 4) + 3];
+        }
+    }
+
+    return out;
+}
\ No newline at end of file
diff --git a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
index 02a4273..eb63692 100644
--- a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
@@ -51,6 +51,7 @@
 // from dithering.cpp
 extern unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int height, int stride);
 extern unsigned short* convertARGB32_to_RGBA4444(const unsigned char *in, int width, int height, int stride);
+extern unsigned char* convertBGRA32_to_RGBA32(const unsigned char *in, int width, int height, int stride);
 
 static EGLint preserved_image_attribs[] = { EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE };
 
@@ -146,8 +147,8 @@ Qt::HANDLE QMeeGoPixmapData::imageToEGLSharedImage(const QImage &image)
     glGenTextures(1, &textureId);
     glBindTexture(GL_TEXTURE_2D, textureId);
     if (image.hasAlphaChannel() && const_cast<QImage &>(image).data_ptr()->checkForAlphaPixels()) {
-        void *converted = convertARGB32_to_RGBA4444(image.bits(), image.width(), image.height(), image.bytesPerLine());
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 0, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, converted);
+        void *converted = convertBGRA32_to_RGBA32(image.bits(), image.width(), image.height(), image.bytesPerLine());
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, converted);
         free(converted);
     } else {
         void *converted = convertRGB32_to_RGB565(image.bits(), image.width(), image.height(), image.bytesPerLine());
-- 
cgit v0.12


From 7229aa57f96d35290914906601084a200132a7ea Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Tue, 2 Nov 2010 12:04:36 +0100
Subject: Update .def files for QtGui and QtOpenVG

Update the .def files with the latest changes.

Reviewed-by: Jason Barron
---
 src/s60installs/eabi/QtGuiu.def    | 3 +++
 src/s60installs/eabi/QtOpenVGu.def | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index f772bcc..75bb026 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12101,4 +12101,7 @@ EXPORTS
 	_ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME
 	_ZNK5QFont14lastResortFontEv @ 12101 NONAME
 	_ZN11QFontEngine33convertToPostscriptFontFamilyNameERK10QByteArray @ 12102 NONAME
+	_ZN15QStaticTextItem13setFontEngineEP11QFontEngine @ 12103 NONAME
+	_ZN15QStaticTextItemD1Ev @ 12104 NONAME
+	_ZN15QStaticTextItemD2Ev @ 12105 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index 99942b8..e1828c1 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -205,4 +205,5 @@ EXPORTS
 	_ZN13QVGPixmapData20createPixmapForImageER6QImage6QFlagsIN2Qt19ImageConversionFlagEEb @ 204 NONAME
 	_ZN13QVGPixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 205 NONAME
 	_ZN13QVGPixmapData8fromFileERK7QStringPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 206 NONAME
+	_ZNK14QVGPaintEngine16canVgWritePixelsERK6QImage @ 207 NONAME
 
-- 
cgit v0.12


From f70c495803f1bb42894e69ee2d390f613ebd93b6 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 2 Nov 2010 12:18:54 +0100
Subject: Doc: fixing style for search display and slim fit menus

---
 doc/src/template/style/style.css | 76 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 3 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 536b3c8..1e5c071 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -660,13 +660,31 @@
 		-webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
 		-moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
 		box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+		font-size: 11px;
+	}
+
+	#resultdialog a
+  {
+      color: #00732f;
 	}
 
 	#resultdialog.active {
 	  display: block;
-	  width:30%;
 	}
 
+	.narrow #resultdialog {
+	  width: 60%;
+	  _width: 360px;
+	}
+
+	.narrow #resultdialog.active {
+    right: 10px;
+	  *left: auto;
+	  _left: auto;
+    _right: -20px;
+	}
+
+
 	#resultdialog #resultclose {
 	  float: right;
 	}
@@ -775,10 +793,11 @@
     {
         float: left;
         text-indent: -10px;
-        margin-top: -5px;
+     /*   margin-top: -5px;*/
         margin-right: 15px;
         font-weight: bold;
         color: #B0ADAB;
+        font: 10px/1.2 Verdana;
     }
 
     .toolbuttons #print
@@ -892,7 +911,6 @@
     }
     .wrap .content h2
     {
-	border-bottom:1px solid #DDDDDD;
 	font:600 16px/1.2 Arial;
 	margin-top:15px;
 	width:100%;	
@@ -1658,6 +1676,58 @@
 	}
 /* end of creator spec*/
 	
+	.item {
+	  float: left;
+	  position: relative;
+	  width: 100%;
+	  overflow: hidden;
+	}
+
+
+	.item .primary {
+	  margin-right: 220px;
+	  position: relative;
+	}
+
+	.item hr {
+	  margin-left: -220px;
+	}
+
+	.item .secondary {
+	  float: right;
+	  width: 200px;
+	  position: relative;
+	}
+
+	.item .cols {
+	  clear: both;
+	  display: block;
+	}
+
+	.item .cols .col {
+	  float: left;
+	  margin-left: 1.5%;
+	}
+
+	.item .cols .col.first {
+	  margin-left: 0;
+	}
+
+	.item .cols.two .col {
+	  width: 45%;
+	}
+
+	.item .box {
+	  margin: 0 0 10px 0;
+	}
+
+	.item .box h3 {
+	  margin: 0 0 10px 0;
+	}
+
+	.cols.unclear {
+		clear:none;
+	}
 }
 
 /* end of screen media */
-- 
cgit v0.12


From 1bf0fa453fa65c6d29696c0b56ebdcb99c384ad4 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 2 Nov 2010 12:39:37 +0100
Subject: Doc: fixing bugs in style

---
 doc/src/template/style/narrow.css | 1 +
 doc/src/template/style/style.css  | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index c1e3f61..fbb0752 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -223,6 +223,7 @@
       float: right;
       margin: 15px 40px 0 0;
       font-size: 11px;
+      position: relative;
     }
 
     .narrow #narrowmenu {
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 1e5c071..17665c0 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -101,7 +101,7 @@
     }
     a
     {
-        color: #00732f;
+        color: #44a51c;
         text-decoration: none;
     }
     hr
@@ -1297,6 +1297,10 @@
         background-color: #E6E7E8;
         margin: 0;
     }
+   .small
+    {
+        font: normal 9px/1 Verdana;
+    }	
 /* end footer elements */
 
 
@@ -1471,7 +1475,7 @@
 	}
 
 
-    .creator .header, .footer, .wrapper
+    .creator .header, .creator .footer, .creator .wrapper
     {
         max-width: 1500px;
         margin: 0px;
-- 
cgit v0.12


From 12120c47133642a0704799208701fd9164bf0ebf Mon Sep 17 00:00:00 2001
From: Frederik Schwarzer <schwarzerf@gmail.com>
Date: Tue, 2 Nov 2010 12:45:09 +0100
Subject: german translation: minor additions + fixes

Merge-request: 902
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 translations/assistant_de.ts | 37 ++++++++++++++++++++++++++++++++-----
 translations/qt_de.ts        |  4 ++--
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts
index 95fabaf..3648fdd 100644
--- a/translations/assistant_de.ts
+++ b/translations/assistant_de.ts
@@ -67,7 +67,7 @@ Grund:
     </message>
     <message>
         <source>Error reading collection file &apos;%1&apos;: %2.</source>
-        <translation>Fehler beim Lesen der Katalogdatei &apos;%1&apos;: %2</translation>
+        <translation>Fehler beim Lesen der Katalogdatei &apos;%1&apos;: %2.</translation>
     </message>
     <message>
         <source>Error creating collection file &apos;%1&apos;: %2.</source>
@@ -741,7 +741,7 @@ Grund:
     </message>
     <message>
         <source>Input File</source>
-        <translation>Eingabedatei:</translation>
+        <translation>Datei eingeben</translation>
     </message>
     <message>
         <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source>
@@ -989,7 +989,7 @@ Grund:
     </message>
     <message>
         <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation und/oder ihre Tochtergesellschaft(en).&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Could not register file &apos;%1&apos;: %2</source>
@@ -1354,7 +1354,19 @@ qcollectiongenerator &lt;collection-config-file&gt; [options]
                          qcollectiongenerator.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>
+Aufruf:
+
+qcollectiongenerator &lt;collection-Konfigurationsdatei&gt; [Optionen]
+
+  -o &lt;collection-Datei&gt;  Erstellt eine Collection-Datei mit
+                         dem Namen &lt;collection-Datei&gt;. Wenn
+                         diese Option nicht angegeben ist, wird
+                         der Standardname verwendet.
+  -v                     Zeigt die Versionsnummer von
+                         qcollectiongenerator an.
+
+</translation>
     </message>
     <message>
         <source>Could not open %1.
@@ -1435,7 +1447,22 @@ qhelpgenerator &lt;help-project-file&gt; [options]
                          qhelpgenerator.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>
+Aufruf:
+
+qhelpgenerator &lt;Hilfe-Projektdatei&gt; [Optionen]
+  -o &lt;komprimierte-Datei&gt;  Erstellt eine komprimierte
+                           Qt-Hilfedatei mit dem Namen
+                           &lt;komprimierte-Datei&gt;. Wenn diese
+                           Option nicht angegeben ist, wird
+                           ein Standardname verwendet.
+  -c                       Prüft, ob alle Verknüpfungen in
+                           HTML-Dateien auf Dateien in diesem
+                           Hilfeprojekt verweisen.
+  -v                       Zeigt die Versionsnummer von
+                           qhelpgenerator an.
+
+</translation>
     </message>
     <message>
         <source>Could not open %1.
diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 3b9bbb0..d167434 100644
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -3700,7 +3700,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
     </message>
     <message>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h3&gt;Über Qt&lt;/h3&gt;&lt;p&gt;Dieses Programm verwendet Qt Version %1.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
@@ -5186,7 +5186,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
     </message>
     <message>
         <source>Find &amp;Previous</source>
-        <translation>Vorhergehende Fundstelle</translation>
+        <translation>&amp;Vorhergehende Fundstelle</translation>
     </message>
     <message>
         <source>Shift+F3</source>
-- 
cgit v0.12


From 891221a3f0c952817eb7891b9243827edda61085 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Tue, 2 Nov 2010 13:41:50 +0100
Subject: Fix Malayalam Rendering - 'Ra' is PreBase

Task-number: QTBUG-1887
Reviewed-by: Lars Knoll
---
 src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
index 4d8418b..237c9ae 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
@@ -833,7 +833,7 @@ static const unsigned char indicPosition[0xe00-0x900] = {
     None, None, None, None,
     None, None, None, Post,
 
-    Post, None, Below, None,
+    Pre, None, Below, None,
     None, Post, None, None,
     None, None, None, None,
     None, None, Post, Post,
-- 
cgit v0.12


From 45f66384c560f75477f0554fa0dd5a48d0d8f503 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 14:35:05 +0200
Subject: Added Maemo 6 to the X11 desktopEnvironment list

DE_MAEMO6 is set when the rootwindow is MCompositor
---
 src/gui/kernel/qapplication_x11.cpp | 34 ++++++++++++++++++++++++++++++++++
 src/gui/kernel/qt_x11_p.h           |  1 +
 2 files changed, 35 insertions(+)

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index a4cc5a3..a9fccb0 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -2334,6 +2334,40 @@ void qt_init(QApplicationPrivate *priv, int,
                 X11->desktopEnvironment = DE_4DWM;
                 break;
             }
+
+            Window windowManagerWindow = XNone;
+            Atom typeReturned;
+            int formatReturned;
+            unsigned long nitemsReturned;
+            unsigned long unused;
+            unsigned char *data = 0;
+            if (XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(),
+                               ATOM(_NET_SUPPORTING_WM_CHECK),
+                               0, 1024, False, XA_WINDOW, &typeReturned,
+                               &formatReturned, &nitemsReturned, &unused, &data)
+                  == Success) {
+                if (typeReturned == XA_WINDOW && formatReturned == 32)
+                    windowManagerWindow = *((Window*) data);
+                if (data)
+                    XFree(data);
+
+                if (windowManagerWindow != XNone) {
+                    QString wmName;
+                    Atom utf8atom = ATOM(UTF8_STRING);
+                    if (XGetWindowProperty(QX11Info::display(), windowManagerWindow, ATOM(_NET_WM_NAME),
+                                           0, 1024, False, utf8atom, &typeReturned,
+                                           &formatReturned, &nitemsReturned, &unused, &data)
+                        == Success) {
+                        if (typeReturned == utf8atom && formatReturned == 8)
+                            wmName = QString::fromUtf8((const char*)data);
+                        if (data)
+                            XFree(data);
+                        if (wmName == QLatin1String("MCompositor"))
+                            X11->desktopEnvironment = DE_MAEMO6;
+                    }
+                }
+            }
+
         } while(0);
 
         if (data)
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h
index d62d9c3..60bcc51 100644
--- a/src/gui/kernel/qt_x11_p.h
+++ b/src/gui/kernel/qt_x11_p.h
@@ -338,6 +338,7 @@ enum DesktopEnvironment {
     DE_KDE,
     DE_GNOME,
     DE_CDE,
+    DE_MAEMO6,
     DE_4DWM
 };
 
-- 
cgit v0.12


From 7e8495a3d14bb5770fd2bdb81616d19e2e1d94af Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 2 Nov 2010 14:20:00 +0100
Subject: Cleanup Meego Compositor detection

Make the code friendlier and rename the enum value to
DE_MEEGO_COMPOSITOR

Reviewed-by: Robert Griebl
---
 src/gui/kernel/qapplication_x11.cpp | 44 ++++++++++++++-----------------------
 src/gui/kernel/qt_x11_p.h           |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index a9fccb0..7c68170 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -2335,35 +2335,25 @@ void qt_init(QApplicationPrivate *priv, int,
                 break;
             }
 
-            Window windowManagerWindow = XNone;
-            Atom typeReturned;
-            int formatReturned;
-            unsigned long nitemsReturned;
-            unsigned long unused;
-            unsigned char *data = 0;
-            if (XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(),
+            if (XGetWindowProperty(X11->display, QX11Info::appRootWindow(),
                                ATOM(_NET_SUPPORTING_WM_CHECK),
-                               0, 1024, False, XA_WINDOW, &typeReturned,
-                               &formatReturned, &nitemsReturned, &unused, &data)
-                  == Success) {
-                if (typeReturned == XA_WINDOW && formatReturned == 32)
-                    windowManagerWindow = *((Window*) data);
-                if (data)
+                               0, 1024, False, XA_WINDOW, &type,
+                               &format, &length, &after, &data) == Success) {
+                if (type == XA_WINDOW && format == 32) {
+                    Window windowManagerWindow = *((Window*) data);
                     XFree(data);
-
-                if (windowManagerWindow != XNone) {
-                    QString wmName;
-                    Atom utf8atom = ATOM(UTF8_STRING);
-                    if (XGetWindowProperty(QX11Info::display(), windowManagerWindow, ATOM(_NET_WM_NAME),
-                                           0, 1024, False, utf8atom, &typeReturned,
-                                           &formatReturned, &nitemsReturned, &unused, &data)
-                        == Success) {
-                        if (typeReturned == utf8atom && formatReturned == 8)
-                            wmName = QString::fromUtf8((const char*)data);
-                        if (data)
-                            XFree(data);
-                        if (wmName == QLatin1String("MCompositor"))
-                            X11->desktopEnvironment = DE_MAEMO6;
+                    data = 0;
+
+                    if (windowManagerWindow != XNone) {
+                        Atom utf8atom = ATOM(UTF8_STRING);
+                        if (XGetWindowProperty(QX11Info::display(), windowManagerWindow, ATOM(_NET_WM_NAME),
+                                               0, 1024, False, utf8atom, &type,
+                                               &format, &length, &after, &data) == Success) {
+                            if (type == utf8atom && format == 8) {
+                                if (qstrcmp((const char *)data, "MCompositor") == 0)
+                                    X11->desktopEnvironment = DE_MEEGO_COMPOSITOR;
+                            }
+                        }
                     }
                 }
             }
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h
index 60bcc51..56c8094 100644
--- a/src/gui/kernel/qt_x11_p.h
+++ b/src/gui/kernel/qt_x11_p.h
@@ -338,7 +338,7 @@ enum DesktopEnvironment {
     DE_KDE,
     DE_GNOME,
     DE_CDE,
-    DE_MAEMO6,
+    DE_MEEGO_COMPOSITOR,
     DE_4DWM
 };
 
-- 
cgit v0.12


From f7048f6dc67d81ea557c43b61192aef0eafd9d98 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 14:42:23 +0200
Subject: Added environment variable for style overriding. This is needed to
 run all autotests in a specified style by default.

Reviewed By: Harald Fernengel
---
 src/gui/kernel/qapplication.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 6c4004e..a4ae46b 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -1430,10 +1430,18 @@ QStyle *QApplication::style()
         // Compile-time search for default style
         //
         QString style;
-        if (!QApplicationPrivate::styleOverride.isEmpty())
+#ifdef QT_BUILD_INTERNAL
+        QString envStyle = QString::fromLocal8Bit(qgetenv("QT_STYLE_OVERRIDE"));
+#else
+        QString envStyle;
+#endif
+        if (!QApplicationPrivate::styleOverride.isEmpty()) {
             style = QApplicationPrivate::styleOverride;
-        else
+        } else if (!envStyle.isEmpty()) {
+            style = envStyle;
+        } else {
             style = QApplicationPrivate::desktopStyleKey();
+        }
 
         QStyle *&app_style = QApplicationPrivate::app_style;
         app_style = QStyleFactory::create(style);
-- 
cgit v0.12


From 72b5609eb62125dcf9e5c83edb4dc743a255e964 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 14:47:11 +0200
Subject: Added new auto test helper PlatformQuirks.

In Future all autotests should use this class to determine,
whether the platform has the capabilities needed for this test
---
 tests/auto/platformquirks.h | 122 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 tests/auto/platformquirks.h

diff --git a/tests/auto/platformquirks.h b/tests/auto/platformquirks.h
new file mode 100644
index 0000000..cdfe793
--- /dev/null
+++ b/tests/auto/platformquirks.h
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PLATFORMQUIRKS_H
+#define PLATFORMQUIRKS_H
+
+#include <qglobal.h>
+
+#ifdef QT_GUI_LIB
+#include <qapplication.h>
+#endif
+
+#ifdef Q_WS_X11
+#include <private/qt_x11_p.h>
+#endif
+
+struct PlatformQuirks
+{
+    enum MediaFileTypes {
+      mp3,
+      wav,
+      ogg
+    };
+  
+    /* On some platforms, libpng or libjpeg sacrifice precision for speed.
+       Esp. with NEON support, color values after decoding can be off by up
+       to three bytes.
+     */
+    static inline bool isImageLoaderImprecise()
+    {
+#ifdef Q_WS_MAEMO_5
+        return true;
+#endif
+#ifdef Q_WS_X11
+        if (X11->desktopEnvironment == DE_MAEMO6)
+            return true;
+#endif
+        return false;
+    }
+
+    /* Some windowing systems automatically maximize apps on startup (e.g. Maemo)
+       "Normal" fixed-sized windows do not work, the WM ignores their size settings.
+    */
+    static inline bool isAutoMaximizing()
+    {
+#ifdef Q_WS_MAEMO_5
+        return true;
+#endif
+#ifdef Q_WS_X11
+        if (X11->desktopEnvironment == DE_MAEMO6)
+            return true;
+#endif
+        return false;
+    }
+
+    static inline bool haveMouseCursor()
+    {
+#ifdef Q_WS_MAEMO_5
+        return false;
+#endif
+#ifdef Q_WS_X11
+        if (X11->desktopEnvironment == DE_MAEMO6)
+            return false;
+#endif
+        return true;
+    }
+    
+    /* On some systems an ogg codec is not installed by default.
+    The autotests have to know which fileType is the default on the system*/
+    static inline MediaFileTypes defaultMediaFileType()
+    {
+#ifdef Q_WS_MAEMO_5
+        return PlatformQuirks::mp3;
+#endif
+#ifdef Q_WS_X11
+        if (X11->desktopEnvironment == DE_MAEMO6)
+            return PlatformQuirks::mp3;
+#endif
+        return PlatformQuirks::ogg;
+    }
+};
+
+#endif
+
-- 
cgit v0.12


From b375f4c0fd88c92e76c265198e55c7698c07a505 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 2 Nov 2010 14:46:02 +0100
Subject: Small cleanup of platformquirks header

---
 tests/auto/platformquirks.h | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/auto/platformquirks.h b/tests/auto/platformquirks.h
index cdfe793..06d23d7 100644
--- a/tests/auto/platformquirks.h
+++ b/tests/auto/platformquirks.h
@@ -54,12 +54,13 @@
 
 struct PlatformQuirks
 {
-    enum MediaFileTypes {
-      mp3,
-      wav,
-      ogg
+    enum MediaFileTypes
+    {
+        mp3,
+        wav,
+        ogg
     };
-  
+
     /* On some platforms, libpng or libjpeg sacrifice precision for speed.
        Esp. with NEON support, color values after decoding can be off by up
        to three bytes.
@@ -68,12 +69,12 @@ struct PlatformQuirks
     {
 #ifdef Q_WS_MAEMO_5
         return true;
-#endif
-#ifdef Q_WS_X11
-        if (X11->desktopEnvironment == DE_MAEMO6)
-            return true;
-#endif
+#elif defined(Q_WS_X11)
+        // ### this is a very bad assumption, we should really check the version of libjpeg
+        return X11->desktopEnvironment == DE_MEEGO_COMPOSITOR;
+#else
         return false;
+#endif
     }
 
     /* Some windowing systems automatically maximize apps on startup (e.g. Maemo)
@@ -83,26 +84,24 @@ struct PlatformQuirks
     {
 #ifdef Q_WS_MAEMO_5
         return true;
-#endif
-#ifdef Q_WS_X11
-        if (X11->desktopEnvironment == DE_MAEMO6)
-            return true;
-#endif
+#elif defined(Q_WS_X11)
+        return X11->desktopEnvironment == DE_MEEGO_COMPOSITOR;
+#else
         return false;
+#endif
     }
 
     static inline bool haveMouseCursor()
     {
 #ifdef Q_WS_MAEMO_5
         return false;
-#endif
-#ifdef Q_WS_X11
-        if (X11->desktopEnvironment == DE_MAEMO6)
-            return false;
-#endif
+#elif defined(Q_WS_X11)
+        return X11->desktopEnvironment != DE_MEEGO_COMPOSITOR;
+#else
         return true;
+#endif
     }
-    
+
     /* On some systems an ogg codec is not installed by default.
     The autotests have to know which fileType is the default on the system*/
     static inline MediaFileTypes defaultMediaFileType()
@@ -111,7 +110,8 @@ struct PlatformQuirks
         return PlatformQuirks::mp3;
 #endif
 #ifdef Q_WS_X11
-        if (X11->desktopEnvironment == DE_MAEMO6)
+        // ### very bad assumption
+        if (X11->desktopEnvironment == DE_MEEGO_COMPOSITOR)
             return PlatformQuirks::mp3;
 #endif
         return PlatformQuirks::ogg;
-- 
cgit v0.12


From 85467f12bae6d748ba5643f4eb518bd63cd80352 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 2 Nov 2010 14:52:28 +0100
Subject: use PlatformQuirks class for better testing

---
 tests/auto/qimagereader/tst_qimagereader.cpp | 36 ++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index 4b4bdd6..d213e8e 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -55,6 +55,8 @@
 #include <QTcpServer>
 #include <QTimer>
 
+#include "../platformquirks.h"
+
 #if defined(Q_OS_SYMBIAN)
 # define SRCDIR "."
 #endif
@@ -315,23 +317,27 @@ void tst_QImageReader::jpegRgbCmyk()
     QImage image1(prefix + QLatin1String("YCbCr_cmyk.jpg"));
     QImage image2(prefix + QLatin1String("YCbCr_cmyk.png"));
 
-    // first, do some obvious tests
-    QCOMPARE(image1.height(), image2.height());
-    QCOMPARE(image1.width(), image2.width());
-    QCOMPARE(image1.format(), image2.format());
-    QCOMPARE(image1.format(), QImage::Format_RGB32);
-
-    // compare all the pixels with a slack of 3. This ignores rounding errors in libjpeg/libpng
-    for (int h = 0; h < image1.height(); ++h) {
-        const uchar *s1 = image1.constScanLine(h);
-        const uchar *s2 = image2.constScanLine(h);
-        for (int w = 0; w < image1.width() * 4; ++w) {
-            if (*s1 != *s2) {
-                QVERIFY2(qAbs(*s1 - *s2) <= 3, qPrintable(QString("images differ in line %1, col %2 (image1: %3, image2: %4)").arg(h).arg(w).arg(*s1, 0, 16).arg(*s2, 0, 16)));
+    if (PlatformQuirks::isImageLoaderImprecise()) {
+        // first, do some obvious tests
+        QCOMPARE(image1.height(), image2.height());
+        QCOMPARE(image1.width(), image2.width());
+        QCOMPARE(image1.format(), image2.format());
+        QCOMPARE(image1.format(), QImage::Format_RGB32);
+
+        // compare all the pixels with a slack of 3. This ignores rounding errors in libjpeg/libpng
+        for (int h = 0; h < image1.height(); ++h) {
+            const uchar *s1 = image1.constScanLine(h);
+            const uchar *s2 = image2.constScanLine(h);
+            for (int w = 0; w < image1.width() * 4; ++w) {
+                if (*s1 != *s2) {
+                    QVERIFY2(qAbs(*s1 - *s2) <= 3, qPrintable(QString("images differ in line %1, col %2 (image1: %3, image2: %4)").arg(h).arg(w).arg(*s1, 0, 16).arg(*s2, 0, 16)));
+                }
+                s1++;
+                s2++;
             }
-            s1++;
-            s2++;
         }
+    } else {
+        QCOMPARE(image1, image2);
     }
 }
 
-- 
cgit v0.12


From 1b103adc6cb443428c5ca7833cafa6ab9da0fa37 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 15:07:21 +0200
Subject: Fixed QColumnView autotests to use a dummy top level widget.

This is needed for all platforms which are autoMaximizing top level widgets
---
 tests/auto/qcolumnview/tst_qcolumnview.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index 1da8c5d..fbfdf87 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -398,9 +398,10 @@ void tst_QColumnView::scrollTo()
     QFETCH(bool, giveFocus);
     if (reverse)
         qApp->setLayoutDirection(Qt::RightToLeft);
-    ColumnView view;
+    QWidget topLevel;
+    ColumnView view(&topLevel);
     view.resize(200, 200);
-    view.show();
+    topLevel.show();
     view.scrollTo(QModelIndex(), QAbstractItemView::EnsureVisible);
     QCOMPARE(view.HorizontalOffset(), 0);
 
@@ -718,13 +719,14 @@ void tst_QColumnView::moveGrip()
     QFETCH(bool, reverse);
     if (reverse)
         qApp->setLayoutDirection(Qt::RightToLeft);
-    ColumnView view;
+    QWidget topLevel;
+    ColumnView view(&topLevel);
     TreeModel model;
     view.setModel(&model);
     QModelIndex home = model.thirdLevel();
     view.setCurrentIndex(home);
     view.resize(640, 200);
-    view.show();
+    topLevel.show();
     QTest::qWait(ANIMATION_DELAY);
 
     int columnNum = view.createdColumns.count() - 2;
@@ -741,9 +743,9 @@ void tst_QColumnView::moveGrip()
 
     QAbstractItemView *column = qobject_cast<QAbstractItemView *>(grip->parent());
     int oldX = column->width();
-    QCOMPARE(view.columnWidths()[columnNum], oldX);
+    QCOMPARE(view.columnWidths().value(columnNum), oldX);
     grip->moveGrip(10);
-    QCOMPARE(view.columnWidths()[columnNum], (oldX + (reverse ? -10 : 10)));
+    QCOMPARE(view.columnWidths().value(columnNum), (oldX + (reverse ? -10 : 10)));
 }
 
 void tst_QColumnView::doubleClick()
@@ -889,12 +891,13 @@ void tst_QColumnView::rowDelegate()
 
 void tst_QColumnView::resize()
 {
-    ColumnView view;
+    QWidget topLevel;
+    ColumnView view(&topLevel);
     QDirModel model;
     view.setModel(&model);
     view.resize(200, 200);
 
-    view.show();
+    topLevel.show();
     QModelIndex home = model.index(QDir::homePath()).parent();
     view.setCurrentIndex(home);
     QTest::qWait(ANIMATION_DELAY);
-- 
cgit v0.12


From 185cf9f10500dc26a5fda44ca38ebeb470218cf3 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 16:30:52 +0200
Subject: Fixed QWaitCondition autotest to use only 2 threads when running on
 linux and arm

---
 tests/auto/qwaitcondition/tst_qwaitcondition.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
index 5391591..ffc4730 100644
--- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
@@ -76,7 +76,7 @@ private slots:
 static const int iterations = 10;
 
 // Note: some tests rely on ThreadCount being multiple of 2
-#ifdef Q_OS_SOLARIS
+#if defined(Q_OS_SOLARIS) || ( defined(Q_OS_LINUX) && defined(QT_ARCH_ARMV6) )
 static const int ThreadCount = 4;
 #else
 static const int ThreadCount = 10;
-- 
cgit v0.12


From affe4a42dea9c72bf220e7e57d427a79b6fd099f Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 16:37:07 +0200
Subject: Fixed QTreeWidget autotest, to use a top level dummy widget

---
 tests/auto/qtreewidget/tst_qtreewidget.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp
index 1e37384..77d353d 100644
--- a/tests/auto/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp
@@ -3098,8 +3098,9 @@ void tst_QTreeWidget::task253109_itemHeight()
 
 void tst_QTreeWidget::task206367_duplication()
 {
-    QTreeWidget treeWidget;
-    treeWidget.show();
+    QWidget topLevel;
+    QTreeWidget treeWidget(&topLevel);
+    topLevel.show();
     treeWidget.resize(200, 200);
 
     treeWidget.setSortingEnabled(true);
-- 
cgit v0.12


From 978c1c612aacde31cc294f5ba2ad1af6feeae61c Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 16:43:17 +0200
Subject: Fixed QTextEdit autotest, to use top level dummy widgets

---
 tests/auto/qtextedit/tst_qtextedit.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 101baa5..878579b 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -2111,6 +2111,7 @@ void tst_QTextEdit::setDocumentPreservesPalette()
     QPalette whitePal = ed->palette();
     whitePal.setColor(QPalette::Active, QPalette::Text, "white");
 
+
     QVERIFY(whitePal != ed->palette());
     ed->setPalette(whitePal);
     QVERIFY(whitePal.color(QPalette::Active, QPalette::Text)
@@ -2155,7 +2156,8 @@ void tst_QTextEdit::pasteFromQt3RichText()
 
 void tst_QTextEdit::noWrapBackgrounds()
 {
-    QTextEdit edit;
+    QWidget topLevel;
+    QTextEdit edit(&topLevel);
     edit.setLineWrapMode(QTextEdit::NoWrap);
 
     QTextFrame *root = edit.document()->rootFrame();
@@ -2169,6 +2171,7 @@ void tst_QTextEdit::noWrapBackgrounds()
     edit.textCursor().setBlockFormat(format);
     edit.insertPlainText(QLatin1String(" \n  \n   \n    \n"));
     edit.setFixedSize(100, 200);
+    topLevel.show();
 
     QImage img = QPixmap::grabWidget(edit.viewport()).toImage();
     QCOMPARE(img, img.mirrored(true, false));
-- 
cgit v0.12


From de9a3a8c71079e89173bea8029bbb4d0f3876bd5 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 22 Jul 2010 16:48:19 +0200
Subject: Fixed QTableView autotest to use a dummy toplevel widget.

- Fixed some timing problems
- Fixed mouseClick center
---
 tests/auto/qtableview/tst_qtableview.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 3e5d077..6c920c9 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -2591,9 +2591,10 @@ void tst_QTableView::scrollTo()
     QFETCH(int, expectedVerticalScroll);
 
     QtTestTableModel model(rowCount, columnCount);
-    QtTestTableView view;
+    QWidget toplevel;
+    QtTestTableView view(&toplevel);
 
-    view.show();
+    toplevel.show();
     // resizing to this size will ensure that there can ONLY_BE_ONE_CELL inside the view.
     QSize forcedSize(columnWidth * 2, rowHeight * 2);
     view.resize(forcedSize);
@@ -2748,10 +2749,11 @@ void tst_QTableView::indexAt()
     QFETCH(int, expectedColumn);
 
     QtTestTableModel model(rowCount, columnCount);
-    QtTestTableView view;
+    QWidget toplevel;
+    QtTestTableView view(&toplevel);
 
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    toplevel.show();
+    QTest::qWaitForWindowShown(&toplevel);
 
     //some styles change the scroll mode in their polish
     view.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem);
@@ -3657,20 +3659,23 @@ void tst_QTableView::mouseWheel()
 #ifdef Q_OS_WINCE
     QSKIP("Since different Windows CE versions sport different taskbars, we skip this test", SkipAll);
 #endif
+
     QFETCH(int, scrollMode);
     QFETCH(int, delta);
     QFETCH(int, horizontalPositon);
     QFETCH(int, verticalPosition);
 
     QtTestTableModel model(100, 100);
-    QtTestTableView view;
+    QWidget topLevel;
+    QtTestTableView view(&topLevel);
     view.resize(500, 500);
     for (int r = 0; r < 100; ++r)
         view.setRowHeight(r, 50);
     for (int c = 0; c < 100; ++c)
         view.setColumnWidth(c, 100);
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    topLevel.show();
+
+    QTest::qWaitForWindowShown(&topLevel);
 
     view.setModel(&model);
 
@@ -3772,7 +3777,7 @@ void tst_QTableView::task191545_dragSelectRows()
         QRect cellRect = table.visualRect(model.index(3, 0));
         QHeaderView *vHeader = table.verticalHeader();
         QWidget *vHeaderVp = vHeader->viewport();
-        QPoint rowPos(5, (cellRect.top() + cellRect.bottom()) / 2);
+        QPoint rowPos(cellRect.center());
         QMouseEvent rowPressEvent(QEvent::MouseButtonPress, rowPos, Qt::LeftButton, Qt::NoButton, Qt::ControlModifier);
         qApp->sendEvent(vHeaderVp, &rowPressEvent);
 
@@ -3851,6 +3856,7 @@ void tst_QTableView::task191545_dragSelectRows()
         QMouseEvent cellReleaseEvent(QEvent::MouseButtonRelease, cellPos, Qt::LeftButton, Qt::NoButton, Qt::ControlModifier);
         qApp->sendEvent(tableVp, &cellReleaseEvent);
 
+        QTest::qWait(200);
         for (int i = 0; i < 6; ++i)
             for (int j = 0; j < 6; ++j) {
                 QModelIndex index = model.index(3 + i, 3 + j, table.rootIndex());
-- 
cgit v0.12


From b10d49dde4e793f380401900fddfc939d5ff20ba Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 08:41:08 +0200
Subject: Fixed QSplitter autotest to use a dummy toplevel widget.

---
 tests/auto/qsplitter/tst_qsplitter.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp
index e7b5dc7..7cb2b65 100644
--- a/tests/auto/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/qsplitter/tst_qsplitter.cpp
@@ -1230,7 +1230,8 @@ void tst_QSplitter::testShowHide()
 
     QSplitter *split = new QSplitter(Qt::Horizontal);
 
-    QWidget widget;
+    QWidget topLevel;
+    QWidget widget(&topLevel);
     widget.resize(400 + split->handleWidth(), 200);
     QVBoxLayout *lay=new QVBoxLayout(&widget);
     lay->setMargin(0);
@@ -1240,7 +1241,7 @@ void tst_QSplitter::testShowHide()
     split->setSizes(QList<int>() << 200 << 200);
     lay->addWidget(split);
     widget.setLayout(lay);
-    widget.show();
+    topLevel.show();
 
     QTest::qWait(100);
 
@@ -1378,8 +1379,9 @@ class MyTextEdit : public QTextEdit
 
 void tst_QSplitter::task169702_sizes()
 {
+    QWidget topLevel;
     // Create two nested (non-collapsible) splitters
-    QSplitter* outerSplitter = new QSplitter(Qt::Vertical);
+    QSplitter* outerSplitter = new QSplitter(Qt::Vertical, &topLevel);
     outerSplitter->setChildrenCollapsible(false);
     QSplitter* splitter = new QSplitter(Qt::Horizontal, outerSplitter);
     splitter->setChildrenCollapsible(false);
@@ -1396,12 +1398,12 @@ void tst_QSplitter::task169702_sizes()
     splitter->addWidget(new QTextEdit("Bar"));
 
     outerSplitter->setGeometry(100, 100, 500, 500);
-    outerSplitter->show();
+    topLevel.show();
 
     QTest::qWait(100);
     testW->m_iFactor++;
     testW->updateGeometry();
-    QTest::qWait(100);
+    QTest::qWait(500);//100 is too fast for Maemo
 
     //Make sure the minimimSizeHint is respected
     QCOMPARE(testW->size().height(), testW->minimumSizeHint().height());
-- 
cgit v0.12


From 5034f1774413c78e1d99f4c5e18a6ff8acd8915f Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 08:59:28 +0200
Subject: Fixed QPrinter autotest, to use qreals for the margintest

---
 tests/auto/qprinter/tst_qprinter.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index e908961..fb9f8f0 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -596,12 +596,12 @@ void tst_QPrinter::testPageMargins_data()
     QTest::addColumn<qreal>("bottom");
     QTest::addColumn<int>("unit");
 
-    QTest::newRow("data0") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Millimeter);
-    QTest::newRow("data1") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Point);
-    QTest::newRow("data2") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Inch);
-    QTest::newRow("data3") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Pica);
-    QTest::newRow("data4") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Didot);
-    QTest::newRow("data5") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Cicero);
+    QTest::newRow("data0") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Millimeter);
+    QTest::newRow("data1") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Point);
+    QTest::newRow("data2") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Inch);
+    QTest::newRow("data3") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Pica);
+    QTest::newRow("data4") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Didot);
+    QTest::newRow("data5") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Cicero);
 }
 
 void tst_QPrinter::testPageMargins()
-- 
cgit v0.12


From 8a74d2041e24a17e70e1a00d0cc3794250a13fed Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 09:01:27 +0200
Subject: Fixed QPlainTextEdit autotest to use the right size in the linewrap
 testcase.

The framewith has to be also added to the minimum with, otherwise the test will
fail when the current style has a bigger border.
---
 tests/auto/qplaintextedit/tst_qplaintextedit.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
index a6dd8be..99d11cc 100644
--- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
@@ -880,6 +880,7 @@ void tst_QPlainTextEdit::lineWrapModes()
     // We thus need to make it wide enough to show something visible.
     int minimumWidth = 2 * ed->document()->documentMargin();
     minimumWidth += ed->fontMetrics().width(QLatin1Char('a'));
+    minimumWidth += ed->frameWidth();
     ed->resize(minimumWidth, 1000);
     QCOMPARE(lineCount(), 26);
     ed->setParent(0);
-- 
cgit v0.12


From 46115a0b8d3de85170a2600b5abb81458dc263bf Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 09:05:31 +0200
Subject: Fixed the QMouseEvent_modal autotest.

Added some waits, needed on slower platforms, like maemo
---
 tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp
index 99a8913..694d65d 100644
--- a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp
+++ b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp
@@ -147,12 +147,14 @@ void tst_qmouseevent_modal::mousePressRelease()
     QVERIFY( w->d->count() == 0 );
 
     QTest::mousePress( w->pb, Qt::LeftButton );
+    QTest::qWait(200);
 
     QVERIFY( !w->d->isVisible() );
     QVERIFY( w->d->count() == 1 );
     QVERIFY( !w->pb->isDown() );
 
     QTest::mousePress( w->pb, Qt::LeftButton );
+    QTest::qWait(200);
 
     QVERIFY( !w->d->isVisible() );
     QVERIFY( w->d->count() == 2 );
@@ -161,12 +163,14 @@ void tst_qmouseevent_modal::mousePressRelease()
     // With the current QWS mouse handling, the 3rd press would fail...
 
     QTest::mousePress( w->pb, Qt::LeftButton );
+    QTest::qWait(200);
 
     QVERIFY( !w->d->isVisible() );
     QVERIFY( w->d->count() == 3 );
     QVERIFY( !w->pb->isDown() );
 
     QTest::mousePress( w->pb, Qt::LeftButton );
+    QTest::qWait(200);
 
     QVERIFY( !w->d->isVisible() );
     QVERIFY( w->d->count() == 4 );
-- 
cgit v0.12


From 8b68c73d1fe916fafa1e0aa0c59ba3131ebd77cc Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 09:21:38 +0200
Subject: Fixed QMainWindow autotests, to skip an test, that makes no sense on
 maemo

---
 tests/auto/qmainwindow/tst_qmainwindow.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp
index c82c566..e3122c4 100644
--- a/tests/auto/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp
@@ -55,6 +55,7 @@
 #include <qtextedit.h>
 #include <private/qmainwindowlayout_p.h>
 #include <private/qdockarealayout_p.h>
+#include "../platformquirks.h"
 
 //TESTED_FILES=
 
@@ -1679,6 +1680,9 @@ void tst_QMainWindow::addToolbarAfterShow()
 
 void tst_QMainWindow::centralWidgetSize()
 {
+    if(PlatformQuirks::isAutoMaximizing())
+        QSKIP("The platform is auto maximizing, so the test makes no sense", SkipAll);;
+
     QMainWindow mainWindow;
     mainWindow.menuBar()->addMenu("menu");
 
-- 
cgit v0.12


From 4280dd6bf4831379eea17e145df1fabc6a9fb901 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 09:29:12 +0200
Subject: Fixed QLayout autotest to use a dummy toplevel widget.

---
 tests/auto/qlayout/tst_qlayout.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp
index c6fe3f0..a974a42 100644
--- a/tests/auto/qlayout/tst_qlayout.cpp
+++ b/tests/auto/qlayout/tst_qlayout.cpp
@@ -133,12 +133,13 @@ void tst_QLayout::geometry()
     // For QWindowsStyle we know that QWidgetItem::geometry() and QWidget::geometry()
     // should be the same.
     QApplication::setStyle(new QWindowsStyle);
-    QWidget w;
+    QWidget topLevel;
+    QWidget w(&topLevel);
     QVBoxLayout layout(&w);
     SizeHinterFrame widget(QSize(100,100));
     layout.addWidget(&widget);
     QLayoutItem *item = layout.itemAt(0);
-    w.show();
+    topLevel.show();
     QApplication::processEvents();
     QCOMPARE(item->geometry().size(), QSize(100,100));
 
-- 
cgit v0.12


From b5e984e2d220596dcc3770969c942bbcf6fdc9a5 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 09:32:08 +0200
Subject: Fixed QInputDialog autotest, to compare with the separator defined by
 the current locale

---
 tests/auto/qinputdialog/tst_qinputdialog.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/qinputdialog/tst_qinputdialog.cpp
index 5d03142..580c644 100644
--- a/tests/auto/qinputdialog/tst_qinputdialog.cpp
+++ b/tests/auto/qinputdialog/tst_qinputdialog.cpp
@@ -147,9 +147,10 @@ void testInvalidateAndRestore(
     QVERIFY(sbox->hasAcceptableInput());
     QVERIFY(okButton->isEnabled());
     QCOMPARE(sbox->value(), lastValidValue);
+    QLocale loc;
     QCOMPARE(
         normalizeNumericString(ledit->text()),
-        normalizeNumericString(QString("%1").arg(sbox->value())));
+        normalizeNumericString(loc.toString(sbox->value())));
 }
 
 template <typename SpinBoxType, typename ValueType>
@@ -169,9 +170,10 @@ void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0)
     QVERIFY(sbox->value() >= sbox->minimum());
     QVERIFY(sbox->value() <= sbox->maximum());
     QVERIFY(sbox->hasAcceptableInput());
+    QLocale loc;
     QCOMPARE(
         normalizeNumericString(ledit->selectedText()),
-        normalizeNumericString(QString("%1").arg(sbox->value())));
+        normalizeNumericString(loc.toString(sbox->value())));
     QVERIFY(okButton->isEnabled());
 
     const ValueType origValue = sbox->value();
@@ -185,7 +187,7 @@ void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0)
     testTypingValue<SpinBoxType>(sbox, okButton, "0.0");
     testTypingValue<SpinBoxType>(sbox, okButton, "foobar");
 
-    testTypingValue<SpinBoxType>(sbox, okButton, QString("%1").arg(origValue));
+    testTypingValue<SpinBoxType>(sbox, okButton, loc.toString(origValue));
 }
 
 void testGetText(QInputDialog *dialog)
-- 
cgit v0.12


From cb98eee3069549023973b422c5e32929d3a65c6d Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 09:38:05 +0200
Subject: Fixe QHeaderView autotest to use a dummy toplevel widget.

---
 tests/auto/qheaderview/tst_qheaderview.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp
index da0a0bb..5252ec6 100644
--- a/tests/auto/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/qheaderview/tst_qheaderview.cpp
@@ -196,6 +196,7 @@ private slots:
     void QTBUG12268_hiddenMovedSectionSorting();
 
 protected:
+    QWidget *topLevel;
     QHeaderView *view;
     QStandardItemModel *model;
 };
@@ -345,7 +346,8 @@ void tst_QHeaderView::cleanupTestCase()
 
 void tst_QHeaderView::init()
 {
-    view = new QHeaderView(Qt::Vertical);
+    topLevel = new QWidget();
+    view = new QHeaderView(Qt::Vertical,topLevel);
     // Some initial value tests before a model is added
     QCOMPARE(view->length(), 0);
     QVERIFY(view->sizeHint() == QSize(0,0));
@@ -373,7 +375,8 @@ void tst_QHeaderView::init()
     QSignalSpy spy(view, SIGNAL(sectionCountChanged(int, int)));
     view->setModel(model);
     QCOMPARE(spy.count(), 1);
-    view->show();
+    view->resize(200,200);
+    topLevel->show();
 }
 
 void tst_QHeaderView::cleanup()
@@ -508,7 +511,7 @@ void tst_QHeaderView::stretch()
     view->resize(viewSize);
     view->setStretchLastSection(true);
     QCOMPARE(view->stretchLastSection(), true);
-    view->show();
+    topLevel->show();
     QCOMPARE(view->width(), viewSize.width());
     QCOMPARE(view->visualIndexAt(view->viewport()->height() - 5), 3);
 
@@ -674,7 +677,7 @@ void tst_QHeaderView::visualIndexAt()
     QFETCH(QList<int>, visual);
 
     view->setStretchLastSection(true);
-    view->show();
+    topLevel->show();
 
     for (int i = 0; i < hidden.count(); ++i)
         view->setSectionHidden(hidden.at(i), true);
@@ -682,6 +685,8 @@ void tst_QHeaderView::visualIndexAt()
     for (int j = 0; j < from.count(); ++j)
         view->moveSection(from.at(j), to.at(j));
 
+    QTest::qWait(100);
+
     for (int k = 0; k < coordinate.count(); ++k)
         QCOMPARE(view->visualIndexAt(coordinate.at(k)), visual.at(k));
 }
@@ -696,7 +701,7 @@ void tst_QHeaderView::length()
     view->setFont(font);
 #endif
     view->setStretchLastSection(true);
-    view->show();
+    topLevel->show();
 
     //minimumSectionSize should be the size of the last section of the widget is not tall enough
     int length = view->minimumSectionSize();
@@ -708,7 +713,7 @@ void tst_QHeaderView::length()
     QCOMPARE(length, view->length());
 
     view->setStretchLastSection(false);
-    view->show();
+    topLevel->show();
 
     QVERIFY(length != view->length());
 
@@ -759,7 +764,7 @@ void tst_QHeaderView::logicalIndexAt()
     QCOMPARE(view->logicalIndexAt(0), 0);
     QCOMPARE(view->logicalIndexAt(1), 0);
 
-    view->show();
+    topLevel->show();
     view->setStretchLastSection(true);
     // First item
     QCOMPARE(view->logicalIndexAt(0), 0);
@@ -1062,7 +1067,7 @@ void  tst_QHeaderView::resizeWithResizeModes()
         view->resizeSection(i, sections.at(i));
         view->setResizeMode(i, (QHeaderView::ResizeMode)modes.at(i));
     }
-    view->show();
+    topLevel->show();
     view->resize(size, size);
     for (int j = 0; j < expected.count(); ++j)
         QCOMPARE(view->sectionSize(j), expected.at(j));
@@ -1160,7 +1165,7 @@ void tst_QHeaderView::resizeSection()
 
     view->resize(400, 400);
 
-    view->show();
+    topLevel->show();
     view->setMovable(true);
     view->setStretchLastSection(false);
 
@@ -2035,14 +2040,14 @@ void tst_QHeaderView::QTBUG7833_sectionClicked()
 
 
     QTest::mouseClick(tv.horizontalHeader()->viewport(), Qt::LeftButton, Qt::NoModifier,
-                      QPoint(tv.horizontalHeader()->sectionViewportPosition(11) + 5, 5));
+                      QPoint(tv.horizontalHeader()->sectionViewportPosition(11) + tv.horizontalHeader()->sectionSize(11)/2, 5));
     QCOMPARE(clickedSpy.count(), 1);
     QCOMPARE(pressedSpy.count(), 1);
     QCOMPARE(clickedSpy.at(0).at(0).toInt(), 11);
     QCOMPARE(pressedSpy.at(0).at(0).toInt(), 11);
 
     QTest::mouseClick(tv.horizontalHeader()->viewport(), Qt::LeftButton, Qt::NoModifier,
-                      QPoint(tv.horizontalHeader()->sectionViewportPosition(8) + 5, 5));
+                      QPoint(tv.horizontalHeader()->sectionViewportPosition(8) + tv.horizontalHeader()->sectionSize(0)/2, 5));
 
     QCOMPARE(clickedSpy.count(), 2);
     QCOMPARE(pressedSpy.count(), 2);
@@ -2050,7 +2055,7 @@ void tst_QHeaderView::QTBUG7833_sectionClicked()
     QCOMPARE(pressedSpy.at(1).at(0).toInt(), 8);
 
     QTest::mouseClick(tv.horizontalHeader()->viewport(), Qt::LeftButton, Qt::NoModifier,
-                      QPoint(tv.horizontalHeader()->sectionViewportPosition(0) + 5, 5));
+                      QPoint(tv.horizontalHeader()->sectionViewportPosition(0) + tv.horizontalHeader()->sectionSize(0)/2, 5));
 
     QCOMPARE(clickedSpy.count(), 3);
     QCOMPARE(pressedSpy.count(), 3);
-- 
cgit v0.12


From 410d46b1cd4da7efc87a9d7cac47f509e1658f03 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 10:04:09 +0200
Subject: Fixed QGripLayout autotest to use a dummy toplevel widget.

---
 tests/auto/qgridlayout/tst_qgridlayout.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp
index e0924de..ed6d635 100644
--- a/tests/auto/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp
@@ -52,6 +52,7 @@
 #include <QStyleFactory>
 
 #include "../../shared/util.h"
+#include "../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=gui/kernel/qlayout.cpp gui/kernel/qlayout.h
@@ -678,6 +679,8 @@ void tst_QGridLayout::spacingsAndMargins()
 
     QApplication::setStyle(new Qt42Style);
     QWidget toplevel;
+    if(PlatformQuirks::isAutoMaximizing())
+        toplevel.setWindowFlags(Qt::X11BypassWindowManagerHint);
     QVBoxLayout vbox(&toplevel);
     QGridLayout grid1;
     vbox.addLayout(&grid1);
@@ -713,11 +716,12 @@ void tst_QGridLayout::spacingsAndMargins()
     toplevel.show();
     toplevel.adjustSize();
     QApplication::processEvents();
+    QTest::qWaitForWindowShown(&toplevel);
 
     QSize topsize = toplevel.size();
     QSize minimumsize = vbox.totalMinimumSize();
 
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS)
     if (topsize.width() < minimumsize.width() || topsize.height() < minimumsize.height())
         QSKIP("The screen is too small to run this test case", SkipSingle);
 #endif
@@ -1463,15 +1467,18 @@ void tst_QGridLayout::layoutSpacingImplementation()
     QFETCH(int, vSpacing);
     QFETCH(bool, customSubElementRect);
 
+    QWidget toplevel;
+
     CustomLayoutStyle *style = new CustomLayoutStyle();
     style->hspacing = hSpacing;
     style->vspacing = vSpacing;
     style->reimplementSubelementRect = customSubElementRect;
     QApplication::setStyle(style);
+    widget->setParent(&toplevel);
     widget->resize(widget->sizeHint());
-    widget->show();
-#if defined(Q_WS_X11)
-    qt_x11_wait_for_window_manager(widget);     // wait for the show
+    toplevel.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&toplevel);     // wait for the show
 #endif
 
     QLayout *layout = widget->layout();
@@ -1482,8 +1489,6 @@ void tst_QGridLayout::layoutSpacingImplementation()
         //qDebug()  << item->widget()->pos();
         QCOMPARE(item->widget()->pos(), expectedpositions.at(pi));
     }
-    delete widget;
-
 }
 
 void tst_QGridLayout::spacing()
-- 
cgit v0.12


From f7fe120e5cad8329f4b4a9bf9bc7fee0d5fbaf9a Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 10:27:19 +0200
Subject: Fixed QEventLoop autotest. Add a restriction in exec().

Only execute when NO_EVENTLOOP_EXCEPTIONS is not set
---
 tests/auto/qeventloop/tst_qeventloop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp
index 8c2ffd9..8331a5f 100644
--- a/tests/auto/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/qeventloop/tst_qeventloop.cpp
@@ -431,7 +431,7 @@ void tst_QEventLoop::exec()
         QCOMPARE(executor.returnCode, -1);
     }
 
-#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM) && !defined(Q_OS_SYMBIAN)
+#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM) && !defined(Q_OS_SYMBIAN) && !defined(NO_EVENTLOOP_EXCEPTIONS)
     // Windows Mobile cannot handle cross library exceptions
     // qobject.cpp will try to rethrow the exception after handling
     // which causes gwes.exe to crash
-- 
cgit v0.12


From af082b6b515d45f905aab29e1b685e91bc6f50cf Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 10:49:32 +0200
Subject: Fixed QCalendarWidget autotest to use a dummy toplevel widget.

Fixed the MousePress to the right position
---
 tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
index 042d8e0..01473d8 100644
--- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -82,7 +82,8 @@ private slots:
 // Testing get/set functions
 void tst_QCalendarWidget::getSetCheck()
 {
-    QCalendarWidget object;
+    QWidget topLevel;
+    QCalendarWidget object(&topLevel);
 
     //horizontal header formats
     object.setHorizontalHeaderFormat(QCalendarWidget::NoHorizontalHeader);
@@ -191,7 +192,7 @@ void tst_QCalendarWidget::buttonClickCheck()
     QCOMPARE(month, object.monthShown());
 
     button = qFindChild<QToolButton *>(&object, "qt_calendar_yearbutton");
-    QTest::mouseClick(button, Qt::LeftButton);
+    QTest::mouseClick(button, Qt::LeftButton, Qt::NoModifier, button->rect().center(), 2);
     QVERIFY(!button->isVisible());
     QSpinBox *spinbox = qFindChild<QSpinBox *>(&object, "qt_calendar_yearedit");
     QTest::qWait(500);
-- 
cgit v0.12


From 08864c3ec88abf5fdb782ffe972e2576fc703e8c Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 10:51:20 +0200
Subject: Fixed QBoxLayout autotest to use a dummy toplevel widget

---
 tests/auto/qboxlayout/tst_qboxlayout.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp
index c4acfdc..659f8a5 100644
--- a/tests/auto/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp
@@ -198,7 +198,8 @@ void tst_QBoxLayout::sizeConstraints()
 
 void tst_QBoxLayout::setGeometry()
 {
-    QWidget w;
+    QWidget toplevel;
+    QWidget w(&toplevel);
     QVBoxLayout *lay = new QVBoxLayout;
     lay->setMargin(0);
     lay->setSpacing(0);
@@ -209,7 +210,7 @@ void tst_QBoxLayout::setGeometry()
     lay2->setAlignment(Qt::AlignRight);
     lay->addLayout(lay2);
     w.setLayout(lay);
-    w.show();
+    toplevel.show();
 
     QRect newGeom(0, 0, 70, 70);
     lay2->setGeometry(newGeom);
-- 
cgit v0.12


From d16b01310af4f9f1ec8b82eb883863745a7c9204 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 10:53:47 +0200
Subject: Fixed QAbstractSlider autotest to use a dummy toplevel widget

---
 tests/auto/qabstractslider/tst_qabstractslider.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp
index cf069db..cd41d05 100644
--- a/tests/auto/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp
@@ -55,6 +55,8 @@
 class Slider : public QAbstractSlider
 {
     public:
+        Slider(QWidget *parent)
+            : QAbstractSlider(parent) {}
         using QAbstractSlider::setRepeatAction;
         using QAbstractSlider::repeatAction;
 };
@@ -95,6 +97,7 @@ private slots:
 private:
     void waitUntilTimeElapsed(const QTime& t, int ms);
 
+    QWidget *topLevel;
     Slider *slider;
     int previousAction;
     int reportedMinimum;
@@ -113,7 +116,8 @@ Q_DECLARE_METATYPE(QPoint)
 
 void tst_QAbstractSlider::initTestCase()
 {
-    slider = new Slider;
+    topLevel = new QWidget;
+    slider = new Slider(topLevel);
     slider->setObjectName("testWidget");
     slider->resize(100,100);
     slider->show();
@@ -129,7 +133,7 @@ void tst_QAbstractSlider::initTestCase()
 
 void tst_QAbstractSlider::cleanupTestCase()
 {
-    delete slider;
+    delete topLevel;
 }
 
 void tst_QAbstractSlider::actionTriggered(int action)
@@ -735,7 +739,6 @@ void tst_QAbstractSlider::wheelEvent_data()
                                    << 100                                // expected position after
 #endif
                                    << QPoint(1,1);
-
     QTest::newRow("Different orientation") << 0                             // initial position
                                         << 0                             // minimum
                                         << 100                           // maximum
@@ -774,7 +777,6 @@ void tst_QAbstractSlider::wheelEvent_data()
 #endif
                                         << QPoint(0,0);
 
-
     QTest::newRow("Inverted controls")     << 50                            // initial position
                                         << 0                             // minimum
                                         << 100                           // maximum
@@ -924,6 +926,7 @@ void tst_QAbstractSlider::sliderPressedReleased()
     QFETCH(uint, subControl);
     QFETCH(int, expectedCount);
 
+    QWidget topLevel;
     QAbstractSlider *slider;
     switch (control) {
     default:
@@ -931,11 +934,11 @@ void tst_QAbstractSlider::sliderPressedReleased()
         return;
         break;
     case QStyle::CC_Slider:
-        slider = new QSlider;
+        slider = new QSlider(&topLevel);
         slider->setLayoutDirection(Qt::LeftToRight);   // Makes "upside down" much easier to compute
         break;
     case QStyle::CC_ScrollBar:
-        slider = new QScrollBar;
+        slider = new QScrollBar(&topLevel);
         break;
     }
 
@@ -949,7 +952,7 @@ void tst_QAbstractSlider::sliderPressedReleased()
     QSignalSpy spy2(slider, SIGNAL(sliderReleased()));
 
     // Mac Style requires the control to be active to get the correct values...
-    slider->show();
+    topLevel.show();
     slider->activateWindow();
 
     QStyleOptionSlider option;
-- 
cgit v0.12


From 162ff4f01c5700da270f80f3e0decae11f42f6df Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 23 Jul 2010 10:54:38 +0200
Subject: Fixed QAbstractScrollArea autotest to use a dummy toplevel widget

---
 tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
index da83826..d6c4b53 100644
--- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
@@ -353,12 +353,13 @@ void tst_QAbstractScrollArea::task214488_layoutDirection()
 
 void tst_QAbstractScrollArea::patternBackground()
 {
-    QScrollArea scrollArea;
+    QWidget topLevel;
+    QScrollArea scrollArea(&topLevel);
     scrollArea.resize(200, 200);
     QWidget widget;
     widget.resize(600, 600);
     scrollArea.setWidget(&widget);
-    scrollArea.show();
+    topLevel.show();
 
     QLinearGradient linearGrad(QPointF(250, 250), QPointF(300, 300));
     linearGrad.setColorAt(0, Qt::yellow);
-- 
cgit v0.12


From 65bad8e2c8894f23f47ff2b7418bcd1fc71d4602 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 4 Mar 2010 15:34:22 +0100
Subject: Fixed QFileInfo autotest to skip on NFS.

Exported the isLikelyToBeNfs() function to skip the fileInfo Test on NFS.
Otherwise the Test will fail, because the FileSystemTimes are not synchronized.
---
 src/corelib/io/qsettings.cpp           | 8 ++++----
 tests/auto/qfileinfo/tst_qfileinfo.cpp | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 8ee42e7..e5d182e 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -134,7 +134,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 # include <sys/mount.h>
 QT_END_INCLUDE_NAMESPACE
 
-static bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle)
 {
     struct statfs buf;
     if (fstatfs(handle, &buf) != 0)
@@ -160,7 +160,7 @@ QT_END_INCLUDE_NAMESPACE
 #  define AUTOFSNG_SUPER_MAGIC  0x7d92b1a0
 # endif
 
-static bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle)
 {
     struct statfs buf;
     if (fstatfs(handle, &buf) != 0)
@@ -177,7 +177,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 # include <sys/statvfs.h>
 QT_END_INCLUDE_NAMESPACE
 
-static bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle)
 {
     struct statvfs buf;
     if (fstatvfs(handle, &buf) != 0)
@@ -189,7 +189,7 @@ static bool isLikelyToBeNfs(int handle)
 #endif
 }
 #else
-static inline bool isLikelyToBeNfs(int /* handle */)
+Q_AUTOTEST_EXPORT inline bool isLikelyToBeNfs(int /* handle */)
 {
     return true;
 }
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 208110a..0306bb6 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -70,6 +70,8 @@
 # define SRCDIR ""
 #endif
 
+extern bool isLikelyToBeNfs(int /* handle */);
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -939,6 +941,8 @@ void tst_QFileInfo::fileTimes()
         QEXPECT_FAIL("longfile absolutepath", "Maximum total filepath cannot exceed 256 characters in Symbian", Abort);
 #endif
         QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
+        if(isLikelyToBeNfs(file.handle()))
+            QSKIP("This Test doesn't work on NFS", SkipAll);
         QTextStream ts(&file);
         ts << fileName << endl;
     }
-- 
cgit v0.12


From efc4e9c3602d569a8437db52c09edd7fb6a6dc34 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Mon, 26 Jul 2010 15:45:54 +0200
Subject: Fixed QXmlQuery autotest to pass when qreal != double

---
 tests/auto/qxmlquery/tst_qxmlquery.cpp | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 2187aeb..e6c40b8 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -1197,9 +1197,15 @@ void tst_QXmlQuery::basicXQueryToQtTypeCheck() const
     expectedValues.append(QVariant()); /* xs:dayTimeDuration */
     expectedValues.append(QVariant()); /* xs:yearMonthDuration */
 
-    expectedValues.append(QVariant(double(3e3)));     /* xs:float */
-    expectedValues.append(QVariant(double(4e4)));     /* xs:double */
-    expectedValues.append(QVariant(double(2)));       /* xs:decimal */
+    if(sizeof(qreal) == sizeof(float)) {//ARM casts to Float not to double
+        expectedValues.append(QVariant(float(3e3)));     /* xs:float */
+        expectedValues.append(QVariant(float(4e4)));     /* xs:double */
+        expectedValues.append(QVariant(float(2)));       /* xs:decimal */
+    } else {
+        expectedValues.append(QVariant(double(3e3)));     /* xs:float */
+        expectedValues.append(QVariant(double(4e4)));     /* xs:double */
+        expectedValues.append(QVariant(double(2)));       /* xs:decimal */
+    }
 
     /* xs:integer and its sub-types. */
     expectedValues.append(QVariant(qlonglong(16)));
@@ -1347,10 +1353,17 @@ void tst_QXmlQuery::basicQtToXQueryTypeCheck() const
     QVERIFY(!item.isNull());
     QVERIFY(item.isAtomicValue());
 
-    QCOMPARE(item.toAtomicValue().toString(),
-             QLatin1String("4 true 3 654 7 41414141 C 2000-10-11Z 2001-09-10T01:02:03 "
-                           "A QString http://example.com/ 5 6 true true true true true true true true true true "
-                           "true true true"));
+    if(sizeof(qreal) == sizeof(float)) //ARM casts to Float not to double
+        QCOMPARE(item.toAtomicValue().toString(),
+                 QLatin1String("4 true 3 654 7 41414141 C 2000-10-11Z 2001-09-10T01:02:03 "
+                               "A QString http://example.com/ 5 6 true false false true true true true true true true "
+                               "true true true"));
+    else
+        QCOMPARE(item.toAtomicValue().toString(),
+                 QLatin1String("4 true 3 654 7 41414141 C 2000-10-11Z 2001-09-10T01:02:03 "
+                               "A QString http://example.com/ 5 6 true true true true true true true true true true "
+                               "true true true"));
+
 }
 
 void tst_QXmlQuery::bindNode() const
-- 
cgit v0.12


From 9967695bf224d6518fa411f0441e0605e61e0bf5 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Mon, 26 Jul 2010 16:15:47 +0200
Subject: Fixed QGraphicsEffect autotest to use platform quirks

---
 tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 07fa630..5315cd1 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -51,6 +51,7 @@
 
 #include "../../shared/util.h"
 #include <private/qgraphicseffect_p.h>
+#include "../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -710,7 +711,10 @@ void tst_QGraphicsEffect::prepareGeometryChangeInvalidateCache()
     scene.addItem(item);
 
     QGraphicsView view(&scene);
-    view.show();
+    if(PlatformQuirks::isAutoMaximizing())
+        view.showFullScreen();
+    else
+        view.show();
     QTest::qWaitForWindowShown(&view);
     QTRY_COMPARE(item->nbPaint, 1);
 
-- 
cgit v0.12


From 7a763f19996bc892a63d021e64c570cbfb13f391 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Tue, 27 Jul 2010 09:33:13 +0200
Subject: Fixed QTreeWidget autotest. Added qWaitForWindowShown()

---
 tests/auto/qtreewidget/tst_qtreewidget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp
index 77d353d..32bf557 100644
--- a/tests/auto/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp
@@ -464,6 +464,7 @@ void tst_QTreeWidget::editItem()
     QTreeWidget tree;
     populate(&tree, topLevelItems, new TreeItem(QStringList() << "1" << "2"));
     tree.show();
+    QTest::qWaitForWindowShown(&tree);
 
     QSignalSpy itemChangedSpy(
         &tree, SIGNAL(itemChanged(QTreeWidgetItem*,int)));
-- 
cgit v0.12


From 2eb6556bac03bde101e2135be1114d6835341678 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Tue, 27 Jul 2010 09:43:10 +0200
Subject: Fixed QTreeView autotest to use a dummy toplevel widget

---
 tests/auto/qtreeview/tst_qtreeview.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index c7b53e9..3c2bf15 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -2379,11 +2379,12 @@ void tst_QTreeView::extendedSelection()
     QFETCH(int, selectedCount);
 
     QStandardItemModel model(5, 2);
-    QTreeView view;
+    QWidget topLevel;
+    QTreeView view(&topLevel);
     view.resize(qMax(mousePressPos.x() * 2, 200), qMax(mousePressPos.y() * 2, 200));
     view.setModel(&model);
     view.setSelectionMode(QAbstractItemView::ExtendedSelection);
-    view.show();
+    topLevel.show();
     QTest::mousePress(view.viewport(), Qt::LeftButton, 0, mousePressPos);
     QCOMPARE(view.selectionModel()->selectedIndexes().count(), selectedCount);
 }
@@ -3280,9 +3281,10 @@ void tst_QTreeView::task220298_selectColumns()
 void tst_QTreeView::task224091_appendColumns()
 {
     QStandardItemModel *model = new QStandardItemModel();
-    QTreeView *treeView = new QTreeView();
+    QWidget* topLevel= new QWidget;
+    QTreeView *treeView = new QTreeView(topLevel);
     treeView->setModel(model);
-    treeView->show();
+    topLevel->show();
     treeView->resize(50,50);
 
     QTest::qWaitForWindowShown(treeView);
@@ -3299,7 +3301,7 @@ void tst_QTreeView::task224091_appendColumns()
 
     QTRY_VERIFY(treeView->verticalScrollBar()->isVisible());
 
-    delete treeView;
+    delete topLevel;
     delete model;
 }
 
@@ -3758,7 +3760,8 @@ void tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint()
 
 void tst_QTreeView::keyboardNavigationWithDisabled()
 {
-    QTreeView view;
+    QWidget topLevel;
+    QTreeView view(&topLevel);
     QStandardItemModel model(90, 0);
     for (int i = 0; i < 90; i ++) {
         model.setItem(i, new QStandardItem(QString::number(i)));
@@ -3767,10 +3770,10 @@ void tst_QTreeView::keyboardNavigationWithDisabled()
     view.setModel(&model);
 
     view.resize(200, view.visualRect(model.index(0,0)).height()*10);
-    view.show();
-    QApplication::setActiveWindow(&view);
-    QTest::qWaitForWindowShown(&view);
-    QTRY_VERIFY(view.isActiveWindow());
+    topLevel.show();
+    QApplication::setActiveWindow(&topLevel);
+    QTest::qWaitForWindowShown(&topLevel);
+    QTRY_VERIFY(topLevel.isActiveWindow());
 
     view.setCurrentIndex(model.index(1, 0));
     QTest::keyClick(view.viewport(), Qt::Key_Up);
-- 
cgit v0.12


From 28b4eb0a10b922581f4f7c6a7cdc60383a35a578 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Tue, 27 Jul 2010 10:52:56 +0200
Subject: Fixed QListWidget autotest to use a dummy toplevel widget

---
 tests/auto/qlistwidget/tst_qlistwidget.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index eb3fb6b..990945d 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -1499,6 +1499,11 @@ void tst_QListWidget::itemWidget()
 class MyListWidget : public QListWidget
 {
 public:
+    MyListWidget(QWidget *parent=0)
+        : QListWidget(parent)
+        {
+        }
+
     void paintEvent(QPaintEvent *e) {
         painted += e->region();
         QListWidget::paintEvent(e);
@@ -1513,14 +1518,16 @@ void tst_QListWidget::fastScroll()
         QSKIP("S60 style doesn't support fast scrolling", SkipAll);
     }
 
-    MyListWidget widget;
+    QWidget topLevel;
+    MyListWidget widget(&topLevel);
     for (int i = 0; i < 50; ++i)
         widget.addItem(QString("Item %1").arg(i));
 
-    widget.show();
+    topLevel.show();
     // Make sure the widget gets the first full repaint. On
     // some WMs, we'll get two (first inactive exposure, then
     // active exposure.
+    QTest::qWaitForWindowShown(&widget);
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&widget);
 #endif
@@ -1531,6 +1538,7 @@ void tst_QListWidget::fastScroll()
     QVERIFY(!itemSize.isEmpty());
 
     QScrollBar *sbar = widget.verticalScrollBar();
+    widget.setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
     widget.painted = QRegion();
     sbar->setValue(sbar->value() + sbar->singleStep());
     QApplication::processEvents();
-- 
cgit v0.12


From 1409261805af661c0f19d109027d44ec04ddbfc4 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Tue, 27 Jul 2010 11:32:28 +0200
Subject: Fixed QGraphicsWidget autotest to use PlatformQuirks.

---
 tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 9d6def8..2368d59 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -53,6 +53,7 @@
 #include <qaction.h>
 #include <qwidgetaction.h>
 #include "../../shared/util.h"
+#include "../platformquirks.h"
 
 
 class EventSpy : public QObject
@@ -1111,6 +1112,10 @@ void tst_QGraphicsWidget::initStyleOption_data()
 // void initStyleOption(QStyleOption* option) const public
 void tst_QGraphicsWidget::initStyleOption()
 {
+#ifdef Q_WS_MAEMO_5
+    QSKIP("The test passes, but it doesn't work when the display is in energy saving mode", SkipAll);
+#endif
+
     QGraphicsScene scene;
     QGraphicsView view(&scene);
     view.show();
@@ -1773,6 +1778,9 @@ void tst_QGraphicsWidget::verifyFocusChain()
 
 void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
 {
+#ifdef Q_WS_MAEMO_5
+    QSKIP("On Maemo 5 the Display Manager is shown on Window change, so the test won't work", SkipAll);
+#endif
     QGraphicsScene scene;
     QGraphicsView view(&scene);
     view.show();
@@ -3144,7 +3152,10 @@ void tst_QGraphicsWidget::initialShow()
     MyGraphicsWidget *widget = new MyGraphicsWidget;
 
     QGraphicsView view(&scene);
-    view.show();
+    if(PlatformQuirks::isAutoMaximizing())
+        view.showFullScreen();
+    else
+        view.show();
     QTest::qWaitForWindowShown(&view);
 
     scene.addItem(widget);
@@ -3186,7 +3197,7 @@ void tst_QGraphicsWidget::initialShow2()
     scene.addItem(widget);
 
     QGraphicsView view(&scene);
-    view.setWindowFlags(Qt::X11BypassWindowManagerHint);
+    view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
     view.show();
     QTest::qWaitForWindowShown(&view);
 
-- 
cgit v0.12


From 27e6214401970b809e0e594cccaa3b3bddad151a Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Tue, 27 Jul 2010 13:47:10 +0200
Subject: Fixed QButtonGroup autotest to run on Maemo

---
 tests/auto/qbuttongroup/tst_qbuttongroup.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
index a610a7f..1831e5d 100644
--- a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
@@ -396,19 +396,20 @@ void tst_QButtonGroup::task106609()
     vbox->addWidget(radio2);
     buttons->addButton(radio3, 3);
     vbox->addWidget(radio3);
-
-    radio1->setFocus();
-    radio1->setChecked(true);
     dlg.show();
+    QTest::qWaitForWindowShown(&dlg);
 
     qRegisterMetaType<QAbstractButton*>("QAbstractButton*");
     QSignalSpy spy1(buttons, SIGNAL(buttonClicked(QAbstractButton*)));
     QSignalSpy spy2(buttons, SIGNAL(buttonClicked(int)));
 
-    QTestEventLoop::instance().enterLoop(1);
     QApplication::setActiveWindow(&dlg);
     QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&dlg));
 
+    radio1->setFocus();
+    radio1->setChecked(true);
+    QTestEventLoop::instance().enterLoop(1);
+
     //qDebug() << "int:" << spy2.count() << "QAbstractButton*:" << spy1.count();
     QCOMPARE(spy2.count(), 2);
     QCOMPARE(spy1.count(), 2);
-- 
cgit v0.12


From 4dabd36fe0cd52dc297d2fa56c50917314c385a2 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Tue, 27 Jul 2010 14:20:53 +0200
Subject: Fixed QString autotest when QT_QLOCALE_USES_FCVT is set

+/-nan tests fail when QT_QLOCALE_USES_FCVT is set
Because the behavior of qstrtod and strtod of glibc differs
---
 tests/auto/qstring/tst_qstring.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp
index 9df2a4d..16cf872 100644
--- a/tests/auto/qstring/tst_qstring.cpp
+++ b/tests/auto/qstring/tst_qstring.cpp
@@ -4433,8 +4433,10 @@ void tst_QString::nanAndInf()
     CHECK_NAN("nan  ", true, true)
     CHECK_NAN("\t NAN", true, true)
     CHECK_NAN("\t NAN  ", true, true)
+#ifndef QT_QLOCALE_USES_FCVT //In case we use glibc this tests will fail
     CHECK_NAN("-nan", false, false)
     CHECK_NAN("+NAN", false, false)
+#endif
     CHECK_NAN("NaN", true, true)
     CHECK_NAN("nAn", true, true)
     CHECK_NAN("NANe-10", false, false)
-- 
cgit v0.12


From 09800d84d99c51941df8b15c2979af79ac750ee3 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Wed, 28 Jul 2010 10:24:18 +0200
Subject: Fixed QMenuBar autotest. Added mainwindow activation

---
 tests/auto/qmenubar/tst_qmenubar.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp
index cc9fb0c..392a4a0 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/qmenubar/tst_qmenubar.cpp
@@ -338,6 +338,8 @@ void tst_QMenuBar::initTestCase_noQt3()
 
     initSimpleMenubar_noQt3();
     mw->show();
+    QTest::qWaitForWindowShown(mw);
+    mw->activateWindow();
 
     menu1 = new QtTestSlot( mw );
     menu2 = new QtTestSlot( mw );
-- 
cgit v0.12


From 07dfb4618fca86314334f331fe788f9a480ef6db Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Wed, 28 Jul 2010 13:18:50 +0200
Subject: Fixed QMenu autotest to use a dummy toplevel widget

Added some waits
---
 tests/auto/qmenu/tst_qmenu.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index 7065b13..84f1b94 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -298,15 +298,17 @@ void tst_QMenu::mouseActivation()
 #ifdef Q_OS_WINCE_WM
     QSKIP("We have a separate mouseActivation test for Windows mobile.", SkipAll);
 #endif
-    QMenu menu;
+    QWidget topLevel;
+    QMenu menu(&topLevel);
+    topLevel.show();
     menu.addAction("Menu Action");
     menu.show();
-    QTest::mouseClick(&menu, Qt::LeftButton, 0, QPoint(5, 5), 300);
+    QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center(), 300);
     QVERIFY(!menu.isVisible());
 
     //context menus can allways be accessed with right click except on windows
     menu.show();
-    QTest::mouseClick(&menu, Qt::RightButton, 0, QPoint(5, 5), 300);
+    QTest::mouseClick(&menu, Qt::RightButton, 0, menu.rect().center(), 300);
     QVERIFY(!menu.isVisible());
 
 #ifdef Q_OS_WIN
@@ -466,9 +468,9 @@ void tst_QMenu::overrideMenuAction()
 	m->addAction(aQuit);
 
 	w.show();
+    QTest::qWaitForWindowShown(&w);
     QApplication::setActiveWindow(&w);
     w.setFocus();
-    QTest::qWaitForWindowShown(&w);
     QTRY_VERIFY(w.hasFocus());
 
 	//test of the action inside the menu
@@ -504,6 +506,7 @@ void tst_QMenu::statusTip()
 
     w.addToolBar(&tb);
     w.show();
+    QTest::qWaitForWindowShown(&w);
 
     QRect rect1 = tb.actionGeometry(&a);
     QToolButton *btn = qobject_cast<QToolButton*>(tb.childAt(rect1.center()));
@@ -589,6 +592,8 @@ void tst_QMenu::tearOff()
     QVERIFY(menu->isTearOffEnabled());
 
     widget.show();
+    QTest::qWaitForWindowShown(&widget);
+    widget.activateWindow();
     menu->popup(QPoint(0,0));
     QTest::qWait(50);
     QVERIFY(!menu->isTearOffMenuVisible());
-- 
cgit v0.12


From 7c0b56d38541443657b8f99792830c0a06b4d558 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Wed, 28 Jul 2010 13:24:15 +0200
Subject: Fixed QListView autotest to use a dummy toplevel widget

---
 tests/auto/qlistview/tst_qlistview.cpp | 35 ++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp
index 425ac89..523a3ab 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/qlistview/tst_qlistview.cpp
@@ -334,7 +334,8 @@ void tst_QListView::cursorMove()
     int columns = 6;
 
     QStandardItemModel model(rows, columns);
-    QListView view;
+    QWidget topLevel;
+    QListView view(&topLevel);
     view.setModel(&model);
 
     for (int j = 0; j < columns; ++j) {
@@ -358,7 +359,7 @@ void tst_QListView::cursorMove()
     view.setGridSize(cellsize);
     view.setViewMode(QListView::IconMode);
     view.doItemsLayout();
-    view.show();
+    topLevel.show();
 
     QVector<Qt::Key> keymoves;
     keymoves << Qt::Key_Up << Qt::Key_Up << Qt::Key_Right << Qt::Key_Right << Qt::Key_Up
@@ -1108,7 +1109,8 @@ void tst_QListView::selection()
     QFETCH(QRect, selectionRect);
     QFETCH(IntList, expectedItems);
 
-    PublicListView v;
+    QWidget topLevel;
+    PublicListView v(&topLevel);
     QtTestModel model;
     model.colCount = 1;
     model.rCount = itemCount;
@@ -1142,7 +1144,7 @@ void tst_QListView::selection()
     v.resize(525,525);
 #endif
 
-    v.show();
+    topLevel.show();
     QTest::qWaitForWindowShown(&v);
     QApplication::processEvents();
 
@@ -1158,7 +1160,8 @@ void tst_QListView::selection()
 
 void tst_QListView::scrollTo()
 {
-    QListView lv;
+    QWidget topLevel;
+    QListView lv(&topLevel);
     QStringListModel model(&lv);
     QStringList list;
     list << "Short item 1";
@@ -1194,8 +1197,8 @@ void tst_QListView::scrollTo()
     model.setStringList(list);
     lv.setModel(&model);
     lv.setFixedSize(100, 200);
-    lv.show();
-    QTest::qWaitForWindowShown(&lv);
+    topLevel.show();
+    QTest::qWaitForWindowShown(&topLevel);
 
     //by default, the list view scrolls per item and has no wrapping
     QModelIndex index = model.index(6,0);
@@ -1266,7 +1269,8 @@ void tst_QListView::scrollBarRanges()
     const int rowCount = 10;
     const int rowHeight = 20;
 
-    QListView lv;
+    QWidget topLevel;
+    QListView lv(&topLevel);
     QStringListModel model(&lv);
     QStringList list;
     for (int i = 0; i < rowCount; ++i)
@@ -1278,7 +1282,7 @@ void tst_QListView::scrollBarRanges()
     TestDelegate *delegate = new TestDelegate(&lv);
     delegate->m_sizeHint = QSize(100, rowHeight);
     lv.setItemDelegate(delegate);
-    lv.show();
+    topLevel.show();
 
     for (int h = 30; h <= 210; ++h) {
         lv.resize(250, h);
@@ -1354,14 +1358,15 @@ void tst_QListView::scrollBarAsNeeded()
 
     const int rowCounts[3] = {0, 1, 20};
 
-    QListView lv;
+    QWidget topLevel;
+    QListView lv(&topLevel);
     lv.setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     lv.setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     lv.setFlow((QListView::Flow)flow);
     QStringListModel model(&lv);
     lv.setModel(&model);
     lv.resize(size);
-    lv.show();
+    topLevel.show();
 
     for (uint r = 0; r < sizeof(rowCounts)/sizeof(int); ++r) {
         QStringList list;
@@ -1631,6 +1636,7 @@ void tst_QListView::task254449_draggingItemToNegativeCoordinates()
     list.setViewMode(QListView::IconMode);
     list.show();
     QTest::qWaitForWindowShown(&list);
+    list.activateWindow();
 
     class MyItemDelegate : public QStyledItemDelegate
     {
@@ -1815,7 +1821,8 @@ void tst_QListView::taskQTBUG_2233_scrollHiddenItems()
     QFETCH(int, flow);
     const int rowCount = 200;
 
-    QListView view;
+    QWidget topLevel;
+    QListView view(&topLevel);
     QStringListModel model(&view);
     QStringList list;
     for (int i = 0; i < rowCount; ++i)
@@ -1839,8 +1846,8 @@ void tst_QListView::taskQTBUG_2233_scrollHiddenItems()
     }
 
     //QTBUG-7929  should not crash
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    topLevel.show();
+    QTest::qWaitForWindowShown(&topLevel);
     QScrollBar *bar = view.flow() == QListView::TopToBottom
             ? view.verticalScrollBar() : view.horizontalScrollBar();
 
-- 
cgit v0.12


From 8c14359f0a43e3a7d196b39cb197d41ff6e4fbea Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 30 Jul 2010 09:25:12 +0200
Subject: Fixed QGraphicsItem autotest to use a dummy toplevel widget

---
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 67 ++++++++++++++++++--------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index a3bd0b0..bfa634f 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -94,6 +94,8 @@ Q_DECLARE_METATYPE(QRectF)
 #define COMPARE_REGIONS QTRY_COMPARE
 #endif
 
+#include "../platformquirks.h"
+
 static QGraphicsRectItem staticItem; //QTBUG-7629, we should not crash at exit.
 
 static void sendMousePress(QGraphicsScene *scene, const QPointF &point, Qt::MouseButton button = Qt::LeftButton)
@@ -272,7 +274,7 @@ class MyGraphicsView : public QGraphicsView
 public:
     int repaints;
     QRegion paintedRegion;
-    MyGraphicsView(QGraphicsScene *scene) : QGraphicsView(scene), repaints(0) {}
+    MyGraphicsView(QGraphicsScene *scene, QWidget *parent=0) : QGraphicsView(scene,parent), repaints(0) {}
     void paintEvent(QPaintEvent *e)
     {
         paintedRegion += e->region();
@@ -4070,9 +4072,10 @@ void tst_QGraphicsItem::cursor()
     item1->setCursor(Qt::IBeamCursor);
     item2->setCursor(Qt::PointingHandCursor);
 
-    QGraphicsView view(&scene);
+    QWidget topLevel;
+    QGraphicsView view(&scene,&topLevel);
     view.setFixedSize(200, 100);
-    view.show();
+    topLevel.show();
     QTest::mouseMove(&view, view.rect().center());
 
     QTest::qWait(25);
@@ -4094,6 +4097,8 @@ void tst_QGraphicsItem::cursor()
         QApplication::sendEvent(view.viewport(), &event);
     }
 
+    if (!PlatformQuirks::haveMouseCursor())
+        return;
 #if !defined(Q_OS_WINCE)
     QTest::qWait(250);
 #else
@@ -4959,7 +4964,10 @@ void tst_QGraphicsItem::paint()
 
     QGraphicsView view(&scene);
 
-    view.show();
+    if(PlatformQuirks::isAutoMaximizing())
+        view.showFullScreen();
+    else
+        view.show();
     QTest::qWaitForWindowShown(&view);
     QApplication::processEvents();
 #ifdef Q_OS_WIN32
@@ -5975,9 +5983,10 @@ void tst_QGraphicsItem::untransformable()
     QGraphicsScene scene(-500, -500, 1000, 1000);
     scene.addItem(item1);
 
-    QGraphicsView view(&scene);
+    QWidget topLevel;
+    QGraphicsView view(&scene,&topLevel);
     view.resize(300, 300);
-    view.show();
+    topLevel.show();
     view.scale(8, 8);
     view.centerOn(0, 0);
 
@@ -6616,7 +6625,10 @@ void tst_QGraphicsItem::opacity2()
     scene.addItem(parent);
 
     MyGraphicsView view(&scene);
-    view.show();
+    if(PlatformQuirks::isAutoMaximizing())
+        view.showFullScreen();
+    else
+        view.show();
     QTest::qWaitForWindowShown(&view);
     QTRY_VERIFY(view.repaints >= 1);
 
@@ -7050,6 +7062,7 @@ void tst_QGraphicsItem::tabChangesFocus()
     widget.setLayout(layout);
     widget.show();
     QTest::qWaitForWindowShown(&widget);
+    QTest::qWait(2000);
 
     QTRY_VERIFY(scene.isActive());
 
@@ -7495,9 +7508,10 @@ void tst_QGraphicsItem::update()
 {
     QGraphicsScene scene;
     scene.setSceneRect(-100, -100, 200, 200);
-    MyGraphicsView view(&scene);
+    QWidget topLevel;
+    MyGraphicsView view(&scene,&topLevel);
 
-    view.show();
+    topLevel.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&view);
 #endif
@@ -7776,10 +7790,11 @@ void tst_QGraphicsItem::itemUsesExtendedStyleOption()
     MyStyleOptionTester *rect = new MyStyleOptionTester(QRect(0, 0, 100, 100));
     scene.addItem(rect);
     rect->setPos(200, 200);
-    QGraphicsView view(&scene);
-    view.setWindowFlags(Qt::X11BypassWindowManagerHint);
+    QWidget topLevel;
+    QGraphicsView view(&scene, &topLevel);
+    topLevel.setWindowFlags(Qt::X11BypassWindowManagerHint);
     rect->startTrack = false;
-    view.show();
+    topLevel.show();
     QTest::qWaitForWindowShown(&view);
     QTest::qWait(60);
     rect->startTrack = true;
@@ -7980,6 +7995,9 @@ void tst_QGraphicsItem::sorting_data()
 
 void tst_QGraphicsItem::sorting()
 {
+    if (PlatformQuirks::isAutoMaximizing())
+        QSKIP("Skipped because Platform is auto maximizing", SkipAll);
+
     _paintedItems.clear();
 
     QGraphicsScene scene;
@@ -8015,7 +8033,7 @@ void tst_QGraphicsItem::sorting()
     _paintedItems.clear();
 
     view.viewport()->repaint();
-#ifdef Q_WS_MAC
+#if defined(Q_WS_MAC)
     // There's no difference between repaint and update on the Mac,
     // so we have to process events here to make sure we get the event.
     QTest::qWait(100);
@@ -8114,10 +8132,12 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
     QGraphicsScene scene;
     scene.setSceneRect(-100, -100, 200, 200);
 
-    QGraphicsView view(&scene);
-    view.show();
+    QWidget toplevel;
+
+    QGraphicsView view(&scene, &toplevel);
+    toplevel.show();
 #ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&view);
+    qt_x11_wait_for_window_manager(&toplevel);
 #endif
     QTest::qWait(100);
 
@@ -10721,7 +10741,10 @@ void tst_QGraphicsItem::QTBUG_6738_missingUpdateWithSetParent()
     scene.addItem(parent);
 
     MyGraphicsView view(&scene);
-    view.show();
+    if(PlatformQuirks::isAutoMaximizing())
+        view.showFullScreen();
+    else
+        view.show();
     QTest::qWaitForWindowShown(&view);
     QTRY_VERIFY(view.repaints > 0);
 
@@ -10769,7 +10792,10 @@ void tst_QGraphicsItem::QT_2653_fullUpdateDiscardingOpacityUpdate()
     // ItemIgnoresTransformations, ItemClipsChildrenToShape, ItemIsSelectable
     parentGreen->setFlag(QGraphicsItem::ItemIgnoresTransformations);
 
-    view.show();
+    if (PlatformQuirks::isAutoMaximizing())
+        view.showFullScreen();
+    else
+        view.show();
     QTest::qWaitForWindowShown(&view);
     view.reset();
 
@@ -10954,7 +10980,10 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene()
     item3->setParentItem(item2);
     item2->setParentItem(item);
     scene.addItem(item);
-    view.show();
+    if(PlatformQuirks::isAutoMaximizing())
+        view.showFullScreen();
+    else
+        view.show();
     QTest::qWaitForWindowShown(&view);
     QTRY_COMPARE(view.repaints, 1);
     QTRY_COMPARE(item->painted, 1);
-- 
cgit v0.12


From eac4fdc9becea59573a945dff0294e7c3d17ea5b Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 30 Jul 2010 10:37:40 +0200
Subject: Fixed QGraphicsScene autotest to use a dummy toplevel widget

---
 tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index 09cf4e2..6a2f849 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -2694,12 +2694,14 @@ void tst_QGraphicsScene::render()
     QPixmap pix(30, 30);
     pix.fill(Qt::blue);
 
-    QGraphicsScene scene;
+    QGraphicsView view;
+    QGraphicsScene scene(&view);
     scene.addEllipse(QRectF(-10, -10, 20, 20), QPen(Qt::black), QBrush(Qt::white));
     scene.addEllipse(QRectF(-2, -7, 4, 4), QPen(Qt::black), QBrush(Qt::yellow))->setZValue(1);
     QGraphicsPixmapItem *item = scene.addPixmap(pix);
     item->setZValue(2);
     item->setOffset(QPointF(3, 3));
+    view.show();
 
     scene.setSceneRect(scene.itemsBoundingRect());
 
@@ -2820,6 +2822,8 @@ void tst_QGraphicsScene::contextMenuEvent()
 
     QGraphicsView view(&scene);
     view.show();
+    QTest::qWaitForWindowShown(&view);
+    view.activateWindow();
 #ifdef Q_WS_X11
         qt_x11_wait_for_window_manager(&view);
 #endif
@@ -2851,12 +2855,14 @@ void tst_QGraphicsScene::contextMenuEvent_ItemIgnoresTransformations()
     item->setFlag(QGraphicsItem::ItemIgnoresTransformations);
     scene.addItem(item);
 
-    QGraphicsView view(&scene);
+    QWidget topLevel;
+    QGraphicsView view(&scene, &topLevel);
     view.resize(200, 200);
-    view.show();
+    topLevel.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&view);
 #endif
+    QTest::qWaitForWindowShown(&topLevel);
 
     {
         QPoint pos(50, 50);
-- 
cgit v0.12


From 8c696e362851c8d98e5895c8f7302f02a1ba685a Mon Sep 17 00:00:00 2001
From: Ralf Engels <ralf.engels@nokia.com>
Date: Tue, 3 Aug 2010 14:31:11 +0200
Subject: Fix QGraphicsItems autotest

---
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index bfa634f..0b29410 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -7511,6 +7511,7 @@ void tst_QGraphicsItem::update()
     QWidget topLevel;
     MyGraphicsView view(&scene,&topLevel);
 
+    topLevel.resize(300, 300);
     topLevel.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&view);
@@ -8135,6 +8136,7 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
     QWidget toplevel;
 
     QGraphicsView view(&scene, &toplevel);
+    toplevel.resize(300, 300);
     toplevel.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&toplevel);
-- 
cgit v0.12


From 01956f9244bf6da45745a836333a9baf134c4075 Mon Sep 17 00:00:00 2001
From: Ralf Engels <ralf.engels@nokia.com>
Date: Thu, 5 Aug 2010 14:07:55 +0200
Subject: Fix QListWidget test

---
 tests/auto/qlistwidget/tst_qlistwidget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index 990945d..6cfd6c5 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -1523,6 +1523,7 @@ void tst_QListWidget::fastScroll()
     for (int i = 0; i < 50; ++i)
         widget.addItem(QString("Item %1").arg(i));
 
+    topLevel.resize(300, 300); // toplevel needs to be wide enough for the item
     topLevel.show();
     // Make sure the widget gets the first full repaint. On
     // some WMs, we'll get two (first inactive exposure, then
-- 
cgit v0.12


From 193e4fccf1f472a2ff9f6d914d4a27d1e39e568f Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 5 Aug 2010 13:16:44 +0200
Subject: Fixed QAccessability autotest to use a dummy toplevel widget

---
 tests/auto/qaccessibility/tst_qaccessibility.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index cea259c..21a530e 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -2269,6 +2269,7 @@ void tst_QAccessibility::scrollBarTest()
     delete scrollBarInterface;
     delete scrollBar;
 
+
     // Test that the rects are ok.
     {
         QScrollBar *scrollBar  = new QScrollBar(Qt::Horizontal);
@@ -2289,7 +2290,6 @@ void tst_QAccessibility::scrollBarTest()
 
         const QRect scrollBarRect = scrollBarInterface->rect(0);
         QVERIFY(scrollBarRect.isValid());
-
         // Verify that the sub-control rects are valid and inside the scrollBar rect.
         for (int i = LineUp; i <= LineDown; ++i) {
             const QRect testRect = scrollBarInterface->rect(i);
@@ -3469,14 +3469,15 @@ void tst_QAccessibility::tableWidgetTest()
 {
 #ifdef QTEST_ACCESSIBILITY
     {
-    QTableWidget *w = new QTableWidget(8,4);
+    QWidget *topLevel = new QWidget;
+    QTableWidget *w = new QTableWidget(8,4,topLevel);
     for (int r = 0; r < 8; ++r) {
         for (int c = 0; c < 4; ++c) {
             w->setItem(r, c, new QTableWidgetItem(tr("%1,%2").arg(c).arg(r)));
         }
     }
     w->resize(100, 100);
-    w->show();
+    topLevel->show();
 #if defined(Q_WS_X11)
     qt_x11_wait_for_window_manager(w);
     QTest::qWait(100);
@@ -3503,6 +3504,7 @@ void tst_QAccessibility::tableWidgetTest()
     delete view;
     delete client;
     delete w;
+    delete topLevel;
     }
     QTestAccessibility::clearEvents();
 #else
-- 
cgit v0.12


From 145126c11d71648fa5eeb1abcd023e418fde8022 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 5 Aug 2010 13:20:38 +0200
Subject: Fixed QColumnView autotest. Added an QApplication::processEvents

---
 tests/auto/qcolumnview/tst_qcolumnview.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index fbfdf87..d4caede 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -429,6 +429,8 @@ void tst_QColumnView::scrollTo()
         view.setFocus(Qt::OtherFocusReason);
     else
         view.clearFocus();
+
+    qApp->processEvents();
     QTRY_COMPARE(view.hasFocus(), giveFocus);
     // scroll to the right
     int level = 0;
-- 
cgit v0.12


From 4e063a7c79caf77cff9748ef4e799dbbc1c1346f Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 5 Aug 2010 13:25:35 +0200
Subject: Fixed QComboBox autotest to use a dummy toplevel widget

---
 tests/auto/qcombobox/tst_qcombobox.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index 1fcea9e..9614e1e 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -163,7 +163,7 @@ protected slots:
 
 private:
     QComboBox *testWidget;
-    QDialog *parent;
+    QWidget *parent;
     QPushButton* ok;
     int editTextCount;
     QString editText;
@@ -395,7 +395,7 @@ tst_QComboBox::~tst_QComboBox()
 void tst_QComboBox::initTestCase()
 {
     // Create the test class
-    parent = new QDialog(0);
+    parent = new QWidget(0, Qt::Window);
     parent->setObjectName("parent");
     parent->resize(400, 400);
     testWidget = new QComboBox(parent);
@@ -1914,7 +1914,8 @@ void tst_QComboBox::itemListPosition()
 
     //we test QFontComboBox because it has the specific behaviour to set a fixed size
     //to the list view
-    QFontComboBox combo;
+    QWidget topLevel;
+    QFontComboBox combo(&topLevel);
 
     //the code to get the avaialbe screen space is copied from QComboBox code
     const int scrNumber = QApplication::desktop()->screenNumber(&combo);
@@ -1932,7 +1933,7 @@ void tst_QComboBox::itemListPosition()
 
     combo.move(screen.width()-combo.sizeHint().width(), 0); //puts the combo to the top-right corner
 
-    combo.show();
+    topLevel.show();
     //wait because the window manager can move the window if there is a right panel
     QTRY_VERIFY(combo.isVisible());
     combo.showPopup();
@@ -2254,9 +2255,10 @@ void tst_QComboBox::noScrollbar()
     qApp->setStyleSheet(stylesheet);
 
     {
-        QComboBox comboBox;
+        QWidget topLevel;
+        QComboBox comboBox(&topLevel);
         comboBox.addItems(initialContent);
-        comboBox.show();
+        topLevel.show();
         comboBox.resize(200, comboBox.height());
         QTRY_VERIFY(comboBox.isVisible());
         comboBox.showPopup();
-- 
cgit v0.12


From 565db9695dc62038e25cd5207731ac4ad59c4a05 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 5 Aug 2010 13:40:08 +0200
Subject: Fixed QPathCliper autotest, to skip a test when qreal != double

---
 tests/auto/qpathclipper/tst_qpathclipper.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/qpathclipper/tst_qpathclipper.cpp
index 4dc12cb..98c67d0 100644
--- a/tests/auto/qpathclipper/tst_qpathclipper.cpp
+++ b/tests/auto/qpathclipper/tst_qpathclipper.cpp
@@ -1300,6 +1300,9 @@ void tst_QPathClipper::task251909()
 
 void tst_QPathClipper::qtbug3778()
 {
+    if (sizeof(double) != sizeof(qreal)) {
+        QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll);
+    }
     QPainterPath path1;
     path1.moveTo(200, 3.22409e-5);
     // e-5 and higher leads to a bug
-- 
cgit v0.12


From ead0c87a27a48881cb8fcf8319eb14f53e8a9bb1 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 5 Aug 2010 13:43:13 +0200
Subject: Fixed QStyleSheetStyle autotest to use a dummy toplevel widget

-use platform quirks to skip tests
---
 tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 04b1e79..0396408 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -48,6 +48,7 @@
 #endif
 
 #include <private/qstylesheetstyle_p.h>
+#include "../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -822,6 +823,8 @@ void tst_QStyleSheetStyle::focusColors()
 
 void tst_QStyleSheetStyle::hoverColors()
 {
+    if (!PlatformQuirks::haveMouseCursor())
+        QSKIP("No mouse Cursor on this platform",SkipAll);
     QList<QWidget *> widgets;
     widgets << new QPushButton("TESTING");
     widgets << new QLineEdit("TESTING");
@@ -979,10 +982,11 @@ void tst_QStyleSheetStyle::background()
 
 void tst_QStyleSheetStyle::tabAlignement()
 {
-    QTabWidget tabWidget;
+    QWidget topLevel;
+    QTabWidget tabWidget(&topLevel);
     tabWidget.addTab(new QLabel("tab1"),"tab1");
     tabWidget.resize(QSize(400,400));
-    tabWidget.show();
+    topLevel.show();
     QTest::qWaitForWindowShown(&tabWidget);
     QTest::qWait(50);
     QTabBar *bar = qFindChild<QTabBar*>(&tabWidget);
-- 
cgit v0.12


From a29718ed16885fd97caa8bdde9e949dd95b11e4b Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Thu, 5 Aug 2010 14:58:39 +0200
Subject: Fixed QMenuBar autotest. Changed window activation order.

---
 tests/auto/qmenubar/tst_qmenubar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp
index 392a4a0..8dfb976 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/qmenubar/tst_qmenubar.cpp
@@ -1702,8 +1702,8 @@ void tst_QMenuBar::taskQTBUG11823_crashwithInvisibleActions()
     QAction * a = menubar.addAction( "&a" );
 
     menubar.show();
-    QApplication::setActiveWindow(&menubar);
     QTest::qWaitForWindowShown(&menubar);
+    QApplication::setActiveWindow(&menubar);
     menubar.setActiveAction(m);
     QCOMPARE(menubar.activeAction(), m);
     QTest::keyClick(0, Qt::Key_Right);
-- 
cgit v0.12


From fde9330d0bf8031159df524bba3e5baba339408b Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 6 Aug 2010 09:54:58 +0200
Subject: Fixed QMdiArea autotest to use a dummy toplevel widget.

---
 tests/auto/qmdiarea/tst_qmdiarea.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp
index f865738..6483f75 100644
--- a/tests/auto/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp
@@ -63,6 +63,7 @@
 #include <QMacStyle>
 
 #include "../../shared/util.h"
+#include "../platformquirks.h"
 
 static const Qt::WindowFlags DefaultWindowFlags
     = Qt::SubWindow | Qt::WindowSystemMenuHint
@@ -468,6 +469,8 @@ void tst_QMdiArea::subWindowActivated2()
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&mdiArea);
 #endif
+    QTest::qWaitForWindowShown(&mdiArea);
+    mdiArea.activateWindow();
     QTest::qWait(100);
 
     QTRY_COMPARE(spy.count(), 5);
@@ -510,6 +513,9 @@ void tst_QMdiArea::subWindowActivated2()
     QCOMPARE(mdiArea.activeSubWindow(), activeSubWindow);
     spy.clear();
 
+    if (PlatformQuirks::isAutoMaximizing())
+        QSKIP("Platform is auto maximizing, so no showMinimized()", SkipAll);
+
     // Check that we only emit _one_ signal and the active window
     // is unchanged after showMinimized/showNormal.
     mdiArea.showMinimized();
@@ -1119,9 +1125,10 @@ void tst_QMdiArea::currentSubWindow()
 
 void tst_QMdiArea::addAndRemoveWindows()
 {
-    QMdiArea workspace;
+    QWidget topLevel;
+    QMdiArea workspace(&topLevel);
     workspace.resize(800, 600);
-    workspace.show();
+    topLevel.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&workspace);
 #endif
@@ -1594,6 +1601,8 @@ void tst_QMdiArea::tileSubWindows()
 {
     QMdiArea workspace;
     workspace.resize(600,480);
+    if (PlatformQuirks::isAutoMaximizing())
+        workspace.setWindowFlags(workspace.windowFlags() | Qt::X11BypassWindowManagerHint);
     workspace.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&workspace);
@@ -1848,8 +1857,9 @@ void tst_QMdiArea::resizeMaximizedChildWindows()
     QFETCH(int, increment);
     QFETCH(int, windowCount);
 
-    QMdiArea workspace;
-    workspace.show();
+    QWidget topLevel;
+    QMdiArea workspace(&topLevel);
+    topLevel.show();
 #if defined(Q_WS_X11)
     qt_x11_wait_for_window_manager(&workspace);
 #endif
@@ -2094,6 +2104,7 @@ void tst_QMdiArea::resizeTimer()
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&mdiArea);
 #endif
+    QTest::qWaitForWindowShown(&mdiArea);
 
 #ifndef Q_OS_WINCE
     int time = 250;
-- 
cgit v0.12


From e8544e43a200d769cef1f1c8f9fe3d728192a5f9 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Fri, 6 Aug 2010 14:49:09 +0200
Subject: Fixed QGraphicsView autotest to use a dummy toplevel widget

Fixed some conversion problems using qreal
---
 tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 148 +++++++++++++++++--------
 1 file changed, 102 insertions(+), 46 deletions(-)

diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index af02c55..0a9633f 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -69,8 +69,10 @@
 #include <QtGui/QStyle>
 #include <QtGui/QPushButton>
 #include <QtGui/QInputContext>
+#include <QtGui/QDesktopWidget>
 #include <private/qgraphicsview_p.h>
 #include "../../shared/util.h"
+#include "../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -400,10 +402,13 @@ void tst_QGraphicsView::interactive()
     scene.addItem(item);
 
     QGraphicsView view(&scene);
+    if (PlatformQuirks::isAutoMaximizing())
+        view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
     view.setFixedSize(300, 300);
     QCOMPARE(item->events.size(), 0);
     view.show();
     QTest::qWaitForWindowShown(&view);
+    view.activateWindow();
 
     QApplication::processEvents();
     QTRY_COMPARE(item->events.size(), 1); // activate
@@ -531,13 +536,15 @@ void tst_QGraphicsView::sceneRect()
 
 void tst_QGraphicsView::sceneRect_growing()
 {
+    QWidget toplevel;
+
     QGraphicsScene scene;
     for (int i = 0; i < 100; ++i)
         scene.addText(QString("(0, %1)").arg((i - 50) * 20))->setPos(0, (i - 50) * 20);
 
-    QGraphicsView view(&scene);
+    QGraphicsView view(&scene, &toplevel);
     view.setFixedSize(200, 200);
-    view.show();
+    toplevel.show();
 
     int size = 200;
     scene.setSceneRect(-size, -size, size * 2, size * 2);
@@ -854,15 +861,17 @@ void tst_QGraphicsView::dragMode_rubberBand()
 
 void tst_QGraphicsView::rubberBandSelectionMode()
 {
+    QWidget toplevel;
+
     QGraphicsScene scene;
     QGraphicsRectItem *rect = scene.addRect(QRectF(10, 10, 80, 80));
     rect->setFlag(QGraphicsItem::ItemIsSelectable);
 
-    QGraphicsView view(&scene);
+    QGraphicsView view(&scene, &toplevel);
     QCOMPARE(view.rubberBandSelectionMode(), Qt::IntersectsItemShape);
     view.setDragMode(QGraphicsView::RubberBandDrag);
     view.resize(120, 120);
-    view.show();
+    toplevel.show();
 
     // Disable mouse tracking to prevent the window system from sending mouse
     // move events to the viewport while we are synthesizing events. If
@@ -1071,16 +1080,18 @@ void tst_QGraphicsView::matrix_combine()
 
 void tst_QGraphicsView::centerOnPoint()
 {
+    QWidget toplevel;
+
     QGraphicsScene scene;
     scene.addEllipse(QRectF(-100, -100, 50, 50));
     scene.addEllipse(QRectF(50, -100, 50, 50));
     scene.addEllipse(QRectF(-100, 50, 50, 50));
     scene.addEllipse(QRectF(50, 50, 50, 50));
 
-    QGraphicsView view(&scene);
+    QGraphicsView view(&scene, &toplevel);
     view.setSceneRect(-400, -400, 800, 800);
     view.setFixedSize(100, 100);
-    view.show();
+    toplevel.show();
 
     int tolerance = 5;
 
@@ -1155,6 +1166,8 @@ void tst_QGraphicsView::centerOnItem()
 
 void tst_QGraphicsView::ensureVisibleRect()
 {
+    QWidget toplevel;
+
     QGraphicsScene scene;
     QGraphicsItem *items[4];
     items[0] = scene.addEllipse(QRectF(-25, -25, 50, 50), QPen(Qt::black), QBrush(Qt::green));
@@ -1170,11 +1183,11 @@ void tst_QGraphicsView::ensureVisibleRect()
 
     QGraphicsItem *icon = scene.addEllipse(QRectF(-10, -10, 20, 20), QPen(Qt::black), QBrush(Qt::gray));
 
-    QGraphicsView view(&scene);
+    QGraphicsView view(&scene, &toplevel);
     view.setSceneRect(-500, -500, 1000, 1000);
     view.setFixedSize(250, 250);
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    toplevel.show();
+    QTest::qWaitForWindowShown(&toplevel);
 
     for (int y = -100; y < 100; y += 25) {
         for (int x = -100; x < 100; x += 13) {
@@ -1253,6 +1266,9 @@ void tst_QGraphicsView::fitInView()
     view.setFixedSize(400, 200);
 #endif
 
+    if (PlatformQuirks::isAutoMaximizing())
+        view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
+
     view.show();
     view.fitInView(scene.itemsBoundingRect(), Qt::IgnoreAspectRatio);
     qApp->processEvents();
@@ -1432,10 +1448,12 @@ void tst_QGraphicsView::itemsInRect_cosmeticAdjust()
     QGraphicsView view(&scene);
     view.setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing, !adjustForAntialiasing);
     view.setRenderHint(QPainter::Antialiasing, adjustForAntialiasing);
+    if (PlatformQuirks::isAutoMaximizing())
+        view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
     view.setFrameStyle(0);
     view.resize(300, 300);
     view.show();
-    QTest::qWaitForWindowShown(&view) ;
+    QTest::qWaitForWindowShown(&view);
     QTRY_VERIFY(rect->numPaints > 0);
 
     rect->numPaints = 0;
@@ -1614,7 +1632,8 @@ void tst_QGraphicsView::mapToScene()
     QGraphicsScene scene;
     scene.addPixmap(QPixmap("3D-Qt-1-2.png"));
 
-    QGraphicsView view;
+    QWidget topLevel;
+    QGraphicsView view(&topLevel);
     view.setScene(&scene);
     view.setSceneRect(-500, -500, 1000, 1000);
 #if defined(Q_OS_WINCE)
@@ -1624,7 +1643,7 @@ void tst_QGraphicsView::mapToScene()
 #endif
 
     view.setFixedSize(viewSize);
-    view.show();
+    topLevel.show();
     QApplication::processEvents();
     QVERIFY(view.isVisible());
     QCOMPARE(view.size(), viewSize);
@@ -1804,11 +1823,14 @@ void tst_QGraphicsView::mapFromScenePoint()
         }
     }
     {
+        QWidget toplevel;
+
         QGraphicsScene scene(0, 0, 200, 200);
         scene.addRect(QRectF(0, 0, 200, 200), QPen(Qt::black, 1));
-        QGraphicsView view(&scene);
+        QGraphicsView view(&scene, &toplevel);
+        view.ensurePolished();
         view.resize(view.sizeHint());
-        view.show();
+        toplevel.show();
 
         QCOMPARE(view.mapFromScene(0, 0), QPoint(0, 0));
         QCOMPARE(view.mapFromScene(0.4, 0.4), QPoint(0, 0));
@@ -1826,12 +1848,13 @@ void tst_QGraphicsView::mapFromScenePoint()
 void tst_QGraphicsView::mapFromSceneRect()
 {
     QGraphicsScene scene;
-    QGraphicsView view(&scene);
+    QWidget topLevel;
+    QGraphicsView view(&scene,&topLevel);
     view.rotate(90);
     view.setFixedSize(200, 200);
     view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    view.show();
+    topLevel.show();
     QTest::qWait(25);
 
     QPolygon polygon;
@@ -2030,6 +2053,9 @@ void tst_QGraphicsView::cursor()
 #if defined(Q_OS_WINCE)
     QSKIP("Qt/CE does not have regular cursor support", SkipAll);
 #endif
+    if (PlatformQuirks::haveMouseCursor())
+        QSKIP("The Platform does not have regular cursor support", SkipAll);
+
     QGraphicsScene scene;
     QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20));
     item->setCursor(Qt::IBeamCursor);
@@ -2057,6 +2083,9 @@ void tst_QGraphicsView::cursor2()
 #if defined(Q_OS_WINCE)
     QSKIP("Qt/CE does not have regular cursor support", SkipAll);
 #endif
+    if (PlatformQuirks::haveMouseCursor())
+        QSKIP("The Platform does not have regular cursor support", SkipAll);
+
     QGraphicsScene scene;
     QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20));
     item->setCursor(Qt::IBeamCursor);
@@ -2209,6 +2238,8 @@ class CustomView : public QGraphicsView
     Q_OBJECT
 public:
     CustomView(QGraphicsScene *s = 0) : QGraphicsView(s) {}
+    CustomView(QGraphicsScene *s, QWidget *parent)
+        : QGraphicsView(s, parent) {}
     QList<QRegion> lastUpdateRegions;
     bool painted;
 
@@ -2227,8 +2258,11 @@ void tst_QGraphicsView::viewportUpdateMode()
     scene.setBackgroundBrush(Qt::red);
 
     CustomView view;
-    view.setFixedSize(500, 500);
+    QDesktopWidget desktop;
+    view.setFixedSize(QSize(500, 500).boundedTo(desktop.availableGeometry().size())); // 500 is too big for all common smartphones
     view.setScene(&scene);
+    if(PlatformQuirks::isAutoMaximizing())
+        view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
     QCOMPARE(view.viewportUpdateMode(), QGraphicsView::MinimalViewportUpdate);
 
     // Show the view, and initialize our test.
@@ -2303,17 +2337,20 @@ void tst_QGraphicsView::viewportUpdateMode()
 
 void tst_QGraphicsView::viewportUpdateMode2()
 {
+    QWidget toplevel;
+
     // Create a view with viewport rect equal to QRect(0, 0, 200, 200).
     QGraphicsScene dummyScene;
-    CustomView view;
+    CustomView view(0, &toplevel);
     view.painted = false;
     view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
     view.setScene(&dummyScene);
+    view.ensurePolished(); // make sure we get the right content margins
     int left, top, right, bottom;
     view.getContentsMargins(&left, &top, &right, &bottom);
     view.resize(200 + left + right, 200 + top + bottom);
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    toplevel.show();
+    QTest::qWaitForWindowShown(&toplevel);
     QTest::qWait(50);
     QTRY_VERIFY(view.painted);
     const QRect viewportRect = view.viewport()->rect();
@@ -3222,15 +3259,17 @@ void tst_QGraphicsView::scrollAfterResize()
 #else
     QCommonStyle style;
 #endif
-    QGraphicsView view;
+    QWidget toplevel;
+
+    QGraphicsView view(&toplevel);
     view.setStyle(&style);
     if (reverse)
         view.setLayoutDirection(Qt::RightToLeft);
 
     view.setSceneRect(-1000, -1000, 2000, 2000);
     view.resize(300, 300);
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    toplevel.show();
+    QTest::qWaitForWindowShown(&toplevel);
     view.horizontalScrollBar()->setValue(0);
     view.verticalScrollBar()->setValue(0);
     QCOMPARE(view.viewportTransform(), x1);
@@ -3321,8 +3360,10 @@ void tst_QGraphicsView::moveItemWhileScrolling()
 
 void tst_QGraphicsView::centerOnDirtyItem()
 {
-    QGraphicsView view;
-    view.setWindowFlags(view.windowFlags() | Qt::WindowStaysOnTopHint);
+    QWidget toplevel;
+
+    QGraphicsView view(&toplevel);
+    toplevel.setWindowFlags(view.windowFlags() | Qt::WindowStaysOnTopHint);
     view.resize(200, 200);
 
     QGraphicsScene *scene = new QGraphicsScene;
@@ -3334,8 +3375,9 @@ void tst_QGraphicsView::centerOnDirtyItem()
     scene->addItem(item);
     view.centerOn(item);
 
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    toplevel.show();
+    QTest::qWaitForWindowShown(&toplevel);
+    QTest::qWait(50);
 
     QImage before(view.viewport()->size(), QImage::Format_ARGB32);
     view.viewport()->render(&before);
@@ -3697,19 +3739,26 @@ void tst_QGraphicsView::update()
 {
     QFETCH(QRect, updateRect);
 
+    // some window manager resize the toplevel to max screen size
+    // so we must make our view a child (no layout!) of a dummy toplevel
+    // to ensure that it's really 200x200 pixels
+    QWidget toplevel;
+
     // Create a view with viewport rect equal to QRect(0, 0, 200, 200).
     QGraphicsScene dummyScene;
-    CustomView view;
+    CustomView view(0, &toplevel);
     view.setScene(&dummyScene);
+    view.ensurePolished(); // must ensure polished to get content margins right
     int left, top, right, bottom;
     view.getContentsMargins(&left, &top, &right, &bottom);
     view.resize(200 + left + right, 200 + top + bottom);
-    view.show();
-    QTest::qWaitForWindowShown(&view);
+    toplevel.show();
+    QTest::qWaitForWindowShown(&toplevel);
 
-    QApplication::setActiveWindow(&view);
+
+    QApplication::setActiveWindow(&toplevel);
     QApplication::processEvents();
-    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&toplevel));
 
     const QRect viewportRect = view.viewport()->rect();
     QCOMPARE(viewportRect, QRect(0, 0, 200, 200));
@@ -3718,6 +3767,7 @@ void tst_QGraphicsView::update()
     const bool intersects = updateRect.intersects(viewportRect);
     QGraphicsViewPrivate *viewPrivate = static_cast<QGraphicsViewPrivate *>(qt_widget_private(&view));
     QTRY_COMPARE(viewPrivate->updateRect(updateRect), intersects);
+    QApplication::processEvents();
 
     view.lastUpdateRegions.clear();
     viewPrivate->processPendingUpdates();
@@ -3741,22 +3791,22 @@ void tst_QGraphicsView::update2_data()
     QTest::addColumn<bool>("changedConnected");
 
     // Anti-aliased.
-    QTest::newRow("pen width: 0.0, antialiasing: true") << 0.0 << true << false;
-    QTest::newRow("pen width: 1.5, antialiasing: true") << 1.5 << true << false;
-    QTest::newRow("pen width: 2.0, antialiasing: true") << 2.0 << true << false;
-    QTest::newRow("pen width: 3.0, antialiasing: true") << 3.0 << true << false;
+    QTest::newRow("pen width: 0.0, antialiasing: true") << qreal(0.0) << true << false;
+    QTest::newRow("pen width: 1.5, antialiasing: true") << qreal(1.5) << true << false;
+    QTest::newRow("pen width: 2.0, antialiasing: true") << qreal(2.0) << true << false;
+    QTest::newRow("pen width: 3.0, antialiasing: true") << qreal(3.0) << true << false;
 
     // Aliased.
-    QTest::newRow("pen width: 0.0, antialiasing: false") << 0.0 << false << false;
-    QTest::newRow("pen width: 1.5, antialiasing: false") << 1.5 << false << false;
-    QTest::newRow("pen width: 2.0, antialiasing: false") << 2.0 << false << false;
-    QTest::newRow("pen width: 3.0, antialiasing: false") << 3.0 << false << false;
+    QTest::newRow("pen width: 0.0, antialiasing: false") << qreal(0.0) << false << false;
+    QTest::newRow("pen width: 1.5, antialiasing: false") << qreal(1.5) << false << false;
+    QTest::newRow("pen width: 2.0, antialiasing: false") << qreal(2.0) << false << false;
+    QTest::newRow("pen width: 3.0, antialiasing: false") << qreal(3.0) << false << false;
 
     // changed() connected
-    QTest::newRow("pen width: 0.0, antialiasing: false, changed") << 0.0 << false << true;
-    QTest::newRow("pen width: 1.5, antialiasing: true, changed") << 1.5 << true << true;
-    QTest::newRow("pen width: 2.0, antialiasing: false, changed") << 2.0 << false << true;
-    QTest::newRow("pen width: 3.0, antialiasing: true, changed") << 3.0 << true << true;
+    QTest::newRow("pen width: 0.0, antialiasing: false, changed") << qreal(0.0) << false << true;
+    QTest::newRow("pen width: 1.5, antialiasing: true, changed") << qreal(1.5) << true << true;
+    QTest::newRow("pen width: 2.0, antialiasing: false, changed") << qreal(2.0) << false << true;
+    QTest::newRow("pen width: 3.0, antialiasing: true, changed") << qreal(3.0) << true << true;
 }
 
 void tst_QGraphicsView::update2()
@@ -4198,8 +4248,8 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins()
     class VpGraphicsView: public QGraphicsView
     {
     public:
-        VpGraphicsView(QGraphicsScene *scene)
-            : QGraphicsView(scene)
+        VpGraphicsView(QGraphicsScene *scene, QWidget *parent=0)
+            : QGraphicsView(scene, parent)
         {
             setViewportMargins(8, 16, 12, 20);
             setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
@@ -4210,6 +4260,7 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins()
     VpGraphicsView view(&scene);
     view.setWindowFlags(Qt::X11BypassWindowManagerHint);
     view.show();
+
     QTest::qWaitForWindowShown(&view);
     QTest::qWait(50);
     QPoint mouseViewPos(20, 20);
@@ -4324,6 +4375,9 @@ void tst_QGraphicsView::QTBUG_4151_clipAndIgnore()
     view.setFrameStyle(0);
     view.resize(75, 75);
     view.show();
+    QTest::qWaitForWindowShown(&view);
+    view.activateWindow();
+
     QTRY_COMPARE(QApplication::activeWindow(), (QWidget *)&view);
 
     QCOMPARE(view.items(view.rect()).size(), numItems);
@@ -4357,6 +4411,8 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
     scene.addItem(&item);
 
     QGraphicsView view(&scene);
+    if (PlatformQuirks::isAutoMaximizing())
+        view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
     view.scale(4.15, 4.15);
     view.show();
     QTest::qWaitForWindowShown(&view);
-- 
cgit v0.12


From 576a2e2181a9615b8aa1984a924442622fa6922d Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Tue, 2 Nov 2010 15:33:41 +0100
Subject: Fixed destination path for the S60 feedback plugin.

Reviewed-by: axis
---
 src/plugins/s60/feedback/feedback.pro | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro
index 32ddf6f..1069220 100644
--- a/src/plugins/s60/feedback/feedback.pro
+++ b/src/plugins/s60/feedback/feedback.pro
@@ -2,6 +2,8 @@ include(../../qpluginbase.pri)
 
 TARGET = qtactilefeedback$${QT_LIBINFIX}
 
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60/feedback
+
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
-- 
cgit v0.12


From 3923448118240a21cc169ea54d21f7ae1b324af8 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 2 Nov 2010 15:56:10 +0100
Subject: Export isLikelyToBeNfs only if we have an internal build

---
 src/corelib/io/qsettings.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index e5d182e..c94ec7b 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -88,6 +88,12 @@
 #define CSIDL_APPDATA		0x001a	// <username>\Application Data
 #endif
 
+#ifdef Q_AUTOTEST_EXPORT
+#  define Q_AUTOTEST_EXPORT_HELPER Q_AUTOTEST_EXPORT
+#else
+#  define Q_AUTOTEST_EXPORT_HELPER static
+#endif
+
 // ************************************************************************
 // QConfFile
 
@@ -134,7 +140,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 # include <sys/mount.h>
 QT_END_INCLUDE_NAMESPACE
 
-Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
 {
     struct statfs buf;
     if (fstatfs(handle, &buf) != 0)
@@ -160,7 +166,7 @@ QT_END_INCLUDE_NAMESPACE
 #  define AUTOFSNG_SUPER_MAGIC  0x7d92b1a0
 # endif
 
-Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
 {
     struct statfs buf;
     if (fstatfs(handle, &buf) != 0)
@@ -177,7 +183,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 # include <sys/statvfs.h>
 QT_END_INCLUDE_NAMESPACE
 
-Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
 {
     struct statvfs buf;
     if (fstatvfs(handle, &buf) != 0)
@@ -189,7 +195,7 @@ Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle)
 #endif
 }
 #else
-Q_AUTOTEST_EXPORT inline bool isLikelyToBeNfs(int /* handle */)
+Q_AUTOTEST_EXPORT_HELPER inline bool isLikelyToBeNfs(int /* handle */)
 {
     return true;
 }
-- 
cgit v0.12


From c76f883b9c48acea35fe04cfe6dbf5036b224dd2 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 2 Nov 2010 15:58:09 +0100
Subject: fix isLikelyToBeNfs usage

---
 tests/auto/qfileinfo/tst_qfileinfo.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 0306bb6..910ed97 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -70,7 +70,7 @@
 # define SRCDIR ""
 #endif
 
-extern bool isLikelyToBeNfs(int /* handle */);
+extern Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int /* handle */);
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -941,8 +941,10 @@ void tst_QFileInfo::fileTimes()
         QEXPECT_FAIL("longfile absolutepath", "Maximum total filepath cannot exceed 256 characters in Symbian", Abort);
 #endif
         QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
-        if(isLikelyToBeNfs(file.handle()))
+#ifdef Q_OS_UNIX
+        if (isLikelyToBeNfs(file.handle()))
             QSKIP("This Test doesn't work on NFS", SkipAll);
+#endif
         QTextStream ts(&file);
         ts << fileName << endl;
     }
-- 
cgit v0.12


From 7c8edecd486b71ff84cfaf278d9b1295e24766b9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 2 Nov 2010 16:09:18 +0100
Subject: make the dtd reflect reality

---
 tools/linguist/shared/ts.dtd | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/tools/linguist/shared/ts.dtd b/tools/linguist/shared/ts.dtd
index 4d2cdeb..12d3562 100644
--- a/tools/linguist/shared/ts.dtd
+++ b/tools/linguist/shared/ts.dtd
@@ -4,8 +4,6 @@
  !
  ! The location element is set as optional since it was introduced first in Qt 4.2.
  ! The userdata element is set as optional since it was introduced first in Qt 4.4.
- ! The source and translation elements are optional starting with version 3.0
- ! (Qt 4.6) to support S60 blank messages.
  !
   -->
 <!-- 
@@ -36,13 +34,10 @@
           language CDATA #IMPLIED>
 <!-- The encoding to use in the QM file by default. Default is ISO-8859-1. -->
 <!ELEMENT defaultcodec (#PCDATA) >
-<!ELEMENT context (name?, comment?, (context|message)+) >
+<!ELEMENT context (name, comment?, (context|message)+) >
 <!ATTLIST context
           encoding CDATA #IMPLIED>
 <!ELEMENT name %evilstring; >
-<!-- If "no", then the context nesting is for informational puposes only -->
-<!ATTLIST name
-          nest (yes|no) "yes">
 <!-- This is "disambiguation" in the (new) API, or "msgctxt" in gettext speak -->
 <!ELEMENT comment %evilstring; >
 <!-- Previous content of comment (result of merge) -->
@@ -53,12 +48,13 @@
 <!ELEMENT translatorcomment %evilstring; >
 <!ELEMENT message (location*, source?, oldsource?, comment?, oldcomment?, extracomment?, translatorcomment?, translation?, userdata?, extra-**) >
 <!--
- ! If utf8 is true, the defaultcodec is overridden and the message is encoded
- ! in UTF-8 in the QM file.
+ ! If utf8 is "true", the defaultcodec is overridden and the message is encoded
+ ! in UTF-8 in the QM file. If it is "both", both source encodings are stored
+ ! in the QM file.
   -->
 <!ATTLIST message
           id CDATA #IMPLIED
-          utf8 (true|false) "false"
+          utf8 (true|false|both) "false"
           numerus (yes|no) "no">
 <!ELEMENT location EMPTY>
 <!--
@@ -100,14 +96,5 @@
   -->
 <!ELEMENT numerusform (#PCDATA|byte|lengthvariant)* >
 <!ATTLIST numerusform
-          plurality (nullar|singular|dual|trial|paucal|greaterpaucal|plural|greaterplural) #IMPLIED>
           variants (yes|no) "no">
 <!ELEMENT lengthvariant %evilstring; >
-<!--
- ! The translation variants have a priority between 1 ("highest") and 9 ("lowest")
- ! Typically longer translations get a higher priority.
- ! If omitted, the order of appearance of the variants in the TS files is used.
-  -->
-<!ATTLIST lengthvariant
-          priority (1|2|3|4|5|6|7|8|9) #IMPLIED>
-         
-- 
cgit v0.12


From 561aeb6b8f7bc4ddb5e6d3e5cbc0ddc9cd344aa9 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 2 Nov 2010 16:53:38 +0100
Subject: Fix crash

check the global network proxy for 0 before dereferencing

Reviewed-by: Robert Griebl
---
 src/network/kernel/qnetworkproxy.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index bc5a025..d9d5918 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -426,7 +426,8 @@ template<> void QSharedDataPointer<QNetworkProxyPrivate>::detach()
 QNetworkProxy::QNetworkProxy()
     : d(0)
 {
-    globalNetworkProxy()->init();
+    if (QGlobalNetworkProxy *globalProxy = globalNetworkProxy())
+        globalProx->init();
 }
 
 /*!
@@ -441,7 +442,8 @@ QNetworkProxy::QNetworkProxy(ProxyType type, const QString &hostName, quint16 po
                   const QString &user, const QString &password)
     : d(new QNetworkProxyPrivate(type, hostName, port, user, password))
 {
-    globalNetworkProxy()->init();
+    if (QGlobalNetworkProxy *globalProxy = globalNetworkProxy())
+        globalProx->init();
 }
 
 /*!
-- 
cgit v0.12


From b2016bbfc9c7389e7b64451417395ceba96af21f Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 2 Nov 2010 13:07:01 +0100
Subject: Qml Debugging: Only enable if explicitly requested

Enable the remote debugging of QDeclarativeEngines only after

  QDeclarativeDebugHelper::enableDebugging()

has been called.

Approved by 4.7 Program Team.

Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
---
 src/declarative/debugger/qdeclarativedebughelper.cpp              | 8 ++++++++
 src/declarative/debugger/qdeclarativedebughelper_p.h              | 4 ++++
 src/declarative/debugger/qdeclarativedebugservice.cpp             | 7 +++++++
 src/declarative/qml/qdeclarativeengine.cpp                        | 1 +
 src/declarative/qml/qdeclarativeengine_p.h                        | 2 ++
 src/s60installs/bwins/QtDeclarativeu.def                          | 3 ++-
 src/s60installs/eabi/QtDeclarativeu.def                           | 3 ++-
 .../auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp  | 5 ++++-
 .../qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp       | 5 ++++-
 .../private_headers/qdeclarativedebughelper_p.h                   | 4 ++++
 .../qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp       | 7 +++++++
 .../qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp     | 4 ++++
 12 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp
index 207ad2b..b003c12 100644
--- a/src/declarative/debugger/qdeclarativedebughelper.cpp
+++ b/src/declarative/debugger/qdeclarativedebughelper.cpp
@@ -48,6 +48,7 @@
 
 #include <private/qdeclarativeengine_p.h>
 #include <private/qabstractanimation_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,4 +64,11 @@ void QDeclarativeDebugHelper::setAnimationSlowDownFactor(qreal factor)
     timer->setSlowdownFactor(factor);
 }
 
+void QDeclarativeDebugHelper::enableDebugging() {
+    if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
+        qWarning("Qml debugging is enabled. Only use this in a safe environment!");
+    }
+    QDeclarativeEnginePrivate::qml_debugging_enabled = true;
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h
index 5689dff..a1ac23d 100644
--- a/src/declarative/debugger/qdeclarativedebughelper_p.h
+++ b/src/declarative/debugger/qdeclarativedebughelper_p.h
@@ -60,6 +60,10 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugHelper
 public:
     static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
     static void setAnimationSlowDownFactor(qreal factor);
+
+    // Enables remote debugging functionality
+    // Only use this for debugging in a safe environment!
+    static void enableDebugging();
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index c39da3d..8c86ae8 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -42,6 +42,7 @@
 #include "private/qdeclarativedebugservice_p.h"
 
 #include "private/qpacketprotocol_p.h"
+#include "private/qdeclarativeengine_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtNetwork/qtcpserver.h>
@@ -205,6 +206,12 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
 
         // format: qmljsdebugger=port:3768[,block]
         if (!appD->qmljsDebugArgumentsString().isEmpty()) {
+            if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
+                qWarning() << QString::fromLatin1("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+                              "Debugging has not been enabled.").arg(
+                                  appD->qmljsDebugArgumentsString()).toAscii().constData();
+                return 0;
+            }
 
             if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
                 int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 6906f21..808ba68 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -176,6 +176,7 @@ struct StaticQtMetaObject : public QObject
 };
 
 static bool qt_QmlQtModule_registered = false;
+bool QDeclarativeEnginePrivate::qml_debugging_enabled = false;
 
 void QDeclarativeEnginePrivate::defineModule()
 {
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 8539fbf..deb4a77 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -321,6 +321,8 @@ public:
     static QString urlToLocalFileOrQrc(const QUrl& url);
 
     static void defineModule();
+
+    static bool qml_debugging_enabled;
 };
 
 /*!
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index db4012c..9e88df7 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -1838,5 +1838,6 @@ EXPORTS
 	?addChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1837 NONAME ABSENT ; void QDeclarativeBasePositioner::addChanged(void)
 	?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1838 NONAME ABSENT ; void QDeclarativeAbstractAnimation::start(void)
 	?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1839 NONAME ABSENT ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?connect@QDeclarativePropertyPrivate@@SA_NPBVQObject@@H0HHPAH@Z @ 1840 NONAME ABSENT ; bool QDeclarativePropertyPrivate::connect(class QObject const *, int, class QObject const *, int, int, int *)
+	?enableDebugging@QDeclarativeDebugHelper@@SAXXZ @ 1840 NONAME ; void QDeclarativeDebugHelper::enableDebugging(void)
+	?connect@QDeclarativePropertyPrivate@@SA_NPBVQObject@@H0HHPAH@Z @ 1841 NONAME ABSENT ; bool QDeclarativePropertyPrivate::connect(class QObject const *, int, class QObject const *, int, int, int *)
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 849ca6a..1f69061 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1883,5 +1883,6 @@ EXPORTS
 	_ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1882 NONAME ABSENT
 	_ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1883 NONAME ABSENT
 	_ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1884 NONAME ABSENT
-	_ZN27QDeclarativePropertyPrivate7connectEPK7QObjectiS2_iiPi @ 1885 NONAME ABSENT
+	_ZN23QDeclarativeDebugHelper15enableDebuggingEv @ 1885 NONAME
+	_ZN27QDeclarativePropertyPrivate7connectEPK7QObjectiS2_iiPi @ 1886 NONAME ABSENT
 
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index e6a81b8..53471bf 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -59,6 +59,7 @@
 #include <private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativedebughelper_p.h>
 
 #include "../../../shared/util.h"
 #include "../shared/debugutil_p.h"
@@ -278,8 +279,10 @@ void tst_QDeclarativeDebug::initTestCase()
 {
     qRegisterMetaType<QDeclarativeDebugWatch::State>();
 
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768...");
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
 
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768...");
     m_engine = new QDeclarativeEngine(this);
 
     QList<QByteArray> qml;
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 80241ba..64afd4e 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -51,6 +51,7 @@
 #include <private/qdeclarativeenginedebug_p.h>
 #include <private/qdeclarativedebugclient_p.h>
 #include <private/qdeclarativedebugservice_p.h>
+#include <private/qdeclarativedebughelper_p.h>
 
 #include "../../../shared/util.h"
 #include "../shared/debugutil_p.h"
@@ -72,8 +73,10 @@ private slots:
 
 void tst_QDeclarativeDebugClient::initTestCase()
 {
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3770...");
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
 
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3770...");
     new QDeclarativeEngine(this);
 
     m_conn = new QDeclarativeDebugConnection(this);
diff --git a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
index c9cb839..edfc58f 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
+++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
@@ -58,6 +58,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
 public:
     static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
     static void setAnimationSlowDownFactor(qreal factor);
+
+    // Enables remote debugging functionality
+    // Only use this for debugging in a safe environment!
+    static void enableDebugging();
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
index 36f2222..60aec9d 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
+++ b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
@@ -54,6 +54,7 @@ class tst_qdeclarativedebughelper : public QObject {
 private slots:
     void getScriptEngine();
     void setAnimationSlowDownFactor();
+    void enableDebugging();
 };
 
 class TestAnimation : public QAbstractAnimation {
@@ -109,6 +110,12 @@ void tst_qdeclarativedebughelper::setAnimationSlowDownFactor()
     QVERIFY(animation.updateCalled > 1);
 }
 
+void tst_qdeclarativedebughelper::enableDebugging()
+{
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
+}
+
 QTEST_MAIN(tst_qdeclarativedebughelper)
 
 #include "tst_qdeclarativedebughelper.moc"
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 538129c..30629f9 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -46,6 +46,7 @@
 #include <QThread>
 
 #include <QtDeclarative/qdeclarativeengine.h>
+#include <private/qdeclarativedebughelper_p.h>
 
 #include <private/qdeclarativedebug_p.h>
 #include <private/qdeclarativeenginedebug_p.h>
@@ -75,6 +76,9 @@ private slots:
 
 void tst_QDeclarativeDebugService::initTestCase()
 {
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
+
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3769...");
     new QDeclarativeEngine(this);
 
-- 
cgit v0.12


From 67dcf89760af14e65e2c62ebba513c987086b355 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 2 Nov 2010 18:53:17 +0100
Subject: simplify recursive symlinking

the jira issue itself has been already fixed, but in a somewhat arcane
way. this one is better maintainable.

Reviewed-by: joerg
Task-number: QTBUG-14955
---
 configure | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 0152c8e..1b2abf4 100755
--- a/configure
+++ b/configure
@@ -2429,14 +2429,8 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     ShadowMkspecs()
     {
         rm -rf "$outpath/mkspecs/$1"
-        if [ "$UNAME_SYSTEM" = "Linux" ]; then
-            # This works with GNU coreutils, and is needed for ScratchBox
-            cp -rs "$relpath/mkspecs/$1" "$outpath/mkspecs/$1"
-        else
-            # A simple "cp -rs" doesn't work on Mac. :(
-            find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
-            find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
-        fi
+        find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
+        find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | while read f; do ln -s "$relpath/$f" "$outpath/$f"; done
     }
 
     # Special case for mkspecs/features directory.
-- 
cgit v0.12


From 1b3f43c997b00d6b0d435ed8be08596c913a0189 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 3 Nov 2010 11:24:52 +1000
Subject: Qml Debugging: Only enable if explicitly requested

Enable the remote debugging of QDeclarativeEngines only after

  QDeclarativeDebugHelper::enableDebugging()

has been called.

Approved by 4.7 Program Team.

Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
(cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f)

Conflicts:

	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/eabi/QtDeclarativeu.def
---
 src/declarative/debugger/qdeclarativedebughelper.cpp              | 8 ++++++++
 src/declarative/debugger/qdeclarativedebughelper_p.h              | 4 ++++
 src/declarative/debugger/qdeclarativedebugservice.cpp             | 7 +++++++
 src/declarative/qml/qdeclarativeengine.cpp                        | 1 +
 src/declarative/qml/qdeclarativeengine_p.h                        | 2 ++
 src/s60installs/bwins/QtDeclarativeu.def                          | 2 +-
 src/s60installs/eabi/QtDeclarativeu.def                           | 1 +
 .../auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp  | 5 ++++-
 .../qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp       | 5 ++++-
 .../private_headers/qdeclarativedebughelper_p.h                   | 4 ++++
 .../qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp       | 7 +++++++
 .../qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp     | 4 ++++
 12 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp
index 24cad35..d6d6e59 100644
--- a/src/declarative/debugger/qdeclarativedebughelper.cpp
+++ b/src/declarative/debugger/qdeclarativedebughelper.cpp
@@ -48,6 +48,7 @@
 
 #include <private/qdeclarativeengine_p.h>
 #include <private/qabstractanimation_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,4 +64,11 @@ void QDeclarativeDebugHelper::setAnimationSlowDownFactor(qreal factor)
     timer->setSlowdownFactor(factor);
 }
 
+void QDeclarativeDebugHelper::enableDebugging() {
+    if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
+        qWarning("Qml debugging is enabled. Only use this in a safe environment!");
+    }
+    QDeclarativeEnginePrivate::qml_debugging_enabled = true;
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h
index bbee228..5d02895 100644
--- a/src/declarative/debugger/qdeclarativedebughelper_p.h
+++ b/src/declarative/debugger/qdeclarativedebughelper_p.h
@@ -58,6 +58,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
 public:
     static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
     static void setAnimationSlowDownFactor(qreal factor);
+
+    // Enables remote debugging functionality
+    // Only use this for debugging in a safe environment!
+    static void enableDebugging();
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 66009f6..50c0713 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -42,6 +42,7 @@
 #include "private/qdeclarativedebugservice_p.h"
 
 #include "private/qpacketprotocol_p.h"
+#include "private/qdeclarativeengine_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtNetwork/qtcpserver.h>
@@ -205,6 +206,12 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
 
         // format: qmljsdebugger=port:3768[,block]
         if (!appD->qmljsDebugArgumentsString().isEmpty()) {
+            if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
+                qWarning() << QString::fromLatin1("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+                              "Debugging has not been enabled.").arg(
+                                  appD->qmljsDebugArgumentsString()).toAscii().constData();
+                return 0;
+            }
 
             if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
                 int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index b87ba52..754e035 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -174,6 +174,7 @@ struct StaticQtMetaObject : public QObject
 };
 
 static bool qt_QmlQtModule_registered = false;
+bool QDeclarativeEnginePrivate::qml_debugging_enabled = false;
 
 void QDeclarativeEnginePrivate::defineModule()
 {
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index cac8f20..6d0c2b8 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -322,6 +322,8 @@ public:
     static QString urlToLocalFileOrQrc(const QUrl& url);
 
     static void defineModule();
+
+    static bool qml_debugging_enabled;
 };
 
 /*!
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index 581c3b8..8f878b1 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -1838,4 +1838,4 @@ EXPORTS
 	?addChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1837 NONAME ; void QDeclarativeBasePositioner::addChanged(void)
 	?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1838 NONAME ; void QDeclarativeAbstractAnimation::start(void)
 	?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1839 NONAME ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *)
-
+	?enableDebugging@QDeclarativeDebugHelper@@SAXXZ @ 1840 NONAME ; void QDeclarativeDebugHelper::enableDebugging(void)
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index b3bb7f5..eb540f8 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1883,4 +1883,5 @@ EXPORTS
 	_ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1882 NONAME
 	_ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1883 NONAME
 	_ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1884 NONAME
+	_ZN23QDeclarativeDebugHelper15enableDebuggingEv @ 1885 NONAME
 
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 029dbff..b728b4f 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -59,6 +59,7 @@
 #include <private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativedebughelper_p.h>
 
 #include "../../../shared/util.h"
 #include "../shared/debugutil_p.h"
@@ -278,8 +279,10 @@ void tst_QDeclarativeDebug::initTestCase()
 {
     qRegisterMetaType<QDeclarativeDebugWatch::State>();
 
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768...");
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
 
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768...");
     m_engine = new QDeclarativeEngine(this);
 
     QList<QByteArray> qml;
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index bb1fc1a..0f6e159 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -51,6 +51,7 @@
 #include <private/qdeclarativeenginedebug_p.h>
 #include <private/qdeclarativedebugclient_p.h>
 #include <private/qdeclarativedebugservice_p.h>
+#include <private/qdeclarativedebughelper_p.h>
 
 #include "../../../shared/util.h"
 #include "../shared/debugutil_p.h"
@@ -72,8 +73,10 @@ private slots:
 
 void tst_QDeclarativeDebugClient::initTestCase()
 {
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3770...");
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
 
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3770...");
     new QDeclarativeEngine(this);
 
     m_conn = new QDeclarativeDebugConnection(this);
diff --git a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
index bbee228..5d02895 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
+++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
@@ -58,6 +58,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
 public:
     static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
     static void setAnimationSlowDownFactor(qreal factor);
+
+    // Enables remote debugging functionality
+    // Only use this for debugging in a safe environment!
+    static void enableDebugging();
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
index ac5c749..90c4443 100644
--- a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
+++ b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
@@ -54,6 +54,7 @@ class tst_qdeclarativedebughelper : public QObject {
 private slots:
     void getScriptEngine();
     void setAnimationSlowDownFactor();
+    void enableDebugging();
 };
 
 class TestAnimation : public QAbstractAnimation {
@@ -109,6 +110,12 @@ void tst_qdeclarativedebughelper::setAnimationSlowDownFactor()
     QVERIFY(animation.updateCalled > 1);
 }
 
+void tst_qdeclarativedebughelper::enableDebugging()
+{
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
+}
+
 QTEST_MAIN(tst_qdeclarativedebughelper)
 
 #include "tst_qdeclarativedebughelper.moc"
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 85a8421..39b55ce 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -46,6 +46,7 @@
 #include <QThread>
 
 #include <QtDeclarative/qdeclarativeengine.h>
+#include <private/qdeclarativedebughelper_p.h>
 
 #include <private/qdeclarativedebug_p.h>
 #include <private/qdeclarativeenginedebug_p.h>
@@ -75,6 +76,9 @@ private slots:
 
 void tst_QDeclarativeDebugService::initTestCase()
 {
+    QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
+    QDeclarativeDebugHelper::enableDebugging();
+
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3769...");
     new QDeclarativeEngine(this);
 
-- 
cgit v0.12


From af15292e4982c11542487d39fc76ccfb8516598f Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Wed, 3 Nov 2010 14:55:46 +1000
Subject: Regression: QDeclarativeText does not update when text turns empty

Task-number: QTBUG-14865
Reviewed-by: Michael Brasser
---
 src/declarative/graphicsitems/qdeclarativetext.cpp |   1 +
 .../graphicsitems/qdeclarativetextlayout.cpp       |  13 +
 .../graphicsitems/qdeclarativetextlayout_p.h       |   1 +
 .../qdeclarativetext/data-MAC/qtbug_14865.0.png    | Bin 0 -> 1695 bytes
 .../qdeclarativetext/data-MAC/qtbug_14865.1.png    | Bin 0 -> 625 bytes
 .../qdeclarativetext/data-MAC/qtbug_14865.qml      | 719 +++++++++++++++++++++
 .../qmlvisual/qdeclarativetext/qtbug_14865.qml     |  17 +
 7 files changed, 751 insertions(+)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 8cb47aa..84f276e 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -219,6 +219,7 @@ void QDeclarativeTextPrivate::updateSize()
 
     QFontMetrics fm(font);
     if (text.isEmpty()) {
+        q->setImplicitWidth(0);
         q->setImplicitHeight(fm.height());
         emit q->paintedSizeChanged();
         q->update();
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
index 89a2158..db5d75d 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
@@ -285,6 +285,19 @@ void QDeclarativeTextLayout::beginLayout()
     QTextLayout::beginLayout();
 }
 
+void QDeclarativeTextLayout::clearLayout()
+{
+    if (d && d->cached) {
+        d->cached = false;
+        d->items.clear();
+        d->positions.clear();
+        d->glyphs.clear();
+        d->chars.clear();
+        d->position = QPointF();
+    }
+    QTextLayout::clearLayout();
+}
+
 void QDeclarativeTextLayout::prepare()
 {
     if (!d || !d->cached) {
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
index 90bf0e0..8b81db3 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
@@ -59,6 +59,7 @@ public:
     ~QDeclarativeTextLayout();
 
     void beginLayout();
+    void clearLayout();
 
     void prepare();
     void draw(QPainter *, const QPointF & = QPointF());
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
new file mode 100644
index 0000000..a947584
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
new file mode 100644
index 0000000..84430bb
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
new file mode 100644
index 0000000..940d3c1
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
@@ -0,0 +1,719 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 32
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 48
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 64
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 80
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 96
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 112
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 128
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 144
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 160
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 176
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 192
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 208
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 224
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 240
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 256
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 272
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 288
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 304
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 320
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 336
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 352
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 368
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 384
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 400
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 416
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 432
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 448
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 464
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 480
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 496
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 512
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 528
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 544
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 560
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 576
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 592
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 608
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 624
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 640
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 656
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 672
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 688
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 704
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 720
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 736
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 752
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 768
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 784
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 800
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 816
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 832
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 848
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 864
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 880
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 896
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 912
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 928
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 944
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 960
+        image: "qtbug_14865.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 992
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 1008
+        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+    }
+    Frame {
+        msec: 1024
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1040
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1056
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1072
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1088
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1104
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1120
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1136
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1152
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1168
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1184
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1200
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1216
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1232
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1248
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1264
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1280
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1296
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1312
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1328
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1344
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1360
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1376
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1392
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1408
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1424
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1440
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1456
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1472
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1488
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1504
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1520
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1536
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1552
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1568
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1584
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1600
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1616
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1632
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1648
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1664
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1680
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1696
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1712
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1728
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1744
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1760
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1776
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1792
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1808
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1824
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1840
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1856
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1872
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1888
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1904
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1920
+        image: "qtbug_14865.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1952
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1968
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1984
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2000
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2016
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2032
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2048
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2064
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2080
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2096
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2112
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2128
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2144
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2160
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2176
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2192
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2208
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2224
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2240
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2256
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2288
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2304
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2320
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2336
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2352
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2368
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2384
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2400
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2416
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2432
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2448
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2464
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2480
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2496
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2512
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2528
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2544
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2560
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2576
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2592
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2608
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2624
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2640
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2656
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2672
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2688
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2704
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2720
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2736
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2752
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2768
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2784
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2800
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 2816
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml
new file mode 100644
index 0000000..07416dc
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml
@@ -0,0 +1,17 @@
+import QtQuick 1.0
+
+Rectangle {
+    width: 200; height: 200
+
+    Text {
+        id: label
+        objectName: "label"
+        text: "Hello world!"
+        width: 10
+    }
+
+    Timer {
+        running: true; interval: 1000
+        onTriggered: label.text = ""
+    }
+}
-- 
cgit v0.12


From 648eb76c22762c510815305e9e495db2aee9d2ad Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 3 Nov 2010 16:18:11 +1000
Subject: Combining ListView.StrictlyEnforceRange and resizing currentItem
 stalls. There were two problems.  1) layout() called fixup() was called while
 the view was being flicked. 2) the snapping code was incorrect (and
 duplicated).

Task-number: QTBUG-14821
Reviewed-by: Michael Brasser
---
 .../graphicsitems/qdeclarativeflickable.cpp        |    9 +-
 .../graphicsitems/qdeclarativeflickable_p_p.h      |    3 +
 .../graphicsitems/qdeclarativelistview.cpp         |   62 +-
 .../qmlvisual/ListView/data/enforcerange.0.png     |  Bin 0 -> 680 bytes
 .../qmlvisual/ListView/data/enforcerange.1.png     |  Bin 0 -> 704 bytes
 .../qmlvisual/ListView/data/enforcerange.2.png     |  Bin 0 -> 695 bytes
 .../qmlvisual/ListView/data/enforcerange.3.png     |  Bin 0 -> 680 bytes
 .../qmlvisual/ListView/data/enforcerange.4.png     |  Bin 0 -> 701 bytes
 .../qmlvisual/ListView/data/enforcerange.5.png     |  Bin 0 -> 704 bytes
 .../qmlvisual/ListView/data/enforcerange.qml       | 2119 ++++++++++++++++++++
 .../qmlvisual/ListView/enforcerange.qml            |   31 +
 11 files changed, 2181 insertions(+), 43 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/enforcerange.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/enforcerange.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/enforcerange.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/enforcerange.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/enforcerange.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/enforcerange.5.png
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml
 create mode 100644 tests/auto/declarative/qmlvisual/ListView/enforcerange.qml

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index b737785..01a8585 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -53,9 +53,6 @@ QT_BEGIN_NAMESPACE
 // before we perform a flick.
 static const int FlickThreshold = 20;
 
-// Really slow flicks can be annoying.
-static const int MinimumFlickVelocity = 75;
-
 QDeclarativeFlickableVisibleArea::QDeclarativeFlickableVisibleArea(QDeclarativeFlickable *parent)
     : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
     , m_yPosition(0.), m_heightRatio(0.)
@@ -990,8 +987,8 @@ void QDeclarativeFlickable::viewportMoved()
 {
     Q_D(QDeclarativeFlickable);
 
-    qreal prevY = d->lastFlickablePosition.x();
-    qreal prevX = d->lastFlickablePosition.y();
+    qreal prevX = d->lastFlickablePosition.x();
+    qreal prevY = d->lastFlickablePosition.y();
     d->velocityTimeline.clear();
     if (d->pressed || d->calcVelocity) {
         int elapsed = QDeclarativeItemPrivate::restart(d->velocityTime);
@@ -1012,7 +1009,7 @@ void QDeclarativeFlickable::viewportMoved()
         }
     }
 
-    d->lastFlickablePosition = QPointF(d->vData.move.value(), d->hData.move.value());
+    d->lastFlickablePosition = QPointF(d->hData.move.value(), d->vData.move.value());
 
     d->vTime = d->timeline.time();
     d->updateBeginningEnd();
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index afefde2..92cf748 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -66,6 +66,9 @@
 
 QT_BEGIN_NAMESPACE
 
+// Really slow flicks can be annoying.
+const qreal MinimumFlickVelocity = 75.0;
+
 class QDeclarativeFlickableVisibleArea;
 class QDeclarativeFlickablePrivate : public QDeclarativeItemPrivate, public QDeclarativeItemChangeListener
 {
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 38a4839..eab66d8 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -334,28 +334,9 @@ public:
         return model && model->count() && model->isValid();
     }
 
-    int snapIndex() {
-        int index = currentIndex;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems[i];
-            if (item->index == -1)
-                continue;
-            qreal itemTop = item->position();
-            if (itemTop >= highlight->position()-item->size()/2 && itemTop < highlight->position()+item->size()/2)
-                return item->index;
-        }
-        return index;
-    }
-
     qreal snapPosAt(qreal pos) {
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems[i];
-            if (item->index == -1)
-                continue;
-            qreal itemTop = item->position();
-            if (itemTop+item->size()/2 >= pos && itemTop <= pos)
-                return item->position();
-        }
+        if (FxListItem *snapItem = snapItemAt(pos))
+            return snapItem->position();
         if (visibleItems.count()) {
             qreal firstPos = visibleItems.first()->position();
             qreal endPos = visibleItems.last()->position();
@@ -368,17 +349,18 @@ public:
     }
 
     FxListItem *snapItemAt(qreal pos) {
+        FxListItem *snapItem = 0;
         for (int i = 0; i < visibleItems.count(); ++i) {
             FxListItem *item = visibleItems[i];
             if (item->index == -1)
                 continue;
             qreal itemTop = item->position();
-            if (item->index == model->count()-1 || (itemTop+item->size()/2 >= pos))
+            if (highlight && itemTop >= pos && item->endPosition() <= pos + highlight->size() - 1)
                 return item;
+            if (itemTop+item->size()/2 >= pos && itemTop-item->size()/2 < pos)
+                snapItem = item;
         }
-        if (visibleItems.count() && visibleItems.first()->position() <= pos)
-            return visibleItems.first();
-        return 0;
+        return snapItem;
     }
 
     int lastVisibleIndex() const {
@@ -768,8 +750,10 @@ void QDeclarativeListViewPrivate::layout()
     minExtentDirty = true;
     maxExtentDirty = true;
     updateHighlight();
-    fixupPosition();
-    q->refill();
+    if (!q->isMoving() && !q->isFlicking()) {
+        fixupPosition();
+        q->refill();
+    }
     if (header)
         updateHeader();
     if (footer)
@@ -1350,12 +1334,15 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
             qreal newtarget = data.flickTarget;
             if (snapMode != QDeclarativeListView::NoSnap || highlightRange == QDeclarativeListView::StrictlyEnforceRange)
                 newtarget = -snapPosAt(-(data.flickTarget - highlightRangeStart)) + highlightRangeStart;
-            if (velocity < 0 && newtarget < maxExtent)
-                newtarget = maxExtent;
-            else if (velocity > 0 && newtarget > minExtent)
-                newtarget = minExtent;
-            if (newtarget == data.flickTarget) // boundary unchanged - nothing to do
+            if (velocity < 0 && newtarget <= maxExtent)
+                newtarget = maxExtent - overshootDist;
+            else if (velocity > 0 && newtarget >= minExtent)
+                newtarget = minExtent + overshootDist;
+            if (newtarget == data.flickTarget) { // boundary unchanged - nothing to do
+                if (qAbs(velocity) < MinimumFlickVelocity)
+                    correctFlick = false;
                 return;
+            }
             data.flickTarget = newtarget;
             qreal dist = -newtarget + data.move.value();
             if ((v < 0 && dist < 0) || (v > 0 && dist > 0)) {
@@ -1365,7 +1352,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
                 return;
             }
             timeline.reset(data.move);
-            timeline.accelDistance(data.move, v, -dist + (v < 0 ? -overshootDist : overshootDist));
+            timeline.accelDistance(data.move, v, -dist);
             timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
         }
     } else {
@@ -1696,7 +1683,7 @@ void QDeclarativeListView::setCurrentIndex(int index)
     if (isComponentComplete() && d->isValid()) {
         d->moveReason = QDeclarativeListViewPrivate::SetIndex;
         d->updateCurrent(index);
-    } else {
+    } else if (d->currentIndex != index) {
         d->currentIndex = index;
         emit currentIndexChanged();
     }
@@ -2323,9 +2310,10 @@ void QDeclarativeListView::viewportMoved()
             d->highlight->setPosition(qRound(pos));
 
             // update current index
-            int idx = d->snapIndex();
-            if (idx >= 0 && idx != d->currentIndex)
-                d->updateCurrent(idx);
+            if (FxListItem *snapItem = d->snapItemAt(d->highlight->position())) {
+                if (snapItem->index >= 0 && snapItem->index != d->currentIndex)
+                    d->updateCurrent(snapItem->index);
+            }
         }
     }
 
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.0.png b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.0.png
new file mode 100644
index 0000000..d466434
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.1.png b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.1.png
new file mode 100644
index 0000000..45d9712
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.2.png b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.2.png
new file mode 100644
index 0000000..3f05a5e
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.3.png b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.3.png
new file mode 100644
index 0000000..d466434
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.4.png b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.4.png
new file mode 100644
index 0000000..c902676
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.5.png b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.5.png
new file mode 100644
index 0000000..45d9712
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml
new file mode 100644
index 0000000..c15b657
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml
@@ -0,0 +1,2119 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 32
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 48
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 64
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 80
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 96
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 112
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 128
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 144
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 160
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 176
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 192
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 208
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 224
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 240
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 256
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 272
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 288
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 304
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 320
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 336
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 352
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 368
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 384
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 400
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 416
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 432
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 448
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 464
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 480
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 496
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 512
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 528
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 544
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 560
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 576
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 592
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 608
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 624
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 640
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 656
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 672
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 688
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 704
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 720
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 736
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 752
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 768
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 784
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 800
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 816
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 832
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 848
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 864
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 880
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 896
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 912
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 928
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 944
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 960
+        image: "enforcerange.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 992
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1008
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1024
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1040
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1056
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1072
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1088
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1104
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1120
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1136
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1152
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1168
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1184
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1200
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 77; y: 157
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1216
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1232
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 1248
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 77; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1264
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 77; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 76; y: 151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1280
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 75; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 74; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1296
+        hash: "c7667b5af9f2ee912abe5879266cb1e0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 73; y: 131
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 72; y: 122
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1312
+        hash: "1e762d6ffe1ceb53046d7953645d02d5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 111
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1328
+        hash: "0d2b7130a84a8efac1cf4fe8a1768231"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 108
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1344
+        hash: "6ef2715c3fd26d50d26fb740afa6dece"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 71; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1360
+        hash: "f489b6f951281ff9a981ec046ca5b17d"
+    }
+    Frame {
+        msec: 1376
+        hash: "fd6e7d7db7c4571ee606269fb9680ed9"
+    }
+    Frame {
+        msec: 1392
+        hash: "398a238f59a2edf07870b624b914c81d"
+    }
+    Frame {
+        msec: 1408
+        hash: "fdce64faab7e7e31a229adda47924cd1"
+    }
+    Frame {
+        msec: 1424
+        hash: "8d474956331fdd0c35beb13a06b7c557"
+    }
+    Frame {
+        msec: 1440
+        hash: "f89fed6f7fa07a8320f07a1e68240a7e"
+    }
+    Frame {
+        msec: 1456
+        hash: "940b70f15082ff138579892bb6f20ce9"
+    }
+    Frame {
+        msec: 1472
+        hash: "35ab744ce2a91567dbbd769f9486f870"
+    }
+    Frame {
+        msec: 1488
+        hash: "6b2d32b8f1df871c2c014af8b5d87329"
+    }
+    Frame {
+        msec: 1504
+        hash: "edf3b33b80cca53999779555f9cd6162"
+    }
+    Frame {
+        msec: 1520
+        hash: "180f3cc4ea5ff5b6f9e8be0294732d4e"
+    }
+    Frame {
+        msec: 1536
+        hash: "28e9ca60a873910380b2d22d6b3df565"
+    }
+    Frame {
+        msec: 1552
+        hash: "3bb1e8d69f171f09eb4c6f9914fc9576"
+    }
+    Frame {
+        msec: 1568
+        hash: "0501da09be444df6cee4b19617290317"
+    }
+    Frame {
+        msec: 1584
+        hash: "8ce1ac0163b0353167488aff2879e841"
+    }
+    Frame {
+        msec: 1600
+        hash: "18e53bf6337cf6590fc3c73c00469d8e"
+    }
+    Frame {
+        msec: 1616
+        hash: "0c31ede980d07069f4977d5753d00ddf"
+    }
+    Frame {
+        msec: 1632
+        hash: "0a854a54176c24f0ebbb6cb747dc0ab7"
+    }
+    Frame {
+        msec: 1648
+        hash: "8dba1ebca6f00b7a64a6982fb8c28c50"
+    }
+    Frame {
+        msec: 1664
+        hash: "8d273efc36ba722af4d044e6552c9dcb"
+    }
+    Frame {
+        msec: 1680
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 1696
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 1712
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 1728
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 1744
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 1760
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 1776
+        hash: "81110f17d191f9795a2c57d136e86550"
+    }
+    Frame {
+        msec: 1792
+        hash: "090a76cf068a5041ff993f21e6ebd087"
+    }
+    Frame {
+        msec: 1808
+        hash: "30eb157c89ad0aeb17fd0012afb9246b"
+    }
+    Frame {
+        msec: 1824
+        hash: "6b317b59e1b0f5b17a6d7d96e745f576"
+    }
+    Frame {
+        msec: 1840
+        hash: "f9fc8467c6dbcb00d1f41a57b550193c"
+    }
+    Frame {
+        msec: 1856
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 1872
+        hash: "d4b370ff8c3b66fc8a616dd9b944abd1"
+    }
+    Frame {
+        msec: 1888
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 1904
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 1920
+        image: "enforcerange.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 1952
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 1968
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 1984
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2000
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2016
+        hash: "81110f17d191f9795a2c57d136e86550"
+    }
+    Frame {
+        msec: 2032
+        hash: "090a76cf068a5041ff993f21e6ebd087"
+    }
+    Frame {
+        msec: 2048
+        hash: "090a76cf068a5041ff993f21e6ebd087"
+    }
+    Frame {
+        msec: 2064
+        hash: "30eb157c89ad0aeb17fd0012afb9246b"
+    }
+    Frame {
+        msec: 2080
+        hash: "6b317b59e1b0f5b17a6d7d96e745f576"
+    }
+    Frame {
+        msec: 2096
+        hash: "f9fc8467c6dbcb00d1f41a57b550193c"
+    }
+    Frame {
+        msec: 2112
+        hash: "f9fc8467c6dbcb00d1f41a57b550193c"
+    }
+    Frame {
+        msec: 2128
+        hash: "711274e9b6811b4662ac29d813574fb6"
+    }
+    Frame {
+        msec: 2144
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 2160
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 2176
+        hash: "d4b370ff8c3b66fc8a616dd9b944abd1"
+    }
+    Frame {
+        msec: 2192
+        hash: "d4b370ff8c3b66fc8a616dd9b944abd1"
+    }
+    Frame {
+        msec: 2208
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 2224
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 2240
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2256
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2272
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 2288
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 2304
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 2320
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 2336
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 2352
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 2368
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 2384
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 2400
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2416
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2432
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2448
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2464
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2480
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2496
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2512
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2528
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2544
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2560
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2576
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2592
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2608
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2624
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2640
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 2656
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2672
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2688
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 2704
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 2720
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 2736
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 2752
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 2768
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 2784
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 2800
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 2816
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2832
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2848
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2864
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2880
+        image: "enforcerange.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2912
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2928
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2944
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2960
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2976
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 2992
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 3008
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 3024
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 82; y: 39
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3040
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 3056
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 82; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3072
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 82; y: 42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3088
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 47
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3104
+        hash: "89016574205e00cf42723446d6a3437e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 60
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 69
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3120
+        hash: "e2db9b1ae5c4be51a548834a7776da1f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 80; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 80; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3136
+        hash: "fcfad57224192065782a77ad3398d0d1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 80; y: 93
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 80; y: 107
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3152
+        hash: "bae4fc0fc2d33008ebe827ece94af196"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 84; y: 130
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 88; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3168
+        hash: "569581944bf18c8165f72c60bdbf1011"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 96; y: 161
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 96; y: 161
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3184
+        hash: "613ff94a26bfaa9a4dc94fcbf6c3eb57"
+    }
+    Frame {
+        msec: 3200
+        hash: "a63f8e6b194f900acb1b7a332f9fb9ae"
+    }
+    Frame {
+        msec: 3216
+        hash: "6c04761cc86d28112c16f692cda58ba4"
+    }
+    Frame {
+        msec: 3232
+        hash: "544275da3f7e2ccaedc8c521bf17f59b"
+    }
+    Frame {
+        msec: 3248
+        hash: "52831480eb69184341b12ffb09ace736"
+    }
+    Frame {
+        msec: 3264
+        hash: "52831480eb69184341b12ffb09ace736"
+    }
+    Frame {
+        msec: 3280
+        hash: "52831480eb69184341b12ffb09ace736"
+    }
+    Frame {
+        msec: 3296
+        hash: "52831480eb69184341b12ffb09ace736"
+    }
+    Frame {
+        msec: 3312
+        hash: "58f2b900bc335424fc70eaaeb23ceb56"
+    }
+    Frame {
+        msec: 3328
+        hash: "58f2b900bc335424fc70eaaeb23ceb56"
+    }
+    Frame {
+        msec: 3344
+        hash: "544275da3f7e2ccaedc8c521bf17f59b"
+    }
+    Frame {
+        msec: 3360
+        hash: "df9fef370c2f6ff300b20fc24b5b9e34"
+    }
+    Frame {
+        msec: 3376
+        hash: "99cdc74eefc8c7c7df4650b373d8bc15"
+    }
+    Frame {
+        msec: 3392
+        hash: "0662898d246e5ff6981610d32e2b8375"
+    }
+    Frame {
+        msec: 3408
+        hash: "651b4c8b7a241263d48e645e603a55a3"
+    }
+    Frame {
+        msec: 3424
+        hash: "82b31c8e8794ce3a9a6a635ef93b29b3"
+    }
+    Frame {
+        msec: 3440
+        hash: "388658b5e03f3853e93173bd9501b77b"
+    }
+    Frame {
+        msec: 3456
+        hash: "cf1856e961e6b8277a82c03ace5ba864"
+    }
+    Frame {
+        msec: 3472
+        hash: "e1d022cc1b41098baffe49925b20678f"
+    }
+    Frame {
+        msec: 3488
+        hash: "ee55d155fa495f3a0da8c21ad56dfc61"
+    }
+    Frame {
+        msec: 3504
+        hash: "044c3712a6a5f6a973defe85643c8d02"
+    }
+    Frame {
+        msec: 3520
+        hash: "e4fe2f1a81a4a4806f4155807f285a2d"
+    }
+    Frame {
+        msec: 3536
+        hash: "e4fe2f1a81a4a4806f4155807f285a2d"
+    }
+    Frame {
+        msec: 3552
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3568
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3584
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3600
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3616
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3632
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3648
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3664
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3680
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3696
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3712
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3728
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3744
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3760
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3776
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3792
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3808
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3824
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3840
+        image: "enforcerange.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3872
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3888
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3904
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3920
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3936
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3952
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3968
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 3984
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 4000
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 4016
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Frame {
+        msec: 4032
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 105; y: 169
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4048
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 168
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4064
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 163
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4080
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 162
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 160
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4096
+        hash: "331164730fb7ccf37dc08ddc26c0e182"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 107; y: 157
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 107; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4112
+        hash: "73e27ff972eefc421bc65897ad8b9a11"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 108; y: 152
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4128
+        hash: "c5e903fd827f8f1ec060dcb9a925bf6d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 109; y: 145
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4144
+        hash: "74d4357dff4d6e00c5ae9ea0c34f1010"
+    }
+    Frame {
+        msec: 4160
+        hash: "790274ee21ba257b84671a6fb19c142f"
+    }
+    Frame {
+        msec: 4176
+        hash: "65ccc26f20be484fefa8ea25a7daf825"
+    }
+    Frame {
+        msec: 4192
+        hash: "e435e2fbba7f0f6a65b9fecf07893eb0"
+    }
+    Frame {
+        msec: 4208
+        hash: "6a994a18a9331731d5fca50dce2b9cff"
+    }
+    Frame {
+        msec: 4224
+        hash: "9fc4405cddc06310215969a4583b2353"
+    }
+    Frame {
+        msec: 4240
+        hash: "0d2b7130a84a8efac1cf4fe8a1768231"
+    }
+    Frame {
+        msec: 4256
+        hash: "791db15db47090e1af299e5b32e53918"
+    }
+    Frame {
+        msec: 4272
+        hash: "0ec6cf7a6ed9a073d2ce8f9e534e2ee5"
+    }
+    Frame {
+        msec: 4288
+        hash: "c7b358f51a9500ca4958d266de5307e6"
+    }
+    Frame {
+        msec: 4304
+        hash: "d24d00e4cd1ea3aaacf202e2fdf1eaa0"
+    }
+    Frame {
+        msec: 4320
+        hash: "169f1a7a933d84071c449132a3c2745e"
+    }
+    Frame {
+        msec: 4336
+        hash: "b6bf9c15ed40d6e862f693155c884035"
+    }
+    Frame {
+        msec: 4352
+        hash: "8639955aa7a03f54d50d7e9051a4b997"
+    }
+    Frame {
+        msec: 4368
+        hash: "411bc9a9aedbfb75f3122eaea6be0c16"
+    }
+    Frame {
+        msec: 4384
+        hash: "827094da86716daf69386af2c8d4027a"
+    }
+    Frame {
+        msec: 4400
+        hash: "ddddd5457e4a54ca5e7415dc2c7eabe5"
+    }
+    Frame {
+        msec: 4416
+        hash: "632a5756af20083504fb1faaa019dd48"
+    }
+    Frame {
+        msec: 4432
+        hash: "0cc2901b1b25412f13865887a8c9d13e"
+    }
+    Frame {
+        msec: 4448
+        hash: "4c8a9473eb9843634340d70f8eab9487"
+    }
+    Frame {
+        msec: 4464
+        hash: "398a238f59a2edf07870b624b914c81d"
+    }
+    Frame {
+        msec: 4480
+        hash: "a7c282235e9166b900ea2ff68800a5f5"
+    }
+    Frame {
+        msec: 4496
+        hash: "bae4fc0fc2d33008ebe827ece94af196"
+    }
+    Frame {
+        msec: 4512
+        hash: "45e0670a2b4c18b847a3c7870539b962"
+    }
+    Frame {
+        msec: 4528
+        hash: "8d474956331fdd0c35beb13a06b7c557"
+    }
+    Frame {
+        msec: 4544
+        hash: "5d5bdffc30d90fd5b061c6fcf24c2599"
+    }
+    Frame {
+        msec: 4560
+        hash: "15721b103981f5fe40b5dfe7d65c5b38"
+    }
+    Frame {
+        msec: 4576
+        hash: "940b70f15082ff138579892bb6f20ce9"
+    }
+    Frame {
+        msec: 4592
+        hash: "5137ea98fd291a4b967fb66d93253a37"
+    }
+    Frame {
+        msec: 4608
+        hash: "35ab744ce2a91567dbbd769f9486f870"
+    }
+    Frame {
+        msec: 4624
+        hash: "d5c55c00b07735e5d7c02dfa99ef2f45"
+    }
+    Frame {
+        msec: 4640
+        hash: "6b2d32b8f1df871c2c014af8b5d87329"
+    }
+    Frame {
+        msec: 4656
+        hash: "edf3b33b80cca53999779555f9cd6162"
+    }
+    Frame {
+        msec: 4672
+        hash: "180f3cc4ea5ff5b6f9e8be0294732d4e"
+    }
+    Frame {
+        msec: 4688
+        hash: "9b99a1b0c0bb0ce37655d92854ee4d19"
+    }
+    Frame {
+        msec: 4704
+        hash: "28e9ca60a873910380b2d22d6b3df565"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 109; y: 131
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4720
+        hash: "28e9ca60a873910380b2d22d6b3df565"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4736
+        hash: "18e53bf6337cf6590fc3c73c00469d8e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 115
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 110
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4752
+        hash: "81110f17d191f9795a2c57d136e86550"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 108; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4768
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 60
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4784
+        hash: "711274e9b6811b4662ac29d813574fb6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 102; y: 54
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 100; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4800
+        image: "enforcerange.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 4832
+        hash: "090a76cf068a5041ff993f21e6ebd087"
+    }
+    Frame {
+        msec: 4848
+        hash: "6b317b59e1b0f5b17a6d7d96e745f576"
+    }
+    Frame {
+        msec: 4864
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 4880
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 4896
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 4912
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 4928
+        hash: "81110f17d191f9795a2c57d136e86550"
+    }
+    Frame {
+        msec: 4944
+        hash: "30eb157c89ad0aeb17fd0012afb9246b"
+    }
+    Frame {
+        msec: 4960
+        hash: "f9fc8467c6dbcb00d1f41a57b550193c"
+    }
+    Frame {
+        msec: 4976
+        hash: "711274e9b6811b4662ac29d813574fb6"
+    }
+    Frame {
+        msec: 4992
+        hash: "d4b370ff8c3b66fc8a616dd9b944abd1"
+    }
+    Frame {
+        msec: 5008
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 5024
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 5040
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 5056
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 5072
+        hash: "81110f17d191f9795a2c57d136e86550"
+    }
+    Frame {
+        msec: 5088
+        hash: "30eb157c89ad0aeb17fd0012afb9246b"
+    }
+    Frame {
+        msec: 5104
+        hash: "6b317b59e1b0f5b17a6d7d96e745f576"
+    }
+    Frame {
+        msec: 5120
+        hash: "711274e9b6811b4662ac29d813574fb6"
+    }
+    Frame {
+        msec: 5136
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 5152
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 5168
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 5184
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 5200
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 5216
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 5232
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 5248
+        hash: "81110f17d191f9795a2c57d136e86550"
+    }
+    Frame {
+        msec: 5264
+        hash: "090a76cf068a5041ff993f21e6ebd087"
+    }
+    Frame {
+        msec: 5280
+        hash: "30eb157c89ad0aeb17fd0012afb9246b"
+    }
+    Frame {
+        msec: 5296
+        hash: "6b317b59e1b0f5b17a6d7d96e745f576"
+    }
+    Frame {
+        msec: 5312
+        hash: "f9fc8467c6dbcb00d1f41a57b550193c"
+    }
+    Frame {
+        msec: 5328
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 5344
+        hash: "d4b370ff8c3b66fc8a616dd9b944abd1"
+    }
+    Frame {
+        msec: 5360
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 5376
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 5392
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 5408
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 5424
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 5440
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 5456
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 5472
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 5488
+        hash: "81110f17d191f9795a2c57d136e86550"
+    }
+    Frame {
+        msec: 5504
+        hash: "090a76cf068a5041ff993f21e6ebd087"
+    }
+    Frame {
+        msec: 5520
+        hash: "090a76cf068a5041ff993f21e6ebd087"
+    }
+    Frame {
+        msec: 5536
+        hash: "30eb157c89ad0aeb17fd0012afb9246b"
+    }
+    Frame {
+        msec: 5552
+        hash: "6b317b59e1b0f5b17a6d7d96e745f576"
+    }
+    Frame {
+        msec: 5568
+        hash: "f9fc8467c6dbcb00d1f41a57b550193c"
+    }
+    Frame {
+        msec: 5584
+        hash: "f9fc8467c6dbcb00d1f41a57b550193c"
+    }
+    Frame {
+        msec: 5600
+        hash: "711274e9b6811b4662ac29d813574fb6"
+    }
+    Frame {
+        msec: 5616
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 5632
+        hash: "744227adbdd31be2920a232ea0dbc85d"
+    }
+    Frame {
+        msec: 5648
+        hash: "d4b370ff8c3b66fc8a616dd9b944abd1"
+    }
+    Frame {
+        msec: 5664
+        hash: "d4b370ff8c3b66fc8a616dd9b944abd1"
+    }
+    Frame {
+        msec: 5680
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 5696
+        hash: "674b07dc5b99bf2da93c40d42dc9023d"
+    }
+    Frame {
+        msec: 5712
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 5728
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 5744
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 5760
+        image: "enforcerange.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 5792
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 5808
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 5824
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 5840
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 5856
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 5872
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 5888
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 5904
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 5920
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 5936
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 5952
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 5968
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 5984
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6000
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6016
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6032
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6048
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6064
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6080
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6096
+        hash: "b061ee3784fbd4a287758ffd100a623e"
+    }
+    Frame {
+        msec: 6112
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 6128
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 6144
+        hash: "7eb75e8e83874d52448a7dbf6a0ad29c"
+    }
+    Frame {
+        msec: 6160
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 6176
+        hash: "70b475e88060ead84d05f0ba1b47c139"
+    }
+    Frame {
+        msec: 6192
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 6208
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 6224
+        hash: "87aaa82b96131fed8822e57e226162a0"
+    }
+    Frame {
+        msec: 6240
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 6256
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 6272
+        hash: "b64810845a97bedf6fe11c043457c197"
+    }
+    Frame {
+        msec: 6288
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6304
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6320
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6336
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6352
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6368
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6384
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6400
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6416
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6432
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6448
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6464
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6480
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6496
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6512
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6528
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6544
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6560
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6576
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6592
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6608
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6624
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6640
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+    Frame {
+        msec: 6656
+        hash: "a4ff6c6c43697808f9ad7387d152cef3"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/ListView/enforcerange.qml b/tests/auto/declarative/qmlvisual/ListView/enforcerange.qml
new file mode 100644
index 0000000..a796be7
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/ListView/enforcerange.qml
@@ -0,0 +1,31 @@
+import QtQuick 1.0
+
+Item {
+    id: document
+    width: 200; height: 200
+
+    ListView {
+        id: serviceListView
+        anchors.fill: parent
+        model: 100
+
+        preferredHighlightBegin: 90
+        preferredHighlightEnd: 90
+
+        highlightRangeMode: ListView.StrictlyEnforceRange
+
+        delegate: Component {
+            Item {
+                height: 15 + ((serviceListView.currentIndex == index) ? 20 : 0)
+                width: 200
+                Rectangle { width: 180; height: parent.height - 4; x: 10; y: 2; color: "red" }
+            }
+        }
+    }
+
+    Rectangle {
+        y: 90; width: 200; height: 35
+        border.color: "black"
+        color: "transparent"
+    }
+}
-- 
cgit v0.12


From 3cc9c5f2541f192733436c79c4d14aa34177c3cc Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 3 Nov 2010 16:38:20 +1000
Subject: highlightranges.qml example and visual test contained binding loop.
 Also, the currentIndex stayed -1 since the views all bound to each others
 currentIndex, which starts as -1.

Task-number: QTBUG-14794
Reviewed-by: Yann Bodson
---
 .../modelviews/listview/highlightranges.qml          | 20 +++++++++++---------
 .../auto/declarative/qmlvisual/ListView/listview.qml | 12 ++++++++----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/examples/declarative/modelviews/listview/highlightranges.qml b/examples/declarative/modelviews/listview/highlightranges.qml
index 2716ee5..58d37a3 100644
--- a/examples/declarative/modelviews/listview/highlightranges.qml
+++ b/examples/declarative/modelviews/listview/highlightranges.qml
@@ -42,15 +42,14 @@ import QtQuick 1.0
 import "content"
 
 Rectangle {
+    id: root
+    property int current: 0
     width: 600; height: 300
 
     // This example shows the same model in three different ListView items, 
     // with different highlight ranges. The highlight ranges are set by the 
     // preferredHighlightBegin and preferredHighlightEnd properties in ListView.
     //
-    // The second and third ListViews set their currentIndex to be the
-    // same as the first. The first ListView is given keyboard focus.
-    //
     // The first ListView does not set a highlight range, so its currentItem
     // can move freely within the visible area. If it moves outside the
     // visible area, the view is automatically scrolled to keep the current
@@ -66,9 +65,10 @@ Rectangle {
     // forces the current item to change when the view is flicked,
     // since the highlight is unable to move.
     //
-    // Note that the first ListView sets its currentIndex to be equal to
-    // the third ListView's currentIndex.  By flicking the third ListView with
-    // the mouse, the current index of the first ListView will be changed.
+    // All ListViews bind their currentIndex to the root.current property.
+    // The first ListView sets root.current whenever its currentIndex changes
+    // due to keyboard interaction.
+    // Flicking the third ListView with the mouse also changes root.current.
 
     ListView {
         id: list1
@@ -77,7 +77,8 @@ Rectangle {
         delegate: petDelegate
 
         highlight: Rectangle { color: "lightsteelblue" }
-        currentIndex: list3.currentIndex
+        currentIndex: root.current
+        onCurrentIndexChanged: root.current = currentIndex
         focus: true
     }
 
@@ -89,7 +90,7 @@ Rectangle {
         delegate: petDelegate
 
         highlight: Rectangle { color: "yellow" }
-        currentIndex: list1.currentIndex
+        currentIndex: root.current
         preferredHighlightBegin: 80; preferredHighlightEnd: 220
         highlightRangeMode: ListView.ApplyRange
     }
@@ -102,7 +103,8 @@ Rectangle {
         delegate: petDelegate
 
         highlight: Rectangle { color: "yellow" }
-        currentIndex: list1.currentIndex
+        currentIndex: root.current
+        onCurrentIndexChanged: root.current = currentIndex
         preferredHighlightBegin: 125; preferredHighlightEnd: 125
         highlightRangeMode: ListView.StrictlyEnforceRange
     }
diff --git a/tests/auto/declarative/qmlvisual/ListView/listview.qml b/tests/auto/declarative/qmlvisual/ListView/listview.qml
index 43c86a0..6171c75 100644
--- a/tests/auto/declarative/qmlvisual/ListView/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/listview.qml
@@ -1,7 +1,8 @@
 import QtQuick 1.0
 
 Rectangle {
-    property string skip: "Incorrect start: QTBUG-14794"
+    id: root
+    property int current: 0
     width: 600; height: 300; color: "white"
 
     ListModel {
@@ -57,7 +58,9 @@ Rectangle {
         id: list1
         width: 200; height: parent.height
         model: myModel; delegate: myDelegate
-        highlight: myHighlight; currentIndex: list3.currentIndex
+        highlight: myHighlight
+        currentIndex: root.current
+        onCurrentIndexChanged: root.current = currentIndex
         focus: true
     }
     ListView {
@@ -67,13 +70,14 @@ Rectangle {
         preferredHighlightBegin: 80
         preferredHighlightEnd: 220
         highlightRangeMode: "ApplyRange"
-        currentIndex: list1.currentIndex
+        currentIndex: root.current
     }
     ListView {
         id: list3
         x: 400; width: 200; height: parent.height
         model: myModel; delegate: myDelegate; highlight: myHighlight
-        currentIndex: list1.currentIndex
+        currentIndex: root.current
+        onCurrentIndexChanged: root.current = currentIndex
         preferredHighlightBegin: 125
         preferredHighlightEnd: 125
         highlightRangeMode: "StrictlyEnforceRange"
-- 
cgit v0.12


From 6382a038d6394135a4dc2d8e1e47133d9ea0b659 Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Wed, 3 Nov 2010 09:40:16 +0200
Subject: Qt/Symbian: QInputDialog layout and size are wrong

The QInputDialog with anything but QLineEdit as the input widget,
will show up as minimal size on device/emulator. Also, the dialog
looks bad since the widgets are deployed very close to the dialog
borders.

As a fix, layout will not get the size policy set on Symbian, but
the dialog itself is stretched to occupy screen width and thus, layout
grows to occupy the available size. Additionally, style will set layout
pixel metrics for dialogs larger than for other widgets, to avoid
the layout from putting widgets very close to dialog border.

Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
---
 src/gui/dialogs/qdialog.cpp      |  2 +-
 src/gui/dialogs/qinputdialog.cpp |  3 +++
 src/gui/styles/qs60style.cpp     | 22 ++++++++++++++++++++--
 src/gui/styles/qs60style_p.h     |  1 +
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index 9e0437c..b7a0026 100644
--- a/src/gui/dialogs/qdialog.cpp
+++ b/src/gui/dialogs/qdialog.cpp
@@ -1111,7 +1111,7 @@ QSize QDialog::sizeHint() const
     // if size is not fixed, try to adjust it according to S60 layoutting
     if (minimumSize() != maximumSize()) {
         // In S60, dialogs are always the width of screen (in portrait, regardless of current layout)
-        return QSize(qMax(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height());
+        return QSize(qMin(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height());
     } else {
         return QWidget::sizeHint();
     }
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index 700b234..abaaa49 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -231,7 +231,10 @@ void QInputDialogPrivate::ensureLayout()
     QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject()));
 
     mainLayout = new QVBoxLayout(q);
+    //we want to let the input dialog grow to available size on Symbian.
+#ifndef Q_OS_SYMBIAN
     mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+#endif
     mainLayout->addWidget(label);
     mainLayout->addWidget(inputWidget);
     mainLayout->addWidget(buttonBox);
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index d39a2ba..53ca28c 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -112,6 +112,8 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** End of generated data ***
 };
 
+QSet<const QWidget *> *QS60StylePrivate::m_autoFillDisabledWidgets = 0;
+
 const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0];
 
 // theme background texture
@@ -152,6 +154,8 @@ const double KTabFontMul = 0.72;
 
 QS60StylePrivate::~QS60StylePrivate()
 {
+    delete m_autoFillDisabledWidgets;
+    m_autoFillDisabledWidgets = 0;
     clearCaches(); //deletes also background image
     deleteThemePalette();
 #ifdef Q_WS_S60
@@ -2521,9 +2525,9 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const
             metricValue = QS60StylePrivate::pixelMetric(PM_LayoutLeftMargin);
     }
 
-    if (widget && (metric == PM_LayoutTopMargin))
+    if (widget && (metric == PM_LayoutTopMargin || metric == PM_LayoutLeftMargin || metric == PM_LayoutRightMargin))
         if (widget->windowType() == Qt::Dialog)
-            //double the top layout margin for dialogs, it is very close to real value
+            //double the layout margins (except bottom) for dialogs, it is very close to real value
             //without having to define custom pixel metric
             metricValue *= 2;
 
@@ -3184,6 +3188,13 @@ void QS60Style::polish(QWidget *widget)
     }
     d->setThemePalette(widget);
     d->setFont(widget);
+    
+    if (widget->autoFillBackground()) {
+        if (!d->m_autoFillDisabledWidgets)
+            d->m_autoFillDisabledWidgets = new QSet<const QWidget *>;
+        widget->setAutoFillBackground(false);
+        d->m_autoFillDisabledWidgets->insert(widget);
+    }
 }
 
 /*!
@@ -3218,6 +3229,13 @@ void QS60Style::unpolish(QWidget *widget)
 
     if (widget)
         widget->setPalette(QPalette());
+    
+    if (d->m_autoFillDisabledWidgets &&
+	    !d->m_autoFillDisabledWidgets->isEmpty() &&
+		d->m_autoFillDisabledWidgets->contains(widget)) {
+        widget->setAutoFillBackground(true);
+        d->m_autoFillDisabledWidgets->remove(widget);
+    }
 
 #if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR)
     if (QProgressBar *bar = qobject_cast<QProgressBar *>(widget)) {
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index b46f75e..3d66c40 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -625,6 +625,7 @@ private:
     static qint64 m_webPaletteKey;
 
     static QPointer<QWidget> m_pressedWidget;
+    static QSet<const QWidget *> *m_autoFillDisabledWidgets;
 
 #ifdef Q_WS_S60
     //list of progress bars having animation running
-- 
cgit v0.12


From 663cef92a8ee7cf7675c235cafdb4c1aab7e0ef3 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Wed, 3 Nov 2010 10:17:55 +0100
Subject: Doc: Fixing columns to display all elements in lists - css3

---
 doc/src/template/style/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 17665c0..faf17c8 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -101,7 +101,7 @@
     }
     a
     {
-        color: #44a51c;
+        color: #00732F;
         text-decoration: none;
     }
     hr
@@ -1008,7 +1008,7 @@
 	/*display:inline-block;*/
 	margin-left:10px;
 	min-width:250px;
-	line-height: 1.2;
+	line-height: 1.5;
 	min-width:100%;
 	min-height:15px;
 	}
-- 
cgit v0.12


From 56d8cf4eb5385aa2d8ad3730c7ffa779a47622d8 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Wed, 3 Nov 2010 10:33:20 +0100
Subject: Doc: updating the template to support search feature better.

---
 tools/qdoc3/test/qt-html-templates.qdocconf | 34 ++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 47b1e5f..30a63c8 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -9,6 +9,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
 			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+			  "    <div id="narrowsearch"></div>\n" \
 			  "    <div id=\"nav-topright\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
@@ -26,6 +27,37 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        </a></li>\n" \
 			  "      </ul>\n" \
 			  "     </div>\n" \
+			" <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
+			" 			<li><a href=\"#\">API Lookup</a> \n" \
+			" 				<ul> \n" \
+			" 					<li><a href=\"classes.html\">Class index</a></li> \n" \
+			"           <li><a href=\"functions.html\">Function index</a></li> \n" \
+			"           <li><a href=\"modules.html\">Modules</a></li> \n" \
+			"           <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+			"           <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
+			"           <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+			" 		    </ul> \n" \
+			" 			</li> \n" \
+			" 			<li><a href=\"#\">Qt Topics</a> \n" \
+			" 				<ul> \n" \
+			" 					   <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
+			" 					   <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
+			" 					   <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
+			" 					   <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
+			" 					   <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
+			" 					   <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
+			" 					   <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
+			" 		     </ul> \n" \
+			" 				</li> \n" \
+			" 				<li><a href=\"#\">Examples</a> \n" \
+			" 					<ul> \n" \
+			" 		              <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+			" 		              <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+			" 		              <li><a href=\"demos.html\">Demos</a></li> \n" \
+			" 		              <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+			" 		       </ul> \n" \
+			" 					</li> \n" \
+			" 				</ul> \n" \
 			  "    </div>\n" \
 			  "  </div>\n" \
 			  "  <div class=\"wrapper\">\n" \
@@ -36,7 +68,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "      <div class=\"sidebar\">\n" \
 			  "        <div class=\"searchlabel\">\n" \
 			  "          Search index:</div>\n" \
-			  "        <div class=\"search\">\n" \
+			  "        <div class=\"search\" id=\"sidebarsearch\">\n" \
 			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
 			  "            <fieldset>\n" \
 			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
-- 
cgit v0.12


From 42ac542a913c78abbb18196b27dfbeee93c6a66f Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Wed, 3 Nov 2010 11:16:33 +0100
Subject: Doc: fixing style - tool buttons to bold.

---
 doc/src/template/style/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index faf17c8..783178d 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -797,7 +797,7 @@
         margin-right: 15px;
         font-weight: bold;
         color: #B0ADAB;
-        font: 10px/1.2 Verdana;
+        font: bold 10px/1.2 Verdana;
     }
 
     .toolbuttons #print
-- 
cgit v0.12


From f23ec770df72e456a227f43a7d984bdb747f9043 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Wed, 3 Nov 2010 11:24:41 +0100
Subject: Doc: style tuning

---
 doc/src/template/style/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 783178d..16bc9ed 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -793,7 +793,7 @@
     {
         float: left;
         text-indent: -10px;
-     /*   margin-top: -5px;*/
+        margin-top: -5px;
         margin-right: 15px;
         font-weight: bold;
         color: #B0ADAB;
-- 
cgit v0.12


From 18b6067fa99004d1572e3d6b8fbc181729ad96be Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Wed, 3 Nov 2010 12:27:32 +0100
Subject: qdoc: Added next and previous links to top of pages.

Task-number: QTBUG-14979
---
 tools/qdoc3/htmlgenerator.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 7b719c8..fb04175 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1929,10 +1929,8 @@ void HtmlGenerator::generateHeader(const QString& title,
         }
     }
 
-#if 0 // Removed for new doc format. MWS
     if (node && !node->links().empty())
-        out() << "<p>\n" << navigationLinks << "</p>\n";
-#endif    
+        out() << "<p>\n" << navigationLinks << "</p><p/>\n";
 }
 
 void HtmlGenerator::generateTitle(const QString& title,
-- 
cgit v0.12


From acc1a2bd5520369c690c2769f067aec6bfd869f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Wed, 3 Nov 2010 12:10:01 +0100
Subject: Fixed grabWidget sometimes returning uninitialized memory.

Use a QImage initialized with transparent to prevent any translucent
parts of the widget to end up as garbage, and to ensure that the
resulting QPixmap ends up with an alpha format only when needed.

Task-number: QTBUG-14945
Reviewed-by: Kim
---
 src/gui/image/qpixmap.cpp          | 5 +++--
 tests/auto/qpixmap/tst_qpixmap.cpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 64d8ed2..290c0f0 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1101,10 +1101,11 @@ QPixmap QPixmap::grabWidget(QWidget * widget, const QRect &rect)
     if (!r.intersects(widget->rect()))
         return QPixmap();
 
-    QPixmap res(r.size());
+    QImage res(r.size(), QImage::Format_ARGB32_Premultiplied);
+    res.fill(0);
     widget->d_func()->render(&res, QPoint(), r, QWidget::DrawWindowBackground
                              | QWidget::DrawChildren | QWidget::IgnoreMask, true);
-    return res;
+    return QPixmap::fromImage(res);
 }
 
 /*!
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index fdf8311..a733d56 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -817,7 +817,7 @@ void tst_QPixmap::grabWidget()
     for (int row = 0; row < image.height(); ++row) {
         QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(row));
         for (int col = 0; col < image.width(); ++col)
-            line[col] = qRgb(rand() & 255, row, col);
+            line[col] = qRgba(rand() & 255, row, col, 127);
     }
 
     QPalette pal = widget.palette();
-- 
cgit v0.12


From b3ffd9aa12faeca6f35118182231a145f69f4ac7 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Wed, 3 Nov 2010 12:50:32 +0100
Subject: trivial: fix build

---
 src/network/kernel/qnetworkproxy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index d9d5918..84f9517 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -427,7 +427,7 @@ QNetworkProxy::QNetworkProxy()
     : d(0)
 {
     if (QGlobalNetworkProxy *globalProxy = globalNetworkProxy())
-        globalProx->init();
+        globalProxy->init();
 }
 
 /*!
@@ -443,7 +443,7 @@ QNetworkProxy::QNetworkProxy(ProxyType type, const QString &hostName, quint16 po
     : d(new QNetworkProxyPrivate(type, hostName, port, user, password))
 {
     if (QGlobalNetworkProxy *globalProxy = globalNetworkProxy())
-        globalProx->init();
+        globalProxy->init();
 }
 
 /*!
-- 
cgit v0.12


From 75648ab9c4f64830aa36753686bec1a8f91d2f7e Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Wed, 3 Nov 2010 13:04:04 +0100
Subject: Doc: Fixing typo

---
 src/plugins/graphicssystems/meego/dithering.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/dithering.cpp b/src/plugins/graphicssystems/meego/dithering.cpp
index 122c51e..1a2e3fa 100644
--- a/src/plugins/graphicssystems/meego/dithering.cpp
+++ b/src/plugins/graphicssystems/meego/dithering.cpp
@@ -76,7 +76,7 @@
 // Converts incoming RGB32 (QImage::Format_RGB32) to RGB565. Returns the newly allocated data.
 unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int height, int stride)
 {
-    // Output line stride. Alligned to 4 bytes.
+    // Output line stride. Aligned to 4 bytes.
     int alignedWidth = width;
     if (alignedWidth % 2 > 0)
         alignedWidth++;
@@ -191,7 +191,7 @@ unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int h
 // The output has each scan line aligned to 4 bytes (as expected by GL by default).
 unsigned short* convertARGB32_to_RGBA4444(const unsigned char *in, int width, int height, int stride)
 {
-    // Output line stride. Alligned to 4 bytes.
+    // Output line stride. Aligned to 4 bytes.
     int alignedWidth = width;
     if (alignedWidth % 2 > 0)
         alignedWidth++;
@@ -303,4 +303,4 @@ unsigned char* convertBGRA32_to_RGBA32(const unsigned char *in, int width, int h
     }
 
     return out;
-}
\ No newline at end of file
+}
-- 
cgit v0.12


From 3970bd54380a9438ce4765b0bb9a72d2b8bf2662 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 2 Nov 2010 19:59:21 +0100
Subject: more elegant treatment of qconfig.h special case

instead of injecting it only if it is not there yet, exclude it if it is
already there and then unconditionally inject it. this makes things more
deterministic.

Reviewed-by: joerg
---
 bin/syncqt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/syncqt b/bin/syncqt
index c73d119..0f64517 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -695,10 +695,7 @@ my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dis
 my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
 my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
 my %colliding_headers = ();
-my %inject_headers;
-# Force generation of forwarding header for qconfig.h if (and only if) we can't
-# find the header by normal means.
-%inject_headers = ( "$basedir/src/corelib/global" => ( "*qconfig.h" ) ) unless (-e "$basedir/src/corelib/global/qconfig.h");
+my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir
 
 foreach my $lib (@modules_to_sync) {
     #iteration info
@@ -800,7 +797,12 @@ foreach my $lib (@modules_to_sync) {
         #calc files and "copy" them
         foreach my $subdir (@subdirs) {
             my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
-            push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir});
+            if (defined $inject_headers{$subdir}) {
+                foreach my $if ($inject_headers{$subdir}) {
+                    @headers = grep(!/^\Q$if\E$/, @headers); #in case we configure'd previously
+                    push @headers, "*".$if;
+                }
+            }
             foreach my $header (@headers) {
                 my $shadow = ($header =~ s/^\*//);
                 $header = 0 if($header =~ /^ui_.*.h/);
-- 
cgit v0.12


From e890821c3c1042f425643facbbbb0e036f5304b6 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 3 Nov 2010 10:06:23 +0100
Subject: exclude headers in builddir from -copy option

Reviewed-by: joerg
---
 bin/syncqt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/syncqt b/bin/syncqt
index 0f64517..6c5729a 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -880,7 +880,7 @@ foreach my $lib (@modules_to_sync) {
                             @headers = ( "$out_basedir/include/$lib/private/$header" );
                         }
                         foreach(@headers) { #sync them
-                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers, $ts));
+                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers && !$shadow, $ts));
                         }
 
                         if($public_header) {
-- 
cgit v0.12


From fc60eb64d38289b448f73889139c94895b74db1a Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 3 Nov 2010 11:47:17 +0100
Subject: msvc: enable unreferenced code elimination in release with debuginfo
 builds

that linker optimization is on by default in release builds, so override
/DEBUG implicitly turning it off. as it happens, this implicitly
disables incremental linking, so that option can go away now.

Reviewed-by: joerg
Task-number: QTBUG-14007
---
 mkspecs/win32-msvc2003/qmake.conf | 2 +-
 mkspecs/win32-msvc2005/qmake.conf | 2 +-
 mkspecs/win32-msvc2008/qmake.conf | 2 +-
 mkspecs/win32-msvc2010/qmake.conf | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mkspecs/win32-msvc2003/qmake.conf b/mkspecs/win32-msvc2003/qmake.conf
index 63d1ffd..a573a4d 100644
--- a/mkspecs/win32-msvc2003/qmake.conf
+++ b/mkspecs/win32-msvc2003/qmake.conf
@@ -53,7 +53,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 265d028..aa58e30 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -55,7 +55,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 1432645..ee7b99a 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 84086e2..44e460e 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
-- 
cgit v0.12


From 0b9aa12659d5ea6b15fe72f963cc98db9af585fc Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 3 Nov 2010 16:39:25 +0100
Subject: Document the difference between +0.0 and -0.0 for QPointF and QSizeF.

Reviewed-by: Robert Griebl
---
 src/corelib/tools/qpoint.cpp | 6 +++++-
 src/corelib/tools/qsize.cpp  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp
index 66f06e9..c297709 100644
--- a/src/corelib/tools/qpoint.cpp
+++ b/src/corelib/tools/qpoint.cpp
@@ -438,8 +438,12 @@ QDebug operator<<(QDebug d, const QPointF &p)
 /*!
     \fn bool QPointF::isNull() const
 
-    Returns true if both the x and y coordinates are set to 0.0,
+    Returns true if both the x and y coordinates are set to +0.0;
     otherwise returns false.
+
+    \note Since this function treats +0.0 and -0.0 differently, points
+    with zero-valued coordinates where either or both values have a
+    negative sign are not defined to be null points.
 */
 
 
diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp
index 20ac344..12287ab 100644
--- a/src/corelib/tools/qsize.cpp
+++ b/src/corelib/tools/qsize.cpp
@@ -492,9 +492,13 @@ QDebug operator<<(QDebug dbg, const QSize &s) {
 /*!
     \fn bool QSizeF::isNull() const
 
-    Returns true if both the width and height is 0; otherwise returns
+    Returns true if both the width and height are +0.0; otherwise returns
     false.
 
+    \note Since this function treats +0.0 and -0.0 differently, sizes with
+    zero width and height where either or both values have a negative
+    sign are not defined to be null sizes.
+
     \sa isValid(), isEmpty()
 */
 
-- 
cgit v0.12


From fbe7375ad3dde9ce10202141ea7ffe78643088a6 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 3 Nov 2010 16:46:24 +0100
Subject: QNAM: Reset authenticator state properly between requests

Reset authenticator and fix operator=(...) of QAuthenticator.

Task-number: QTBUG-6792
Reviewed-by: ogoffart
---
 src/network/access/qhttpnetworkconnection.cpp |  7 +++++++
 src/network/kernel/qauthenticator.cpp         | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 89f9b03..4d27531 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -373,6 +373,13 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         // - If withCredentials has been set to false (e.g. by QtWebKit for a cross-origin XMLHttpRequest) then
         //   we need to bail out if authentication is required.
         if (priv->phase == QAuthenticatorPrivate::Done || !reply->request().withCredentials()) {
+            // Reset authenticator so the next request on that channel does not get messed up
+            auth = 0;
+            if (isProxy)
+                channels[i].proxyAuthenticator = QAuthenticator();
+            else
+                channels[i].authenticator = QAuthenticator();
+
             // authentication is cancelled, send the current contents to the user.
             emit channels[i].reply->headerChanged();
             emit channels[i].reply->readyRead();
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index 220f7da..73f6b94 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -164,9 +164,13 @@ QAuthenticator &QAuthenticator::operator=(const QAuthenticator &other)
 {
     if (d == other.d)
         return *this;
-    detach();
-    d->user = other.d->user;
-    d->password = other.d->password;
+
+    if (d && !d->ref.deref())
+        delete d;
+
+    d = other.d;
+    if (d)
+        d->ref.ref();
     return *this;
 }
 
-- 
cgit v0.12


From 163443583b8242d11d2a821db1863c4773bc624c Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 3 Nov 2010 16:57:08 +0100
Subject: Doc: Mentioned default values for the BorderImage tile modes.

---
 src/declarative/graphicsitems/qdeclarativeborderimage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index c58a08d..649c8fb 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -361,6 +361,8 @@ QDeclarativeScaleGrid *QDeclarativeBorderImage::border()
     \o BorderImage.Repeat - Tile the image until there is no more space. May crop the last image.
     \o BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
     \endlist
+
+    The default tile mode for each property is BorderImage.Stretch.
 */
 QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::horizontalTileMode() const
 {
-- 
cgit v0.12


From 9e8083d09954c9886565bcd122fd3c6e0f95a030 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 3 Nov 2010 17:08:28 +0100
Subject: Doc: Added more instructions to help with device file permissions.

---
 doc/src/platforms/emb-pointer.qdoc             | 7 +++++--
 doc/src/snippets/code/doc_src_emb-pointer.qdoc | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/src/platforms/emb-pointer.qdoc b/doc/src/platforms/emb-pointer.qdoc
index 22935b4..81e532f 100644
--- a/doc/src/platforms/emb-pointer.qdoc
+++ b/doc/src/platforms/emb-pointer.qdoc
@@ -186,8 +186,11 @@
     device file. Some drivers also require write access to the device file. 
     For instance, if you have specified the mouse driver with
     \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 11
-    then examine the permissions of the device file by entering the following
-    command in a console:
+    then examine the permissions of the device file by entering the
+    following command in a console:
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc show permissions
+    Change the permissions of the device file, if necessary, in the following
+    way:
     \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 12
 
     If the device file is actually a symbolic link to another file, you must
diff --git a/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
index d333c90..b051a98 100644
--- a/doc/src/snippets/code/doc_src_emb-pointer.qdoc
+++ b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
@@ -104,6 +104,10 @@ QWS_MOUSE_PROTO=IntelliMouse:/dev/input/mouse0
 //! [11]
 
 
+//! [show permissions]
+ls -l /dev/input/mouse0
+//! [show permissions]
+
 //! [12]
 chmod a+rw /dev/input/mouse0
 //! [12]
-- 
cgit v0.12


From deb2ace2a31ae9881ef335f0f6c4f523879f01f9 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Date: Wed, 3 Nov 2010 17:22:40 +0100
Subject: Doc: using pointer member variables and language change

Reviewed-by: Friedemann Kleint
Reviewed-by: Martin Smith
---
 doc/src/development/designer-manual.qdoc | 156 ++++++++++++++++++++++++-------
 1 file changed, 124 insertions(+), 32 deletions(-)

diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc
index b30a700..df82fba 100644
--- a/doc/src/development/designer-manual.qdoc
+++ b/doc/src/development/designer-manual.qdoc
@@ -1769,37 +1769,54 @@ pixmap property in the property editor.
 
     \title Using a Designer UI File in Your Application
 
-    With Qt's integrated build tools, \l{qmake Manual}{qmake} and \l uic, the
-    code for user interface components created with \QD is automatically
-    generated when the rest of your application is built. Forms can be included
-    and used directly from your application. Alternatively, you can use them to
-    extend subclasses of standard widgets. These forms can be processed at
-    compile time or at run time, depending on the approach used.
+    Qt Designer UI files represent the widget tree of the form in XML format. The
+    forms can be processed:
 
+    \list
+        \o \l{Compile Time Form Processing}{At compile time}, which means that forms
+            are converted to C++ code that can be compiled.
+        \o \l{Run Time Form Processing}{At runtime}, which means that forms are processed
+            by the QUiLoader class that dynamically constructs the widget tree while
+            parsing the XML file.
+    \endlist
 
     \tableofcontents
     \section1 Compile Time Form Processing
 
+    You create user interface components with \QD and use Qt's integrated build tools,
+    \l{qmake Manual}{qmake} and \l{User Interface Compiler (uic)}{uic}, to generate code
+    for them when the application is built. The generated code contains the form's user
+    interface object. It is a C++ struct that contains:
+
+    \list
+        \o Pointers to the form's widgets, layouts, layout items,
+           button groups, and actions.
+        \o A member function called \c setupUi() to build the widget tree
+           on the parent widget.
+        \o A member function called \c retranslateUi() that handles the
+           translation of the string properties of the form. For more information,
+           see \l{Reacting to Language Changes}.
+    \endlist
+
+    The generated code can be included in your application and used directly from
+    it. Alternatively, you can use it to extend subclasses of standard widgets.
+
     A compile time processed form can be used in your application with one of
     the following approaches:
 
     \list
-        \o  The Direct Approach: you construct a widget to use as a placeholder
+        \o  \l{The Direct Approach}: you construct a widget to use as a placeholder
             for the component, and set up the user interface inside it.
-        \o  The Single Inheritance Approach: you subclass the form's base class
+        \o  \l{The Single Inheritance Approach}: you subclass the form's base class
             (QWidget or QDialog, for example), and include a private instance
             of the form's user interface object.
-        \o  The MultipleInheritance Approach: you subclass both the form's base
+        \o  \l{The Multiple Inheritance Approach}: you subclass both the form's base
             class and the form's user interface object. This allows the widgets
             defined in the form to be used directly from within the scope of
             the subclass.
     \endlist
 
-
-    \section2 The Direct Approach
-
-    To demonstrate how to use user interface (UI) files straight from
-    \QD, we create a simple Calculator Form application. This is based on the
+    To demonstrate, we create a simple Calculator Form application. It is based on the
     original \l{Calculator Form Example}{Calculator Form} example.
 
     The application consists of one source file, \c main.cpp and a UI
@@ -1817,15 +1834,18 @@ pixmap property in the property editor.
     The special feature of this file is the \c FORMS declaration that tells
     \c qmake which files to process with \c uic. In this case, the
     \c calculatorform.ui file is used to create a \c ui_calculatorform.h file
-    that can be used by any file listed in the \c SOURCES declaration. To
-    ensure that \c qmake generates the \c ui_calculatorform.h file, we need to
-    include it in a file listed in \c SOURCES. Since we only have \c main.cpp,
-    we include it there:
+    that can be used by any file listed in the \c SOURCES declaration.
 
-    \snippet doc/src/snippets/uitools/calculatorform/main.cpp 0
+    \note You can use Qt Creator to create the Calculator Form project. It
+    automatically generates the main.cpp, UI, and .pro files, which you can
+    then modify.
+
+    \section2 The Direct Approach
 
-    This include is an additional check to ensure that we do not generate code
-    for UI files that are not used.
+    To use the direct approach, we include the \c ui_calculatorform.h file
+    directly in \c main.cpp:
+
+    \snippet doc/src/snippets/uitools/calculatorform/main.cpp 0
 
     The \c main function creates the calculator widget by constructing a
     standard QWidget that we use to host the user interface described by the
@@ -1837,23 +1857,33 @@ pixmap property in the property editor.
     from the \c ui_calculatorform.h file that sets up all the dialog's widgets
     and the connections between its signals and slots.
 
-    This approach provides a quick and easy way to use simple, self-contained
-    components in your applications, but many componens created with \QD will
+    The direct approach provides a quick and easy way to use simple, self-contained
+    components in your applications. However, componens created with \QD often
     require close integration with the rest of the application code. For
     instance, the \c CalculatorForm code provided above will compile and run,
     but the QSpinBox objects will not interact with the QLabel as we need a
     custom slot to carry out the add operation and display the result in the
-    QLabel. To achieve this, we need to subclass a standard Qt widget (known as
-    the single inheritance approach).
-
+    QLabel. To achieve this, we need to use the single inheritance approach.
 
     \section2 The Single Inheritance Approach
 
+    To use the single inheritance approach, we subclass a standard Qt widget and
+    include a private instance of the form's user interface object. This can take
+    the form of:
+
+    \list
+        \o A member variable
+        \o A pointer member variable
+    \endlist
+
+    \section3 Using a Member Variable
+
     In this approach, we subclass a Qt widget and set up the user interface
     from within the constructor. Components used in this way expose the widgets
     and layouts used in the form to the Qt widget subclass, and provide a
     standard system for making signal and slot connections between the user
     interface and other objects in your application.
+    The generated \c{Ui::CalculatorForm} structure is a member of the class.
 
     This approach is used in the \l{Calculator Form Example}{Calculator Form}
     example.
@@ -1893,6 +1923,52 @@ pixmap property in the property editor.
     them. This approach can be used to create individual tabs from existing
     forms, for example.
 
+    \section3 Using a Pointer Member Variable
+
+    Alternatively, the \c{Ui::CalculatorForm} structure can be made a pointer
+    member of the class. The header then looks as follows:
+
+    \code
+
+    namespace Ui {
+        class CalculatorForm;
+    }
+
+    class CalculatorForm : public QWidget
+    ...
+    virtual ~CalculatorForm();
+    ...
+    private:
+        Ui::CalculatorForm *ui;
+    ...
+
+    \endcode
+
+    The corresponding source file looks as follows:
+
+    \code
+    #include "ui_calculatorform.h"
+
+    CalculatorForm::CalculatorForm(QWidget *parent) :
+        QWidget(parent), ui(new Ui::CalculatorForm)
+    {
+        ui->setupUi(this);
+    }
+
+    CalculatorForm::~CalculatorForm()
+    {
+        delete ui;
+    }
+    \endcode
+
+    The advantage of this approach is that the user interface object can be
+    forward-declared, which means that we do not have to include the generated
+    \c ui_calculatorform.h file in the header. The form can then be changed without
+    recompiling the dependent source files. This is particularly important if the
+    class is subject to binary compatibility restrictions.
+
+    We generally recommend this approach for libraries and large applications.
+    For more information, see \l{Creating Shared Libraries}.
 
     \section2 The Multiple Inheritance Approach
 
@@ -1906,13 +1982,14 @@ pixmap property in the property editor.
     {Multiple Inheritance} example.
 
     We need to include the header file that \c uic generates from the
-    \c calculatorform.ui file:
+    \c calculatorform.ui file, as follows:
 
     \snippet examples/uitools/multipleinheritance/calculatorform.h 0
 
     The class is defined in a similar way to the one used in the
     \l{The Single Inheritance Approach}{single inheritance approach}, except that
-    this time we inherit from \e{both} QWidget and \c{Ui::CalculatorForm}:
+    this time we inherit from \e{both} QWidget and \c{Ui::CalculatorForm},
+    as follows:
 
     \snippet examples/uitools/multipleinheritance/calculatorform.h 1
 
@@ -1931,11 +2008,26 @@ pixmap property in the property editor.
     same say as a widget created in code by hand. We no longer require the
     \c{ui} prefix to access them.
 
-    Subclassing using multiple inheritance gives us more direct access to the
-    contents of the form, is slightly cleaner than the single inheritance
-    approach, but does not conveniently support composition of multiple user
-    interfaces.
+    \section2 Reacting to Language Changes
+
+    Qt notifies applications if the user interface language changes by sending an
+    event of the type QEvent::LanguageChange. To call the member function
+    \c retranslateUi() of the user interface object, we reimplement
+    \c QWidget::changeEvent() in the form class, as follows:
 
+    \code
+    void CalculatorForm::changeEvent(QEvent *e)
+    {
+        QWidget::changeEvent(e);
+        switch (e->type()) {
+        case QEvent::LanguageChange:
+            ui->retranslateUi(this);
+            break;
+        default:
+            break;
+       }
+    }
+    \endcode
 
     \section1 Run Time Form Processing
 
-- 
cgit v0.12


From 5a20a7b87220dd33792b5c25ea809a0e5f93a93b Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 3 Nov 2010 17:17:47 +0100
Subject: tst_qnetworkreply: Add testcase for unknown authentication method

Task-number: QTBUG-4121
Reviewed-by: ogoffart
---
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 5196ed2..8850e6e 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -295,6 +295,8 @@ private Q_SLOTS:
 
     void getFromUnreachableIp();
 
+    void qtbug4121unknownAuthentication();
+
     // NOTE: This test must be last!
     void parentingRepliesToTheApp();
 };
@@ -4598,6 +4600,7 @@ void tst_QNetworkReply::qtbug12908compressedHttpReply()
     QCOMPARE(reply->error(), QNetworkReply::NoError);
 }
 
+// TODO add similar test for FTP
 void tst_QNetworkReply::getFromUnreachableIp()
 {
     QNetworkAccessManager manager;
@@ -4612,6 +4615,35 @@ void tst_QNetworkReply::getFromUnreachableIp()
     QVERIFY(reply->error() != QNetworkReply::NoError);
 }
 
+void tst_QNetworkReply::qtbug4121unknownAuthentication()
+{
+    MiniHttpServer server(QByteArray("HTTP/1.1 401 bla\r\nWWW-Authenticate: crap\r\nContent-Length: 0\r\n\r\n"));
+    server.doClose = false;
+
+    QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
+    QNetworkAccessManager manager;
+    QNetworkReplyPtr reply = manager.get(request);
+
+    qRegisterMetaType<QNetworkReply*>("QNetworkReply*");
+    qRegisterMetaType<QAuthenticator*>("QAuthenticator*");
+    QSignalSpy authSpy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)));
+    QSignalSpy finishedSpy(&manager, SIGNAL(finished(QNetworkReply*)));
+    qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
+    QSignalSpy errorSpy(reply, SIGNAL(error(QNetworkReply::NetworkError)));
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    QCOMPARE(authSpy.count(), 0);
+    QCOMPARE(finishedSpy.count(), 1);
+    QCOMPARE(errorSpy.count(), 1);
+
+    QCOMPARE(reply->error(), QNetworkReply::AuthenticationRequiredError);
+}
+
+
+
 // NOTE: This test must be last testcase in tst_qnetworkreply!
 void tst_QNetworkReply::parentingRepliesToTheApp()
 {
-- 
cgit v0.12


From 526fbec417fcdae715cba56fbb01182fa25a2c04 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 3 Nov 2010 17:50:09 +0100
Subject: Doc: Added a snippet showing the default BorderImage tiling behavior.

---
 .../borderimage/borderimage-defaults.qml           | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 doc/src/snippets/declarative/borderimage/borderimage-defaults.qml

diff --git a/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml b/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml
new file mode 100644
index 0000000..1888f4e
--- /dev/null
+++ b/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: page
+    color: "white"
+    width: 180; height: 180
+
+//! [tiled border image]
+BorderImage {
+    width: 180; height: 180
+    border { left: 30; top: 30; right: 30; bottom: 30 }
+    source: "pics/borderframe.png"
+}
+//! [tiled border image]
+}
-- 
cgit v0.12


From 4c400ec8e397b4da9898f96c50a702eaa362293d Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Date: Mon, 25 Oct 2010 22:28:31 +0200
Subject: PinchGesture: lastRotationAngle should start at 0.

Reviewed-by: Zeno Albisser
---
 src/gui/kernel/qstandardgestures.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index 1821c3d..7336c84 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -224,7 +224,7 @@ QGestureRecognizer::Result QPinchGestureRecognizer::recognize(QGesture *state,
                 startAngle -= 360;
             const qreal rotationAngle = startAngle - angle;
             if (d->isNewSequence)
-                d->lastRotationAngle = rotationAngle;
+                d->lastRotationAngle = 0.0;
             else
                 d->lastRotationAngle = d->rotationAngle;
             d->rotationAngle = rotationAngle;
-- 
cgit v0.12


From b37fa034257673a43783a54bb66328c82a0c7ef1 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Date: Mon, 25 Oct 2010 23:28:37 +0200
Subject: The lastCenterPoint should be equal to centerPoint for new gestures.

Reviewed-by: Zeno Albisser
---
 src/gui/kernel/qstandardgestures.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index 7336c84..48b7ac1 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -194,13 +194,15 @@ QGestureRecognizer::Result QPinchGestureRecognizer::recognize(QGesture *state,
             d->hotSpot = p1.screenPos();
             d->isHotSpotSet = true;
 
+            QPointF centerPoint = (p1.screenPos() + p2.screenPos()) / 2.0;
             if (d->isNewSequence) {
                 d->startPosition[0] = p1.screenPos();
                 d->startPosition[1] = p2.screenPos();
+                d->lastCenterPoint = centerPoint;
+            } else {
+                d->lastCenterPoint = d->centerPoint;
             }
-
-            d->lastCenterPoint = d->centerPoint;
-            d->centerPoint = (p1.screenPos() + p2.screenPos()) / 2.0;
+            d->centerPoint = centerPoint;
 
             d->changeFlags |= QPinchGesture::CenterPointChanged;
 
-- 
cgit v0.12


From d8416650ae9d345f289bd697461891dede7c410c Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 3 Nov 2010 19:17:47 +0100
Subject: Doc: Clarified the lifetime of the session bus connection.

Reviewed-by: Thiago Macieira
---
 src/dbus/qdbusconnection.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index bf771a8..f68a8ca 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -140,9 +140,9 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP
     \fn QDBusConnection &QDBusConnection::sessionBus()
     \relates QDBusConnection
 
-    Returns a QDBusConnection object opened with the session bus. The object reference returned
-    by this function is valid until the QCoreApplication's destructor is run, when the
-    connection will be closed and the object, deleted.
+    Returns a QDBusConnection object opened with the session bus. The object
+    reference returned by this function is valid until the application terminates,
+    at which point the connection will be closed and the object deleted.
 */
 /*!
     \fn QDBusConnection &QDBusConnection::systemBus()
-- 
cgit v0.12


From bee2335bbb3cbfe0e2d1184ca22835b0cf15fb7b Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 4 Nov 2010 11:05:14 +1000
Subject: Doc fix

The associated bug report is invalid, but this doc fix helps people
understand why (so that they never mistakenly file it again).

Task-number: QTBUG-14950
---
 doc/src/declarative/dynamicobjects.qdoc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index 3921d3e..daf2ae1 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -173,7 +173,11 @@ component. Each instance runs a NumberAnimation, and when the animation has fini
 Alternatively, the \c application.qml could have destroyed the created object
 by calling \c object.destroy().
 
-Notice that if a \c SelfDestroyingRect instance was created statically like this:
+Note that it is safe to call destroy() on an object within that object. Objects are not destroyed the
+instant destroy() is called, but are cleaned up sometime between the end of that script block and the next frame
+(unless you specified a non-zero delay).
+
+Note also that if a \c SelfDestroyingRect instance was created statically like this:
 
 \qml
 Item {
-- 
cgit v0.12


From 59d4e2022095d8363cd5373a1a74f86a448c3542 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 4 Nov 2010 12:41:28 +1000
Subject: Add testcase for QTBUG-13719.

---
 .../data/ConstantsOverrideBindings.qml                    |  6 ++++++
 .../data/constantsOverrideBindings.4.qml                  | 11 +++++++++++
 .../qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 15 +++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
index b4a702b..07bb16b 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
@@ -3,4 +3,10 @@ import Qt.test 1.0
 MyQmlObject {
     property int c1: 0
     property int c2: c1
+    property alias c3: inner.ic1
+
+    objectProperty: MyQmlObject {
+        id: inner
+        property int ic1: c1
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml
new file mode 100644
index 0000000..5a2091f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.4.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property alias c1: myConstants.c1
+    property alias c3: myConstants.c3
+
+    objectProperty: ConstantsOverrideBindings { 
+        id: myConstants
+        c3: 10
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 72e2e10..3dd69da 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -733,6 +733,21 @@ void tst_qdeclarativeecmascript::constantsOverrideBindings()
         QCOMPARE(object->property("c2").toInt(), 13);
     }
 #endif
+
+    // Using an alias
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.4.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c1").toInt(), 0);
+        QEXPECT_FAIL("", "QTBUG-13719", Continue);
+        QCOMPARE(object->property("c3").toInt(), 10);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c1").toInt(), 9);
+        QEXPECT_FAIL("", "QTBUG-13719", Continue);
+        QCOMPARE(object->property("c3").toInt(), 10);
+    }
 }
 
 /*
-- 
cgit v0.12


From f1344a817fdb3d263bd64f4440fedc73ad94ad31 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 4 Nov 2010 13:00:50 +1000
Subject: Don't emit xChanged()/yChanged() twice. Once from QGraphicsObject
 (QGraphicsItemPrivate::setPosHelper()) and once from
 QDeclarativeItem::geometryChanged().  Remove from geometryChanged().

Task-number: QTBUG-14942
Reviewed-by: Michael Brasser
---
 src/declarative/graphicsitems/qdeclarativeitem.cpp             |  4 ----
 .../auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 95a4fd6..e0df751 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1955,12 +1955,8 @@ void QDeclarativeItem::geometryChanged(const QRectF &newGeometry,
             change.listener->itemGeometryChanged(this, newGeometry, oldGeometry);
     }
 
-    if (newGeometry.x() != oldGeometry.x())
-        emit xChanged();
     if (newGeometry.width() != oldGeometry.width())
         emit widthChanged();
-    if (newGeometry.y() != oldGeometry.y())
-        emit yChanged();
     if (newGeometry.height() != oldGeometry.height())
         emit heightChanged();
 }
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index b4903ae..711bf00 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -686,6 +686,8 @@ void tst_QDeclarativeItem::propertyChanges()
     QSignalSpy focusSpy(item, SIGNAL(focusChanged(bool)));
     QSignalSpy wantsFocusSpy(parentItem, SIGNAL(activeFocusChanged(bool)));
     QSignalSpy childrenChangedSpy(parentItem, SIGNAL(childrenChanged()));
+    QSignalSpy xSpy(item, SIGNAL(xChanged()));
+    QSignalSpy ySpy(item, SIGNAL(yChanged()));
 
     item->setParentItem(parentItem);
     item->setWidth(100.0);
@@ -731,6 +733,14 @@ void tst_QDeclarativeItem::propertyChanges()
     QCOMPARE(parentItem->hasFocus(), false);
     QCOMPARE(wantsFocusSpy.count(),0);
 
+    item->setX(10.0);
+    QCOMPARE(item->x(), 10.0);
+    QCOMPARE(xSpy.count(), 1);
+
+    item->setY(10.0);
+    QCOMPARE(item->y(), 10.0);
+    QCOMPARE(ySpy.count(), 1);
+
     delete canvas;
 }
 
-- 
cgit v0.12


From adc6d4776e6570fa6e6d5d2e4e40fe7eab0ebb99 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Thu, 4 Nov 2010 13:45:46 +1000
Subject: Fix bearermonitor when building for Maemo in scratchbox.

Use the correct ui file when building in scratchbox.
Remove use of message boxes.
---
 examples/network/bearermonitor/bearermonitor.cpp   |  22 +-
 examples/network/bearermonitor/bearermonitor.h     |   4 +-
 examples/network/bearermonitor/bearermonitor.pro   |   3 +-
 .../network/bearermonitor/bearermonitor_maemo.ui   | 601 +++++++++++----------
 examples/network/bearermonitor/main.cpp            |   9 +-
 examples/network/bearermonitor/sessionwidget.cpp   |   4 +-
 examples/network/bearermonitor/sessionwidget.h     |   5 +-
 7 files changed, 353 insertions(+), 295 deletions(-)

diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 2c976ff..75ffb01 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -41,8 +41,8 @@
 #include "bearermonitor.h"
 #include "sessionwidget.h"
 
-#include <QDebug>
-#include <QMessageBox>
+#include <QtCore/QDebug>
+
 #ifdef Q_OS_WIN
 #include <winsock2.h>
 #undef interface
@@ -56,20 +56,18 @@ BearerMonitor::BearerMonitor(QWidget *parent)
 :   QWidget(parent)
 {
     setupUi(this);
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
     newSessionButton->hide();
     deleteSessionButton->hide();
 #else
     delete tabWidget->currentWidget();
     sessionGroup->hide();
 #endif
-#if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(MAEMO_UI)
     setWindowState(Qt::WindowMaximized);
 #endif
     updateConfigurations();
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty());
-#endif
     QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration();
     for (int i = 0; i < treeWidget->topLevelItemCount(); ++i) {
         QTreeWidgetItem *item = treeWidget->topLevelItem(i);
@@ -104,7 +102,7 @@ BearerMonitor::BearerMonitor(QWidget *parent)
 
     connect(newSessionButton, SIGNAL(clicked()),
             this, SLOT(createNewSession()));
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
     connect(deleteSessionButton, SIGNAL(clicked()),
             this, SLOT(deleteSession()));
 #endif
@@ -257,15 +255,9 @@ void BearerMonitor::updateConfigurations()
 void BearerMonitor::onlineStateChanged(bool isOnline)
 {
     if (isOnline)
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
-        QMessageBox::information(this, "Connection state changed", "Online", QMessageBox::Close);
-    else
-        QMessageBox::information(this, "Connection state changed", "Offline", QMessageBox::Close);
-#else
         onlineState->setText(tr("Online"));
     else
         onlineState->setText(tr("Offline"));
-#endif
 }
 
 #ifdef Q_OS_WIN
@@ -393,7 +385,7 @@ void BearerMonitor::createSessionFor(QTreeWidgetItem *item)
 
     tabWidget->addTab(session, conf.name());
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
     sessionGroup->show();
 #endif
 
@@ -408,7 +400,7 @@ void BearerMonitor::createNewSession()
     createSessionFor(item);
 }
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
 void BearerMonitor::deleteSession()
 {
     SessionWidget *session = qobject_cast<SessionWidget *>(tabWidget->currentWidget());
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index 45e7275..df1c78b 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -45,7 +45,7 @@
 #include <qnetworksession.h>
 #if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE)	
 #include "ui_bearermonitor_240_320.h"
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#elif defined(MAEMO_UI)
 #include "ui_bearermonitor_maemo.h"
 #else
 #include "ui_bearermonitor_640_480.h"
@@ -81,7 +81,7 @@ private slots:
 
     void createSessionFor(QTreeWidgetItem *item);
     void createNewSession();
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
     void deleteSession();
 #endif
     void performScan();
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index 4b2c35b..bd9bd68 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -8,7 +8,8 @@ SOURCES = main.cpp \
           bearermonitor.cpp \
           sessionwidget.cpp
 
-maemo5|maemo6 {
+maemo5|maemo6|linux-g++-maemo {
+  DEFINES += MAEMO_UI
   FORMS = bearermonitor_maemo.ui \
           sessionwidget_maemo.ui
 } else {
diff --git a/examples/network/bearermonitor/bearermonitor_maemo.ui b/examples/network/bearermonitor/bearermonitor_maemo.ui
index a7940c6..9c72bfd 100644
--- a/examples/network/bearermonitor/bearermonitor_maemo.ui
+++ b/examples/network/bearermonitor/bearermonitor_maemo.ui
@@ -7,300 +7,359 @@
     <x>0</x>
     <y>0</y>
     <width>612</width>
-    <height>495</height>
+    <height>555</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>BearerMonitor</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
    <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QGroupBox" name="systemState">
+     <property name="title">
+      <string>System State</string>
      </property>
-     <property name="currentIndex">
-      <number>0</number>
+     <property name="flat">
+      <bool>true</bool>
      </property>
-     <property name="usesScrollButtons">
-      <bool>false</bool>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="onlineStateLabel">
+        <property name="text">
+         <string>Online State:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="onlineState">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="configurations">
+     <property name="title">
+      <string>Configurations &amp;&amp; Sessions</string>
      </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Configurations</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QTreeWidget" name="treeWidget">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <attribute name="headerVisible">
-          <bool>false</bool>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QTabWidget" name="tabWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <property name="usesScrollButtons">
+         <bool>false</bool>
+        </property>
+        <widget class="QWidget" name="tab">
+         <attribute name="title">
+          <string>Configurations</string>
          </attribute>
-         <column>
-          <property name="text">
-           <string>1</string>
-          </property>
-         </column>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <layout class="QHBoxLayout" name="configurationNameLayout">
-           <item>
-            <widget class="QLabel" name="configurationNameLabel">
-             <property name="text">
-              <string>Name:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationName">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationStateLayout">
-           <item>
-            <widget class="QLabel" name="configurationStateLabel">
-             <property name="text">
-              <string>State:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationState">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationTypeLayout">
-           <item>
-            <widget class="QLabel" name="configurationTypeLabel">
-             <property name="text">
-              <string>Type:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationType">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>Invalid</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationPurposeLayout">
-           <item>
-            <widget class="QLabel" name="configurationPurposeLabel">
-             <property name="text">
-              <string>Purpose:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationPurpose">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>Unknown</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationIdentifierLayout">
-           <item>
-            <widget class="QLabel" name="configurationIdentifierLabel">
-             <property name="text">
-              <string>Identifier:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationIdentifier">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationRoamingLayout">
-           <item>
-            <widget class="QLabel" name="configurationRoamingLabel">
-             <property name="text">
-              <string>Roaming:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationRoaming">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationChildrenLayout">
-           <item>
-            <widget class="QLabel" name="configurationChildrenLabel">
-             <property name="text">
-              <string>Children:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationChildren">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QTreeWidget" name="treeWidget">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="rootIsDecorated">
+             <bool>false</bool>
+            </property>
+            <attribute name="headerVisible">
+             <bool>false</bool>
+            </attribute>
+            <column>
              <property name="text">
-              <string/>
+              <string>1</string>
              </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="nlaGroup">
-           <property name="title">
-            <string>Network Location Awareness</string>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout">
+            </column>
+           </widget>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <item>
+             <layout class="QHBoxLayout" name="configurationNameLayout">
+              <item>
+               <widget class="QLabel" name="configurationNameLabel">
+                <property name="text">
+                 <string>Name:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationName">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationStateLayout">
+              <item>
+               <widget class="QLabel" name="configurationStateLabel">
+                <property name="text">
+                 <string>State:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationState">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationTypeLayout">
+              <item>
+               <widget class="QLabel" name="configurationTypeLabel">
+                <property name="text">
+                 <string>Type:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationType">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Invalid</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationPurposeLayout">
+              <item>
+               <widget class="QLabel" name="configurationPurposeLabel">
+                <property name="text">
+                 <string>Purpose:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationPurpose">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Unknown</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationIdentifierLayout">
+              <item>
+               <widget class="QLabel" name="configurationIdentifierLabel">
+                <property name="text">
+                 <string>Identifier:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationIdentifier">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationRoamingLayout">
+              <item>
+               <widget class="QLabel" name="configurationRoamingLabel">
+                <property name="text">
+                 <string>Roaming:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationRoaming">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationChildrenLayout">
+              <item>
+               <widget class="QLabel" name="configurationChildrenLabel">
+                <property name="text">
+                 <string>Children:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationChildren">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="nlaGroup">
+              <property name="title">
+               <string>Network Location Awareness</string>
+              </property>
+              <layout class="QHBoxLayout" name="horizontalLayout">
+               <item>
+                <widget class="QPushButton" name="registerButton">
+                 <property name="text">
+                  <string>Register</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="unregisterButton">
+                 <property name="text">
+                  <string>Unregister</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
             <item>
-             <widget class="QPushButton" name="registerButton">
+             <widget class="QPushButton" name="newSessionButton">
               <property name="text">
-               <string>Register</string>
+               <string>New Session</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="unregisterButton">
+             <widget class="QPushButton" name="deleteSessionButton">
               <property name="text">
-               <string>Unregister</string>
+               <string>Delete Session</string>
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QPushButton" name="scanButton">
+              <property name="text">
+               <string>Scan</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QProgressBar" name="progressBar">
+              <property name="maximum">
+               <number>0</number>
+              </property>
+              <property name="value">
+               <number>23280</number>
+              </property>
+              <property name="textVisible">
+               <bool>false</bool>
+              </property>
+              <property name="invertedAppearance">
+               <bool>false</bool>
+              </property>
+              <property name="format">
+               <string>%p%</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="newSessionButton">
-           <property name="text">
-            <string>New Session</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="deleteSessionButton">
-           <property name="text">
-            <string>Delete Session</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="scanButton">
-           <property name="text">
-            <string>Scan</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QProgressBar" name="progressBar">
-           <property name="maximum">
-            <number>0</number>
-           </property>
-           <property name="value">
-            <number>23280</number>
-           </property>
-           <property name="textVisible">
-            <bool>false</bool>
-           </property>
-           <property name="invertedAppearance">
-            <bool>false</bool>
-           </property>
-           <property name="format">
-            <string>%p%</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
diff --git a/examples/network/bearermonitor/main.cpp b/examples/network/bearermonitor/main.cpp
index 1a22c13..11399e4 100644
--- a/examples/network/bearermonitor/main.cpp
+++ b/examples/network/bearermonitor/main.cpp
@@ -38,7 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QtGui/QApplication>
+#include <QtGui/QMainWindow>
 
 #include "bearermonitor.h"
 
@@ -46,8 +47,12 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
+    QMainWindow mainWindow;
+
     BearerMonitor monitor;
-    monitor.show();
+
+    mainWindow.setCentralWidget(&monitor);
+    mainWindow.show();
 
     return app.exec();
 }
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp
index 5ec9d53..51de0f2 100644
--- a/examples/network/bearermonitor/sessionwidget.cpp
+++ b/examples/network/bearermonitor/sessionwidget.cpp
@@ -74,7 +74,7 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren
             this, SLOT(closeSession()));
     connect(stopSessionButton, SIGNAL(clicked()),
             this, SLOT(stopSession()));
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
     connect(deleteSessionButton, SIGNAL(clicked()),
             this, SLOT(deleteSession()));
 #endif
@@ -94,7 +94,7 @@ void SessionWidget::timerEvent(QTimerEvent *e)
     }
 }
 
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
 void SessionWidget::deleteSession()
 {
     delete this;
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index c92db44..846a1af 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -42,7 +42,8 @@
 #define SESSIONWIDGET_H
 
 #include <qnetworksession.h>
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+
+#ifdef MAEMO_UI
 #include "ui_sessionwidget_maemo.h"
 #else
 #include "ui_sessionwidget.h"
@@ -71,7 +72,7 @@ private Q_SLOTS:
     void stopSession();
     void updateSession();
     void updateSessionError(QNetworkSession::SessionError error);
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
     void deleteSession();
 #endif
 
-- 
cgit v0.12


From 80544a90d165736088b8286b738fd4e3033b1ade Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 4 Nov 2010 15:07:24 +1000
Subject: Fix regression in 648eb76c and update visual tests. Once fixup()
 begins, flick should not be recalculated.

Task-number: QTBUG-14821
Reviewed-by: Michael Brasser
---
 .../graphicsitems/qdeclarativelistview.cpp         |   1 +
 .../qmlvisual/ListView/data/enforcerange.qml       |  30 +-
 .../qmlvisual/ListView/data/itemlist.0.png         | Bin 976 -> 976 bytes
 .../qmlvisual/ListView/data/itemlist.1.png         | Bin 986 -> 986 bytes
 .../qmlvisual/ListView/data/itemlist.2.png         | Bin 977 -> 977 bytes
 .../qmlvisual/ListView/data/itemlist.3.png         | Bin 977 -> 977 bytes
 .../qmlvisual/ListView/data/itemlist.4.png         | Bin 977 -> 977 bytes
 .../qmlvisual/ListView/data/itemlist.5.png         | Bin 990 -> 990 bytes
 .../qmlvisual/ListView/data/itemlist.6.png         | Bin 976 -> 976 bytes
 .../qmlvisual/ListView/data/itemlist.qml           | 104 ++--
 .../qmlvisual/ListView/data/listview.0.png         | Bin 1580 -> 1585 bytes
 .../qmlvisual/ListView/data/listview.1.png         | Bin 1580 -> 1580 bytes
 .../qmlvisual/ListView/data/listview.2.png         | Bin 1661 -> 1667 bytes
 .../qmlvisual/ListView/data/listview.3.png         | Bin 1649 -> 1599 bytes
 .../qmlvisual/ListView/data/listview.4.png         | Bin 1669 -> 1663 bytes
 .../qmlvisual/ListView/data/listview.5.png         | Bin 1651 -> 1666 bytes
 .../qmlvisual/ListView/data/listview.qml           | 604 ++++++++++-----------
 17 files changed, 370 insertions(+), 369 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index eab66d8..94b1cb3 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1157,6 +1157,7 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         || (orient == QDeclarativeListView::Vertical && &data == &hData))
         return;
 
+    correctFlick = false;
     int oldDuration = fixupDuration;
     fixupDuration = moveReason == Mouse ? fixupDuration : 0;
 
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml
index c15b657..20ed077 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/enforcerange.qml
@@ -1074,7 +1074,7 @@ VisualTest {
     }
     Frame {
         msec: 3296
-        hash: "52831480eb69184341b12ffb09ace736"
+        hash: "58f2b900bc335424fc70eaaeb23ceb56"
     }
     Frame {
         msec: 3312
@@ -1082,59 +1082,59 @@ VisualTest {
     }
     Frame {
         msec: 3328
-        hash: "58f2b900bc335424fc70eaaeb23ceb56"
+        hash: "544275da3f7e2ccaedc8c521bf17f59b"
     }
     Frame {
         msec: 3344
-        hash: "544275da3f7e2ccaedc8c521bf17f59b"
+        hash: "df9fef370c2f6ff300b20fc24b5b9e34"
     }
     Frame {
         msec: 3360
-        hash: "df9fef370c2f6ff300b20fc24b5b9e34"
+        hash: "0662898d246e5ff6981610d32e2b8375"
     }
     Frame {
         msec: 3376
-        hash: "99cdc74eefc8c7c7df4650b373d8bc15"
+        hash: "6c04761cc86d28112c16f692cda58ba4"
     }
     Frame {
         msec: 3392
-        hash: "0662898d246e5ff6981610d32e2b8375"
+        hash: "82b31c8e8794ce3a9a6a635ef93b29b3"
     }
     Frame {
         msec: 3408
-        hash: "651b4c8b7a241263d48e645e603a55a3"
+        hash: "388658b5e03f3853e93173bd9501b77b"
     }
     Frame {
         msec: 3424
-        hash: "82b31c8e8794ce3a9a6a635ef93b29b3"
+        hash: "cf1856e961e6b8277a82c03ace5ba864"
     }
     Frame {
         msec: 3440
-        hash: "388658b5e03f3853e93173bd9501b77b"
+        hash: "e1d022cc1b41098baffe49925b20678f"
     }
     Frame {
         msec: 3456
-        hash: "cf1856e961e6b8277a82c03ace5ba864"
+        hash: "a63f8e6b194f900acb1b7a332f9fb9ae"
     }
     Frame {
         msec: 3472
-        hash: "e1d022cc1b41098baffe49925b20678f"
+        hash: "044c3712a6a5f6a973defe85643c8d02"
     }
     Frame {
         msec: 3488
-        hash: "ee55d155fa495f3a0da8c21ad56dfc61"
+        hash: "044c3712a6a5f6a973defe85643c8d02"
     }
     Frame {
         msec: 3504
-        hash: "044c3712a6a5f6a973defe85643c8d02"
+        hash: "e4fe2f1a81a4a4806f4155807f285a2d"
     }
     Frame {
         msec: 3520
-        hash: "e4fe2f1a81a4a4806f4155807f285a2d"
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
     }
     Frame {
         msec: 3536
-        hash: "e4fe2f1a81a4a4806f4155807f285a2d"
+        hash: "19c43fcf2875769c9a15f1ce317a0f1e"
     }
     Frame {
         msec: 3552
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png
index 75d2089..6a589c6 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png
index 578b7d1..a8957d6 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png
index def378f..fe2d28b 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png
index e23b903..0f20b07 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png
index def378f..fe2d28b 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png
index b81e713..0ab58c5 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png
index 75d2089..6a589c6 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png and b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
index b23594b..6d09bc0 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
@@ -982,67 +982,67 @@ VisualTest {
     }
     Frame {
         msec: 3088
-        hash: "4b5368f0d86bffeb6bd31b58aec88650"
+        hash: "fd8e51cca3432f6edcf949857737095f"
     }
     Frame {
         msec: 3104
-        hash: "3f4c24f7ac89da982af22032309637fb"
+        hash: "aa5d4e65932b3ec2f5549079dfc7718d"
     }
     Frame {
         msec: 3120
-        hash: "8cacde33b70fc62b9b0c753091168b97"
+        hash: "f811f3c6b022730dd68ebd7b1659ea40"
     }
     Frame {
         msec: 3136
-        hash: "7b8c1bb2a3ab9ba23ac17dc5422adac8"
+        hash: "e51a2e41972cfc3df46a7d4375024d80"
     }
     Frame {
         msec: 3152
-        hash: "5aa34dccdd406b7e93dfdf756bbca5f0"
+        hash: "275f3594a0e2cc4b6717f9f336e7e1b6"
     }
     Frame {
         msec: 3168
-        hash: "4865c30dc45fbf5ca82047b77eca0912"
+        hash: "9229054bb70662b12a4f7e45ac5b7a90"
     }
     Frame {
         msec: 3184
-        hash: "1dcecc3a899b060a1469ef91e0d21765"
+        hash: "89ff346eca0b71cad3b04a2cb8064fb0"
     }
     Frame {
         msec: 3200
-        hash: "31422699bdbbbf827f7bb1f1ef78823e"
+        hash: "94e6ecb87a7efca6344d6d63a1e3829f"
     }
     Frame {
         msec: 3216
-        hash: "5859920a625ef94a644fda85d14e92fb"
+        hash: "bc5eb6b0eeae316ddd0b308da2cc32e2"
     }
     Frame {
         msec: 3232
-        hash: "37f1f7aaeaed28807f51fd9ad8c414ac"
+        hash: "240081760f0cf2f02be4d6d2600d2bbc"
     }
     Frame {
         msec: 3248
-        hash: "14592a6c86f211c20abab5cf34a406b4"
+        hash: "69b335aeb81fc2ae6173f2ec5cdc4c55"
     }
     Frame {
         msec: 3264
-        hash: "77c18ac7dfff2a4e516915e3e3df0717"
+        hash: "10d481e57cc8cd694500d9ed6ae1f8bb"
     }
     Frame {
         msec: 3280
-        hash: "f619097356671f6eb54d3b1c481e709d"
+        hash: "6b21f71d0bedef4bbcb445a13f61e7a3"
     }
     Frame {
         msec: 3296
-        hash: "7f19ea52e9e41a3b1bd90bb2a144d305"
+        hash: "aa94ebdbb4b8423aff28c95daff0baf5"
     }
     Frame {
         msec: 3312
-        hash: "17deb6b26fc9d27d5194995c102da4ac"
+        hash: "5f6708f615654c459f5749676fc09016"
     }
     Frame {
         msec: 3328
-        hash: "29c52328b54f02cc9042f676d710b9b2"
+        hash: "8ef246d322446e7f0848b99495f89e2b"
     }
     Frame {
         msec: 3344
@@ -1050,11 +1050,11 @@ VisualTest {
     }
     Frame {
         msec: 3360
-        hash: "40204fdb7a84b86f1380224908092354"
+        hash: "3b2e2d957585fb44a7165186a146892c"
     }
     Frame {
         msec: 3376
-        hash: "de7f3c83f37cc89c87009626c72e7642"
+        hash: "124da0099a7dd6fbf6dfd0ecfb09638c"
     }
     Frame {
         msec: 3392
@@ -1074,7 +1074,7 @@ VisualTest {
     }
     Frame {
         msec: 3456
-        hash: "b554512bac0766063870c5b3acb1d24f"
+        hash: "bb5ea2a238920a8486263bc7450edfb4"
     }
     Frame {
         msec: 3472
@@ -1082,7 +1082,7 @@ VisualTest {
     }
     Frame {
         msec: 3488
-        hash: "e4dacafba5ab5f8db53f08cef458cf42"
+        hash: "b554512bac0766063870c5b3acb1d24f"
     }
     Frame {
         msec: 3504
@@ -1094,23 +1094,23 @@ VisualTest {
     }
     Frame {
         msec: 3536
-        hash: "40204fdb7a84b86f1380224908092354"
+        hash: "124da0099a7dd6fbf6dfd0ecfb09638c"
     }
     Frame {
         msec: 3552
-        hash: "3b2e2d957585fb44a7165186a146892c"
+        hash: "40204fdb7a84b86f1380224908092354"
     }
     Frame {
         msec: 3568
-        hash: "c3b219bdd7710427d134402a8d3e6429"
+        hash: "ff93c3290b7d9a9743cc11d41a112a0a"
     }
     Frame {
         msec: 3584
-        hash: "8d424f37bb6af879129e57661d30a162"
+        hash: "c3b219bdd7710427d134402a8d3e6429"
     }
     Frame {
         msec: 3600
-        hash: "29c52328b54f02cc9042f676d710b9b2"
+        hash: "56e2f6b2ac103caf7ada3b56c19622c2"
     }
     Frame {
         msec: 3616
@@ -1118,15 +1118,15 @@ VisualTest {
     }
     Frame {
         msec: 3632
-        hash: "17deb6b26fc9d27d5194995c102da4ac"
+        hash: "8eb6d69d9833d0fbf87f951f489b71fe"
     }
     Frame {
         msec: 3648
-        hash: "5f6708f615654c459f5749676fc09016"
+        hash: "17deb6b26fc9d27d5194995c102da4ac"
     }
     Frame {
         msec: 3664
-        hash: "1734205ea5e7539b47d80c5a93ec74aa"
+        hash: "5f6708f615654c459f5749676fc09016"
     }
     Frame {
         msec: 3680
@@ -1134,7 +1134,7 @@ VisualTest {
     }
     Frame {
         msec: 3696
-        hash: "88143ff6c278a5433b314b551b7b8b1d"
+        hash: "1734205ea5e7539b47d80c5a93ec74aa"
     }
     Frame {
         msec: 3712
@@ -1722,7 +1722,7 @@ VisualTest {
     }
     Frame {
         msec: 5408
-        hash: "cf2acc805e9707327b01eb979f2b67a3"
+        hash: "06ce7db518da042e04dd3f79b7220974"
     }
     Frame {
         msec: 5424
@@ -1730,55 +1730,55 @@ VisualTest {
     }
     Frame {
         msec: 5440
-        hash: "a978890b419f9503e53d4d3f4f9b8c9b"
+        hash: "53e9d5a0098f2e91bbea45360b876607"
     }
     Frame {
         msec: 5456
-        hash: "73339b67e49210b4760b8e06fa4067b7"
+        hash: "22a6c7f3dcb5a36592909783b2466c8d"
     }
     Frame {
         msec: 5472
-        hash: "d09a245890e813c248050132a76465f3"
+        hash: "9d8da9199efebb95f56e5d4ebc9a585e"
     }
     Frame {
         msec: 5488
-        hash: "35b874b3b4d7d1e59852233fce192b0b"
+        hash: "c553400402f233a6246be4e544b433ae"
     }
     Frame {
         msec: 5504
-        hash: "4f80a0da1941e9c208036f22df93bed8"
+        hash: "c2e41a54c03340832db93f6f88393f00"
     }
     Frame {
         msec: 5520
-        hash: "7bbdc4ce95bc12e505f24cb8b137a0f1"
+        hash: "3622a619a99c939e96636a86c4428ba3"
     }
     Frame {
         msec: 5536
-        hash: "e68b5fb604a45d4e7ee21f6e06460b47"
+        hash: "e65d5e6c756e750e6d98096fe211465c"
     }
     Frame {
         msec: 5552
-        hash: "903059d468bed1ac8395e38a19c9dd38"
+        hash: "cabd6d30b1f4e42b38b73803aae6d5be"
     }
     Frame {
         msec: 5568
-        hash: "d7430ebf26f2de6f648471c19455cf0f"
+        hash: "68d443f16c16821ffc9ca68b17c76034"
     }
     Frame {
         msec: 5584
-        hash: "d5268cd58c222451d48038e715e83802"
+        hash: "a68b1bc6c2963ee92c3a45f500667b3b"
     }
     Frame {
         msec: 5600
-        hash: "99b4534b0bf58dc8e28c1118a5baec33"
+        hash: "805319ac7ca842feb3649e92f8b5b72f"
     }
     Frame {
         msec: 5616
-        hash: "ade5beb259b5277c333ca806fc9bdbec"
+        hash: "fd8d3f5688b1806998c6087e18c6c730"
     }
     Frame {
         msec: 5632
-        hash: "f34d2248999f5f51210064315d631f60"
+        hash: "b135c8c9975f4d45d2054cf31d0b1fe1"
     }
     Frame {
         msec: 5648
@@ -1786,7 +1786,7 @@ VisualTest {
     }
     Frame {
         msec: 5664
-        hash: "65af7a4a4aea5a983ea3fb9324e74256"
+        hash: "aa32e4c20c6a43c4ef7991a9418e57fe"
     }
     Frame {
         msec: 5680
@@ -1794,7 +1794,7 @@ VisualTest {
     }
     Frame {
         msec: 5696
-        hash: "2311ce1a83a43619ab7ce537a2b948e1"
+        hash: "127871a98123b7bd44f4c38f27cbc836"
     }
     Frame {
         msec: 5712
@@ -1826,15 +1826,15 @@ VisualTest {
     }
     Frame {
         msec: 5824
-        hash: "127871a98123b7bd44f4c38f27cbc836"
+        hash: "2311ce1a83a43619ab7ce537a2b948e1"
     }
     Frame {
         msec: 5840
-        hash: "b8db9180b4ad15fdbd25a4e974512f92"
+        hash: "127871a98123b7bd44f4c38f27cbc836"
     }
     Frame {
         msec: 5856
-        hash: "0974df6a7277bba11a3d3f400c68f4f1"
+        hash: "b8db9180b4ad15fdbd25a4e974512f92"
     }
     Frame {
         msec: 5872
@@ -1842,11 +1842,11 @@ VisualTest {
     }
     Frame {
         msec: 5888
-        hash: "b3e92eb4cfe548b92ac526066dfc7d23"
+        hash: "aa32e4c20c6a43c4ef7991a9418e57fe"
     }
     Frame {
         msec: 5904
-        hash: "40382f644935dc4e99353fa29c3e0b21"
+        hash: "b3e92eb4cfe548b92ac526066dfc7d23"
     }
     Frame {
         msec: 5920
@@ -1862,7 +1862,7 @@ VisualTest {
     }
     Frame {
         msec: 5968
-        hash: "b135c8c9975f4d45d2054cf31d0b1fe1"
+        hash: "f34d2248999f5f51210064315d631f60"
     }
     Frame {
         msec: 5984
@@ -1870,7 +1870,7 @@ VisualTest {
     }
     Frame {
         msec: 6000
-        hash: "bf47cc398a702dd17c8efebb3d2f8073"
+        hash: "b135c8c9975f4d45d2054cf31d0b1fe1"
     }
     Frame {
         msec: 6016
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png
index 78c1c27..c7fa695 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png
index ecd1e01..b6c5e19 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png
index ba1733f..711c47a 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png
index 7a393d1..e56fae0 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png
index cb73ca9..0030842 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png
index cbbe6d7..2ec8177 100644
Binary files a/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png and b/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/ListView/data/listview.qml b/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
index 1db722f..45f96e1 100644
--- a/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
@@ -6,107 +6,107 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 32
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 48
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 64
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 80
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 96
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 112
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 128
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 144
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 160
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 176
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 192
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 208
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 224
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 240
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 256
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 272
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 288
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 304
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 320
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 336
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 352
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 368
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 384
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 400
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Frame {
         msec: 416
-        hash: "95c48087b681f0bcb09b2d7aad1a0299"
+        hash: "3b88645092be28037fca4a6034f5b2f7"
     }
     Key {
         type: 6
@@ -122,15 +122,15 @@ VisualTest {
     }
     Frame {
         msec: 448
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "435ac0668ad4d0e196eb040d385053cb"
     }
     Frame {
         msec: 464
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "e9532fe1acc1c27a2119e6dde3e01637"
     }
     Frame {
         msec: 480
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "9c757feaf5a8d1e88c659fca97e3b7b2"
     }
     Key {
         type: 7
@@ -142,35 +142,35 @@ VisualTest {
     }
     Frame {
         msec: 496
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "ccc7785a45a41615db01580835a4638e"
     }
     Frame {
         msec: 512
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "11ad92022bcd5d3fbd28ffb9f51c69eb"
     }
     Frame {
         msec: 528
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "a8a94e1f95216864c368b8c3d0ae682b"
     }
     Frame {
         msec: 544
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "d83e213d35e7fcff2580b4e197547f24"
     }
     Frame {
         msec: 560
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
     }
     Frame {
         msec: 576
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
     }
     Frame {
         msec: 592
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
     }
     Frame {
         msec: 608
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
     }
     Key {
         type: 6
@@ -182,27 +182,27 @@ VisualTest {
     }
     Frame {
         msec: 624
-        hash: "3b88645092be28037fca4a6034f5b2f7"
+        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
     }
     Frame {
         msec: 640
-        hash: "435ac0668ad4d0e196eb040d385053cb"
+        hash: "0e9c577fa86d9b3734da0d50040624e0"
     }
     Frame {
         msec: 656
-        hash: "e9532fe1acc1c27a2119e6dde3e01637"
+        hash: "834cf83f0f8d613191cac775b5737664"
     }
     Frame {
         msec: 672
-        hash: "9c757feaf5a8d1e88c659fca97e3b7b2"
+        hash: "495ea7650b2ae45f9afd7f9f6ecdd793"
     }
     Frame {
         msec: 688
-        hash: "ccc7785a45a41615db01580835a4638e"
+        hash: "55c761ccee6543bb3b9564bb813df58e"
     }
     Frame {
         msec: 704
-        hash: "11ad92022bcd5d3fbd28ffb9f51c69eb"
+        hash: "e29e5f86cb3b1fb5ec77fde696024812"
     }
     Key {
         type: 7
@@ -214,19 +214,19 @@ VisualTest {
     }
     Frame {
         msec: 720
-        hash: "a8a94e1f95216864c368b8c3d0ae682b"
+        hash: "f24b7d5a8f5ab03460505d6203269d1b"
     }
     Frame {
         msec: 736
-        hash: "d83e213d35e7fcff2580b4e197547f24"
+        hash: "893473965efe9e0540b197cbaa3f765d"
     }
     Frame {
         msec: 752
-        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
+        hash: "a541b7be2f370f948048b2101b037ab7"
     }
     Frame {
         msec: 768
-        hash: "9e5a57fabdc443e395cacbaf6e0c9bef"
+        hash: "a541b7be2f370f948048b2101b037ab7"
     }
     Key {
         type: 6
@@ -238,19 +238,19 @@ VisualTest {
     }
     Frame {
         msec: 784
-        hash: "0e9c577fa86d9b3734da0d50040624e0"
+        hash: "da065f1e72883a45241630b96ee5b1f8"
     }
     Frame {
         msec: 800
-        hash: "834cf83f0f8d613191cac775b5737664"
+        hash: "e97f78604c0c6d468c8dd225642e2ebd"
     }
     Frame {
         msec: 816
-        hash: "495ea7650b2ae45f9afd7f9f6ecdd793"
+        hash: "7b9d4b14eedfa4ff10dd7e3747c4a7f5"
     }
     Frame {
         msec: 832
-        hash: "55c761ccee6543bb3b9564bb813df58e"
+        hash: "6d55ba6287c720614854d36bb681a9f3"
     }
     Key {
         type: 7
@@ -262,27 +262,27 @@ VisualTest {
     }
     Frame {
         msec: 848
-        hash: "e29e5f86cb3b1fb5ec77fde696024812"
+        hash: "3e7a44811f59bfb81de2f4f884a7af17"
     }
     Frame {
         msec: 864
-        hash: "f24b7d5a8f5ab03460505d6203269d1b"
+        hash: "101113a7723b9d09275f66152b82142f"
     }
     Frame {
         msec: 880
-        hash: "893473965efe9e0540b197cbaa3f765d"
+        hash: "0044e068522f912630868476f8bf49f8"
     }
     Frame {
         msec: 896
-        hash: "a541b7be2f370f948048b2101b037ab7"
+        hash: "92065f9f170ee09abf67f0d0c7a1b6ba"
     }
     Frame {
         msec: 912
-        hash: "a541b7be2f370f948048b2101b037ab7"
+        hash: "92065f9f170ee09abf67f0d0c7a1b6ba"
     }
     Frame {
         msec: 928
-        hash: "a541b7be2f370f948048b2101b037ab7"
+        hash: "92065f9f170ee09abf67f0d0c7a1b6ba"
     }
     Key {
         type: 6
@@ -294,7 +294,7 @@ VisualTest {
     }
     Frame {
         msec: 944
-        hash: "a541b7be2f370f948048b2101b037ab7"
+        hash: "92065f9f170ee09abf67f0d0c7a1b6ba"
     }
     Frame {
         msec: 960
@@ -302,7 +302,7 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "e97f78604c0c6d468c8dd225642e2ebd"
+        hash: "e15814643bad6a71cb8c318ee5fd684a"
     }
     Key {
         type: 7
@@ -314,23 +314,23 @@ VisualTest {
     }
     Frame {
         msec: 992
-        hash: "7b9d4b14eedfa4ff10dd7e3747c4a7f5"
+        hash: "9b07b6861a97d0871ed89369ff7449da"
     }
     Frame {
         msec: 1008
-        hash: "6d55ba6287c720614854d36bb681a9f3"
+        hash: "7d95daf35c1823ea7187162b62010c57"
     }
     Frame {
         msec: 1024
-        hash: "3e7a44811f59bfb81de2f4f884a7af17"
+        hash: "cc1e70fd1235d50ca291580bef1d6fc4"
     }
     Frame {
         msec: 1040
-        hash: "101113a7723b9d09275f66152b82142f"
+        hash: "c8250f4cf69642e78523412b7b75501c"
     }
     Frame {
         msec: 1056
-        hash: "0044e068522f912630868476f8bf49f8"
+        hash: "c57e421c803e8bfa1a85409cbb858829"
     }
     Key {
         type: 6
@@ -342,19 +342,19 @@ VisualTest {
     }
     Frame {
         msec: 1072
-        hash: "4a50079d15b51758bf39b6d3fc51f337"
+        hash: "19b429a90d9877e62a7dee53ebf01fb2"
     }
     Frame {
         msec: 1088
-        hash: "df659ebf6a5926943de92d6838127b9c"
+        hash: "7c810f174bed3826016272515df2d525"
     }
     Frame {
         msec: 1104
-        hash: "0aa422c4af139023817465090f42f264"
+        hash: "9034cf480bda0d8b55aa6c43fc96b23d"
     }
     Frame {
         msec: 1120
-        hash: "fb598a01e5cd9e3655f86a47ff7bda0d"
+        hash: "f62697a1f4e4df2869c14462a0d514fd"
     }
     Key {
         type: 7
@@ -366,19 +366,19 @@ VisualTest {
     }
     Frame {
         msec: 1136
-        hash: "83a63dfcdbb27035d3e5208b066a2e1e"
+        hash: "c878f53b338d1ce332973193b0fa4b86"
     }
     Frame {
         msec: 1152
-        hash: "c8250f4cf69642e78523412b7b75501c"
+        hash: "5d26f27061b319c391961dc30d985593"
     }
     Frame {
         msec: 1168
-        hash: "c57e421c803e8bfa1a85409cbb858829"
+        hash: "e038ae877e8dddd3d99bf97475f59b3d"
     }
     Frame {
         msec: 1184
-        hash: "f7611692216c0519b9188924e8a6b92e"
+        hash: "f44adc5e46d320c62095e1285ca8848b"
     }
     Key {
         type: 6
@@ -390,15 +390,15 @@ VisualTest {
     }
     Frame {
         msec: 1200
-        hash: "0f9495c9f9f91c409f868959854824ed"
+        hash: "17f6b13e0556ac07dc527a9013a307a1"
     }
     Frame {
         msec: 1216
-        hash: "d4a752aa1c4112a3b60f40468932945d"
+        hash: "70a1cc3b6dd3be4e30bb6763344fb980"
     }
     Frame {
         msec: 1232
-        hash: "fbe2d7c160132f312911aabe4cad8bf5"
+        hash: "097c37d2243a27b8e800b5d4ec94b2e3"
     }
     Key {
         type: 7
@@ -410,27 +410,27 @@ VisualTest {
     }
     Frame {
         msec: 1248
-        hash: "2d3c7dc0d0efac613a32860968d166ac"
+        hash: "15839227c002b1c71eb516f6653a7531"
     }
     Frame {
         msec: 1264
-        hash: "fa0891d8c22dd26c1cb27d86864a8225"
+        hash: "f4a8103ef9010c651368d325fe9eee98"
     }
     Frame {
         msec: 1280
-        hash: "5d26f27061b319c391961dc30d985593"
+        hash: "d158ec1c83719c58c1d0a2e4cc90998f"
     }
     Frame {
         msec: 1296
-        hash: "e038ae877e8dddd3d99bf97475f59b3d"
+        hash: "6f66a44f5dc3fe150db2291b8cbc7327"
     }
     Frame {
         msec: 1312
-        hash: "f44adc5e46d320c62095e1285ca8848b"
+        hash: "8a016eac5befb215a157f7fe5bc743de"
     }
     Frame {
         msec: 1328
-        hash: "f44adc5e46d320c62095e1285ca8848b"
+        hash: "8a016eac5befb215a157f7fe5bc743de"
     }
     Key {
         type: 6
@@ -442,15 +442,15 @@ VisualTest {
     }
     Frame {
         msec: 1344
-        hash: "17f6b13e0556ac07dc527a9013a307a1"
+        hash: "807129a4c578b1a5f0d3d84686eb0553"
     }
     Frame {
         msec: 1360
-        hash: "70a1cc3b6dd3be4e30bb6763344fb980"
+        hash: "f9f2da990518048f0b050cc193567a20"
     }
     Frame {
         msec: 1376
-        hash: "097c37d2243a27b8e800b5d4ec94b2e3"
+        hash: "762de7b1f4e56df6d7a245a23446884b"
     }
     Key {
         type: 7
@@ -462,23 +462,23 @@ VisualTest {
     }
     Frame {
         msec: 1392
-        hash: "15839227c002b1c71eb516f6653a7531"
+        hash: "84ba7354badc3dca92974933c3610010"
     }
     Frame {
         msec: 1408
-        hash: "f4a8103ef9010c651368d325fe9eee98"
+        hash: "36c3018870d74cff638d00acd03a0cf0"
     }
     Frame {
         msec: 1424
-        hash: "d158ec1c83719c58c1d0a2e4cc90998f"
+        hash: "82b756a14eb0e802cd3e2d2d2a07f28e"
     }
     Frame {
         msec: 1440
-        hash: "6f66a44f5dc3fe150db2291b8cbc7327"
+        hash: "74af1c12613130dc53533fe1178d5534"
     }
     Frame {
         msec: 1456
-        hash: "8a016eac5befb215a157f7fe5bc743de"
+        hash: "c32818b0ba24f11295580d1ccffffdc0"
     }
     Key {
         type: 6
@@ -490,19 +490,19 @@ VisualTest {
     }
     Frame {
         msec: 1472
-        hash: "807129a4c578b1a5f0d3d84686eb0553"
+        hash: "b858be109fac6852234bf1db161e515b"
     }
     Frame {
         msec: 1488
-        hash: "f9f2da990518048f0b050cc193567a20"
+        hash: "9b3f8cffd3e79241d8a3b1f7d80790db"
     }
     Frame {
         msec: 1504
-        hash: "762de7b1f4e56df6d7a245a23446884b"
+        hash: "840dc72aabc4a9b28bae641354676324"
     }
     Frame {
         msec: 1520
-        hash: "84ba7354badc3dca92974933c3610010"
+        hash: "c60bfd5cc8b26a841035db29baba5dab"
     }
     Key {
         type: 7
@@ -514,23 +514,23 @@ VisualTest {
     }
     Frame {
         msec: 1536
-        hash: "36c3018870d74cff638d00acd03a0cf0"
+        hash: "88d80dc8b0d968aa718ff464e507f53b"
     }
     Frame {
         msec: 1552
-        hash: "82b756a14eb0e802cd3e2d2d2a07f28e"
+        hash: "f7ffc82d3448c415b4997401fb61b96b"
     }
     Frame {
         msec: 1568
-        hash: "74af1c12613130dc53533fe1178d5534"
+        hash: "df8e9a09752fe2b2eff9184ba8e88ef1"
     }
     Frame {
         msec: 1584
-        hash: "c32818b0ba24f11295580d1ccffffdc0"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Frame {
         msec: 1600
-        hash: "c32818b0ba24f11295580d1ccffffdc0"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Key {
         type: 6
@@ -542,15 +542,15 @@ VisualTest {
     }
     Frame {
         msec: 1616
-        hash: "b858be109fac6852234bf1db161e515b"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Frame {
         msec: 1632
-        hash: "9b3f8cffd3e79241d8a3b1f7d80790db"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Frame {
         msec: 1648
-        hash: "840dc72aabc4a9b28bae641354676324"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Key {
         type: 7
@@ -562,19 +562,19 @@ VisualTest {
     }
     Frame {
         msec: 1664
-        hash: "c60bfd5cc8b26a841035db29baba5dab"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Frame {
         msec: 1680
-        hash: "88d80dc8b0d968aa718ff464e507f53b"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Frame {
         msec: 1696
-        hash: "f7ffc82d3448c415b4997401fb61b96b"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Frame {
         msec: 1712
-        hash: "df8e9a09752fe2b2eff9184ba8e88ef1"
+        hash: "97330e949a609f5f33832dd17e0c3716"
     }
     Frame {
         msec: 1728
@@ -966,71 +966,71 @@ VisualTest {
     }
     Frame {
         msec: 2608
-        hash: "85c0127315a489cfcf14ec7e16e43f4c"
+        hash: "68f3366932fed9156bf68dce6660b2a8"
     }
     Frame {
         msec: 2624
-        hash: "65f1be6c38fa9e024671bfe612c585b4"
+        hash: "9f4be0b58c46035a11c5b80ec60618d5"
     }
     Frame {
         msec: 2640
-        hash: "74b7b60a048d37c38f179d071e9d9730"
+        hash: "6d38a4eaa2a41c57599cca381957ec4c"
     }
     Frame {
         msec: 2656
-        hash: "13c96d066af31d75647b0be21f1ae68d"
+        hash: "1061db26c9080067bf121eb1d164a3f3"
     }
     Frame {
         msec: 2672
-        hash: "a1f880a95596f6c82385e51a4853327e"
+        hash: "c78d271711dc8f13fb48b41871249141"
     }
     Frame {
         msec: 2688
-        hash: "8596123a6b0f234d90869d823448ff8e"
+        hash: "c5825611f6c429fddd8c20495507ea5f"
     }
     Frame {
         msec: 2704
-        hash: "1ca65b63eea4034e3889f53c86ac95b7"
+        hash: "9888b608bcf80496a3fe8848be4e3629"
     }
     Frame {
         msec: 2720
-        hash: "b847b515d89ad0394ef0fd4954158940"
+        hash: "9995d6ba039045d94903d5095b018ca8"
     }
     Frame {
         msec: 2736
-        hash: "f73f7747115fdda2f0a13734a0dc9446"
+        hash: "f8ea705b4710b3ffb11c2fe08ccccda2"
     }
     Frame {
         msec: 2752
-        hash: "5b31a1aca62cf654428e4d7fc25208b6"
+        hash: "7354c2fcabdede9fb1ee823ce098da3b"
     }
     Frame {
         msec: 2768
-        hash: "f797d3c0364515138059967e17e185ed"
+        hash: "0d6beff960fa26771f09748356accedb"
     }
     Frame {
         msec: 2784
-        hash: "dff0266adf50e30bc2a7674b001d19dc"
+        hash: "0720a8a1ed85344a1de6682b3aefd502"
     }
     Frame {
         msec: 2800
-        hash: "610c72005c1aa83306fecc9ca34bf5a4"
+        hash: "0245488740e13dbfc836b587b2bdf917"
     }
     Frame {
         msec: 2816
-        hash: "542587ab3dff0cfb3f724096871e925a"
+        hash: "25c4fcdd85017d18df7e83c15f1accbc"
     }
     Frame {
         msec: 2832
-        hash: "fd79c9159a77b1be25d9cfde2e6cecb6"
+        hash: "51192ae0eae814f3dead9d949e2e4676"
     }
     Frame {
         msec: 2848
-        hash: "e3d4bb451d6210e6006c54178d406068"
+        hash: "ddbe6b273882c6018c01e0a4480b1adb"
     }
     Frame {
         msec: 2864
-        hash: "3dd3c57049bddb206c0204d7fbf673b0"
+        hash: "bb840a0677114b67d9b08589e8a8192b"
     }
     Frame {
         msec: 2880
@@ -1038,15 +1038,15 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "44008e30de01ecb1893a0fe4b06ec63a"
+        hash: "6ceadf740293537c7b9f2e2cfe8e6f1e"
     }
     Frame {
         msec: 2912
-        hash: "c593c7e7edab1a034b96f778259b5b91"
+        hash: "f5c99d06e0b3055374ee4c6bf3e634f4"
     }
     Frame {
         msec: 2928
-        hash: "9ac483cb720fef5783abd4e0072cf71e"
+        hash: "18fe01fadf4c5acbd369f4450db1efa6"
     }
     Frame {
         msec: 2944
@@ -1186,63 +1186,63 @@ VisualTest {
     }
     Frame {
         msec: 3232
-        hash: "45bacd56ecaeefd9c80c7bd77e79cff0"
+        hash: "0e1f352c163ad8fe852c2e4857881d2f"
     }
     Frame {
         msec: 3248
-        hash: "ad5239583e3924c98358e0ec7d12fd39"
+        hash: "3c3b44481a6c2330a4a03076e35055f4"
     }
     Frame {
         msec: 3264
-        hash: "8e0fbae41165c553af4a49ed5691dfbb"
+        hash: "6ea3210a929774aea84a7beb4a784842"
     }
     Frame {
         msec: 3280
-        hash: "c697930f45e23628c83a248de44472fb"
+        hash: "74dd747f9a64b19e5c5230c90ad3b642"
     }
     Frame {
         msec: 3296
-        hash: "840e1f8ba5fe6e42d6dc41c1e42dc3dc"
+        hash: "c02be4ebefd19f4c5e864e8bbab7c13e"
     }
     Frame {
         msec: 3312
-        hash: "e071cd254b69da678997eeb7ac0a13f8"
+        hash: "ce661af9085c833ec7d1fd66ebe67649"
     }
     Frame {
         msec: 3328
-        hash: "27954d55c9772aa0ba237e7bdff75517"
+        hash: "4bf921874cfdc1b7d14e3a110b9e70a1"
     }
     Frame {
         msec: 3344
-        hash: "5879feff61f02a9322b8620c84be4462"
+        hash: "f3e9cf8ac9e109e88d8c426fdcee28a9"
     }
     Frame {
         msec: 3360
-        hash: "feba016bdcdc3f59b70000375a5b4242"
+        hash: "aa718a37f7ccf655d176adb799b5ddfb"
     }
     Frame {
         msec: 3376
-        hash: "e57ae7048209884fb024481318c88080"
+        hash: "aa114a9676af508b4a106b21f7a2ed10"
     }
     Frame {
         msec: 3392
-        hash: "93707dc8ec5e02adb691d0c6f3ff7772"
+        hash: "a5bbbaebb61b83384f5be82a9c3181ba"
     }
     Frame {
         msec: 3408
-        hash: "ab2d8b822a4e2cd7c6a9cfa2e81d2113"
+        hash: "83deebf650b192de7c8a764d5379eeb4"
     }
     Frame {
         msec: 3424
-        hash: "a9d0e39b30b16eafec85e08a75e2b50f"
+        hash: "5b433e1f5b97b39b6e86c837f0b91f2b"
     }
     Frame {
         msec: 3440
-        hash: "8c94d16c8cde9b3d0ac8ccfb1374387d"
+        hash: "b5236be4e416f89a91eda7afbd75fc63"
     }
     Frame {
         msec: 3456
-        hash: "7f4873f6c773b3d2d814bb1ea5c5dec6"
+        hash: "1713477f5484a1b35686f2f4bff27612"
     }
     Frame {
         msec: 3472
@@ -1254,63 +1254,63 @@ VisualTest {
     }
     Frame {
         msec: 3504
-        hash: "042adc29907ca50187d4aad772a7500d"
+        hash: "7f64804cd07a0ae63d0e3a1b9f8f8a84"
     }
     Frame {
         msec: 3520
-        hash: "90accd1b4f5bbe5cc59f3a73d697ea18"
+        hash: "9ae6bc952da97239bfee88633637aeb7"
     }
     Frame {
         msec: 3536
-        hash: "3ce26e9c0b2ee1b4cb3dc19bbac92736"
+        hash: "ba34cd0d57d5d027ad6c2de102676399"
     }
     Frame {
         msec: 3552
-        hash: "ca976ad1590e156e155cdba452dbc0ce"
+        hash: "c49632f9369aa901fcb702e76295c1e8"
     }
     Frame {
         msec: 3568
-        hash: "b342477cedfb2a3839aa145703f33cb4"
+        hash: "3adab59e06a635a033564dfc8edc4877"
     }
     Frame {
         msec: 3584
-        hash: "8fccdb3fbf637426b8b3df088a5a24a5"
+        hash: "67643cbfb3c9864b7447a9a8e316b251"
     }
     Frame {
         msec: 3600
-        hash: "973c8d2d2496c5cc871aecc0b6be0bbb"
+        hash: "d04d288cbf89e1ad3bbf25ffebd7a382"
     }
     Frame {
         msec: 3616
-        hash: "6af9574467c7b565450dc6533dddb0f2"
+        hash: "e6c4d34b9b3de464ec0dcf8719b86313"
     }
     Frame {
         msec: 3632
-        hash: "ced3d8a93bf564c0ebec837f1655c202"
+        hash: "f73462d0fe19cbbd771f9f78d7bc4384"
     }
     Frame {
         msec: 3648
-        hash: "0a38fe8ac9024b4a30b8efbcf155bbd8"
+        hash: "6369f075a492240aee36eae8dcb2ace5"
     }
     Frame {
         msec: 3664
-        hash: "2421dc73fe95e8abb246ae894ac255b2"
+        hash: "1e9424a3b93833f8ae855c5f7877679a"
     }
     Frame {
         msec: 3680
-        hash: "98789298fcc85a0b3307036c800d80af"
+        hash: "da274c1ae57d217ef4515326d32646b4"
     }
     Frame {
         msec: 3696
-        hash: "6361b512cfd9aa5f97529089ad7d902c"
+        hash: "1cbe684ba95e6ef635873f746e942f3d"
     }
     Frame {
         msec: 3712
-        hash: "5f26400f45140d634ac49ae5ce6bc2cf"
+        hash: "228e13c1d3dea6e666637de7cedd6dd4"
     }
     Frame {
         msec: 3728
-        hash: "49586dcf6a4c7a80563e9cc67b16a520"
+        hash: "a3f8fec49fb88652e9339b621ea8b972"
     }
     Mouse {
         type: 2
@@ -1322,7 +1322,7 @@ VisualTest {
     }
     Frame {
         msec: 3744
-        hash: "fa8827f2a5eefaa9f740e36e4eb05083"
+        hash: "7c3eb16bf4f66d2b9889c9d80aaae8b2"
     }
     Mouse {
         type: 5
@@ -1334,7 +1334,7 @@ VisualTest {
     }
     Frame {
         msec: 3760
-        hash: "5f2e33f8b436686840a124ba71f7d203"
+        hash: "1825d33eb9ae94a63d334d93e07ce9af"
     }
     Mouse {
         type: 5
@@ -1346,7 +1346,7 @@ VisualTest {
     }
     Frame {
         msec: 3776
-        hash: "b0093a1f538381e79f43c91192437be5"
+        hash: "306652a5a179cf23ee87c10571814f53"
     }
     Mouse {
         type: 5
@@ -1358,7 +1358,7 @@ VisualTest {
     }
     Frame {
         msec: 3792
-        hash: "9a8e645817c214a0353beadc0bc2e3f8"
+        hash: "3d3ba7cd968a1f91f7534cabd7cc034b"
     }
     Mouse {
         type: 5
@@ -1370,7 +1370,7 @@ VisualTest {
     }
     Frame {
         msec: 3808
-        hash: "3f059fefcb7908e6f89a4b245bd0c948"
+        hash: "862f70151938a5d27db37a9f5dd53faa"
     }
     Mouse {
         type: 5
@@ -1382,7 +1382,7 @@ VisualTest {
     }
     Frame {
         msec: 3824
-        hash: "48ccbb037ebe01dc9c73fafa54aa6175"
+        hash: "92b9283fa8b5642ce9bd14d875a12b75"
     }
     Mouse {
         type: 5
@@ -1406,7 +1406,7 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "3398c59636fc02358fc0b22d7bc2afd3"
+        hash: "58e61d0a4f397c5a2b137d6a6e85d99b"
     }
     Mouse {
         type: 5
@@ -1418,7 +1418,7 @@ VisualTest {
     }
     Frame {
         msec: 3872
-        hash: "86ebc9911fc2da29a1960ae3999e4329"
+        hash: "6cdd764ee39789307e5e313bfbbb7765"
     }
     Mouse {
         type: 5
@@ -1438,83 +1438,83 @@ VisualTest {
     }
     Frame {
         msec: 3888
-        hash: "7e910c843f531af6d08a0c7ea890c823"
+        hash: "a88656d49e4636b18c4f6f4a0ab943d6"
     }
     Frame {
         msec: 3904
-        hash: "7e92be7beeba33541e16305d5cb7b3b6"
+        hash: "f1ec9a65d5f8d2020db1b70bcd419417"
     }
     Frame {
         msec: 3920
-        hash: "1e7caa1bb4627bea028cdd2ef2260d9f"
+        hash: "ca7d3d7d26445d13acd7fe4a2c5d1d4d"
     }
     Frame {
         msec: 3936
-        hash: "a7d77ec36935d8d8c8a6120d373d714c"
+        hash: "90016f51541a15ba4b6265f6843a2998"
     }
     Frame {
         msec: 3952
-        hash: "770e16a5c7bf17522445bdae41d170df"
+        hash: "bdb992552a5c5707ddb372631f72e6a3"
     }
     Frame {
         msec: 3968
-        hash: "d5c93bb61aeef777bb91dd504e91ecf6"
+        hash: "af69ed47f0f40648d55af10c87866805"
     }
     Frame {
         msec: 3984
-        hash: "2247494cb67e7f0cade508b6ef46cb3e"
+        hash: "33e77562bdf839ca1e969b918d90a07b"
     }
     Frame {
         msec: 4000
-        hash: "61a480c3a29f37b4383b430b02eb5dc1"
+        hash: "2001b5ca444808a79c49adc9d03c960e"
     }
     Frame {
         msec: 4016
-        hash: "f741ede20b0ad51f81c7aba44705a08e"
+        hash: "e4186283e5fe0c1efb29eca6f59e9079"
     }
     Frame {
         msec: 4032
-        hash: "73bb52725e3906ac3074371936e9f3f3"
+        hash: "dab82d0bbba66df3297712b42f74f25a"
     }
     Frame {
         msec: 4048
-        hash: "a915081e3c6ca9397567cb3df2aed517"
+        hash: "b180ad3acdfd736276ef4d1de040bb55"
     }
     Frame {
         msec: 4064
-        hash: "79b514577bcc36db6de4db2e8b284a4c"
+        hash: "577445b0e4d6f8079830c2b87ce5829d"
     }
     Frame {
         msec: 4080
-        hash: "5412571baa69b8e0c3b4daf52796482a"
+        hash: "45fffe51376abef4cb28842b392ab0b7"
     }
     Frame {
         msec: 4096
-        hash: "7f739333fdc9c3457461e7fcf49bf650"
+        hash: "fc14e3b2d16e1f078d223876ef71c81e"
     }
     Frame {
         msec: 4112
-        hash: "ed9a9fdd4bea6e9f7f7078934337b4a6"
+        hash: "4ef2b65280a00a6a4e66185f41479aef"
     }
     Frame {
         msec: 4128
-        hash: "4fbc687f1a5b4364a90441134162c817"
+        hash: "131181ce7ff2f4d4e69823fcb7a20755"
     }
     Frame {
         msec: 4144
-        hash: "7c91ad050f31e30b7f16b99dd1ed19df"
+        hash: "8e6db058e96dad9c4963b881083ab9bf"
     }
     Frame {
         msec: 4160
-        hash: "44777e9a08d5f112b922272227b22558"
+        hash: "e2d407b6dff40625790d4fd9e599b374"
     }
     Frame {
         msec: 4176
-        hash: "c4f7523d0a214e188c95d7cbd4455a9d"
+        hash: "631fe708fdcb1e4f4ea89b10da5db623"
     }
     Frame {
         msec: 4192
-        hash: "7703b85f0bda71fa8ff84a557b015458"
+        hash: "e11831f37a3a1da78cbdc7604ddccd68"
     }
     Mouse {
         type: 2
@@ -1526,7 +1526,7 @@ VisualTest {
     }
     Frame {
         msec: 4208
-        hash: "0bd445389e69d1d758a9b17eee69d584"
+        hash: "c2dccc4e890b2302edd413dcdb87b50b"
     }
     Mouse {
         type: 5
@@ -1538,7 +1538,7 @@ VisualTest {
     }
     Frame {
         msec: 4224
-        hash: "13bfb19a05b5aef65f7f70b2c0b01424"
+        hash: "b4f6a6650dd779c8ad8696c23f44411a"
     }
     Mouse {
         type: 5
@@ -1550,7 +1550,7 @@ VisualTest {
     }
     Frame {
         msec: 4240
-        hash: "9d6a81d6f7df8aa93c9421fa3cdc3a7d"
+        hash: "ad913e53e63c030ffdf4560766722760"
     }
     Mouse {
         type: 5
@@ -1570,7 +1570,7 @@ VisualTest {
     }
     Frame {
         msec: 4256
-        hash: "4d88acb157fdeb0c608b6c9d75e999e8"
+        hash: "ef31f8a4d5bde5a2e308d19ee6d5e759"
     }
     Mouse {
         type: 5
@@ -1582,7 +1582,7 @@ VisualTest {
     }
     Frame {
         msec: 4272
-        hash: "fe506e31923e1feb2d2b3c105444f61f"
+        hash: "3ba07527f66e8bea5a8fb7647b0b4f3f"
     }
     Mouse {
         type: 5
@@ -1594,7 +1594,7 @@ VisualTest {
     }
     Frame {
         msec: 4288
-        hash: "72c0ccbbf296742f67139bd9a4abcf6b"
+        hash: "70e5fe656f5fd843383964825690b678"
     }
     Mouse {
         type: 5
@@ -1614,7 +1614,7 @@ VisualTest {
     }
     Frame {
         msec: 4304
-        hash: "75b083e391afb3cdb8e4bcd885f17966"
+        hash: "b7d8738be4cd6caa63dbecdb0f810a2f"
     }
     Mouse {
         type: 5
@@ -1626,7 +1626,7 @@ VisualTest {
     }
     Frame {
         msec: 4320
-        hash: "2babcf0e4d434120e0a7eb7d8716baa7"
+        hash: "d6312191f9d7bbddc07f9253d8a93469"
     }
     Mouse {
         type: 5
@@ -1638,7 +1638,7 @@ VisualTest {
     }
     Frame {
         msec: 4336
-        hash: "676e6a7587781146f58f82ca1ceac2b3"
+        hash: "b182da64886cf4f444296e5fde26701e"
     }
     Mouse {
         type: 5
@@ -1650,7 +1650,7 @@ VisualTest {
     }
     Frame {
         msec: 4352
-        hash: "58ecd6234c3c0f7ceec942098e3ae0fc"
+        hash: "ebefef14b6fb990e0c6900884528bbd3"
     }
     Mouse {
         type: 5
@@ -1662,7 +1662,7 @@ VisualTest {
     }
     Frame {
         msec: 4368
-        hash: "25a8af71ba1cf4581682cbec3b9baf8a"
+        hash: "9a3451ed091b1bb6b975a9c5506b1ea4"
     }
     Mouse {
         type: 5
@@ -1674,7 +1674,7 @@ VisualTest {
     }
     Frame {
         msec: 4384
-        hash: "11c305643f2ed535a6dc0a7a54caf17c"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Mouse {
         type: 5
@@ -1686,7 +1686,7 @@ VisualTest {
     }
     Frame {
         msec: 4400
-        hash: "29b33349f90286b2c078ae8d5896a338"
+        hash: "eaaf9ea1d7fcf4a2a9dd58b1b5bb3cae"
     }
     Mouse {
         type: 5
@@ -1698,7 +1698,7 @@ VisualTest {
     }
     Frame {
         msec: 4416
-        hash: "af917864d02b49bef4190ee1fca607dc"
+        hash: "7ca8e3d76cf913d85f84f0b96acde829"
     }
     Mouse {
         type: 5
@@ -1710,7 +1710,7 @@ VisualTest {
     }
     Frame {
         msec: 4432
-        hash: "7b1af6cddd2f78615354f747dfd016b9"
+        hash: "7cfef56b24a552c6d4ecb3d0b88a1d08"
     }
     Mouse {
         type: 5
@@ -1730,7 +1730,7 @@ VisualTest {
     }
     Frame {
         msec: 4448
-        hash: "84f1757af8c26b4f00298090e09f7f68"
+        hash: "d032b257259810b4fe514c63ca5c9e4b"
     }
     Mouse {
         type: 5
@@ -1742,7 +1742,7 @@ VisualTest {
     }
     Frame {
         msec: 4464
-        hash: "fd214ddbd1f60dc733994ba7a2048951"
+        hash: "568f6a57e6f1644b0dc245d03a1d7b85"
     }
     Mouse {
         type: 5
@@ -1754,83 +1754,83 @@ VisualTest {
     }
     Frame {
         msec: 4480
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4496
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4512
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4528
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4544
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4560
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4576
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4592
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4608
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4624
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4640
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4656
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4672
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4688
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4704
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4720
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4736
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4752
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4768
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4784
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4800
@@ -1838,15 +1838,15 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4832
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Frame {
         msec: 4848
-        hash: "01f209a3b5e9adaa32ad55c7d1f1d4c7"
+        hash: "5cb4cf2c527d821db2a5072dd3702653"
     }
     Mouse {
         type: 5
@@ -1866,7 +1866,7 @@ VisualTest {
     }
     Frame {
         msec: 4864
-        hash: "1dc57bc129f3a6d5287ec0fa2a99d62e"
+        hash: "d48ecbd0661e08b2117fe2fd96ffeb2c"
     }
     Mouse {
         type: 5
@@ -1878,7 +1878,7 @@ VisualTest {
     }
     Frame {
         msec: 4880
-        hash: "7b1af6cddd2f78615354f747dfd016b9"
+        hash: "7cfef56b24a552c6d4ecb3d0b88a1d08"
     }
     Mouse {
         type: 5
@@ -1890,7 +1890,7 @@ VisualTest {
     }
     Frame {
         msec: 4896
-        hash: "a890208c702b9fde41584a33b3038940"
+        hash: "5b12e9d17d9d464b055601db9cf0da44"
     }
     Mouse {
         type: 5
@@ -1902,7 +1902,7 @@ VisualTest {
     }
     Frame {
         msec: 4912
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "25333e1f0cc9cfc664fd7369af544c06"
     }
     Mouse {
         type: 5
@@ -1914,39 +1914,39 @@ VisualTest {
     }
     Frame {
         msec: 4928
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 4944
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 4960
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 4976
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 4992
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5008
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5024
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5040
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5056
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Mouse {
         type: 3
@@ -1958,175 +1958,175 @@ VisualTest {
     }
     Frame {
         msec: 5072
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5088
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5104
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5120
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5136
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5152
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5168
-        hash: "cdc2d0868771429226c74e77676f55f1"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5184
-        hash: "768d6d504470ce841e51022dd514edc5"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5200
-        hash: "768d6d504470ce841e51022dd514edc5"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5216
-        hash: "768d6d504470ce841e51022dd514edc5"
+        hash: "04290d8d62436c8a812f886e0a56ec1b"
     }
     Frame {
         msec: 5232
-        hash: "768d6d504470ce841e51022dd514edc5"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5248
-        hash: "768d6d504470ce841e51022dd514edc5"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5264
-        hash: "768d6d504470ce841e51022dd514edc5"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5280
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5296
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5312
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5328
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5344
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5360
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5376
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5392
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5408
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5424
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5440
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5456
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5472
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5488
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5504
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5520
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5536
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5552
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5568
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5584
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5600
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5616
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5632
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5648
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5664
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5680
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5696
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5712
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5728
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5744
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5760
@@ -2134,94 +2134,94 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5792
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5808
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5824
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5840
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5856
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5872
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5888
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5904
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5920
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5936
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5952
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5968
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 5984
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6000
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6016
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6032
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6048
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6064
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6080
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6096
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6112
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
     Frame {
         msec: 6128
-        hash: "6df3f8000a0d390b89d41c6ece6ea221"
+        hash: "dbd87bf02d698b7f053d307ef0c98452"
     }
 }
-- 
cgit v0.12


From b628a6dc1373fcfbc71a7668d39111c699396674 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 4 Nov 2010 15:18:08 +1000
Subject: Document list type operations

Task-number: QTBUG-14645
---
 doc/src/declarative/basictypes.qdoc | 85 ++++++++++++++++++++++++++++++++++---
 doc/src/declarative/extending.qdoc  |  9 +++-
 2 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 6abe96f..8ab06ab 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -355,9 +355,11 @@
 
     \brief A list of objects.
 
-    A list of objects. While not technically a basic type, QML also
-    supports lists of object types. When used from QML, the engine
-    automatically appends each value to the list.
+    A list type contains a list of objects. While not technically
+    a basic type, QML supports lists of object types. When used
+    from QML, the engine automatically appends each value to the list.
+    Items in the list can be accessed by index using the usual
+    \c listName[index] syntax.
 
     For example, the \l Item class contains a list property named
     children that can be used like this:
@@ -366,14 +368,87 @@
     Item {
         children: [
             Item { id: child1 },
-            Rectangle { id: child2 },
+            Rectangle { id: child2; width: 200 },
             Text { id: child3 }
         ]
+
+        Component.onCompleted: {
+            console.log("Width of child rectangle:", children[1].width)
+        }
     }
     \endqml
-    \c child1, \c child2 and \c child3 will all be added to the children list
+    \c child1, \c child2 and \c child3 will be added to the children list
     in the order in which they appear.
 
+    List \l {Adding new properties}{properties} can be created as a
+    \c variant type, or as a \c list<Type> type, where \c Type is the
+    type of the object in the list:
+
+    \qml
+    Item {
+        property variant values: [ 10, 20, 'abc', 'xyz' ]
+
+        property list<Rectangle> rects: [
+            Rectangle { width: 100; height: 100},
+            Rectangle { width: 200; height: 200}
+        ]
+    }
+    \endqml
+
+    A \c variant list can contain values of any of the \l {QML Basic Types}{basic QML types}
+    such as numbers, strings, etc. while a \c list<Type> list can only contain values
+    that match (or are derived from) the specified \c Type.
+
+    A list property can be cleared by setting it to an empty list:
+
+    \qml
+    Item {
+        children: []
+    }
+    \endqml
+
+    A list property cannot be modified in any other way. Items cannot be dynamically added to
+    or removed from the list through JavaScript operations; any \c push() operations on the
+    list only modify a \e copy of the list and not the actual list. (These current limitations
+    are due to restrictions on \l {Property Binding} where lists are involved.)
+
+    To create a modifiable list, create an array object from within a \c .js JavaScript file,
+    or implement a custom list element in C++. Here is a QML element that modifies the list in a
+    JavaScript file:
+
+    \table
+    \row
+    \o
+    \qml
+    // QML
+    import "script.js" as Script
+
+    Item {
+        Component.onCompleted: {
+            Script.addItem('abc')
+            console.log("Added:", Script.getList()[0])
+        }
+    }
+    \endqml
+
+    \o
+    \code
+    // script.js
+    var myArray = new Array()
+
+    function getList() {
+        return myArray
+    }
+
+    function addItem(item) {
+        myArray.push(item)
+    }
+    \endcode
+    \endtable
+
+    However, note that a JavaScript list should not be used as a QML \c property value,
+    as the property is not updated when the list changes.
+
     \sa {QML Basic Types}
 */
 
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 18887c7..5c1b977 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -647,7 +647,8 @@ language.
 
 \section1 Adding new properties
 
-New properties can be added to an existing type.  These new properties are
+New properties can be added to an existing type using the \c property keyword.
+These new properties are
 available for use within QML, and also appear as regular Qt properties on the
 C++ object, accessible through the regular property access mechanisms.
 
@@ -679,8 +680,12 @@ like this:
     property list<Item> listOfItemsProperty
 \endcode
 
+Custom types must be registered with qmlRegisterType() to be usable as a property
+type. Also note that list properties cannot be modified like ordinary JavaScript
+arrays; see the \l {list}{list type documentation} for details.
+
 QML supports two methods for adding a new property to a type: a new property
-definition, and a property alias.
+definition, and a property alias. These are shown below.
 
 \section2 Property definitions
 
-- 
cgit v0.12


From b5588ded342ed9dbc9f00fc8a4091e447880eccc Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 4 Nov 2010 15:18:52 +1000
Subject: Largely rewrite the Using QML in C++ Applications documentation. It
 now has an overview of different approaches to QML/C++ integration and
 demonstrates how to pass data between QML and C++ through
 properties/functions/signals. The part in the old docs that focused on
 QDeclarativeContext has been merged into the QDeclarativeContext class docs
 (although most of the info was largely covered in there already) and the part
 that covered Network Components has been moved to the QDeclarativeComponent
 class docs. The custom enum types example previously in
 extending-tutorial.qdoc has been moved to these new docs.

Task-number: QTBUG-14923
---
 doc/src/declarative/extending-tutorial.qdoc        |  20 +-
 doc/src/declarative/qtbinding.qdoc                 | 631 ++++++++++++++++-----
 .../qtbinding/context-advanced/MyItem.qml          |  46 ++
 .../qtbinding/context-advanced/applicationdata.h   |  52 ++
 .../qtbinding/context-advanced/connections.qml     |  52 ++
 .../context-advanced/context-advanced.pro          |   3 +
 .../qtbinding/context-advanced/main.cpp            |  60 ++
 .../declarative/qtbinding/context/MyItem.qml       |  45 ++
 .../declarative/qtbinding/context/context.pro      |   2 +
 .../declarative/qtbinding/context/main.cpp         |  56 ++
 .../contextproperties/contextproperties.pro        |   2 -
 .../qtbinding/contextproperties/main.cpp           |  78 ---
 .../qtbinding/contextproperties/main.qml           |  55 --
 .../qtbinding/custompalette/custompalette.h        |  79 ---
 .../qtbinding/custompalette/custompalette.pro      |   3 -
 .../declarative/qtbinding/custompalette/main.cpp   |  61 --
 .../declarative/qtbinding/custompalette/main.qml   |  62 --
 .../snippets/declarative/qtbinding/enums/enums.pro |   3 +
 .../declarative/qtbinding/enums/imageviewer.h      |  68 +++
 .../snippets/declarative/qtbinding/enums/main.cpp  |  73 +++
 .../declarative/qtbinding/enums/standalone.qml     |  49 ++
 .../declarative/qtbinding/functions-cpp/MyItem.qml |  55 ++
 .../qtbinding/functions-cpp/functions-qml.pro      |   3 +
 .../declarative/qtbinding/functions-cpp/main.cpp   |  59 ++
 .../declarative/qtbinding/functions-cpp/myclass.h  |  57 ++
 .../declarative/qtbinding/functions-qml/MyItem.qml |  50 ++
 .../qtbinding/functions-qml/functions-qml.pro      |   2 +
 .../declarative/qtbinding/functions-qml/main.cpp   |  63 ++
 .../declarative/qtbinding/loading/MyItem.qml       |  56 ++
 .../declarative/qtbinding/loading/loading.pro      |   2 +
 .../declarative/qtbinding/loading/main.cpp         |  90 +++
 .../qtbinding/newelements/imageviewer.h            |  56 ++
 .../declarative/qtbinding/newelements/main.cpp     |  62 ++
 .../qtbinding/newelements/newelements.pro          |   3 +
 .../qtbinding/newelements/standalone.qml           |  44 ++
 .../qtbinding/properties-cpp/MyItem.qml            |  54 ++
 .../qtbinding/properties-cpp/applicationdata.h     |  71 +++
 .../declarative/qtbinding/properties-cpp/main.cpp  |  58 ++
 .../qtbinding/properties-cpp/properties-cpp.pro    |   3 +
 .../qtbinding/properties-qml/MyItem.qml            |  47 ++
 .../declarative/qtbinding/properties-qml/main.cpp  |  61 ++
 .../qtbinding/properties-qml/properties-qml.pro    |   2 +
 .../declarative/qtbinding/resources/main.qml       |   5 +-
 .../declarative/qtbinding/signals-cpp/MyItem.qml   |  50 ++
 .../qtbinding/signals-cpp/imageviewer.h            |  64 +++
 .../declarative/qtbinding/signals-cpp/main.cpp     |  81 +++
 .../qtbinding/signals-cpp/signals-cpp.pro          |   3 +
 .../qtbinding/signals-cpp/standalone.qml           |  48 ++
 .../declarative/qtbinding/signals-qml/MyItem.qml   |  55 ++
 .../declarative/qtbinding/signals-qml/main.cpp     |  59 ++
 .../declarative/qtbinding/signals-qml/myclass.h    |  51 ++
 .../qtbinding/signals-qml/signals-qml.pro          |   3 +
 .../declarative/qtbinding/stopwatch/main.cpp       |  62 --
 .../declarative/qtbinding/stopwatch/main.qml       |  58 --
 .../declarative/qtbinding/stopwatch/stopwatch.cpp  |  62 --
 .../declarative/qtbinding/stopwatch/stopwatch.h    |  61 --
 .../declarative/qtbinding/stopwatch/stopwatch.pro  |   3 -
 src/declarative/qml/qdeclarativecomponent.cpp      |  37 ++
 src/declarative/qml/qdeclarativecontext.cpp        |  21 +-
 tests/auto/declarative/examples/tst_examples.cpp   |   1 +
 60 files changed, 2363 insertions(+), 759 deletions(-)
 create mode 100644 doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h
 create mode 100644 doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/context/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/context/context.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/context/main.cpp
 delete mode 100644 doc/src/snippets/declarative/qtbinding/contextproperties/contextproperties.pro
 delete mode 100644 doc/src/snippets/declarative/qtbinding/contextproperties/main.cpp
 delete mode 100644 doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
 delete mode 100644 doc/src/snippets/declarative/qtbinding/custompalette/custompalette.h
 delete mode 100644 doc/src/snippets/declarative/qtbinding/custompalette/custompalette.pro
 delete mode 100644 doc/src/snippets/declarative/qtbinding/custompalette/main.cpp
 delete mode 100644 doc/src/snippets/declarative/qtbinding/custompalette/main.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/enums/enums.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/enums/imageviewer.h
 create mode 100644 doc/src/snippets/declarative/qtbinding/enums/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/enums/standalone.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h
 create mode 100644 doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/loading/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/loading/loading.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/loading/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h
 create mode 100644 doc/src/snippets/declarative/qtbinding/newelements/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/newelements/newelements.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/newelements/standalone.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
 create mode 100644 doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h
 create mode 100644 doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro
 delete mode 100644 doc/src/snippets/declarative/qtbinding/stopwatch/main.cpp
 delete mode 100644 doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
 delete mode 100644 doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.cpp
 delete mode 100644 doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.h
 delete mode 100644 doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.pro

diff --git a/doc/src/declarative/extending-tutorial.qdoc b/doc/src/declarative/extending-tutorial.qdoc
index 3b2fe3b..2bfe62e 100644
--- a/doc/src/declarative/extending-tutorial.qdoc
+++ b/doc/src/declarative/extending-tutorial.qdoc
@@ -260,32 +260,28 @@ custom QML types may see unexpected behavior if bindings are not implemented.
 
 The \c PieChart type currently has a string-type property and a color-type property.
 It could have many other types of properties. For example, it could have an
-enum-type property to store a display mode for each chart:
+int-type property to store an identifier for each chart:
 
 \code
     // C++
     class PieChart : public QDeclarativeItem
     {
-        Q_ENUMS(DisplayMode)
-        Q_PROPERTY(DisplayMode displayMode READ displayMode WRITE setDisplayMode)
+        Q_PROPERTY(int chartId READ chartId WRITE setChartId NOTIFY chartIdChanged)
         ...
 
     public:
-        enum DisplayMode {
-            MultiLevel,
-            Exploded,
-            ThreeDimensional
-        };
-
-        void setDisplayMode(DisplayMode mode);
-        DisplayMode displayMode() const;
+        void setChartId(int chartId);
+        int chartId() const;
         ...
+
+    signals:
+        void chartIdChanged();
     };
 
     // QML
     PieChart {
         ...
-        displayMode: PieChart.Exploded
+        chartId: 100
     }
 \endcode
 
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 58d53de..8a969eb 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -30,126 +30,389 @@
 \target qtbinding
 \title Using QML in C++ Applications
 
-\tableofcontents
+QML is designed to be easily extensible from C++. The classes in the
+QtDeclarative module allow QML components to be loaded and manipulated from C++, and through
+Qt's \l{The Meta-Object System}{meta-object system}, QML and C++ objects can easily
+communicate through Qt signals and slots. In addition, QML plugins can be written to create
+reusable QML components for distribution.
 
-The QML API is split into three main classes - QDeclarativeEngine, QDeclarativeComponent and QDeclarativeContext.  
-QDeclarativeEngine provides the environment in which QML is run, QDeclarativeComponent encapsulates 
-\l {QML Documents}, and QDeclarativeContext allows applications to expose data to QML component instances.
+You may want to mix QML and C++ for a number of reasons. For example:
 
-QML also includes a convenience API, QDeclarativeView, for applications that simply want to embed QML
-components into a new QGraphicsView.  QDeclarativeView covers up many of the details discussed below.  
-While QDeclarativeView is mainly intended for rapid prototyping it can have uses in production applications.
+\list
+\o To use functionality defined in a C++ source (for example, when using a C++ Qt-based data model, or
+calling functions in a third-party C++ library)
+\o To access functionality in the QtDeclarative module (for example, to dynamically generate
+images using QDeclarativeImageProvider)
+\o To write your own QML elements (whether for your applications, or for distribution to others)
+\endlist
+
+To use the QtDeclarative module, you must include and link to the module appropriately, as shown on
+the \l {QtDeclarative}{module index page}. The \l {Qt Declarative UI Runtime} documentation
+shows how to build a basic C++ application that uses this module.
+
+
+\section1 Core module classes
 
-If you are looking at retrofitting an existing Qt application with QML,
-read \l{Integrating QML with existing Qt UI code}.
-\section1 Basic Usage
+The QtDeclarative module provides a set of C++ APIs for extending your QML applications from C++ and
+embedding QML into C++ applications. There are several core classes in the QtDeclarative module
+that provide the essential capabilities for doing this. These are:
 
-Every application requires at least one QDeclarativeEngine.  A QDeclarativeEngine allows the configuration of
-global settings that apply to all the QML component instances - such as the QNetworkAccessManager
-that is used for network communications, and the path used for persistent storage.  
-Multiple QDeclarativeEngine's are only needed if the application requires these settings to differ 
-between QML component instances.
+\list
+\o QDeclarativeEngine: A QML engine provides the environment for executing QML code. Every
+application requires at least one engine instance.
+\o QDeclarativeComponent: A component encapsulates a \l{QML Documents}{QML document}.
+\o QDeclarativeContext: A context allows an application to expose data to the QML components
+created by an engine.
+\endlist
 
-\l {QML Documents} are loaded using the QDeclarativeComponent class.  Each QDeclarativeComponent instance 
-represents a single QML document.  A QDeclarativeComponent can be passed a document URL, or raw text
-representing the content of the document.  The document URL can be a local filesystem URL, or
-any network URL supported by QNetworkAccessManager.
+A QDeclarativeEngine allows the configuration of global settings that apply to all of its QML
+component instances: for example, the QNetworkAccessManager to be used for network communications,
+and the file path to be used for persistent storage.
 
-QML component instances can then be created by calling the QDeclarativeComponent::create() method.  Here's
-an example of loading a QML document, and creating an object from it.
+QDeclarativeComponent is used to load QML documents. Each QDeclarativeComponent instance represents
+a single document. A component can be created from the URL or file path of a QML document, or the raw
+QML code of the document. Component instances are instatiated through the
+QDeclarativeComponent::create() method, like this:
 
 \code
-    QDeclarativeEngine *engine = new QDeclarativeEngine(parent);
-    QDeclarativeComponent component(engine, QUrl::fromLocalFile("main.qml"));
-    QObject *myObject = component.create();
+QDeclarativeEngine engine;
+QDeclarativeComponent component(&engine, QUrl::fromLocalFile("MyRectangle.qml"));
+QObject *rectangleInstance = component.create();
+
+// ...
+delete rectangleInstance;
 \endcode
 
-\section1 Exposing Data
+QML documents can also be loaded using QDeclarativeView. This class provides a convenient
+QWidget-based view for embedding QML components into QGraphicsView-based applications. (For other
+methods of integrating QML into QWidget-based applications, see \l {Integrating QML with existing Qt
+UI code}.)
+
+
+\section1 Approaches to using QML with C++
+
+There are a number of ways to extend your QML application through C++. For example, you could:
+
+\list
+\o Load a QML component and manipulate it (or its children) from C++
+\o Embed a C++ object and its properties directly into a QML component (for example, to make a
+particular C++ object callable from QML, or to replace a dummy list model data with a real data set)
+\o Define new QML elements (through QObject-based C++ classes) and create them directly from your
+QML code
+\endlist
+
+These methods are shown below. Naturally these approaches are not exclusive; you can mix any of
+these methods throughout your application as appropriate.
+
+
+\section2 Loading QML components from C++
+
+A QML document can be loaded with QDeclarativeComponent or QDeclarativeView. QDeclarativeComponent
+loads a QML component as a C++ object; QDeclarativeView also does this,
+but additionally loads the QML component directly into a QGraphicsView. It is convenient for loading
+a displayable QML component into a QWidget-based application.
+
+For example, suppose there is a \c MyItem.qml file that looks like this:
+
+\snippet doc/src/snippets/declarative/qtbinding/loading/MyItem.qml start
+\snippet doc/src/snippets/declarative/qtbinding/loading/MyItem.qml end
+
+This QML document can be loaded with QDeclarativeComponent or QDeclarativeView with the following
+C++ code. Using a QDeclarativeComponent requires calling QDeclarativeComponent::create() to create
+a new instance of the component, while a QDeclarativeView automatically creates an instance of the
+component, which is accessible via QDeclarativeView::rootObject():
+
+\table
+\row
+\o
+\snippet doc/src/snippets/declarative/qtbinding/loading/main.cpp QDeclarativeComponent-a
+\dots 0
+\snippet doc/src/snippets/declarative/qtbinding/loading/main.cpp QDeclarativeComponent-b
+\o
+\snippet doc/src/snippets/declarative/qtbinding/loading/main.cpp QDeclarativeView
+\endtable
+
+This \c object is the instance of the \c MyItem.qml component that has been created. You can now
+modify the item's properties using QObject::setProperty() or QDeclarativeProperty:
+
+\snippet doc/src/snippets/declarative/qtbinding/loading/main.cpp properties
+
+Alternatively, you can cast the object to its actual type and call functions with compile-time
+safety. In this case the base object of \c MyItem.qml is an \l Item, which is defined by the
+QDeclarativeItem class:
+
+\snippet doc/src/snippets/declarative/qtbinding/loading/main.cpp cast
+
+You can also connect to any signals or call functions defined in the component using
+QMetaObject::invokeMethod() and QObject::connect(). See \l {Exchanging data between QML and C++}
+below for further details.
+
+\section3 Locating child objects
+
+QML components are essentially object trees with children that have siblings and their own children.
+Child objects of QML components can be located using the QObject::objectName property with
+QObject::findChild(). For example, if the root item in \c MyItem.qml had a child \l Rectangle item:
+
+\snippet doc/src/snippets/declarative/qtbinding/loading/MyItem.qml start
+\codeline
+\snippet doc/src/snippets/declarative/qtbinding/loading/MyItem.qml child
+\snippet doc/src/snippets/declarative/qtbinding/loading/MyItem.qml end
+
+The child could be located like this:
+
+\snippet doc/src/snippets/declarative/qtbinding/loading/main.cpp findChild
+
+If \c objectName is used inside a delegate of a ListView, \l Repeater or some other
+element that creates multiple instances of its delegates, there will be multiple children with
+the same \c objectName. In this case, QObject::findChildren() can be used to find all children
+with a matching \c objectName.
+
+\warning While it is possible to use C++ to access and manipulate QML objects deep into the
+object tree, we recommend that you do not take this approach outside of application
+testing and prototyping. One strength of QML and C++ integration is the ability to implement the
+QML user interface separately from the C++ logic and dataset backend, and this strategy breaks if the
+C++ side reaches deep into the QML components to manipulate them directly. This would make it difficult
+to, for example, swap a QML view component for another view, if the new component was missing a
+required \c objectName. It is better for the C++ implementation to know as little as possible about
+the QML user interface implementation and the composition of the QML object tree.
+
+
+\section2 Embedding C++ objects into QML components
+
+When loading a QML scene into a C++ application, it can be useful to directly embed C++ data into
+the QML object. QDeclarativeContext enables this by exposing data to the context of a QML
+component, allowing data to be injected from C++ into QML.
+
+For example, here is a QML item that refers to a \c currentDateTime value that does not exist in
+the current scope:
+
+\snippet doc/src/snippets/declarative/qtbinding/context/MyItem.qml 0
+
+This \c currentDateTime value can be set directly by the C++ application that loads the QML
+component, using QDeclarativeContext::setContextProperty():
+
+\snippet doc/src/snippets/declarative/qtbinding/context/main.cpp 0
+
+Context properties can hold either QVariant or QObject* values. This means custom C++ objects can
+also be injected using this approach, and these objects can be modified and read directly in QML.
+Here, we modify the above example to embed a QObject instance instead of a QDateTime value, and the QML code
+invokes a method on the object instance:
+
+\table
+\row
+\o
+\snippet doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h 0
+\codeline
+\snippet doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp 0
+\o
+\snippet doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml 0
+\endtable
+
+(Note that date/time values returned from C++ to QML can be formatted through
+\l{QML:Qt::formatDateTime}{Qt.formatDateTime()} and associated functions.)
+
+If the QML item needs to receive signals from the context property, it can connect to them using the
+\l Connections element. For example, if \c ApplicationData has a signal named \c
+dataChanged(), this signal can be connected to using an \c onDataChanged handler within
+a \l Connections object:
+
+\snippet doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml 0
+
+Context properties can be useful for using C++ based data models in a QML view. See the
+\l {declarative/modelviews/stringlistmodel}{String ListModel},
+\l {declarative/modelviews/objectlistmodel}{Object ListModel} and
+\l {declarative/modelviews/abstractitemmodel}{AbstractItemModel} models for
+respective examples on using QStringListModel, QObjectList-based models and QAbstractItemModel
+in QML views.
+
+Also see the QDeclarativeContext documentation for more information.
+
+
+\section2 Defining new QML elements
+
+While new QML elements can be \l {Defining new Components}{defined in QML}, they can also be
+defined by C++ classes; in fact, many of the core \l {QML Elements} are implemented through
+C++ classes. When you create a QML object using one of these elements, you are simply creating an
+instance of a QObject-based C++ class and setting its properties.
+
+For example, here is an \c ImageViewer class with an \c image URL property:
+
+\snippet doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h 0
+
+Aside from the fact that it inherits QDeclarativeItem, this is an ordinary class that could
+exist outside of QML. However, once it is registered with the QML engine using qmlRegisterType():
+
+\snippet doc/src/snippets/declarative/qtbinding/newelements/main.cpp register
+
+Then, any QML code loaded by your C++ application or \l{QDeclarativeExtensionPlugin}{plugin} can create and manipulate
+\c ImageViewer objects:
+
+\snippet doc/src/snippets/declarative/qtbinding/newelements/standalone.qml 0
+
+Note that custom C++ types do not have to inherit from QDeclarativeItem; this is only necessary if it is
+a displayable item. If the item is not displayable, it can simply inherit from QObject.
+
+For more information on defining new QML elements, see the \l {Tutorial: Writing QML extensions with C++}
+{Writing QML extensions with C++} tutorial and the \l {Extending QML in C++} reference
+documentation.
+
+
+
+\section1 Exchanging data between QML and C++
+
+QML and C++ objects can communicate with one another through signals, slots and property
+modifications. For a C++ object, any data that is exposed to Qt's \l{The Meta-Object System}{Meta-Object System}
+- that is, properties, signals, slots and Q_INVOKABLE methods - become available to QML. On
+the QML side, all QML object data is automatically made available to the meta-object system and can
+be accessed from C++.
+
+
+\section2 Calling functions
 
-QML components are instantiated in a QDeclarativeContext.  A context allows the application to expose data
-to the QML component instance.  A single QDeclarativeContext can be used to instantiate all the objects
-used by an application, or several QDeclarativeContext can be created for more fine grained control over
-the data exposed to each instance.  If a context is not passed to the QDeclarativeComponent::create()
-method, the QDeclarativeEngine's \l {QDeclarativeEngine::rootContext()}{root context} is used.  Data exposed through
-the root context is available to all object instances.
+QML functions can be called from C++ and vice-versa.
 
-\section1 Simple Data
+All QML functions are exposed to the meta-object system and can be called using
+QMetaObject::invokeMethod(). Here is a C++ application that uses this to call a QML function:
 
-To expose data to a QML component instance, applications set \l {QDeclarativeContext::setContextProperty()}
-{context properties} which are then accessible by name from QML  \l {Property Binding}s and JavaScript.
-The following example shows how to expose a background color to a QML file through QDeclarativeView:
+\table
+\row
+\o \snippet doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml 0
+\o \snippet doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp 0
+\endtable
+
+Notice the Q_RETURN_ARG() and Q_ARG() arguments for QMetaObject::invokeMethod() must be specified as
+QVariant types, as this is the generic data type used for QML functions and return values.
+
+To call a C++ function from QML, the function must be either a Qt slot, or a function marked with
+the Q_INVOKABLE macro, to be available to QML. In the following example, the QML code invokes
+methods on the \c myObject object, which has been set using QDeclarativeContext::setContextProperty():
+
+\table
+\row
+\o
+\snippet doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml 0
+\o
+\snippet doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h 0
+\codeline
+\snippet doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp 0
+\endtable
+
+Note that QML does not support overloaded functions. If a C++ has more than one function with the
+same name, there is no guarantee which overloaded function will be called from QML.
+
+
+\section2 Receiving signals
+
+All QML signals are automatically available to C++, and can be connected to using QObject::connect()
+like any ordinary Qt C++ signal.
+
+Here is a QML component with a signal named \c qmlSignal. This signal is connected to a C++ object's
+slot using QObject::connect():
+
+\table
+\row
+\o
+\snippet doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml 0
+\o
+\snippet doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h 0
+\codeline
+\snippet doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp 0
+\endtable
+
+To connect to Qt C++ signals from within QML, use a signal handler with the \c on<SignalName> syntax.
+If the C++ object is directly creatable from within QML (see \l {Defining new QML elements} above)
+then the signal handler can be defined within the object declaration. In the following example, the
+QML code creates a \c ImageViewer object, and the \c imageChanged and \c loadingError signals of the
+C++ object are connected to through \c onImagedChanged and \c onLoadingError signal handlers in QML:
 
 \table
 \row
 \o
-\c {// main.cpp}
-\snippet doc/src/snippets/declarative/qtbinding/contextproperties/main.cpp 0
+
+\snippet doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h start
+\dots 4
+\snippet doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h end
 
 \o
-\c {// main.qml}
-\snippet doc/src/snippets/declarative/qtbinding/contextproperties/main.qml 0
+\snippet doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml 0
+\endtable
+
+(Note that if a signal has been declared as the NOTIFY signal for a property, QML allows it to be
+received with an \c on<Property>Changed handler even if the signal's name does not follow the \c
+<Property>Changed naming convention. In the above example, if the "imageChanged" signal was named
+"imageModified" instead, the \c onImageChanged signal handler would still be called.)
+
+If, however, the object with the signal is not created from within the QML code, and the QML item only has a
+reference to the created object - for example, if the object was set using
+QDeclarativeContext::setContextProperty() - then the \l Connections element can be used
+instead to create the signal handler:
 
+\table
+\row
+\o \snippet doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp connections
+\o \snippet doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml 0
 \endtable
 
-Or, if you want \c main.cpp to create the component without showing it in a QDeclarativeView, you could create an instance of QDeclarativeContext using QDeclarativeEngine::rootContext() instead:
 
-\snippet doc/src/snippets/declarative/qtbinding/contextproperties/main.cpp 1
+\section2 Modifying properties
 
-Context properties work just like normal properties in QML bindings - if the \c backgroundColor
-context property in this example was changed to red, the component object instances would
-all be automatically updated.  Note that it is the responsibility of the creator to delete any
-QDeclarativeContext it constructs.  If the \c windowContext is no longer needed when
-the \c window component instantiation is destroyed, the \c windowContext must be destroyed
-explicitly.  The simplest way to ensure this is to set \c window as \c windowContext's parent.
+Any properties declared in a QML object are automatically accessible from C++. Given a QML item
+like this:
 
-QDeclarativeContexts form a tree - each QDeclarativeContext except for the root context has a parent.  Child 
-QDeclarativeContexts effectively inherit the context properties present in their parents.  This gives
-applications more freedom in partitioning the data exposed to different QML object instances.  
-If a QDeclarativeContext sets a context property that is also set in one of its parents, the new context
-property shadows that in the parent.  In The following example, the \c background context property
-in \c {Context 1} shadows the \c background context property in the root context.
+\snippet doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml 0
 
-\image qml-context-tree.png
+The value of the \c someNumber property can be set and read using QDeclarativeProperty, or
+QObject::setProperty() and QObject::property():
 
-\section2 Structured Data
+\snippet doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp 0
 
-Context properties can also be used to expose structured and writable data to QML objects.  In 
-addition to all the types already supported by QVariant, QObject derived types can be assigned to
-context properties.  QObject context properties allow the data exposed to be more structured, and
-allow QML to set values.
+You should always use QObject::setProperty(), QDeclarativeProperty or QMetaProperty::write() to
+change a QML property value, to ensure the QML engine is made aware of the property change. For example,
+say you have a custom element \c PushButton with a \c buttonText property that internally reflects
+the value of a \c m_buttonText member variable. Modifying the member variable directly like this is
+not a good idea:
 
-The following example creates a \c CustomPalette object, and sets it as the \c palette context
-property.
+\badcode
+// BAD!
+QDeclarativeComponent component(engine, "MyButton.qml");
+PushButton *button = qobject_cast<PushButton*>(component.create());
+button->m_buttonText = "Click me";
+\endcode
 
-\snippet doc/src/snippets/declarative/qtbinding/custompalette/custompalette.h 0
+Since the value is changed directly, this bypasses Qt's \l{The Meta-Object System}{meta-object system}
+and the QML engine is not made aware of the property change. This means property bindings to
+\c buttonText would not be updated, and any \c onButtonTextChanged handlers would not be called.
 
-\snippet doc/src/snippets/declarative/qtbinding/custompalette/main.cpp 0
 
-The QML that follows references the palette object, and its properties, to set the appropriate
-background and text colors.  When the window is clicked, the palette's text color is changed, and
-the window text will update accordingly.
+\target properties-cpp
 
-\snippet doc/src/snippets/declarative/qtbinding/custompalette/main.qml 0
+Any \l {The Property System}{Qt properties} - that is, those declared with the Q_PROPERTY()
+macro - are accessible from QML. Here is a modified version of the \l {Embedding C++ objects into
+QML components}{earlier example} on this page; here, the \c ApplicationData class has a \c backgroundColor
+property. This property can be written to and read from QML:
 
-To detect when a C++ property value - in this case the \c CustomPalette's \c text property - 
-changes, the property must have a corresponding NOTIFY signal.  The NOTIFY signal specifies a signal
-that is emitted whenever the property changes value.  Implementers should take care to only emit the
-signal if the value \e changes to prevent loops from occurring.  Accessing a property from a
-binding that does not have a NOTIFY signal will cause QML to issue a warning at runtime.
+\table
+\row
+\o \snippet doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h 0
+\o \snippet doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml 0
+\endtable
 
-\section2 Dynamic Structured Data
+Notice the \c backgroundColorChanged signal is declared as the NOTIFY signal for the
+\c backgroundColor property. If a Qt property does not have an associated NOTIFY signal,
+the property cannot be used for \l {Property Binding} in QML, as the QML engine would not be
+notified when the value changes. If you are using custom types in QML, make sure their
+properties have NOTIFY signals so that they can be used in property bindings.
 
-If an application is too dynamic to structure data as compile-time QObject types, dynamically
-structured data can be constructed at runtime using the QDeclarativePropertyMap class.
+See \l {Tutorial: Writing QML extensions with C++} for further details and examples
+on using Qt properties with QML.
 
 
-\section1 Calling C++ methods from QML
+\section1 Supported data types
 
-It is possible to call methods of QObject derived types by either exposing the
-methods as public slots, or by marking the methods Q_INVOKABLE.
+Any C++ data that is used from QML - whether as custom properties, or parameters for signals or
+functions - must be of a type that is recognizable by QML.
 
-The C++ methods can also have parameters and return values.  QML has support for
-the following types:
+By default, QML recognizes the following data types:
 
 \list
 \o bool
@@ -163,102 +426,168 @@ the following types:
 \o QSize, QSizeF
 \o QRect, QRectF
 \o QVariant
+\o QObject*
+\o Enumerations declared with Q_ENUMS()
 \endlist
 
-This example toggles the "Stopwatch" object on/off when the MouseArea is clicked:
+To allow a custom C++ type to be created or used in QML, the C++ class must be registered as a QML
+type using qmlRegisterType(), as shown in the \l {Defining new QML elements} section above.
 
-\table
-\row
-\o
-\c {// main.cpp}
-\snippet doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.h 0
-\snippet doc/src/snippets/declarative/qtbinding/stopwatch/main.cpp 0
 
-\o
-\c {// main.qml}
-\snippet doc/src/snippets/declarative/qtbinding/stopwatch/main.qml 0
+\section2 Using enumerations of a custom type
 
-\endtable
+To use an enumeration from a custom C++ component, the enumeration must be declared with Q_ENUMS() to
+register it with Qt's meta object system. For example, the following C++ type has a \c Status enum:
 
-Note that in this particular example a better way to achieve the same result
-is to have a "running" property in \c main.qml.  This leads to much nicer QML code:
+\snippet doc/src/snippets/declarative/qtbinding/enums/imageviewer.h start
+\snippet doc/src/snippets/declarative/qtbinding/enums/imageviewer.h end
+
+Providing the \c ImageViewer class has been registered using qmlRegisterType(), its \c Status enum can
+now be used from QML:
+
+\snippet doc/src/snippets/declarative/qtbinding/enums/standalone.qml 0
+
+The C++ type must be registered with QML to use its enums. If your C++ type is not instantiable, it
+can be registered using qmlRegisterUncreatableType().
+
+See the \l {Tutorial: Writing QML extensions with C++}{Writing QML extensions with C++} tutorial and
+the \l {Extending QML in C++} reference documentation for more information.
+
+
+\section2 Automatic type conversion
+
+As a convenience, some basic types can be specified in QML using format strings to make it easier to
+pass simple values from QML to C++.
 
 \table
+\header
+\o Type
+\o String format
+\o Example
 \row
-\o
-\code
-// main.qml
-import QtQuick 1.0
-
-Rectangle {
-    MouseArea {
-        anchors.fill: parent
-        onClicked: stopwatch.running = !stopwatch.running
-    }
-}
-\endcode
+\o QColor
+\o Color name, "#RRGGBB", "#RRGGBBAA"
+\o "red", "#ff0000", "#ff000000"
+\row
+\o QDate
+\o "YYYY-MM-DD"
+\o "2010-05-31"
+\row
+\o QPoint
+\o "x,y"
+\o "10,20"
+\row
+\o QRect
+\o "x,y,WidthxHeight"
+\o "50,50,100x100"
+\row
+\o QSize
+\o "WidthxHeight"
+\o "100x200"
+\row
+\o QTime
+\o "hh:mm:ss"
+\o "14:22:55"
+\row
+\o QUrl
+\o URL string
+\o "http://www.example.com"
+\row
+\o QVector3D
+\o "x,y,z"
+\o "0,1,0"
+\row
+\o Enumeration value
+\o Enum value name
+\o "AlignRight"
 \endtable
 
-Of course, it is also possible to call \l {Adding new methods}{functions declared in QML from C++}.
+(More details on these string formats and types can be found in the
+\l {QML Basic Types}{basic type documentation}.)
+
+These string formats can be used to set QML \c property values and pass arguments to C++
+functions. This is demonstrated by various examples on this page; in the above
+\l{#properties-cpp}{Qt properties example}, the \c ApplicationData class has a \c backgroundColor
+property of a QColor type, which is set from the QML code with the string "red" rather rather
+than an actual QColor object.
+
+If it is preferred to pass an explicitly-typed value rather than a string, the global
+\l{QmlGlobalQtObject}{Qt object} provides convenience functions for creating some of the object
+types listed above. For example, \l{QML:Qt::rgba()}{Qt.rgba()} creates a QColor value from four
+RGBA values. The QColor returned from this function could be used instead of a string to set
+a QColor-type property or to call a C++ function that requires a QColor parameter.
+
+
+\section1 Writing QML plugins
+
+The QtDeclarative module includes the QDeclarativeExtensionPlugin class, which is an abstract
+class for writing QML plugins. This allows QML extension types to be dynamically loaded into
+QML applications.
+
+See the QDeclarativeExtensionPlugin documentation and \l {How to Create Qt Plugins} for more
+details.
+
+
+\section1 Managing resource files with the Qt resource system
 
+The \l {The Qt Resource System}{Qt resource system} allows resource files to be stored as
+binary files in an application executable. This can be useful when building a mixed
+QML/C++ application as it enables QML files (as well as other resources such as images
+and sound files) to be referred to through the resource system URI scheme rather than
+relative or absolute paths to filesystem resources. Note, however, that if you use the resource
+system, the application executable must be re-compiled whenever a QML source file is changed
+in order to update the resources in the package.
 
-\section1 Network Components
+To use the resource system in a mixed QML/C++ application:
 
-If the URL passed to QDeclarativeComponent is a network resource, or if the QML document references a
-network resource, the QDeclarativeComponent has to fetch the network data before it is able to create
-objects.  In this case, the QDeclarativeComponent will have a \l {QDeclarativeComponent::Loading}{Loading}
-\l {QDeclarativeComponent::status()}{status}.  An application will have to wait until the component
-is \l {QDeclarativeComponent::Ready}{Ready} before calling \l {QDeclarativeComponent::create()}.
+\list
+\o Create a \c .qrc \l {The Qt Resource System}{resource collection file} that lists resource
+   files in XML format
+\o From C++, load the main QML file as a resource using the \c :/ prefix or as a URL with the
+   \c qrc scheme
+\endlist
+
+Once this is done, all files specified by relative paths in QML will be loaded from
+the resource system instead. Use of the resource system is completely transparent to
+the QML layer; this means all QML code should refer to resource files using relative
+paths and should \e not use the \c qrc scheme. This scheme should only be used from
+C++ code for referring to resource files.
 
-The following example shows how to load a QML file from a network resource.  After creating
-the QDeclarativeComponent, it tests whether the component is loading.  If it is, it connects to the
-QDeclarativeComponent::statusChanged() signal and otherwise calls the \c {continueLoading()} method
-directly.  This test is necessary, even for URLs that are known to be remote, just in case
-the component has been cached and is ready immediately.
+Here is a application packaged using the \l {The Qt Resource System}{Qt resource system}.
+The directory structure looks like this:
 
 \code
-MyApplication::MyApplication()
-{
-    // ...
-    component = new QDeclarativeComponent(engine, QUrl("http://www.example.com/main.qml"));
-    if (component->isLoading())
-        QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
-                         this, SLOT(continueLoading()));
-    else
-        continueLoading();
-}
-
-void MyApplication::continueLoading()
-{
-    if (component->isError()) {
-        qWarning() << component->errors();
-    } else {
-        QObject *myObject = component->create();
-    }
-}
+project
+    |- example.qrc
+    |- main.qml
+    |- images
+        |- background.png
+    |- main.cpp
+    |- project.pro
 \endcode
 
-\section1 Qt Resources
+The \c main.qml and \c background.png files will be packaged as resource files. This is
+done in the \c example.qrc resource collection file:
 
-QML content can be loaded from \l {The Qt Resource System} using the \e qrc: URL scheme.
-For example:
+\quotefile doc/src/snippets/declarative/qtbinding/resources/example.qrc
 
-\c [project/example.qrc]
-\quotefile doc/src/snippets/declarative/qtbinding/resources/example.qrc 
+Since \c background.png is a resource file, \c main.qml can refer to it using the relative
+path specified in \c example.qrc:
+
+\snippet doc/src/snippets/declarative/qtbinding/resources/main.qml 0
 
-\c [project/project.pro]
-\quotefile doc/src/snippets/declarative/qtbinding/resources/resources.pro 
+To allow QML to locate resource files correctly, the \c main.cpp loads the main QML
+file, \c main.qml, as a resource file using the \c qrc scheme:
 
-\c [project/main.cpp]
 \snippet doc/src/snippets/declarative/qtbinding/resources/main.cpp 0
 
-\c [project/main.qml]
-\snippet doc/src/snippets/declarative/qtbinding/resources/main.qml 0
+Finally \c project.pro uses the RESOURCES variable to indicate that \c example.qrc should
+be used to build the application resources:
+
+\quotefile doc/src/snippets/declarative/qtbinding/resources/resources.pro
+
+See \l {The Qt Resource System} for more information.
 
-Note that the resource system cannot be accessed from QML directly. If the main QML file is
-loaded as a resource, all files specified as relative paths in QML will also be loaded from
-the resource system. Using the resource system is completely transparent to the QML layer.
-This also means that if the main QML file is not loaded as a resource then files in the resource
-system cannot be accessed from QML.
 */
 
+
diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml b/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml
new file mode 100644
index 0000000..607651a
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Text { text: applicationData.getCurrentDateTime() }
+//![0]
+
diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h b/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h
new file mode 100644
index 0000000..930e381
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QObject>
+#include <QDateTime>
+
+//![0]
+class ApplicationData : public QObject
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE QDateTime getCurrentDateTime() const {
+        return QDateTime::currentDateTime();
+    }
+};
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml b/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml
new file mode 100644
index 0000000..749bea3
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+
+//![0]
+Text {
+    text: applicationData.getCurrentDateTime()
+
+    Connections {
+        target: applicationData
+        onDataChanged: console.log("The application data changed!")
+    }
+}
+//![0]
+
diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro b/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro
new file mode 100644
index 0000000..188a9fb
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro
@@ -0,0 +1,3 @@
+QT += declarative
+SOURCES += main.cpp
+HEADERS += applicationdata.h
diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp b/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp
new file mode 100644
index 0000000..b92215b
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+#include "applicationdata.h"
+
+//![0]
+int main(int argc, char *argv[]) {
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+
+    ApplicationData data;
+    view.rootContext()->setContextProperty("applicationData", &data);
+
+    view.setSource(QUrl::fromLocalFile("MyItem.qml"));
+    view.show();
+
+    return app.exec();
+}
+//![0]
+
diff --git a/doc/src/snippets/declarative/qtbinding/context/MyItem.qml b/doc/src/snippets/declarative/qtbinding/context/MyItem.qml
new file mode 100644
index 0000000..faa42dc
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context/MyItem.qml
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Text { text: currentDateTime }
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/context/context.pro b/doc/src/snippets/declarative/qtbinding/context/context.pro
new file mode 100644
index 0000000..68eeaf2
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context/context.pro
@@ -0,0 +1,2 @@
+QT += declarative
+SOURCES += main.cpp
diff --git a/doc/src/snippets/declarative/qtbinding/context/main.cpp b/doc/src/snippets/declarative/qtbinding/context/main.cpp
new file mode 100644
index 0000000..bbe9956
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/context/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//![0]
+QDeclarativeView view;
+view.rootContext()->setContextProperty("currentDateTime", QDateTime::currentDateTime());
+view.setSource(QUrl::fromLocalFile("MyItem.qml"));
+view.show();
+//![0]
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/declarative/qtbinding/contextproperties/contextproperties.pro b/doc/src/snippets/declarative/qtbinding/contextproperties/contextproperties.pro
deleted file mode 100644
index 68eeaf2..0000000
--- a/doc/src/snippets/declarative/qtbinding/contextproperties/contextproperties.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-QT += declarative
-SOURCES += main.cpp
diff --git a/doc/src/snippets/declarative/qtbinding/contextproperties/main.cpp b/doc/src/snippets/declarative/qtbinding/contextproperties/main.cpp
deleted file mode 100644
index 6887e8f..0000000
--- a/doc/src/snippets/declarative/qtbinding/contextproperties/main.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-
-//![0]
-#include <QApplication>
-#include <QDeclarativeView>
-#include <QDeclarativeContext>
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QDeclarativeView view;
-    QDeclarativeContext *context = view.rootContext();
-    context->setContextProperty("backgroundColor",
-                                QColor(Qt::yellow));
-
-    view.setSource(QUrl::fromLocalFile("main.qml"));
-    view.show();
-
-    return app.exec();
-}
-//![0]
-
-static void alternative()
-{
-    // Alternatively, if we don't actually want to display main.qml:
-//![1]
-    QDeclarativeEngine engine;
-    QDeclarativeContext *windowContext = new QDeclarativeContext(engine.rootContext());
-    windowContext->setContextProperty("backgroundColor", QColor(Qt::yellow));
-
-    QDeclarativeComponent component(&engine, "main.qml");
-    QObject *window = component.create(windowContext);
-//![1]
-}
-
-
diff --git a/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml b/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
deleted file mode 100644
index 425346d..0000000
--- a/doc/src/snippets/declarative/qtbinding/contextproperties/main.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 1.0
-
-Rectangle {
-    width: 300
-    height: 300
-
-    color: backgroundColor
-
-    Text {
-        anchors.centerIn: parent
-        text: "Hello Yellow World!"
-    }
-}
-//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/custompalette/custompalette.h b/doc/src/snippets/declarative/qtbinding/custompalette/custompalette.h
deleted file mode 100644
index 7e84bd4..0000000
--- a/doc/src/snippets/declarative/qtbinding/custompalette/custompalette.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QObject>
-#include <QColor>
-
-//![0]
-class CustomPalette : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QColor background READ background WRITE setBackground NOTIFY backgroundChanged)
-    Q_PROPERTY(QColor text READ text WRITE setText NOTIFY textChanged)
-
-public:
-    CustomPalette() : m_background(Qt::white), m_text(Qt::black) {}
-    
-    QColor background() const { return m_background; }
-    void setBackground(const QColor &c) {
-        if (c != m_background) {
-            m_background = c;
-            emit backgroundChanged();
-        }
-    }
-    
-    QColor text() const { return m_text; }
-    void setText(const QColor &c) {
-        if (c != m_text) {
-            m_text = c;
-            emit textChanged();
-        }
-    }
-
-signals:
-    void textChanged();
-    void backgroundChanged();
-    
-private:
-    QColor m_background;
-    QColor m_text;
-};
-
-//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/custompalette/custompalette.pro b/doc/src/snippets/declarative/qtbinding/custompalette/custompalette.pro
deleted file mode 100644
index e6af0d0..0000000
--- a/doc/src/snippets/declarative/qtbinding/custompalette/custompalette.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-QT += declarative
-HEADERS += custompalette.h
-SOURCES += main.cpp
diff --git a/doc/src/snippets/declarative/qtbinding/custompalette/main.cpp b/doc/src/snippets/declarative/qtbinding/custompalette/main.cpp
deleted file mode 100644
index 7481b75..0000000
--- a/doc/src/snippets/declarative/qtbinding/custompalette/main.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QDeclarativeView>
-#include <QDeclarativeContext>
-
-#include "custompalette.h"
-
-//![0]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QDeclarativeView view;
-    view.rootContext()->setContextProperty("palette", new CustomPalette);
-
-    view.setSource(QUrl::fromLocalFile("main.qml"));
-    view.show();
-
-    return app.exec();
-}
-//![0]
-
diff --git a/doc/src/snippets/declarative/qtbinding/custompalette/main.qml b/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
deleted file mode 100644
index a20d9e0..0000000
--- a/doc/src/snippets/declarative/qtbinding/custompalette/main.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 1.0
-
-Rectangle {
-    width: 240
-    height: 320
-    color: palette.background
-    
-    Text {
-        anchors.centerIn: parent
-        color: palette.text
-        text: "Click me to change color!"
-    }
-    
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            palette.text = "blue";
-        }
-    }
-}
-//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/enums/enums.pro b/doc/src/snippets/declarative/qtbinding/enums/enums.pro
new file mode 100644
index 0000000..82bc123
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/enums/enums.pro
@@ -0,0 +1,3 @@
+QT += declarative
+SOURCES += main.cpp
+HEADERS += imageviewer.h
diff --git a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h b/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h
new file mode 100644
index 0000000..8aaddee
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+//![start]
+class ImageViewer : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_ENUMS(Status)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+public:
+    enum Status {
+        Ready,
+        Loading,
+        Error
+    };
+
+    Status status() const;
+//![start]
+
+    ImageViewer(QDeclarativeItem *parent = 0);
+
+public slots:
+    void emitSignals();
+
+//![end]
+signals:
+    void statusChanged();
+};
+//![end]
diff --git a/doc/src/snippets/declarative/qtbinding/enums/main.cpp b/doc/src/snippets/declarative/qtbinding/enums/main.cpp
new file mode 100644
index 0000000..9243f4b
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/enums/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+#include "imageviewer.h"
+
+ImageViewer::ImageViewer(QDeclarativeItem *parent)
+    : QDeclarativeItem(parent)
+{
+    QTimer::singleShot(0, this, SLOT(emitSignals()));
+}
+
+ImageViewer::Status ImageViewer::status() const
+{
+    return Ready;
+}
+
+void ImageViewer::emitSignals()
+{
+    emit statusChanged();
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    qmlRegisterType<ImageViewer>("MyLibrary", 1, 0, "ImageViewer");
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile("standalone.qml"));
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/declarative/qtbinding/enums/standalone.qml b/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
new file mode 100644
index 0000000..ad6c14c
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import MyLibrary 1.0
+
+//![0]
+ImageViewer {
+    onStatusChanged: {
+        if (status == ImageViewer.Ready)
+            console.log("Image viewer is ready!")
+    }
+}
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml b/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml
new file mode 100644
index 0000000..8d8cd56
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Item {
+    width: 100; height: 100
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            myObject.cppMethod("Hello from QML")
+            myObject.cppSlot(12345)
+        }
+    }
+}
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro b/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro
new file mode 100644
index 0000000..01066c1
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro
@@ -0,0 +1,3 @@
+QT += declarative
+SOURCES += main.cpp
+HEADERS += myclass.h
diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp
new file mode 100644
index 0000000..91d6aec
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+#include "myclass.h"
+
+//![0]
+int main(int argc, char *argv[]) {
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    MyClass myClass;
+    view.rootContext()->setContextProperty("myObject", &myClass);
+
+    view.setSource(QUrl::fromLocalFile("MyItem.qml"));
+    view.show();
+
+    return app.exec();
+}
+//![0]
+
diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h b/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h
new file mode 100644
index 0000000..76c628e
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QObject>
+#include <QDebug>
+
+//![0]
+class MyClass : public QObject
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE void cppMethod(const QString &msg) {
+        qDebug() << "Called the C++ method with" << msg;
+    }
+    
+public slots:
+    void cppSlot(int number) {
+        qDebug() << "Called the C++ slot with" << number;
+    }
+};
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml b/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml
new file mode 100644
index 0000000..6161d6e
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Item {
+    function myQmlFunction(msg) {
+        console.log("Got message:", msg)
+        return "some return value"
+    }
+}
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro b/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro
new file mode 100644
index 0000000..68eeaf2
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro
@@ -0,0 +1,2 @@
+QT += declarative
+SOURCES += main.cpp
diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp
new file mode 100644
index 0000000..3e9e51e
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//![0]
+// main.cpp
+QDeclarativeEngine engine;
+QDeclarativeComponent component(&engine, "MyItem.qml");
+QObject *object = component.create();
+
+QVariant returnedValue;
+QVariant msg = "Hello from C++";
+QMetaObject::invokeMethod(object, "myQmlFunction",
+        Q_RETURN_ARG(QVariant, returnedValue),
+        Q_ARG(QVariant, msg));
+
+qDebug() << "QML function returned:" << returnedValue.toString();
+delete object;
+//![0]
+}
+
diff --git a/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml b/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml
new file mode 100644
index 0000000..40138f6
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![start]
+import QtQuick 1.0
+
+Item {
+    width: 100; height: 100
+//![start]
+
+//![child]
+    Rectangle {
+        anchors.fill: parent
+        objectName: "rect"
+    }
+//![child]
+
+//![end]
+}
+//![end]
diff --git a/doc/src/snippets/declarative/qtbinding/loading/loading.pro b/doc/src/snippets/declarative/qtbinding/loading/loading.pro
new file mode 100644
index 0000000..68eeaf2
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/loading/loading.pro
@@ -0,0 +1,2 @@
+QT += declarative
+SOURCES += main.cpp
diff --git a/doc/src/snippets/declarative/qtbinding/loading/main.cpp b/doc/src/snippets/declarative/qtbinding/loading/main.cpp
new file mode 100644
index 0000000..bd400b0
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/loading/main.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+static void withComponent()
+{
+//![QDeclarativeComponent-a]
+// Using QDeclarativeComponent
+QDeclarativeEngine engine;
+QDeclarativeComponent component(&engine,
+        QUrl::fromLocalFile("MyItem.qml"));
+QObject *object = component.create();
+//![QDeclarativeComponent-a]
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//![QDeclarativeView]
+// Using QDeclarativeView
+QDeclarativeView view;
+view.setSource(QUrl::fromLocalFile("MyItem.qml"));
+view.show();
+QObject *object = view.rootObject();
+//![QDeclarativeView]
+
+//![properties]
+object->setProperty("width", 500);
+QDeclarativeProperty(object, "width").write(500);
+//![properties]
+
+//![cast]
+QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(object);
+item->setWidth(500);
+//![cast]
+
+//![findChild]
+QObject *rect = object->findChild<QObject*>("rect");
+if (rect)
+    rect->setProperty("color", "red");
+//![findChild]
+
+//![QDeclarativeComponent-b]
+delete object;
+//![QDeclarativeComponent-b]
+
+withComponent();
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h b/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h
new file mode 100644
index 0000000..fd9db5e
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+//![0]
+class ImageViewer : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl image READ image WRITE setImage NOTIFY imageChanged)
+
+public:
+    void setImage(const QUrl &url);
+    QUrl image() const;
+
+signals:
+    void imageChanged();
+};
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp b/doc/src/snippets/declarative/qtbinding/newelements/main.cpp
new file mode 100644
index 0000000..57994ca
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/newelements/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+#include "imageviewer.h"
+
+void ImageViewer::setImage(const QUrl &url) {}
+QUrl ImageViewer::image() const { return QUrl(); }
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    //![register]
+    qmlRegisterType<ImageViewer>("MyLibrary", 1, 0, "ImageViewer");
+    //![register]
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile("standalone.qml"));
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro b/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro
new file mode 100644
index 0000000..82bc123
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro
@@ -0,0 +1,3 @@
+QT += declarative
+SOURCES += main.cpp
+HEADERS += imageviewer.h
diff --git a/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml b/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml
new file mode 100644
index 0000000..7345f21
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+import MyLibrary 1.0
+
+ImageViewer { image: "smile.png" }
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml b/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml
new file mode 100644
index 0000000..9db4b93
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Rectangle {
+    width: 100; height: 100
+    color: applicationData.backgroundColor
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: applicationData.backgroundColor = "red"
+    }
+}
+//![0]
+
diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h b/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
new file mode 100644
index 0000000..763a451
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QObject>
+#include <QColor>
+
+//![0]
+class ApplicationData : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QColor backgroundColor
+            READ backgroundColor
+            WRITE setBackgroundColor
+            NOTIFY backgroundColorChanged)
+
+public:
+    void setBackgroundColor(const QColor &c) {
+        if (c != m_color) {
+            m_color = c;
+            emit backgroundColorChanged();
+        }
+    }
+
+    QColor backgroundColor() const {
+        return m_color;
+    }
+
+signals:
+    void backgroundColorChanged();
+
+private:
+    QColor m_color;
+};
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp
new file mode 100644
index 0000000..36b508d
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+#include "applicationdata.h"
+
+int main(int argc, char *argv[]) {
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+
+    ApplicationData data;
+    view.rootContext()->setContextProperty("applicationData", &data);
+
+    view.setSource(QUrl::fromLocalFile("MyItem.qml"));
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro b/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro
new file mode 100644
index 0000000..188a9fb
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro
@@ -0,0 +1,3 @@
+QT += declarative
+SOURCES += main.cpp
+HEADERS += applicationdata.h
diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml b/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml
new file mode 100644
index 0000000..a43ded8
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Item {
+    property int someNumber: 100
+}
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp
new file mode 100644
index 0000000..d8daff8
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//![0]
+QDeclarativeEngine engine;
+QDeclarativeComponent component(&engine, "MyItem.qml");
+QObject *object = component.create();
+
+qDebug() << "Property value:" << QDeclarativeProperty::read(object, "someNumber").toInt();
+QDeclarativeProperty::write(object, "someNumber", 5000);
+
+qDebug() << "Property value:" << object->property("someNumber").toInt();
+object->setProperty("someNumber", 100);
+//![0]
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro b/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro
new file mode 100644
index 0000000..68eeaf2
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro
@@ -0,0 +1,2 @@
+QT += declarative
+SOURCES += main.cpp
diff --git a/doc/src/snippets/declarative/qtbinding/resources/main.qml b/doc/src/snippets/declarative/qtbinding/resources/main.qml
index 644d963..43029cf 100644
--- a/doc/src/snippets/declarative/qtbinding/resources/main.qml
+++ b/doc/src/snippets/declarative/qtbinding/resources/main.qml
@@ -39,9 +39,8 @@
 ****************************************************************************/
 
 //![0]
+// main.qml
 import QtQuick 1.0
 
-Image {
-    source: "images/background.png"
-}
+Image { source: "images/background.png" }
 //![0]
diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml b/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml
new file mode 100644
index 0000000..d900830
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Item {
+    Connections {
+        target: imageViewer
+        onImageChanged: console.log("Image has changed!")
+    }
+}
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h b/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h
new file mode 100644
index 0000000..7288d11
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+//![start]
+class ImageViewer : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl image READ image WRITE setImage NOTIFY imageChanged)
+public:
+//![start]
+    ImageViewer(QDeclarativeItem *item = 0);
+
+    void setImage(const QUrl &url) {}
+    QUrl image() const { return QUrl(); }
+
+public slots:
+    void emitSignals();
+
+//![end]
+signals:
+    void imageChanged();
+    void loadingError(const QString &errorMsg);
+};
+//![end]
+
diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp
new file mode 100644
index 0000000..e5dd33c
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+#include "imageviewer.h"
+
+
+ImageViewer::ImageViewer(QDeclarativeItem *item)
+    : QDeclarativeItem(item)
+{
+    QTimer::singleShot(0, this, SLOT(emitSignals()));
+}
+
+void ImageViewer::emitSignals()
+{
+    emit imageChanged();
+    emit loadingError("some error message");
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    qmlRegisterType<ImageViewer>("MyLibrary", 1, 0, "ImageViewer");
+
+    QDeclarativeView standalone;
+    standalone.setSource(QUrl::fromLocalFile("standalone.qml"));
+    standalone.show();
+
+//![connections]
+ImageViewer viewer;
+
+QDeclarativeView view;
+view.rootContext()->setContextProperty("imageViewer", &viewer);
+
+view.setSource(QUrl::fromLocalFile("MyItem.qml"));
+view.show();
+//![connections]
+
+    return app.exec();
+}
+
+
diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro b/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro
new file mode 100644
index 0000000..9aa8702
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro
@@ -0,0 +1,3 @@
+QT += declarative
+SOURCES += main.cpp
+HEADERS += "imageviewer.h"
diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml b/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml
new file mode 100644
index 0000000..4027b19
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import MyLibrary 1.0
+
+//![0]
+ImageViewer {
+    onImageChanged: console.log("Image changed!")
+    onLoadingError: console.log("Image failed to load:", errorMsg)
+}
+//![0]
+
diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml b/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml
new file mode 100644
index 0000000..e4b6ced
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+// MyItem.qml
+import QtQuick 1.0
+
+Item {
+    id: item
+    width: 100; height: 100
+
+    signal qmlSignal(string msg)
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: item.qmlSignal("Hello from QML")
+    }
+}
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp
new file mode 100644
index 0000000..f1d03c4
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+#include <QtDeclarative>
+
+//![0]
+int main(int argc, char *argv[]) {
+    QApplication app(argc, argv);
+
+    QDeclarativeView view(QUrl::fromLocalFile("MyItem.qml"));
+    QObject *item = view.rootObject();
+
+    MyClass myClass;
+    QObject::connect(item, SIGNAL(qmlSignal(QString)),
+                     &myClass, SLOT(cppSlot(QString)));
+
+    view.show();
+    return app.exec();
+}
+//![0]
+
+#include "moc_main.cpp"
diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h b/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h
new file mode 100644
index 0000000..c326a54
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QObject>
+#include <QDebug>
+//![0]
+class MyClass : public QObject
+{
+    Q_OBJECT
+public slots:
+    void cppSlot(const QString &msg) {
+        qDebug() << "Called the C++ slot with message:" << msg;
+    }
+};
+//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro b/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro
new file mode 100644
index 0000000..01066c1
--- /dev/null
+++ b/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro
@@ -0,0 +1,3 @@
+QT += declarative
+SOURCES += main.cpp
+HEADERS += myclass.h
diff --git a/doc/src/snippets/declarative/qtbinding/stopwatch/main.cpp b/doc/src/snippets/declarative/qtbinding/stopwatch/main.cpp
deleted file mode 100644
index 12481da..0000000
--- a/doc/src/snippets/declarative/qtbinding/stopwatch/main.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "stopwatch.h"
-
-#include <QDeclarativeView>
-#include <QDeclarativeContext>
-#include <QApplication>
-
-//![0]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QDeclarativeView view;
-    view.rootContext()->setContextProperty("stopwatch",
-                                           new Stopwatch);
-
-    view.setSource(QUrl::fromLocalFile("main.qml"));
-    view.show();
-
-    return app.exec();
-}
-//![0]
-
diff --git a/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml b/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
deleted file mode 100644
index f894f71..0000000
--- a/doc/src/snippets/declarative/qtbinding/stopwatch/main.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 1.0
-
-Rectangle {
-    width: 300
-    height: 300
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            if (stopwatch.isRunning())
-                stopwatch.stop()
-            else
-                stopwatch.start();
-        }
-    }
-}
-//![0]
diff --git a/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.cpp b/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.cpp
deleted file mode 100644
index 124422f..0000000
--- a/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "stopwatch.h"
-
-Stopwatch::Stopwatch()
-    : m_running(false)
-{
-}
-
-bool Stopwatch::isRunning() const
-{
-    return m_running;
-}
-
-void Stopwatch::start()
-{
-    m_running = true;
-}
-
-void Stopwatch::stop()
-{
-    m_running = false;
-}
-
diff --git a/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.h b/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.h
deleted file mode 100644
index fd65916..0000000
--- a/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QObject>
-
-//![0]
-class Stopwatch : public QObject
-{
-    Q_OBJECT
-public:
-    Stopwatch();
-    
-    Q_INVOKABLE bool isRunning() const;
-    
-public slots:
-    void start();
-    void stop();
-
-private:
-    bool m_running;
-};
-
-//![0]
-
diff --git a/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.pro b/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.pro
deleted file mode 100644
index d803e6a..0000000
--- a/doc/src/snippets/declarative/qtbinding/stopwatch/stopwatch.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-QT += declarative
-HEADERS += stopwatch.h
-SOURCES += main.cpp stopwatch.cpp
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 0a2a6db..2686ce3 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -98,6 +98,43 @@ class QByteArray;
     int width = item->width();  // width = 200
     \endcode
 
+
+    \section2 Network Components
+
+    If the URL passed to QDeclarativeComponent is a network resource, or if the QML document references a
+    network resource, the QDeclarativeComponent has to fetch the network data before it is able to create
+    objects.  In this case, the QDeclarativeComponent will have a \l {QDeclarativeComponent::Loading}{Loading}
+    \l {QDeclarativeComponent::status()}{status}.  An application will have to wait until the component
+    is \l {QDeclarativeComponent::Ready}{Ready} before calling \l {QDeclarativeComponent::create()}.
+
+    The following example shows how to load a QML file from a network resource.  After creating
+    the QDeclarativeComponent, it tests whether the component is loading.  If it is, it connects to the
+    QDeclarativeComponent::statusChanged() signal and otherwise calls the \c {continueLoading()} method
+    directly. Note that QDeclarativeComponent::isLoading() may be false for a network component if the
+    component has been cached and is ready immediately.
+
+    \code
+    MyApplication::MyApplication()
+    {
+        // ...
+        component = new QDeclarativeComponent(engine, QUrl("http://www.example.com/main.qml"));
+        if (component->isLoading())
+            QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+                             this, SLOT(continueLoading()));
+        else
+            continueLoading();
+    }
+
+    void MyApplication::continueLoading()
+    {
+        if (component->isError()) {
+            qWarning() << component->errors();
+        } else {
+            QObject *myObject = component->create();
+        }
+    }
+    \endcode
+
     \sa {Using QML in C++ Applications}, {Integrating QML with existing Qt UI code}
 */
 
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index 59d5cfa..1e58a71 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -86,9 +86,14 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
 
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 1.0\nListView { model: myModel }", QUrl());
-    component.create(context);
+    QObject *window = component.create(context);
     \endcode
 
+    Note it is the responsibility of the creator to delete any QDeclarativeContext it
+    constructs. If the \c context object in the example is no longer needed when the
+    \c window component instance is destroyed, the \c context must be destroyed explicitly.
+    The simplest way to ensure this is to set \c window as the parent of \c context.
+
     To simplify binding and maintaining larger data sets, a context object can be set
     on a QDeclarativeContext.  All the properties of the context object are available
     by name in the context, as though they were all individually added through calls
@@ -119,11 +124,13 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     All properties added explicitly by QDeclarativeContext::setContextProperty() take 
     precedence over the context object's properties.
 
-    Contexts form a hierarchy.  The root of this hierarchy is the QDeclarativeEngine's
-    \l {QDeclarativeEngine::rootContext()}{root context}.  A component instance can 
-    access the data in its own context, as well as all its ancestor contexts.  Data
-    can be made available to all instances by modifying the 
-    \l {QDeclarativeEngine::rootContext()}{root context}.
+    \section2 The Context Hierarchy
+
+    Contexts form a hierarchy. The root of this hierarchy is the QML engine's
+    \l {QDeclarativeEngine::rootContext()}{root context}. Child contexts inherit
+    the context properties of their parents; if a child context sets a context property
+    that already exists in its parent, the new context property overrides that of the
+    parent.
 
     The following example defines two contexts - \c context1 and \c context2.  The
     second context overrides the "b" context property inherited from the first with a
@@ -144,7 +151,7 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     context, their bindings are.  If a context is destroyed, the property bindings of 
     outstanding QML objects will stop evaluating.
 
-    \note Setting the context object or adding new context properties after an object
+    \warning Setting the context object or adding new context properties after an object
     has been created in that context is an expensive operation (essentially forcing all bindings
     to reevaluate). Thus whenever possible you should complete "setup" of the context
     before using it to create any objects.
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index cff0b46..0c7f8fb 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -86,6 +86,7 @@ tst_examples::tst_examples()
 
     // Add directories you want excluded here
     excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex";
+    excludedDirs << "doc/src/snippets/declarative/qtbinding";
 
 #ifdef QT_NO_WEBKIT
     excludedDirs << "examples/declarative/modelviews/webview";
-- 
cgit v0.12


From eedb9980c89e77e21e1336195930a148b6a2e712 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 4 Nov 2010 16:05:30 +1000
Subject: Fix errors in example code. Also reverts the example code to the old
 list format.

Task-number: QTBUG-14871
---
 src/declarative/graphicsitems/qdeclarativeimage.cpp  | 16 +++++++++-------
 src/declarative/graphicsitems/qdeclarativeloader.cpp | 16 +++++++++-------
 src/declarative/util/qdeclarativefontloader.cpp      | 16 +++++++++-------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 08d237f..1f1e93d 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -288,23 +288,25 @@ qreal QDeclarativeImage::paintedHeight() const
     Use this status to provide an update or respond to the status change in some way.
     For example, you could:
 
-    \e {Trigger a state change:}
-    \qml 
-        State { name: 'loaded'; when: image.status = Image.Ready }
+    \list
+    \o Trigger a state change:
+    \qml
+        State { name: 'loaded'; when: image.status == Image.Ready }
     \endqml
 
-    \e {Implement an \c onStatusChanged signal handler:}
-    \qml 
+    \o Implement an \c onStatusChanged signal handler:
+    \qml
         Image {
             id: image
             onStatusChanged: if (image.status == Image.Ready) console.log('Loaded')
         }
     \endqml
 
-    \e {Bind to the status value:}
+    \o Bind to the status value:
     \qml
-        Text { text: image.status != Image.Ready ? 'Not Loaded' : 'Loaded' }
+        Text { text: image.status == Image.Ready ? 'Loaded' : 'Not loaded' }
     \endqml
+    \endlist
 
     \sa progress
 */
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 7777567..109fbbb 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -395,23 +395,25 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
     Use this status to provide an update or respond to the status change in some way.
     For example, you could:
 
-    \e {Trigger a state change:}
-    \qml 
-        State { name: 'loaded'; when: loader.status = Loader.Ready }
+    \list
+    \o Trigger a state change:
+    \qml
+        State { name: 'loaded'; when: loader.status == Loader.Ready }
     \endqml
 
-    \e {Implement an \c onStatusChanged signal handler:}
-    \qml 
+    \o Implement an \c onStatusChanged signal handler:
+    \qml
         Loader {
             id: loader
             onStatusChanged: if (loader.status == Loader.Ready) console.log('Loaded')
         }
     \endqml
 
-    \e {Bind to the status value:}
+    \o Bind to the status value:
     \qml
-        Text { text: loader.status != Loader.Ready ? 'Not Loaded' : 'Loaded' }
+        Text { text: loader.status == Loader.Ready ? 'Loaded' : 'Not loaded' }
     \endqml
+    \endlist
 
     Note that if the source is a local file, the status will initially be Ready (or Error). While
     there will be no onStatusChanged signal in that case, the onLoaded will still be invoked.
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 9fee257..03a0561 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -297,23 +297,25 @@ void QDeclarativeFontLoader::setName(const QString &name)
     Use this status to provide an update or respond to the status change in some way.
     For example, you could:
 
-    \e {Trigger a state change:}
-    \qml 
-        State { name: 'loaded'; when: loader.status = FontLoader.Ready }
+    \list
+    \o Trigger a state change:
+    \qml
+        State { name: 'loaded'; when: loader.status == FontLoader.Ready }
     \endqml
 
-    \e {Implement an \c onStatusChanged signal handler:}
-    \qml 
+    \o Implement an \c onStatusChanged signal handler:
+    \qml
         FontLoader {
             id: loader
             onStatusChanged: if (loader.status == FontLoader.Ready) console.log('Loaded')
         }
     \endqml
 
-    \e {Bind to the status value:}
+    \o Bind to the status value:
     \qml
-        Text { text: loader.status != FontLoader.Ready ? 'Not Loaded' : 'Loaded' }
+        Text { text: loader.status == FontLoader.Ready ? 'Loaded' : 'Not loaded' }
     \endqml
+    \endlist
 */
 QDeclarativeFontLoader::Status QDeclarativeFontLoader::status() const
 {
-- 
cgit v0.12


From 693a1dd90dc2e5a9ba7aabed5fcc3984e7440ba9 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 4 Nov 2010 16:19:25 +1000
Subject: Maintain passing visualtests on X11

springanimation/follow.qml has had updated visuals, unknown cause.
the text tests were committed without an actual testcase, now added
the 'skip' property has now been documented in the tst_qmlvisual help

Task-number: QTBUG-14792
---
 .../qdeclarativespringanimation/data/follow.qml    |   6 +-
 .../qdeclarativetext/data-X11/qtbug_14865.0.png    | Bin 0 -> 1400 bytes
 .../qdeclarativetext/data-X11/qtbug_14865.qml      | 447 +++++++++++++++++++++
 .../qdeclarativetext/data/qtbug_14865.0.png        | Bin 0 -> 1400 bytes
 .../qdeclarativetext/data/qtbug_14865.qml          | 447 +++++++++++++++++++++
 .../font/data-X11/plaintext2.0.png                 | Bin 0 -> 2778 bytes
 .../qdeclarativetext/font/data-X11/plaintext2.qml  |  11 +
 .../qdeclarativetext/font/data/plaintext2.0.png    | Bin 0 -> 2778 bytes
 .../qdeclarativetext/font/data/plaintext2.qml      |  11 +
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp |   6 +
 10 files changed, 925 insertions(+), 3 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.qml

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
index e5c55a4..a688563 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
@@ -450,7 +450,7 @@ VisualTest {
     }
     Frame {
         msec: 1760
-        hash: "2c01571e523002166ba6ec476bc8a68b"
+        hash: "b2b4b3de77e2b7fd58d3da1ad52355a9"
     }
     Frame {
         msec: 1776
@@ -1554,7 +1554,7 @@ VisualTest {
     }
     Frame {
         msec: 6144
-        hash: "0506667a14ace4e2edf04956c137e217"
+        hash: "8cd5edce652013a2ed4bf95693259538"
     }
     Frame {
         msec: 6160
@@ -1731,7 +1731,7 @@ VisualTest {
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
new file mode 100644
index 0000000..a4bae3a
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.qml
new file mode 100644
index 0000000..a470a66
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.qml
@@ -0,0 +1,447 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 32
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 48
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 64
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 80
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 96
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 112
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 128
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 144
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 160
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 176
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 192
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 208
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 224
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 240
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 256
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 272
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 288
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 304
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 320
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 336
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 352
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 368
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 384
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 400
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 416
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 432
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 448
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 464
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 480
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 496
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 512
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 528
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 544
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 560
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 576
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 592
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 608
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 624
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 640
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 656
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 672
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 688
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 704
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 720
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 736
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 752
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 768
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 784
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 800
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 816
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 832
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 848
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 864
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 880
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 896
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 912
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 928
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 944
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 960
+        image: "qtbug_14865.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 992
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1008
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1024
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1040
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1056
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1072
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1088
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1104
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1120
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1136
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1152
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1168
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1184
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1200
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1216
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1232
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1248
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1264
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1280
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1296
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1312
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1328
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1344
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1360
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1376
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1392
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1408
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1424
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1440
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1456
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1472
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1488
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1504
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1520
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1536
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1552
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1568
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1584
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1600
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1616
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1632
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1648
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1664
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1680
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1696
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1712
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1728
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1744
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1760
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.0.png
new file mode 100644
index 0000000..a4bae3a
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.qml
new file mode 100644
index 0000000..a470a66
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.qml
@@ -0,0 +1,447 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 32
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 48
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 64
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 80
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 96
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 112
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 128
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 144
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 160
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 176
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 192
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 208
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 224
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 240
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 256
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 272
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 288
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 304
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 320
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 336
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 352
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 368
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 384
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 400
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 416
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 432
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 448
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 464
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 480
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 496
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 512
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 528
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 544
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 560
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 576
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 592
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 608
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 624
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 640
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 656
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 672
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 688
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 704
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 720
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 736
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 752
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 768
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 784
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 800
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 816
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 832
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 848
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 864
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 880
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 896
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 912
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 928
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 944
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 960
+        image: "qtbug_14865.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 992
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1008
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1024
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1040
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1056
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1072
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1088
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1104
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1120
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1136
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1152
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1168
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1184
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1200
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1216
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1232
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1248
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1264
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1280
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1296
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1312
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1328
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1344
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1360
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1376
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1392
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1408
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1424
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1440
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1456
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1472
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1488
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1504
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1520
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1536
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1552
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1568
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1584
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1600
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1616
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1632
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1648
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1664
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1680
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1696
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1712
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1728
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1744
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1760
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
new file mode 100644
index 0000000..0574f63
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.qml
new file mode 100644
index 0000000..f6cddc4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext2.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.0.png
new file mode 100644
index 0000000..0574f63
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.qml
new file mode 100644
index 0000000..f6cddc4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext2.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index b52b430..81404ea 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -345,6 +345,12 @@ void usage()
         "If you ONLY wish to use the 'error' property, you can record your test with\n"
         "-recordnovisuals, or discard existing visuals with -removevisuals; the test\n"
         "will then only fail on a syntax error, crash, or non-empty 'error' property.\n"
+        "\n"
+        "If your test has anything set to the 'skip' property on the root object then\n"
+        "test failures will be ignored. This allows for an opt-out of automated\n"
+        "aggregation of test results. The value of the 'skip' property (usually a\n"
+        "string) will then be printed to stdout when the test is run as part of the\n"
+        "message saying the test has been skipped.\n"
     );
 }
 
-- 
cgit v0.12


From 893e2fdc16976085092d09eb65d9650ce471af3f Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 4 Nov 2010 17:02:32 +1000
Subject: Add documentation about script evaluation context and allowed types

Task-number: QTBUG-14919
---
 src/declarative/qml/qdeclarativeworkerscript.cpp | 30 ++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index 789116e..be7ea0e 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -514,7 +514,7 @@ void QDeclarativeWorkerScriptEngine::run()
 
 /*!
     \qmlclass WorkerScript QDeclarativeWorkerScript
-  \ingroup qml-utility-elements
+    \ingroup qml-utility-elements
     \brief The WorkerScript element enables the use of threads in QML.
 
     Use WorkerScript to run operations in a new thread.
@@ -528,7 +528,7 @@ void QDeclarativeWorkerScriptEngine::run()
 
     \snippet doc/src/snippets/declarative/workerscript.qml 0
 
-    The above worker script specifies a javascript file, "script.js", that handles
+    The above worker script specifies a JavaScript file, "script.js", that handles
     the operations to be performed in the new thread. Here is \c script.js:
 
     \qml
@@ -543,6 +543,19 @@ void QDeclarativeWorkerScriptEngine::run()
     \tt script.js. This in turn sends a reply message that is then received
     by the \tt onMessage() handler of \tt myWorker.
 
+
+    \section3 Restrictions
+
+    Since the \c WorkerScript.onMessage() function is run in a separate thread, the
+    JavaScript file is evaluated in a context separate from the main QML engine. This means
+    that unlike an ordinary JavaScript file that is imported into QML, the \c script.js
+    in the above example cannot access the properties, methods or other attributes
+    of the QML item, nor can it access any context properties set on the QML object
+    through QDeclarativeContext.
+
+    Additionally, there are restrictions on the types of values that can be passed to and
+    from the worker script. See the sendMessage() documentation for details.
+
     \sa {declarative/threading/workerscript}{WorkerScript example},
         {declarative/threading/threadedlistmodel}{Threaded ListModel example}
 */
@@ -586,6 +599,19 @@ void QDeclarativeWorkerScript::setSource(const QUrl &source)
     Sends the given \a message to a worker script handler in another
     thread. The other worker script handler can receive this message
     through the onMessage() handler.
+
+    The \c message object may only contain values of the following
+    types:
+
+    \list
+    \o boolean, number, string
+    \o JavaScript objects and arrays
+    \o ListModel objects (any other type of QObject* is not allowed)
+    \endlist
+
+    All objects and arrays are copied to the \c message. With the exception
+    of ListModel objects, any modifications by the other thread to an object
+    passed in \c message will not be reflected in the original object.
 */
 void QDeclarativeWorkerScript::sendMessage(const QScriptValue &message)
 {
-- 
cgit v0.12


From d5ed9ed21b67b6e5e884e7c87fabc096b8c677a2 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 4 Nov 2010 18:01:36 +1000
Subject: Make qmlvisual tests more stable

Text elements now use shared components that have the same default
values, instead of using the system defaults (that can vary between
computers). This also removes text edit/input cursor blinking.

Task-number: QTBUG-14792
---
 .../qdeclarativetext/align/multilineAlign.qml      |   3 +-
 .../qdeclarativetext/baseline/parentanchor.qml     |   5 +-
 .../qdeclarativetext/bugs/QTBUG-14469.qml          |   1 +
 .../qdeclarativetext/elide/data-X11/elide.0.png    | Bin 1167 -> 1150 bytes
 .../qdeclarativetext/elide/data-X11/elide.qml      | 132 +++---
 .../elide/data-X11/multilength.qml                 |  66 +--
 .../qmlvisual/qdeclarativetext/elide/elide.qml     |   9 +-
 .../qmlvisual/qdeclarativetext/elide/elide2.qml    |   3 +-
 .../qdeclarativetext/elide/multilength.qml         |   3 +-
 .../qdeclarativetext/font/data-X11/plaintext.0.png | Bin 77181 -> 77252 bytes
 .../qdeclarativetext/font/data-X11/richtext.0.png  | Bin 103375 -> 101974 bytes
 .../qmlvisual/qdeclarativetext/font/plaintext.qml  |  55 +--
 .../qmlvisual/qdeclarativetext/font/plaintext2.qml |   9 +-
 .../qmlvisual/qdeclarativetext/font/richtext.qml   |  43 +-
 .../qmlvisual/qdeclarativetext/qtbug_14865.qml     |   3 +-
 .../qdeclarativetextedit/MultilineEdit.qml         |  11 +-
 .../qdeclarativetextedit/cursorDelegate.qml        |   6 +-
 .../data-X11/usingMultilineEdit.10.png             | Bin 6074 -> 6055 bytes
 .../data-X11/usingMultilineEdit.11.png             | Bin 6074 -> 6055 bytes
 .../data-X11/usingMultilineEdit.8.png              | Bin 6072 -> 6051 bytes
 .../data-X11/usingMultilineEdit.9.png              | Bin 6074 -> 6055 bytes
 .../data-X11/usingMultilineEdit.qml                | 452 ++++++++++-----------
 .../qdeclarativetextedit/data-X11/wrap.qml         | 194 ++++-----
 .../qmlvisual/qdeclarativetextedit/qt-669.qml      |   3 +-
 .../qdeclarativetextedit/usingMultilineEdit.qml    |   8 +-
 .../qmlvisual/qdeclarativetextedit/wrap.qml        |   9 +-
 .../qmlvisual/qdeclarativetextinput/LineEdit.qml   |  11 +-
 .../qdeclarativetextinput/cursorDelegate.qml       |   6 +-
 .../qdeclarativetextinput/data-X11/echoMode.0.png  | Bin 570 -> 580 bytes
 .../qdeclarativetextinput/data-X11/echoMode.1.png  | Bin 1061 -> 1073 bytes
 .../qdeclarativetextinput/data-X11/echoMode.2.png  | Bin 1661 -> 1672 bytes
 .../qdeclarativetextinput/data-X11/echoMode.qml    | 180 ++++----
 .../qmlvisual/qdeclarativetextinput/echoMode.qml   |   9 +-
 .../qmlvisual/qdeclarativetextinput/hAlign.qml     |  15 +-
 .../qdeclarativetextinput/usingLineEdit.qml        |   6 +-
 tests/auto/declarative/qmlvisual/shared/README     |   7 +
 .../auto/declarative/qmlvisual/shared/TestText.qml |   8 +
 .../declarative/qmlvisual/shared/TestTextEdit.qml  |  14 +
 .../declarative/qmlvisual/shared/TestTextInput.qml |  14 +
 tests/auto/declarative/qmlvisual/shared/Vera.ttf   | Bin 0 -> 65932 bytes
 tests/auto/declarative/qmlvisual/shared/qmldir     |   3 +
 41 files changed, 677 insertions(+), 611 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/shared/README
 create mode 100644 tests/auto/declarative/qmlvisual/shared/TestText.qml
 create mode 100644 tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
 create mode 100644 tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
 create mode 100644 tests/auto/declarative/qmlvisual/shared/Vera.ttf
 create mode 100644 tests/auto/declarative/qmlvisual/shared/qmldir

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
index 976f0b0..a427719 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 /*Tests both the alignments of multiline text, and that
   it can deal with changing them properly
@@ -8,7 +9,7 @@ Item{
     height: 80
     property int stage: 0
     onStageChanged: if(stage == 6) Qt.quit();
-    Text{
+    TestText{
         text: "I am the very model of a modern major general."
         anchors.fill: parent;
         wrapMode: Text.WordWrap
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
index c1920db..618a65f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
@@ -1,13 +1,14 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
     id: s; width: 600; height: 100;
     property string text: "The quick brown fox jumps over the lazy dog."
-    Text {
+    TestText {
         text: s.text
         anchors.verticalCenter: s.verticalCenter
     }
-    Text {
+    TestText {
         text: s.text
         anchors.baseline: s.verticalCenter
     }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml
index ea3a939..aca7c2d 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/bugs/QTBUG-14469.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 /* The bug was that if text was set to "" or the size didn't increase, the text didn't repaint
    ended up only repainting for 1, 10, 11, 12.
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png
index b250b38..de216ba 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
index f3bc1db..fcaeed5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 32
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 48
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 64
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 80
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 96
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 112
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 128
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 144
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 160
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 176
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 192
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 208
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 224
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 240
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 256
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 272
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 288
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 304
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 320
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 336
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 352
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 368
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 384
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 400
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 416
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 432
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 448
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 464
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 480
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 496
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 512
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 528
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 544
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 560
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 576
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 592
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 608
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 624
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 640
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 656
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 672
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 688
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 704
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 720
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 736
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 752
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 768
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 784
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 800
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 816
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 832
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 848
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 864
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 880
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 896
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 912
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 928
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 944
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 960
@@ -246,34 +246,34 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 992
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 1008
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 1024
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 1040
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
     Frame {
         msec: 1056
-        hash: "9992670f23580ce63cdd3ab3fed621a1"
+        hash: "bdf278826a033dbb744d1fa9492c9351"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
index 5d36d48..3871f91 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
@@ -6,71 +6,71 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "a9dc5058e29f9c129087eaa013002185"
+        hash: "51e3a7214bf2fd98108de683ae650b05"
     }
     Frame {
         msec: 32
-        hash: "da0d63697414c19f57235c4d133faf63"
+        hash: "72bd0f47e179c5356d4a0575939b6c05"
     }
     Frame {
         msec: 48
-        hash: "e3992f5512959c061d53fc3899acec14"
+        hash: "9229869bf23fe10394ffb6bacc38d2b5"
     }
     Frame {
         msec: 64
-        hash: "e225de5dc21fee719ebc43fa8838f841"
+        hash: "4f75c0a0b7a04c8abdf2768a819b6c14"
     }
     Frame {
         msec: 80
-        hash: "a5673b8b7ad5a9d67e785beaaa4c0307"
+        hash: "514a9a762cd0356cbcecb93e73c81534"
     }
     Frame {
         msec: 96
-        hash: "2c126bf2d794039e1380595b9c40ae2e"
+        hash: "68436451f6f3ee981bf8851944b82dda"
     }
     Frame {
         msec: 112
-        hash: "f974072b4863b842b520b4c11c427f5d"
+        hash: "fa33b582c0890bc9852f3a6c80864988"
     }
     Frame {
         msec: 128
-        hash: "bf06ec5a2c1c46e780cdd0d859b2becb"
+        hash: "f65928b270f12f2917193ba70d9388ee"
     }
     Frame {
         msec: 144
-        hash: "3a58b1900912a5a6ace72757f3af4d1a"
+        hash: "755d1421a9b2bf3be9d665f5f8d6f767"
     }
     Frame {
         msec: 160
-        hash: "3fa86df29f53e7f6f65fb6e605f5e705"
+        hash: "dbec63b93f3617440317f7ddc2fbd6fa"
     }
     Frame {
         msec: 176
-        hash: "6d29c12395050b049537819cf0a65746"
+        hash: "1ec885da7efc3d71904c79a4a4768f27"
     }
     Frame {
         msec: 192
-        hash: "352a390ab4e3e31b645f025e65885cfc"
+        hash: "a20981af2ce8e82a6c1825e438dfd815"
     }
     Frame {
         msec: 208
-        hash: "7c3be9d325f023a356b6ed73332bc804"
+        hash: "3c951028229d8d6a3a0faa18f21afbe6"
     }
     Frame {
         msec: 224
-        hash: "09dd10566eda09e0366b7bf0a8ce9e1b"
+        hash: "8354d4c9bd5ccb2eae46cdaf3fd337bb"
     }
     Frame {
         msec: 240
-        hash: "6cafcba107e48f7efe2db60a14c3749d"
+        hash: "05880d6d76fa8dc421af4d06cbdd4448"
     }
     Frame {
         msec: 256
-        hash: "a4b6df2874ce48ed5a17aab43f32e665"
+        hash: "370e33f141d0a8396b5c2bb279f9bb67"
     }
     Frame {
         msec: 272
-        hash: "b6a3df4b704fa7e8284572b9c520b03d"
+        hash: "663b162ce447eee0f2194a92b463d6fe"
     }
     Frame {
         msec: 288
@@ -1258,66 +1258,66 @@ VisualTest {
     }
     Frame {
         msec: 5024
-        hash: "a9dc5058e29f9c129087eaa013002185"
+        hash: "51e3a7214bf2fd98108de683ae650b05"
     }
     Frame {
         msec: 5040
-        hash: "5d06ae83ab9cc218175013042922b908"
+        hash: "af3da99b9abc3b3440b22d4d428dcd1a"
     }
     Frame {
         msec: 5056
-        hash: "e225de5dc21fee719ebc43fa8838f841"
+        hash: "4f75c0a0b7a04c8abdf2768a819b6c14"
     }
     Frame {
         msec: 5072
-        hash: "b89bf31a945cb6c880e95bf2d2a6e944"
+        hash: "c73dc19d48511634717cf4e95f843a5d"
     }
     Frame {
         msec: 5088
-        hash: "fa54db3c383bc1da121c0d3b09e942d3"
+        hash: "0f263ab43dde78f1280483c6287b44a2"
     }
     Frame {
         msec: 5104
-        hash: "2c126bf2d794039e1380595b9c40ae2e"
+        hash: "68436451f6f3ee981bf8851944b82dda"
     }
     Frame {
         msec: 5120
-        hash: "1e9639693e5ec1edb72e71d126c434bb"
+        hash: "e0ea33b011cc8aef74070e26b71bd05e"
     }
     Frame {
         msec: 5136
-        hash: "3a58b1900912a5a6ace72757f3af4d1a"
+        hash: "755d1421a9b2bf3be9d665f5f8d6f767"
     }
     Frame {
         msec: 5152
-        hash: "11a846d93430e622a9750e4e2a7b76fe"
+        hash: "7e20da3dab6bd290498756ac392bc052"
     }
     Frame {
         msec: 5168
-        hash: "801d7707e86b776fe2459c42b26337f5"
+        hash: "babdfa14fbba8f6eb0c95334588123ce"
     }
     Frame {
         msec: 5184
-        hash: "6d29c12395050b049537819cf0a65746"
+        hash: "1ec885da7efc3d71904c79a4a4768f27"
     }
     Frame {
         msec: 5200
-        hash: "5a68af870474ffb8a694710b10f52bc7"
+        hash: "2159f4c9f72bca3ba98b4fd0aeb3c1ba"
     }
     Frame {
         msec: 5216
-        hash: "09dd10566eda09e0366b7bf0a8ce9e1b"
+        hash: "8354d4c9bd5ccb2eae46cdaf3fd337bb"
     }
     Frame {
         msec: 5232
-        hash: "f43b377f99f74e2cf07e419887f7ee0b"
+        hash: "ee95872db6f9440800bb98023764dc2a"
     }
     Frame {
         msec: 5248
-        hash: "108287fc253d36a5ebf8582ef2a5fd57"
+        hash: "23197dd2bb352193b72d4445912d9c94"
     }
     Frame {
         msec: 5264
-        hash: "a4b6df2874ce48ed5a17aab43f32e665"
+        hash: "370e33f141d0a8396b5c2bb279f9bb67"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
index b96ecb3..e52c609 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
     width: childrenRect.width
@@ -6,23 +7,23 @@ Rectangle {
     Column {
         width: 80
         height: myText.height*4
-        Text {
+        TestText {
             elide: "ElideLeft"
             text: "aaa bbb ccc ddd eee fff"
             width: 80
             id: myText
         }
-        Text {
+        TestText {
             elide: "ElideMiddle"
             text: "aaa bbb ccc ddd eee fff"
             width: 80
         }
-        Text {
+        TestText {
             elide: "ElideRight"
             text: "aaa bbb ccc ddd eee fff"
             width: 80
         }
-        Text {
+        TestText {
             elide: "ElideNone"
             text: "aaa bbb ccc ddd eee fff"
             width: 80
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
index b772982..0370a73 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
@@ -1,10 +1,11 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
     width: 500
     height: 100
 
-    Text {
+    TestText {
         NumberAnimation on width { from: 500; to: 0; loops: Animation.Infinite; duration: 5000 }
         elide: Text.ElideRight
         text: 'Here is some very long text that we should truncate when sizing window'
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
index 3ef64ef..db991a2 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
     width: 500
@@ -9,7 +10,7 @@ Rectangle {
         height: myText.height
         color: "white"
         anchors.centerIn: parent
-        Text {
+        TestText {
             id: myText
             NumberAnimation on width { from: 500; to: 0; loops: Animation.Infinite; duration: 5000 }
             elide: "ElideRight"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
index 89195ae..30dc0a9 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
index 6a48728..8d3c37b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
index e82d80f..3a06cf0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
     id: s; width: 620; height: 600; color: "lightsteelblue"
@@ -6,96 +7,96 @@ Rectangle {
 
     Column {
         spacing: 8
-        Text {
+        TestText {
             text: s.text
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18
         }
-        Text {
+        TestText {
             text: s.text; font.pointSize: 20
         }
-        Text {
+        TestText {
             text: s.text; color: "red"; smooth: true
         }
-        Text {
+        TestText {
             text: s.text; font.capitalization: "AllUppercase"
         }
-        Text {
+        TestText {
             text: s.text; font.underline: true
         }
-        Text {
+        TestText {
             text: s.text; font.overline: true; smooth: true
         }
-        Text {
+        TestText {
             text: s.text; font.strikeout: true
         }
-        Text {
+        TestText {
             text: s.text; font.underline: true; font.overline: true; font.strikeout: true
         }
-        Text {
+        TestText {
             text: s.text; font.letterSpacing: 2
         }
-        Text {
+        TestText {
             text: s.text; font.underline: true; font.letterSpacing: 2; font.capitalization: "AllUppercase"; color: "blue"
         }
-        Text {
+        TestText {
             text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
         }
-        Text {
+        TestText {
             text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width
         }
-        Text {
+        TestText {
             text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20
         }
-        Text {
+        TestText {
             text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20
         }
         Row{
             height: childrenRect.height
             spacing: 4
-            Text {
+            TestText {
                 text: s.text; elide: Text.ElideLeft; width: 200
             }
-            Text {
+            TestText {
                 text: s.text; elide: Text.ElideMiddle; width: 200
             }
-            Text {
+            TestText {
                 text: s.text; elide: Text.ElideRight; width: 200
             }
         }
         Row{
             height: childrenRect.height
             spacing: 4
-            Text{
+            TestText{
                 text: s.text; elide: Text.ElideLeft; width: 200; wrapMode: Text.WordWrap
             }
-            Text {
+            TestText {
                 text: s.text; elide: Text.ElideMiddle; width: 200; wrapMode: Text.WordWrap
             }
-            Text {
+            TestText {
                 text: s.text; elide: Text.ElideRight; width: 200; wrapMode: Text.WordWrap
             }
         }
         Row{
             height: childrenRect.height
             spacing: 4
-            Text {
+            TestText {
                 text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere
             }
-            Text {
+            TestText {
                 text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap
             }
-            Text {
+            TestText {
 text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200
             }
         }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml
index 901025a..01de1f0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext2.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
     width: 400; height: 200
@@ -6,16 +7,16 @@ Rectangle {
     Row {
         spacing: 20
         anchors.centerIn: parent
-        Text {
+        TestText {
             text: "First line\nSecond line"; wrapMode: Text.Wrap
         }
-        Text {
+        TestText {
             text: "First line\nSecond line"; width: 70
         }
-        Text {
+        TestText {
             text: "First Second\nThird Fourth"; wrapMode: Text.Wrap; width: 50
         }
-        Text {
+        TestText {
             text: "First line<br>Second line"; textFormat: Text.StyledText
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
index 7d174cc..3670479 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
     id: s; width: 620; height: 600; color: "lightsteelblue"
@@ -6,70 +7,70 @@ Rectangle {
 
     Column {
         spacing: 6
-        Text {
+        TestText {
             text: s.text
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18
         }
-        Text {
+        TestText {
             text: s.text; font.pointSize: 18
         }
-        Text {
+        TestText {
             text: s.text; color: "red"; smooth: true
         }
-        Text {
+        TestText {
             text: s.text; font.capitalization: "AllUppercase"
         }
-        Text {
+        TestText {
             text: s.text; font.underline: true
         }
-        Text {
+        TestText {
             text: s.text; font.overline: true; smooth: true
         }
-        Text {
+        TestText {
             text: s.text; font.strikeout: true
         }
-        Text {
+        TestText {
             text: s.text; font.underline: true; font.overline: true; font.strikeout: true
         }
-        Text {
+        TestText {
             text: s.text; font.letterSpacing: 2
         }
-        Text {
+        TestText {
             text: s.text; font.underline: true; font.letterSpacing: 2; font.capitalization: "AllUppercase"; color: "blue"
         }
-        Text {
+        TestText {
             text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
         }
-        Text {
+        TestText {
             text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
         }
-        Text {
+        TestText {
             text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width
         }
-        Text {
+        TestText {
             text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20
         }
-        Text {
+        TestText {
             text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20
         }
         Row{
             height: childrenRect.height;
             spacing: 4
-            Text {
+            TestText {
                 text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere
             }
-            Text {
+            TestText {
                 text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap
             }
-            Text {
+            TestText {
                 text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200
             }
         }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml
index 07416dc..3d5fbf0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/qtbug_14865.qml
@@ -1,9 +1,10 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
 Rectangle {
     width: 200; height: 200
 
-    Text {
+    TestText {
         id: label
         objectName: "label"
         text: "Hello world!"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
index fd29eb6..4273f32 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
 Item {
     id:lineedit
@@ -7,16 +8,16 @@ Item {
     width: 240 + 11 //Should be set manually in most cases
     height: textEdit.height + 11 
 
-    Rectangle{
+    Rectangle {
         color: 'lightsteelblue'
         anchors.fill: parent
     }
     clip: true
     Component.onCompleted: textEdit.cursorPosition = 0;
-    TextEdit{
+    TestTextEdit {
         id:textEdit
-        cursorDelegate: Item{
-            Rectangle{
+        cursorDelegate: Item {
+            Rectangle {
                 visible: parent.parent.focus
                 color: "#009BCE"
                 height: 13
@@ -46,7 +47,7 @@ Item {
         wrapMode: TextEdit.WordWrap
         font.pixelSize:15
     }
-    MouseArea{
+    MouseArea {
         //Implements all line edit mouse handling
         id: mainMouseArea
         anchors.fill: parent;
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
index 8798a5f..1e0f71a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
@@ -1,5 +1,7 @@
 import QtQuick 1.0
-    Rectangle {
+import "../shared" 1.0
+
+Rectangle {
     resources: [
         Component { id: cursorA
             Item { id: cPage;
@@ -21,7 +23,7 @@ import QtQuick 1.0
     width: 400
     height: 200
     color: "white"
-    TextEdit { id: mainText
+    TestTextEdit { id: mainText
         text: "Hello World"
         cursorDelegate: cursorA
         focus: true
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
index 9c72d52..ae21dca 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
index 9c72d52..ae21dca 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png
index d49c2ff..5f329b6 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
index 9c72d52..ae21dca 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml
index c12094e..5a1f8de 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml
@@ -2218,7 +2218,7 @@ VisualTest {
     }
     Frame {
         msec: 5952
-        hash: "eba517141a4dc94025801fabc8c5e813"
+        hash: "3d71f15694368397bc8f6a6a0c2c16de"
     }
     Mouse {
         type: 5
@@ -2722,7 +2722,7 @@ VisualTest {
     }
     Frame {
         msec: 6432
-        hash: "a609d3c9cb375240e66dd316af27543c"
+        hash: "b7eeca12627f0ca82a0e56179184b3b8"
     }
     Mouse {
         type: 5
@@ -2742,7 +2742,7 @@ VisualTest {
     }
     Frame {
         msec: 6448
-        hash: "0d376060ba0f9843ed814a8d8150d047"
+        hash: "abccf1571b12444328188003928a0aea"
     }
     Mouse {
         type: 5
@@ -3554,11 +3554,11 @@ VisualTest {
     }
     Frame {
         msec: 8000
-        hash: "a62df700f3209668a813e765a79e7859"
+        hash: "236c237e3f4673d568a8cf2c3665cb49"
     }
     Frame {
         msec: 8016
-        hash: "a62df700f3209668a813e765a79e7859"
+        hash: "236c237e3f4673d568a8cf2c3665cb49"
     }
     Key {
         type: 7
@@ -3578,11 +3578,11 @@ VisualTest {
     }
     Frame {
         msec: 8032
-        hash: "e8928770969b82523e828e3036bbe106"
+        hash: "cea55dd0cd5b0c2e37808bd38c689ddf"
     }
     Frame {
         msec: 8048
-        hash: "e8928770969b82523e828e3036bbe106"
+        hash: "cea55dd0cd5b0c2e37808bd38c689ddf"
     }
     Key {
         type: 7
@@ -3602,11 +3602,11 @@ VisualTest {
     }
     Frame {
         msec: 8064
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Frame {
         msec: 8080
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Key {
         type: 6
@@ -3626,31 +3626,31 @@ VisualTest {
     }
     Frame {
         msec: 8096
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Frame {
         msec: 8112
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Frame {
         msec: 8128
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Frame {
         msec: 8144
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Frame {
         msec: 8160
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Frame {
         msec: 8176
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Frame {
         msec: 8192
-        hash: "ba0c406580cc0fa02a6b26367a290ec9"
+        hash: "9bf8a1a8a79230f459fcec6d21843f3f"
     }
     Key {
         type: 6
@@ -3662,19 +3662,19 @@ VisualTest {
     }
     Frame {
         msec: 8208
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Frame {
         msec: 8224
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Frame {
         msec: 8240
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Frame {
         msec: 8256
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Key {
         type: 7
@@ -3686,19 +3686,19 @@ VisualTest {
     }
     Frame {
         msec: 8272
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Frame {
         msec: 8288
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Frame {
         msec: 8304
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Frame {
         msec: 8320
-        hash: "479b5ba3f5b3d38b5e9aba6b5204da03"
+        hash: "261d950728b1628d637e739a72c58e9f"
     }
     Key {
         type: 6
@@ -3710,19 +3710,19 @@ VisualTest {
     }
     Frame {
         msec: 8336
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Frame {
         msec: 8352
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Frame {
         msec: 8368
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Frame {
         msec: 8384
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Key {
         type: 7
@@ -3734,23 +3734,23 @@ VisualTest {
     }
     Frame {
         msec: 8400
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Frame {
         msec: 8416
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Frame {
         msec: 8432
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Frame {
         msec: 8448
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Frame {
         msec: 8464
-        hash: "978ed05f4ea2cc7ddb06807a25883335"
+        hash: "aad904179a9dbda49f411b9ae3efcb53"
     }
     Key {
         type: 6
@@ -3762,19 +3762,19 @@ VisualTest {
     }
     Frame {
         msec: 8480
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8496
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8512
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8528
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Key {
         type: 7
@@ -3786,27 +3786,27 @@ VisualTest {
     }
     Frame {
         msec: 8544
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8560
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8576
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8592
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8608
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8624
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8640
@@ -3814,7 +3814,7 @@ VisualTest {
     }
     Frame {
         msec: 8656
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Key {
         type: 7
@@ -3826,139 +3826,139 @@ VisualTest {
     }
     Frame {
         msec: 8672
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8688
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8704
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8720
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8736
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8752
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8768
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8784
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8800
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8816
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8832
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8848
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8864
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8880
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8896
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8912
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8928
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8944
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8960
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8976
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 8992
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9008
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9024
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9040
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9056
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9072
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9088
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9104
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9120
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9136
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9152
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9168
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9184
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9200
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Mouse {
         type: 2
@@ -3970,11 +3970,11 @@ VisualTest {
     }
     Frame {
         msec: 9216
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9232
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Mouse {
         type: 5
@@ -3986,7 +3986,7 @@ VisualTest {
     }
     Frame {
         msec: 9248
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Mouse {
         type: 5
@@ -4006,7 +4006,7 @@ VisualTest {
     }
     Frame {
         msec: 9264
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Mouse {
         type: 5
@@ -4026,7 +4026,7 @@ VisualTest {
     }
     Frame {
         msec: 9280
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Mouse {
         type: 3
@@ -4038,43 +4038,43 @@ VisualTest {
     }
     Frame {
         msec: 9296
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9312
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9328
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9344
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9360
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9376
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9392
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9408
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9424
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Frame {
         msec: 9440
-        hash: "b65c439a091d3293352de410d28aaca1"
+        hash: "b5c199f82cea188d2aafa4fa09f444fc"
     }
     Mouse {
         type: 2
@@ -4086,27 +4086,27 @@ VisualTest {
     }
     Frame {
         msec: 9456
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9472
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9488
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9504
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9520
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9536
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Mouse {
         type: 3
@@ -4118,15 +4118,15 @@ VisualTest {
     }
     Frame {
         msec: 9552
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9568
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9584
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9600
@@ -4134,19 +4134,19 @@ VisualTest {
     }
     Frame {
         msec: 9616
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9632
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9648
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9664
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Key {
         type: 6
@@ -4158,111 +4158,111 @@ VisualTest {
     }
     Frame {
         msec: 9680
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9696
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9712
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9728
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9744
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9760
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9776
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9792
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9808
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9824
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9840
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9856
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9872
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9888
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9904
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9920
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9936
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9952
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9968
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 9984
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10000
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10016
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10032
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10048
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10064
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10080
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10096
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Key {
         type: 6
@@ -4274,35 +4274,35 @@ VisualTest {
     }
     Frame {
         msec: 10112
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10128
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10144
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10160
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10176
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10192
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10208
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10224
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Key {
         type: 7
@@ -4314,35 +4314,35 @@ VisualTest {
     }
     Frame {
         msec: 10240
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10256
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10272
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10288
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10304
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10320
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10336
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Frame {
         msec: 10352
-        hash: "8d9ca5bff73c2c93a0db5787ca7ef76b"
+        hash: "ead21885244133a71e103eb9ae6b61e4"
     }
     Key {
         type: 6
@@ -4354,27 +4354,27 @@ VisualTest {
     }
     Frame {
         msec: 10368
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10384
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10400
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10416
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10432
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10448
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Key {
         type: 7
@@ -4386,27 +4386,27 @@ VisualTest {
     }
     Frame {
         msec: 10464
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10480
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10496
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10512
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10528
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10544
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10560
@@ -4414,23 +4414,23 @@ VisualTest {
     }
     Frame {
         msec: 10576
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10592
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10608
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10624
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10640
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Key {
         type: 7
@@ -4442,219 +4442,219 @@ VisualTest {
     }
     Frame {
         msec: 10656
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10672
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10688
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10704
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10720
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10736
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10752
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10768
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10784
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10800
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10816
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10832
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10848
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10864
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10880
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10896
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10912
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10928
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10944
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10960
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10976
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 10992
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11008
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11024
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11040
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11056
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11072
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11088
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11104
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11120
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11136
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11152
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11168
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11184
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11200
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11216
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11232
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11248
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11264
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11280
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11296
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11312
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11328
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11344
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11360
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11376
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11392
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11408
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11424
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11440
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11456
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11472
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11488
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11504
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11520
@@ -4662,26 +4662,26 @@ VisualTest {
     }
     Frame {
         msec: 11536
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11552
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11568
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11584
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11600
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
     Frame {
         msec: 11616
-        hash: "3d08eff16edf54f522a75df1734150df"
+        hash: "a6c8b66b0d3f1124a6a316209a1456ff"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
index defaf78..475aee1 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
@@ -230,7 +230,7 @@ VisualTest {
     }
     Frame {
         msec: 528
-        hash: "41fc29e728daf52d54a3acacceabab39"
+        hash: "36fb24a55e2cda02c3001adaa67e82a7"
     }
     Key {
         type: 6
@@ -450,19 +450,19 @@ VisualTest {
     }
     Frame {
         msec: 1024
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1040
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1056
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1072
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Key {
         type: 7
@@ -474,31 +474,31 @@ VisualTest {
     }
     Frame {
         msec: 1088
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1104
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1120
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1136
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1152
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1168
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Frame {
         msec: 1184
-        hash: "6d8069ea1f16634ebcf94ba45041984f"
+        hash: "f681181b9e889f2fe0ac5ccddaa8c39f"
     }
     Key {
         type: 6
@@ -638,7 +638,7 @@ VisualTest {
     }
     Frame {
         msec: 1520
-        hash: "7e63c2f83280eee33bb3c954d769e297"
+        hash: "a086058fa845a399a222c2571ef25442"
     }
     Key {
         type: 7
@@ -650,11 +650,11 @@ VisualTest {
     }
     Frame {
         msec: 1536
-        hash: "7e63c2f83280eee33bb3c954d769e297"
+        hash: "a086058fa845a399a222c2571ef25442"
     }
     Frame {
         msec: 1552
-        hash: "7e63c2f83280eee33bb3c954d769e297"
+        hash: "a086058fa845a399a222c2571ef25442"
     }
     Key {
         type: 6
@@ -842,15 +842,15 @@ VisualTest {
     }
     Frame {
         msec: 2016
-        hash: "6e626464dfc68af86649589a23fe5368"
+        hash: "2ddf4c1b9ec2d5540c456e10c2af775e"
     }
     Frame {
         msec: 2032
-        hash: "6e626464dfc68af86649589a23fe5368"
+        hash: "2ddf4c1b9ec2d5540c456e10c2af775e"
     }
     Frame {
         msec: 2048
-        hash: "6e626464dfc68af86649589a23fe5368"
+        hash: "2ddf4c1b9ec2d5540c456e10c2af775e"
     }
     Key {
         type: 6
@@ -1050,11 +1050,11 @@ VisualTest {
     }
     Frame {
         msec: 2528
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2544
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Key {
         type: 7
@@ -1066,27 +1066,27 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2576
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2592
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2608
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2624
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Frame {
         msec: 2640
-        hash: "0a5589c5877c807b8d9540a1dd86e265"
+        hash: "1475ec7421f2c16f7dbb13eeb35f21c8"
     }
     Key {
         type: 6
@@ -1246,23 +1246,23 @@ VisualTest {
     }
     Frame {
         msec: 3024
-        hash: "718894676b3feeff1924b9b315838551"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 3040
-        hash: "718894676b3feeff1924b9b315838551"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 3056
-        hash: "718894676b3feeff1924b9b315838551"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 3072
-        hash: "718894676b3feeff1924b9b315838551"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Frame {
         msec: 3088
-        hash: "718894676b3feeff1924b9b315838551"
+        hash: "ab08c67bc5c8f53bba66ad48f618d9c9"
     }
     Key {
         type: 6
@@ -1606,7 +1606,7 @@ VisualTest {
     }
     Frame {
         msec: 4016
-        hash: "8c949a494d7bd5f9b6e5ac5bf3baec59"
+        hash: "67b49fc16da9390bff9814b34659baca"
     }
     Key {
         type: 6
@@ -1814,11 +1814,11 @@ VisualTest {
     }
     Frame {
         msec: 4528
-        hash: "55e236c3b51b7104cf3254a44b0f1c92"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Frame {
         msec: 4544
-        hash: "55e236c3b51b7104cf3254a44b0f1c92"
+        hash: "c5ce4fc832787535e66e64c546383d28"
     }
     Key {
         type: 6
@@ -2002,127 +2002,127 @@ VisualTest {
     }
     Frame {
         msec: 5024
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5040
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5056
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5072
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5088
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5104
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5120
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5136
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5152
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5168
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5184
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5200
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5216
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5232
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5248
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5264
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5280
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5296
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5312
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5328
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5344
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5360
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5376
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5392
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5408
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5424
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5440
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5456
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5472
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5488
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5504
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 5520
@@ -2250,131 +2250,131 @@ VisualTest {
     }
     Frame {
         msec: 6016
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6032
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6048
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6064
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6080
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6096
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6112
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6128
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6144
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6160
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6176
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6192
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6208
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6224
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6240
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6256
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6272
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6288
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6304
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6320
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6336
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6352
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6368
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6384
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6400
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6416
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6432
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6448
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6464
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6480
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6496
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6512
-        hash: "a0208b5276f3f26500f40535017563a6"
+        hash: "41179a181fd4ae8bd15a259b66d90eea"
     }
     Frame {
         msec: 6528
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
index d7054ba..5f80234 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
 Rectangle {
     Component { id: testableCursor
@@ -10,7 +11,7 @@ Rectangle {
     }
     width:300;
     height:40;
-    TextEdit {
+    TestTextEdit {
         focus: true;
         cursorDelegate: testableCursor
         text: "Jackdaws love my big sphinx of Quartz"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
index f03e1cc..bf5e7a0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
@@ -3,12 +3,12 @@ import QtQuick 1.0
 Rectangle{
     width: 280
     height: 140
-    Column{
-        MultilineEdit{
+    Column {
+        MultilineEdit {
             text: 'I am the very model of a modern major general. I\'ve information vegetable, animal and mineral. I know the kings of england and I quote the fights historical - from Marathon to Waterloo in order categorical.';
             width: 182; height: 60;
         }
-        Rectangle{height: 20; width: 20;}//Spacer
-        MultilineEdit{text: 'Hello world'}
+        Rectangle {height: 20; width: 20;}//Spacer
+        MultilineEdit {text: 'Hello world'}
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
index 4afe417..63400f1 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
@@ -1,30 +1,31 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
 Item {
     height:400
     width: 200
-    TextEdit {
+    TestTextEdit {
         width: 200
         height: 100
         wrapMode: TextEdit.WordWrap
         focus: true
     }
     //With QTBUG-6273 only the bottom one would be wrapped
-    TextEdit {
+    TestTextEdit {
         width: 200
         height: 100
         wrapMode: TextEdit.WordWrap
         text: "This is a test that text edit wraps correctly."
         y:100
     }
-    TextEdit {
+    TestTextEdit {
         width: 150
         height: 100
         wrapMode: TextEdit.WrapAnywhere
         text: "This is a test that text edit wraps correctly. thisisaverylongstringwithnospaces"
         y:200
     }
-    TextEdit {
+    TestTextEdit {
         width: 150
         height: 100
         wrapMode: TextEdit.Wrap
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
index 74c16e2..50c3cb4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
 Item {
     id:lineedit
@@ -7,16 +8,16 @@ Item {
     width: textInp.width + 11 
     height: 13 + 11 
 
-    Rectangle{
+    Rectangle {
         color: 'lightsteelblue'
         anchors.fill: parent
     }
     clip: true
     Component.onCompleted: textInp.cursorPosition = 0;
-    TextInput{
+    TestTextInput {
         id:textInp
-        cursorDelegate: Item{
-            Rectangle{
+        cursorDelegate: Item {
+            Rectangle {
                 visible: parent.parent.focus
                 color: "#009BCE"
                 height: 13
@@ -42,7 +43,7 @@ Item {
         horizontalAlignment: TextInput.AlignLeft
         font.pixelSize:15
     }
-    MouseArea{
+    MouseArea {
         //Implements all line edit mouse handling
         id: mainMouseArea
         anchors.fill: parent;
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
index 69dc32a..f2a34b7 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
@@ -1,5 +1,7 @@
 import QtQuick 1.0
-    Rectangle {
+import "../shared" 1.0
+
+Rectangle {
     resources: [
         Component { id: cursorA
             Item { id: cPage;
@@ -22,7 +24,7 @@ import QtQuick 1.0
     width: 400
     height: 200
     color: "white"
-    TextInput { id: mainText
+    TestTextInput { id: mainText
         text: "Hello World"
         cursorDelegate: cursorA
         focus: true
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png
index e7e4ad8..551a3de 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png
index 07a19e2..826d99a 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png
index 075c4d5..727e873 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
index 31d3592..c8f1f27 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
@@ -158,7 +158,7 @@ VisualTest {
     }
     Frame {
         msec: 528
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Key {
         type: 7
@@ -170,43 +170,43 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 560
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 576
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 592
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 608
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 624
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 640
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 656
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 672
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Frame {
         msec: 688
-        hash: "48b0300c8109a227176bd90e6b8ca682"
+        hash: "86f9d315291a08f35f1c431ae802ada2"
     }
     Key {
         type: 6
@@ -218,23 +218,23 @@ VisualTest {
     }
     Frame {
         msec: 704
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 720
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 736
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 752
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 768
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Key {
         type: 7
@@ -246,23 +246,23 @@ VisualTest {
     }
     Frame {
         msec: 784
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 800
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 816
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 832
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Frame {
         msec: 848
-        hash: "7de871fbd0f87da5c31216863f6eb0ba"
+        hash: "5c1e01a1dd3004ea3eff7ec215cc8fdc"
     }
     Key {
         type: 6
@@ -274,15 +274,15 @@ VisualTest {
     }
     Frame {
         msec: 864
-        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
+        hash: "b3504e4dbb653a7c039dcf8ab0351055"
     }
     Frame {
         msec: 880
-        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
+        hash: "b3504e4dbb653a7c039dcf8ab0351055"
     }
     Frame {
         msec: 896
-        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
+        hash: "b3504e4dbb653a7c039dcf8ab0351055"
     }
     Key {
         type: 7
@@ -294,15 +294,15 @@ VisualTest {
     }
     Frame {
         msec: 912
-        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
+        hash: "b3504e4dbb653a7c039dcf8ab0351055"
     }
     Frame {
         msec: 928
-        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
+        hash: "b3504e4dbb653a7c039dcf8ab0351055"
     }
     Frame {
         msec: 944
-        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
+        hash: "b3504e4dbb653a7c039dcf8ab0351055"
     }
     Frame {
         msec: 960
@@ -310,7 +310,7 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "2fa1f1853e1ebf127fcb42ba072bc66f"
+        hash: "b3504e4dbb653a7c039dcf8ab0351055"
     }
     Key {
         type: 6
@@ -322,11 +322,11 @@ VisualTest {
     }
     Frame {
         msec: 992
-        hash: "7bd52cf50949b283ec40b82cf457841a"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1008
-        hash: "7bd52cf50949b283ec40b82cf457841a"
+        hash: "16069bd86f3b8a896087a455e76f1059"
     }
     Frame {
         msec: 1024
@@ -502,15 +502,15 @@ VisualTest {
     }
     Frame {
         msec: 1520
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1536
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1552
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Key {
         type: 7
@@ -522,27 +522,27 @@ VisualTest {
     }
     Frame {
         msec: 1568
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1584
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1600
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1616
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1632
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Frame {
         msec: 1648
-        hash: "7b294a04afc0567d321a28930bc43600"
+        hash: "80685804ddaefa46508a3cbe4cd16f59"
     }
     Key {
         type: 6
@@ -554,23 +554,23 @@ VisualTest {
     }
     Frame {
         msec: 1664
-        hash: "00095464e3f162c2a825f7fdae21ab6f"
+        hash: "270f91762428ce515e0de44dea26d6ed"
     }
     Frame {
         msec: 1680
-        hash: "00095464e3f162c2a825f7fdae21ab6f"
+        hash: "270f91762428ce515e0de44dea26d6ed"
     }
     Frame {
         msec: 1696
-        hash: "00095464e3f162c2a825f7fdae21ab6f"
+        hash: "270f91762428ce515e0de44dea26d6ed"
     }
     Frame {
         msec: 1712
-        hash: "00095464e3f162c2a825f7fdae21ab6f"
+        hash: "270f91762428ce515e0de44dea26d6ed"
     }
     Frame {
         msec: 1728
-        hash: "00095464e3f162c2a825f7fdae21ab6f"
+        hash: "270f91762428ce515e0de44dea26d6ed"
     }
     Key {
         type: 6
@@ -582,7 +582,7 @@ VisualTest {
     }
     Frame {
         msec: 1744
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Key {
         type: 7
@@ -594,15 +594,15 @@ VisualTest {
     }
     Frame {
         msec: 1760
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Frame {
         msec: 1776
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Frame {
         msec: 1792
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Key {
         type: 7
@@ -614,19 +614,19 @@ VisualTest {
     }
     Frame {
         msec: 1808
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Frame {
         msec: 1824
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Frame {
         msec: 1840
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Frame {
         msec: 1856
-        hash: "c25d79796963ca42789725c6621bce01"
+        hash: "5ff3755b130835886503045e45700235"
     }
     Key {
         type: 6
@@ -638,15 +638,15 @@ VisualTest {
     }
     Frame {
         msec: 1872
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 1888
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 1904
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 1920
@@ -662,23 +662,23 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 1952
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 1968
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 1984
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 2000
-        hash: "e876aa2aaa6ae2c3a5f048771858c21b"
+        hash: "deab81e7fcc4ecc31d02fccc52a4cc17"
     }
     Frame {
         msec: 2016
@@ -898,11 +898,11 @@ VisualTest {
     }
     Frame {
         msec: 2528
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2544
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Key {
         type: 7
@@ -914,83 +914,83 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2576
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2592
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2608
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2624
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2640
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2656
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2672
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2688
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2704
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2720
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2736
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2752
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2768
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2784
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2800
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2816
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2832
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2848
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2864
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2880
@@ -998,35 +998,35 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2912
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2928
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2944
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2960
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2976
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 2992
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 3008
-        hash: "73ebe3eec273bac501d56451c0c0a828"
+        hash: "34d00f787b814ad82c025c77d6be51a2"
     }
     Frame {
         msec: 3024
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
index 5d11403..83ec088 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
@@ -1,10 +1,11 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
-Item{
+Item {
     height: 50; width: 200
-    Column{
+    Column {
         //Not an exhaustive echo mode test, that's in QLineEdit (since the functionality is in QLineControl)
-        TextInput{ id: main; focus: true; echoMode: TextInput.Password; passwordCharacter: '.' }
-        Text{ text: main.text }
+        TestTextInput { id: main; focus: true; echoMode: TextInput.Password; passwordCharacter: '.' }
+        TestText { text: main.text }
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
index cf29f7c..ad8db33 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
@@ -1,36 +1,37 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
 Item{
     width:600;
     height:300;
-    Column{
+    Column {
         //Because they have auto width, these three should look the same
-        TextInput{ 
+        TestTextInput { 
             text: "Jackdaws love my big sphinx of quartz"; 
             horizontalAlignment: TextInput.AlignLeft;
         }
-        TextInput{ 
+        TestTextInput { 
             text: "Jackdaws love my big sphinx of quartz"; 
             horizontalAlignment: TextInput.AlignHCenter;
         }
-        TextInput{ 
+        TestTextInput { 
             text: "Jackdaws love my big sphinx of quartz"; 
             horizontalAlignment: TextInput.AlignRight;
         }
         Rectangle{ width: 600; height: 10; color: "pink" }
-        TextInput{ 
+        TestTextInput { 
             height: 30;
             width: 600;
             text: "Jackdaws love my big sphinx of quartz"; 
             horizontalAlignment: TextInput.AlignLeft;
         }
-        TextInput{ 
+        TestTextInput { 
             height: 30;
             width: 600;
             text: "Jackdaws love my big sphinx of quartz"; 
             horizontalAlignment: TextInput.AlignHCenter;
         }
-        TextInput{ 
+        TestTextInput { 
             height: 30;
             width: 600;
             text: "Jackdaws love my big sphinx of quartz"; 
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml
index 318af0f..758717e 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/usingLineEdit.qml
@@ -3,8 +3,8 @@ import QtQuick 1.0
 Rectangle{
     width: 600
     height: 200
-    Column{
-        LineEdit{text: 'Hello world'}
-        LineEdit{text: 'Hello underwhelmingly verbose world'; width: 80; height: 24;}
+    Column {
+        LineEdit {text: 'Hello world'}
+        LineEdit {text: 'Hello underwhelmingly verbose world'; width: 80; height: 24;}
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/shared/README b/tests/auto/declarative/qmlvisual/shared/README
new file mode 100644
index 0000000..56a88ae
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/shared/README
@@ -0,0 +1,7 @@
+These components provide a standard set of what would otherwise be system dependant settings. These are
+-default font
+-default fontSize
+-cursor blink time (unblinking cursor)
+
+This should probably be replaced with a Test Style/Theme once QtComponents is done.
+Note that having multiple font loaders is probably quite inefficient, so don't use these for performance tests.
diff --git a/tests/auto/declarative/qmlvisual/shared/TestText.qml b/tests/auto/declarative/qmlvisual/shared/TestText.qml
new file mode 100644
index 0000000..be40112
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/shared/TestText.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+import "../shared" 1.0
+
+Text{
+    FontLoader { id: fixedFont; source: "Vera.ttf" }
+    font.family: fixedFont.name
+    font.pixelSize: 12
+}
diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
new file mode 100644
index 0000000..fb35ae3
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+import "../shared" 1.0
+
+TextEdit {
+    id: edit
+    FontLoader { id: fixedFont; source: "Vera.ttf" }
+    font.family: fixedFont.name
+    font.pixelSize: 12
+    cursorDelegate: Rectangle {
+            width: 1; 
+            color: "black";
+            visible: edit.cursorVisible
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
new file mode 100644
index 0000000..8593218
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+import "../shared" 1.0
+
+TextInput {
+    id: inp
+    FontLoader { id: fixedFont; source: "Vera.ttf" }
+    font.family: fixedFont.name
+    font.pixelSize: 12
+    cursorDelegate: Rectangle {
+            width: 1; 
+            color: "black";
+            visible: parent.cursorVisible//bug that 'inp' doesn't seem to work?
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/shared/Vera.ttf b/tests/auto/declarative/qmlvisual/shared/Vera.ttf
new file mode 100644
index 0000000..58cd6b5
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/shared/Vera.ttf differ
diff --git a/tests/auto/declarative/qmlvisual/shared/qmldir b/tests/auto/declarative/qmlvisual/shared/qmldir
new file mode 100644
index 0000000..4aebb39
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/shared/qmldir
@@ -0,0 +1,3 @@
+TestText 1.0 TestText.qml
+TestTextEdit 1.0 TestTextEdit.qml
+TestTextInput 1.0 TestTextInput.qml
-- 
cgit v0.12


From 2875e6b26c9a40ad1f5e4e214937e5a19a56432c Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 4 Nov 2010 18:09:37 +1000
Subject: Run all QML visual tests now.

They all pass for me, and running them through CI will help find the
unstable ones.
---
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 81404ea..ce08eab 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -102,7 +102,7 @@ void tst_qmlvisual::visual_data()
     QTest::addColumn<QString>("testdata");
 
     QStringList files;
-    if (qgetenv("QMLVISUAL_ALL") != "")
+    if (qgetenv("QMLVISUAL_ALL") != "0")
         files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
     else {
         //these are newly added tests we want to try out in CI (then move to the stable list)
-- 
cgit v0.12


From 095f416f806062ab23d82c6907fffac4f862ee3b Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Thu, 4 Nov 2010 10:20:27 +0100
Subject: Fix tst_symbols auto test

Prefix isLikelyToBeNfs with a "q", even though it's only
autotest-exported.
---
 src/corelib/io/qsettings.cpp           | 10 +++++-----
 tests/auto/qfileinfo/tst_qfileinfo.cpp |  4 ++--
 tests/auto/symbols/tst_symbols.cpp     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index c94ec7b..e6c5fb9 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -140,7 +140,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 # include <sys/mount.h>
 QT_END_INCLUDE_NAMESPACE
 
-Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
 {
     struct statfs buf;
     if (fstatfs(handle, &buf) != 0)
@@ -166,7 +166,7 @@ QT_END_INCLUDE_NAMESPACE
 #  define AUTOFSNG_SUPER_MAGIC  0x7d92b1a0
 # endif
 
-Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
 {
     struct statfs buf;
     if (fstatfs(handle, &buf) != 0)
@@ -183,7 +183,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 # include <sys/statvfs.h>
 QT_END_INCLUDE_NAMESPACE
 
-Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
 {
     struct statvfs buf;
     if (fstatvfs(handle, &buf) != 0)
@@ -195,7 +195,7 @@ Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
 #endif
 }
 #else
-Q_AUTOTEST_EXPORT_HELPER inline bool isLikelyToBeNfs(int /* handle */)
+Q_AUTOTEST_EXPORT_HELPER inline bool qIsLikelyToBeNfs(int /* handle */)
 {
     return true;
 }
@@ -209,7 +209,7 @@ static bool unixLock(int handle, int lockType)
         now is to disable locking when we detect NFS (or AutoFS or
         CacheFS, which are probably wrapping NFS).
     */
-    if (isLikelyToBeNfs(handle))
+    if (qIsLikelyToBeNfs(handle))
         return false;
 
     struct flock fl;
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 910ed97..5ec721b 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -70,7 +70,7 @@
 # define SRCDIR ""
 #endif
 
-extern Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int /* handle */);
+extern Q_AUTOTEST_EXPORT bool qIsLikelyToBeNfs(int /* handle */);
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -942,7 +942,7 @@ void tst_QFileInfo::fileTimes()
 #endif
         QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
 #ifdef Q_OS_UNIX
-        if (isLikelyToBeNfs(file.handle()))
+        if (qIsLikelyToBeNfs(file.handle()))
             QSKIP("This Test doesn't work on NFS", SkipAll);
 #endif
         QTextStream ts(&file);
diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp
index 28970eb..1572a5f 100644
--- a/tests/auto/symbols/tst_symbols.cpp
+++ b/tests/auto/symbols/tst_symbols.cpp
@@ -443,7 +443,7 @@ void tst_Symbols::prefix()
 #  if defined(Q_OS_LINUX) && defined(Q_CC_INTEL)
     QEXPECT_FAIL("", "linux-icc* incorrectly exports some QtWebkit symbols, waiting for a fix from Intel.", Continue);
 #  endif
-    QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output :)");
+    QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output above.");
 #else
     QSKIP("Linux-specific test", SkipAll);
 #endif
-- 
cgit v0.12


From 7833534ee1fda1e80a14ace34747283aaa386114 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Thu, 4 Nov 2010 10:31:22 +0100
Subject: fix tests when using Qt in a namespace

---
 tests/auto/qfileinfo/tst_qfileinfo.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 5ec721b..c9bf17a 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -70,7 +70,9 @@
 # define SRCDIR ""
 #endif
 
+QT_BEGIN_NAMESPACE
 extern Q_AUTOTEST_EXPORT bool qIsLikelyToBeNfs(int /* handle */);
+QT_END_NAMESPACE
 
 //TESTED_CLASS=
 //TESTED_FILES=
-- 
cgit v0.12


From fa4ee0aadd00c976a70ef63aeb5be1d4eb52f928 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Thu, 4 Nov 2010 10:32:26 +0100
Subject: Doc: Correcting character escape bug

---
 tools/qdoc3/test/qt-html-templates.qdocconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 30a63c8..698164d 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -9,7 +9,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
 			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
-			  "    <div id="narrowsearch"></div>\n" \
+			  "    <div id=\"narrowsearch\"></div>\n" \
 			  "    <div id=\"nav-topright\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
-- 
cgit v0.12


From 74d586cb6d5391b186bfa8211fbb1e33f7c20e2f Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Thu, 4 Nov 2010 10:39:16 +0100
Subject: Give the toplevel widget a layout

This ensures that the top-level will be large enough to view the text
edit.
---
 tests/auto/qtextedit/tst_qtextedit.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 878579b..321aa22 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -58,6 +58,7 @@
 #include <qimagereader.h>
 #include <qimagewriter.h>
 #include <qcommonstyle.h>
+#include <qlayout.h>
 
 #include <qabstracttextdocumentlayout.h>
 #include <qtextdocumentfragment.h>
@@ -2157,7 +2158,9 @@ void tst_QTextEdit::pasteFromQt3RichText()
 void tst_QTextEdit::noWrapBackgrounds()
 {
     QWidget topLevel;
-    QTextEdit edit(&topLevel);
+    QVBoxLayout *layout = new QVBoxLayout(&topLevel);
+
+    QTextEdit edit;
     edit.setLineWrapMode(QTextEdit::NoWrap);
 
     QTextFrame *root = edit.document()->rootFrame();
@@ -2171,8 +2174,12 @@ void tst_QTextEdit::noWrapBackgrounds()
     edit.textCursor().setBlockFormat(format);
     edit.insertPlainText(QLatin1String(" \n  \n   \n    \n"));
     edit.setFixedSize(100, 200);
+
+    layout->addWidget(&edit);
     topLevel.show();
 
+    QTest::qWait(1000);
+
     QImage img = QPixmap::grabWidget(edit.viewport()).toImage();
     QCOMPARE(img, img.mirrored(true, false));
 }
-- 
cgit v0.12


From 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 4 Nov 2010 12:23:54 +0200
Subject: Use qtmain.lib to provide entry point for all Symbian applications

Using Open C's libcrt0.lib to provide entry point caused problems
for applications that launched other processes, as Open C retains a
handle to all launched processes even after said processes terminate.

Task-number: QTBUG-14735
Reviewed-by: axis
---
 mkspecs/common/symbian/symbian.conf           |  3 ++-
 mkspecs/features/symbian/default_post.prf     |  3 ---
 mkspecs/features/symbian/symbian_building.prf | 20 +++++---------------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index decec14..6d1f708 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -79,7 +79,6 @@ QMAKE_LIBS_OPENGL_ES2_QT = -llibglesv2 -lcone -lws32
 QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
 QMAKE_LIBS_THREAD       = -llibpthread
 QMAKE_LIBS_COMPAT       = 
-QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon -leikcoctl
 
 exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
@@ -127,6 +126,8 @@ QT_ARCH               = symbian
 
 load(qt_config)
 
+QMAKE_LIBS_QT_ENTRY     = -lqtmain$${QT_LIBINFIX}.lib
+
 # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
 QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
 QT_IMPORTS_BASE_DIR = /resource/qt/imports
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 0564e9b..348c366 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -3,9 +3,6 @@ load(default_post)
 contains(TEMPLATE, ".*app") {
     contains(CONFIG, stdbinary) {
         QMAKE_LIBS +=
-    } else:contains(QT, gui):contains(CONFIG,qt) {
-        S60MAIN_LIBS = -leuser
-        QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
     } else {
         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     }
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 1a51cb2..20bc3a3 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -187,26 +187,16 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
     linux-armcc: {
         QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
         QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
-        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
-            QMAKE_LIBS -= -lqtmain$${QT_LIBINFIX}.lib
-            QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib
-        } else {
-            QMAKE_LIBS -= -llibcrt0.lib
-            QMAKE_LIBS += -llibcrt0.lib
-        }
+        QMAKE_LIBS -= $$QMAKE_LIBS_QT_ENTRY
+        QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     } else :linux-gcce {
         # notice that we can't merge these as ordering of arguments is important.
         QMAKE_LIBS += \
             -l:eexe.lib \
             -l:usrt2_2.lib
-        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
-            QMAKE_LIBS -= -l:qtmain$${QT_LIBINFIX}.lib
-            QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib
-        } else {
-            QMAKE_LIBS -= -l:libcrt0.lib
-            QMAKE_LIBS -= -l:libcrt0_gcce.lib
-            QMAKE_LIBS += -l:libcrt0_gcce.lib
-        }
+        modified_entry = $$replace(QMAKE_LIBS_QT_ENTRY, "^-l", "-l:")
+        QMAKE_LIBS -= $$modified_entry
+        QMAKE_LIBS += $$modified_entry
         QMAKE_LIBS += \
             -l:dfpaeabi.dso \
             -l:drtaeabi.dso \
-- 
cgit v0.12


From 828003fb654f33de52585883ed5e7441f925af75 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 4 Nov 2010 13:28:42 +0100
Subject: Doc: Removed note about some Qt classes working without an
 application.

The QString example turned out to be a poor one because it requires
an application instance in cases where text codecs need to be set up
for the user's locale.
---
 src/corelib/kernel/qcoreapplication.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index d3f399b..5598187 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -406,11 +406,10 @@ QString qAppName()
     operations can call processEvents() to keep the application
     responsive.
 
-    Some Qt classes, such as QString, can be used without a
-    QCoreApplication object. However, in general, we recommend that
-    you create a QCoreApplication or a QApplication object in your \c
-    main() function as early as possible. exit() will not return
-    until the event loop exits; e.g., when quit() is called.
+    In general, we recommend that you create a QCoreApplication or
+    a QApplication object in your \c main() function as early as
+    possible. exit() will not return until the event loop exits;
+    e.g., when quit() is called.
 
     Several static convenience functions are also provided. The
     QCoreApplication object is available from instance(). Events can
-- 
cgit v0.12


From e6150729cba24fb50195606666105e8962b52a3a Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 4 Nov 2010 13:42:37 +0100
Subject: Doc: Attempt to document content handling in Flickable.

Reviewed-by: Alan Alpert
---
 .../graphicsitems/qdeclarativeflickable.cpp         | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index b737785..a88fc2b 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1182,19 +1182,18 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b)
     \qmlproperty real Flickable::contentWidth
     \qmlproperty real Flickable::contentHeight
 
-    The dimensions of the content (the surface controlled by Flickable). Typically this
-    should be set to the combined size of the items placed in the Flickable. Note this
-    can be set automatically using \l {Item::childrenRect.width}{childrenRect.width}
-    and \l {Item::childrenRect.height}{childrenRect.height}. For example:
+    The dimensions of the content (the surface controlled by Flickable).
+    This should typically be set to the combined size of the items placed in the
+    Flickable.
 
-    \code
-    Flickable {
-        width: 320; height: 480
-        contentWidth: childrenRect.width; contentHeight: childrenRect.height
+    The following snippet shows how these properties are used to display
+    an image that is larger than the Flickable item itself:
 
-        Image { id: image; source: "bigImage.png" }
-    }
-    \endcode
+    \snippet doc/src/snippets/declarative/flickable.qml document
+
+    In some cases, the the content dimensions can be automatically set
+    using the \l {Item::childrenRect.width}{childrenRect.width}
+    and \l {Item::childrenRect.height}{childrenRect.height} properties.
 */
 qreal QDeclarativeFlickable::contentWidth() const
 {
-- 
cgit v0.12


From 018c0ebc7d7ffaa55bf5a80b2a8a0e3ee1ebcc7b Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Thu, 4 Nov 2010 13:49:43 +0100
Subject: Prevent excessive seeks in xbm detection

When auto-detecting an image type, the xbm handler would read
the entire file just to figure out that it's not an xbm. This patch
limits the read to maximum 4k and also breaks if line length >= 299.

Task-number: QT-4021
Reviewed-by: Robert Griebl
---
 src/gui/image/qxbmhandler.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index 0dd4e99..f9c2e0c 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -66,27 +66,36 @@ static inline int hex2byte(register char *p)
 static bool read_xbm_header(QIODevice *device, int& w, int& h)
 {
     const int buflen = 300;
+    const int maxlen = 4096;
     char buf[buflen + 1];
     QRegExp r1(QLatin1String("^#define[ \t]+[a-zA-Z0-9._]+[ \t]+"));
     QRegExp r2(QLatin1String("[0-9]+"));
 
     qint64 readBytes = 0;
+    qint64 totalReadBytes = 0;
 
-    // "#define .._width <num>"
-    readBytes = device->readLine(buf, buflen);
-    if (readBytes <= 0)
-	return false;
-    buf[readBytes - 1] = '\0';
+    buf[0] = '\0';
 
     // skip initial comment, if any
-    while (buf[0] != '#' && (readBytes = device->readLine( buf, buflen )) > 0) {}
+    while (buf[0] != '#') {
+        readBytes = device->readLine(buf, buflen);
+
+        // if readBytes >= buflen, it's very probably not a C file
+        if (readBytes <= 0 || readBytes >= buflen -1)
+            return false;
+
+        // limit xbm headers to the first 4k in the file to prevent
+        // excessive reads on non-xbm files
+        totalReadBytes += readBytes;
+        if (totalReadBytes >= maxlen)
+            return false;
+    }
 
-    if (readBytes <= 0)
-	return false;
     buf[readBytes - 1] = '\0';
     QString sbuf;
     sbuf = QString::fromLatin1(buf);
 
+    // "#define .._width <num>"
     if (r1.indexIn(sbuf) == 0 &&
          r2.indexIn(sbuf, r1.matchedLength()) == r1.matchedLength())
         w = QByteArray(&buf[r1.matchedLength()]).trimmed().toInt();
-- 
cgit v0.12


From 7151ff10f7e2d3b8e92e9cfec8d5c8655bf21525 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 4 Nov 2010 13:59:42 +0100
Subject: qdoc: Remove leading QML: text from certain node names.

Reviewed-by: Martin Smith
---
 tools/qdoc3/htmlgenerator.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index fb04175..1b89e97 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -3719,7 +3719,11 @@ void HtmlGenerator::findAllClasses(const InnerNode *node)
                      (*c)->subType() == Node::QmlClass &&
                      !(*c)->doc().isEmpty()) {
                 QString qmlClassName = (*c)->name();
-                qmlClasses.insert(qmlClassName,*c);
+                // Remove the "QML:" prefix if present.
+                if (qmlClassName.startsWith(QLatin1String("QML:")))
+                    qmlClasses.insert(qmlClassName.mid(4),*c);
+                else
+                    qmlClasses.insert(qmlClassName,*c);
             }
             else if ((*c)->isInnerNode()) {
                 findAllClasses(static_cast<InnerNode *>(*c));
-- 
cgit v0.12


From 5a79d8e83d1f62e365e179b84fa7be1112eb8a52 Mon Sep 17 00:00:00 2001
From: Janne Koskinen <janne.p.koskinen@digia.com>
Date: Thu, 4 Nov 2010 14:47:20 +0200
Subject: Wordwrap QInputDialog label in Symbian

Enable wordwrapping for QInputDialog in Symbian to allow longer texts to
be displayed without cutting them off. Fixes issue with javascript
prompt not showing long texts.

Task-number: QT-4008
Reviewed-by: Sami Merila
---
 src/gui/dialogs/qinputdialog.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index abaaa49..ce27bd3 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -561,6 +561,9 @@ void QInputDialog::setLabelText(const QString &text)
     } else {
         d->label->setText(text);
     }
+#ifdef Q_OS_SYMBIAN
+    d->label->setWordWrap(true);
+#endif
 }
 
 QString QInputDialog::labelText() const
-- 
cgit v0.12


From 990a19f9e19b84a896f55ea580e6db4edbca2573 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Thu, 4 Nov 2010 14:17:03 +0100
Subject: Doc: adding html clasnames to the next and previous links

Reviewed-by: David Boddie
---
 tools/qdoc3/htmlgenerator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index fb04175..82cafa0 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1930,7 +1930,7 @@ void HtmlGenerator::generateHeader(const QString& title,
     }
 
     if (node && !node->links().empty())
-        out() << "<p>\n" << navigationLinks << "</p><p/>\n";
+        out() << "<p class=\"naviNextPrevious headerNavi\">\n" << navigationLinks << "</p><p/>\n";
 }
 
 void HtmlGenerator::generateTitle(const QString& title,
@@ -1955,7 +1955,7 @@ void HtmlGenerator::generateTitle(const QString& title,
 void HtmlGenerator::generateFooter(const Node *node)
 {
     if (node && !node->links().empty())
-        out() << "<p>\n" << navigationLinks << "</p>\n";
+        out() << "<p class=\"naviNextPrevious footerNavi\">\n" << navigationLinks << "</p>\n";
 
     out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
           << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
-- 
cgit v0.12


From 440888de851daad78d89f2958aa95e9193832fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Topi=20Reini=C3=B6?= <topi.reinio@nokia.com>
Date: Thu, 4 Nov 2010 14:20:02 +0100
Subject: Prevent access to non-existent memory in QGL2PEXVertexArray

QGL2PEXVertexArray::addClosingLine() uses using QDataBuffer::add() to
add a QPointF at the end, with a const reference to another value in
the same array. As add() resizes and possibly relocates the buffer, an
already-released memory location may be accessed.

This change copies the value into a temporary variable before resizing
the array.

Task-number: QTBUG-14944
Reviewed-by: Samuel
---
 src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
index 559a6fd..167a7d2 100644
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
+++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
@@ -63,8 +63,9 @@ QGLRect QGL2PEXVertexArray::boundingRect() const
 
 void QGL2PEXVertexArray::addClosingLine(int index)
 {
-    if (QPointF(vertexArray.at(index)) != QPointF(vertexArray.last()))
-        vertexArray.add(vertexArray.at(index));
+    QPointF point(vertexArray.at(index));
+    if (point != QPointF(vertexArray.last()))
+        vertexArray.add(point);
 }
 
 void QGL2PEXVertexArray::addCentroid(const QVectorPath &path, int subPathIndex)
-- 
cgit v0.12


From a52f572d513e2002e442769a46664009f45bc74a Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Thu, 4 Nov 2010 15:27:39 +0200
Subject: Remove code changes that were NOT intended as part of the fix

For some unknown reasons (read: missed git checkout -f), few code line
changes which were NOT part of fix for QTBUG-14331 crept into the
commit. These are now removed with this fix.

Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
---
 src/gui/styles/qs60style.cpp | 18 ------------------
 src/gui/styles/qs60style_p.h |  1 -
 2 files changed, 19 deletions(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 53ca28c..f3fb2f5 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -112,8 +112,6 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** End of generated data ***
 };
 
-QSet<const QWidget *> *QS60StylePrivate::m_autoFillDisabledWidgets = 0;
-
 const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0];
 
 // theme background texture
@@ -154,8 +152,6 @@ const double KTabFontMul = 0.72;
 
 QS60StylePrivate::~QS60StylePrivate()
 {
-    delete m_autoFillDisabledWidgets;
-    m_autoFillDisabledWidgets = 0;
     clearCaches(); //deletes also background image
     deleteThemePalette();
 #ifdef Q_WS_S60
@@ -3188,13 +3184,6 @@ void QS60Style::polish(QWidget *widget)
     }
     d->setThemePalette(widget);
     d->setFont(widget);
-    
-    if (widget->autoFillBackground()) {
-        if (!d->m_autoFillDisabledWidgets)
-            d->m_autoFillDisabledWidgets = new QSet<const QWidget *>;
-        widget->setAutoFillBackground(false);
-        d->m_autoFillDisabledWidgets->insert(widget);
-    }
 }
 
 /*!
@@ -3229,13 +3218,6 @@ void QS60Style::unpolish(QWidget *widget)
 
     if (widget)
         widget->setPalette(QPalette());
-    
-    if (d->m_autoFillDisabledWidgets &&
-	    !d->m_autoFillDisabledWidgets->isEmpty() &&
-		d->m_autoFillDisabledWidgets->contains(widget)) {
-        widget->setAutoFillBackground(true);
-        d->m_autoFillDisabledWidgets->remove(widget);
-    }
 
 #if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR)
     if (QProgressBar *bar = qobject_cast<QProgressBar *>(widget)) {
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 3d66c40..b46f75e 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -625,7 +625,6 @@ private:
     static qint64 m_webPaletteKey;
 
     static QPointer<QWidget> m_pressedWidget;
-    static QSet<const QWidget *> *m_autoFillDisabledWidgets;
 
 #ifdef Q_WS_S60
     //list of progress bars having animation running
-- 
cgit v0.12


From 81fd236d0fa4d66ac288c450c7993acec110b8f6 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Thu, 4 Nov 2010 14:49:44 +0100
Subject: Doc: reintroducing QML elements table temporarily

---
 doc/src/declarative/elements.qdoc | 106 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 2 deletions(-)

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index a0eb95d..54f07a2 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -37,8 +37,110 @@
   To see the QML elements listed by functional area, see the
   \l{Groups Of Related QML Elements} page.
 
-  \generatelist qmlclasses
-
+	\table 
+	\header \o {2,1} \bold {Basic Visual Items}
+	\row \o \l {Item} \o Basic item element inherited by all visual items in QML
+	\row \o \l {Rectangle} \o Basic visual rectangle element
+	\row \o \l {Gradient} \o Defines a gradient between two or more colors
+	\row \o \l {GradientStop} \o Defines a color used in a \l {Gradient}
+	\row \o \l {Image} \o Allows the use of bitmaps to a scene
+	\row \o \l {BorderImage} (Item-specific) \o Defines an image as a border
+	\row \o \l {AnimatedImage} \o For playing animations stored as a series of frames
+	\row \o \l {Text} \o Allows the use of formatted text in a scene
+	\row \o \l {TextInput} \o Displays an editable line of text
+	\row \o \l {IntValidator} \o Validator for integer values
+	\row \o \l {DoubleValidator} \o Validator for non-integer values
+	\row \o \l {RegExpValidator} \o Validator for string regular expressions
+	\row \o \l {TextEdit} \o Displays multiple lines of editable formatted text
+
+	\header \o {2,1} \bold {Basic Interaction Items}
+	\row \o \l {MouseArea} \o Handles mouse interactions
+	\row \o \l {FocusScope} \o For keyboard focus handling 
+	\row \o \l {Flickable} \o Provides a surface that can be "flicked"  
+	\row \o \l {Flipable} \o Provides a surface that produces flipping effects
+	\row \o \l {GestureArea} (experimental) \o Enables simple gesture handling
+	 
+	\header \o {2,1} \bold {States}
+	\row \o \l {State} \o Defines sets of configurations of objects and properties
+	\row \o \l {PropertyChanges} \o Describes property changes within a state
+	\row \o \l {StateGroup} \o Contains a set of states and state transitions
+	\row \o \l {StateChangeScript} \o Allows script binding in a state
+	\row \o \l {ParentChange} (Item-specific) \o Re-parent an Item in a state change
+	\row \o \l {AnchorChanges} \o Change the anchors of an item in a state
+
+	\header \o {2,1} \bold {Animation and Transitions}
+	\row \o \l {Behavior} \o Specifies a default animation for property changes
+	\row \o \l {SequentialAnimation} \o Runs animations sequentially
+	\row \o \l {ParallelAnimation} \o Runs animations in parallel
+	\row \o \l {PropertyAnimation} \o Animates property changes
+	\row \o \l {NumberAnimation} \o Animates properties of type qreal
+	\row \o \l {Vector3dAnimation} \o Animates properties of type QVector3d
+	\row \o \l {ColorAnimation} \o Animates color changes
+	\row \o \l {RotationAnimation} \o Animates rotations
+	\row \o \l {ParentAnimation} \o Animates parent changes
+	\row \o \l {AnchorAnimation} \o Animates anchor changes
+	\row \o \l {PauseAnimation} \o Pauses an animation 
+	\row \o \l {SmoothedAnimation} \o Allows a property to smoothly track a value
+	\row \o \l {SpringAnimation} \o Allows a property to track a value in a spring-like motion
+	\row \o \l {PropertyAction} \o Sets immediate property changes during animation
+	\row \o \l {ScriptAction} \o Runs scripts during an animation
+	\row \o \l {Transition} \o Animates transitions during state changes
+
+	\header \o {2,1} \bold {Working with Data}
+	\row \o \l {Binding} \o Binds any value to any property
+	\row \o \l {ListModel} \o Defines a list of data
+	\row \o \l {ListElement} \o Defines a data item in a \l {ListModel}
+	\row \o \l {VisualItemModel} \o Contains items that already defines its own visual delegate
+	\row \o \l {VisualDataModel} \o Encapsulates a model and a delegate
+	\row \o \l {Package} \o Collection that enables sharing of items within different views
+	\row \o \l {XmlListModel} \o Specifies a model using XPath expressions 
+	\row \o \l {XmlRole}  \o Specifies a role for an \l {XmlListModel}
+
+	\header \o {2,1} \bold {Views}
+	\row \o \l {ListView} \o Provides a list visualization of a model
+	\row \o \l {GridView} \o Provides a grid visualization of a model
+	\row \o \l {PathView} \o Visualizes a model's contents along a path
+	\row \o \l {Path} \o Defines a path used by \l {PathView}
+	\row \o \l {PathLine}  \o Defines a line in \l {Path}
+	\row \o \l {PathQuad}  \o Defines a quadratic Bezier curve in a \l {Path}
+	\row \o \l {PathCubic}  \o Defines a cubic Bezier curve in a \l {Path}
+	\row \o \l {PathAttribute}  \o Allows the setting of attributes along a \l {Path}
+	\row \o \l {PathPercent}  \o Modifies the item distribution along a \l {Path}
+	\row \o \l {WebView} \o Allows the addition of web content to a canvas
+
+	\header \o {2,1} \bold {Positioners}
+	\row \o \l {Column} \o Arranges its children vertically
+	\row \o \l {Row} \o Arranges its children horizontally
+	\row \o \l {Grid} \o Positions its children in a grid
+	\row \o \l {Flow} \o Positions its children with wrapping support
+
+	\header \o {2,1} \bold {Utility}
+	\row \o \l {Connections} \o Explicitly connects signals and signal handlers
+	\row \o \l {Component} \o Encapsulate QML items as a component
+	\row \o \l {Timer} \o Provides timed triggers 
+	\row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property
+	\row \o \l {QML:Qt} {Qt} \o The QML global Qt object provides useful enums and functions from Qt.
+	\row \o \l {WorkerScript} \o Enables the use of threads in QML
+	\row \o \l {Loader} \o Controls the loading of items or components
+	\row \o \l {Repeater} \o Uses a model to create multiples of components
+	\row \o \l {SystemPalette} \o Provides access to the Qt palettes
+	\row \o \l {FontLoader} \o Loads fonts by name or URL
+	\row \o \l {LayoutItem} \o Allows declarative UI elements inside Qt's Graphics View layouts 
+
+	\header \o {2,1} \bold {Transforms}
+	\row \o \l {Scale} \o Assigns item scaling behaviors
+	\row \o \l {Rotation} \o Assigns item rotation behaviors
+	\row \o \l {Translate} \o Assigns item translation behaviors
+
+	\header \o {2,1} \bold {Effects}
+	\row \o \l {Particles} (experimental) \o Generates and animates particles
+	\row \o \l {ParticleMotionLinear} \o Adds linear motion behavior to \l {Particles}
+	\row \o \l {ParticleMotionGravity} \o Adds gravitational motion to \l {Particles}
+	\row \o \l {ParticleMotionWander} \o Adds varied motions to \l {Particles}
+	\endtable
+	  
+  
+  
 */
 
 
-- 
cgit v0.12


From 6bf640a7600132c02742a2581402e04f75b60962 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Thu, 4 Nov 2010 15:24:32 +0100
Subject: QNAM HTTP: Download last chunk properly when readBufferSize() limited

Task-number: QTBUG-13431
Task-number: QTBUG-6276
Reviewed-by: ogoffart
---
 src/network/access/qhttpnetworkconnectionchannel.cpp | 5 +++--
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp       | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 4e5de53..02daa50 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -412,7 +412,9 @@ void QHttpNetworkConnectionChannel::_q_receiveReply()
         }
         case QHttpNetworkReplyPrivate::ReadingDataState: {
            QHttpNetworkReplyPrivate *replyPrivate = reply->d_func();
-           if (replyPrivate->downstreamLimited && !replyPrivate->responseData.isEmpty() && replyPrivate->shouldEmitSignals()) {
+           if (socket->state() == QAbstractSocket::ConnectedState &&
+               replyPrivate->downstreamLimited && !replyPrivate->responseData.isEmpty() && replyPrivate->shouldEmitSignals()) {
+               // (only do the following when still connected, not when we have already been disconnected and there is still data)
                // We already have some HTTP body data. We don't read more from the socket until
                // this is fetched by QHttpNetworkAccessHttpBackend. If we would read more,
                // we could not limit our read buffer usage.
@@ -421,7 +423,6 @@ void QHttpNetworkConnectionChannel::_q_receiveReply()
                // to the read buffer maximum size, but we don't care since they should be small.
                return;
            }
-
             if (!replyPrivate->isChunked() && !replyPrivate->autoDecompress
                 && replyPrivate->bodyLength > 0) {
                 // bulk files like images should fulfill these properties and
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 8850e6e..d21428b 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -3457,11 +3457,11 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp_data()
 {
     QTest::addColumn<bool>("https");
     QTest::addColumn<int>("bufferSize");
-    QTest::newRow("http, no limit") << false << 0;
-    QTest::newRow("http, limited") << false << 4096;
+    QTest::newRow("http+unlimited") << false << 0;
+    QTest::newRow("http+limited") << false << 4096;
 #ifndef QT_NO_OPENSSL
-    QTest::newRow("https, no limit") << true << 0;
-    QTest::newRow("https, limited") << true << 4096;
+    QTest::newRow("https+unlimited") << true << 0;
+    QTest::newRow("https+limited") << true << 4096;
 #endif
 }
 
@@ -3534,6 +3534,7 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp()
         const int allowedDeviation = 16; // TODO find out why the send rate is 13% faster currently
         const int minRate = rate * 1024 * (100-allowedDeviation) / 100;
         const int maxRate = rate * 1024 * (100+allowedDeviation) / 100;
+        qDebug() << minRate << "<="<< server.transferRate << "<=" << maxRate << "?";
         QVERIFY(server.transferRate >= minRate);
         QVERIFY(server.transferRate <= maxRate);
     }
-- 
cgit v0.12


From f9aa09a43e38ad79d0cb19576d7e136db51d6b15 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 4 Nov 2010 15:52:42 +0100
Subject: Doc: Added more hints for building Qt for Symbian on Linux.

Initial-review-and-suggestions-by: axis
---
 doc/src/getting-started/installation.qdoc       | 263 ++++++++++++++----------
 doc/src/snippets/code/doc_src_installation.qdoc |  13 ++
 2 files changed, 163 insertions(+), 113 deletions(-)

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 8f6f16a..a68310c 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -697,187 +697,224 @@ the Symbian platform from scratch, using Linux as the build host.
 Qt for Symbian binaries can be downloaded directly so development of
 applications using Qt for Symbian can start right away.
 
-\section1 Step 1:  Setup the development environment
+\section1 Step 1: Setup the Development Environment
+
+Qt for the Symbian platform has some requirements on the development
+platform. The Symbian SDK for Linux as well as a cross compiler for the ARM
+processor used on Symbian devices should be present on the development 
+machine.
+
+See \l{http://qt.gitorious.org/qt/pages/QtCreatorSymbianLinux} for more details.
+
 
-    Qt for the Symbian platform has some requirements on the development
-    platform. The Symbian SDK for Linux as well as a cross compiler for the ARM
-    processor used on Symbian devices should be present on the development 
-    machine.
-    
-    See \l{http://qt.gitorious.org/qt/pages/QtCreatorSymbianLinux} for more details.
 \section1 Step 2: Unpack the Archive
 
-    Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
-        directory you want Qt installed, e.g. \c{/home/user/qt/%VERSION%}.
+Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
+directory you want Qt installed, e.g. \c{/home/user/qt/%VERSION%}.
+
 
 \section1 Step 3: Set the Environment Variables
 
-    In order to build and use Qt, the \c PATH environment variable needs
-    to be extended to fine Qt tools and also to find the Symbian platform tools:
+In order to build and use Qt, the \c PATH environment variable needs
+to be extended to fine Qt tools and also to find the Symbian platform tools:
 
-    First you need to set the \c EPOCROOT environment variable to point to the 
-    location of your S60 SDK:
+First you need to set the \c EPOCROOT environment variable to point to the 
+location of your S60 SDK:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 36
 
-    Then you can update the PATH variable;
+Then you can update the PATH variable;
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 37
 
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 37
 
 \section1 Step 4: Configure Qt
 
-    To configure Qt for the Symbian platform, do:
+To configure Qt for the Symbian platform, do:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 38
-    to build the libraries using RVCT or
+
+to build the libraries using RVCT or
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 39
-    to build the libraries using GCCE.
+
+to build the libraries using GCCE.
+
 
 \section1 Step 5: Build Qt
 
-    To build Qt for the device, type:
+To build Qt for the device, type:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 40
 
-    Congratulations, Qt is now ready to use.
+Congratulations, Qt is now ready to use.
 
-\section1 Step 6: Building Qt packages for the Device
 
-    To run any application or demo on a real device, you need to install it
-    on the device. To do this you first have to create a a package for the
-    device, containing the libraries:
+\section1 Step 6: Building Qt Packages for the Device
 
-    \bold{Building a Qt package without a certificate}
+To run any application or demo on a real device, you need to install it
+on the device. To do this you first have to create a a package for the
+device, containing the libraries:
 
-            If you have no certificate, build a self signed Qt:
+\bold{Building a Qt package without a certificate}
 
-            \snippet doc/src/snippets/code/doc_src_installation.qdoc 41
+If you have no certificate, build a self signed Qt:
 
-            The Qt libraries are built with "All -Tcb" capability, so that
-            they can support all types of applications. However, these
-            capabilities are automatically lowered if you make a self-signed
-            package.
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 41
 
-    \bold{Building a Qt package with a Symbian developer certificate}
+The Qt libraries are built with "All -Tcb" capability, so that
+they can support all types of applications. However, these
+capabilities are automatically lowered if you make a self-signed
+package.
 
-            If you have a symbian-signed developer certificate, specify the
-            capabilities you can sign for, for example:
+\bold{Building a Qt package with a Symbian developer certificate}
 
-            \snippet doc/src/snippets/code/doc_src_installation.qdoc 42
-   
-    \section2  Installing Qt packages to the device.
+If you have a Symbian-signed developer certificate, specify the
+capabilities you can sign for, for example:
 
-        It is possible to install packages to a phone in Linux by putting
-        the package on the phone memory card and then installing manually
-        from the phone menu. However, this is tedious and will not work
-        on phones without a memory card, so the method recommended by Qt is
-        to use the App TRK tool.
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 42
 
-        \section3 Obtaining the App TRK package.
+\section2 Installing Qt Packages to the Device.
 
-                Download the package from the following location.
+It is possible to install packages to a phone in Linux by putting
+the package on the phone memory card and then installing manually
+from the phone menu. However, this is tedious and will not work
+on phones without a memory card, so the method recommended by Qt is
+to use the App TRK tool.
 
-                \list
-                    \o \l{http://tools.ext.nokia.com/trk/}{Application TRK}.
-                       Choose the correct installation package based on the
-                       S60 version of your device
-                       (\c{S60_<S60-version>_app_trk_<TRK-version>.sisx}).
-                \endlist
+\section3 Obtaining the App TRK package.
 
-                This package currently has to be installed by putting the
-                package on the memory card and installing from the phone
-                menu, or using a Windows PC for doing the install. However,
-                the installation only has to be done once.
+Download the package from the following location.
 
-         \section3 Configuring App TRK on the phone.
+\list
+\o \l{http://tools.ext.nokia.com/trk/}{Application TRK}.
+   Choose the correct installation package based on the
+   S60 version of your device
+   (\c{S60_<S60-version>_app_trk_<TRK-version>.sisx}).
+\endlist
 
-                When App TRK is installed, connect the phone to the PC using
-                the USB cable. Select "PCSuite" as connection type. Then run
-                App TRK on the phone, and make sure that the connection type is
-                USB. This can be changed under
-                the \c Settings menu entry. If necessary, choose \c Connect
-                from the menu.
+This package currently has to be installed by putting the
+package on the memory card and installing from the phone
+menu, or using a Windows PC for doing the install. However,
+the installation only has to be done once.
 
-         \section3 Configuring the USB serial driver on the Linux system.
+\section3 Configuring App TRK on the Phone
 
-               On Linux, phone should appear as the \c /dev/ttyUSB1 device,
-               however if you are running an old kernel, you may need to
-               force the USB module to be loaded correctly before the device
-               will appear:
+When App TRK is installed, connect the phone to the PC using
+the USB cable. Select "PCSuite" as connection type. Then run
+App TRK on the phone, and make sure that the connection type is
+USB. This can be changed under the \c Settings menu entry.
+If necessary, choose \c Connect from the menu.
 
-               \snippet doc/src/snippets/code/doc_src_installation.qdoc 43
+\section3 Configuring the USB Serial Driver on the Linux System
 
-               Note the identifier on the line where your Symbian device
-               appears. Then execute the following, using the first and
-               second part of the identifier in place of \c XXX,
-               respectively.
+On Linux, phone should appear as the \c /dev/ttyUSB1 device,
+however if you are running an old kernel, you may need to
+force the USB module to be loaded correctly before the device
+will appear:
 
-               \snippet doc/src/snippets/code/doc_src_installation.qdoc 44
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 43
 
-               The \c rmmod step may fail if the module is not already
-               loaded, but that is harmless.
+Note the identifier on the line where your Symbian device
+appears. Then execute the following, using the first and
+second part of the identifier in place of \c XXX,
+respectively.
 
-          \section3 Building the \c runonphone tool.
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 44
 
-               Note that building the \c runonphone tool requires a separate
-               installation of Qt for Linux. If there is a version of Qt
-               installed by your distribution's package mechanism, that that
-               should do fine. Some distributions separate the libraries from
-               the development setup which includes qmake. Make sure you have
-               both installed.
+The \c rmmod step may fail if the module is not already
+loaded, but that is harmless.
 
-               First make sure that the \c qmake you use is taken from the
-               Linux installation of Qt. The easiest way to make sure of this
-               is to open a new shell and run the following command:
+\section3 Building the runonphone Tool.
 
-               \snippet doc/src/snippets/code/doc_src_installation.qdoc 45
+Note that building the \c runonphone tool requires a separate
+installation of Qt for Linux. If there is a version of Qt
+installed by your distribution's package mechanism, that that
+should do fine. Some distributions separate the libraries from
+the development setup which includes \c qmake. Make sure you
+have both installed.
 
-               \c qmake will tell you where it is installed.
+You will also need the \l{libusb} libraries and header files
+installed. Usually, installing a development package such as
+\c{libusb-dev} will ensure that you have all the necessary
+dependencies installed.
 
-               Copy the \c{%QTDIR%/tools/runonphone} folder to a place outside
-               of the Qt tree. Then go to the folder in a shell and build it:
+First, make sure that the \c qmake you use is taken from the
+Linux installation of Qt. The easiest way to make sure of this
+is to open a new shell and run the following command:
 
-               \snippet doc/src/snippets/code/doc_src_installation.qdoc 46
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 45
 
-               Copy the resulting executable to a folder which is in your
-               \c PATH environment variable.
+\c qmake will tell you where it is installed.
 
-           \section3 Installing the built package onto the phone.
+Copy the \c{%QTDIR%/tools/runonphone} folder to a place outside
+of the Qt tree. Then go to the folder in a shell and build it:
 
-               Return to the root of the Qt tree configured for Symbian. Then
-               install the Qt libraries by running the following:
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 46
 
-               \snippet doc/src/snippets/code/doc_src_installation.qdoc 47
+Copy the resulting executable to a folder which is in your
+\c PATH environment variable.
 
-               \note If the installation fails, please make sure that there is
-                     no previously installed version of Qt on the phone.
+\section3 Installing the Built Package onto the Phone
 
-               Qt requires some dependent packages to be installed on the device,
-               they are shipped in the Symbian SDK and can be installed using the
-               runonphone tool as well.
-               The packages can be found in the EPOCROOT at the following locations;
+\note Before starting, please make sure that there is no previously
+installed version of Qt on the phone.
 
-               \snippet doc/src/snippets/code/doc_src_installation.qdoc 50
+Return to the root of the Qt tree configured for Symbian. Then
+install the Qt libraries by running the following:
 
-\section1 Running Qt demos
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 47
 
-        We've included a subset of the Qt demos in this package for you
-        to try out. An excellent starting point is the "fluidlauncher"
-        demo.
+You may need to supply the path of the serial device file using
+the \c{-p} option:
 
-        Install and run the demo by using the following commands:
+\snippet doc/src/snippets/code/doc_src_installation.qdoc runonphone with device file path
 
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 48
+If the installation fails, please make sure that there is
+no previously installed version of Qt on the phone.
 
-        The same command can be used for other applications:
+Qt requires some dependent packages to be installed on the device,
+they are shipped in the Symbian SDK and can be installed using the
+runonphone tool as well.
+The packages can be found in the EPOCROOT at the following locations;
 
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 49
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 50
 
-        For more information about building and running Qt programs on the
-        Symbian platform, see \l{The Symbian platform - Introduction to Qt}.
+It is also possible to install packages onto the device using the
+\c runonphone build rule that \c qmake automatically generates for
+each Qt project. Options can be supplied to the \c runonphone tool
+that is invoked begind the scenes:
 
-    We hope you will enjoy using Qt.
+\snippet doc/src/snippets/code/doc_src_installation.qdoc make runonphone with options
+
+If you are running \c runonphone or invoking the \c runonphone
+build rule often, it is possible to set the \c QT_RUN_ON_PHONE_OPTIONS
+environment variable with the options you normally use:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc make runonphone with preset environment variable
+
+This makes installation of packages onto a device easier and less
+error-prone.
+
+
+\section1 Running Qt Demos
+
+We've included a subset of the Qt demos in this package for you
+to try out. An excellent starting point is the "fluidlauncher"
+demo.
+
+Install and run the demo by using the following commands:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 48
+
+The same command can be used for other applications:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 49
+
+For more information about building and running Qt programs on the
+Symbian platform, see \l{The Symbian platform - Introduction to Qt}.
+
+We hope you will enjoy using Qt.
 */
 
 /*!
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 0593567..2e59db9 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -301,11 +301,24 @@ make
 runonphone -s lib/Qt.sis
 //! [47]
 
+//! [runonphone with device file path]
+runonphone -s lib/Qt.sis -p /dev/ttyUSB1
+//! [runonphone with device file path]
+
 //! [48]
 cd demos/embedded/fluidlauncher
 runonphone -s fluidlauncher.sis fluidlauncher.exe
 //! [48]
 
+//! [make runonphone with options]
+make runonphone "QT_RUN_ON_PHONE_OPTIONS=-p /dev/ttyUSB1"
+//! [make runonphone with options]
+
+//! [make runonphone with preset environment variable]
+export QT_RUN_ON_PHONE_OPTIONS="-p /dev/ttyUSB1"
+make runonphone
+//! [make runonphone with preset environment variable]
+
 //! [49]
 cd myapp
 qmake
-- 
cgit v0.12


From 688e0e8615330f1a50ef5a601fac2ce8de5af7d6 Mon Sep 17 00:00:00 2001
From: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Date: Thu, 4 Nov 2010 17:21:33 +0100
Subject: Russian translation update

Merge-request: 895
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 translations/assistant_ru.ts | 581 +++++++++++++++++++++++++-
 translations/designer_ru.ts  | 172 +++++---
 translations/linguist_ru.ts  | 955 +++++++++++++++++++++++++++++++++++++++++++
 translations/qt_ru.ts        | 166 +++++---
 translations/qtconfig_ru.ts  |  82 ++--
 translations/qvfb_ru.ts      | 139 +++++++
 6 files changed, 1933 insertions(+), 162 deletions(-)

diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts
index f5ba461..61c8d6c 100644
--- a/translations/assistant_ru.ts
+++ b/translations/assistant_ru.ts
@@ -76,10 +76,6 @@ Reason:
         <translation>Ошибка создания файла коллекции справки &apos;%1&apos;: %2.</translation>
     </message>
     <message>
-        <source>Error reading collection file &apos;%1&apos;: %2</source>
-        <translation>Ошибка чтения файла коллекции справки &apos;%1&apos;: %2</translation>
-    </message>
-    <message>
         <source>Cannot load sqlite database driver!</source>
         <translation>Не удалось загрузить драйвер баз данных sqlite!</translation>
     </message>
@@ -112,6 +108,17 @@ Reason:
     </message>
 </context>
 <context>
+    <name>BookmarkItem</name>
+    <message>
+        <source>New Folder</source>
+        <translation>Новая папка</translation>
+    </message>
+    <message>
+        <source>Untitled</source>
+        <translation>Безымянная</translation>
+    </message>
+</context>
+<context>
     <name>BookmarkManager</name>
     <message>
         <source>Remove</source>
@@ -131,7 +138,7 @@ Reason:
     </message>
     <message>
         <source>Untitled</source>
-        <translation>Неозаглавлено</translation>
+        <translation>Безымянная</translation>
     </message>
     <message>
         <source>Manage Bookmarks...</source>
@@ -329,6 +336,64 @@ Reason:
         <translation>Файл коллекции справки &apos;%1&apos; не существует.</translation>
     </message>
     <message>
+        <source>Usage: assistant [Options]
+
+-collectionFile file       Uses the specified collection
+                           file instead of the default one
+-showUrl url               Shows the document with the
+                           url.
+-enableRemoteControl       Enables Assistant to be
+                           remotely controlled.
+-show widget               Shows the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-activate widget           Activates the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-hide widget               Hides the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-register helpFile         Registers the specified help file
+                           (.qch) in the given collection
+                           file.
+-unregister helpFile       Unregisters the specified help file
+                           (.qch) from the give collection
+                           file.
+-setCurrentFilter filter   Set the filter as the active filter.
+-remove-search-index       Removes the full text search index.
+-rebuild-search-index      Re-builds the full text search index (potentially slow).
+-quiet                     Does not display any error or
+                           status message.
+-help                      Displays this help.
+</source>
+        <translation>Использование: assistant [ОПЦИИ]
+
+-collectionFile файл       Использовать указанный файл коллекции,
+                           вместо стандартного
+-showUrl ссылка            Отобразить документ по ссылке.
+-enableRemoteControl       Включение удалённого управления Assistant.
+-show виджет               Отображение указанного прикрепляемого виджета,
+                           который может быть &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; или &quot;search&quot;.
+-activate виджет           Включение указанного прикрепляемого виджета,
+                           который может быть &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; или &quot;search&quot;.
+-hide виджет               Скрытие указанного прикрепляемого виджета,
+                           который может быть &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; или &quot;search&quot;.
+-register файлСправки      Регистрация указанного файла справки (.qch)
+                           в данном файле коллекции.
+-unregister файлСправки    Отмена регистрации указанного файла
+                           справки (.qch) в данном файле коллекции.
+-setCurrentFilter фильтр   Активация указанного фильтра.
+-remove-search-index       Удаление индекса полнотекстового поиска.
+-rebuild-search-index      Пересоздание индекса полнотекстового поиска
+                           (потенциально медленно).
+-quiet                     Не отображать сообщения об ошибках и состояниях.
+-help                      Показать эту справку.
+</translation>
+    </message>
+    <message>
         <source>Missing collection file.</source>
         <translation>Отсутствует файл коллекции справки.</translation>
     </message>
@@ -377,6 +442,56 @@ Reason:
     </message>
 </context>
 <context>
+    <name>ConversionWizard</name>
+    <message>
+        <source>Help Conversion Wizard</source>
+        <translation>Мастер преобразования справки</translation>
+    </message>
+    <message>
+        <source>Converting %1...</source>
+        <translation>Преобразование %1...</translation>
+    </message>
+    <message>
+        <source>Writing help collection file...</source>
+        <translation>Запись файла коллекции справки...</translation>
+    </message>
+    <message>
+        <source>Done.</source>
+        <translation>Готово.</translation>
+    </message>
+</context>
+<context>
+    <name>FilesPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Files:</source>
+        <translation>Файлы:</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Remove All</source>
+        <translation>Удалить всё</translation>
+    </message>
+    <message>
+        <source>Unreferenced Files</source>
+        <translation>Невостребованные файлы</translation>
+    </message>
+    <message>
+        <source>Remove files which are neither referenced by a keyword nor by the TOC.</source>
+        <translation>Удаление файлов, на которые нет ссылок ни по ключевым словам, ни в содержании.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; When removing images or stylesheets, be aware that those files are not directly referenced by the .adp or .dcf file.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;b&gt;Внимание:&lt;/b&gt; при удалении изображений или таблиц стилей следует убедиться, что на эти файлы напрямую не ссылается файл .adp или .dcf.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>FilterNameDialogClass</name>
     <message>
         <source>Add Filter Name</source>
@@ -388,6 +503,66 @@ Reason:
     </message>
 </context>
 <context>
+    <name>FilterPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Filter attributes for current documentation (comma separated list):</source>
+        <translation>Атрибуты фильтра для текущей документации (список, разделённый запятыми):</translation>
+    </message>
+    <message>
+        <source>Custom Filters</source>
+        <translation>Пользовательские фильтры</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Добавить</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation>Настройки фильтра</translation>
+    </message>
+    <message>
+        <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both the filter attributes and the custom filters are optional.</source>
+        <translation>Укажите атрибуты фильтра для документации. Если атрибуты фильтра используются, также укажите пользовательский фильтр для них. Атрибуты и пользовательский фильтр необязательны.</translation>
+    </message>
+    <message>
+        <source>Filter Name</source>
+        <translation>Название фильтра</translation>
+    </message>
+    <message>
+        <source>Filter Attributes</source>
+        <translation>Атрибуты фильтра</translation>
+    </message>
+    <message>
+        <source>The custom filter &apos;%1&apos; is defined multiple times.</source>
+        <translation>Пользовательский фильтр &quot;%1&quot; определён несколько раз.</translation>
+    </message>
+    <message>
+        <source>The attributes for custom filter &apos;%1&apos; are defined multiple times.</source>
+        <translation>Атрибуты для пользовательского фильтра &quot;%1&quot; определены несколько раз.</translation>
+    </message>
+    <message>
+        <source>unfiltered</source>
+        <comment>list of available documentation</comment>
+        <translation>вся документация</translation>
+    </message>
+</context>
+<context>
     <name>FindWidget</name>
     <message>
         <source>Previous</source>
@@ -407,6 +582,17 @@ Reason:
     </message>
 </context>
 <context>
+    <name>FinishPage</name>
+    <message>
+        <source>Converting File</source>
+        <translation>Преобразование файла</translation>
+    </message>
+    <message>
+        <source>Creating the new Qt help files from the old ADP file.</source>
+        <translation>Создание файлов справки Qt из старых файлов ADP.</translation>
+    </message>
+</context>
+<context>
     <name>FontPanel</name>
     <message>
         <source>Font</source>
@@ -430,6 +616,59 @@ Reason:
     </message>
 </context>
 <context>
+    <name>GeneralPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Namespace:</source>
+        <translation>Пространство имён:</translation>
+    </message>
+    <message>
+        <source>Virtual Folder:</source>
+        <translation>Виртуальный каталог:</translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation>Основные настройки</translation>
+    </message>
+    <message>
+        <source>Specify the namespace and the virtual folder for the documentation.</source>
+        <translation>Укажите пространство имён и виртуальный каталог для документации.</translation>
+    </message>
+    <message>
+        <source>Namespace Error</source>
+        <translation>Ошибка пространства имён</translation>
+    </message>
+    <message>
+        <source>The namespace contains some invalid characters.</source>
+        <translation>Пространство имён содержит недопустимые символы.</translation>
+    </message>
+    <message>
+        <source>Virtual Folder Error</source>
+        <translation>Ошибка виртуального каталога</translation>
+    </message>
+    <message>
+        <source>The virtual folder contains some invalid characters.</source>
+        <translation>Виртуальный каталог содержит недопустимые символы.</translation>
+    </message>
+</context>
+<context>
+    <name>HelpEngineWrapper</name>
+    <message>
+        <source>Unfiltered</source>
+        <translation>Вся документация</translation>
+    </message>
+</context>
+<context>
+    <name>HelpGenerator</name>
+    <message>
+        <source>Warning: %1</source>
+        <translation>Предупреждение: %1</translation>
+    </message>
+</context>
+<context>
     <name>HelpViewer</name>
     <message>
         <source>&lt;title&gt;about:blank&lt;/title&gt;</source>
@@ -453,6 +692,40 @@ Reason:
     </message>
 </context>
 <context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Wizard Assistant&lt;/b&gt;&lt;/center&gt;</source>
+        <translation>&lt;center&gt;&lt;b&gt;Помощь по мастеру преобразования справки&lt;/b&gt;&lt;/center&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>IdentifierPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Create identifiers</source>
+        <translation>Создавать идентификаторы</translation>
+    </message>
+    <message>
+        <source>Global prefix:</source>
+        <translation>Глобальный префикс:</translation>
+    </message>
+    <message>
+        <source>Inherit prefix from file names</source>
+        <translation>Наследовать префикс из имён файлов</translation>
+    </message>
+    <message>
+        <source>Identifiers</source>
+        <translation>Идентификаторы</translation>
+    </message>
+    <message>
+        <source>This page allows you to create identifiers from the keywords found in the .adp or .dcf file.</source>
+        <translation>Данная страница позволяет создавать идентификаторы из ключевых слов найденных в файле .adp или .dcf.</translation>
+    </message>
+</context>
+<context>
     <name>IndexWindow</name>
     <message>
         <source>&amp;Look for:</source>
@@ -468,6 +741,53 @@ Reason:
     </message>
 </context>
 <context>
+    <name>InputPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>File name:</source>
+        <translation>Имя файла:</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Input File</source>
+        <translation>Исходный файл</translation>
+    </message>
+    <message>
+        <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source>
+        <translation>Укажите файл .adp или .dcf, который необходимо преобразовать в формат нового проекта справки Qt или коллекции.</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Открыть файл</translation>
+    </message>
+    <message>
+        <source>Qt Help Files (*.adp *.dcf)</source>
+        <translation>Файлы справки Qt (*.adp *.dcf)</translation>
+    </message>
+    <message>
+        <source>File Open Error</source>
+        <translation>Ошибка открытия файла</translation>
+    </message>
+    <message>
+        <source>The specified file could not be opened!</source>
+        <translation>Не удалось открыть указанный файл!</translation>
+    </message>
+    <message>
+        <source>File Parsing Error</source>
+        <translation>Ошибка обработки файла</translation>
+    </message>
+    <message>
+        <source>Parsing error in line %1!</source>
+        <translation>Возникла ошибка обработки на строке %1!</translation>
+    </message>
+</context>
+<context>
     <name>InstallDialog</name>
     <message>
         <source>Install Documentation</source>
@@ -715,6 +1035,10 @@ Reason:
         <translation>&amp;Закладки</translation>
     </message>
     <message>
+        <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
+        <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Версия %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>Could not register file &apos;%1&apos;: %2</source>
         <translation>Не удалось зарегистрировать файл &apos;%1&apos;: %2</translation>
     </message>
@@ -776,7 +1100,93 @@ Reason:
     </message>
     <message>
         <source>Updating search index</source>
-        <translation>Обновление поискового индекса</translation>
+        <translation>Обновление индекса полнотекстового поиска</translation>
+    </message>
+</context>
+<context>
+    <name>OutputPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Project file name:</source>
+        <translation>Имя файла проекта:</translation>
+    </message>
+    <message>
+        <source>Collection file name:</source>
+        <translation>Имя файла коллекции:</translation>
+    </message>
+    <message>
+        <source>Output File Names</source>
+        <translation>Имена выходных файлов</translation>
+    </message>
+    <message>
+        <source>Specify the file names for the output files.</source>
+        <translation>Укажите имена выходных файлов.</translation>
+    </message>
+    <message>
+        <source>Convert...</source>
+        <translation>Преобразовать...</translation>
+    </message>
+    <message>
+        <source>Qt Help Project File</source>
+        <translation>Файл проекта справки Qt</translation>
+    </message>
+    <message>
+        <source>Qt Help Collection Project File</source>
+        <translation>Файл проекта коллекции справки Qt</translation>
+    </message>
+    <message>
+        <source>The specified file %1 already exist.
+
+Do you want to remove it?</source>
+        <translation>Файл %1 уже существует.
+
+Желаете удалить его?</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+</context>
+<context>
+    <name>PathPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>File filters:</source>
+        <translation>Фильтры файлов:</translation>
+    </message>
+    <message>
+        <source>Documentation source file paths:</source>
+        <translation>Пути к исходным файлам документации:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Добавить</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Source File Paths</source>
+        <translation>Пути к исходным файлам</translation>
+    </message>
+    <message>
+        <source>Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included.</source>
+        <translation>Укажите пути, где расположены исходные файлы. По умолчанию, будут включены все файлы в каталогах, соответствующие фильтру файлов.</translation>
+    </message>
+    <message>
+        <source>Source File Path</source>
+        <translation>Путь к исходному файлу</translation>
     </message>
 </context>
 <context>
@@ -914,6 +1324,165 @@ Reason:
     </message>
 </context>
 <context>
+    <name>QCollectionGenerator</name>
+    <message>
+        <source>Unknown token at line %1.</source>
+        <translation>Неизвестный токен в строке %1.</translation>
+    </message>
+    <message>
+        <source>Unknown token at line %1. Expected &quot;QtHelpCollectionProject&quot;.</source>
+        <translation>Неизвестный токен в строке %1. Ожидался &quot;QtHelpCollectionProject&quot;.</translation>
+    </message>
+    <message>
+        <source>Missing end tags.</source>
+        <translation>Отсутствуют завершающие теги.</translation>
+    </message>
+    <message>
+        <source>Missing input or output file for help file generation.</source>
+        <translation>Отсутствует входной или выходной файл для создания файла справки.</translation>
+    </message>
+    <message>
+        <source>Missing output file name.</source>
+        <translation>Отсутствует имя выходного файла.</translation>
+    </message>
+    <message>
+        <source>Qt Collection Generator version 1.0 (Qt %1)
+</source>
+        <translation>Генератор коллекций Qt версии 1.0 (Qt %1)
+</translation>
+    </message>
+    <message>
+        <source>Missing collection config file.</source>
+        <translation>Отсутствует файл настроек коллекции.</translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qcollectiongenerator &lt;collection-config-file&gt; [options]
+
+  -o &lt;collection-file&gt;   Generates a collection file
+                         called &lt;collection-file&gt;. If
+                         this option is not specified
+                         a default name will be used.
+  -v                     Displays the version of
+                         qcollectiongenerator.
+
+</source>
+        <translation>
+Использование:
+
+qcollectiongenerator &lt;файл-конфигурации-коллекции&gt; [ОПЦИИ]
+
+  -o &lt;файл-коллекции&gt;    Создание файла коллекции с именем
+                         &lt;файл-коллекции&gt;. Если эта опция не указана,
+                         будет использовано имя по умолчанию.
+  -v                     Показать версию qcollectiongenerator.
+
+</translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation>Не удалось открыть %1.</translation>
+    </message>
+    <message>
+        <source>Reading collection config file...
+</source>
+        <translation>Чтение файла конфигурации коллекции...
+</translation>
+    </message>
+    <message>
+        <source>Collection config file error: %1
+</source>
+        <translation>Ошибка файла конфигурации коллекции: %1
+</translation>
+    </message>
+    <message>
+        <source>Generating help for %1...
+</source>
+        <translation>Создание справки для %1...</translation>
+    </message>
+    <message>
+        <source>Creating collection file...
+</source>
+        <translation>Создание файла коллекции...</translation>
+    </message>
+    <message>
+        <source>The file %1 cannot be overwritten.
+</source>
+        <translation>Файл %1 не может быть перезаписан.</translation>
+    </message>
+    <message>
+        <source>Cannot open %1.
+</source>
+        <translation>Не удалось открыть %1.</translation>
+    </message>
+    <message>
+        <source>Cannot open referenced image file %1.
+</source>
+        <translation>Не удалось открыть необходимый файл изображения %1.
+</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpGenerator</name>
+    <message>
+        <source>Missing output file name.</source>
+        <translation>Отсутствует имя выходного файла.</translation>
+    </message>
+    <message>
+        <source>Qt Help Generator version 1.0 (Qt %1)
+</source>
+        <translation>Генератор справки Qt, версия 1.0 (Qt %1)
+</translation>
+    </message>
+    <message>
+        <source>Missing Qt help project file.</source>
+        <translation>Отсутствует файл проекта справки Qt.</translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qhelpgenerator &lt;help-project-file&gt; [options]
+
+  -o &lt;compressed-file&gt;   Generates a Qt compressed help
+                         file called &lt;compressed-file&gt;.
+                         If this option is not specified
+                         a default name will be used.
+  -c                     Checks whether all links in HTML files
+                         point to files in this help project.
+  -v                     Displays the version of 
+                         qhelpgenerator.
+
+</source>
+        <translation>
+Использование:
+
+qhelpgenerator &lt;файл-проекта-справки&gt; [ОПЦИИ]
+
+  -o &lt;сжатый-файл&gt;   Создание сжатого файла справки Qt под именем
+                     &lt;сжатый-файл&gt;. Если эта опция не указана,
+                     будет использоваться имя по умолчанию.
+  -c                 Проверка на то, чтобы все ссылки в файлах
+                     HTML указывали на файлы в этом проекте.
+  -v                 Отображение версии qhelpgenerator.
+
+</translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation>Не удалось открыть %1.</translation>
+    </message>
+    <message>
+        <source>Could not create output directory: %1
+</source>
+        <translation>Не удалось создать каталог: %1</translation>
+    </message>
+</context>
+<context>
     <name>RemoteControl</name>
     <message>
         <source>Debugging Remote Control</source>
diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts
index 89977b1..d6ab18e 100644
--- a/translations/designer_ru.ts
+++ b/translations/designer_ru.ts
@@ -25,6 +25,49 @@
     </message>
 </context>
 <context>
+    <name>AbstractItemEditor</name>
+    <message>
+        <source>Selectable</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Editable</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>DragEnabled</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>DropEnabled</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>UserCheckable</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Tristate</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Unchecked</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>PartiallyChecked</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Checked</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
     <name>AddLinkDialog</name>
     <message>
         <source>Insert Link</source>
@@ -304,7 +347,7 @@
     </message>
     <message>
         <source>Change Z-order of &apos;%1&apos;</source>
-        <translation type="unfinished">Изменить порядок удалённости &apos;%1&apos;</translation>
+        <translation>Изменить порядок удалённости &apos;%1&apos;</translation>
     </message>
     <message>
         <source>Raise &apos;%1&apos;</source>
@@ -324,11 +367,11 @@
     </message>
     <message>
         <source>Promote to custom widget</source>
-        <translation type="unfinished">Преобразовать в пользовательский виджет</translation>
+        <translation>Преобразовать в пользовательский виджет</translation>
     </message>
     <message>
         <source>Demote from custom widget</source>
-        <translation type="unfinished">Преобразовать из пользовательского виджета</translation>
+        <translation>Преобразовать из пользовательского виджета</translation>
     </message>
     <message>
         <source>Lay out using grid</source>
@@ -348,7 +391,7 @@
     </message>
     <message>
         <source>Simplify Grid Layout</source>
-        <translation type="unfinished">Упрощённая компоновка по сетке</translation>
+        <translation>Упрощённая компоновка по сетке</translation>
     </message>
     <message>
         <source>Move Page</source>
@@ -396,7 +439,7 @@
     </message>
     <message>
         <source>Add Dock Window</source>
-        <translation type="unfinished">Добавить прикрепляемое окно</translation>
+        <translation>Добавить прикрепляемое окно</translation>
     </message>
     <message>
         <source>Adjust Size of &apos;%1&apos;</source>
@@ -404,11 +447,11 @@
     </message>
     <message>
         <source>Change Form Layout Item Geometry</source>
-        <translation type="unfinished">Изменить геометрию элементов компоновки столбцами</translation>
+        <translation>Изменить геометрию элемента компоновки столбцами</translation>
     </message>
     <message>
         <source>Change Layout Item Geometry</source>
-        <translation type="unfinished">Изменить геометрию элементов компоновки</translation>
+        <translation>Изменить геометрию элемента компоновки</translation>
     </message>
     <message>
         <source>Delete Subwindow</source>
@@ -653,7 +696,7 @@
     </message>
     <message>
         <source>Promoted Widgets</source>
-        <translation type="unfinished">Преобразованные виджеты</translation>
+        <translation>Преобразованные виджеты</translation>
     </message>
     <message>
         <source>Unable to launch %1.</source>
@@ -777,7 +820,7 @@
     <message>
         <source>Embedded Design</source>
         <extracomment>Tab in preferences dialog</extracomment>
-        <translation type="unfinished">Оформление портативных устройств</translation>
+        <translation>Оформление портативных устройств</translation>
     </message>
     <message>
         <source>Device Profiles</source>
@@ -852,6 +895,7 @@ Parsing grid layout minimum size values</extracomment>
     <name>FormEditorOptionsPage</name>
     <message>
         <source>%1 %</source>
+        <extracomment>Zoom percentage</extracomment>
         <translation>%1 %</translation>
     </message>
     <message>
@@ -876,7 +920,7 @@ Parsing grid layout minimum size values</extracomment>
     <name>FormLayoutRowDialog</name>
     <message>
         <source>Add Form Layout Row</source>
-        <translation type="unfinished">Добавление строки  компоновщика формы</translation>
+        <translation>Добавление строки  компоновщика столбцами (QFormLayout)</translation>
     </message>
     <message>
         <source>&amp;Label text:</source>
@@ -962,7 +1006,7 @@ Parsing grid layout minimum size values</extracomment>
     </message>
     <message>
         <source>Embedded Design</source>
-        <translation type="unfinished">Оформление портативных устройств</translation>
+        <translation>Оформление портативных устройств</translation>
     </message>
 </context>
 <context>
@@ -1131,7 +1175,7 @@ Parsing grid layout minimum size values</extracomment>
     <message>
         <source>Not used</source>
         <extracomment>Usage of promoted widgets</extracomment>
-        <translation>Не используется</translation>
+        <translation>Не используются</translation>
     </message>
 </context>
 <context>
@@ -1205,11 +1249,11 @@ This indicates an inconsistency in the ui-file.</source>
     <name>QAxWidgetTaskMenu</name>
     <message>
         <source>Set Control</source>
-        <translation>Установить элемент управления</translation>
+        <translation>Задать элемент управления</translation>
     </message>
     <message>
         <source>Reset Control</source>
-        <translation type="unfinished">Удалить элемент управления</translation>
+        <translation>Сбросить элемент управления</translation>
     </message>
     <message>
         <source>Licensed Control</source>
@@ -1224,7 +1268,7 @@ This indicates an inconsistency in the ui-file.</source>
     <name>QCoreApplication</name>
     <message>
         <source>%1 is not a promoted class.</source>
-        <translation type="unfinished">%1 не является преобразованным классом.</translation>
+        <translation>%1 не является преобразованным классом.</translation>
     </message>
     <message>
         <source>The base class %1 is invalid.</source>
@@ -1236,7 +1280,7 @@ This indicates an inconsistency in the ui-file.</source>
     </message>
     <message>
         <source>Promoted Widgets</source>
-        <translation type="unfinished">Преобразованные виджеты</translation>
+        <translation>Преобразованные виджеты</translation>
     </message>
     <message>
         <source>The class %1 cannot be removed</source>
@@ -1567,11 +1611,11 @@ Would you like to retry?</source>
     <name>QDesignerAxWidget</name>
     <message>
         <source>Reset control</source>
-        <translation type="unfinished">Сбросить элемент управления</translation>
+        <translation>Сбросить элемент управления</translation>
     </message>
     <message>
         <source>Set control</source>
-        <translation>Установить элемент управления</translation>
+        <translation>Задать элемент управления</translation>
     </message>
     <message>
         <source>Control loaded</source>
@@ -1579,7 +1623,7 @@ Would you like to retry?</source>
     </message>
     <message>
         <source>A COM exception occurred when executing a meta call of type %1, index %2 of &quot;%3&quot;.</source>
-        <translation type="unfinished">Возникло исключение COM при выполнении мета-вызова типа %1, индекс %2 &quot;%3&quot;.</translation>
+        <translation>Возникло исключение COM при выполнении мета-вызова типа %1, индекс %2 в &quot;%3&quot;.</translation>
     </message>
 </context>
 <context>
@@ -1838,7 +1882,7 @@ Container pages should only be added by specifying them in XML returned by the d
     </message>
     <message>
         <source>Backup Information</source>
-        <translation type="unfinished">Информация о резервированых копиях</translation>
+        <translation>Информация о резервных копиях</translation>
     </message>
     <message>
         <source>The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them?</source>
@@ -2232,27 +2276,27 @@ Empty class name passed to widget factory method</extracomment>
     </message>
     <message>
         <source>Linear</source>
-        <translation type="unfinished">Линейный</translation>
+        <translation>Линейный</translation>
     </message>
     <message>
         <source>Radial</source>
-        <translation type="unfinished">Радиальный</translation>
+        <translation>Радиальный</translation>
     </message>
     <message>
         <source>Conical</source>
-        <translation type="unfinished">Конический</translation>
+        <translation>Конический</translation>
     </message>
     <message>
         <source>Pad</source>
-        <translation type="unfinished">Равномерная</translation>
+        <translation>Равномерная</translation>
     </message>
     <message>
         <source>Repeat</source>
-        <translation type="unfinished">Цикличная</translation>
+        <translation>Цикличная</translation>
     </message>
     <message>
         <source>Reflect</source>
-        <translation type="unfinished">Зеркальная</translation>
+        <translation>Зеркальная</translation>
     </message>
     <message>
         <source>Form</source>
@@ -2514,6 +2558,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtLocalePropertyManager</name>
     <message>
+        <source>&lt;Invalid&gt;</source>
+        <translation>&lt;Некорректное значение&gt;</translation>
+    </message>
+    <message>
         <source>%1, %2</source>
         <translation>%1, %2</translation>
     </message>
@@ -2651,7 +2699,7 @@ Do you want to replace it?</source>
     </message>
     <message>
         <source>newPrefix</source>
-        <translation type="unfinished">newPrefix</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; The file&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;is outside of the current resource file&apos;s parent directory.&lt;/p&gt;</source>
@@ -2883,7 +2931,7 @@ to
     <name>QtSizePolicyPropertyManager</name>
     <message>
         <source>&lt;Invalid&gt;</source>
-        <translation>&lt;Неверный&gt;</translation>
+        <translation>&lt;Некорректное значение&gt;</translation>
     </message>
     <message>
         <source>[%1, %2, %3, %4]</source>
@@ -3174,23 +3222,23 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Dock views</source>
-        <translation type="unfinished">Прикрепляемые панели</translation>
+        <translation>Прикрепляемые панели</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished">Файл</translation>
+        <translation>Файл</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished">Правка</translation>
+        <translation>Правка</translation>
     </message>
     <message>
         <source>Tools</source>
-        <translation type="unfinished">Инструменты</translation>
+        <translation>Инструменты</translation>
     </message>
     <message>
         <source>Form</source>
-        <translation type="unfinished">Форма</translation>
+        <translation>Форма</translation>
     </message>
     <message>
         <source>Toolbars</source>
@@ -3220,11 +3268,11 @@ Do you want overwrite the template?</source>
     <name>VideoPlayerTaskMenu</name>
     <message>
         <source>Available Mime Types</source>
-        <translation type="unfinished">Доступные типы данных</translation>
+        <translation>Доступные типы данных</translation>
     </message>
     <message>
         <source>Display supported mime types...</source>
-        <translation type="unfinished">Показывать поддерживаемые типы данных...</translation>
+        <translation>Показать поддерживаемые типы данных...</translation>
     </message>
     <message>
         <source>Load...</source>
@@ -3306,11 +3354,11 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Icon View</source>
-        <translation type="unfinished">Значки</translation>
+        <translation>Значки</translation>
     </message>
     <message>
         <source>Detailed View</source>
-        <translation type="unfinished">Подробно</translation>
+        <translation>Подробно</translation>
     </message>
     <message>
         <source>New action</source>
@@ -3902,7 +3950,7 @@ Do you want overwrite the template?</source>
     <name>qdesigner_internal::FormLayoutMenu</name>
     <message>
         <source>Add form layout row...</source>
-        <translation>Добавить строку компоновщика формы...</translation>
+        <translation>Добавить строку компоновки в 2 столбца...</translation>
     </message>
 </context>
 <context>
@@ -3953,7 +4001,7 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source>
-        <translation type="unfinished">Не удалось вставить виджеты. Qt Designer не смог найти контейнер без компоновщика для вставки виджетов.</translation>
+        <translation>Не удалось вставить виджеты. Qt Designer не смог найти контейнер без компоновщика для вставки виджетов.</translation>
     </message>
     <message>
         <source>Break the layout of the container you want to paste into, select this container and then paste again.</source>
@@ -4083,11 +4131,11 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Lay Out in a &amp;Form Layout</source>
-        <translation>Скомпоновать в &amp;две колонки</translation>
+        <translation>Скомпоновать в &amp;два столбца</translation>
     </message>
     <message>
         <source>Lays out the selected widgets in a form layout</source>
-        <translation>Компонует выделенные виджеты в две колонки (QFormLayout)</translation>
+        <translation>Компонует выделенные виджеты в два столбца (QFormLayout)</translation>
     </message>
     <message>
         <source>Lay Out in a &amp;Grid</source>
@@ -4548,7 +4596,7 @@ Please select another name.</source>
     </message>
     <message>
         <source>Embedded Design</source>
-        <translation type="unfinished">Оформление портативных устройств</translation>
+        <translation>Оформление портативных устройств</translation>
     </message>
     <message>
         <source>Device:</source>
@@ -4567,7 +4615,7 @@ Please select another name.</source>
     </message>
     <message>
         <source>New Promoted Class</source>
-        <translation type="unfinished">Новый преобразованный класс</translation>
+        <translation>Новый преобразованный класс</translation>
     </message>
     <message>
         <source>Base class name:</source>
@@ -4575,7 +4623,7 @@ Please select another name.</source>
     </message>
     <message>
         <source>Promoted class name:</source>
-        <translation type="unfinished">Имя преобразованного класса:</translation>
+        <translation>Имя преобразованного класса:</translation>
     </message>
     <message>
         <source>Header file:</source>
@@ -4644,7 +4692,7 @@ Please select another name.</source>
     </message>
     <message>
         <source>Compute Details</source>
-        <translation type="unfinished">Расчитывать детали</translation>
+        <translation type="unfinished">Рассчитывать детали</translation>
     </message>
     <message>
         <source>Quick</source>
@@ -4671,7 +4719,7 @@ Please select another name.</source>
     <name>qdesigner_internal::PaletteEditorButton</name>
     <message>
         <source>Change Palette</source>
-        <translation type="unfinished">Изменить палитру</translation>
+        <translation>Изменить палитру</translation>
     </message>
 </context>
 <context>
@@ -4742,6 +4790,14 @@ Please select another name.</source>
         <translation>Поиск вновь установленных модулей пользовательских виджетов.</translation>
     </message>
     <message>
+        <source>Loaded Plugins</source>
+        <translation>Загруженные модули</translation>
+    </message>
+    <message>
+        <source>Failed Plugins</source>
+        <translation>Незагруженные модули</translation>
+    </message>
+    <message>
         <source>Qt Designer couldn&apos;t find any plugins</source>
         <translation>Qt Designer не может найти ни одного модуля</translation>
     </message>
@@ -4898,7 +4954,7 @@ ate the goose who was loose.</source>
     </message>
     <message>
         <source>Global include</source>
-        <translation>Глобальное включение</translation>
+        <translation type="unfinished">Глобальное включение</translation>
     </message>
     <message>
         <source>Usage</source>
@@ -4909,11 +4965,11 @@ ate the goose who was loose.</source>
     <name>qdesigner_internal::PromotionTaskMenu</name>
     <message>
         <source>Promoted widgets...</source>
-        <translation type="unfinished">Преобразованные виджеты...</translation>
+        <translation>Преобразованные виджеты...</translation>
     </message>
     <message>
         <source>Promote to ...</source>
-        <translation type="unfinished">Преобразовать в ...</translation>
+        <translation>Преобразовать в ...</translation>
     </message>
     <message>
         <source>Change signals/slots...</source>
@@ -4921,11 +4977,11 @@ ate the goose who was loose.</source>
     </message>
     <message>
         <source>Promote to</source>
-        <translation type="unfinished">Преобразовать в</translation>
+        <translation>Преобразовать в</translation>
     </message>
     <message>
         <source>Demote to %1</source>
-        <translation type="unfinished">Преобразовать в %1</translation>
+        <translation>Преобразовать в %1</translation>
     </message>
 </context>
 <context>
@@ -4988,15 +5044,15 @@ Class: %2</source>
     <name>qdesigner_internal::QDesignerPromotionDialog</name>
     <message>
         <source>Promoted Widgets</source>
-        <translation type="unfinished">Преобразованные виджеты</translation>
+        <translation>Преобразованные виджеты</translation>
     </message>
     <message>
         <source>Promoted Classes</source>
-        <translation type="unfinished">Преобразованные классы</translation>
+        <translation>Преобразованные классы</translation>
     </message>
     <message>
         <source>Promote</source>
-        <translation type="unfinished">Преобразовать</translation>
+        <translation>Преобразовать</translation>
     </message>
     <message>
         <source>Change signals/slots...</source>
@@ -5227,7 +5283,7 @@ Class: %2</source>
     </message>
     <message>
         <source>Source</source>
-        <translation type="unfinished">Исходник</translation>
+        <translation>Исходник</translation>
     </message>
     <message>
         <source>&amp;OK</source>
@@ -5600,7 +5656,7 @@ Class: %2</source>
     </message>
     <message>
         <source>Edit Tree Widget</source>
-        <translation type="unfinished">Изменение виджета Дерево</translation>
+        <translation>Изменение виджета Дерево</translation>
     </message>
     <message>
         <source>&amp;Items</source>
@@ -5681,7 +5737,7 @@ Class: %2</source>
     <name>qdesigner_internal::WidgetBoxTreeWidget</name>
     <message>
         <source>Scratchpad</source>
-        <translation type="unfinished">Блокнот</translation>
+        <translation>Блокнот</translation>
     </message>
     <message>
         <source>Custom Widgets</source>
@@ -5742,7 +5798,7 @@ Class: %2</source>
     </message>
     <message>
         <source>The current page of the container &apos;%1&apos; (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget.</source>
-        <translation type="unfinished">При создании компоновщика не удалось определить текущую страницу контейнера &apos;%1&apos; (%2). Это указывает на некорректность файла ui - возможно, компоновщик был создан для контейнерного виджета.</translation>
+        <translation>При создании компоновщика не удалось определить текущую страницу контейнера &apos;%1&apos; (%2). Это указывает на некорректность файла ui - возможно, компоновщик был создан для виджета контейнерного типа.</translation>
     </message>
     <message>
         <source>Attempt to add a layout to a widget &apos;%1&apos; (%2) which already has an unmanaged layout of type %3.
diff --git a/translations/linguist_ru.ts b/translations/linguist_ru.ts
index 2d06f25..3b448a0 100644
--- a/translations/linguist_ru.ts
+++ b/translations/linguist_ru.ts
@@ -258,6 +258,191 @@ Will assume a single universal form.</source>
     </message>
 </context>
 <context>
+    <name>LConvert</name>
+    <message>
+        <source>
+Usage:
+    lconvert [options] &lt;infile&gt; [&lt;infile&gt;...]
+
+lconvert is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert and filter translation data files.
+The following file formats are supported:
+
+%1
+If multiple input files are specified, they are merged with
+translations from later files taking precedence.
+
+Options:
+    -h
+    --help  Display this information and exit.
+
+    -i &lt;infile&gt;
+    --input-file &lt;infile&gt;
+           Specify input file. Use if &lt;infile&gt; might start with a dash.
+           This option can be used several times to merge inputs.
+           May be &apos;-&apos; (standard input) for use in a pipe.
+
+    -o &lt;outfile&gt;
+    --output-file &lt;outfile&gt;
+           Specify output file. Default is &apos;-&apos; (standard output).
+
+    -if &lt;informat&gt;
+    --input-format &lt;format&gt;
+           Specify input format for subsequent &lt;infile&gt;s.
+           The format is auto-detected from the file name and defaults to &apos;ts&apos;.
+
+    -of &lt;outformat&gt;
+    --output-format &lt;outformat&gt;
+           Specify output format. See -if.
+
+    --input-codec &lt;codec&gt;
+           Specify encoding for QM and PO input files. Default is &apos;Latin1&apos;
+           for QM and &apos;UTF-8&apos; for PO files. UTF-8 is always tried as well for
+           QM, corresponding to the possible use of the trUtf8() function.
+
+    --output-codec &lt;codec&gt;
+           Specify encoding for PO output files. Default is &apos;UTF-8&apos;.
+
+    --drop-tags &lt;regexp&gt;
+           Drop named extra tags when writing TS or XLIFF files.
+           May be specified repeatedly.
+
+    --drop-translations
+           Drop existing translations and reset the status to &apos;unfinished&apos;.
+           Note: this implies --no-obsolete.
+
+    --source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the source strings. Defaults to
+           POSIX if not specified and the file does not name it yet.
+
+    --target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the translation.
+           The target language is guessed from the file name if this option
+           is not specified and the file contents name no language yet.
+
+    --no-obsolete
+           Drop obsolete messages.
+
+    --no-finished
+           Drop finished messages.
+
+    --sort-contexts
+           Sort contexts in output TS file alphabetically.
+
+    --locations {absolute|relative|none}
+           Override how source code references are saved in TS files.
+           Default is absolute.
+
+    --no-ui-lines
+           Drop line numbers from references to UI files.
+
+    --verbose
+           be a bit more verbose
+
+Long options can be specified with only one leading dash, too.
+
+Return value:
+    0 on success
+    1 on command line parse failures
+    2 on read failures
+    3 on write failures
+</source>
+        <translation>
+Использование:
+    lconvert [параметры] &lt;входной файл&gt; [&lt;входной файл&gt;...]
+
+lconvert - это один из инструментов Qt Linguist. Он может быть использован как
+для преобразования файлов переводов, так и для обработки файлов переводов.
+
+Поддерживаются файлы следующих форматов:
+
+%1
+Если задано несколько входных файлов, то они будут объединены, причем, каждый
+последующий файл имеет приоритет над предыдущим.
+
+Параметры:
+    -h
+    --help  Отображение данной справки и выход.
+
+    -i &lt;файл&gt;
+    --input-file &lt;файл&gt;
+           Указание входного файл. Следует использовать, если &lt;входной файл&gt;
+           начинается с дефиса. Этот параметр может быть использован несколько
+           раз для объединения файлов.
+           Допустимо значение &quot;-&quot; (стандартный ввод) для использования каналов.
+
+    -o &lt;файл&gt;
+    --output-file &lt;файл&gt;
+           Указание выходного файла.
+           По умолчанию значение &quot;-&quot; (стандартный вывод).
+
+    -if &lt;формат&gt;
+    --input-format &lt;формат&gt;
+           Указание формата для последующих входных файлов.
+           Формат определяется автоматически из имени файла.
+           По умолчанию предполагается &quot;ts&quot;.
+
+    -of &lt;формат&gt;
+    --output-format &lt;формат&gt;
+           Указание формата выходного файла. См. -if.
+
+    --input-codec &lt;кодировка&gt;
+           Указание кодировки входных файлов QM и PO. По умолчанию,
+           используется &quot;Latin1&quot; для QM и &quot;UTF-8&quot; для PO файлов. Так же UTF-8
+           всегда применяется для QM, где возможно использование
+           функции trUtf8().
+
+    --output-codec &lt;кодировка&gt;
+           Указание кодировки выходных файлов формата PO. По умолчанию &quot;UTF-8&quot;.
+
+    --drop-tags &lt;regexp&gt;
+           Опустить дополнительные теги, соответствующие регулярному выражению
+           regexp, при записи файлов TS или XLIFF.
+           Можно указывать несколько раз.
+
+    --drop-translations
+           Опустить существующие переводы и сбросить их статус в &quot;незавершено&quot;.
+           Включает действие --no-obsolete.
+
+    --source-language &lt;язык&gt;[_&lt;регион&gt;]
+           Задание/изменение языка исходных строк. По умолчанию POSIX, если не
+           указано и файл не содержит язык исходных строк в своём имени.
+
+    --target-language &lt;язык&gt;[_&lt;регион&gt;]
+           Задание/изменение языка переводов.
+           Этот язык определяется из имени файла, если этот параметр не задан
+           или язык не указан внутри файла.
+
+    --no-obsolete
+           Опустить устаревшие переводы.
+
+    --no-finished
+           Опустить завершённые переводы.
+
+    --sort-contexts
+           Упорядочить по алфавиту контекст выходного TS файла.
+
+    --locations {absolute|relative|none}
+           Изменение метода сохранения ссылок на исходные тексты в TS файлах.
+           По умолчанию absolute.
+
+    --no-ui-lines
+           Опустить номера строк в ссылках на UI файлы.
+
+    --verbose
+           Выводить чуть больше информации.
+
+Длинные параметры также можно указывать и с одним дефисом.
+
+Возвращаемые результаты:
+    0 в случае успеха
+    1 в случае ошибки в командной строке
+    2 при ошибке чтения
+    3 при ошибки записи
+</translation>
+    </message>
+</context>
+<context>
     <name>LRelease</name>
     <message numerus="yes">
         <source>Dropped %n message(s) which had no ID.</source>
@@ -291,6 +476,763 @@ Will assume a single universal form.</source>
             <numerusform>    Пропущено %n непереведённых исходных текстов</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Usage:
+    lrelease [options] project-file
+    lrelease [options] ts-files [-qm qm-file]
+
+lrelease is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert XML-based translations files in the TS
+format into the &apos;compiled&apos; QM format used by QTranslator objects.
+
+Options:
+    -help  Display this information and exit
+    -idbased
+           Use IDs instead of source strings for message keying
+    -compress
+           Compress the QM files
+    -nounfinished
+           Do not include unfinished translations
+    -removeidentical
+           If the translated text is the same as
+           the source text, do not include the message
+    -markuntranslated &lt;prefix&gt;
+           If a message has no real translation, use the source text
+           prefixed with the given string instead
+    -silent
+           Do not explain what is being done
+    -version
+           Display the version of lrelease and exit
+</source>
+        <translation>Использование:
+    lrelease [параметры] &lt;файл-проекта&gt;
+    lrelease [параметры] &lt;ts-файлы&gt; [-qm &lt;qm-файлы&gt;]
+
+lrelease - это один из инструментов Qt Linguist. Он может быть использован для
+преобразования переводов, основанных на формате TS в &quot;скомпилированный&quot;
+формат QM, используемый объектами QTranslator.
+
+Параметры:
+    -help
+           Отобразить данную справку и выйти
+    -idbased
+           Использовать ID вместо исходных строк для индексирования сообщений
+    -compress
+           Сжать файл QM
+    -nounfinished
+           Не включать незавершённые переводы
+    -removeidentical
+           Не включать переводы, совпадающие с исходным текстом
+    -markuntranslated &lt;приставка&gt;
+           Если сообщение не имеет перевода, то использовать исходный текст
+           с указанной приставкой
+    -silent
+           Не отчитываться о производимых действиях
+    -version
+           Отобразить текущую версию lrelease и выйти
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: %1</source>
+        <translation>lrelease ошибка: %1</translation>
+    </message>
+    <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation>Обновление &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
+        <source>Removing translations equal to source text in &apos;%1&apos;...
+</source>
+        <translation>Удаление переводов для &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot create &apos;%1&apos;: %2
+</source>
+        <translation>lrelease ошибка: не удалось создать &apos;%1&apos;: %2</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot save &apos;%1&apos;: %2</source>
+        <translation>lrelease ошибка: не удалось сохранить &apos;%1&apos;: %2</translation>
+    </message>
+    <message>
+        <source>lrelease version %1
+</source>
+        <translation>lrelease версия %1
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot read project file &apos;%1&apos;.
+</source>
+        <translation>lrelease ошибка: не удалось прочитать файл проекта &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot process project file &apos;%1&apos;.
+</source>
+        <translation>lrelease ошибка: не удалось обработать файл проекта &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <source>lrelease warning: Met no &apos;TRANSLATIONS&apos; entry in project file &apos;%1&apos;
+</source>
+        <translation>lrelease ошибка: в файле проекта &apos;%1&apos; отсутствует запись &apos;TRANSLATIONS&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>LUpdate</name>
+    <message>
+        <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation>Несовпадение скобок (круглых, квадратных или фигурных) между ветками #if и #else; используется ветка #if
+</translation>
+    </message>
+    <message>
+        <source>Parenthesis/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation>Несовпадение скобок (круглых или фигурных) между ветками #if и #else; используется ветка #if
+</translation>
+    </message>
+    <message>
+        <source>Unterminated C++ comment
+</source>
+        <translation>Незавершённый комментарий C++
+</translation>
+    </message>
+    <message>
+        <source>Unterminated C++ string
+</source>
+        <translation>Незавершённая строка C++
+</translation>
+    </message>
+    <message>
+        <source>Excess closing brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Лишняя закрывающая фигурная скобка в C++ коде (или злоупотребление препроцессором C++)
+</translation>
+    </message>
+    <message>
+        <source>Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Лишняя закрывающая круглая скобка в C++ коде (или злоупотребление препроцессором C++)
+</translation>
+    </message>
+    <message>
+        <source>Excess closing bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Лишняя закрывающая квадратная скобка в C++ коде (или злоупотребление препроцессором C++)
+</translation>
+    </message>
+    <message>
+        <source>circular inclusion of %1
+</source>
+        <translation>цикличное включение %1
+</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2
+</source>
+        <translation>Невозможно открыть %1: %2
+</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with tr() / QT_TR_NOOP(). Ignoring
+</source>
+        <translation>//% не может быть использовано совместно с tr() / QT_TR_NOOP(). Пропускается
+</translation>
+    </message>
+    <message>
+        <source>Qualifying with unknown namespace/class %1::%2
+</source>
+        <translation>Уточнение с неизвестным пространством имён/классом %1::%2
+</translation>
+    </message>
+    <message>
+        <source>tr() cannot be called without context
+</source>
+        <translation>tr() не может быть вызван без контекста
+</translation>
+    </message>
+    <message>
+        <source>Class &apos;%1&apos; lacks Q_OBJECT macro
+</source>
+        <translation>У класса &quot;%1&quot; отсутствует макрос Q_OBJECT
+</translation>
+    </message>
+    <message>
+        <source>It is not recommended to call tr() from within a constructor &apos;%1::%2&apos;
+</source>
+        <translation>Не рекомендуется вызывать tr() в теле конструктора &quot;%1::%2&quot;
+</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring
+</source>
+        <translation>//% не может быть использовано совместно с translate() / QT_TRANSLATE_NOOP(). Пропускается
+</translation>
+    </message>
+    <message>
+        <source>//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring
+</source>
+        <translation>//= не может быть использовано совместно с qtTrId() / QT_TRID_NOOP(). Пропускается
+</translation>
+    </message>
+    <message>
+        <source>Unexpected character in meta string
+</source>
+        <translation>Неожиданный символ в мета-строке
+</translation>
+    </message>
+    <message>
+        <source>Unterminated meta string
+</source>
+        <translation>Незавершённая мета-строка
+</translation>
+    </message>
+    <message>
+        <source>Cannot invoke tr() like this
+</source>
+        <translation>Использование tr() в том виде, как здесь, не допускается
+</translation>
+    </message>
+    <message>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation>Отбрасываются неиспользуемые мета-данные
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Лишняя открывающая фигурная скобка в C++ коде (или злоупотребление препроцессором C++)
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Лишняя открывающая круглая скобка в C++ коде (или злоупотребление препроцессором C++)
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Лишняя открывающая квадратная скобка в C++ коде (или злоупотребление препроцессором C++)
+</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2</source>
+        <translation>Невозможно открыть %1: %2</translation>
+    </message>
+    <message>
+        <source>Unterminated Java comment.
+</source>
+        <translation>Незавершённый комментарий Java.
+</translation>
+    </message>
+    <message>
+        <source>Invalid Unicode value.
+</source>
+        <translation>Неверное значение Unicode.
+</translation>
+    </message>
+    <message>
+        <source>Unterminated string.
+</source>
+        <translation>Незавершённая строка.
+</translation>
+    </message>
+    <message>
+        <source>String used in translation can contain only literals concatenated with other literals, not expressions or numbers.
+</source>
+        <translation>Строка, используемая в переводе, может содержать только строковые литералы (возможно, соединённые с другими литералами), но не выражения или числа.
+</translation>
+    </message>
+    <message>
+        <source>&apos;class&apos; must be followed by a class name.
+</source>
+        <translation>После слова &quot;class&quot; должно идти имя класса.
+</translation>
+    </message>
+    <message>
+        <source>Excess closing brace.
+</source>
+        <translation>Лишняя закрывающая фигурная скобка.
+</translation>
+    </message>
+    <message>
+        <source>&apos;package&apos; must be followed by package name.
+</source>
+        <translation>После слова &quot;package&quot; должно идти имя пакета.
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace.
+</source>
+        <translation>Лишняя открывающая фигурная скобка.
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis.
+</source>
+        <translation>Лишняя открывающая круглая скобка.
+</translation>
+    </message>
+    <message>
+        <source>Usage:
+    lupdate [options] [project-file]...
+    lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
+
+lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
+messages from Qt UI files, C++, Java and JavaScript/QtScript source code.
+Extracted messages are stored in textual translation source files (typically
+Qt TS XML). New and modified messages can be merged into existing TS files.
+
+Options:
+    -help  Display this information and exit.
+    -no-obsolete
+           Drop all obsolete strings.
+    -extensions &lt;ext&gt;[,&lt;ext&gt;]...
+           Process files with the given extensions only.
+           The extension list must be separated with commas, not with whitespace.
+           Default: &apos;%1&apos;.
+    -pluralonly
+           Only include plural form messages.
+    -silent
+           Do not explain what is being done.
+    -no-sort
+           Do not sort contexts in TS files.
+    -no-recursive
+           Do not recursively scan the following directories.
+    -recursive
+           Recursively scan the following directories (default).
+    -I &lt;includepath&gt; or -I&lt;includepath&gt;
+           Additional location to look for include files.
+           May be specified multiple times.
+    -locations {absolute|relative|none}
+           Specify/override how source code references are saved in TS files.
+           Default is absolute.
+    -no-ui-lines
+           Do not record line numbers in references to UI files.
+    -disable-heuristic {sametext|similartext|number}
+           Disable the named merge heuristic. Can be specified multiple times.
+    -pro &lt;filename&gt;
+           Name of a .pro file. Useful for files with .pro file syntax but
+           different file suffix. Projects are recursed into and merged.
+    -source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the source strings for new files.
+           Defaults to POSIX if not specified.
+    -target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the translations for new files.
+           Guessed from the file name if not specified.
+    -ts &lt;ts-file&gt;...
+           Specify the output file(s). This will override the TRANSLATIONS
+           and nullify the CODECFORTR from possibly specified project files.
+    -codecfortr &lt;codec&gt;
+           Specify the codec assumed for tr() calls. Effective only with -ts.
+    -version
+           Display the version of lupdate and exit.
+    @lst-file
+           Read additional file names (one per line) from lst-file.
+</source>
+        <translation>Использование:
+    lupdate [параметры] [файл-проекта]...
+    lupdate [параметры] [исходный-файл|путь|@lst-файл]... -ts ts-файлы|@lst-файл
+
+lupdate - это один из инструментов Qt Linguist. Он извлекает переводимые строки
+из файлов Qt UI, исходных текстов C++, Java и JavaScript/QtScript. Эти строки
+сохраняются в текстовых исходных файлах перевода (обычно, Qt TS XML). Новые
+или изменённые сообщения могут быть добавлены в существующие TS файлы.
+
+Параметры:
+    -help  Отобразить эту информацию и выйти.
+    -no-obsolete
+           Удалить все устаревшие строки.
+    -extensions &lt;ext&gt;[,&lt;ext&gt;]...
+           Обрабатывать файлы, имеющие только указанные расширения.
+           Список расширений должен быть разделён запятыми, а не пробелами.
+           По умолчанию:
+           &quot;%1&quot;.
+    -pluralonly
+           Включать только множественную форму сообщений.
+    -silent
+           Не показывать выполняемые действия.
+    -no-sort
+           Не упорядочивать контекст в TS файлах.
+    -no-recursive
+           Не сканировать каталоги рекурсивно.
+    -recursive
+           Сканировать каталоги рекурсивно (по умолчанию).
+    -I &lt;путь&gt; or -I&lt;путь&gt;
+           Дополнительное расположение подключаемых файлов.
+           Можно указать несколько раз.
+    -locations {absolute|relative|none}
+           Изменение метода сохранения ссылок на исходные тексты в TS файлах.
+           По умолчанию absolute.
+    -no-ui-lines
+           Не сохранять номера строк в ссылках на UI файлы.
+    -disable-heuristic {sametext|similartext|number}
+           Отключить указанный метод объединения:
+           sametext - тот же текст
+           similartext - похожий текст
+           number - числа
+           Может указываться несколько раз.
+    -pro &lt;имя файла&gt;
+           Название .pro файла. Используется для файлов в формате .pro, но
+           имеющих другое расширение. Проекты будут объединены и обработаны
+           рекурсивно.
+    --source-language &lt;язык&gt;[_&lt;регион&gt;]
+           Задание/замена языка исходных строк. По умолчанию, POSIX, если не
+           указано, и файл не содержит его в своём имени.
+    --target-language &lt;язык&gt;[_&lt;регион&gt;]
+           Задание/замена языка переводов.
+           Этот язык определяется из имени файла, если этот параметр не задан
+           или язык не указан внутри файла.
+    -ts &lt;ts-файл&gt;...
+           Указание выходного файла(ов). В этом случае будет заменена
+           переменная TRANSLATIONS и обнулена CODECFORTR в указанном файле
+           проекта.
+    -codecfortr &lt;кодировка&gt;
+           Указание кодировки, применимой к tr().
+           Используется только вместе с -ts.
+    -version
+           Отобразить версию lupdate и выйти.
+    @lst-файл
+           Прочитать дополнительные имена файлов (по одному на строке) из
+           файла lst-файл.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
+</source>
+        <translation>Предупреждение lupdate: Кодировка для tr() &quot;%1&quot; не совпадает с кодировкой существующего файла &quot;%2&quot;. Возможны проблемы.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Specified target language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
+</source>
+        <translation>Предупреждение lupdate: Указанный целевой язык &quot;%1&quot; не совпадает с языком существующего файла &quot;%2&quot;. Пропускается.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Specified source language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
+</source>
+        <translation>Предупреждение lupdate: Указанный исходный язык &quot;%1&quot; не совпадает с языком существующего файла &quot;%2&quot;. Пропускается.
+</translation>
+    </message>
+    <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation>Обновление &quot;%1&quot;...
+</translation>
+    </message>
+    <message>
+        <source>Stripping non plural forms in &apos;%1&apos;...
+</source>
+        <translation>Удаление немножественных форм из &quot;%1&quot;...
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: Codec for source &apos;%1&apos; is invalid. Falling back to codec for tr().
+</source>
+        <translation>Предупреждение lupdate: Некорректная кодировка для исходника &quot;%1&quot;. Используется кодировка для tr().
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: TS files from command line will override TRANSLATIONS in %1.
+</source>
+        <translation>Предупреждение lupdate: TS файлы командной строки заменят TRANSLATIONS в %1.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: TS files from command line prevent recursing into %1.
+</source>
+        <translation>Предупреждение lupdate: TS файлы командной строки отключают рекурсию в %1.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: no TS files specified. Only diagnostics will be produced for &apos;%1&apos;.
+</source>
+        <translation>Предупреждение lupdate: TS файлы не указаны. Будет произведена только диагностика &quot;%1&quot;.
+</translation>
+    </message>
+    <message>
+        <source>The option -target-language requires a parameter.
+</source>
+        <translation>Параметр -target-language требует значение.
+</translation>
+    </message>
+    <message>
+        <source>The option -source-language requires a parameter.
+</source>
+        <translation>Параметр -source-language требует значение.
+</translation>
+    </message>
+    <message>
+        <source>The option -disable-heuristic requires a parameter.
+</source>
+        <translation>Параметр -disable-heuristic требует значение.
+</translation>
+    </message>
+    <message>
+        <source>Invalid heuristic name passed to -disable-heuristic.
+</source>
+        <translation>Неверное имя метода передано в -disable-heuristic.
+</translation>
+    </message>
+    <message>
+        <source>The option -locations requires a parameter.
+</source>
+        <translation>Параметр -locations требует значения.</translation>
+    </message>
+    <message>
+        <source>Invalid parameter passed to -locations.
+</source>
+        <translation>Неверное значение передано в -locations.
+</translation>
+    </message>
+    <message>
+        <source>The -codecfortr option should be followed by a codec name.
+</source>
+        <translation>Параметру -codecfortr требуется название кодировки.
+</translation>
+    </message>
+    <message>
+        <source>The -extensions option should be followed by an extension list.
+</source>
+        <translation>Параметру -extensions требуется список расширений.
+</translation>
+    </message>
+    <message>
+        <source>The -pro option should be followed by a filename of .pro file.
+</source>
+        <translation>Параметру -pro требуется имя .pro файла.
+</translation>
+    </message>
+    <message>
+        <source>The -I option should be followed by a path.
+</source>
+        <translation>Параметру -I требуется путь.
+</translation>
+    </message>
+    <message>
+        <source>Unrecognized option &apos;%1&apos;.
+</source>
+        <translation>Неопознанный параметр &quot;%1&quot;.
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: List file &apos;%1&apos; is not readable.
+</source>
+        <translation>Ошибка lupdate: Не удалось прочитать файл списка &quot;%1&quot;.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: For some reason, &apos;%1&apos; is not writable.
+</source>
+        <translation>Предупреждение lupdate: По какой-то причине не удалось записать в &quot;%1&quot;.
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: File &apos;%1&apos; has no recognized extension.
+</source>
+        <translation>Ошибка lupdate: Расширение файла &quot;%1&quot; не опознано.
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: File &apos;%1&apos; does not exist.
+</source>
+        <translation>Ошибка lupdate: Файл &quot;%1&quot; не существует.
+</translation>
+    </message>
+    <message>
+        <source>Scanning directory &apos;%1&apos;...
+</source>
+        <translation>Сканирование каталога &quot;%1&quot;...
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: -target-language usually only makes sense with exactly one TS file.
+</source>
+        <translation>Предупреждение lupdate: -target-language имеет смысл для одного TS файла.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: -codecfortr has no effect without -ts.
+</source>
+        <translation>Предупреждение lupdate: -codecfortr не имеет смысла без -ts.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: no TS files specified. Only diagnostics will be produced.
+</source>
+        <translation>Предупреждение lupdate: TS файлы не указаны. Будет произведена только диагностика.
+</translation>
+    </message>
+    <message>
+        <source>lupdate error: Both project and source files / include paths specified.
+</source>
+        <translation>Ошибка lupdate: Указаны и проект, и исходный файл / включаемые пути.
+</translation>
+    </message>
+    <message numerus="yes">
+        <source>    Found %n source text(s) (%1 new and %2 already existing)
+</source>
+        <translation>
+            <numerusform>    Обнаружен %n исходный текст (%1 новых и %2 уже имеющихся)
+</numerusform>
+            <numerusform>    Обнаружено %n исходных текста (%1 новых и %2 уже имеющихся)
+</numerusform>
+            <numerusform>    Обнаружено %n исходных текстов (%1 новых и %2 уже имеющихся)
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Removed %n obsolete entries
+</source>
+        <translation>
+            <numerusform>Удалена %n устаревшая запись
+</numerusform>
+            <numerusform>Удалены %n устаревших записи
+</numerusform>
+            <numerusform>Удалено %n устаревших записей
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Kept %n obsolete entries
+</source>
+        <translation>
+            <numerusform>Сохранена %n устаревшая запись
+</numerusform>
+            <numerusform>Сохранены %n устаревшие записи
+</numerusform>
+            <numerusform>Сохранено %n устаревших записей
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Number heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>    Эвристика number добавила %n перевод
+</numerusform>
+            <numerusform>    Эвристика number добавила %n перевода
+</numerusform>
+            <numerusform>    Эвристика number добавила %n переводов
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Same-text heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>    Эвристика same-text добавила %n перевод
+</numerusform>
+            <numerusform>    Эвристика same-text добавила %n перевода
+</numerusform>
+            <numerusform>    Эвристика same-text добавила %n переводов
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Similar-text heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>    Эвристика similar-text добавила %n перевод
+</numerusform>
+            <numerusform>    Эвристика similar-text добавила %n перевода
+</numerusform>
+            <numerusform>    Эвристика similar-text добавила %n переводов
+</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Illegal character</source>
+        <translation>Недопустимый символ</translation>
+    </message>
+    <message>
+        <source>Unclosed string at end of line</source>
+        <translation>Незавершенный текст в конце строки</translation>
+    </message>
+    <message>
+        <source>Illegal escape squence</source>
+        <translation>Неверная esc-последовательность</translation>
+    </message>
+    <message>
+        <source>Illegal unicode escape sequence</source>
+        <translation>Неверная esc-последовательность unicode</translation>
+    </message>
+    <message>
+        <source>Unclosed comment at end of file</source>
+        <translation>Незакрытый комментарий в конце файла</translation>
+    </message>
+    <message>
+        <source>Illegal syntax for exponential number</source>
+        <translation>Неверный синтаксис для числа в экспоненциальной форме</translation>
+    </message>
+    <message>
+        <source>Identifier cannot start with numeric literal</source>
+        <translation>Идентификатор не может начинаться с цифры</translation>
+    </message>
+    <message>
+        <source>Unterminated regular expression literal</source>
+        <translation>Незавершённый литерал регулярного выражения</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation>//% не может быть использовано совместно с %1(). Пропускается
+</translation>
+    </message>
+    <message>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation>для %1() требуется как минимум два параметра.
+</translation>
+    </message>
+    <message>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation>%1(): оба параметра должны быть строковыми литералами.
+</translation>
+    </message>
+    <message>
+        <source>%1() requires at least one argument.
+</source>
+        <translation>для %1() требуется как минимум один параметр.
+</translation>
+    </message>
+    <message>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation>%1(): переводимый текст должен быть строковым литералом.
+</translation>
+    </message>
+    <message>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation>//= не может быть использовано совместно с %1(). Пропускается
+</translation>
+    </message>
+    <message>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation>%1(): идентификатор должен быть строковым литералом.
+</translation>
+    </message>
+    <message>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation>Ожидается </translation>
+    </message>
+    <message>
+        <source>XML error: Parse error at line %1, column %2 (%3).</source>
+        <translation>Ошибка XML: Ошибка разбора в строке %1, столбце %2 (%3).</translation>
+    </message>
+    <message>
+        <source>Parse error in UI file</source>
+        <translation>Ошибка разбора UI файла</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -1289,6 +2231,13 @@ Line: %2</source>
     </message>
 </context>
 <context>
+    <name>PhraseBook</name>
+    <message>
+        <source>Parse error at line %1, column %2 (%3).</source>
+        <translation>Ошибка разбора в строке %1, столбце %2 (%3).</translation>
+    </message>
+</context>
+<context>
     <name>PhraseBookBox</name>
     <message>
         <source></source>
@@ -1460,6 +2409,12 @@ Line: %2</source>
         <source>XLIFF localization files</source>
         <translation>Файлы локализации XLIFF</translation>
     </message>
+    <message>
+        <source>lupdate version %1
+</source>
+        <translation>lupdate версия %1
+</translation>
+    </message>
 </context>
 <context>
     <name>SourceCodeView</name>
diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index 5fbd6e3..b445c5d 100644
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -302,6 +302,14 @@ have libgstreamer-plugins-base installed.</source>
         <translation>Ошибка открытия адреса URL</translation>
     </message>
     <message>
+        <source>Error opening resource</source>
+        <translation>Ошибка открытия ресурса</translation>
+    </message>
+    <message>
+        <source>Error opening source: resource not opened</source>
+        <translation>Ошибка открытия источника: ресурс не был открыт</translation>
+    </message>
+    <message>
         <source>Setting volume failed</source>
         <translation>Не удалось установить уровень громкости</translation>
     </message>
@@ -313,6 +321,10 @@ have libgstreamer-plugins-base installed.</source>
         <source>Playback complete</source>
         <translation>Воспроизведение завершено</translation>
     </message>
+    <message>
+        <source>Download error</source>
+        <translation>Ошибка загрузки</translation>
+    </message>
 </context>
 <context>
     <name>Phonon::MMF::AbstractVideoPlayer</name>
@@ -421,6 +433,14 @@ have libgstreamer-plugins-base installed.</source>
         <translation>Ошибка открытия источника: тип не поддерживается</translation>
     </message>
     <message>
+        <source>Error opening source: resource is compressed</source>
+        <translation>Ошибка открытия источника: сжатый ресурс</translation>
+    </message>
+    <message>
+        <source>Error opening source: resource not valid</source>
+        <translation>Ошибка открытия источника: некорректный ресурс</translation>
+    </message>
+    <message>
         <source>Error opening source: media type could not be determined</source>
         <translation>Ошибка открытия источника: не удалось определить тип медиа-данных</translation>
     </message>
@@ -1360,7 +1380,7 @@ to
     <name>QDeclarativeBinding</name>
     <message>
         <source>Binding loop detected for property &quot;%1&quot;</source>
-        <translation type="unfinished">Обнаружена цикличная привязка для свойства &quot;%1&quot;</translation>
+        <translation type="unfinished">Обнаружено зацикливание привязки для свойства &quot;%1&quot;</translation>
     </message>
 </context>
 <context>
@@ -1574,6 +1594,10 @@ to
         <translation type="unfinished">Некорректное присваивание свойства: ожидается сценарий</translation>
     </message>
     <message>
+        <source>Cannot assign multiple values to a singular property</source>
+        <translation type="unfinished">Невозможно присвоить множество значений свойству, принимающему только одно</translation>
+    </message>
+    <message>
         <source>Cannot assign object to property</source>
         <translation type="unfinished">Невозможно назначить объектсвойству</translation>
     </message>
@@ -1666,8 +1690,16 @@ to
         <translation type="unfinished">Некорректное размещение псевдонима</translation>
     </message>
     <message>
+        <source>Invalid alias reference. An alias reference must be specified as &lt;id&gt;, &lt;id&gt;.&lt;property&gt; or &lt;id&gt;.&lt;value property&gt;.&lt;property&gt;</source>
+        <translation type="unfinished">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как &lt;id&gt;, &lt;id&gt;.&lt;свойство&gt; или &lt;id&gt;.&lt;свойство значения&gt;.&lt;свойство&gt;</translation>
+    </message>
+    <message>
+        <source>Alias property exceeds alias bounds</source>
+        <translation type="unfinished">Свойство псевдонима выходит за границы</translation>
+    </message>
+    <message>
         <source>Invalid alias reference. An alias reference must be specified as &lt;id&gt; or &lt;id&gt;.&lt;property&gt;</source>
-        <translation type="unfinished">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как &lt;id&gt; или &lt;id&gt;.&lt;property&gt;</translation>
+        <translation type="obsolete">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как &lt;id&gt; или &lt;id&gt;.&lt;property&gt;</translation>
     </message>
     <message>
         <source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
@@ -1682,29 +1714,10 @@ to
     </message>
 </context>
 <context>
-    <name>QDeclarativeCompositeTypeManager</name>
-    <message>
-        <source>Resource %1 unavailable</source>
-        <translation>Ресурс &quot;%1&quot; недоступен</translation>
-    </message>
-    <message>
-        <source>Namespace %1 cannot be used as a type</source>
-        <translation>Пространство имён &quot;%1&quot; не может быть использовано в качестве типа</translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <translation>%1 %2</translation>
-    </message>
-    <message>
-        <source>Type %1 unavailable</source>
-        <translation>Тип &quot;%1&quot; недоступен</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeConnections</name>
     <message>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
-        <translation type="unfinished">Невозможно назначить несуществующему свойству &quot;%1&quot;</translation>
+        <translation>Невозможно назначить несуществующему свойству &quot;%1&quot;</translation>
     </message>
     <message>
         <source>Connections: nested objects not allowed</source>
@@ -1760,6 +1773,10 @@ to
 <context>
     <name>QDeclarativeImportDatabase</name>
     <message>
+        <source>cannot load module &quot;%1&quot;: File name case mismatch for &quot;%2&quot;</source>
+        <translation type="unfinished">невозможно загрузить модуль &quot;%1&quot;: Регистр имени файла не соответствует &quot;%2&quot;</translation>
+    </message>
+    <message>
         <source>module &quot;%1&quot; definition &quot;%2&quot; not readable</source>
         <translation type="unfinished">невозможно прочитать определение &quot;%2&quot; модуля &quot;%1&quot;</translation>
     </message>
@@ -1815,6 +1832,10 @@ to
         <source>is not a type</source>
         <translation>не является типом</translation>
     </message>
+    <message>
+        <source>File name case mismatch for &quot;%2&quot;</source>
+        <translation type="unfinished">Регистр имени файла не соответствует &quot;%2&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
@@ -1918,7 +1939,7 @@ to
     <name>QDeclarativeParser</name>
     <message>
         <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished">Неверная unicode esc-последовательность</translation>
+        <translation>Недопустимая unicode esc-последовательность</translation>
     </message>
     <message>
         <source>Illegal character</source>
@@ -1930,7 +1951,7 @@ to
     </message>
     <message>
         <source>Illegal escape squence</source>
-        <translation type="unfinished">Неверная esc-последовательность</translation>
+        <translation>Недопустимая esc-последовательность</translation>
     </message>
     <message>
         <source>Unclosed comment at end of file</source>
@@ -1938,7 +1959,7 @@ to
     </message>
     <message>
         <source>Illegal syntax for exponential number</source>
-        <translation type="unfinished">Недопустимый синтаксис для экспоненциального числа</translation>
+        <translation>Недопустимый синтаксис для экспоненциального числа</translation>
     </message>
     <message>
         <source>Identifier cannot start with numeric literal</source>
@@ -1986,15 +2007,15 @@ to
     </message>
     <message>
         <source>Reserved name &quot;Qt&quot; cannot be used as an qualifier</source>
-        <translation type="unfinished">Зарезервированное имя &quot;Qt&quot; не может быть использовано в качестве спецификатора</translation>
+        <translation>Зарезервированное имя &quot;Qt&quot; не может быть использовано в качестве спецификатора</translation>
     </message>
     <message>
         <source>Script import qualifiers must be unique.</source>
-        <translation type="unfinished">Спецификаторы импорта сценария должны быть уникальными.</translation>
+        <translation>Спецификаторы импорта сценария должны быть уникальными.</translation>
     </message>
     <message>
         <source>Script import requires a qualifier</source>
-        <translation type="unfinished">Для импорта сценария требуется спецификатор</translation>
+        <translation>Для импорта сценария требуется спецификатор</translation>
     </message>
     <message>
         <source>Library import requires a version</source>
@@ -2081,6 +2102,25 @@ to
     </message>
 </context>
 <context>
+    <name>QDeclarativeTypeLoader</name>
+    <message>
+        <source>Script %1 unavailable</source>
+        <translation>Сценарий %1 недоступен</translation>
+    </message>
+    <message>
+        <source>Type %1 unavailable</source>
+        <translation>Тип &quot;%1&quot; недоступен</translation>
+    </message>
+    <message>
+        <source>Namespace %1 cannot be used as a type</source>
+        <translation>Пространство имён &quot;%1&quot; не может быть использовано в качестве типа</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <translation>%1 %2</translation>
+    </message>
+</context>
+<context>
     <name>QDeclarativeVME</name>
     <message>
         <source>Unable to create object of type %1</source>
@@ -3298,18 +3338,10 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QLibrary</name>
     <message>
-        <source>Could not mmap &apos;%1&apos;: %2</source>
-        <translation>Не удалось выполнить mmap &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation>Проверочная информация для модуля &quot;%1&quot; не совпадает</translation>
     </message>
     <message>
-        <source>Could not unmap &apos;%1&apos;: %2</source>
-        <translation>Не удалось выполнить unmap &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>Модуль &quot;%1&quot; использует несоместимую библиотеку Qt. (%2.%3.%4) [%5]</translation>
     </message>
@@ -6071,7 +6103,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Voice Dial</source>
-        <extracomment>Button to trigger voice dialling</extracomment>
+        <extracomment>Button to trigger voice dialing</extracomment>
         <translation type="unfinished">Голосовой вызов</translation>
     </message>
     <message>
@@ -8381,11 +8413,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>W3C XML Schema identity constraint selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Переключатель ограничений типа шаблона W3C XML</translation>
     </message>
     <message>
         <source>W3C XML Schema identity constraint field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Поле ограничений типа шаблона W3C XML</translation>
     </message>
     <message>
         <source>A construct was encountered which is disallowed in the current language(%1).</source>
@@ -9557,15 +9589,15 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Data of type %1 are not allowed to be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Данные типа %1 не могут быть пустыми.</translation>
     </message>
     <message>
         <source>Element %1 is missing child element.</source>
-        <translation type="unfinished"></translation>
+        <translation>У элемента %1 отсутствует дочерний элемент.</translation>
     </message>
     <message>
         <source>There is one IDREF value with no corresponding ID: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Присутствует одно значение IDREF без соответствующего ID: %1.</translation>
     </message>
     <message>
         <source>Loaded schema file is invalid.</source>
@@ -9593,7 +9625,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Specified type %1 is not known to the schema.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Указанный тип %1 шаблону не известен.</translation>
     </message>
     <message>
         <source>Element %1 is not defined in this scope.</source>
@@ -9601,15 +9633,15 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Declaration for element %1 does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>Отсутствует объявление элемента %1.</translation>
     </message>
     <message>
         <source>Element %1 contains invalid content.</source>
-        <translation type="unfinished"></translation>
+        <translation>В элементе %1 находится неверное содержимое.</translation>
     </message>
     <message>
         <source>Element %1 is declared as abstract.</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент %1 объявлен абстрактным.</translation>
     </message>
     <message>
         <source>Element %1 is not nillable.</source>
@@ -9617,7 +9649,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Attribute %1 contains invalid data: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Атрибут %1 содержит неверные данные: %2</translation>
     </message>
     <message>
         <source>Element contains content although it is nillable.</source>
@@ -9625,7 +9657,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Fixed value constraint not allowed if element is nillable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Для обнуляемых элементов недопустимо ограничение фиксированным значением.</translation>
     </message>
     <message>
         <source>Element %1 cannot contain other elements, as it has a fixed content.</source>
@@ -9633,75 +9665,75 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Specified type %1 is not validly substitutable with element type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Указанный тип %1 не может быть корректно замещён элементом типа %2.</translation>
     </message>
     <message>
         <source>Complex type %1 is not allowed to be abstract.</source>
-        <translation type="unfinished"></translation>
+        <translation>Недопустимо, чтобы сложный тип %1 был абстрактным.</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed attributes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент %1 содержит недопустимые атрибуты.</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed child element.</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент %1 содержит недопустимый дочерний элемент.</translation>
     </message>
     <message>
         <source>Content of element %1 does not match its type definition: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержимое элемента %1 не соответствует его определению типа: %2.</translation>
     </message>
     <message>
         <source>Content of element %1 does not match defined value constraint.</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержимое элемента %1 не соответствует определённому ограничению значения.</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed child content.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Элемент %1 содержит недопустимое дочернее содержимое.</translation>
     </message>
     <message>
         <source>Element %1 contains not allowed text content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент %1 содержит недопустимое текстовое содержимое.</translation>
     </message>
     <message>
         <source>Element %1 is missing required attribute %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>У элемента %1 отсутствует необходимый атрибут %2.</translation>
     </message>
     <message>
         <source>Attribute %1 does not match the attribute wildcard.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Атрибут %1 не соответствует шаблону.</translation>
     </message>
     <message>
         <source>Declaration for attribute %1 does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>Отсутствует объявление атрибута %1.</translation>
     </message>
     <message>
         <source>Element %1 contains two attributes of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент %1 содержит два атрибута типа %2.</translation>
     </message>
     <message>
         <source>Attribute %1 contains invalid content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент %1 содержит неверное содержимое.</translation>
     </message>
     <message>
         <source>Element %1 contains unknown attribute %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент %1 содержит неизвестный атрибут %2.</translation>
     </message>
     <message>
         <source>Content of attribute %1 does not match its type definition: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержимое атрибута %1 не соответствует его определению типа: %2.</translation>
     </message>
     <message>
         <source>Content of attribute %1 does not match defined value constraint.</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержимое атрибута %1 не соответствует определённому ограничению значения.</translation>
     </message>
     <message>
         <source>Non-unique value found for constraint %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обнаружено неуникальное значение для ограничения %1.</translation>
     </message>
     <message>
         <source>Key constraint %1 contains absent fields.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ограничение на ключ %1 содержит недостающие поля.</translation>
     </message>
     <message>
         <source>Key constraint %1 contains references nillable element %2.</source>
@@ -9717,7 +9749,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Field %1 has no simple type.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Поле %1 имеет не простой тип.</translation>
     </message>
     <message>
         <source>ID value &apos;%1&apos; is not unique.</source>
diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts
index 7137d21..ea1671f 100644
--- a/translations/qtconfig_ru.ts
+++ b/translations/qtconfig_ru.ts
@@ -4,6 +4,26 @@
 <context>
     <name>MainWindow</name>
     <message>
+        <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Appearance&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to customize the appearance of your Qt applications.&lt;/p&gt;&lt;p&gt;You can select the default GUI Style from the drop down list and customize the colors.&lt;/p&gt;&lt;p&gt;Any GUI Style plugins in your plugin path will automatically be added to the list of built-in Qt styles. (See the Library Paths tab for information on adding new plugin paths.)&lt;/p&gt;&lt;p&gt;When you choose 3-D Effects and Window Background colors, the Qt Configuration program will automatically generate a palette for you. To customize colors further, press the Tune Palette button to open the advanced palette editor.&lt;p&gt;The Preview Window shows what the selected Style and colors look like.</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Внешний вид&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить внешний вид приложений Qt.&lt;/p&gt;&lt;p&gt;Позволяет выбрать стиль интерфейса по умолчанию из выпадающего списка и настроить используемые стилем цвета.&lt;/p&gt;&lt;p&gt;Каждый стиль интерфейса, содержащийся в модулях, найденных в путях к модулям, автоматически добавляется в список встроенных стилей Qt (на вкладке Пути к библиотекам имеется более подробная информация о добавлении путей к модулям).&lt;/p&gt;&lt;p&gt;При выборе эффектов 3D и фоновых цветов окна программа настройки Qt автоматически создаст подходящую палитру. Для дальнейшей настройки цветов следует зайти в расширенный редактор палитры, нажав кнопку Настроить палитру.&lt;p&gt;В окне предпросмотра можно увидеть как будет выглядеть интерфейс с выбранными стилем и цветами.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Fonts&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to select the default font for your Qt applications. The selected font is shown (initially as &apos;Sample Text&apos;) in the line edit below the Family, Style and Point Size drop down lists.&lt;/p&gt;&lt;p&gt;Qt has a powerful font substitution feature that allows you to specify a list of substitute fonts.  Substitute fonts are used when a font cannot be loaded, or if the specified font doesn&apos;t have a particular character.&lt;p&gt;For example, if you select the font Lucida, which doesn&apos;t have Korean characters, but need to show some Korean text using the Mincho font family you can do so by adding Mincho to the list. Once Mincho is added, any Korean characters that are not found in the Lucida font will be taken from the Mincho font.  Because the font substitutions are lists, you can also select multiple families, such as Song Ti (for use with Chinese text).</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Шрифты&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно выбрать шрифт по умолчанию для приложений Qt. Выбранный шрифт отображается в строке редактирования ниже выпадающих списков &quot;Шрифт&quot;, &quot;Начертание&quot; и &quot;Размер&quot; (по умолчанию это текст &quot;Текст для примера (Sample Text)&quot;).&lt;/p&gt;&lt;p&gt;Qt обладает мощным механизмом подмены шрифтов, который позволяет задавать список подставляемых шрифтов. Подставляемые шрифты используются, когда шрифт не удаётся загрузить или в нём отсутствуют необходимые символы.&lt;p&gt;Например, если требуется, чтобы при выборе шрифта Lucida, в котором отсутствуют корейские иероглифы, для отображения корейского текста использовался шрифт Mincho,то можно добавить его в список. После этого все корейские символы, отсутствующие в шрифте Lucida, будут браться из шрифта Mincho. Так как для замены используется список, то можно добавлять несколько шрифтов, например, можно также добавить шрифт Song Ti для отображения китайского текста.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Interface&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to customize the feel of your Qt applications.&lt;/p&gt;&lt;p&gt;If the Resolve Symlinks checkbox is checked Qt will follow symlinks when handling URLs. For example, in the file dialog, if this setting is turned on and /usr/tmp is a symlink to /var/tmp, entering the /usr/tmp directory will cause the file dialog to change to /var/tmp.  With this setting turned off, symlinks are not resolved or followed.&lt;/p&gt;&lt;p&gt;The Global Strut setting is useful for people who require a minimum size for all widgets (e.g. when using a touch panel or for users who are visually impaired).  Leaving the Global Strut width and height at 0 will disable the Global Strut feature&lt;/p&gt;&lt;p&gt;XIM (Extended Input Methods) are used for entering characters in languages that have large character sets, for example, Chinese and Japanese.</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Интерфейс&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить поведение приложений Qt.&lt;/p&gt;&lt;p&gt;Если включено &quot;Разрешать символьные ссылки&quot;, Qt будет следовать по символьным ссылкам при обработке путей URL. Например, если эта функция включена и /usr/tmp является символьной ссылкой на /var/tmp, то в диалоге выбора файла при вводе пути к каталогу /usr/tmp он будет изменён на /var/tmp.&lt;/p&gt;&lt;p&gt;Функция &quot;Минимальные размеры&quot; предназначены для тех, кому необходимо чтобы элементы интерфейса были не менее заданного размера (например, при использовании сенсорной панели или для людей с проблемами зрения). Если задать 0 в полях &quot;минимальная ширина&quot; и &quot;минимальная высота&quot;, то данная функция будет отключена.&lt;/p&gt;&lt;p&gt;Метод ввода XIM (расширенные методы ввода) используется для ввода символов на языках с большим набором символов (например, китайском или японском).</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Printer&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to configure the way Qt generates output for the printer.You can specify if Qt should try to embed fonts into its generated output.If you enable font embedding, the resulting postscript will be more portable and will more accurately reflect the visual output on the screen; however the resulting postscript file size will be bigger.&lt;p&gt;When using font embedding you can select additional directories where Qt should search for embeddable font files.  By default, the X server font path is used.</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Принтер&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить способ, которым Qt будет подготавливать данные для печати. Можно указать следует ли встраивать шрифты - в этом случае напечатанные документы будут более похожи на те, что на экране, но при этом увеличится объём данных, передаваемых на печатающее устройство.&lt;p&gt;При использовании встраивания шрифтов можно указать дополнительные каталоги, в которых Qt будет искать файлы шрифтов для встраивания. По умолчанию используется путь к шрифтам X сервера.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Phonon&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;Use this tab to configure the Phonon GStreamer multimedia backend. &lt;p&gt;It is reccommended to leave all settings on &quot;Auto&quot; to let Phonon determine your settings automatically.</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;&lt;font size+=2&gt;Phonon&lt;/font&gt;&lt;/b&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;На этой вкладке можно настроить мультимедийную подсистему Phonon GStreamer.&lt;p&gt;Рекомендуется оставить значение &quot;Автоматически&quot; для всех настроек, чтобы Phonon определил параметры самостоятельно.</translation>
+    </message>
+    <message>
         <source>Desktop Settings (Default)</source>
         <translation>Настройки рабочего стола (по умолчанию)</translation>
     </message>
@@ -236,7 +256,7 @@
     </message>
     <message>
         <source>Feel Settings</source>
-        <translation type="unfinished">Настройка указателя</translation>
+        <translation type="unfinished">Настройки поведения</translation>
     </message>
     <message>
         <source> ms</source>
@@ -260,7 +280,7 @@
     </message>
     <message>
         <source>Wheel &amp;Scroll Lines:</source>
-        <translation type="unfinished">&amp;Прокручивать строк при повороте колёсика:</translation>
+        <translation>&amp;Прокручивать строк при повороте колёсика:</translation>
     </message>
     <message>
         <source>Resolve symlinks in URLs</source>
@@ -268,7 +288,7 @@
     </message>
     <message>
         <source>GUI Effects</source>
-        <translation type="unfinished">Эффекты пользовательского интерфейса</translation>
+        <translation>Эффекты интерфейса</translation>
     </message>
     <message>
         <source>&amp;Enable</source>
@@ -284,15 +304,15 @@
     </message>
     <message>
         <source>C&amp;omboBox Effect:</source>
-        <translation type="unfinished">Эффект &amp;выпадающего списка:</translation>
+        <translation>Эффект &amp;выпадающего списка:</translation>
     </message>
     <message>
         <source>&amp;ToolTip Effect:</source>
-        <translation type="unfinished">Эффект &amp;подсказки:</translation>
+        <translation>Эффект &amp;подсказки:</translation>
     </message>
     <message>
         <source>Tool&amp;Box Effect:</source>
-        <translation type="unfinished">Эффект панели &amp;инструментов:</translation>
+        <translation>Эффект панели &amp;инструментов:</translation>
     </message>
     <message>
         <source>Disable</source>
@@ -308,7 +328,7 @@
     </message>
     <message>
         <source>Global Strut</source>
-        <translation type="unfinished">Минимальные размеры</translation>
+        <translation>Минимальные размеры</translation>
     </message>
     <message>
         <source>Minimum &amp;Width:</source>
@@ -519,59 +539,59 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Build inactive palette from active</source>
-        <translation type="unfinished">Создать неактивную палитру из активной</translation>
+        <translation>Создать неактивную палитру из активной</translation>
     </message>
     <message>
         <source>Build disabled palette from active</source>
-        <translation type="unfinished">Создать выключенную палитру из активной</translation>
+        <translation>Создать выключенную палитру из активной</translation>
     </message>
     <message>
         <source>Central color &amp;roles</source>
-        <translation type="unfinished">Роли &amp;цветов</translation>
+        <translation>Основные роли &amp;цветов</translation>
     </message>
     <message>
         <source>Choose central color role</source>
-        <translation type="unfinished">Выберите роль цвета</translation>
+        <translation>Выберите основную роль цвета</translation>
     </message>
     <message>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central roles are: &lt;ul&gt; &lt;li&gt;Window - general background color.&lt;/li&gt; &lt;li&gt;WindowText - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li&gt; &lt;li&gt;Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt;&lt;li&gt;Window - основной цвет фона.&lt;/li&gt; &lt;li&gt;WindowText - основной цвет текста.&lt;/li&gt; &lt;li&gt;Base - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.&lt;/li&gt; &lt;li&gt;Text - цвет текста используемый совместно с Base. Обычно, он совпадает с WindowText, так как в этом случае получается максимальный контраст и с Window, и с Base.&lt;/li&gt; &lt;li&gt;Button - основной цвет фона кнопки, которой требуется цвет отличный от Window, например, в стиле Macintosh.&lt;/li&gt; &lt;li&gt;ButtonText - цвет текста используемый совместно с Button.&lt;/li&gt; &lt;li&gt;Highlight - цвет для обозначения выбранного или выделенного элемента.&lt;/li&gt; &lt;li&gt;HighlightedText - цвет текста контрастирующий с Highlight.&lt;/li&gt; &lt;li&gt;BrightText - цвет текста, который отличается от WindowText и хорошо контрастирует с черным.&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</translation>
+        <translation>&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt;&lt;li&gt;&lt;b&gt;Окно&lt;/b&gt; - основной цвет фона.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Текст окна&lt;/b&gt; - основной цвет текста.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Фон&lt;/b&gt; - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Текст&lt;/b&gt; - цвет текста используемый совместно с &lt;b&gt;Фон&lt;/b&gt;. Обычно, он совпадает с &lt;b&gt;Текст окна&lt;/b&gt;, так как в этом случае получается максимальный контраст и с &lt;b&gt;Окно&lt;/b&gt;, и с &lt;b&gt;Фон&lt;/b&gt;.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Кнопка&lt;/b&gt; - основной цвет фона кнопки, которой требуется цвет отличный от &lt;b&gt;Окно&lt;/b&gt;, например, в стиле Macintosh.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Текст кнопки&lt;/b&gt; - цвет текста используемый совместно с &lt;b&gt;Кнопка&lt;/b&gt;.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Выделение&lt;/b&gt; - цвет для обозначения выбранного или выделенного элемента.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Выделенный текст&lt;/b&gt; - цвет текста контрастирующий с &lt;b&gt;Выделение&lt;/b&gt;.&lt;/li&gt; &lt;li&gt;&lt;b&gt;Яркий текст&lt;/b&gt; - цвет текста, который отличается от &lt;b&gt;Текст окна&lt;/b&gt; и хорошо контрастирует с черным.&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Окно</translation>
     </message>
     <message>
         <source>WindowText</source>
-        <translation type="unfinished"></translation>
+        <translation>Текст окна</translation>
     </message>
     <message>
         <source>Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Кнопка</translation>
     </message>
     <message>
         <source>Base</source>
-        <translation type="unfinished"></translation>
+        <translation>Фон</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Текст</translation>
     </message>
     <message>
         <source>BrightText</source>
-        <translation type="unfinished"></translation>
+        <translation>Светлый текст</translation>
     </message>
     <message>
         <source>ButtonText</source>
-        <translation type="unfinished"></translation>
+        <translation>Текст на кнопке</translation>
     </message>
     <message>
         <source>Highlight</source>
-        <translation type="unfinished"></translation>
+        <translation>Выделение</translation>
     </message>
     <message>
         <source>HighlightedText</source>
-        <translation type="unfinished"></translation>
+        <translation>Выделенный текст</translation>
     </message>
     <message>
         <source>&amp;Select Color:</source>
@@ -595,39 +615,39 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Generate shadings</source>
-        <translation type="unfinished">Создание полутонов</translation>
+        <translation>Создание полутонов</translation>
     </message>
     <message>
         <source>Check to let 3D-effect colors be calculated from button-color.</source>
-        <translation type="unfinished">Включите, чтобы цвета эффекта трёхмерности были получены из цвета кнопки.</translation>
+        <translation>Создать цвета эффекта трёхмерности из цвета кнопки.</translation>
     </message>
     <message>
         <source>Choose 3D-effect color role</source>
-        <translation type="unfinished">Выбор роли цвета дял эффекта трёхмерности</translation>
+        <translation>Выбор роли цвета дял эффекта трёхмерности</translation>
     </message>
     <message>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available effect roles are: &lt;ul&gt; &lt;li&gt;Light - lighter than Button color. &lt;/li&gt; &lt;li&gt;Midlight - between Button and Light. &lt;/li&gt; &lt;li&gt;Mid - between Button and Dark. &lt;/li&gt; &lt;li&gt;Dark - darker than Button. &lt;/li&gt; &lt;li&gt;Shadow - a very dark color. &lt;/li&gt; &lt;/ul&gt;</source>
-        <translation>&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt; &lt;li&gt;Light - светлее цвета Button. &lt;/li&gt; &lt;li&gt;Midlight - среднее между Light и Button. &lt;/li&gt; &lt;li&gt;Mid - среднее между Button и Dark. &lt;/li&gt; &lt;li&gt;Dark - темнее цвета Button. &lt;/li&gt; &lt;li&gt;Shadow - очень темный цвет. &lt;/li&gt; &lt;/ul&gt;</translation>
+        <translation>&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt; &lt;li&gt;&lt;b&gt;Светлый&lt;/b&gt; - светлее цвета &lt;b&gt;Кнопка&lt;/b&gt;. &lt;/li&gt; &lt;li&gt;&lt;b&gt;Полусветлый&lt;/b&gt; - среднее между &lt;b&gt;Светлый&lt;/b&gt; и &lt;b&gt;Кнопка&lt;/b&gt;. &lt;/li&gt; &lt;li&gt;&lt;b&gt;Полутёмный&lt;/b&gt; - среднее между &lt;b&gt;Кнопка&lt;/b&gt; и &lt;b&gt;Тёмный&lt;/b&gt;. &lt;/li&gt; &lt;li&gt;&lt;b&gt;Тёмный&lt;/b&gt; - темнее цвета &lt;b&gt;Кнопка&lt;/b&gt;. &lt;/li&gt; &lt;li&gt;&lt;b&gt;Тень&lt;/b&gt; - очень темный цвет. &lt;/li&gt; &lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Light</source>
-        <translation type="unfinished"></translation>
+        <translation>Светлый</translation>
     </message>
     <message>
         <source>Midlight</source>
-        <translation type="unfinished"></translation>
+        <translation>Полусветлый</translation>
     </message>
     <message>
         <source>Mid</source>
-        <translation type="unfinished"></translation>
+        <translation>Полутёмный</translation>
     </message>
     <message>
         <source>Dark</source>
-        <translation type="unfinished"></translation>
+        <translation>Тёмный</translation>
     </message>
     <message>
         <source>Shadow</source>
-        <translation type="unfinished"></translation>
+        <translation>Тень</translation>
     </message>
     <message>
         <source>Select Co&amp;lor:</source>
@@ -635,7 +655,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Choose a color for the selected effect color role.</source>
-        <translation type="unfinished">Выбор цвета для указанной роли.</translation>
+        <translation>Выбор цвета для указанной роли.</translation>
     </message>
     <message>
         <source>OK</source>
diff --git a/translations/qvfb_ru.ts b/translations/qvfb_ru.ts
index a1988de..db9ff2a 100644
--- a/translations/qvfb_ru.ts
+++ b/translations/qvfb_ru.ts
@@ -262,6 +262,126 @@
 <context>
     <name>QVFb</name>
     <message>
+        <source>&amp;File</source>
+        <translation>&amp;Файл</translation>
+    </message>
+    <message>
+        <source>&amp;Configure...</source>
+        <translation>&amp;Настройки...</translation>
+    </message>
+    <message>
+        <source>&amp;Save image...</source>
+        <translation>&amp;Сохранить изображение...</translation>
+    </message>
+    <message>
+        <source>&amp;Animation...</source>
+        <translation>&amp;Анимация...</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>В&amp;ыход</translation>
+    </message>
+    <message>
+        <source>&amp;View</source>
+        <translation>&amp;Вид</translation>
+    </message>
+    <message>
+        <source>Show &amp;Cursor</source>
+        <translation>Отображать &amp;курсор</translation>
+    </message>
+    <message>
+        <source>&amp;Refresh Rate...</source>
+        <translation>&amp;Частота обновлений...</translation>
+    </message>
+    <message>
+        <source>&amp;No rotation</source>
+        <translation>&amp;Без поворота</translation>
+    </message>
+    <message>
+        <source>&amp;90° rotation</source>
+        <translation>Поворот на &amp;90°</translation>
+    </message>
+    <message>
+        <source>1&amp;80° rotation</source>
+        <translation>Поворот на 1&amp;80°</translation>
+    </message>
+    <message>
+        <source>2&amp;70° rotation</source>
+        <translation>Поворот на 2&amp;70°</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;0.5</source>
+        <translation>Масштаб &amp;0.5</translation>
+    </message>
+    <message>
+        <source>Zoom scale 0.7&amp;5</source>
+        <translation>Масштаб 0.7&amp;5</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;1</source>
+        <translation>Масштаб &amp;1</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;2</source>
+        <translation>Масштаб &amp;2</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;3</source>
+        <translation>Масштаб &amp;3</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;4</source>
+        <translation>Масштаб &amp;4</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;scale...</source>
+        <translation>&amp;Масштаб...</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Справка</translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation>&amp;О программе...</translation>
+    </message>
+    <message>
+        <source>Save Main Screen image</source>
+        <translation>Сохранить снимок основного экрана</translation>
+    </message>
+    <message>
+        <source>snapshot.png</source>
+        <translation>снимок.png</translation>
+    </message>
+    <message>
+        <source>Portable Network Graphics (*.png)</source>
+        <translation>Portable Network Graphics (*.png)</translation>
+    </message>
+    <message>
+        <source>Save Main Screen Image</source>
+        <translation>Сохранить снимок основного экрана</translation>
+    </message>
+    <message>
+        <source>Save failed. Check that you have permission to write to the target directory.</source>
+        <translation>Не удалось сохранить. Убедитесь, что Вы имеете права на запись в целевой каталог.</translation>
+    </message>
+    <message>
+        <source>Save Second Screen image</source>
+        <translation>Сохранить снимок дополнительного экрана</translation>
+    </message>
+    <message>
+        <source>Save Second Screen Image</source>
+        <translation>Сохранить снимок дополнительного экрана</translation>
+    </message>
+    <message>
+        <source>About QVFB</source>
+        <translation>О QVFB</translation>
+    </message>
+    <message>
+        <source>&lt;h2&gt;The Qt for Embedded Linux Virtual X11 Framebuffer&lt;/h2&gt;&lt;p&gt;This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. &lt;p&gt;With the aid of this development tool, you can develop Qt for Embedded  Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers.</source>
+        <translation>&lt;h2&gt;Qt для Embedded Linux Virtual X11 Framebuffer&lt;/h2&gt;&lt;p&gt;Данное приложение работает под Qt для X11, эмулируя простой фрэймбуфер, к которому сервер и клиенты Qt для Embedded Linux могут соединяться как если бы это был аппаратный фрэймбуфер Linux. &lt;p&gt;С помощью данного инструмента Вы можете разрабатывать приложения Qt для Embedded Linux под X11 без необходимости переключаться в виртуальную консоль, что делает более удобным использование других инструментов с графическим интерфейсом - как то профайлеров и отладчиков.</translation>
+    </message>
+    <message>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
@@ -274,4 +394,23 @@
         <translation>Все обложки QVFB (*.skin)</translation>
     </message>
 </context>
+<context>
+    <name>QVFbRateDialog</name>
+    <message>
+        <source>Target frame rate:</source>
+        <translation>Частота смены кадров:</translation>
+    </message>
+    <message>
+        <source>%1fps</source>
+        <translation>%1 к/с</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+</context>
 </TS>
-- 
cgit v0.12


From c454cbf083d9851107e958e6c2626f61065fee8b Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 5 Nov 2010 09:21:29 +1000
Subject: Update visual tests for Mac.

---
 .../align/data-MAC/multilineAlign.0.png            |  Bin 2434 -> 2388 bytes
 .../align/data-MAC/multilineAlign.qml              |  118 +-
 .../baseline/data-MAC/parentanchor.qml             |   62 +-
 .../qdeclarativetext/data-MAC/qtbug_14865.0.png    |  Bin 1695 -> 1640 bytes
 .../qdeclarativetext/data-MAC/qtbug_14865.qml      |  396 +-----
 .../qdeclarativetext/elide/data-MAC/elide.0.png    |  Bin 1613 -> 1706 bytes
 .../qdeclarativetext/elide/data-MAC/elide.qml      |  132 +-
 .../qdeclarativetext/elide/data-MAC/elide2.0.png   |  Bin 3477 -> 3564 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.1.png   |  Bin 3080 -> 3271 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.2.png   |  Bin 2501 -> 2549 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.3.png   |  Bin 1574 -> 1574 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.qml     |  482 +++----
 .../elide/data-MAC/multilength.0.png               |  Bin 2877 -> 2883 bytes
 .../elide/data-MAC/multilength.qml                 |  146 +-
 .../qdeclarativetext/font/data-MAC/plaintext.0.png |  Bin 95506 -> 96247 bytes
 .../font/data-MAC/plaintext2.0.png                 |  Bin 0 -> 3481 bytes
 .../qdeclarativetext/font/data-MAC/plaintext2.qml  |  122 +-
 .../qdeclarativetext/font/data-MAC/richtext.0.png  |  Bin 121473 -> 118835 bytes
 .../data-MAC/cursorDelegate.0.png                  |  Bin 3542 -> 3636 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 3566 -> 3611 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 3592 -> 3612 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 3570 -> 3612 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 3569 -> 3609 bytes
 .../data-MAC/cursorDelegate.qml                    |  648 ++++-----
 .../qdeclarativetextedit/data-MAC/qt-669.0.png     |  Bin 3293 -> 3273 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.1.png     |  Bin 3298 -> 3265 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.2.png     |  Bin 3290 -> 3266 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.3.png     |  Bin 3295 -> 3245 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.qml       |  530 ++++----
 .../data-MAC/usingMultilineEdit.0.png              |  Bin 4954 -> 5123 bytes
 .../data-MAC/usingMultilineEdit.1.png              |  Bin 5289 -> 5500 bytes
 .../data-MAC/usingMultilineEdit.10.png             |  Bin 8028 -> 8641 bytes
 .../data-MAC/usingMultilineEdit.11.png             |  Bin 8028 -> 8641 bytes
 .../data-MAC/usingMultilineEdit.2.png              |  Bin 5820 -> 6163 bytes
 .../data-MAC/usingMultilineEdit.3.png              |  Bin 6293 -> 6785 bytes
 .../data-MAC/usingMultilineEdit.4.png              |  Bin 6484 -> 6943 bytes
 .../data-MAC/usingMultilineEdit.5.png              |  Bin 6657 -> 7043 bytes
 .../data-MAC/usingMultilineEdit.6.png              |  Bin 7006 -> 7428 bytes
 .../data-MAC/usingMultilineEdit.7.png              |  Bin 6792 -> 6860 bytes
 .../data-MAC/usingMultilineEdit.8.png              |  Bin 7844 -> 8659 bytes
 .../data-MAC/usingMultilineEdit.9.png              |  Bin 8028 -> 8641 bytes
 .../data-MAC/usingMultilineEdit.qml                | 1428 ++++++++++----------
 .../qdeclarativetextedit/data-MAC/wrap.0.png       |  Bin 11729 -> 11626 bytes
 .../qdeclarativetextedit/data-MAC/wrap.1.png       |  Bin 11956 -> 11869 bytes
 .../qdeclarativetextedit/data-MAC/wrap.2.png       |  Bin 12323 -> 12264 bytes
 .../qdeclarativetextedit/data-MAC/wrap.3.png       |  Bin 12931 -> 12607 bytes
 .../qdeclarativetextedit/data-MAC/wrap.4.png       |  Bin 13447 -> 13243 bytes
 .../qdeclarativetextedit/data-MAC/wrap.5.png       |  Bin 13478 -> 13260 bytes
 .../qdeclarativetextedit/data-MAC/wrap.6.png       |  Bin 13478 -> 13260 bytes
 .../qdeclarativetextedit/data-MAC/wrap.qml         |  844 ++++++------
 .../data-MAC/cursorDelegate.0.png                  |  Bin 3557 -> 3613 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 4062 -> 4140 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 3529 -> 3593 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 3563 -> 3605 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 3566 -> 3605 bytes
 .../data-MAC/cursorDelegate.qml                    |  610 ++++-----
 .../qdeclarativetextinput/data-MAC/echoMode.0.png  |  Bin 681 -> 703 bytes
 .../qdeclarativetextinput/data-MAC/echoMode.1.png  |  Bin 1299 -> 1360 bytes
 .../qdeclarativetextinput/data-MAC/echoMode.2.png  |  Bin 1968 -> 2031 bytes
 .../qdeclarativetextinput/data-MAC/echoMode.qml    |  376 +++---
 .../qdeclarativetextinput/data-MAC/hAlign.qml      |   50 +-
 61 files changed, 2776 insertions(+), 3168 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
index 5243f4a..8b6329d 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
index ad7f35e..85c0cce 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 32
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 48
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 64
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 80
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 96
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 112
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 128
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 144
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 160
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 176
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 192
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 208
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 224
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 240
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 256
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 272
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 288
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 304
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 320
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 336
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 352
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 368
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 384
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 400
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 416
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 432
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 448
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 464
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 480
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 496
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 512
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 528
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 544
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 560
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 576
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 592
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 608
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 624
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 640
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 656
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 672
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 688
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 704
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 720
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 736
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 752
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 768
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 784
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 800
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 816
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 832
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 848
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 864
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 880
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 896
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 912
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 928
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 944
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 960
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
index 56527d1..d7428dd 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
@@ -6,126 +6,126 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 32
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 48
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 64
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 80
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 96
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 112
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 128
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 144
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 160
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 176
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 192
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 208
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 224
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 240
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 256
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 272
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 288
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 304
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 320
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 336
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 352
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 368
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 384
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 400
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 416
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 432
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 448
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 464
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 480
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 496
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
index a947584..7547856 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
index 940d3c1..6b9986f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 32
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 48
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 64
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 80
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 96
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 112
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 128
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 144
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 160
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 176
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 192
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 208
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 224
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 240
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 256
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 272
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 288
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 304
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 320
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 336
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 352
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 368
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 384
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 400
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 416
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 432
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 448
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 464
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 480
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 496
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 512
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 528
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 544
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 560
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 576
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 592
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 608
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 624
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 640
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 656
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 672
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 688
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 704
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 720
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 736
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 752
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 768
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 784
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 800
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 816
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 832
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 848
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 864
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 880
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 896
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 912
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 928
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 944
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 960
@@ -246,15 +246,15 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 992
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 1008
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 1024
@@ -444,276 +444,4 @@ VisualTest {
         msec: 1760
         hash: "eee4600ac08b458ac7ac2320e225674c"
     }
-    Frame {
-        msec: 1776
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1792
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1808
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1824
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1840
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1856
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1872
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1888
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1904
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1920
-        image: "qtbug_14865.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1952
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1968
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1984
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2000
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2016
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2032
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2048
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2064
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2080
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2096
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2112
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2128
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2144
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2160
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2176
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2192
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2208
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2224
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2240
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2256
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2288
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2304
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2320
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2336
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2352
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2368
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2384
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2400
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2416
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2432
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2448
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2464
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2480
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2496
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2512
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2528
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2544
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2560
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2576
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2592
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2608
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2624
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2640
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2656
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2672
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2688
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2704
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2720
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2736
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2752
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2768
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2784
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2800
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2816
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png
index 91ee2e5..88e065b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
index 718375a..96144e1 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 32
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 48
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 64
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 80
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 96
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 112
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 128
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 144
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 160
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 176
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 192
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 208
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 224
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 240
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 256
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 272
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 288
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 304
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 320
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 336
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 352
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 368
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 384
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 400
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 416
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 432
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 448
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 464
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 480
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 496
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 512
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 528
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 544
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 560
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 576
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 592
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 608
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 624
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 640
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 656
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 672
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 688
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 704
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 720
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 736
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 752
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 768
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 784
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 800
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 816
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 832
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 848
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 864
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 880
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 896
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 912
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 928
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 944
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 960
@@ -246,34 +246,34 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 67108864
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 992
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1008
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1024
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1040
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1056
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png
index 0f9a0aa..4df514a 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png
index f3bb7b9..e752fec 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png
index b2f09de..d2f8633 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png
index bca63db..0162321 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
index 48a0ff4..b531942 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 32
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 48
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 64
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 80
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 96
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 112
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 128
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 144
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 160
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 176
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 192
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 208
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 224
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 240
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 256
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 272
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 288
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 304
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 320
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 336
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 352
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 368
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 384
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 400
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 416
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 432
-        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 448
-        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 464
-        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 480
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 496
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 512
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 528
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 544
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 560
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 576
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 592
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 608
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 624
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 640
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 656
-        hash: "02d4eb733c7249f2c38c1768a9988739"
+        hash: "c73bf21c0c9946e123372c660c78e7dd"
     }
     Frame {
         msec: 672
-        hash: "02d4eb733c7249f2c38c1768a9988739"
+        hash: "c73bf21c0c9946e123372c660c78e7dd"
     }
     Frame {
         msec: 688
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "c73bf21c0c9946e123372c660c78e7dd"
     }
     Frame {
         msec: 704
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 720
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 736
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 752
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 768
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 784
-        hash: "3262cf6b60e56028056b81db17cfef61"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 800
-        hash: "3262cf6b60e56028056b81db17cfef61"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 816
-        hash: "3262cf6b60e56028056b81db17cfef61"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 832
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 848
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "96a83eae50a073573ace90239a64d326"
     }
     Frame {
         msec: 864
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "96a83eae50a073573ace90239a64d326"
     }
     Frame {
         msec: 880
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 896
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 912
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 928
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 944
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 960
@@ -246,247 +246,247 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 992
-        hash: "f463cbd97856cd3cb0316cfbbc4c960f"
+        hash: "7b000cccb4e4cdaa53b025d235478b1c"
     }
     Frame {
         msec: 1008
-        hash: "f463cbd97856cd3cb0316cfbbc4c960f"
+        hash: "7b000cccb4e4cdaa53b025d235478b1c"
     }
     Frame {
         msec: 1024
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1040
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1056
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1072
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1088
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1104
-        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1120
-        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1136
-        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1152
-        hash: "2cb79791e784739b5c4a12578df47205"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1168
-        hash: "2cb79791e784739b5c4a12578df47205"
+        hash: "b8c7416944cb741ceb4ee0e8545037b1"
     }
     Frame {
         msec: 1184
-        hash: "2cb79791e784739b5c4a12578df47205"
+        hash: "b8c7416944cb741ceb4ee0e8545037b1"
     }
     Frame {
         msec: 1200
-        hash: "c040d9e9494193164206890e8dd79508"
+        hash: "b8c7416944cb741ceb4ee0e8545037b1"
     }
     Frame {
         msec: 1216
-        hash: "c040d9e9494193164206890e8dd79508"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1232
-        hash: "c040d9e9494193164206890e8dd79508"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1248
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1264
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1280
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "0d286d7e274868e87f7de4367b69386e"
     }
     Frame {
         msec: 1296
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "0d286d7e274868e87f7de4367b69386e"
     }
     Frame {
         msec: 1312
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "892e9e8feeb15bbad5f38cb354aa7290"
     }
     Frame {
         msec: 1328
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "892e9e8feeb15bbad5f38cb354aa7290"
     }
     Frame {
         msec: 1344
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "892e9e8feeb15bbad5f38cb354aa7290"
     }
     Frame {
         msec: 1360
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "06d6ad94b01af5b441fd64536f7740ff"
     }
     Frame {
         msec: 1376
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "06d6ad94b01af5b441fd64536f7740ff"
     }
     Frame {
         msec: 1392
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "06d6ad94b01af5b441fd64536f7740ff"
     }
     Frame {
         msec: 1408
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1424
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1440
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1456
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1472
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1488
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1504
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1520
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1536
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1552
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1568
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1584
-        hash: "ad8f8e33731a8861016c3c9567419fff"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1600
-        hash: "ad8f8e33731a8861016c3c9567419fff"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1616
-        hash: "ad8f8e33731a8861016c3c9567419fff"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1632
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1648
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1664
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1680
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1696
-        hash: "f3a64e17c082529f753292a722a2b3e8"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1712
-        hash: "f3a64e17c082529f753292a722a2b3e8"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1728
-        hash: "f3a64e17c082529f753292a722a2b3e8"
+        hash: "d3d23db79c5f2a374b267bcda8919d1e"
     }
     Frame {
         msec: 1744
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "d3d23db79c5f2a374b267bcda8919d1e"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 67108864
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 1760
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1776
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1792
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1808
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1824
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1840
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "6a202f32d3d7a7c9edc97e55c2fe7aca"
     }
     Frame {
         msec: 1856
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "6a202f32d3d7a7c9edc97e55c2fe7aca"
     }
     Frame {
         msec: 1872
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "6a202f32d3d7a7c9edc97e55c2fe7aca"
     }
     Frame {
         msec: 1888
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1904
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1920
@@ -494,239 +494,239 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1952
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1968
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 1984
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 2000
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 2016
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 2032
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2048
-        hash: "4421ad90c93cca320b790c0432745a5e"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2064
-        hash: "4421ad90c93cca320b790c0432745a5e"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2080
-        hash: "4421ad90c93cca320b790c0432745a5e"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2096
-        hash: "c21285318beec99e9afd1dde46a5497b"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2112
-        hash: "c21285318beec99e9afd1dde46a5497b"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2128
-        hash: "c21285318beec99e9afd1dde46a5497b"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2144
-        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2160
-        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2176
-        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2192
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "f31d3f99faff3289b38ec91a43108707"
     }
     Frame {
         msec: 2208
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "f31d3f99faff3289b38ec91a43108707"
     }
     Frame {
         msec: 2224
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "f31d3f99faff3289b38ec91a43108707"
     }
     Frame {
         msec: 2240
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "60468f768e70c91cd28dca9479ed7738"
     }
     Frame {
         msec: 2256
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "60468f768e70c91cd28dca9479ed7738"
     }
     Frame {
         msec: 2272
-        hash: "cd016ce04572119cf89263091ae55b2f"
+        hash: "fd5e8714cdd406f5626682c15a6efa38"
     }
     Frame {
         msec: 2288
-        hash: "cd016ce04572119cf89263091ae55b2f"
+        hash: "fd5e8714cdd406f5626682c15a6efa38"
     }
     Frame {
         msec: 2304
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "fd5e8714cdd406f5626682c15a6efa38"
     }
     Frame {
         msec: 2320
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2336
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2352
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2368
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2384
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2400
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "8ab72206d4ba87effd44844c67ab4d53"
     }
     Frame {
         msec: 2416
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "8ab72206d4ba87effd44844c67ab4d53"
     }
     Frame {
         msec: 2432
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2448
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2464
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2480
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2496
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2512
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2528
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2544
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2560
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2576
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2592
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2608
-        hash: "c82742c641c411df5d9ecb4d19b7a30d"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2624
-        hash: "c82742c641c411df5d9ecb4d19b7a30d"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2640
-        hash: "c82742c641c411df5d9ecb4d19b7a30d"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2656
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2672
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2688
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2704
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2720
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "1c6d8786cb42afa2af611dec5ebdcda7"
     }
     Frame {
         msec: 2736
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "1c6d8786cb42afa2af611dec5ebdcda7"
     }
     Frame {
         msec: 2752
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2768
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2784
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2800
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2816
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2832
-        hash: "50a47e20ff34a2935b1dde36c85f7f54"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2848
-        hash: "50a47e20ff34a2935b1dde36c85f7f54"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2864
-        hash: "4daa350f9385217b9eef714f40b4e6d0"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2880
@@ -734,239 +734,239 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "4daa350f9385217b9eef714f40b4e6d0"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2912
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2928
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "a7f26f5fbcc97f408974e4bc23fd0b70"
     }
     Frame {
         msec: 2944
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "a7f26f5fbcc97f408974e4bc23fd0b70"
     }
     Frame {
         msec: 2960
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "913478b8d5d05967efd1c83e80e773e2"
     }
     Frame {
         msec: 2976
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "913478b8d5d05967efd1c83e80e773e2"
     }
     Frame {
         msec: 2992
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "913478b8d5d05967efd1c83e80e773e2"
     }
     Frame {
         msec: 3008
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3024
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3040
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3056
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3072
-        hash: "5e2e943b2ab6f798660b32e132ec6bef"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3088
-        hash: "5e2e943b2ab6f798660b32e132ec6bef"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3104
-        hash: "5e2e943b2ab6f798660b32e132ec6bef"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3120
-        hash: "a64b8d6bae4b6445d5de78b126e3af63"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3136
-        hash: "a64b8d6bae4b6445d5de78b126e3af63"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3152
-        hash: "8732d4c3b6ea276079794d2c892d14a9"
+        hash: "9059402dce5cb1813af8f7ebbd831bca"
     }
     Frame {
         msec: 3168
-        hash: "8732d4c3b6ea276079794d2c892d14a9"
+        hash: "9059402dce5cb1813af8f7ebbd831bca"
     }
     Frame {
         msec: 3184
-        hash: "8732d4c3b6ea276079794d2c892d14a9"
+        hash: "9059402dce5cb1813af8f7ebbd831bca"
     }
     Frame {
         msec: 3200
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "80387fc8aedc0c490c689c3a1711fe9f"
     }
     Frame {
         msec: 3216
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "80387fc8aedc0c490c689c3a1711fe9f"
     }
     Frame {
         msec: 3232
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "80387fc8aedc0c490c689c3a1711fe9f"
     }
     Frame {
         msec: 3248
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "f461bf58cbfd345a3f4e087cfcb0e9f0"
     }
     Frame {
         msec: 3264
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "f461bf58cbfd345a3f4e087cfcb0e9f0"
     }
     Frame {
         msec: 3280
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3296
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3312
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3328
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3344
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3360
-        hash: "0c9bb37ebb01a6127b60d26792cc3524"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3376
-        hash: "0c9bb37ebb01a6127b60d26792cc3524"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3392
-        hash: "0c9bb37ebb01a6127b60d26792cc3524"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3408
-        hash: "04b580975c168ef07b11496a18b55582"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3424
-        hash: "04b580975c168ef07b11496a18b55582"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3440
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "c7a9e47b613745858a76a57e1782b566"
     }
     Frame {
         msec: 3456
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "c7a9e47b613745858a76a57e1782b566"
     }
     Frame {
         msec: 3472
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "b90d46cbd9d7d1d82cb9abfbe27fc549"
     }
     Frame {
         msec: 3488
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "b90d46cbd9d7d1d82cb9abfbe27fc549"
     }
     Frame {
         msec: 3504
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "b90d46cbd9d7d1d82cb9abfbe27fc549"
     }
     Frame {
         msec: 3520
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3536
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3552
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3568
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3584
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3600
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3616
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3632
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3648
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3664
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3680
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3696
-        hash: "da74be0adb46300cac7ba9bfe3660c33"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3712
-        hash: "da74be0adb46300cac7ba9bfe3660c33"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3728
-        hash: "9276749ab90c7da1eb62c6277613f75a"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3744
-        hash: "9276749ab90c7da1eb62c6277613f75a"
+        hash: "ee357c3850d0f328db859e7b790bed83"
     }
     Frame {
         msec: 3760
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "ee357c3850d0f328db859e7b790bed83"
     }
     Frame {
         msec: 3776
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "f706095272153c1e9fc4a4825ba54d91"
     }
     Frame {
         msec: 3792
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "f706095272153c1e9fc4a4825ba54d91"
     }
     Frame {
         msec: 3808
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3824
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3840
@@ -974,18 +974,18 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "e871d5f9d6437154ef85a60fe5a6a08e"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3872
-        hash: "e871d5f9d6437154ef85a60fe5a6a08e"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3888
-        hash: "f66f5d470e913f4bec6c8982702b8a60"
+        hash: "97cb5f52e1a5e82a15542b7e5f772fba"
     }
     Frame {
         msec: 3904
-        hash: "f66f5d470e913f4bec6c8982702b8a60"
+        hash: "97cb5f52e1a5e82a15542b7e5f772fba"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png
index 944208b..8caaf5f 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
index e76ad11..30df3fa 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "fa4edc25cc530be81c5c18c089c76643"
+        hash: "2e258ad7cb0a2cd7c6c47a0b0a9563c1"
     }
     Frame {
         msec: 32
-        hash: "d543f734101d89c6d4e4a5992bd34cb3"
+        hash: "d818e0f4f1011a2a8f1d0d803fa18bc0"
     }
     Frame {
         msec: 48
-        hash: "fc96f61ab3f8235d96c815f8876728f5"
+        hash: "44b37be97bbd1f0e26d81f76d9643e51"
     }
     Frame {
         msec: 64
-        hash: "0bdeb73a4cfbe216ca795756baa353c8"
+        hash: "3079a5cf6b8277ae3e1b29ae09d04adc"
     }
     Frame {
         msec: 80
-        hash: "4451049db7f7d0b62325af6d27073f16"
+        hash: "ba899e6f18abb7105f915cef4e60f1e1"
     }
     Frame {
         msec: 96
-        hash: "ef51f1424db831f962960e468b547cc5"
+        hash: "6d2d2b3dc8afa60e32a39449ba90f78d"
     }
     Frame {
         msec: 112
-        hash: "c79ffb52d5aa11e2ee99e9db57c58c3e"
+        hash: "965af350a8fc20c7bcffb370802bc9d9"
     }
     Frame {
         msec: 128
-        hash: "3827b0ca877b214ceffdc7444f9eae14"
+        hash: "8e088db1ff0eb9f5c28268dee929928c"
     }
     Frame {
         msec: 144
-        hash: "8e375f05606f04f81c2ff0551ce7a290"
+        hash: "a0ba6c6bd1e491778294346eeabd8138"
     }
     Frame {
         msec: 160
-        hash: "8d48743f9d3c02cdb342c57b080ab52a"
+        hash: "068a018a5c017cb76ebf3721e0acdb35"
     }
     Frame {
         msec: 176
-        hash: "a8d1cae0e817ca059a73594f35eeccaf"
+        hash: "efa65cae0a4d027c2ec508deecef8aa5"
     }
     Frame {
         msec: 192
-        hash: "71d024907815100b5ea74e072e167384"
+        hash: "9c224e97aa56c6b203a48fb689d72c9a"
     }
     Frame {
         msec: 208
-        hash: "8f294501a7d0dff60233c922161f0b8d"
+        hash: "4f78af1e82a2dd46bab2d237d4f574e5"
     }
     Frame {
         msec: 224
-        hash: "303deae49dd99baba31af8915dd43d4d"
+        hash: "7d022c13e3ef07ca0b6618ae8865dbf1"
     }
     Frame {
         msec: 240
-        hash: "41f34af1ca4417e546d40057727a24b8"
+        hash: "1dc2ecf6cb92cd7d9e467de0049a8598"
     }
     Frame {
         msec: 256
-        hash: "baf5102132a01cb44925f7fc1532f8fb"
+        hash: "262174926ac657c3cd788e2383b5842b"
     }
     Frame {
         msec: 272
-        hash: "559c5e92b2cc8f20c2289bdabc7d2a3c"
+        hash: "984c40aaa927f9e9e73ad228f057d3d9"
     }
     Frame {
         msec: 288
-        hash: "39a50d44ae47e6c358d6ebaa2234cbfb"
+        hash: "0c74101beaeb0a59c1e6b1bf751ca71d"
     }
     Frame {
         msec: 304
-        hash: "4bdfe9e04c2ee21a584dc7612603fe62"
+        hash: "1c2dd6a6675014255e83c2ae734d717b"
     }
     Frame {
         msec: 320
-        hash: "e3ff2c98c9309964ccc612c4499817ff"
+        hash: "f6ac3e9e82a9a710f500f8053b6030ac"
     }
     Frame {
         msec: 336
-        hash: "f3509a8a9fe255e30e1b23ca36803169"
+        hash: "9676fdc060e5784e96534a962992c024"
     }
     Frame {
         msec: 352
-        hash: "644629a42f8a2c8dc1f84e274e25df52"
+        hash: "c46634183e4bde82419bf757bd674a72"
     }
     Frame {
         msec: 368
-        hash: "e169e2e67b0ebffc2181463a1e155e5c"
+        hash: "d04d082f4a1602a308da7f373cbb4094"
     }
     Frame {
         msec: 384
-        hash: "74ccb97fe629c48211543e885930f18e"
+        hash: "a4178c9ffbb74f3f221fc63bee26ca35"
     }
     Frame {
         msec: 400
-        hash: "14d97918485475971a832002a333722d"
+        hash: "0667b13789a501995b2846f7d93fb973"
     }
     Frame {
         msec: 416
-        hash: "4e768d02555701df2109d07259228b05"
+        hash: "fda46bf0beecbb4326b2fc6f6926f0a7"
     }
     Frame {
         msec: 432
-        hash: "ceeeeffb00e1f74ace1a11832d183c81"
+        hash: "85cbdea027d76dee1dad376679a40a22"
     }
     Frame {
         msec: 448
-        hash: "3e6660aff9dfd72e5bd7e67d547af8b5"
+        hash: "0fd56200749ea5882e1bd714e9803d44"
     }
     Frame {
         msec: 464
-        hash: "991a782f939dbfe96b316254177f34ad"
+        hash: "10bf5c477f64f442990716b7eec8fd70"
     }
     Frame {
         msec: 480
-        hash: "ce4adfec222428d3fd7dd6069c69674c"
+        hash: "7cbd8ba3f09c3d00051cd33006381afb"
     }
     Frame {
         msec: 496
-        hash: "27d658710bdeb0395052291bb736fdac"
+        hash: "dca10161836025808cddce9fd93f2412"
     }
     Frame {
         msec: 512
-        hash: "a448c7c9fc2b4cf62f57ced461e39a05"
+        hash: "b949ec6303ccaafc203066c7f9b33ef2"
     }
     Frame {
         msec: 528
-        hash: "0e1fd2a517db3a3fafb2840bbe550592"
+        hash: "853c521bad75c08c0dfe3a00bed01136"
     }
     Frame {
         msec: 544
-        hash: "2ff7fe0c183fddc88d0daaabb866d78b"
+        hash: "dd76c440dc8cfcb7305409483d21d65d"
     }
     Frame {
         msec: 560
-        hash: "73c952ed17daaf19755728185d999f96"
+        hash: "c9b70db4b94e4b0cc855102f43b8e731"
     }
     Frame {
         msec: 576
-        hash: "85e9928b19d66b8ab1ee6b10d8b2b401"
+        hash: "d196057b8aa1e11ec9cf11032b57ca03"
     }
     Frame {
         msec: 592
-        hash: "0c6fa7c70f98d53f2f0425e79083dc2c"
+        hash: "0fae715746a8a340a8f3c4428cf96783"
     }
     Frame {
         msec: 608
-        hash: "589813b70ea86dd5ebe47ccf2121b5a8"
+        hash: "dd2e89d00ce85b167fbc822fedbfb449"
     }
     Frame {
         msec: 624
-        hash: "7b94db2fd4f35fda4183a4351581a931"
+        hash: "a5228adf745f580364eafcbbdd994178"
     }
     Frame {
         msec: 640
-        hash: "5769822d37ed1e88aacbbaaddbd7520a"
+        hash: "f750f588ee00805bc3757940f95de9ae"
     }
     Frame {
         msec: 656
-        hash: "36ab6549d745c1d0e7a7b47b9d1f6887"
+        hash: "55a79fefc2bf6d42b442e68150e3a9bc"
     }
     Frame {
         msec: 672
-        hash: "d130cecb02cdacc0cdbcce80e492d21b"
+        hash: "7b932e7585e66cc7cd31f858ce78a6e1"
     }
     Frame {
         msec: 688
-        hash: "d1395dbf450e90c4f18c872cd50fca8f"
+        hash: "10f204c59a5bff0c49dfc7691c35cef8"
     }
     Frame {
         msec: 704
-        hash: "7415bda155a9287ba22eac9c0548f10e"
+        hash: "cf901c80729eb0b83b46777e727d43e2"
     }
     Frame {
         msec: 720
-        hash: "b65b886a632b042c00317a4013071f6c"
+        hash: "f6bf6e11ef6a71d7e746fae1d0a44531"
     }
     Frame {
         msec: 736
-        hash: "cf4289cd85cb18bbf1a677008d8f1f0a"
+        hash: "4a8795196ece8c0ef18319008dbc0f2f"
     }
     Frame {
         msec: 752
-        hash: "97a6e76519c522854ec88cc9e40165da"
+        hash: "44d32f0b5377ad3b08928413f20e95e1"
     }
     Frame {
         msec: 768
-        hash: "bb80a571507cdc994f79ef05b0ad3b68"
+        hash: "9e0dd160a465573cbac831a14e36ba6d"
     }
     Frame {
         msec: 784
-        hash: "823d647182b73e0f57ff7aca373160f1"
+        hash: "fb2e2522cee569632d9682aa04e7ca08"
     }
     Frame {
         msec: 800
-        hash: "29b649d6cc3510a904561050bea9aa5b"
+        hash: "71b0e8d7671cee10f4f71a80abcde7ec"
     }
     Frame {
         msec: 816
-        hash: "195089eb803c1eef039bac097e446ae6"
+        hash: "4affee92d320d6eca9995ddd8989627f"
     }
     Frame {
         msec: 832
-        hash: "eb5d4b8a47cec6940c5c5019e1ca2fae"
+        hash: "b3e5e26a34cd491d3cd23f4e611266e2"
     }
     Frame {
         msec: 848
-        hash: "e8aebb115dba21f631ad6bce87615fd3"
+        hash: "aa185efe8d0c4c61d4df55266830cfd8"
     }
     Frame {
         msec: 864
-        hash: "15c9982c4c71542788e563db6e069fd1"
+        hash: "19c01ead1135f84b4b3a32583815fd10"
     }
     Frame {
         msec: 880
-        hash: "8124924f33282195f0a04cb178a332b1"
+        hash: "a231a722225c26ff764f16570d1e6beb"
     }
     Frame {
         msec: 896
-        hash: "0134d4df0b3b524107baa4068c64af7f"
+        hash: "466fce12d10bd4b714d4ead14d1c5839"
     }
     Frame {
         msec: 912
-        hash: "bd3015b94540bafebfc9a7190b0e3d6c"
+        hash: "158650554c8467ed7d93c3c11177e041"
     }
     Frame {
         msec: 928
-        hash: "3edcdf689225edcba379775c86390609"
+        hash: "ac16910bc816ca6c76a78160dda8380d"
     }
     Frame {
         msec: 944
-        hash: "407d4d439efec4cb07c80a5bc6638b51"
+        hash: "23ac6eeb0c9bd48dbc844b1263a18cbb"
     }
     Frame {
         msec: 960
@@ -246,58 +246,58 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "7b58d2d0726bb994d9e651411d76cbe4"
+        hash: "3da0b9d963113cfb58152bac1c757065"
     }
     Frame {
         msec: 992
-        hash: "15801c5e1e470c8c45c24debfb9b478b"
+        hash: "e1a33345ee1372069d9282406f1e5605"
     }
     Frame {
         msec: 1008
-        hash: "e257158a1da8908df7522bede4e9c4d9"
+        hash: "da872c570bccf17e88ac7db1d6d076ae"
     }
     Frame {
         msec: 1024
-        hash: "3cb21bef1761c2f70b880b54ca9234fc"
+        hash: "6feea54c6a7f9895001efeff177f9be9"
     }
     Frame {
         msec: 1040
-        hash: "b5effa369f0ab095f4345e2b9f6caa5f"
+        hash: "09049b33ca46a2fc2d06855e29ae66bf"
     }
     Frame {
         msec: 1056
-        hash: "aaafb43e6290a9e7b351dd7c13b8aaaf"
+        hash: "cd96d789f57ac1d425942416337174f1"
     }
     Frame {
         msec: 1072
-        hash: "8a4b622539868188f40f8c7fe75c6ddf"
+        hash: "0a763dd626e27ad14963aecfb8d7673c"
     }
     Frame {
         msec: 1088
-        hash: "365c2f7c0d1c718cf326864c3ba75d2e"
+        hash: "3d81f68bb7aac95b66b0cd0defbb3657"
     }
     Frame {
         msec: 1104
-        hash: "bac17384d4f375652bbc574459554835"
+        hash: "469b862006f99dfefcca803bc49287e3"
     }
     Frame {
         msec: 1120
-        hash: "6bf6917ee323a05824bd6d071459d0b2"
+        hash: "c3f698102bd46231430ab9e8029b8192"
     }
     Frame {
         msec: 1136
-        hash: "7aee8af3ef6b6592011b29281fb0e545"
+        hash: "421a9b4848a59281aea73c08a7219a33"
     }
     Frame {
         msec: 1152
-        hash: "5351b508cbd2e0352f230d211b864c4f"
+        hash: "0066eaa302678a4be35dca0c3ed33b1c"
     }
     Frame {
         msec: 1168
-        hash: "5a051f26ba6287707dbff8422d1eb9f3"
+        hash: "4cceb05bfeb231189b66f1fbdfaeccd3"
     }
     Frame {
         msec: 1184
-        hash: "67611596f75fe97b13a9cf0dc0313727"
+        hash: "ccf229cdd6fde7ef663791d27a008bee"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
index 22863cf..cd436b5 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
new file mode 100644
index 0000000..e47b479
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
index 1a8af0e..f6cddc4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
@@ -6,126 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 32
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 48
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 64
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 80
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 96
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 112
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 128
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 144
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 160
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 176
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 192
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 208
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 224
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 240
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 256
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 272
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 288
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 304
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 320
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 336
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 352
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 368
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 384
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 400
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 416
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 432
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 464
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
+        image: "plaintext2.0.png"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
index aac7c8d..ba833a2 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
index 3f2c403..f41c165 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
index e94c97b..539e4df 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
index 847f8a5..47ceaac 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
index 9002e80..e24a453 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
index 0a399c8..ecf8335 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
index f714adc..ff5db41 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
@@ -6,87 +6,87 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "fd83046af94eac26d394a5da986e734c"
+        hash: "c1bb09480464b7813bc10b0093d14745"
     }
     Frame {
         msec: 32
-        hash: "c9bf546976fc17de9ea9e877f4978f02"
+        hash: "9d0e449506ce93052216b7a952af3dea"
     }
     Frame {
         msec: 48
-        hash: "c711fd5d0c3900494493f8309b79ad0c"
+        hash: "52641f9d6dfba8bf2b94aa37ade140d1"
     }
     Frame {
         msec: 64
-        hash: "b297d098f02fbbeac830b20b0a5194c5"
+        hash: "7610775f69a461d5487e8bc3db6b6e1f"
     }
     Frame {
         msec: 80
-        hash: "b5e956f236ba52cb673af22417d1aabc"
+        hash: "afe0c3fdcb498f1f6b877c5d808b2555"
     }
     Frame {
         msec: 96
-        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
+        hash: "97dabf3984492d2f868b36c3e7bfce50"
     }
     Frame {
         msec: 112
-        hash: "315734f8f38efbc810ca2e65bd752ddd"
+        hash: "869624c2ae63b0a447401a955a6fefb1"
     }
     Frame {
         msec: 128
-        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
+        hash: "7031966f014d4acd5b00c46c89f61403"
     }
     Frame {
         msec: 144
-        hash: "56cc00965e12254e0133fe1d914fffb2"
+        hash: "bd5395e7e0aa0d50cb30504f9961c954"
     }
     Frame {
         msec: 160
-        hash: "690aa50862a887edcc9392d1c3ca0424"
+        hash: "a7142c3c1eb9c934e0b258c163fcdfec"
     }
     Frame {
         msec: 176
-        hash: "c3df3735586ed103d137d4902d7a1cc3"
+        hash: "373c57edb812db59f40710305d80e9e9"
     }
     Frame {
         msec: 192
-        hash: "0a2c07dc17922651d2abd6400fff6e43"
+        hash: "78b16507899c3c8de04b55389ea0ad49"
     }
     Frame {
         msec: 208
-        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
+        hash: "b0fd95dc2ac09a1cbd67ad0f86682666"
     }
     Frame {
         msec: 224
-        hash: "7937850b86f3611ee1d75da9deb7420d"
+        hash: "5f073a4a89413b6a6c5d6ff52717bb2f"
     }
     Frame {
         msec: 240
-        hash: "ecd42368bf2a9058185b9b25b659f4c6"
+        hash: "82e61a4d3f58ee5104893e254a77f13e"
     }
     Frame {
         msec: 256
-        hash: "e545c6ba42edd1e6a055b48f162315ab"
+        hash: "a8fe05178e6339454d57575692fa3df3"
     }
     Frame {
         msec: 272
-        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
+        hash: "192f80add5f612b07dcb8d69f2161648"
     }
     Frame {
         msec: 288
-        hash: "49de66674e8f38f925f3505c64201076"
+        hash: "cfd85885f59ea80b0b0152446a829fec"
     }
     Frame {
         msec: 304
-        hash: "b33880917cae07d038620065ec2c1d1c"
+        hash: "a7295dcc92f80a5f343bf05076a03748"
     }
     Frame {
         msec: 320
-        hash: "97c8af8dc7e5372a3a0f5bed0050127e"
+        hash: "2b0b30cfb1c1e4ed8a51d36fb7ccdf57"
     }
     Frame {
         msec: 336
-        hash: "b0236b8c44398cb9f97324f6ca9ce5c4"
+        hash: "419c538908d0226ff4485f1094eaa08e"
     }
     Key {
         type: 6
@@ -98,27 +98,27 @@ VisualTest {
     }
     Frame {
         msec: 352
-        hash: "2695b45a1ea89518d236ef3b8dccd89e"
+        hash: "8afe64448d42419f97ca207487b3b0f8"
     }
     Frame {
         msec: 368
-        hash: "61370b1d04626facfd243176cb4bb79b"
+        hash: "86091218d2d066d8f95a460426266369"
     }
     Frame {
         msec: 384
-        hash: "53c53e501469ca0ef0f0325a13aa4aa4"
+        hash: "fc45978cac92b6cdeeecc2dd4c29aa53"
     }
     Frame {
         msec: 400
-        hash: "c56717a79ccffe756c5423bc5e44a53f"
+        hash: "03a90ae5cbe68cc210e303c78a14e065"
     }
     Frame {
         msec: 416
-        hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b"
+        hash: "15603a997aa02afb688aa74cd930f3b4"
     }
     Frame {
         msec: 432
-        hash: "4ccb9af28572e13f961f2057eb98482d"
+        hash: "90bf6b2bf89e1440f0c4d1044c1bd22c"
     }
     Key {
         type: 6
@@ -130,19 +130,19 @@ VisualTest {
     }
     Frame {
         msec: 448
-        hash: "0b8ce455fd40c3cd74fb05d4b603cceb"
+        hash: "4dbdc16538cbbf1a87c6a54e09e02b16"
     }
     Frame {
         msec: 464
-        hash: "f5c3754201dbb6f4ca4f4c1611036c5a"
+        hash: "2011ee59d2ec4bb0ae0d63727f091648"
     }
     Frame {
         msec: 480
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 496
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Key {
         type: 6
@@ -154,35 +154,35 @@ VisualTest {
     }
     Frame {
         msec: 512
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 528
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 544
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 560
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 576
-        hash: "9e887b7206f31bbb95573ea4ff157579"
+        hash: "b4205f141a7a6b646cf641ba922d588b"
     }
     Frame {
         msec: 592
-        hash: "0d66c3a6c2df2a2ffe95901e55a5f945"
+        hash: "94c3adf5da700bb63ed6eaf0adf8d037"
     }
     Frame {
         msec: 608
-        hash: "af497d287a3cc1637da43f3cad97a479"
+        hash: "62c4757a2e26341655e27417f85ba6d8"
     }
     Frame {
         msec: 624
-        hash: "e7c4f22fcc84e1fdf09191b3ae8529fa"
+        hash: "9de2ce48334b088c0a0960a581f43a36"
     }
     Key {
         type: 7
@@ -194,15 +194,15 @@ VisualTest {
     }
     Frame {
         msec: 640
-        hash: "ec6b2062c0dc274febc63aa3a2313299"
+        hash: "9ca827d4812521d1590ca6e7117bd788"
     }
     Frame {
         msec: 656
-        hash: "de8e8c97aef11ee03bec315fc82a46f8"
+        hash: "66f65cd7215ea89e60d8f60337fffe97"
     }
     Frame {
         msec: 672
-        hash: "2f9e1a13c276282fd70b3242ec136b22"
+        hash: "05caae5e0d092c4d0595286aa4baa6a0"
     }
     Key {
         type: 6
@@ -214,31 +214,31 @@ VisualTest {
     }
     Frame {
         msec: 688
-        hash: "60e390b7bb10dc756c83d5d52c7832f7"
+        hash: "2282153f3ae493aa6ad5377b12d88043"
     }
     Frame {
         msec: 704
-        hash: "76bf44fbfcac0c8a6615ef4ba67ee91d"
+        hash: "aee2503a5d4ec61795b0486da5c53867"
     }
     Frame {
         msec: 720
-        hash: "614e3712c8b91bcbadaedca209fc80dc"
+        hash: "f564e1ae90bc6b1ea4bc84f1729eb487"
     }
     Frame {
         msec: 736
-        hash: "eb2204890d51b1112ea79f37768bb74e"
+        hash: "f5c70adef5725a0574b63dd5ab7d7b12"
     }
     Frame {
         msec: 752
-        hash: "d5b0d7d19ae4d9df059002e619726266"
+        hash: "74ed3230417c69b0dc82ce9cfe4b6cd0"
     }
     Frame {
         msec: 768
-        hash: "9bd5a7fde4e26a5913c41c61175a2fba"
+        hash: "374270279bcc00167d2b63bf9a658785"
     }
     Frame {
         msec: 784
-        hash: "533e6355f554cfc324f90c70484632ab"
+        hash: "68445a2b5470e44baf7af95efc20ba33"
     }
     Key {
         type: 7
@@ -250,43 +250,43 @@ VisualTest {
     }
     Frame {
         msec: 800
-        hash: "bf05da75483bdc6c4945c1c3a4f8b72a"
+        hash: "5add6c9527edf6bbdb3a79b8a524db70"
     }
     Frame {
         msec: 816
-        hash: "9b7468ba9c2d9e354d15f60ca7ecf6b6"
+        hash: "01a96c8407fa2c0f9e7a822249ac9adc"
     }
     Frame {
         msec: 832
-        hash: "5d57dbc8d8996c2275da30a6f22ea37f"
+        hash: "6b9af295d8f2fb5ba8d9c234596d0a88"
     }
     Frame {
         msec: 848
-        hash: "3efa002ab3b856b0b8d4849b8bb6e567"
+        hash: "3837442e90c2a1534e21d21bfc3b46e1"
     }
     Frame {
         msec: 864
-        hash: "84471ddf06c2c90a17bbef9d634ffabc"
+        hash: "afd7d2494dae8e7ef40a165ccc627313"
     }
     Frame {
         msec: 880
-        hash: "cf8460f68815510416dc1cd86dd80c19"
+        hash: "6e7058d540b26d3c5f15804f2f93b835"
     }
     Frame {
         msec: 896
-        hash: "7e1e02e0795e695a423ee3518c9e8e8f"
+        hash: "ffa489a15db741d8b835d998336bc1b3"
     }
     Frame {
         msec: 912
-        hash: "ca5ea92767f31f7fb7e04894edadb73b"
+        hash: "5a0308d1d2a6a36e16ddb312294fcbf8"
     }
     Frame {
         msec: 928
-        hash: "616e57b513b4e950803c49584de106bd"
+        hash: "bd56ed24908c7e8ec4e5ebc75a19ca86"
     }
     Frame {
         msec: 944
-        hash: "718badb44982d10fe92b646aa5dc3d96"
+        hash: "7bd56b12087226100da27776f8943427"
     }
     Frame {
         msec: 960
@@ -294,19 +294,19 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "4acc383cecec9d65dafa3b75b2711577"
+        hash: "f48a56350bba266c2f19deb46d39e174"
     }
     Frame {
         msec: 992
-        hash: "9e26dd446fe8ed2b8a57888bc7f2f643"
+        hash: "9587bb118f2eb2bf8bb3cfc40ed18310"
     }
     Frame {
         msec: 1008
-        hash: "369f454d8f387320423f2b2e568d6ad6"
+        hash: "0f9e9622427ebaf85369b3013ae9aaf0"
     }
     Frame {
         msec: 1024
-        hash: "369f454d8f387320423f2b2e568d6ad6"
+        hash: "0f9e9622427ebaf85369b3013ae9aaf0"
     }
     Key {
         type: 7
@@ -318,39 +318,39 @@ VisualTest {
     }
     Frame {
         msec: 1040
-        hash: "9e26dd446fe8ed2b8a57888bc7f2f643"
+        hash: "9587bb118f2eb2bf8bb3cfc40ed18310"
     }
     Frame {
         msec: 1056
-        hash: "4acc383cecec9d65dafa3b75b2711577"
+        hash: "f48a56350bba266c2f19deb46d39e174"
     }
     Frame {
         msec: 1072
-        hash: "2909eabaad28f76c37c780d0e0d9e357"
+        hash: "8234f16d07e76aeedb6ca14d622453cb"
     }
     Frame {
         msec: 1088
-        hash: "718badb44982d10fe92b646aa5dc3d96"
+        hash: "7bd56b12087226100da27776f8943427"
     }
     Frame {
         msec: 1104
-        hash: "616e57b513b4e950803c49584de106bd"
+        hash: "bd56ed24908c7e8ec4e5ebc75a19ca86"
     }
     Frame {
         msec: 1120
-        hash: "ca5ea92767f31f7fb7e04894edadb73b"
+        hash: "5a0308d1d2a6a36e16ddb312294fcbf8"
     }
     Frame {
         msec: 1136
-        hash: "7e1e02e0795e695a423ee3518c9e8e8f"
+        hash: "ffa489a15db741d8b835d998336bc1b3"
     }
     Frame {
         msec: 1152
-        hash: "cf8460f68815510416dc1cd86dd80c19"
+        hash: "6e7058d540b26d3c5f15804f2f93b835"
     }
     Frame {
         msec: 1168
-        hash: "84471ddf06c2c90a17bbef9d634ffabc"
+        hash: "afd7d2494dae8e7ef40a165ccc627313"
     }
     Key {
         type: 6
@@ -362,31 +362,31 @@ VisualTest {
     }
     Frame {
         msec: 1184
-        hash: "0e4120f723b1b1d879065f0324ba18fa"
+        hash: "1d5c9458d568df773dbff4e333e14de0"
     }
     Frame {
         msec: 1200
-        hash: "2a8c575dbe68797c8a909df9f1166ff8"
+        hash: "8eef242d89b7e2eff7678030f9fd808e"
     }
     Frame {
         msec: 1216
-        hash: "e26abb9311a2b25ed32efb0da41a4d53"
+        hash: "97dc6ebbf64a19f5026c02ea4c79d63b"
     }
     Frame {
         msec: 1232
-        hash: "d35ae7b04e8ddf1962a20f8593c9c18c"
+        hash: "52d2135428c3c2bf85f0fa7c2ba01a25"
     }
     Frame {
         msec: 1248
-        hash: "afbbcee5ea4c854aebb7ba56856cf9c8"
+        hash: "c713bd1d1ab2df81292020e6e822546c"
     }
     Frame {
         msec: 1264
-        hash: "2d97ae4f3657617d4f4df55090c2d0e1"
+        hash: "0c61ff34510168e324c53786720dd953"
     }
     Frame {
         msec: 1280
-        hash: "dc024030252b263dc7dd3c05580d7ec6"
+        hash: "ba1488f2d9d4482cdf41c40af7642030"
     }
     Key {
         type: 7
@@ -398,95 +398,95 @@ VisualTest {
     }
     Frame {
         msec: 1296
-        hash: "c9072651fd565ed8c6d69a258e464fca"
+        hash: "91d2da369579bb72641d4e7e7cd696f5"
     }
     Frame {
         msec: 1312
-        hash: "bb6a90fd1cb94ed4b590c9ae65d31f86"
+        hash: "1cf1d30d6def868a60f434fe84c23c47"
     }
     Frame {
         msec: 1328
-        hash: "d3e5054c8b0a25adb9bd0fe78bd72153"
+        hash: "ba5b3005af3c44caaf7272cbb56e60da"
     }
     Frame {
         msec: 1344
-        hash: "158e31266eae1718958d37d2096b32af"
+        hash: "116ab7576b5e45e6009920854ff87f39"
     }
     Frame {
         msec: 1360
-        hash: "6986bbfaedae3838de7a92f911d1e4d1"
+        hash: "294c76d6f63c230af666b0b86e0c9844"
     }
     Frame {
         msec: 1376
-        hash: "8ab83b3b3038150036d6d6135d6e2d8d"
+        hash: "c721a5b17b1eb4a063fa3b727d13ba62"
     }
     Frame {
         msec: 1392
-        hash: "6749a62f9d9eadc33e2d109c140bfdde"
+        hash: "a98bd750b67a0ef8831c9c66a0b06a28"
     }
     Frame {
         msec: 1408
-        hash: "7519758a28f49b3a669f6676a1b47253"
+        hash: "7739509b0f5e62207ba62262d8822388"
     }
     Frame {
         msec: 1424
-        hash: "a8470fa7ddf69b4f86c5933f85256684"
+        hash: "62d70a7e3ce290c52d37090bf899377c"
     }
     Frame {
         msec: 1440
-        hash: "1f2f34e0dfeb38bd568915718627abf5"
+        hash: "3f3c1137c02e14796c3a4537337d1dd8"
     }
     Frame {
         msec: 1456
-        hash: "d843ec499de0a7c0094a479f75cab4c6"
+        hash: "4997a45af699c1face114c72a9ce067d"
     }
     Frame {
         msec: 1472
-        hash: "25cf1c1efce5ad53695099ffeb93d27f"
+        hash: "093cce71722904a32b030478f3af49bb"
     }
     Frame {
         msec: 1488
-        hash: "25cf1c1efce5ad53695099ffeb93d27f"
+        hash: "093cce71722904a32b030478f3af49bb"
     }
     Frame {
         msec: 1504
-        hash: "25cf1c1efce5ad53695099ffeb93d27f"
+        hash: "093cce71722904a32b030478f3af49bb"
     }
     Frame {
         msec: 1520
-        hash: "25cf1c1efce5ad53695099ffeb93d27f"
+        hash: "093cce71722904a32b030478f3af49bb"
     }
     Frame {
         msec: 1536
-        hash: "25cf1c1efce5ad53695099ffeb93d27f"
+        hash: "093cce71722904a32b030478f3af49bb"
     }
     Frame {
         msec: 1552
-        hash: "25cf1c1efce5ad53695099ffeb93d27f"
+        hash: "093cce71722904a32b030478f3af49bb"
     }
     Frame {
         msec: 1568
-        hash: "444090b334e856ff4f9b9938c7676666"
+        hash: "a4810a97e51259350bb1543dffc156af"
     }
     Frame {
         msec: 1584
-        hash: "6064d9310e5d660c8e1aae9e9cfc6bd3"
+        hash: "838871072acbefc1c8c488f47312da9b"
     }
     Frame {
         msec: 1600
-        hash: "fc562db867e30ac63a9992b3cf554553"
+        hash: "8cfe8847729878519669caa8b702d910"
     }
     Frame {
         msec: 1616
-        hash: "e127594d11d3e4c0d1f3e4585ef3a901"
+        hash: "a2fd8e049d03b87a306bb5b81e3f7311"
     }
     Frame {
         msec: 1632
-        hash: "6d3d43b6a38cf1c64289282bbcaf2ac2"
+        hash: "29bd4d5e36cb6b232f513b6bb0c00b28"
     }
     Frame {
         msec: 1648
-        hash: "bd58d75020a5272ae3cdcb0ed780e496"
+        hash: "9637f14efb2e355bfe886d7c5f2a8d38"
     }
     Key {
         type: 6
@@ -498,35 +498,35 @@ VisualTest {
     }
     Frame {
         msec: 1664
-        hash: "655cdefae8b30a40e6baaa04b790f811"
+        hash: "0365fa8845c3c1e53ef35d22423eb973"
     }
     Frame {
         msec: 1680
-        hash: "a654e6c9c5414593425bd2ccc6a0f916"
+        hash: "bf88d5d2cd2ff062c1cc8a391a238b1d"
     }
     Frame {
         msec: 1696
-        hash: "88e3865dcb7da6be36cff12a1da7c94b"
+        hash: "46b22f33eb80f013e44da11153441864"
     }
     Frame {
         msec: 1712
-        hash: "4d85866e40d8118081d2747af7343c42"
+        hash: "05ae42e3a0296a569dec147c76be273d"
     }
     Frame {
         msec: 1728
-        hash: "d84111903e76a53be7b55d7dc3847914"
+        hash: "1a8cc65973d08bb949f7a71b0bb8be1a"
     }
     Frame {
         msec: 1744
-        hash: "4f7b708a511dc7a882af661ca3282404"
+        hash: "ca3bde8cd8de81c4210fcfd000fe0f5e"
     }
     Frame {
         msec: 1760
-        hash: "29d940c479f0c76c6f4d88e417672878"
+        hash: "e06d104d1ed451eea4c1d9bdae9d10f4"
     }
     Frame {
         msec: 1776
-        hash: "ade916241f4b2a50e6b84f8ae41369ef"
+        hash: "c95153ae401ad8a2e839905841c074f3"
     }
     Key {
         type: 6
@@ -538,35 +538,35 @@ VisualTest {
     }
     Frame {
         msec: 1792
-        hash: "ecd42368bf2a9058185b9b25b659f4c6"
+        hash: "82e61a4d3f58ee5104893e254a77f13e"
     }
     Frame {
         msec: 1808
-        hash: "7937850b86f3611ee1d75da9deb7420d"
+        hash: "5f073a4a89413b6a6c5d6ff52717bb2f"
     }
     Frame {
         msec: 1824
-        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
+        hash: "b0fd95dc2ac09a1cbd67ad0f86682666"
     }
     Frame {
         msec: 1840
-        hash: "0a2c07dc17922651d2abd6400fff6e43"
+        hash: "78b16507899c3c8de04b55389ea0ad49"
     }
     Frame {
         msec: 1856
-        hash: "c3df3735586ed103d137d4902d7a1cc3"
+        hash: "373c57edb812db59f40710305d80e9e9"
     }
     Frame {
         msec: 1872
-        hash: "690aa50862a887edcc9392d1c3ca0424"
+        hash: "a7142c3c1eb9c934e0b258c163fcdfec"
     }
     Frame {
         msec: 1888
-        hash: "56cc00965e12254e0133fe1d914fffb2"
+        hash: "bd5395e7e0aa0d50cb30504f9961c954"
     }
     Frame {
         msec: 1904
-        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
+        hash: "7031966f014d4acd5b00c46c89f61403"
     }
     Key {
         type: 7
@@ -582,79 +582,79 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
+        hash: "97dabf3984492d2f868b36c3e7bfce50"
     }
     Frame {
         msec: 1952
-        hash: "b5e956f236ba52cb673af22417d1aabc"
+        hash: "afe0c3fdcb498f1f6b877c5d808b2555"
     }
     Frame {
         msec: 1968
-        hash: "b297d098f02fbbeac830b20b0a5194c5"
+        hash: "7610775f69a461d5487e8bc3db6b6e1f"
     }
     Frame {
         msec: 1984
-        hash: "c711fd5d0c3900494493f8309b79ad0c"
+        hash: "52641f9d6dfba8bf2b94aa37ade140d1"
     }
     Frame {
         msec: 2000
-        hash: "c9bf546976fc17de9ea9e877f4978f02"
+        hash: "9d0e449506ce93052216b7a952af3dea"
     }
     Frame {
         msec: 2016
-        hash: "fd83046af94eac26d394a5da986e734c"
+        hash: "c1bb09480464b7813bc10b0093d14745"
     }
     Frame {
         msec: 2032
-        hash: "c9bf546976fc17de9ea9e877f4978f02"
+        hash: "9d0e449506ce93052216b7a952af3dea"
     }
     Frame {
         msec: 2048
-        hash: "c711fd5d0c3900494493f8309b79ad0c"
+        hash: "52641f9d6dfba8bf2b94aa37ade140d1"
     }
     Frame {
         msec: 2064
-        hash: "b297d098f02fbbeac830b20b0a5194c5"
+        hash: "7610775f69a461d5487e8bc3db6b6e1f"
     }
     Frame {
         msec: 2080
-        hash: "b5e956f236ba52cb673af22417d1aabc"
+        hash: "afe0c3fdcb498f1f6b877c5d808b2555"
     }
     Frame {
         msec: 2096
-        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
+        hash: "97dabf3984492d2f868b36c3e7bfce50"
     }
     Frame {
         msec: 2112
-        hash: "315734f8f38efbc810ca2e65bd752ddd"
+        hash: "869624c2ae63b0a447401a955a6fefb1"
     }
     Frame {
         msec: 2128
-        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
+        hash: "7031966f014d4acd5b00c46c89f61403"
     }
     Frame {
         msec: 2144
-        hash: "56cc00965e12254e0133fe1d914fffb2"
+        hash: "bd5395e7e0aa0d50cb30504f9961c954"
     }
     Frame {
         msec: 2160
-        hash: "690aa50862a887edcc9392d1c3ca0424"
+        hash: "a7142c3c1eb9c934e0b258c163fcdfec"
     }
     Frame {
         msec: 2176
-        hash: "c3df3735586ed103d137d4902d7a1cc3"
+        hash: "373c57edb812db59f40710305d80e9e9"
     }
     Frame {
         msec: 2192
-        hash: "0a2c07dc17922651d2abd6400fff6e43"
+        hash: "78b16507899c3c8de04b55389ea0ad49"
     }
     Frame {
         msec: 2208
-        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
+        hash: "b0fd95dc2ac09a1cbd67ad0f86682666"
     }
     Frame {
         msec: 2224
-        hash: "7937850b86f3611ee1d75da9deb7420d"
+        hash: "5f073a4a89413b6a6c5d6ff52717bb2f"
     }
     Key {
         type: 7
@@ -666,35 +666,35 @@ VisualTest {
     }
     Frame {
         msec: 2240
-        hash: "ecd42368bf2a9058185b9b25b659f4c6"
+        hash: "82e61a4d3f58ee5104893e254a77f13e"
     }
     Frame {
         msec: 2256
-        hash: "e545c6ba42edd1e6a055b48f162315ab"
+        hash: "a8fe05178e6339454d57575692fa3df3"
     }
     Frame {
         msec: 2272
-        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
+        hash: "192f80add5f612b07dcb8d69f2161648"
     }
     Frame {
         msec: 2288
-        hash: "49de66674e8f38f925f3505c64201076"
+        hash: "cfd85885f59ea80b0b0152446a829fec"
     }
     Frame {
         msec: 2304
-        hash: "b33880917cae07d038620065ec2c1d1c"
+        hash: "a7295dcc92f80a5f343bf05076a03748"
     }
     Frame {
         msec: 2320
-        hash: "97c8af8dc7e5372a3a0f5bed0050127e"
+        hash: "2b0b30cfb1c1e4ed8a51d36fb7ccdf57"
     }
     Frame {
         msec: 2336
-        hash: "b0236b8c44398cb9f97324f6ca9ce5c4"
+        hash: "419c538908d0226ff4485f1094eaa08e"
     }
     Frame {
         msec: 2352
-        hash: "2695b45a1ea89518d236ef3b8dccd89e"
+        hash: "8afe64448d42419f97ca207487b3b0f8"
     }
     Key {
         type: 6
@@ -706,35 +706,35 @@ VisualTest {
     }
     Frame {
         msec: 2368
-        hash: "61370b1d04626facfd243176cb4bb79b"
+        hash: "86091218d2d066d8f95a460426266369"
     }
     Frame {
         msec: 2384
-        hash: "53c53e501469ca0ef0f0325a13aa4aa4"
+        hash: "fc45978cac92b6cdeeecc2dd4c29aa53"
     }
     Frame {
         msec: 2400
-        hash: "c56717a79ccffe756c5423bc5e44a53f"
+        hash: "03a90ae5cbe68cc210e303c78a14e065"
     }
     Frame {
         msec: 2416
-        hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b"
+        hash: "15603a997aa02afb688aa74cd930f3b4"
     }
     Frame {
         msec: 2432
-        hash: "4ccb9af28572e13f961f2057eb98482d"
+        hash: "90bf6b2bf89e1440f0c4d1044c1bd22c"
     }
     Frame {
         msec: 2448
-        hash: "0b8ce455fd40c3cd74fb05d4b603cceb"
+        hash: "4dbdc16538cbbf1a87c6a54e09e02b16"
     }
     Frame {
         msec: 2464
-        hash: "f5c3754201dbb6f4ca4f4c1611036c5a"
+        hash: "2011ee59d2ec4bb0ae0d63727f091648"
     }
     Frame {
         msec: 2480
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Key {
         type: 7
@@ -746,95 +746,95 @@ VisualTest {
     }
     Frame {
         msec: 2496
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 2512
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 2528
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 2544
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 2560
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 2576
-        hash: "3c1972940b70a388ebfd007b0b5d9860"
+        hash: "02996bef06c74f34cf8be4cf4d1392d5"
     }
     Frame {
         msec: 2592
-        hash: "674707d6ae5ef5109940f1bd62427a63"
+        hash: "2d8cb2d213ce22132ba63a829c07f768"
     }
     Frame {
         msec: 2608
-        hash: "8f512390b74d7a545eb60a86d4b8dee6"
+        hash: "0a16c282a18fdc657ea48fb208dea494"
     }
     Frame {
         msec: 2624
-        hash: "0502cfe70da38a6ebccd7fdf799be464"
+        hash: "86baec52ccb8ae818439c637c5be1514"
     }
     Frame {
         msec: 2640
-        hash: "23c45beae15b893ec4450b0d380aeb17"
+        hash: "72e2415581ba2a96b8f23cf8f5985afb"
     }
     Frame {
         msec: 2656
-        hash: "45de58892db757e76c95ddb76e267f6f"
+        hash: "7776d964b2b5f80bac51a29d298a067f"
     }
     Frame {
         msec: 2672
-        hash: "ff3f1529c937c4d95cf4dfb8592759dc"
+        hash: "3b5d0a9f961c2102a4118a8e2d2793ae"
     }
     Frame {
         msec: 2688
-        hash: "236c6e16bbfab9268f488d6dbf9544be"
+        hash: "048b5e51d9bcf8d1b24c8f8f98b7b4e4"
     }
     Frame {
         msec: 2704
-        hash: "3bb19cbddf5e66c08bdd5c881e93db3e"
+        hash: "d30e5d7c27b72ec95c41a87741061a3f"
     }
     Frame {
         msec: 2720
-        hash: "057ea6d1007993908c9c398391b85072"
+        hash: "0374cc41cdb6528e212f678e0e049f2b"
     }
     Frame {
         msec: 2736
-        hash: "faa124cd5d0a027dc5e3b92125bc9cc5"
+        hash: "c80bc90c90b02d1d42176f16fa992f27"
     }
     Frame {
         msec: 2752
-        hash: "234ac2e7f0b87a86e0678e3cbc5a1e30"
+        hash: "70182707dbdf87a2c8db556f030bec17"
     }
     Frame {
         msec: 2768
-        hash: "bdee3016f1811188691786bafe305196"
+        hash: "0c6c0c3d27d87128d65b40789714dd6b"
     }
     Frame {
         msec: 2784
-        hash: "9ecc192aec9b15314132b16dd3f43860"
+        hash: "46e1debee4ca606492a36de6191f4594"
     }
     Frame {
         msec: 2800
-        hash: "26dc03cf86d6812cfb788599b1c34de0"
+        hash: "f327bb2ea12b2baffc0a98d44a0ded16"
     }
     Frame {
         msec: 2816
-        hash: "8752b33ae49ea6d1ee27376d8585776e"
+        hash: "15bc04b65bde5e8ca69b6a1f88647c16"
     }
     Frame {
         msec: 2832
-        hash: "a181b264ba729ad1d8ff91a0c56fb98a"
+        hash: "27156c3309835ec20a02877f1188e14a"
     }
     Frame {
         msec: 2848
-        hash: "af426cd28c90ac2d46d2b2478ce616f3"
+        hash: "a163019c9feff0f4d1bb4aaedcd2ecd4"
     }
     Key {
         type: 6
@@ -846,7 +846,7 @@ VisualTest {
     }
     Frame {
         msec: 2864
-        hash: "7462f7f9c339fc4d8b0c08e54b0ed71d"
+        hash: "c5569c3c06bcf01b7e69e7f7ad6203ef"
     }
     Frame {
         msec: 2880
@@ -854,27 +854,27 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "10f5b360c3809fbe51de55f47199c541"
+        hash: "5d1c41e371b1a95426882b3991383b6b"
     }
     Frame {
         msec: 2912
-        hash: "ecab3f62c89e1cb9ff9b10ace4cdb40b"
+        hash: "4b9581a767fc1c94451780c044baf003"
     }
     Frame {
         msec: 2928
-        hash: "d3eac9d8cd01bbb44fd61fca497230c0"
+        hash: "39978ba9bb1a535d7735228c650add38"
     }
     Frame {
         msec: 2944
-        hash: "33ff6af85e783c617a42ca5021d1463b"
+        hash: "1a2afe394227dcf2da118559e2e58fd7"
     }
     Frame {
         msec: 2960
-        hash: "a53cccc463d6f6fc24dc0d6309246640"
+        hash: "2f6bdb7af9bf9334231180b6113b125f"
     }
     Frame {
         msec: 2976
-        hash: "8fc354dd6ddbd829240a3c2c9dcafdeb"
+        hash: "85017ca5ca286830e2745abf2f1f963a"
     }
     Key {
         type: 7
@@ -886,63 +886,63 @@ VisualTest {
     }
     Frame {
         msec: 2992
-        hash: "0529a6cb7083caf513de4677970ed33f"
+        hash: "3760b42a25e332c6df49bd92109dae98"
     }
     Frame {
         msec: 3008
-        hash: "bb38f9cdd67d18bc9297b353d499bb35"
+        hash: "7c0347f97f9e4d7fcf47a90b336d264a"
     }
     Frame {
         msec: 3024
-        hash: "bb38f9cdd67d18bc9297b353d499bb35"
+        hash: "7c0347f97f9e4d7fcf47a90b336d264a"
     }
     Frame {
         msec: 3040
-        hash: "0529a6cb7083caf513de4677970ed33f"
+        hash: "3760b42a25e332c6df49bd92109dae98"
     }
     Frame {
         msec: 3056
-        hash: "8fc354dd6ddbd829240a3c2c9dcafdeb"
+        hash: "85017ca5ca286830e2745abf2f1f963a"
     }
     Frame {
         msec: 3072
-        hash: "a53cccc463d6f6fc24dc0d6309246640"
+        hash: "2f6bdb7af9bf9334231180b6113b125f"
     }
     Frame {
         msec: 3088
-        hash: "33ff6af85e783c617a42ca5021d1463b"
+        hash: "1a2afe394227dcf2da118559e2e58fd7"
     }
     Frame {
         msec: 3104
-        hash: "d3eac9d8cd01bbb44fd61fca497230c0"
+        hash: "39978ba9bb1a535d7735228c650add38"
     }
     Frame {
         msec: 3120
-        hash: "ecab3f62c89e1cb9ff9b10ace4cdb40b"
+        hash: "4b9581a767fc1c94451780c044baf003"
     }
     Frame {
         msec: 3136
-        hash: "10f5b360c3809fbe51de55f47199c541"
+        hash: "5d1c41e371b1a95426882b3991383b6b"
     }
     Frame {
         msec: 3152
-        hash: "2a0b3f5170c31a2f2ae512ab3c4268fc"
+        hash: "73c771b964becb418289e0674571eb6f"
     }
     Frame {
         msec: 3168
-        hash: "7462f7f9c339fc4d8b0c08e54b0ed71d"
+        hash: "c5569c3c06bcf01b7e69e7f7ad6203ef"
     }
     Frame {
         msec: 3184
-        hash: "0367ee5e3204a54d225791fbd833fc21"
+        hash: "7c55078e04b56c9aba7d227917323021"
     }
     Frame {
         msec: 3200
-        hash: "86f96b2b846cad8660d80f7dbda24806"
+        hash: "01c6b78b296c00e4597ae1bd36a65f3a"
     }
     Frame {
         msec: 3216
-        hash: "ce05bb9e0a7bd884c12f100b9d219461"
+        hash: "67e9271f71b2d6d9eb2e230953db06c5"
     }
     Key {
         type: 6
@@ -954,31 +954,31 @@ VisualTest {
     }
     Frame {
         msec: 3232
-        hash: "8b04473fad0ffec6b56d2dca8d4dd81c"
+        hash: "642a6f4d7b3f467263b8e033578927af"
     }
     Frame {
         msec: 3248
-        hash: "cedcf233a83047beef7a8aa3486df671"
+        hash: "9f000f97b33427860cb5daeb259c72ea"
     }
     Frame {
         msec: 3264
-        hash: "8117b9590a36bbb4fd0d73c1df2e655e"
+        hash: "d74e3f977b5decb89dda46ea608a933a"
     }
     Frame {
         msec: 3280
-        hash: "5c3168c676a7dc35913e365b2acafea1"
+        hash: "f4e446cd96a3eb1a0df83cf032e7a0b2"
     }
     Frame {
         msec: 3296
-        hash: "4314ebdafbfbad5f108a4cb9874ed06c"
+        hash: "abe715855a79a8ced43000884c4bf04b"
     }
     Frame {
         msec: 3312
-        hash: "d2ffe99b443ecf1188bd3639ddbccda3"
+        hash: "29fd5c17b9a169c1850aa538b4006084"
     }
     Frame {
         msec: 3328
-        hash: "a0894a3492ed7e5bf5b834db890325e2"
+        hash: "cefdcaebb9c319ac358b0d7fc9424327"
     }
     Key {
         type: 7
@@ -990,103 +990,103 @@ VisualTest {
     }
     Frame {
         msec: 3344
-        hash: "57498e86bdc3cfd37bf29505c289d100"
+        hash: "85bfa23957bb5cd947e0819ffa442ea3"
     }
     Frame {
         msec: 3360
-        hash: "57d77411f30c4733f2afec2fc99f3d0b"
+        hash: "48f18d9d12331dc8725ea9e4b7f79823"
     }
     Frame {
         msec: 3376
-        hash: "a3c4b4fef44c4019daba366c1e3a58b1"
+        hash: "63cde59ffbbe2b9087ca228733de18dd"
     }
     Frame {
         msec: 3392
-        hash: "f8461558248b7da3bdf2df641154171a"
+        hash: "73f5d4594f23ff4aac5e42aee00dce81"
     }
     Frame {
         msec: 3408
-        hash: "13e84656ef70bf07e2a444d60ac933e1"
+        hash: "51a1b8e79d209643d55d4cecc6a70ed0"
     }
     Frame {
         msec: 3424
-        hash: "186d8a59092cfe4128b46a3c87eb347b"
+        hash: "7f2ae476246b23d79997a2545723ff62"
     }
     Frame {
         msec: 3440
-        hash: "ac4898002fdc5ea7894d741cac863c8d"
+        hash: "996da2eff9302908a55308dbcc8fb3c2"
     }
     Frame {
         msec: 3456
-        hash: "2e95c1966c94acccd2a44a6c2942d36d"
+        hash: "264f34128dfe563126b9f187c65df61e"
     }
     Frame {
         msec: 3472
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 3488
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 3504
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 3520
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 3536
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 3552
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 3568
-        hash: "7f83ba29fd27aa4817b7b84afbc8d6d7"
+        hash: "70d6b73499c36138bee63e07afb0b186"
     }
     Frame {
         msec: 3584
-        hash: "8575a99b28bb5b8c2d01a5ed91f25d47"
+        hash: "66500c2cc3d69b9fb48dc46e384aca6d"
     }
     Frame {
         msec: 3600
-        hash: "eda67cb2d32f3f605a74a01148f04c99"
+        hash: "6ccc70f6120acb53152b71bcf95514ca"
     }
     Frame {
         msec: 3616
-        hash: "1d65e6e7160f092fe65f683df7c10f92"
+        hash: "5c10e6b0e541fe913b589601a55ea6ce"
     }
     Frame {
         msec: 3632
-        hash: "274c59f268f667a1f11b8ea04a4f88a0"
+        hash: "2c62584e4c09c1d22f9016aa6fa74e10"
     }
     Frame {
         msec: 3648
-        hash: "e46d917e79910b3319c4579776bbdd60"
+        hash: "fd8f53e36a86ae22deb4f7af5aa1eb81"
     }
     Frame {
         msec: 3664
-        hash: "42b7662aad44804653101117ca698023"
+        hash: "e33226eb0e81a64bed7bcdb50e99cd13"
     }
     Frame {
         msec: 3680
-        hash: "dda5147cb6e4e8f61819de6a90dcb165"
+        hash: "a7053a2b7bc9f4749c290bace6b55634"
     }
     Frame {
         msec: 3696
-        hash: "b4a5dcd0bb667d3a42c8f0703d753ed6"
+        hash: "782cb4e647e849ac7299d41f04bc89e3"
     }
     Frame {
         msec: 3712
-        hash: "4ae70de6785fdbecf7650637c8e99a71"
+        hash: "0f7d04fe594ae027364a7c2b570c5a27"
     }
     Frame {
         msec: 3728
-        hash: "22dc8343eab28b0526d5486405b68478"
+        hash: "dfb00adcdc2f68bfb691bce47845b0e7"
     }
     Key {
         type: 6
@@ -1098,27 +1098,27 @@ VisualTest {
     }
     Frame {
         msec: 3744
-        hash: "49de66674e8f38f925f3505c64201076"
+        hash: "cfd85885f59ea80b0b0152446a829fec"
     }
     Frame {
         msec: 3760
-        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
+        hash: "192f80add5f612b07dcb8d69f2161648"
     }
     Frame {
         msec: 3776
-        hash: "e545c6ba42edd1e6a055b48f162315ab"
+        hash: "a8fe05178e6339454d57575692fa3df3"
     }
     Frame {
         msec: 3792
-        hash: "ecd42368bf2a9058185b9b25b659f4c6"
+        hash: "82e61a4d3f58ee5104893e254a77f13e"
     }
     Frame {
         msec: 3808
-        hash: "7937850b86f3611ee1d75da9deb7420d"
+        hash: "5f073a4a89413b6a6c5d6ff52717bb2f"
     }
     Frame {
         msec: 3824
-        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
+        hash: "b0fd95dc2ac09a1cbd67ad0f86682666"
     }
     Frame {
         msec: 3840
@@ -1134,59 +1134,59 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "c3df3735586ed103d137d4902d7a1cc3"
+        hash: "373c57edb812db59f40710305d80e9e9"
     }
     Frame {
         msec: 3872
-        hash: "690aa50862a887edcc9392d1c3ca0424"
+        hash: "a7142c3c1eb9c934e0b258c163fcdfec"
     }
     Frame {
         msec: 3888
-        hash: "56cc00965e12254e0133fe1d914fffb2"
+        hash: "bd5395e7e0aa0d50cb30504f9961c954"
     }
     Frame {
         msec: 3904
-        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
+        hash: "7031966f014d4acd5b00c46c89f61403"
     }
     Frame {
         msec: 3920
-        hash: "315734f8f38efbc810ca2e65bd752ddd"
+        hash: "869624c2ae63b0a447401a955a6fefb1"
     }
     Frame {
         msec: 3936
-        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
+        hash: "97dabf3984492d2f868b36c3e7bfce50"
     }
     Frame {
         msec: 3952
-        hash: "b5e956f236ba52cb673af22417d1aabc"
+        hash: "afe0c3fdcb498f1f6b877c5d808b2555"
     }
     Frame {
         msec: 3968
-        hash: "b297d098f02fbbeac830b20b0a5194c5"
+        hash: "7610775f69a461d5487e8bc3db6b6e1f"
     }
     Frame {
         msec: 3984
-        hash: "c711fd5d0c3900494493f8309b79ad0c"
+        hash: "52641f9d6dfba8bf2b94aa37ade140d1"
     }
     Frame {
         msec: 4000
-        hash: "c9bf546976fc17de9ea9e877f4978f02"
+        hash: "9d0e449506ce93052216b7a952af3dea"
     }
     Frame {
         msec: 4016
-        hash: "fd83046af94eac26d394a5da986e734c"
+        hash: "c1bb09480464b7813bc10b0093d14745"
     }
     Frame {
         msec: 4032
-        hash: "c9bf546976fc17de9ea9e877f4978f02"
+        hash: "9d0e449506ce93052216b7a952af3dea"
     }
     Frame {
         msec: 4048
-        hash: "c711fd5d0c3900494493f8309b79ad0c"
+        hash: "52641f9d6dfba8bf2b94aa37ade140d1"
     }
     Frame {
         msec: 4064
-        hash: "b297d098f02fbbeac830b20b0a5194c5"
+        hash: "7610775f69a461d5487e8bc3db6b6e1f"
     }
     Key {
         type: 7
@@ -1198,183 +1198,183 @@ VisualTest {
     }
     Frame {
         msec: 4080
-        hash: "b5e956f236ba52cb673af22417d1aabc"
+        hash: "afe0c3fdcb498f1f6b877c5d808b2555"
     }
     Frame {
         msec: 4096
-        hash: "e8cd9511f073ff40a6645ad6aa2b5bee"
+        hash: "97dabf3984492d2f868b36c3e7bfce50"
     }
     Frame {
         msec: 4112
-        hash: "315734f8f38efbc810ca2e65bd752ddd"
+        hash: "869624c2ae63b0a447401a955a6fefb1"
     }
     Frame {
         msec: 4128
-        hash: "fa7d20c99cb8c20494b558ce8ef860a2"
+        hash: "7031966f014d4acd5b00c46c89f61403"
     }
     Frame {
         msec: 4144
-        hash: "56cc00965e12254e0133fe1d914fffb2"
+        hash: "bd5395e7e0aa0d50cb30504f9961c954"
     }
     Frame {
         msec: 4160
-        hash: "690aa50862a887edcc9392d1c3ca0424"
+        hash: "a7142c3c1eb9c934e0b258c163fcdfec"
     }
     Frame {
         msec: 4176
-        hash: "c3df3735586ed103d137d4902d7a1cc3"
+        hash: "373c57edb812db59f40710305d80e9e9"
     }
     Frame {
         msec: 4192
-        hash: "0a2c07dc17922651d2abd6400fff6e43"
+        hash: "78b16507899c3c8de04b55389ea0ad49"
     }
     Frame {
         msec: 4208
-        hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6"
+        hash: "b0fd95dc2ac09a1cbd67ad0f86682666"
     }
     Frame {
         msec: 4224
-        hash: "7937850b86f3611ee1d75da9deb7420d"
+        hash: "5f073a4a89413b6a6c5d6ff52717bb2f"
     }
     Frame {
         msec: 4240
-        hash: "ecd42368bf2a9058185b9b25b659f4c6"
+        hash: "82e61a4d3f58ee5104893e254a77f13e"
     }
     Frame {
         msec: 4256
-        hash: "e545c6ba42edd1e6a055b48f162315ab"
+        hash: "a8fe05178e6339454d57575692fa3df3"
     }
     Frame {
         msec: 4272
-        hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7"
+        hash: "192f80add5f612b07dcb8d69f2161648"
     }
     Frame {
         msec: 4288
-        hash: "49de66674e8f38f925f3505c64201076"
+        hash: "cfd85885f59ea80b0b0152446a829fec"
     }
     Frame {
         msec: 4304
-        hash: "b33880917cae07d038620065ec2c1d1c"
+        hash: "a7295dcc92f80a5f343bf05076a03748"
     }
     Frame {
         msec: 4320
-        hash: "97c8af8dc7e5372a3a0f5bed0050127e"
+        hash: "2b0b30cfb1c1e4ed8a51d36fb7ccdf57"
     }
     Frame {
         msec: 4336
-        hash: "b0236b8c44398cb9f97324f6ca9ce5c4"
+        hash: "419c538908d0226ff4485f1094eaa08e"
     }
     Frame {
         msec: 4352
-        hash: "2695b45a1ea89518d236ef3b8dccd89e"
+        hash: "8afe64448d42419f97ca207487b3b0f8"
     }
     Frame {
         msec: 4368
-        hash: "61370b1d04626facfd243176cb4bb79b"
+        hash: "86091218d2d066d8f95a460426266369"
     }
     Frame {
         msec: 4384
-        hash: "53c53e501469ca0ef0f0325a13aa4aa4"
+        hash: "fc45978cac92b6cdeeecc2dd4c29aa53"
     }
     Frame {
         msec: 4400
-        hash: "c56717a79ccffe756c5423bc5e44a53f"
+        hash: "03a90ae5cbe68cc210e303c78a14e065"
     }
     Frame {
         msec: 4416
-        hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b"
+        hash: "15603a997aa02afb688aa74cd930f3b4"
     }
     Frame {
         msec: 4432
-        hash: "4ccb9af28572e13f961f2057eb98482d"
+        hash: "90bf6b2bf89e1440f0c4d1044c1bd22c"
     }
     Frame {
         msec: 4448
-        hash: "0b8ce455fd40c3cd74fb05d4b603cceb"
+        hash: "4dbdc16538cbbf1a87c6a54e09e02b16"
     }
     Frame {
         msec: 4464
-        hash: "f5c3754201dbb6f4ca4f4c1611036c5a"
+        hash: "2011ee59d2ec4bb0ae0d63727f091648"
     }
     Frame {
         msec: 4480
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4496
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4512
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4528
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4544
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4560
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4576
-        hash: "3c1972940b70a388ebfd007b0b5d9860"
+        hash: "02996bef06c74f34cf8be4cf4d1392d5"
     }
     Frame {
         msec: 4592
-        hash: "674707d6ae5ef5109940f1bd62427a63"
+        hash: "2d8cb2d213ce22132ba63a829c07f768"
     }
     Frame {
         msec: 4608
-        hash: "8f512390b74d7a545eb60a86d4b8dee6"
+        hash: "0a16c282a18fdc657ea48fb208dea494"
     }
     Frame {
         msec: 4624
-        hash: "0502cfe70da38a6ebccd7fdf799be464"
+        hash: "86baec52ccb8ae818439c637c5be1514"
     }
     Frame {
         msec: 4640
-        hash: "23c45beae15b893ec4450b0d380aeb17"
+        hash: "72e2415581ba2a96b8f23cf8f5985afb"
     }
     Frame {
         msec: 4656
-        hash: "45de58892db757e76c95ddb76e267f6f"
+        hash: "7776d964b2b5f80bac51a29d298a067f"
     }
     Frame {
         msec: 4672
-        hash: "ff3f1529c937c4d95cf4dfb8592759dc"
+        hash: "3b5d0a9f961c2102a4118a8e2d2793ae"
     }
     Frame {
         msec: 4688
-        hash: "236c6e16bbfab9268f488d6dbf9544be"
+        hash: "048b5e51d9bcf8d1b24c8f8f98b7b4e4"
     }
     Frame {
         msec: 4704
-        hash: "3bb19cbddf5e66c08bdd5c881e93db3e"
+        hash: "d30e5d7c27b72ec95c41a87741061a3f"
     }
     Frame {
         msec: 4720
-        hash: "057ea6d1007993908c9c398391b85072"
+        hash: "0374cc41cdb6528e212f678e0e049f2b"
     }
     Frame {
         msec: 4736
-        hash: "faa124cd5d0a027dc5e3b92125bc9cc5"
+        hash: "c80bc90c90b02d1d42176f16fa992f27"
     }
     Frame {
         msec: 4752
-        hash: "234ac2e7f0b87a86e0678e3cbc5a1e30"
+        hash: "70182707dbdf87a2c8db556f030bec17"
     }
     Frame {
         msec: 4768
-        hash: "bdee3016f1811188691786bafe305196"
+        hash: "0c6c0c3d27d87128d65b40789714dd6b"
     }
     Frame {
         msec: 4784
-        hash: "9ecc192aec9b15314132b16dd3f43860"
+        hash: "46e1debee4ca606492a36de6191f4594"
     }
     Frame {
         msec: 4800
@@ -1382,118 +1382,118 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "8752b33ae49ea6d1ee27376d8585776e"
+        hash: "15bc04b65bde5e8ca69b6a1f88647c16"
     }
     Frame {
         msec: 4832
-        hash: "a181b264ba729ad1d8ff91a0c56fb98a"
+        hash: "27156c3309835ec20a02877f1188e14a"
     }
     Frame {
         msec: 4848
-        hash: "af426cd28c90ac2d46d2b2478ce616f3"
+        hash: "a163019c9feff0f4d1bb4aaedcd2ecd4"
     }
     Frame {
         msec: 4864
-        hash: "d062f03ccc0eb1f56aba411e1078c4ab"
+        hash: "35f243da98f9934d5ac0a7cc1fde73ef"
     }
     Frame {
         msec: 4880
-        hash: "793cb0a98cac4a0f5d9a1dc5df5cd0ce"
+        hash: "42d393d75e0c1d5aea0e1694190e4507"
     }
     Frame {
         msec: 4896
-        hash: "da1f9732e1d7cd0b82f0c0949937067e"
+        hash: "0ec47c6c74efd66d339d9be13148e334"
     }
     Frame {
         msec: 4912
-        hash: "35d38ce67e19453f255241473294f7e9"
+        hash: "2e7597e8d03f0a05cf96fe7e2a3ee540"
     }
     Frame {
         msec: 4928
-        hash: "e8c5d9895119167f2fcb4a15b0f1b65e"
+        hash: "093c9e5ac431284de7e81e082868c5db"
     }
     Frame {
         msec: 4944
-        hash: "26c0d91942f1cb3313d604804d1e4b9e"
+        hash: "60ae71c4a6c905f47b2b457d9167153b"
     }
     Frame {
         msec: 4960
-        hash: "eaf1ba458119f6d3dedcd581d5c04f8c"
+        hash: "e4be7897b1b30ab916a53df2998282d7"
     }
     Frame {
         msec: 4976
-        hash: "a54c778d78c9a715ce0429e9c366ef8b"
+        hash: "c082b97799dffdb73ad65b2920507e9c"
     }
     Frame {
         msec: 4992
-        hash: "f3a8edba1311c54a12024dbcf1656b85"
+        hash: "aadaab0547a4f15c533589b531f39504"
     }
     Frame {
         msec: 5008
-        hash: "7c5c30318c41ab5c5874239bbcfbaae2"
+        hash: "847f0a1faf094e73d533692fa47a030a"
     }
     Frame {
         msec: 5024
-        hash: "7c5c30318c41ab5c5874239bbcfbaae2"
+        hash: "847f0a1faf094e73d533692fa47a030a"
     }
     Frame {
         msec: 5040
-        hash: "f3a8edba1311c54a12024dbcf1656b85"
+        hash: "aadaab0547a4f15c533589b531f39504"
     }
     Frame {
         msec: 5056
-        hash: "a54c778d78c9a715ce0429e9c366ef8b"
+        hash: "c082b97799dffdb73ad65b2920507e9c"
     }
     Frame {
         msec: 5072
-        hash: "eaf1ba458119f6d3dedcd581d5c04f8c"
+        hash: "e4be7897b1b30ab916a53df2998282d7"
     }
     Frame {
         msec: 5088
-        hash: "26c0d91942f1cb3313d604804d1e4b9e"
+        hash: "60ae71c4a6c905f47b2b457d9167153b"
     }
     Frame {
         msec: 5104
-        hash: "e8c5d9895119167f2fcb4a15b0f1b65e"
+        hash: "093c9e5ac431284de7e81e082868c5db"
     }
     Frame {
         msec: 5120
-        hash: "35d38ce67e19453f255241473294f7e9"
+        hash: "2e7597e8d03f0a05cf96fe7e2a3ee540"
     }
     Frame {
         msec: 5136
-        hash: "da1f9732e1d7cd0b82f0c0949937067e"
+        hash: "0ec47c6c74efd66d339d9be13148e334"
     }
     Frame {
         msec: 5152
-        hash: "793cb0a98cac4a0f5d9a1dc5df5cd0ce"
+        hash: "42d393d75e0c1d5aea0e1694190e4507"
     }
     Frame {
         msec: 5168
-        hash: "d062f03ccc0eb1f56aba411e1078c4ab"
+        hash: "35f243da98f9934d5ac0a7cc1fde73ef"
     }
     Frame {
         msec: 5184
-        hash: "af426cd28c90ac2d46d2b2478ce616f3"
+        hash: "a163019c9feff0f4d1bb4aaedcd2ecd4"
     }
     Frame {
         msec: 5200
-        hash: "a181b264ba729ad1d8ff91a0c56fb98a"
+        hash: "27156c3309835ec20a02877f1188e14a"
     }
     Frame {
         msec: 5216
-        hash: "8752b33ae49ea6d1ee27376d8585776e"
+        hash: "15bc04b65bde5e8ca69b6a1f88647c16"
     }
     Frame {
         msec: 5232
-        hash: "26dc03cf86d6812cfb788599b1c34de0"
+        hash: "f327bb2ea12b2baffc0a98d44a0ded16"
     }
     Frame {
         msec: 5248
-        hash: "9ecc192aec9b15314132b16dd3f43860"
+        hash: "46e1debee4ca606492a36de6191f4594"
     }
     Frame {
         msec: 5264
-        hash: "bdee3016f1811188691786bafe305196"
+        hash: "0c6c0c3d27d87128d65b40789714dd6b"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png
index c4bf75d..dfd30f6 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png
index f28b342..9d4eb9b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png
index 955aed7..968517e 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png
index 02ac575..eb62c19 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
index 8d14a2b..a7df61f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
@@ -6,99 +6,99 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 32
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 48
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 64
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 80
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 96
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 112
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 128
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 144
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 160
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 176
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 192
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 208
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 224
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 240
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 256
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 272
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 288
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 304
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 320
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 336
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 352
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 368
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 384
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Key {
         type: 6
@@ -110,15 +110,15 @@ VisualTest {
     }
     Frame {
         msec: 400
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 416
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 432
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Key {
         type: 7
@@ -130,27 +130,27 @@ VisualTest {
     }
     Frame {
         msec: 448
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 464
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 480
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 496
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 512
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 528
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Key {
         type: 6
@@ -162,15 +162,15 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 560
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 576
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Key {
         type: 7
@@ -182,27 +182,27 @@ VisualTest {
     }
     Frame {
         msec: 592
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 608
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 624
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 640
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 656
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 672
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Key {
         type: 6
@@ -214,19 +214,19 @@ VisualTest {
     }
     Frame {
         msec: 688
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 704
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 720
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 736
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Key {
         type: 7
@@ -238,23 +238,23 @@ VisualTest {
     }
     Frame {
         msec: 752
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 768
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 784
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 800
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 816
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Key {
         type: 6
@@ -266,19 +266,19 @@ VisualTest {
     }
     Frame {
         msec: 832
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 848
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 864
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 880
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Key {
         type: 7
@@ -290,19 +290,19 @@ VisualTest {
     }
     Frame {
         msec: 896
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 912
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 928
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 944
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Key {
         type: 6
@@ -318,15 +318,15 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 992
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 1008
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Key {
         type: 7
@@ -338,23 +338,23 @@ VisualTest {
     }
     Frame {
         msec: 1024
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 1040
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 1056
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 1072
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 1088
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Key {
         type: 6
@@ -366,15 +366,15 @@ VisualTest {
     }
     Frame {
         msec: 1104
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 1120
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 1136
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Key {
         type: 7
@@ -386,23 +386,23 @@ VisualTest {
     }
     Frame {
         msec: 1152
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 1168
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 1184
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 1200
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 1216
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Key {
         type: 6
@@ -414,19 +414,19 @@ VisualTest {
     }
     Frame {
         msec: 1232
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 1248
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 1264
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 1280
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Key {
         type: 7
@@ -438,19 +438,19 @@ VisualTest {
     }
     Frame {
         msec: 1296
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 1312
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 1328
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 1344
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Key {
         type: 6
@@ -462,19 +462,19 @@ VisualTest {
     }
     Frame {
         msec: 1360
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1376
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1392
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1408
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Key {
         type: 7
@@ -486,23 +486,23 @@ VisualTest {
     }
     Frame {
         msec: 1424
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1440
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1456
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1472
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1488
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Key {
         type: 6
@@ -514,15 +514,15 @@ VisualTest {
     }
     Frame {
         msec: 1504
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1520
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1536
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Key {
         type: 7
@@ -534,79 +534,79 @@ VisualTest {
     }
     Frame {
         msec: 1552
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1568
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1584
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1600
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1616
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1632
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1648
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1664
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1680
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1696
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1712
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1728
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1744
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1760
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1776
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1792
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1808
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1824
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Frame {
         msec: 1840
-        hash: "2723a5a18241fd8787c2e298673e61e3"
+        hash: "ab021c71945620eba0b0cd70c7cffe5d"
     }
     Key {
         type: 6
@@ -618,19 +618,19 @@ VisualTest {
     }
     Frame {
         msec: 1856
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1872
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1888
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1904
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1920
@@ -638,19 +638,19 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1952
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1968
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 1984
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Key {
         type: 7
@@ -662,23 +662,23 @@ VisualTest {
     }
     Frame {
         msec: 2000
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 2016
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 2032
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 2048
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Frame {
         msec: 2064
-        hash: "730ff91304bee489409ea616678a9877"
+        hash: "2ce295d30754b14d889795d2192fef41"
     }
     Key {
         type: 6
@@ -690,23 +690,23 @@ VisualTest {
     }
     Frame {
         msec: 2080
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2096
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2112
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2128
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2144
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Key {
         type: 7
@@ -718,23 +718,23 @@ VisualTest {
     }
     Frame {
         msec: 2160
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2176
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2192
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2208
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Frame {
         msec: 2224
-        hash: "8c9706e5cc1dd8cba4312aa07249ae74"
+        hash: "22bdd816325b5466ca937cf2535a3ef8"
     }
     Key {
         type: 6
@@ -746,11 +746,11 @@ VisualTest {
     }
     Frame {
         msec: 2240
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 2256
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Key {
         type: 7
@@ -762,23 +762,23 @@ VisualTest {
     }
     Frame {
         msec: 2272
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 2288
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 2304
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 2320
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Frame {
         msec: 2336
-        hash: "d9af8bbbe324c23f69251847c64497d9"
+        hash: "a88ac2f56d3d75a277b0855e2baeda33"
     }
     Key {
         type: 6
@@ -790,15 +790,15 @@ VisualTest {
     }
     Frame {
         msec: 2352
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2368
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2384
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Key {
         type: 7
@@ -810,55 +810,55 @@ VisualTest {
     }
     Frame {
         msec: 2400
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2416
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2432
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2448
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2464
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2480
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2496
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2512
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2528
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2544
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2560
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2576
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Frame {
         msec: 2592
-        hash: "9a3654cf08a913058fd47c072e09a5c8"
+        hash: "0873eebe3bbcb864644811670642028e"
     }
     Key {
         type: 6
@@ -870,23 +870,23 @@ VisualTest {
     }
     Frame {
         msec: 2608
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2624
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2640
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2656
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2672
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Key {
         type: 7
@@ -898,23 +898,23 @@ VisualTest {
     }
     Frame {
         msec: 2688
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2704
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2720
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2736
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Frame {
         msec: 2752
-        hash: "dc2b08893d3ec12e2da923215eedf2de"
+        hash: "94d3da7909c84467c62deb2861104d21"
     }
     Key {
         type: 6
@@ -926,15 +926,15 @@ VisualTest {
     }
     Frame {
         msec: 2768
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 2784
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 2800
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Key {
         type: 7
@@ -946,19 +946,19 @@ VisualTest {
     }
     Frame {
         msec: 2816
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 2832
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 2848
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Frame {
         msec: 2864
-        hash: "755c3478a46c430b058e99cf433942b8"
+        hash: "5a7abe3d30f7dc66c2cda37b03ff339f"
     }
     Key {
         type: 6
@@ -974,15 +974,15 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 2912
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 2928
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Key {
         type: 7
@@ -994,23 +994,23 @@ VisualTest {
     }
     Frame {
         msec: 2944
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 2960
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 2976
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 2992
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Frame {
         msec: 3008
-        hash: "dbc65e33a133cd8fa7669175de83d94a"
+        hash: "ddf97bfd6216415dd2a56871f19c2d49"
     }
     Key {
         type: 6
@@ -1022,23 +1022,23 @@ VisualTest {
     }
     Frame {
         msec: 3024
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3040
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3056
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3072
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3088
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Key {
         type: 7
@@ -1050,155 +1050,155 @@ VisualTest {
     }
     Frame {
         msec: 3104
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3120
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3136
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3152
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3168
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3184
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3200
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3216
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3232
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3248
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3264
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3280
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3296
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3312
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3328
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3344
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3360
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3376
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3392
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3408
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3424
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3440
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3456
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3472
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3488
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3504
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3520
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3536
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3552
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3568
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3584
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3600
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3616
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3632
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3648
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3664
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3680
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Frame {
         msec: 3696
-        hash: "1e5621ab02591170fabc0d91c4a09c69"
+        hash: "5db508bc5a66018d9732cf8427461ef2"
     }
     Key {
         type: 6
@@ -1210,27 +1210,27 @@ VisualTest {
     }
     Frame {
         msec: 3712
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3728
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3744
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3760
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3776
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3792
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Key {
         type: 7
@@ -1242,11 +1242,11 @@ VisualTest {
     }
     Frame {
         msec: 3808
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3824
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3840
@@ -1254,118 +1254,118 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3872
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3888
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3904
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3920
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3936
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3952
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3968
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 3984
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4000
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4016
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4032
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4048
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4064
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4080
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4096
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4112
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4128
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4144
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4160
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4176
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4192
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4208
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4224
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4240
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4256
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4272
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4288
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
     Frame {
         msec: 4304
-        hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4"
+        hash: "9d4f0f25239a53ed9ac917df0c4a5f8e"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
index a3f0089..5049c3f 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
index 95772a9..ee6e16a 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
index 1b280eb..d9d2252 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
index 1b280eb..d9d2252 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
index cdd3dc0..cf99d98 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
index a3115f6..e3937f0 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
index d2c895b..2fe3337 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
index e0e1ced..97b9913 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
index bde3d7d..08e059f 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
index 38bf8be..bbc5ba2 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
index 7475f96..465b64e 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
index 1b280eb..d9d2252 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml
index c12ee51..a8173be 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml
@@ -6,83 +6,83 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 32
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 48
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 64
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 80
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 96
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 112
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 128
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 144
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 160
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 176
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 192
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 208
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 224
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 240
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 256
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 272
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 288
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 304
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 320
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Mouse {
         type: 2
@@ -94,23 +94,23 @@ VisualTest {
     }
     Frame {
         msec: 336
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 352
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 368
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 384
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 400
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Mouse {
         type: 3
@@ -122,63 +122,63 @@ VisualTest {
     }
     Frame {
         msec: 416
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 432
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 448
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 464
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 480
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 496
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 512
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 528
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 544
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 560
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 576
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 592
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 608
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 624
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Frame {
         msec: 640
-        hash: "e931c5f5d15e4f977e1822f2a6dd57df"
+        hash: "e742c08c259034e879b95eea60794e77"
     }
     Mouse {
         type: 2
@@ -190,11 +190,11 @@ VisualTest {
     }
     Frame {
         msec: 656
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 672
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Mouse {
         type: 3
@@ -206,71 +206,71 @@ VisualTest {
     }
     Frame {
         msec: 688
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 704
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 720
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 736
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 752
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 768
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 784
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 800
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 816
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 832
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 848
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 864
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 880
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 896
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 912
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 928
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 944
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 960
@@ -278,87 +278,87 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 992
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1008
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1024
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1040
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1056
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1072
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1088
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1104
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1120
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1136
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1152
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1168
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1184
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1200
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1216
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1232
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1248
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1264
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1280
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Frame {
         msec: 1296
-        hash: "01cf9ccfc86504bc6efe5fec1e68e537"
+        hash: "3eaecb73d32414207c898a36c9c41da3"
     }
     Key {
         type: 6
@@ -370,23 +370,23 @@ VisualTest {
     }
     Frame {
         msec: 1312
-        hash: "bac01431244974a1768d84318f49bf89"
+        hash: "c101a1d74691605f2740452950693e43"
     }
     Frame {
         msec: 1328
-        hash: "bac01431244974a1768d84318f49bf89"
+        hash: "c101a1d74691605f2740452950693e43"
     }
     Frame {
         msec: 1344
-        hash: "bac01431244974a1768d84318f49bf89"
+        hash: "c101a1d74691605f2740452950693e43"
     }
     Frame {
         msec: 1360
-        hash: "bac01431244974a1768d84318f49bf89"
+        hash: "c101a1d74691605f2740452950693e43"
     }
     Frame {
         msec: 1376
-        hash: "bac01431244974a1768d84318f49bf89"
+        hash: "c101a1d74691605f2740452950693e43"
     }
     Key {
         type: 7
@@ -398,7 +398,7 @@ VisualTest {
     }
     Frame {
         msec: 1392
-        hash: "bac01431244974a1768d84318f49bf89"
+        hash: "c101a1d74691605f2740452950693e43"
     }
     Key {
         type: 6
@@ -410,19 +410,19 @@ VisualTest {
     }
     Frame {
         msec: 1408
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1424
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1440
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1456
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Key {
         type: 7
@@ -434,27 +434,27 @@ VisualTest {
     }
     Frame {
         msec: 1472
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1488
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1504
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1520
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1536
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Frame {
         msec: 1552
-        hash: "e22c6376c05d52c8997a67bf21d82a83"
+        hash: "e3e33c9f73352079db2f5e96c0069974"
     }
     Key {
         type: 6
@@ -466,15 +466,15 @@ VisualTest {
     }
     Frame {
         msec: 1568
-        hash: "47f630d2cc3a3fa15309f5f631a36690"
+        hash: "0e79208365ec4b5a609d13b9e6c5c8d8"
     }
     Frame {
         msec: 1584
-        hash: "47f630d2cc3a3fa15309f5f631a36690"
+        hash: "0e79208365ec4b5a609d13b9e6c5c8d8"
     }
     Frame {
         msec: 1600
-        hash: "47f630d2cc3a3fa15309f5f631a36690"
+        hash: "0e79208365ec4b5a609d13b9e6c5c8d8"
     }
     Key {
         type: 7
@@ -486,7 +486,7 @@ VisualTest {
     }
     Frame {
         msec: 1616
-        hash: "47f630d2cc3a3fa15309f5f631a36690"
+        hash: "0e79208365ec4b5a609d13b9e6c5c8d8"
     }
     Key {
         type: 6
@@ -498,23 +498,23 @@ VisualTest {
     }
     Frame {
         msec: 1632
-        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+        hash: "5485c9cf4050ef8c1dda227d27326f78"
     }
     Frame {
         msec: 1648
-        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+        hash: "5485c9cf4050ef8c1dda227d27326f78"
     }
     Frame {
         msec: 1664
-        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+        hash: "5485c9cf4050ef8c1dda227d27326f78"
     }
     Frame {
         msec: 1680
-        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+        hash: "5485c9cf4050ef8c1dda227d27326f78"
     }
     Frame {
         msec: 1696
-        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+        hash: "5485c9cf4050ef8c1dda227d27326f78"
     }
     Key {
         type: 7
@@ -526,11 +526,11 @@ VisualTest {
     }
     Frame {
         msec: 1712
-        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+        hash: "5485c9cf4050ef8c1dda227d27326f78"
     }
     Frame {
         msec: 1728
-        hash: "b03df007a2e778d3f055ceb12ab61ec1"
+        hash: "5485c9cf4050ef8c1dda227d27326f78"
     }
     Key {
         type: 6
@@ -542,15 +542,15 @@ VisualTest {
     }
     Frame {
         msec: 1744
-        hash: "f73e5dc997ddc56554f914014c376f24"
+        hash: "1063a2e6164b372ba364c15c1c8b6ade"
     }
     Frame {
         msec: 1760
-        hash: "f73e5dc997ddc56554f914014c376f24"
+        hash: "1063a2e6164b372ba364c15c1c8b6ade"
     }
     Frame {
         msec: 1776
-        hash: "f73e5dc997ddc56554f914014c376f24"
+        hash: "1063a2e6164b372ba364c15c1c8b6ade"
     }
     Key {
         type: 7
@@ -562,15 +562,15 @@ VisualTest {
     }
     Frame {
         msec: 1792
-        hash: "f73e5dc997ddc56554f914014c376f24"
+        hash: "1063a2e6164b372ba364c15c1c8b6ade"
     }
     Frame {
         msec: 1808
-        hash: "f73e5dc997ddc56554f914014c376f24"
+        hash: "1063a2e6164b372ba364c15c1c8b6ade"
     }
     Frame {
         msec: 1824
-        hash: "f73e5dc997ddc56554f914014c376f24"
+        hash: "1063a2e6164b372ba364c15c1c8b6ade"
     }
     Key {
         type: 6
@@ -582,23 +582,23 @@ VisualTest {
     }
     Frame {
         msec: 1840
-        hash: "d089f840e514b68fad1edbbce686525f"
+        hash: "213c0057171a86bd4e2d898fac4d6642"
     }
     Frame {
         msec: 1856
-        hash: "d089f840e514b68fad1edbbce686525f"
+        hash: "213c0057171a86bd4e2d898fac4d6642"
     }
     Frame {
         msec: 1872
-        hash: "d089f840e514b68fad1edbbce686525f"
+        hash: "213c0057171a86bd4e2d898fac4d6642"
     }
     Frame {
         msec: 1888
-        hash: "d089f840e514b68fad1edbbce686525f"
+        hash: "213c0057171a86bd4e2d898fac4d6642"
     }
     Frame {
         msec: 1904
-        hash: "d089f840e514b68fad1edbbce686525f"
+        hash: "213c0057171a86bd4e2d898fac4d6642"
     }
     Key {
         type: 7
@@ -622,15 +622,15 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "9751cdca40cadacfc28de757b20ed639"
+        hash: "df9766751a5698f84f98faa0ac0e6f1a"
     }
     Frame {
         msec: 1952
-        hash: "9751cdca40cadacfc28de757b20ed639"
+        hash: "df9766751a5698f84f98faa0ac0e6f1a"
     }
     Frame {
         msec: 1968
-        hash: "9751cdca40cadacfc28de757b20ed639"
+        hash: "df9766751a5698f84f98faa0ac0e6f1a"
     }
     Key {
         type: 6
@@ -642,11 +642,11 @@ VisualTest {
     }
     Frame {
         msec: 1984
-        hash: "8fb457eb7c17974786ff239c09101d27"
+        hash: "47cb63f13c81ac6557ecc68d4e6f9c99"
     }
     Frame {
         msec: 2000
-        hash: "8fb457eb7c17974786ff239c09101d27"
+        hash: "47cb63f13c81ac6557ecc68d4e6f9c99"
     }
     Key {
         type: 7
@@ -658,7 +658,7 @@ VisualTest {
     }
     Frame {
         msec: 2016
-        hash: "8fb457eb7c17974786ff239c09101d27"
+        hash: "47cb63f13c81ac6557ecc68d4e6f9c99"
     }
     Key {
         type: 6
@@ -670,11 +670,11 @@ VisualTest {
     }
     Frame {
         msec: 2032
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Frame {
         msec: 2048
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Key {
         type: 7
@@ -686,19 +686,19 @@ VisualTest {
     }
     Frame {
         msec: 2064
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Frame {
         msec: 2080
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Frame {
         msec: 2096
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Frame {
         msec: 2112
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Key {
         type: 7
@@ -710,11 +710,11 @@ VisualTest {
     }
     Frame {
         msec: 2128
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Frame {
         msec: 2144
-        hash: "eeb022c3dd997ce86c3a60146d19b540"
+        hash: "4f39251d7a0071a67435d088f46fc4fe"
     }
     Key {
         type: 6
@@ -726,27 +726,27 @@ VisualTest {
     }
     Frame {
         msec: 2160
-        hash: "ba2033e83b5aef2408197ebf7db543a6"
+        hash: "722715a78e99d0f1f9a2830090c98f3c"
     }
     Frame {
         msec: 2176
-        hash: "ba2033e83b5aef2408197ebf7db543a6"
+        hash: "722715a78e99d0f1f9a2830090c98f3c"
     }
     Frame {
         msec: 2192
-        hash: "ba2033e83b5aef2408197ebf7db543a6"
+        hash: "722715a78e99d0f1f9a2830090c98f3c"
     }
     Frame {
         msec: 2208
-        hash: "ba2033e83b5aef2408197ebf7db543a6"
+        hash: "722715a78e99d0f1f9a2830090c98f3c"
     }
     Frame {
         msec: 2224
-        hash: "ba2033e83b5aef2408197ebf7db543a6"
+        hash: "722715a78e99d0f1f9a2830090c98f3c"
     }
     Frame {
         msec: 2240
-        hash: "ba2033e83b5aef2408197ebf7db543a6"
+        hash: "722715a78e99d0f1f9a2830090c98f3c"
     }
     Key {
         type: 7
@@ -766,23 +766,23 @@ VisualTest {
     }
     Frame {
         msec: 2256
-        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+        hash: "aa085c20f74a765297f7904680c7591e"
     }
     Frame {
         msec: 2272
-        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+        hash: "aa085c20f74a765297f7904680c7591e"
     }
     Frame {
         msec: 2288
-        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+        hash: "aa085c20f74a765297f7904680c7591e"
     }
     Frame {
         msec: 2304
-        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+        hash: "aa085c20f74a765297f7904680c7591e"
     }
     Frame {
         msec: 2320
-        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+        hash: "aa085c20f74a765297f7904680c7591e"
     }
     Key {
         type: 7
@@ -794,11 +794,11 @@ VisualTest {
     }
     Frame {
         msec: 2336
-        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+        hash: "aa085c20f74a765297f7904680c7591e"
     }
     Frame {
         msec: 2352
-        hash: "8a843083f0415f1e06bfe925b3bd7f52"
+        hash: "aa085c20f74a765297f7904680c7591e"
     }
     Key {
         type: 6
@@ -810,19 +810,19 @@ VisualTest {
     }
     Frame {
         msec: 2368
-        hash: "c3d6b261447c0fa65722c697b60ef415"
+        hash: "0cc1397ce700d4a84647dddee65241b3"
     }
     Frame {
         msec: 2384
-        hash: "c3d6b261447c0fa65722c697b60ef415"
+        hash: "0cc1397ce700d4a84647dddee65241b3"
     }
     Frame {
         msec: 2400
-        hash: "c3d6b261447c0fa65722c697b60ef415"
+        hash: "0cc1397ce700d4a84647dddee65241b3"
     }
     Frame {
         msec: 2416
-        hash: "c3d6b261447c0fa65722c697b60ef415"
+        hash: "0cc1397ce700d4a84647dddee65241b3"
     }
     Key {
         type: 7
@@ -834,7 +834,7 @@ VisualTest {
     }
     Frame {
         msec: 2432
-        hash: "c3d6b261447c0fa65722c697b60ef415"
+        hash: "0cc1397ce700d4a84647dddee65241b3"
     }
     Key {
         type: 6
@@ -846,27 +846,27 @@ VisualTest {
     }
     Frame {
         msec: 2448
-        hash: "7899672516311904cc7108f975290615"
+        hash: "ac693aa9030cc388dce9004916734aed"
     }
     Frame {
         msec: 2464
-        hash: "7899672516311904cc7108f975290615"
+        hash: "ac693aa9030cc388dce9004916734aed"
     }
     Frame {
         msec: 2480
-        hash: "7899672516311904cc7108f975290615"
+        hash: "ac693aa9030cc388dce9004916734aed"
     }
     Frame {
         msec: 2496
-        hash: "7899672516311904cc7108f975290615"
+        hash: "ac693aa9030cc388dce9004916734aed"
     }
     Frame {
         msec: 2512
-        hash: "7899672516311904cc7108f975290615"
+        hash: "ac693aa9030cc388dce9004916734aed"
     }
     Frame {
         msec: 2528
-        hash: "7899672516311904cc7108f975290615"
+        hash: "ac693aa9030cc388dce9004916734aed"
     }
     Key {
         type: 7
@@ -878,7 +878,7 @@ VisualTest {
     }
     Frame {
         msec: 2544
-        hash: "7899672516311904cc7108f975290615"
+        hash: "ac693aa9030cc388dce9004916734aed"
     }
     Key {
         type: 6
@@ -890,19 +890,19 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Frame {
         msec: 2576
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Frame {
         msec: 2592
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Frame {
         msec: 2608
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Key {
         type: 7
@@ -914,23 +914,23 @@ VisualTest {
     }
     Frame {
         msec: 2624
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Frame {
         msec: 2640
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Frame {
         msec: 2656
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Frame {
         msec: 2672
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Frame {
         msec: 2688
-        hash: "4c9dc2d3538a47f0c5f4e5b8f1863583"
+        hash: "e1f1b75892dc186e7f9546661722e259"
     }
     Key {
         type: 6
@@ -942,27 +942,27 @@ VisualTest {
     }
     Frame {
         msec: 2704
-        hash: "0e583b5b8c82af7fe74ff845abb57069"
+        hash: "4c1829c6c263cf290e0e71035f678589"
     }
     Frame {
         msec: 2720
-        hash: "0e583b5b8c82af7fe74ff845abb57069"
+        hash: "4c1829c6c263cf290e0e71035f678589"
     }
     Frame {
         msec: 2736
-        hash: "0e583b5b8c82af7fe74ff845abb57069"
+        hash: "4c1829c6c263cf290e0e71035f678589"
     }
     Frame {
         msec: 2752
-        hash: "0e583b5b8c82af7fe74ff845abb57069"
+        hash: "4c1829c6c263cf290e0e71035f678589"
     }
     Frame {
         msec: 2768
-        hash: "0e583b5b8c82af7fe74ff845abb57069"
+        hash: "4c1829c6c263cf290e0e71035f678589"
     }
     Frame {
         msec: 2784
-        hash: "0e583b5b8c82af7fe74ff845abb57069"
+        hash: "4c1829c6c263cf290e0e71035f678589"
     }
     Key {
         type: 6
@@ -974,7 +974,7 @@ VisualTest {
     }
     Frame {
         msec: 2800
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Key {
         type: 7
@@ -986,19 +986,19 @@ VisualTest {
     }
     Frame {
         msec: 2816
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Frame {
         msec: 2832
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Frame {
         msec: 2848
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Frame {
         msec: 2864
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Key {
         type: 7
@@ -1014,15 +1014,15 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Frame {
         msec: 2912
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Frame {
         msec: 2928
-        hash: "5b282d8041386acfd94eab03a0d40fe8"
+        hash: "fa5cf022b185f178d0121b442af01c00"
     }
     Key {
         type: 6
@@ -1034,15 +1034,15 @@ VisualTest {
     }
     Frame {
         msec: 2944
-        hash: "9b19fe7f4665fdbd471e22cac9d97bab"
+        hash: "b0748cac94695eb95774e0cdfabf47cc"
     }
     Frame {
         msec: 2960
-        hash: "9b19fe7f4665fdbd471e22cac9d97bab"
+        hash: "b0748cac94695eb95774e0cdfabf47cc"
     }
     Frame {
         msec: 2976
-        hash: "9b19fe7f4665fdbd471e22cac9d97bab"
+        hash: "b0748cac94695eb95774e0cdfabf47cc"
     }
     Key {
         type: 7
@@ -1062,19 +1062,19 @@ VisualTest {
     }
     Frame {
         msec: 2992
-        hash: "ed57767e75c850ad9bf2d08050419c56"
+        hash: "b05fc4c21113146463372b1ea981e265"
     }
     Frame {
         msec: 3008
-        hash: "ed57767e75c850ad9bf2d08050419c56"
+        hash: "b05fc4c21113146463372b1ea981e265"
     }
     Frame {
         msec: 3024
-        hash: "ed57767e75c850ad9bf2d08050419c56"
+        hash: "b05fc4c21113146463372b1ea981e265"
     }
     Frame {
         msec: 3040
-        hash: "ed57767e75c850ad9bf2d08050419c56"
+        hash: "b05fc4c21113146463372b1ea981e265"
     }
     Key {
         type: 7
@@ -1086,7 +1086,7 @@ VisualTest {
     }
     Frame {
         msec: 3056
-        hash: "ed57767e75c850ad9bf2d08050419c56"
+        hash: "b05fc4c21113146463372b1ea981e265"
     }
     Key {
         type: 6
@@ -1098,15 +1098,15 @@ VisualTest {
     }
     Frame {
         msec: 3072
-        hash: "225820f0472a6af17f56687a655b382a"
+        hash: "01b789845bf308fc896d53bbbfe0dd01"
     }
     Frame {
         msec: 3088
-        hash: "225820f0472a6af17f56687a655b382a"
+        hash: "01b789845bf308fc896d53bbbfe0dd01"
     }
     Frame {
         msec: 3104
-        hash: "225820f0472a6af17f56687a655b382a"
+        hash: "01b789845bf308fc896d53bbbfe0dd01"
     }
     Key {
         type: 6
@@ -1118,7 +1118,7 @@ VisualTest {
     }
     Frame {
         msec: 3120
-        hash: "225820f0472a6af17f56687a655b382a"
+        hash: "01b789845bf308fc896d53bbbfe0dd01"
     }
     Key {
         type: 7
@@ -1130,11 +1130,11 @@ VisualTest {
     }
     Frame {
         msec: 3136
-        hash: "225820f0472a6af17f56687a655b382a"
+        hash: "01b789845bf308fc896d53bbbfe0dd01"
     }
     Frame {
         msec: 3152
-        hash: "225820f0472a6af17f56687a655b382a"
+        hash: "01b789845bf308fc896d53bbbfe0dd01"
     }
     Key {
         type: 6
@@ -1146,19 +1146,19 @@ VisualTest {
     }
     Frame {
         msec: 3168
-        hash: "719effbf9211edc87c56cb5628a57ded"
+        hash: "433d805d957203918fc4a8edfc93290e"
     }
     Frame {
         msec: 3184
-        hash: "719effbf9211edc87c56cb5628a57ded"
+        hash: "433d805d957203918fc4a8edfc93290e"
     }
     Frame {
         msec: 3200
-        hash: "719effbf9211edc87c56cb5628a57ded"
+        hash: "433d805d957203918fc4a8edfc93290e"
     }
     Frame {
         msec: 3216
-        hash: "719effbf9211edc87c56cb5628a57ded"
+        hash: "433d805d957203918fc4a8edfc93290e"
     }
     Key {
         type: 7
@@ -1170,7 +1170,7 @@ VisualTest {
     }
     Frame {
         msec: 3232
-        hash: "719effbf9211edc87c56cb5628a57ded"
+        hash: "433d805d957203918fc4a8edfc93290e"
     }
     Key {
         type: 7
@@ -1190,19 +1190,19 @@ VisualTest {
     }
     Frame {
         msec: 3248
-        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+        hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d"
     }
     Frame {
         msec: 3264
-        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+        hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d"
     }
     Frame {
         msec: 3280
-        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+        hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d"
     }
     Frame {
         msec: 3296
-        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+        hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d"
     }
     Key {
         type: 7
@@ -1214,7 +1214,7 @@ VisualTest {
     }
     Frame {
         msec: 3312
-        hash: "5d8d2ba8c15937cc2f70414a71f87d24"
+        hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d"
     }
     Key {
         type: 6
@@ -1226,23 +1226,23 @@ VisualTest {
     }
     Frame {
         msec: 3328
-        hash: "4df9946eb277ca403fd63a2e19535369"
+        hash: "b4bc12141255c91630e775fcf4935f22"
     }
     Frame {
         msec: 3344
-        hash: "4df9946eb277ca403fd63a2e19535369"
+        hash: "b4bc12141255c91630e775fcf4935f22"
     }
     Frame {
         msec: 3360
-        hash: "4df9946eb277ca403fd63a2e19535369"
+        hash: "b4bc12141255c91630e775fcf4935f22"
     }
     Frame {
         msec: 3376
-        hash: "4df9946eb277ca403fd63a2e19535369"
+        hash: "b4bc12141255c91630e775fcf4935f22"
     }
     Frame {
         msec: 3392
-        hash: "4df9946eb277ca403fd63a2e19535369"
+        hash: "b4bc12141255c91630e775fcf4935f22"
     }
     Key {
         type: 7
@@ -1254,7 +1254,7 @@ VisualTest {
     }
     Frame {
         msec: 3408
-        hash: "4df9946eb277ca403fd63a2e19535369"
+        hash: "b4bc12141255c91630e775fcf4935f22"
     }
     Key {
         type: 6
@@ -1266,23 +1266,23 @@ VisualTest {
     }
     Frame {
         msec: 3424
-        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+        hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52"
     }
     Frame {
         msec: 3440
-        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+        hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52"
     }
     Frame {
         msec: 3456
-        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+        hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52"
     }
     Frame {
         msec: 3472
-        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+        hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52"
     }
     Frame {
         msec: 3488
-        hash: "bb1bde5147f4f203f2af3787df0f0c7a"
+        hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52"
     }
     Key {
         type: 7
@@ -1302,27 +1302,27 @@ VisualTest {
     }
     Frame {
         msec: 3504
-        hash: "60225c94dc1e1485406d8ba59737d383"
+        hash: "3f154d5eace7e0e688fe609d7eebe80d"
     }
     Frame {
         msec: 3520
-        hash: "60225c94dc1e1485406d8ba59737d383"
+        hash: "3f154d5eace7e0e688fe609d7eebe80d"
     }
     Frame {
         msec: 3536
-        hash: "60225c94dc1e1485406d8ba59737d383"
+        hash: "3f154d5eace7e0e688fe609d7eebe80d"
     }
     Frame {
         msec: 3552
-        hash: "60225c94dc1e1485406d8ba59737d383"
+        hash: "3f154d5eace7e0e688fe609d7eebe80d"
     }
     Frame {
         msec: 3568
-        hash: "60225c94dc1e1485406d8ba59737d383"
+        hash: "3f154d5eace7e0e688fe609d7eebe80d"
     }
     Frame {
         msec: 3584
-        hash: "60225c94dc1e1485406d8ba59737d383"
+        hash: "3f154d5eace7e0e688fe609d7eebe80d"
     }
     Key {
         type: 7
@@ -1334,7 +1334,7 @@ VisualTest {
     }
     Frame {
         msec: 3600
-        hash: "60225c94dc1e1485406d8ba59737d383"
+        hash: "3f154d5eace7e0e688fe609d7eebe80d"
     }
     Key {
         type: 6
@@ -1346,19 +1346,19 @@ VisualTest {
     }
     Frame {
         msec: 3616
-        hash: "8321580dd92a92edbf12df43259999f4"
+        hash: "8cecca2b1a586b7121692a8f618a1a50"
     }
     Frame {
         msec: 3632
-        hash: "8321580dd92a92edbf12df43259999f4"
+        hash: "8cecca2b1a586b7121692a8f618a1a50"
     }
     Frame {
         msec: 3648
-        hash: "8321580dd92a92edbf12df43259999f4"
+        hash: "8cecca2b1a586b7121692a8f618a1a50"
     }
     Frame {
         msec: 3664
-        hash: "8321580dd92a92edbf12df43259999f4"
+        hash: "8cecca2b1a586b7121692a8f618a1a50"
     }
     Key {
         type: 6
@@ -1370,7 +1370,7 @@ VisualTest {
     }
     Frame {
         msec: 3680
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Key {
         type: 7
@@ -1382,15 +1382,15 @@ VisualTest {
     }
     Frame {
         msec: 3696
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3712
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3728
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Key {
         type: 7
@@ -1402,27 +1402,27 @@ VisualTest {
     }
     Frame {
         msec: 3744
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3760
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3776
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3792
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3808
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3824
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3840
@@ -1430,35 +1430,35 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3872
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3888
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3904
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3920
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3936
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3952
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Frame {
         msec: 3968
-        hash: "d704cc8d5bbdc8768d25372aa654925c"
+        hash: "90bd87209b6d26785689779641b1f506"
     }
     Key {
         type: 6
@@ -1470,23 +1470,23 @@ VisualTest {
     }
     Frame {
         msec: 3984
-        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+        hash: "7fac93ef3184d5a844448c75b0aa8e18"
     }
     Frame {
         msec: 4000
-        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+        hash: "7fac93ef3184d5a844448c75b0aa8e18"
     }
     Frame {
         msec: 4016
-        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+        hash: "7fac93ef3184d5a844448c75b0aa8e18"
     }
     Frame {
         msec: 4032
-        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+        hash: "7fac93ef3184d5a844448c75b0aa8e18"
     }
     Frame {
         msec: 4048
-        hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3"
+        hash: "7fac93ef3184d5a844448c75b0aa8e18"
     }
     Key {
         type: 6
@@ -1498,7 +1498,7 @@ VisualTest {
     }
     Frame {
         msec: 4064
-        hash: "89613ce626a22573fa41191fcede3273"
+        hash: "591366861f9e23276042250d5b1da7f9"
     }
     Key {
         type: 7
@@ -1510,19 +1510,19 @@ VisualTest {
     }
     Frame {
         msec: 4080
-        hash: "89613ce626a22573fa41191fcede3273"
+        hash: "591366861f9e23276042250d5b1da7f9"
     }
     Frame {
         msec: 4096
-        hash: "89613ce626a22573fa41191fcede3273"
+        hash: "591366861f9e23276042250d5b1da7f9"
     }
     Frame {
         msec: 4112
-        hash: "89613ce626a22573fa41191fcede3273"
+        hash: "591366861f9e23276042250d5b1da7f9"
     }
     Frame {
         msec: 4128
-        hash: "89613ce626a22573fa41191fcede3273"
+        hash: "591366861f9e23276042250d5b1da7f9"
     }
     Key {
         type: 6
@@ -1534,11 +1534,11 @@ VisualTest {
     }
     Frame {
         msec: 4144
-        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+        hash: "c5c33e5f4429698b1a1bc084a41d303d"
     }
     Frame {
         msec: 4160
-        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+        hash: "c5c33e5f4429698b1a1bc084a41d303d"
     }
     Key {
         type: 7
@@ -1550,15 +1550,15 @@ VisualTest {
     }
     Frame {
         msec: 4176
-        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+        hash: "c5c33e5f4429698b1a1bc084a41d303d"
     }
     Frame {
         msec: 4192
-        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+        hash: "c5c33e5f4429698b1a1bc084a41d303d"
     }
     Frame {
         msec: 4208
-        hash: "7d9ef94b610cc7e9bcfd04bfac91ae38"
+        hash: "c5c33e5f4429698b1a1bc084a41d303d"
     }
     Key {
         type: 6
@@ -1570,11 +1570,11 @@ VisualTest {
     }
     Frame {
         msec: 4224
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Frame {
         msec: 4240
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Key {
         type: 7
@@ -1586,11 +1586,11 @@ VisualTest {
     }
     Frame {
         msec: 4256
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Frame {
         msec: 4272
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Key {
         type: 7
@@ -1602,27 +1602,27 @@ VisualTest {
     }
     Frame {
         msec: 4288
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Frame {
         msec: 4304
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Frame {
         msec: 4320
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Frame {
         msec: 4336
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Frame {
         msec: 4352
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Frame {
         msec: 4368
-        hash: "9653692fe9292ef0d0559412f68e9cf7"
+        hash: "36223521c9ab06661239329c14e4fabe"
     }
     Key {
         type: 6
@@ -1634,23 +1634,23 @@ VisualTest {
     }
     Frame {
         msec: 4384
-        hash: "902831b5d2a134629e04b53c87cdc709"
+        hash: "22ab171b9805302b729afd314e55a0f4"
     }
     Frame {
         msec: 4400
-        hash: "902831b5d2a134629e04b53c87cdc709"
+        hash: "22ab171b9805302b729afd314e55a0f4"
     }
     Frame {
         msec: 4416
-        hash: "902831b5d2a134629e04b53c87cdc709"
+        hash: "22ab171b9805302b729afd314e55a0f4"
     }
     Frame {
         msec: 4432
-        hash: "902831b5d2a134629e04b53c87cdc709"
+        hash: "22ab171b9805302b729afd314e55a0f4"
     }
     Frame {
         msec: 4448
-        hash: "902831b5d2a134629e04b53c87cdc709"
+        hash: "22ab171b9805302b729afd314e55a0f4"
     }
     Key {
         type: 7
@@ -1662,7 +1662,7 @@ VisualTest {
     }
     Frame {
         msec: 4464
-        hash: "902831b5d2a134629e04b53c87cdc709"
+        hash: "22ab171b9805302b729afd314e55a0f4"
     }
     Key {
         type: 6
@@ -1674,23 +1674,23 @@ VisualTest {
     }
     Frame {
         msec: 4480
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4496
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4512
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4528
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4544
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Key {
         type: 7
@@ -1702,15 +1702,15 @@ VisualTest {
     }
     Frame {
         msec: 4560
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4576
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4592
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Key {
         type: 6
@@ -1722,51 +1722,51 @@ VisualTest {
     }
     Frame {
         msec: 4608
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4624
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4640
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4656
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4672
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4688
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4704
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4720
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4736
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4752
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4768
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4784
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4800
@@ -1774,11 +1774,11 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Frame {
         msec: 4832
-        hash: "cc1dc01f123309c70743535f61b18278"
+        hash: "beaad223234484e21f824ceb7f1edc2a"
     }
     Key {
         type: 6
@@ -1790,31 +1790,31 @@ VisualTest {
     }
     Frame {
         msec: 4848
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4864
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4880
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4896
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4912
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4928
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4944
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Key {
         type: 7
@@ -1826,19 +1826,19 @@ VisualTest {
     }
     Frame {
         msec: 4960
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4976
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 4992
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5008
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Key {
         type: 7
@@ -1850,187 +1850,187 @@ VisualTest {
     }
     Frame {
         msec: 5024
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5040
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5056
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5072
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5088
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5104
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5120
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5136
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5152
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5168
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5184
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5200
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5216
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5232
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5248
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5264
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5280
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5296
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5312
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5328
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5344
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5360
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5376
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5392
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5408
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5424
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5440
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5456
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5472
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5488
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5504
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5520
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5536
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5552
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5568
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5584
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5600
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5616
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5632
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5648
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5664
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5680
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5696
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5712
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5728
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5744
-        hash: "652b66d0b62e7fcf9d4fff50296966b0"
+        hash: "49b26f36a10d808fdcb8248a384a4da6"
     }
     Frame {
         msec: 5760
@@ -2046,19 +2046,19 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "a8710131aa2cfcedeb1956319174bd44"
+        hash: "476040951352f144bda4ed7fb817cd7f"
     }
     Frame {
         msec: 5792
-        hash: "a8710131aa2cfcedeb1956319174bd44"
+        hash: "476040951352f144bda4ed7fb817cd7f"
     }
     Frame {
         msec: 5808
-        hash: "a8710131aa2cfcedeb1956319174bd44"
+        hash: "476040951352f144bda4ed7fb817cd7f"
     }
     Frame {
         msec: 5824
-        hash: "a8710131aa2cfcedeb1956319174bd44"
+        hash: "476040951352f144bda4ed7fb817cd7f"
     }
     Mouse {
         type: 5
@@ -2078,7 +2078,7 @@ VisualTest {
     }
     Frame {
         msec: 5840
-        hash: "a8710131aa2cfcedeb1956319174bd44"
+        hash: "476040951352f144bda4ed7fb817cd7f"
     }
     Mouse {
         type: 5
@@ -2098,7 +2098,7 @@ VisualTest {
     }
     Frame {
         msec: 5856
-        hash: "069e40e23640f303e24f8821907bf907"
+        hash: "9ecb1e68ab724c6f83b1a37aa1cb15c4"
     }
     Mouse {
         type: 5
@@ -2118,7 +2118,7 @@ VisualTest {
     }
     Frame {
         msec: 5872
-        hash: "069e40e23640f303e24f8821907bf907"
+        hash: "9ecb1e68ab724c6f83b1a37aa1cb15c4"
     }
     Mouse {
         type: 5
@@ -2138,7 +2138,7 @@ VisualTest {
     }
     Frame {
         msec: 5888
-        hash: "3aba0fbccdbbbfc6b452464a35941f01"
+        hash: "9ecb1e68ab724c6f83b1a37aa1cb15c4"
     }
     Mouse {
         type: 5
@@ -2158,7 +2158,7 @@ VisualTest {
     }
     Frame {
         msec: 5904
-        hash: "8d68c5797a7a3be6ab1bc83a1adea983"
+        hash: "173735fb4be11da603fb8ae8cffc609d"
     }
     Mouse {
         type: 5
@@ -2178,7 +2178,7 @@ VisualTest {
     }
     Frame {
         msec: 5920
-        hash: "633201d777634e5a2e4ccc0ba7a84ada"
+        hash: "173735fb4be11da603fb8ae8cffc609d"
     }
     Mouse {
         type: 5
@@ -2198,7 +2198,7 @@ VisualTest {
     }
     Frame {
         msec: 5936
-        hash: "e1d36d4dbdff47e6b6f864dae077bc7f"
+        hash: "b337a09f359fb2a237731c66ab95c92c"
     }
     Mouse {
         type: 5
@@ -2218,7 +2218,7 @@ VisualTest {
     }
     Frame {
         msec: 5952
-        hash: "905419e116b2c93145c85456e6e7ccac"
+        hash: "32719becb40f8c6bd49b5f5754786913"
     }
     Mouse {
         type: 5
@@ -2238,7 +2238,7 @@ VisualTest {
     }
     Frame {
         msec: 5968
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2250,7 +2250,7 @@ VisualTest {
     }
     Frame {
         msec: 5984
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2270,7 +2270,7 @@ VisualTest {
     }
     Frame {
         msec: 6000
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2290,7 +2290,7 @@ VisualTest {
     }
     Frame {
         msec: 6016
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2310,7 +2310,7 @@ VisualTest {
     }
     Frame {
         msec: 6032
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2330,7 +2330,7 @@ VisualTest {
     }
     Frame {
         msec: 6048
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2350,7 +2350,7 @@ VisualTest {
     }
     Frame {
         msec: 6064
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2370,7 +2370,7 @@ VisualTest {
     }
     Frame {
         msec: 6080
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2390,7 +2390,7 @@ VisualTest {
     }
     Frame {
         msec: 6096
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2410,7 +2410,7 @@ VisualTest {
     }
     Frame {
         msec: 6112
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2430,7 +2430,7 @@ VisualTest {
     }
     Frame {
         msec: 6128
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2450,7 +2450,7 @@ VisualTest {
     }
     Frame {
         msec: 6144
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2470,7 +2470,7 @@ VisualTest {
     }
     Frame {
         msec: 6160
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2490,7 +2490,7 @@ VisualTest {
     }
     Frame {
         msec: 6176
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2502,23 +2502,23 @@ VisualTest {
     }
     Frame {
         msec: 6192
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Frame {
         msec: 6208
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Frame {
         msec: 6224
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Frame {
         msec: 6240
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Frame {
         msec: 6256
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2530,7 +2530,7 @@ VisualTest {
     }
     Frame {
         msec: 6272
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2550,7 +2550,7 @@ VisualTest {
     }
     Frame {
         msec: 6288
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2570,7 +2570,7 @@ VisualTest {
     }
     Frame {
         msec: 6304
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2590,7 +2590,7 @@ VisualTest {
     }
     Frame {
         msec: 6320
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2610,7 +2610,7 @@ VisualTest {
     }
     Frame {
         msec: 6336
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2630,7 +2630,7 @@ VisualTest {
     }
     Frame {
         msec: 6352
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2650,7 +2650,7 @@ VisualTest {
     }
     Frame {
         msec: 6368
-        hash: "f851ebbbab70e4f283caefc26f304946"
+        hash: "e6bff88d0a5e2e7df4b3355749ecc902"
     }
     Mouse {
         type: 5
@@ -2670,7 +2670,7 @@ VisualTest {
     }
     Frame {
         msec: 6384
-        hash: "ca385b53209d35e0c78e8124c782d03f"
+        hash: "5de7bbfdf96d84c8fbe74b4817a3c88a"
     }
     Mouse {
         type: 5
@@ -2682,7 +2682,7 @@ VisualTest {
     }
     Frame {
         msec: 6400
-        hash: "ca385b53209d35e0c78e8124c782d03f"
+        hash: "5de7bbfdf96d84c8fbe74b4817a3c88a"
     }
     Mouse {
         type: 5
@@ -2702,7 +2702,7 @@ VisualTest {
     }
     Frame {
         msec: 6416
-        hash: "730fa19a0deb6e210ee7ca136ecfb4e0"
+        hash: "056d22660f6feedfb453755978aa4c1d"
     }
     Mouse {
         type: 5
@@ -2722,7 +2722,7 @@ VisualTest {
     }
     Frame {
         msec: 6432
-        hash: "e749a531bb6b30611bed794e2630555f"
+        hash: "9d8568931fdca572dd31ea62ebbaf76a"
     }
     Mouse {
         type: 5
@@ -2742,7 +2742,7 @@ VisualTest {
     }
     Frame {
         msec: 6448
-        hash: "4d7a02eeb0d0ed7eb29fbfb72bce9ba1"
+        hash: "29aa2da8a830d5605a8d2d2543097177"
     }
     Mouse {
         type: 5
@@ -2754,7 +2754,7 @@ VisualTest {
     }
     Frame {
         msec: 6464
-        hash: "2476a4d7038b9f1c50557cf077ea4412"
+        hash: "154e312998b32cc09daf1693d07eda2f"
     }
     Mouse {
         type: 5
@@ -2774,7 +2774,7 @@ VisualTest {
     }
     Frame {
         msec: 6480
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2794,7 +2794,7 @@ VisualTest {
     }
     Frame {
         msec: 6496
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2814,7 +2814,7 @@ VisualTest {
     }
     Frame {
         msec: 6512
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2834,7 +2834,7 @@ VisualTest {
     }
     Frame {
         msec: 6528
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2854,7 +2854,7 @@ VisualTest {
     }
     Frame {
         msec: 6544
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2874,7 +2874,7 @@ VisualTest {
     }
     Frame {
         msec: 6560
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2894,7 +2894,7 @@ VisualTest {
     }
     Frame {
         msec: 6576
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2914,27 +2914,27 @@ VisualTest {
     }
     Frame {
         msec: 6592
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Frame {
         msec: 6608
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Frame {
         msec: 6624
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Frame {
         msec: 6640
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Frame {
         msec: 6656
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Frame {
         msec: 6672
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2954,7 +2954,7 @@ VisualTest {
     }
     Frame {
         msec: 6688
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -2974,7 +2974,7 @@ VisualTest {
     }
     Frame {
         msec: 6704
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3014,7 +3014,7 @@ VisualTest {
     }
     Frame {
         msec: 6736
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3034,7 +3034,7 @@ VisualTest {
     }
     Frame {
         msec: 6752
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3054,7 +3054,7 @@ VisualTest {
     }
     Frame {
         msec: 6768
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3074,7 +3074,7 @@ VisualTest {
     }
     Frame {
         msec: 6784
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3094,7 +3094,7 @@ VisualTest {
     }
     Frame {
         msec: 6800
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3114,7 +3114,7 @@ VisualTest {
     }
     Frame {
         msec: 6816
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3134,7 +3134,7 @@ VisualTest {
     }
     Frame {
         msec: 6832
-        hash: "ff9bdea73a03bc51f76b6732176a0bad"
+        hash: "5b3a17fd92fe5117aa405d4c737e6673"
     }
     Mouse {
         type: 5
@@ -3154,7 +3154,7 @@ VisualTest {
     }
     Frame {
         msec: 6848
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "476040951352f144bda4ed7fb817cd7f"
     }
     Mouse {
         type: 5
@@ -3174,7 +3174,7 @@ VisualTest {
     }
     Frame {
         msec: 6864
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Mouse {
         type: 5
@@ -3194,7 +3194,7 @@ VisualTest {
     }
     Frame {
         msec: 6880
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Mouse {
         type: 3
@@ -3206,55 +3206,55 @@ VisualTest {
     }
     Frame {
         msec: 6896
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 6912
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 6928
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 6944
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 6960
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 6976
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 6992
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 7008
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 7024
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 7040
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 7056
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 7072
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Frame {
         msec: 7088
-        hash: "2b0458102c2231777202e66e0eaa8c8c"
+        hash: "2cb10cb75beb454df7918b6948c6ad8a"
     }
     Mouse {
         type: 2
@@ -3266,23 +3266,23 @@ VisualTest {
     }
     Frame {
         msec: 7104
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7120
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7136
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7152
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7168
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Mouse {
         type: 3
@@ -3294,103 +3294,103 @@ VisualTest {
     }
     Frame {
         msec: 7184
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7200
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7216
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7232
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7248
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7264
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7280
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7296
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7312
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7328
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7344
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7360
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7376
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7392
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7408
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7424
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7440
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7456
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7472
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7488
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7504
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7520
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7536
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7552
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Frame {
         msec: 7568
-        hash: "2ca3f2d1e4673bd97d05b43c4b70174a"
+        hash: "eafa794e0c09cc2558575bafa945ecdf"
     }
     Key {
         type: 6
@@ -3402,15 +3402,15 @@ VisualTest {
     }
     Frame {
         msec: 7584
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Frame {
         msec: 7600
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Frame {
         msec: 7616
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Key {
         type: 7
@@ -3422,15 +3422,15 @@ VisualTest {
     }
     Frame {
         msec: 7632
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Frame {
         msec: 7648
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Frame {
         msec: 7664
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Frame {
         msec: 7680
@@ -3438,11 +3438,11 @@ VisualTest {
     }
     Frame {
         msec: 7696
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Frame {
         msec: 7712
-        hash: "ed7e9042cc805a60b1e8cf58a654ac66"
+        hash: "0444d714b801f88685df9722390faf4f"
     }
     Key {
         type: 6
@@ -3454,63 +3454,63 @@ VisualTest {
     }
     Frame {
         msec: 7728
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7744
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7760
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7776
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7792
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7808
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7824
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7840
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7856
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7872
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7888
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7904
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7920
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7936
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Frame {
         msec: 7952
-        hash: "16829fffc675d304661b9ff844a675f3"
+        hash: "250a49b60ad8e9b901977e01063ec20a"
     }
     Key {
         type: 7
@@ -3530,11 +3530,11 @@ VisualTest {
     }
     Frame {
         msec: 7968
-        hash: "45cfab0823b20b5dc206b42781cd9fb0"
+        hash: "bec2aea61fef64475e638848b96d28c3"
     }
     Frame {
         msec: 7984
-        hash: "45cfab0823b20b5dc206b42781cd9fb0"
+        hash: "bec2aea61fef64475e638848b96d28c3"
     }
     Key {
         type: 7
@@ -3554,11 +3554,11 @@ VisualTest {
     }
     Frame {
         msec: 8000
-        hash: "01069fb12c399f4d22d4d4ec79779752"
+        hash: "54177e0d53373636850e18399640fee8"
     }
     Frame {
         msec: 8016
-        hash: "01069fb12c399f4d22d4d4ec79779752"
+        hash: "54177e0d53373636850e18399640fee8"
     }
     Key {
         type: 7
@@ -3578,11 +3578,11 @@ VisualTest {
     }
     Frame {
         msec: 8032
-        hash: "88b6c6cca32a6d4adfc51cc7cce5e4bb"
+        hash: "81c03bd9dfd562e9f13784c906fa0d9e"
     }
     Frame {
         msec: 8048
-        hash: "88b6c6cca32a6d4adfc51cc7cce5e4bb"
+        hash: "81c03bd9dfd562e9f13784c906fa0d9e"
     }
     Key {
         type: 7
@@ -3602,11 +3602,11 @@ VisualTest {
     }
     Frame {
         msec: 8064
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Frame {
         msec: 8080
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Key {
         type: 6
@@ -3626,31 +3626,31 @@ VisualTest {
     }
     Frame {
         msec: 8096
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Frame {
         msec: 8112
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Frame {
         msec: 8128
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Frame {
         msec: 8144
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Frame {
         msec: 8160
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Frame {
         msec: 8176
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Frame {
         msec: 8192
-        hash: "7b8423cfd0806b7d29cdb366133ef828"
+        hash: "2547fbe956bab6566c2b9137c0edc841"
     }
     Key {
         type: 6
@@ -3662,19 +3662,19 @@ VisualTest {
     }
     Frame {
         msec: 8208
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Frame {
         msec: 8224
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Frame {
         msec: 8240
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Frame {
         msec: 8256
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Key {
         type: 7
@@ -3686,19 +3686,19 @@ VisualTest {
     }
     Frame {
         msec: 8272
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Frame {
         msec: 8288
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Frame {
         msec: 8304
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Frame {
         msec: 8320
-        hash: "45feb9f7c516693224505726324e07f1"
+        hash: "c757d4e60d18ce16f87c66e42cc81a99"
     }
     Key {
         type: 6
@@ -3710,19 +3710,19 @@ VisualTest {
     }
     Frame {
         msec: 8336
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Frame {
         msec: 8352
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Frame {
         msec: 8368
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Frame {
         msec: 8384
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Key {
         type: 7
@@ -3734,23 +3734,23 @@ VisualTest {
     }
     Frame {
         msec: 8400
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Frame {
         msec: 8416
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Frame {
         msec: 8432
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Frame {
         msec: 8448
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Frame {
         msec: 8464
-        hash: "592811b385809e02c02e5925191fbc0c"
+        hash: "2ef578193024153dc85a2a92d10dc6c0"
     }
     Key {
         type: 6
@@ -3762,19 +3762,19 @@ VisualTest {
     }
     Frame {
         msec: 8480
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8496
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8512
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8528
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Key {
         type: 7
@@ -3786,27 +3786,27 @@ VisualTest {
     }
     Frame {
         msec: 8544
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8560
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8576
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8592
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8608
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8624
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8640
@@ -3814,7 +3814,7 @@ VisualTest {
     }
     Frame {
         msec: 8656
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Key {
         type: 7
@@ -3826,139 +3826,139 @@ VisualTest {
     }
     Frame {
         msec: 8672
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8688
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8704
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8720
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8736
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8752
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8768
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8784
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8800
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8816
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8832
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8848
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8864
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8880
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8896
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8912
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8928
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8944
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8960
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8976
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 8992
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9008
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9024
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9040
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9056
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9072
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9088
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9104
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9120
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9136
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9152
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9168
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9184
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9200
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Mouse {
         type: 2
@@ -3970,11 +3970,11 @@ VisualTest {
     }
     Frame {
         msec: 9216
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9232
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Mouse {
         type: 5
@@ -3986,7 +3986,7 @@ VisualTest {
     }
     Frame {
         msec: 9248
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Mouse {
         type: 5
@@ -4006,7 +4006,7 @@ VisualTest {
     }
     Frame {
         msec: 9264
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Mouse {
         type: 5
@@ -4026,7 +4026,7 @@ VisualTest {
     }
     Frame {
         msec: 9280
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Mouse {
         type: 3
@@ -4038,43 +4038,43 @@ VisualTest {
     }
     Frame {
         msec: 9296
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9312
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9328
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9344
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9360
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9376
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9392
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9408
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9424
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Frame {
         msec: 9440
-        hash: "e9b5feff425d22a5dcecc57ebb3d5379"
+        hash: "47e926162c6d695d2bdb7ec9de05f0cc"
     }
     Mouse {
         type: 2
@@ -4086,27 +4086,27 @@ VisualTest {
     }
     Frame {
         msec: 9456
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9472
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9488
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9504
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9520
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9536
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Mouse {
         type: 3
@@ -4118,15 +4118,15 @@ VisualTest {
     }
     Frame {
         msec: 9552
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9568
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9584
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9600
@@ -4134,19 +4134,19 @@ VisualTest {
     }
     Frame {
         msec: 9616
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9632
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9648
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9664
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Key {
         type: 6
@@ -4158,111 +4158,111 @@ VisualTest {
     }
     Frame {
         msec: 9680
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9696
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9712
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9728
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9744
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9760
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9776
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9792
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9808
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9824
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9840
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9856
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9872
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9888
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9904
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9920
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9936
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9952
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9968
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 9984
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10000
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10016
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10032
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10048
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10064
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10080
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10096
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Key {
         type: 6
@@ -4274,35 +4274,35 @@ VisualTest {
     }
     Frame {
         msec: 10112
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10128
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10144
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10160
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10176
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10192
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10208
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10224
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Key {
         type: 7
@@ -4314,35 +4314,35 @@ VisualTest {
     }
     Frame {
         msec: 10240
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10256
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10272
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10288
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10304
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10320
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10336
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Frame {
         msec: 10352
-        hash: "f3e8f8174b1c995d76e68fea7f21f285"
+        hash: "2ef5e7b2c0edc631765ea12d1f7abf33"
     }
     Key {
         type: 6
@@ -4354,27 +4354,27 @@ VisualTest {
     }
     Frame {
         msec: 10368
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10384
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10400
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10416
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10432
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10448
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Key {
         type: 7
@@ -4386,27 +4386,27 @@ VisualTest {
     }
     Frame {
         msec: 10464
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10480
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10496
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10512
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10528
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10544
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10560
@@ -4414,23 +4414,23 @@ VisualTest {
     }
     Frame {
         msec: 10576
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10592
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10608
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10624
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10640
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Key {
         type: 7
@@ -4442,219 +4442,219 @@ VisualTest {
     }
     Frame {
         msec: 10656
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10672
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10688
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10704
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10720
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10736
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10752
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10768
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10784
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10800
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10816
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10832
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10848
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10864
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10880
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10896
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10912
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10928
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10944
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10960
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10976
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 10992
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11008
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11024
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11040
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11056
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11072
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11088
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11104
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11120
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11136
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11152
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11168
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11184
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11200
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11216
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11232
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11248
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11264
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11280
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11296
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11312
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11328
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11344
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11360
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11376
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11392
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11408
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11424
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11440
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11456
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11472
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11488
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11504
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11520
@@ -4662,26 +4662,26 @@ VisualTest {
     }
     Frame {
         msec: 11536
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11552
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11568
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11584
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11600
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
     Frame {
         msec: 11616
-        hash: "94c707f2778a4f327f0c49265a42dfb4"
+        hash: "c3914ed0d035a39423a1f2cf9ac6c165"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
index 0d1fa54..61606b2 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
index bedf721..a4b28fc 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
index f17abe2..5be6bbb 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
index a98e8ef..a220f65 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
index 36801d8..6946707 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
index 35c39e7..4eeb8ec 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
index 35c39e7..4eeb8ec 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml
index 3e36073..f1bb5a9 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml
@@ -6,7 +6,7 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "2bfc2ce5462c1b2e8177159590e8bf9d"
+        hash: "b6611676a7d38162d5c0210ea9d0e291"
     }
     Key {
         type: 6
@@ -18,7 +18,7 @@ VisualTest {
     }
     Frame {
         msec: 32
-        hash: "2aebd6f552933d74ad64e953728c44a6"
+        hash: "b7fc43d4344c8d39f4240dadead86b1e"
     }
     Key {
         type: 7
@@ -30,11 +30,11 @@ VisualTest {
     }
     Frame {
         msec: 48
-        hash: "2aebd6f552933d74ad64e953728c44a6"
+        hash: "b7fc43d4344c8d39f4240dadead86b1e"
     }
     Frame {
         msec: 64
-        hash: "2aebd6f552933d74ad64e953728c44a6"
+        hash: "b7fc43d4344c8d39f4240dadead86b1e"
     }
     Key {
         type: 7
@@ -46,11 +46,11 @@ VisualTest {
     }
     Frame {
         msec: 80
-        hash: "2aebd6f552933d74ad64e953728c44a6"
+        hash: "b7fc43d4344c8d39f4240dadead86b1e"
     }
     Frame {
         msec: 96
-        hash: "2aebd6f552933d74ad64e953728c44a6"
+        hash: "b7fc43d4344c8d39f4240dadead86b1e"
     }
     Key {
         type: 6
@@ -62,15 +62,15 @@ VisualTest {
     }
     Frame {
         msec: 112
-        hash: "96f0f1c8ddc760ddb454c374faa75239"
+        hash: "23006a07263b8b3240c4080fb1d587e9"
     }
     Frame {
         msec: 128
-        hash: "96f0f1c8ddc760ddb454c374faa75239"
+        hash: "23006a07263b8b3240c4080fb1d587e9"
     }
     Frame {
         msec: 144
-        hash: "96f0f1c8ddc760ddb454c374faa75239"
+        hash: "23006a07263b8b3240c4080fb1d587e9"
     }
     Key {
         type: 6
@@ -82,15 +82,15 @@ VisualTest {
     }
     Frame {
         msec: 160
-        hash: "5660942e66cdc499a067b1209b46a593"
+        hash: "8a60fd38fb9c171a15bf7e6e51bee664"
     }
     Frame {
         msec: 176
-        hash: "5660942e66cdc499a067b1209b46a593"
+        hash: "8a60fd38fb9c171a15bf7e6e51bee664"
     }
     Frame {
         msec: 192
-        hash: "5660942e66cdc499a067b1209b46a593"
+        hash: "8a60fd38fb9c171a15bf7e6e51bee664"
     }
     Key {
         type: 7
@@ -102,11 +102,11 @@ VisualTest {
     }
     Frame {
         msec: 208
-        hash: "5660942e66cdc499a067b1209b46a593"
+        hash: "8a60fd38fb9c171a15bf7e6e51bee664"
     }
     Frame {
         msec: 224
-        hash: "5660942e66cdc499a067b1209b46a593"
+        hash: "8a60fd38fb9c171a15bf7e6e51bee664"
     }
     Key {
         type: 6
@@ -118,7 +118,7 @@ VisualTest {
     }
     Frame {
         msec: 240
-        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+        hash: "33cdfa214f071848ed374407b4601c5a"
     }
     Key {
         type: 7
@@ -130,19 +130,19 @@ VisualTest {
     }
     Frame {
         msec: 256
-        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+        hash: "33cdfa214f071848ed374407b4601c5a"
     }
     Frame {
         msec: 272
-        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+        hash: "33cdfa214f071848ed374407b4601c5a"
     }
     Frame {
         msec: 288
-        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+        hash: "33cdfa214f071848ed374407b4601c5a"
     }
     Frame {
         msec: 304
-        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+        hash: "33cdfa214f071848ed374407b4601c5a"
     }
     Key {
         type: 7
@@ -154,11 +154,11 @@ VisualTest {
     }
     Frame {
         msec: 320
-        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+        hash: "33cdfa214f071848ed374407b4601c5a"
     }
     Frame {
         msec: 336
-        hash: "dd3b01d6a2a829e6ba7404d5318f7d15"
+        hash: "33cdfa214f071848ed374407b4601c5a"
     }
     Key {
         type: 6
@@ -170,19 +170,19 @@ VisualTest {
     }
     Frame {
         msec: 352
-        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Frame {
         msec: 368
-        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Frame {
         msec: 384
-        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Frame {
         msec: 400
-        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Key {
         type: 7
@@ -194,19 +194,19 @@ VisualTest {
     }
     Frame {
         msec: 416
-        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Frame {
         msec: 432
-        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Frame {
         msec: 448
-        hash: "1cf8dbc4358e3aa51c260a3a40143318"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Frame {
         msec: 464
-        hash: "c9f5b9e45b0bb040e669daccf8bb1eb0"
+        hash: "80794c72fe7dda72997122a89f33e6e4"
     }
     Key {
         type: 6
@@ -218,19 +218,19 @@ VisualTest {
     }
     Frame {
         msec: 480
-        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+        hash: "bfcd901aee3d9db796597834bec1f173"
     }
     Frame {
         msec: 496
-        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+        hash: "bfcd901aee3d9db796597834bec1f173"
     }
     Frame {
         msec: 512
-        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+        hash: "bfcd901aee3d9db796597834bec1f173"
     }
     Frame {
         msec: 528
-        hash: "fc2972eca4ca510d23c92f712fd1ceb3"
+        hash: "bfcd901aee3d9db796597834bec1f173"
     }
     Key {
         type: 6
@@ -250,23 +250,23 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "15313caf999d43a079e51c69323682f3"
+        hash: "965102cb74dcf695b950616ce5c42875"
     }
     Frame {
         msec: 560
-        hash: "15313caf999d43a079e51c69323682f3"
+        hash: "965102cb74dcf695b950616ce5c42875"
     }
     Frame {
         msec: 576
-        hash: "15313caf999d43a079e51c69323682f3"
+        hash: "965102cb74dcf695b950616ce5c42875"
     }
     Frame {
         msec: 592
-        hash: "15313caf999d43a079e51c69323682f3"
+        hash: "965102cb74dcf695b950616ce5c42875"
     }
     Frame {
         msec: 608
-        hash: "15313caf999d43a079e51c69323682f3"
+        hash: "965102cb74dcf695b950616ce5c42875"
     }
     Key {
         type: 7
@@ -286,19 +286,19 @@ VisualTest {
     }
     Frame {
         msec: 624
-        hash: "80cbbe525c033083248e4a5d636f875c"
+        hash: "73556f0cf2c8d77881a7d3881025e343"
     }
     Frame {
         msec: 640
-        hash: "80cbbe525c033083248e4a5d636f875c"
+        hash: "73556f0cf2c8d77881a7d3881025e343"
     }
     Frame {
         msec: 656
-        hash: "80cbbe525c033083248e4a5d636f875c"
+        hash: "73556f0cf2c8d77881a7d3881025e343"
     }
     Frame {
         msec: 672
-        hash: "80cbbe525c033083248e4a5d636f875c"
+        hash: "73556f0cf2c8d77881a7d3881025e343"
     }
     Key {
         type: 7
@@ -310,11 +310,11 @@ VisualTest {
     }
     Frame {
         msec: 688
-        hash: "80cbbe525c033083248e4a5d636f875c"
+        hash: "73556f0cf2c8d77881a7d3881025e343"
     }
     Frame {
         msec: 704
-        hash: "80cbbe525c033083248e4a5d636f875c"
+        hash: "73556f0cf2c8d77881a7d3881025e343"
     }
     Key {
         type: 6
@@ -326,23 +326,23 @@ VisualTest {
     }
     Frame {
         msec: 720
-        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+        hash: "a75bdb09a48b90936d2d4de647e7323d"
     }
     Frame {
         msec: 736
-        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+        hash: "a75bdb09a48b90936d2d4de647e7323d"
     }
     Frame {
         msec: 752
-        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+        hash: "a75bdb09a48b90936d2d4de647e7323d"
     }
     Frame {
         msec: 768
-        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+        hash: "a75bdb09a48b90936d2d4de647e7323d"
     }
     Frame {
         msec: 784
-        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+        hash: "a75bdb09a48b90936d2d4de647e7323d"
     }
     Key {
         type: 7
@@ -354,7 +354,7 @@ VisualTest {
     }
     Frame {
         msec: 800
-        hash: "ccc8cfb1c79d043ec68b2174f3fb5b27"
+        hash: "a75bdb09a48b90936d2d4de647e7323d"
     }
     Key {
         type: 6
@@ -366,15 +366,15 @@ VisualTest {
     }
     Frame {
         msec: 816
-        hash: "d13548c95a838350f2b3011e643e0182"
+        hash: "f37ab5f03e7cf86e3589fc0711b23a53"
     }
     Frame {
         msec: 832
-        hash: "d13548c95a838350f2b3011e643e0182"
+        hash: "f37ab5f03e7cf86e3589fc0711b23a53"
     }
     Frame {
         msec: 848
-        hash: "d13548c95a838350f2b3011e643e0182"
+        hash: "f37ab5f03e7cf86e3589fc0711b23a53"
     }
     Key {
         type: 7
@@ -386,15 +386,15 @@ VisualTest {
     }
     Frame {
         msec: 864
-        hash: "d13548c95a838350f2b3011e643e0182"
+        hash: "f37ab5f03e7cf86e3589fc0711b23a53"
     }
     Frame {
         msec: 880
-        hash: "d13548c95a838350f2b3011e643e0182"
+        hash: "f37ab5f03e7cf86e3589fc0711b23a53"
     }
     Frame {
         msec: 896
-        hash: "d13548c95a838350f2b3011e643e0182"
+        hash: "f37ab5f03e7cf86e3589fc0711b23a53"
     }
     Key {
         type: 6
@@ -406,15 +406,15 @@ VisualTest {
     }
     Frame {
         msec: 912
-        hash: "1c61611fc6386736782b7d61619ae9af"
+        hash: "219e5edd5f138cd113f0b929460cf074"
     }
     Frame {
         msec: 928
-        hash: "1c61611fc6386736782b7d61619ae9af"
+        hash: "219e5edd5f138cd113f0b929460cf074"
     }
     Frame {
         msec: 944
-        hash: "1c61611fc6386736782b7d61619ae9af"
+        hash: "219e5edd5f138cd113f0b929460cf074"
     }
     Frame {
         msec: 960
@@ -422,11 +422,11 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "224079eaeb708f8cd27326a06857f6aa"
+        hash: "219e5edd5f138cd113f0b929460cf074"
     }
     Frame {
         msec: 992
-        hash: "224079eaeb708f8cd27326a06857f6aa"
+        hash: "219e5edd5f138cd113f0b929460cf074"
     }
     Key {
         type: 6
@@ -446,23 +446,23 @@ VisualTest {
     }
     Frame {
         msec: 1008
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1024
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1040
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1056
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1072
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Key {
         type: 7
@@ -474,31 +474,31 @@ VisualTest {
     }
     Frame {
         msec: 1088
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1104
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1120
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1136
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1152
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1168
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Frame {
         msec: 1184
-        hash: "07681c5879322e7ac093c9324b45520d"
+        hash: "79cf23a46fbbeddbef10ef2a62533342"
     }
     Key {
         type: 6
@@ -510,23 +510,23 @@ VisualTest {
     }
     Frame {
         msec: 1200
-        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+        hash: "ccb17209d85c7e49fbb0b5f9134fc39c"
     }
     Frame {
         msec: 1216
-        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+        hash: "ccb17209d85c7e49fbb0b5f9134fc39c"
     }
     Frame {
         msec: 1232
-        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+        hash: "ccb17209d85c7e49fbb0b5f9134fc39c"
     }
     Frame {
         msec: 1248
-        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+        hash: "ccb17209d85c7e49fbb0b5f9134fc39c"
     }
     Frame {
         msec: 1264
-        hash: "9dda4b5fa581a01608d9c3e2ce0bc33b"
+        hash: "ccb17209d85c7e49fbb0b5f9134fc39c"
     }
     Key {
         type: 7
@@ -546,11 +546,11 @@ VisualTest {
     }
     Frame {
         msec: 1280
-        hash: "95c62fa8d99d29999ce84b975d6858bc"
+        hash: "29aaa213e4b146199289b5383528bc88"
     }
     Frame {
         msec: 1296
-        hash: "95c62fa8d99d29999ce84b975d6858bc"
+        hash: "29aaa213e4b146199289b5383528bc88"
     }
     Key {
         type: 6
@@ -562,15 +562,15 @@ VisualTest {
     }
     Frame {
         msec: 1312
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Frame {
         msec: 1328
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Frame {
         msec: 1344
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Key {
         type: 7
@@ -582,11 +582,11 @@ VisualTest {
     }
     Frame {
         msec: 1360
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Frame {
         msec: 1376
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Key {
         type: 7
@@ -598,19 +598,19 @@ VisualTest {
     }
     Frame {
         msec: 1392
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Frame {
         msec: 1408
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Frame {
         msec: 1424
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Frame {
         msec: 1440
-        hash: "c98dada1c82e867bd0d0ff56de86574f"
+        hash: "7f9da386497bca2dc19b1c3ab475f453"
     }
     Key {
         type: 6
@@ -622,23 +622,23 @@ VisualTest {
     }
     Frame {
         msec: 1456
-        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+        hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2"
     }
     Frame {
         msec: 1472
-        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+        hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2"
     }
     Frame {
         msec: 1488
-        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+        hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2"
     }
     Frame {
         msec: 1504
-        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+        hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2"
     }
     Frame {
         msec: 1520
-        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+        hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2"
     }
     Key {
         type: 7
@@ -650,11 +650,11 @@ VisualTest {
     }
     Frame {
         msec: 1536
-        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+        hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2"
     }
     Frame {
         msec: 1552
-        hash: "30d8ac1ed88cce3df5e8e5ef209caf45"
+        hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2"
     }
     Key {
         type: 6
@@ -666,23 +666,23 @@ VisualTest {
     }
     Frame {
         msec: 1568
-        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+        hash: "c5c789ca287cf673be808f3e10e054a2"
     }
     Frame {
         msec: 1584
-        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+        hash: "c5c789ca287cf673be808f3e10e054a2"
     }
     Frame {
         msec: 1600
-        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+        hash: "c5c789ca287cf673be808f3e10e054a2"
     }
     Frame {
         msec: 1616
-        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+        hash: "c5c789ca287cf673be808f3e10e054a2"
     }
     Frame {
         msec: 1632
-        hash: "d0d0bd91c9ac756c43a0c0fe53797ee3"
+        hash: "c5c789ca287cf673be808f3e10e054a2"
     }
     Key {
         type: 6
@@ -702,23 +702,23 @@ VisualTest {
     }
     Frame {
         msec: 1648
-        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+        hash: "5e39fc7058b64afa7036002a2dae8976"
     }
     Frame {
         msec: 1664
-        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+        hash: "5e39fc7058b64afa7036002a2dae8976"
     }
     Frame {
         msec: 1680
-        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+        hash: "5e39fc7058b64afa7036002a2dae8976"
     }
     Frame {
         msec: 1696
-        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+        hash: "5e39fc7058b64afa7036002a2dae8976"
     }
     Frame {
         msec: 1712
-        hash: "8a2825dc4d2883fe491819ae34a2eff8"
+        hash: "5e39fc7058b64afa7036002a2dae8976"
     }
     Key {
         type: 6
@@ -730,15 +730,15 @@ VisualTest {
     }
     Frame {
         msec: 1728
-        hash: "acf73c003e786ca1756f43a2e20962d3"
+        hash: "687e69083430812cd42eff708229a176"
     }
     Frame {
         msec: 1744
-        hash: "acf73c003e786ca1756f43a2e20962d3"
+        hash: "687e69083430812cd42eff708229a176"
     }
     Frame {
         msec: 1760
-        hash: "acf73c003e786ca1756f43a2e20962d3"
+        hash: "687e69083430812cd42eff708229a176"
     }
     Key {
         type: 7
@@ -750,7 +750,7 @@ VisualTest {
     }
     Frame {
         msec: 1776
-        hash: "acf73c003e786ca1756f43a2e20962d3"
+        hash: "687e69083430812cd42eff708229a176"
     }
     Key {
         type: 6
@@ -762,11 +762,11 @@ VisualTest {
     }
     Frame {
         msec: 1792
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Frame {
         msec: 1808
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Key {
         type: 7
@@ -778,19 +778,19 @@ VisualTest {
     }
     Frame {
         msec: 1824
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Frame {
         msec: 1840
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Frame {
         msec: 1856
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Frame {
         msec: 1872
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Key {
         type: 7
@@ -802,11 +802,11 @@ VisualTest {
     }
     Frame {
         msec: 1888
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Frame {
         msec: 1904
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Frame {
         msec: 1920
@@ -814,11 +814,11 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Frame {
         msec: 1952
-        hash: "715cce5efb512e76e65b6dd53de988c6"
+        hash: "f33cd379acd2785298aa74f78e22bdfb"
     }
     Key {
         type: 6
@@ -830,27 +830,27 @@ VisualTest {
     }
     Frame {
         msec: 1968
-        hash: "eb9217410ea88877b037c9f8d38413ab"
+        hash: "205e79eb4a7e515ffa5bd24677408e79"
     }
     Frame {
         msec: 1984
-        hash: "eb9217410ea88877b037c9f8d38413ab"
+        hash: "205e79eb4a7e515ffa5bd24677408e79"
     }
     Frame {
         msec: 2000
-        hash: "eb9217410ea88877b037c9f8d38413ab"
+        hash: "205e79eb4a7e515ffa5bd24677408e79"
     }
     Frame {
         msec: 2016
-        hash: "eb9217410ea88877b037c9f8d38413ab"
+        hash: "205e79eb4a7e515ffa5bd24677408e79"
     }
     Frame {
         msec: 2032
-        hash: "eb9217410ea88877b037c9f8d38413ab"
+        hash: "205e79eb4a7e515ffa5bd24677408e79"
     }
     Frame {
         msec: 2048
-        hash: "eb9217410ea88877b037c9f8d38413ab"
+        hash: "205e79eb4a7e515ffa5bd24677408e79"
     }
     Key {
         type: 6
@@ -862,7 +862,7 @@ VisualTest {
     }
     Frame {
         msec: 2064
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Key {
         type: 7
@@ -874,15 +874,15 @@ VisualTest {
     }
     Frame {
         msec: 2080
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Frame {
         msec: 2096
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Frame {
         msec: 2112
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Key {
         type: 7
@@ -894,27 +894,27 @@ VisualTest {
     }
     Frame {
         msec: 2128
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Frame {
         msec: 2144
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Frame {
         msec: 2160
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Frame {
         msec: 2176
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Frame {
         msec: 2192
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Frame {
         msec: 2208
-        hash: "d4b86b88d417e168139671f762a129a9"
+        hash: "2c1570a63d3eff7346c58356610a2f44"
     }
     Key {
         type: 6
@@ -926,23 +926,23 @@ VisualTest {
     }
     Frame {
         msec: 2224
-        hash: "bce77452be7f54a1f42685acb79ca5a3"
+        hash: "8202436b4e184adc69cdf7dd735afe33"
     }
     Frame {
         msec: 2240
-        hash: "bce77452be7f54a1f42685acb79ca5a3"
+        hash: "8202436b4e184adc69cdf7dd735afe33"
     }
     Frame {
         msec: 2256
-        hash: "bce77452be7f54a1f42685acb79ca5a3"
+        hash: "8202436b4e184adc69cdf7dd735afe33"
     }
     Frame {
         msec: 2272
-        hash: "bce77452be7f54a1f42685acb79ca5a3"
+        hash: "8202436b4e184adc69cdf7dd735afe33"
     }
     Frame {
         msec: 2288
-        hash: "bce77452be7f54a1f42685acb79ca5a3"
+        hash: "8202436b4e184adc69cdf7dd735afe33"
     }
     Key {
         type: 6
@@ -954,7 +954,7 @@ VisualTest {
     }
     Frame {
         msec: 2304
-        hash: "c8040808e2d582a32d447eb885b6a72d"
+        hash: "855069b52f6714d54f4005751b8e2930"
     }
     Key {
         type: 7
@@ -966,15 +966,15 @@ VisualTest {
     }
     Frame {
         msec: 2320
-        hash: "c8040808e2d582a32d447eb885b6a72d"
+        hash: "855069b52f6714d54f4005751b8e2930"
     }
     Frame {
         msec: 2336
-        hash: "c8040808e2d582a32d447eb885b6a72d"
+        hash: "855069b52f6714d54f4005751b8e2930"
     }
     Frame {
         msec: 2352
-        hash: "c8040808e2d582a32d447eb885b6a72d"
+        hash: "855069b52f6714d54f4005751b8e2930"
     }
     Key {
         type: 6
@@ -986,11 +986,11 @@ VisualTest {
     }
     Frame {
         msec: 2368
-        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Frame {
         msec: 2384
-        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Key {
         type: 7
@@ -1002,15 +1002,15 @@ VisualTest {
     }
     Frame {
         msec: 2400
-        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Frame {
         msec: 2416
-        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Frame {
         msec: 2432
-        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Key {
         type: 7
@@ -1022,15 +1022,15 @@ VisualTest {
     }
     Frame {
         msec: 2448
-        hash: "5beb32a23637b51f1c9b117e93b2c1d0"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Frame {
         msec: 2464
-        hash: "e1020b6bb8ca2e9f0ce93f9047695f48"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Frame {
         msec: 2480
-        hash: "e1020b6bb8ca2e9f0ce93f9047695f48"
+        hash: "6e1a97a3e491f24e34d4b24bf3091afc"
     }
     Key {
         type: 6
@@ -1042,19 +1042,19 @@ VisualTest {
     }
     Frame {
         msec: 2496
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2512
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2528
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2544
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Key {
         type: 7
@@ -1066,27 +1066,27 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2576
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2592
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2608
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2624
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Frame {
         msec: 2640
-        hash: "429296196c5ebf0094d5e76379f929c5"
+        hash: "12eb5152181e0bff993dc1be087969f9"
     }
     Key {
         type: 6
@@ -1098,19 +1098,19 @@ VisualTest {
     }
     Frame {
         msec: 2656
-        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+        hash: "8a77655cae6c04453e6dc8a2321d1a32"
     }
     Frame {
         msec: 2672
-        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+        hash: "8a77655cae6c04453e6dc8a2321d1a32"
     }
     Frame {
         msec: 2688
-        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+        hash: "8a77655cae6c04453e6dc8a2321d1a32"
     }
     Frame {
         msec: 2704
-        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+        hash: "8a77655cae6c04453e6dc8a2321d1a32"
     }
     Key {
         type: 7
@@ -1122,15 +1122,15 @@ VisualTest {
     }
     Frame {
         msec: 2720
-        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+        hash: "8a77655cae6c04453e6dc8a2321d1a32"
     }
     Frame {
         msec: 2736
-        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+        hash: "8a77655cae6c04453e6dc8a2321d1a32"
     }
     Frame {
         msec: 2752
-        hash: "83a910a91a9c1ca60e8f021b7a96509e"
+        hash: "8a77655cae6c04453e6dc8a2321d1a32"
     }
     Key {
         type: 6
@@ -1142,23 +1142,23 @@ VisualTest {
     }
     Frame {
         msec: 2768
-        hash: "4a2af150d069abfff098673375469b08"
+        hash: "c42349fe4b75e5d56a04ec6462cb0780"
     }
     Frame {
         msec: 2784
-        hash: "4a2af150d069abfff098673375469b08"
+        hash: "c42349fe4b75e5d56a04ec6462cb0780"
     }
     Frame {
         msec: 2800
-        hash: "4a2af150d069abfff098673375469b08"
+        hash: "c42349fe4b75e5d56a04ec6462cb0780"
     }
     Frame {
         msec: 2816
-        hash: "4a2af150d069abfff098673375469b08"
+        hash: "c42349fe4b75e5d56a04ec6462cb0780"
     }
     Frame {
         msec: 2832
-        hash: "4a2af150d069abfff098673375469b08"
+        hash: "c42349fe4b75e5d56a04ec6462cb0780"
     }
     Key {
         type: 6
@@ -1178,11 +1178,11 @@ VisualTest {
     }
     Frame {
         msec: 2848
-        hash: "f1909371c6f44fb7547916340d043ac7"
+        hash: "973c163b1ea4e6189e788b7f37013185"
     }
     Frame {
         msec: 2864
-        hash: "f1909371c6f44fb7547916340d043ac7"
+        hash: "973c163b1ea4e6189e788b7f37013185"
     }
     Frame {
         msec: 2880
@@ -1190,7 +1190,7 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "f1909371c6f44fb7547916340d043ac7"
+        hash: "973c163b1ea4e6189e788b7f37013185"
     }
     Key {
         type: 6
@@ -1202,11 +1202,11 @@ VisualTest {
     }
     Frame {
         msec: 2912
-        hash: "35fecf3c5feda6afbd4eac5935dca7af"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 2928
-        hash: "35fecf3c5feda6afbd4eac5935dca7af"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Key {
         type: 7
@@ -1218,11 +1218,11 @@ VisualTest {
     }
     Frame {
         msec: 2944
-        hash: "35fecf3c5feda6afbd4eac5935dca7af"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 2960
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Key {
         type: 7
@@ -1234,35 +1234,35 @@ VisualTest {
     }
     Frame {
         msec: 2976
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 2992
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 3008
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 3024
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 3040
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 3056
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 3072
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Frame {
         msec: 3088
-        hash: "d8e23c87332aed5105cb6d488efd4a63"
+        hash: "a847abc1ef9a41a741f8dce6bc68e6a1"
     }
     Key {
         type: 6
@@ -1274,23 +1274,23 @@ VisualTest {
     }
     Frame {
         msec: 3104
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3120
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3136
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3152
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3168
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Key {
         type: 7
@@ -1302,23 +1302,23 @@ VisualTest {
     }
     Frame {
         msec: 3184
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3200
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3216
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3232
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Frame {
         msec: 3248
-        hash: "6c3f38c1180f392082e3879e35a23c5e"
+        hash: "93d3b56a5070a84164169ab1869d6ed0"
     }
     Key {
         type: 6
@@ -1330,15 +1330,15 @@ VisualTest {
     }
     Frame {
         msec: 3264
-        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+        hash: "60480b61f29a34c790da8fe1bfd98755"
     }
     Frame {
         msec: 3280
-        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+        hash: "60480b61f29a34c790da8fe1bfd98755"
     }
     Frame {
         msec: 3296
-        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+        hash: "60480b61f29a34c790da8fe1bfd98755"
     }
     Key {
         type: 7
@@ -1350,15 +1350,15 @@ VisualTest {
     }
     Frame {
         msec: 3312
-        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+        hash: "60480b61f29a34c790da8fe1bfd98755"
     }
     Frame {
         msec: 3328
-        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+        hash: "60480b61f29a34c790da8fe1bfd98755"
     }
     Frame {
         msec: 3344
-        hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3"
+        hash: "60480b61f29a34c790da8fe1bfd98755"
     }
     Key {
         type: 6
@@ -1370,23 +1370,23 @@ VisualTest {
     }
     Frame {
         msec: 3360
-        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Frame {
         msec: 3376
-        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Frame {
         msec: 3392
-        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Frame {
         msec: 3408
-        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Frame {
         msec: 3424
-        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Key {
         type: 7
@@ -1398,15 +1398,15 @@ VisualTest {
     }
     Frame {
         msec: 3440
-        hash: "0e7fcbbe36c374e9436e5ecccd8663ee"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Frame {
         msec: 3456
-        hash: "4928b737a83471181066d043b51e939f"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Frame {
         msec: 3472
-        hash: "4928b737a83471181066d043b51e939f"
+        hash: "c6f235590c03170581dfabc07bf9c20b"
     }
     Key {
         type: 6
@@ -1418,19 +1418,19 @@ VisualTest {
     }
     Frame {
         msec: 3488
-        hash: "541901e223b7129edcbd2264da7e13cd"
+        hash: "10a29af771a5c17b1443b10abd45c9aa"
     }
     Frame {
         msec: 3504
-        hash: "541901e223b7129edcbd2264da7e13cd"
+        hash: "10a29af771a5c17b1443b10abd45c9aa"
     }
     Frame {
         msec: 3520
-        hash: "541901e223b7129edcbd2264da7e13cd"
+        hash: "10a29af771a5c17b1443b10abd45c9aa"
     }
     Frame {
         msec: 3536
-        hash: "541901e223b7129edcbd2264da7e13cd"
+        hash: "10a29af771a5c17b1443b10abd45c9aa"
     }
     Key {
         type: 7
@@ -1442,11 +1442,11 @@ VisualTest {
     }
     Frame {
         msec: 3552
-        hash: "541901e223b7129edcbd2264da7e13cd"
+        hash: "10a29af771a5c17b1443b10abd45c9aa"
     }
     Frame {
         msec: 3568
-        hash: "541901e223b7129edcbd2264da7e13cd"
+        hash: "10a29af771a5c17b1443b10abd45c9aa"
     }
     Key {
         type: 6
@@ -1458,27 +1458,27 @@ VisualTest {
     }
     Frame {
         msec: 3584
-        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+        hash: "68449dbef331f4bdf4c4bc443ec98e89"
     }
     Frame {
         msec: 3600
-        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+        hash: "68449dbef331f4bdf4c4bc443ec98e89"
     }
     Frame {
         msec: 3616
-        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+        hash: "68449dbef331f4bdf4c4bc443ec98e89"
     }
     Frame {
         msec: 3632
-        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+        hash: "68449dbef331f4bdf4c4bc443ec98e89"
     }
     Frame {
         msec: 3648
-        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+        hash: "68449dbef331f4bdf4c4bc443ec98e89"
     }
     Frame {
         msec: 3664
-        hash: "86aa5d4fdc4f92c2810ccb3d5e990e22"
+        hash: "68449dbef331f4bdf4c4bc443ec98e89"
     }
     Key {
         type: 6
@@ -1490,7 +1490,7 @@ VisualTest {
     }
     Frame {
         msec: 3680
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Key {
         type: 7
@@ -1502,23 +1502,23 @@ VisualTest {
     }
     Frame {
         msec: 3696
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3712
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3728
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3744
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3760
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Key {
         type: 7
@@ -1530,19 +1530,19 @@ VisualTest {
     }
     Frame {
         msec: 3776
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3792
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3808
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3824
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3840
@@ -1550,19 +1550,19 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3872
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3888
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Frame {
         msec: 3904
-        hash: "af1a78eca66ce7523306aaf324a59af6"
+        hash: "5c773045e3ccab933749a3f6a74dc25a"
     }
     Key {
         type: 6
@@ -1574,23 +1574,23 @@ VisualTest {
     }
     Frame {
         msec: 3920
-        hash: "c72ed9cecd1144b7e937c2c3c33ab0b8"
+        hash: "f1ef12790a0548cfaa4176680566680d"
     }
     Frame {
         msec: 3936
-        hash: "c72ed9cecd1144b7e937c2c3c33ab0b8"
+        hash: "f1ef12790a0548cfaa4176680566680d"
     }
     Frame {
         msec: 3952
-        hash: "c72ed9cecd1144b7e937c2c3c33ab0b8"
+        hash: "f1ef12790a0548cfaa4176680566680d"
     }
     Frame {
         msec: 3968
-        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+        hash: "f1ef12790a0548cfaa4176680566680d"
     }
     Frame {
         msec: 3984
-        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+        hash: "f1ef12790a0548cfaa4176680566680d"
     }
     Key {
         type: 7
@@ -1602,11 +1602,11 @@ VisualTest {
     }
     Frame {
         msec: 4000
-        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+        hash: "f1ef12790a0548cfaa4176680566680d"
     }
     Frame {
         msec: 4016
-        hash: "e00d1a6f1ceb15493e87151071d8ad3f"
+        hash: "f1ef12790a0548cfaa4176680566680d"
     }
     Key {
         type: 6
@@ -1618,15 +1618,15 @@ VisualTest {
     }
     Frame {
         msec: 4032
-        hash: "9b129865b81189be8c2e59178c009cd9"
+        hash: "22575a03b4c58e4391845d495c2ca48b"
     }
     Frame {
         msec: 4048
-        hash: "9b129865b81189be8c2e59178c009cd9"
+        hash: "22575a03b4c58e4391845d495c2ca48b"
     }
     Frame {
         msec: 4064
-        hash: "9b129865b81189be8c2e59178c009cd9"
+        hash: "22575a03b4c58e4391845d495c2ca48b"
     }
     Key {
         type: 7
@@ -1638,7 +1638,7 @@ VisualTest {
     }
     Frame {
         msec: 4080
-        hash: "9b129865b81189be8c2e59178c009cd9"
+        hash: "22575a03b4c58e4391845d495c2ca48b"
     }
     Key {
         type: 6
@@ -1650,19 +1650,19 @@ VisualTest {
     }
     Frame {
         msec: 4096
-        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+        hash: "3243dc4562f073136782415365b7b42d"
     }
     Frame {
         msec: 4112
-        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+        hash: "3243dc4562f073136782415365b7b42d"
     }
     Frame {
         msec: 4128
-        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+        hash: "3243dc4562f073136782415365b7b42d"
     }
     Frame {
         msec: 4144
-        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+        hash: "3243dc4562f073136782415365b7b42d"
     }
     Key {
         type: 7
@@ -1674,15 +1674,15 @@ VisualTest {
     }
     Frame {
         msec: 4160
-        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+        hash: "3243dc4562f073136782415365b7b42d"
     }
     Frame {
         msec: 4176
-        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+        hash: "3243dc4562f073136782415365b7b42d"
     }
     Frame {
         msec: 4192
-        hash: "ccbc7a847315311d9661b7c3fc6057d6"
+        hash: "3243dc4562f073136782415365b7b42d"
     }
     Key {
         type: 6
@@ -1694,23 +1694,23 @@ VisualTest {
     }
     Frame {
         msec: 4208
-        hash: "3532604c4d8bb23fc8fd44a153708f23"
+        hash: "44cd04d2a2bf12654cb96ec9af92b9aa"
     }
     Frame {
         msec: 4224
-        hash: "3532604c4d8bb23fc8fd44a153708f23"
+        hash: "44cd04d2a2bf12654cb96ec9af92b9aa"
     }
     Frame {
         msec: 4240
-        hash: "3532604c4d8bb23fc8fd44a153708f23"
+        hash: "44cd04d2a2bf12654cb96ec9af92b9aa"
     }
     Frame {
         msec: 4256
-        hash: "3532604c4d8bb23fc8fd44a153708f23"
+        hash: "44cd04d2a2bf12654cb96ec9af92b9aa"
     }
     Frame {
         msec: 4272
-        hash: "3532604c4d8bb23fc8fd44a153708f23"
+        hash: "44cd04d2a2bf12654cb96ec9af92b9aa"
     }
     Key {
         type: 6
@@ -1722,7 +1722,7 @@ VisualTest {
     }
     Frame {
         msec: 4288
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Key {
         type: 7
@@ -1734,15 +1734,15 @@ VisualTest {
     }
     Frame {
         msec: 4304
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Frame {
         msec: 4320
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Frame {
         msec: 4336
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Key {
         type: 7
@@ -1754,23 +1754,23 @@ VisualTest {
     }
     Frame {
         msec: 4352
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Frame {
         msec: 4368
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Frame {
         msec: 4384
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Frame {
         msec: 4400
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Frame {
         msec: 4416
-        hash: "7a951d7233a41e872aa8f8784edc1bff"
+        hash: "cf1eb35cb9a793769303abee0a2fcad8"
     }
     Key {
         type: 6
@@ -1782,15 +1782,15 @@ VisualTest {
     }
     Frame {
         msec: 4432
-        hash: "41683813bcdc1761003a9bece7752516"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Frame {
         msec: 4448
-        hash: "41683813bcdc1761003a9bece7752516"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Frame {
         msec: 4464
-        hash: "be52b6b350696bb8e883bd24750cce06"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Key {
         type: 7
@@ -1802,23 +1802,23 @@ VisualTest {
     }
     Frame {
         msec: 4480
-        hash: "be52b6b350696bb8e883bd24750cce06"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Frame {
         msec: 4496
-        hash: "be52b6b350696bb8e883bd24750cce06"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Frame {
         msec: 4512
-        hash: "be52b6b350696bb8e883bd24750cce06"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Frame {
         msec: 4528
-        hash: "be52b6b350696bb8e883bd24750cce06"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Frame {
         msec: 4544
-        hash: "be52b6b350696bb8e883bd24750cce06"
+        hash: "252838a495502ba5b836ffd1b20711f4"
     }
     Key {
         type: 6
@@ -1830,19 +1830,19 @@ VisualTest {
     }
     Frame {
         msec: 4560
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Frame {
         msec: 4576
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Frame {
         msec: 4592
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Frame {
         msec: 4608
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Key {
         type: 7
@@ -1854,19 +1854,19 @@ VisualTest {
     }
     Frame {
         msec: 4624
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Frame {
         msec: 4640
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Frame {
         msec: 4656
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Frame {
         msec: 4672
-        hash: "f4845e51dfb18617fe31471b0cb3bf16"
+        hash: "4010bb0f50630f067974e6ddb3177693"
     }
     Key {
         type: 6
@@ -1878,19 +1878,19 @@ VisualTest {
     }
     Frame {
         msec: 4688
-        hash: "4e994f63cd763db43435fd39e864585c"
+        hash: "14dc6ee8cd3b4747650f2a458b42a6e3"
     }
     Frame {
         msec: 4704
-        hash: "4e994f63cd763db43435fd39e864585c"
+        hash: "14dc6ee8cd3b4747650f2a458b42a6e3"
     }
     Frame {
         msec: 4720
-        hash: "4e994f63cd763db43435fd39e864585c"
+        hash: "14dc6ee8cd3b4747650f2a458b42a6e3"
     }
     Frame {
         msec: 4736
-        hash: "4e994f63cd763db43435fd39e864585c"
+        hash: "14dc6ee8cd3b4747650f2a458b42a6e3"
     }
     Key {
         type: 7
@@ -1902,15 +1902,15 @@ VisualTest {
     }
     Frame {
         msec: 4752
-        hash: "4e994f63cd763db43435fd39e864585c"
+        hash: "14dc6ee8cd3b4747650f2a458b42a6e3"
     }
     Frame {
         msec: 4768
-        hash: "4e994f63cd763db43435fd39e864585c"
+        hash: "14dc6ee8cd3b4747650f2a458b42a6e3"
     }
     Frame {
         msec: 4784
-        hash: "4e994f63cd763db43435fd39e864585c"
+        hash: "14dc6ee8cd3b4747650f2a458b42a6e3"
     }
     Key {
         type: 6
@@ -1926,7 +1926,7 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "2b5db83aff14077f625dbfc75830b2b0"
+        hash: "7d4a56854715772c92706522d2dcac56"
     }
     Key {
         type: 7
@@ -1938,19 +1938,19 @@ VisualTest {
     }
     Frame {
         msec: 4832
-        hash: "2b5db83aff14077f625dbfc75830b2b0"
+        hash: "7d4a56854715772c92706522d2dcac56"
     }
     Frame {
         msec: 4848
-        hash: "2b5db83aff14077f625dbfc75830b2b0"
+        hash: "7d4a56854715772c92706522d2dcac56"
     }
     Frame {
         msec: 4864
-        hash: "2b5db83aff14077f625dbfc75830b2b0"
+        hash: "7d4a56854715772c92706522d2dcac56"
     }
     Frame {
         msec: 4880
-        hash: "2b5db83aff14077f625dbfc75830b2b0"
+        hash: "7d4a56854715772c92706522d2dcac56"
     }
     Key {
         type: 6
@@ -1962,19 +1962,19 @@ VisualTest {
     }
     Frame {
         msec: 4896
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 4912
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 4928
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 4944
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Key {
         type: 7
@@ -1986,203 +1986,203 @@ VisualTest {
     }
     Frame {
         msec: 4960
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 4976
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 4992
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5008
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5024
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5040
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5056
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5072
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5088
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5104
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5120
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5136
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5152
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5168
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5184
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5200
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5216
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5232
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5248
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5264
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5280
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5296
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5312
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5328
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5344
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5360
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5376
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5392
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5408
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5424
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5440
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5456
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5472
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5488
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5504
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5520
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5536
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5552
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5568
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5584
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5600
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5616
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5632
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5648
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5664
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5680
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5696
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5712
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5728
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5744
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5760
@@ -2190,239 +2190,239 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5792
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5808
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5824
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5840
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5856
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5872
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5888
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5904
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5920
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5936
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5952
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5968
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 5984
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6000
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6016
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6032
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6048
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6064
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6080
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6096
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6112
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6128
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6144
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6160
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6176
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6192
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6208
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6224
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6240
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6256
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6272
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6288
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6304
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6320
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6336
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6352
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6368
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6384
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6400
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6416
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6432
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6448
-        hash: "f902766808596ea423cbc0b7e9bdd87a"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6464
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6480
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6496
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6512
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6528
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6544
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6560
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6576
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6592
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6608
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6624
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6640
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6656
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6672
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6688
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6704
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6720
@@ -2430,38 +2430,38 @@ VisualTest {
     }
     Frame {
         msec: 6736
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6752
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6768
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6784
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6800
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6816
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6832
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6848
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
     Frame {
         msec: 6864
-        hash: "566cba616a99c92c228a4c312466b96b"
+        hash: "0c75eb65cf70c883ee4dcd2f7ee092ce"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
index d889eef..1d96795 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
index 0c8c250..a3a9bfa 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
index 76b7fce..b50028c 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
index ecc8568..1c4876e 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
index 766abaf..9d110cb 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
index 37f5e46..bd4af6a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
@@ -6,115 +6,115 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 32
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 48
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 64
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 80
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 96
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 112
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 128
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 144
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 160
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 176
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 192
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 208
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 224
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 240
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 256
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 272
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 288
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 304
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 320
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 336
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 352
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 368
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 384
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 400
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 416
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 432
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Frame {
         msec: 448
-        hash: "79b388ca7d46e1efb38672c6bf8837f8"
+        hash: "c0ffaa97d1be341fafafc18762f5cb67"
     }
     Key {
         type: 6
@@ -126,23 +126,23 @@ VisualTest {
     }
     Frame {
         msec: 464
-        hash: "52c03d5681cadb1df400a0974261e05d"
+        hash: "eadbfc95de35a0d1880809b2bbaec562"
     }
     Frame {
         msec: 480
-        hash: "52c03d5681cadb1df400a0974261e05d"
+        hash: "eadbfc95de35a0d1880809b2bbaec562"
     }
     Frame {
         msec: 496
-        hash: "52c03d5681cadb1df400a0974261e05d"
+        hash: "eadbfc95de35a0d1880809b2bbaec562"
     }
     Frame {
         msec: 512
-        hash: "52c03d5681cadb1df400a0974261e05d"
+        hash: "eadbfc95de35a0d1880809b2bbaec562"
     }
     Frame {
         msec: 528
-        hash: "9c280c469d12fc0bf1ff42883ffd5155"
+        hash: "227cbfe5fc07906060951e19ebb3ad30"
     }
     Key {
         type: 7
@@ -154,19 +154,19 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "655716f3544c6ae649cbda487ed1916f"
+        hash: "066256a59ad290b3725193955e3c48a6"
     }
     Frame {
         msec: 560
-        hash: "e9e6a20040bedf4afb670310a7e5c2f0"
+        hash: "6709f77cbcde82886d1c5a07f06b55a5"
     }
     Frame {
         msec: 576
-        hash: "842641682f22e370402857b9cb875192"
+        hash: "da0028083048837b4756a2d3ff468378"
     }
     Frame {
         msec: 592
-        hash: "4d8258cd2fea9b4bee647b9480a743e3"
+        hash: "5f265351bed34357d603794d868dbcbc"
     }
     Key {
         type: 6
@@ -178,19 +178,19 @@ VisualTest {
     }
     Frame {
         msec: 608
-        hash: "eb7d48cbf4cad403eb7d3fa2d10e0f88"
+        hash: "3b8030849229e90b69842219e8b2d3f1"
     }
     Frame {
         msec: 624
-        hash: "c6387240c7075e8321fda5348de9b752"
+        hash: "0b08356d9b00313b2d892175dd93095a"
     }
     Frame {
         msec: 640
-        hash: "98fb4f03db3a574cf96e88ca940fcd07"
+        hash: "4780555b277d65e3e4c0c60817b63eb4"
     }
     Frame {
         msec: 656
-        hash: "19d450ee21b0c525aba2c38e62c5b117"
+        hash: "6b31c8f0569d01d97a371423a0f379c0"
     }
     Key {
         type: 7
@@ -202,19 +202,19 @@ VisualTest {
     }
     Frame {
         msec: 672
-        hash: "9943426dd31b393c4831dcfcdb266f76"
+        hash: "e9a5695636f7957d33f1c902a37a605d"
     }
     Frame {
         msec: 688
-        hash: "318bd0909d6ab32fc15ee385b69e1dc2"
+        hash: "27a783cd4ef5caab382721a98f7966da"
     }
     Frame {
         msec: 704
-        hash: "ca5f62f289b5f86e6d86afdcb0bc05f5"
+        hash: "c50598c0a5f8d501fd3ac9cddecee506"
     }
     Frame {
         msec: 720
-        hash: "2158851f276862dd1e2a7d3fee9af938"
+        hash: "2a2d0e202bc3bf7991409391a2ce2934"
     }
     Key {
         type: 6
@@ -226,19 +226,19 @@ VisualTest {
     }
     Frame {
         msec: 736
-        hash: "746e28cf8df1bcfd5a07383e4f9e1420"
+        hash: "2d97b8503c739b210615971ad08c2714"
     }
     Frame {
         msec: 752
-        hash: "8ae15b54e47c6ba43b6ddad234a65499"
+        hash: "f27fd7f1d8c6dfb7393ab0d39ed5cd02"
     }
     Frame {
         msec: 768
-        hash: "8fcb22bd16dafb62a2fdcd40feda5178"
+        hash: "32d256543e3e1ba722860e5143af9f09"
     }
     Frame {
         msec: 784
-        hash: "1ef6e14540615967e7c059fb3299c38a"
+        hash: "9123b724613ef4d3d8431afde6e9eb6b"
     }
     Key {
         type: 7
@@ -250,23 +250,23 @@ VisualTest {
     }
     Frame {
         msec: 800
-        hash: "cd260f4aa6e9772668b13f1f5e4ab3db"
+        hash: "be5249a7effc94ec2be3d6053eba7b45"
     }
     Frame {
         msec: 816
-        hash: "44aaa31fe7183e0088eb9ec12cfef69f"
+        hash: "57f2c119c9eca3d1e4acd2f775af5207"
     }
     Frame {
         msec: 832
-        hash: "575b1fbc9fa6587ce9811b5074a47a84"
+        hash: "23b79a2630448e99f27a657fd9789354"
     }
     Frame {
         msec: 848
-        hash: "83b1fe02fdbe16418231c8acbbbebcac"
+        hash: "c8faab137cbc014aef5e3212889d00b8"
     }
     Frame {
         msec: 864
-        hash: "7bfb6f545fd55e7e336431e6882c9974"
+        hash: "c9616f6fde5d6a8ecf346ece9952f09b"
     }
     Key {
         type: 6
@@ -278,15 +278,15 @@ VisualTest {
     }
     Frame {
         msec: 880
-        hash: "bf3a6677b5f815e1b66f6489032f8e1d"
+        hash: "11a861ca71d789e3d97d599608a793be"
     }
     Frame {
         msec: 896
-        hash: "cfcd90f1e97e92b0fbe2595275a64a48"
+        hash: "5a6c57df0c33b83985aeb194f291ad6c"
     }
     Frame {
         msec: 912
-        hash: "397ad28f60e1f5245b59380968ececd2"
+        hash: "2c047359db6946cb740462b0d6c695be"
     }
     Key {
         type: 7
@@ -298,11 +298,11 @@ VisualTest {
     }
     Frame {
         msec: 928
-        hash: "c6ea797bc327a7e31316f44e93d6beb9"
+        hash: "d0bb54caf661be021be8fe2691de24e8"
     }
     Frame {
         msec: 944
-        hash: "0e3c15c5328c85a54826b65ec82007f5"
+        hash: "80f0a60239f4d81b18b9cb3e80faf346"
     }
     Frame {
         msec: 960
@@ -310,11 +310,11 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 992
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Key {
         type: 6
@@ -326,15 +326,15 @@ VisualTest {
     }
     Frame {
         msec: 1008
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 1024
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 1040
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Key {
         type: 7
@@ -346,23 +346,23 @@ VisualTest {
     }
     Frame {
         msec: 1056
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 1072
-        hash: "676e251f10800c2a8860b43c2546524d"
+        hash: "5f6cc0c97e4748aeeaa4a00c8a8c8928"
     }
     Frame {
         msec: 1088
-        hash: "db99874ab3656663316931ea0ac4c7c3"
+        hash: "b1d71160d9a8a8edeb4cf7e00df36cfc"
     }
     Frame {
         msec: 1104
-        hash: "2c4b2205df96e09a9cd91d5efb86d820"
+        hash: "5bfd4269145cc0962e0fa9c294e8f5aa"
     }
     Frame {
         msec: 1120
-        hash: "25e6e81e4769751e9639ee4a3c4ae839"
+        hash: "4e22c95802d83f0099017c6be9d93214"
     }
     Key {
         type: 6
@@ -374,23 +374,23 @@ VisualTest {
     }
     Frame {
         msec: 1136
-        hash: "9eaa29386d3ad22b9032b8b345739342"
+        hash: "0f31d8f4867af7c2f4fb8e86aa077afd"
     }
     Frame {
         msec: 1152
-        hash: "21ebb054c5df6104bb01e0a8abe9b40c"
+        hash: "21a552133320008a4d4f77752a3cfb55"
     }
     Frame {
         msec: 1168
-        hash: "3ab8cdbe65ea34868c1a917e42d31c14"
+        hash: "3a30a4a785de21da0ff939e303202a81"
     }
     Frame {
         msec: 1184
-        hash: "05badd00be618fc4395e80936284613f"
+        hash: "b0e3ed2468538aacec354cb96d90c362"
     }
     Frame {
         msec: 1200
-        hash: "8a373ed9798a8dd33aab5191db06f190"
+        hash: "56bf6e3fe47e52046b443481fc17a3ec"
     }
     Key {
         type: 7
@@ -402,27 +402,27 @@ VisualTest {
     }
     Frame {
         msec: 1216
-        hash: "2a8c6a7cd20fcf7b5c8b75c59f50276b"
+        hash: "ce80807cde9b902ebf33281fce50d9fb"
     }
     Frame {
         msec: 1232
-        hash: "2e874a6b741d1cbfde5544fb831bdf84"
+        hash: "ed67b18b5f7b90d3bcd9f662e70dc7b8"
     }
     Frame {
         msec: 1248
-        hash: "36e3d3a9a4e7163a1c052f30a97697dc"
+        hash: "930950ce5c6b12da47eea1b92d5176eb"
     }
     Frame {
         msec: 1264
-        hash: "fb18565ab22f6b397aef65a992c0dff8"
+        hash: "5a2eeca0f1533d323cc4d7ffbb7ad6aa"
     }
     Frame {
         msec: 1280
-        hash: "13763364dd631556988fe18afce23e84"
+        hash: "3f7f3ef2d4c1353dfe7027930505f4fd"
     }
     Frame {
         msec: 1296
-        hash: "2ea2995a7c022a4959eb1128d69907cc"
+        hash: "1a3a781ac5a1e90a4415944e0c54ea4e"
     }
     Key {
         type: 6
@@ -434,7 +434,7 @@ VisualTest {
     }
     Frame {
         msec: 1312
-        hash: "88485c98b946476b52094c85702939d4"
+        hash: "d11dae0dd461fc82a73bf319905320d4"
     }
     Key {
         type: 6
@@ -446,19 +446,19 @@ VisualTest {
     }
     Frame {
         msec: 1328
-        hash: "532586645946f17a274a3f7d1077e55b"
+        hash: "00957049ea51866138cfc33451f12e17"
     }
     Frame {
         msec: 1344
-        hash: "1702f1badb65f4039536c7255220a4b9"
+        hash: "386847af9b173db7ef1554d2c85c748e"
     }
     Frame {
         msec: 1360
-        hash: "7cd23a8548d9d2d7da78fa541d1ff9ba"
+        hash: "4b715060d29d6228a40217bc769fc140"
     }
     Frame {
         msec: 1376
-        hash: "42a4e0f3511d45f56e445737cbda49b5"
+        hash: "e58a9a3623afa08819351c22435ba03f"
     }
     Key {
         type: 6
@@ -470,31 +470,31 @@ VisualTest {
     }
     Frame {
         msec: 1392
-        hash: "e326fff480404a41735b1567a784ba80"
+        hash: "6378e3faf5578818fc282de2a077da59"
     }
     Frame {
         msec: 1408
-        hash: "4d972a5cfa88e86c72dc1fa7430090e4"
+        hash: "07efb3687d29e65680e1cc831762348f"
     }
     Frame {
         msec: 1424
-        hash: "691c28e265d5cd253c06f6feff7ee536"
+        hash: "5292e7c95b3c5b11e4088b5010984257"
     }
     Frame {
         msec: 1440
-        hash: "3ebb2496ec085b92a8f130e4f54c26c9"
+        hash: "ffe95603f5fe9d63abb3b77c399c3b11"
     }
     Frame {
         msec: 1456
-        hash: "2447e98313dc850f58333c7aa630ef28"
+        hash: "ad7cb73893c27b69704c5b821738a3c1"
     }
     Frame {
         msec: 1472
-        hash: "9d8bc16d365e534e4e1feee7185db44f"
+        hash: "e25971a61888ded93b651891ec9661b0"
     }
     Frame {
         msec: 1488
-        hash: "9a4b9cb5396857f79eac3a0a4e1dc1b3"
+        hash: "80f90b3623bf34544438dd00abee7037"
     }
     Key {
         type: 7
@@ -506,51 +506,51 @@ VisualTest {
     }
     Frame {
         msec: 1504
-        hash: "2d25e8fc011ec795e1596806a81be60d"
+        hash: "797dd70572e532d4acb374230b2c8efe"
     }
     Frame {
         msec: 1520
-        hash: "2fce48cf607cc3809ee1a9f59323e23a"
+        hash: "0673db1283d874a5711520f272572cf8"
     }
     Frame {
         msec: 1536
-        hash: "0fa177b9aa230dbcd5032a6ecddf604a"
+        hash: "fbc8434912f08a93b5f884258bc754b7"
     }
     Frame {
         msec: 1552
-        hash: "2dd53f15e0787337ce0590223e5ce788"
+        hash: "e41ebaf8f2114a6e8f38f731ea164e8a"
     }
     Frame {
         msec: 1568
-        hash: "385d08fa990f40a7a1d5fd61fa9fe7ae"
+        hash: "d14bdb5bf1b4756166ecf6f3255bf3cc"
     }
     Frame {
         msec: 1584
-        hash: "481401635bd419b8a30435135f61223f"
+        hash: "5fb04569aa0e530b898a3c11725b947e"
     }
     Frame {
         msec: 1600
-        hash: "d6600e6fcfd477100b7aab3509888512"
+        hash: "03d24457fae160864fec985765f6d8d1"
     }
     Frame {
         msec: 1616
-        hash: "4ede7ec537b56352dec575bbb7dbd482"
+        hash: "56dad740bb9032d113a0dacbe986c9c0"
     }
     Frame {
         msec: 1632
-        hash: "d4ff15c0dcf76dd7c97a0bf1901d688e"
+        hash: "70d9acda83aa7db59780cf56f03e38ec"
     }
     Frame {
         msec: 1648
-        hash: "d15c7df693dfb0ef48c30d5f73b34126"
+        hash: "a272e39bc1af0f4d1bab9c3f64e746e2"
     }
     Frame {
         msec: 1664
-        hash: "6dee0c6a00fb378692277914d22607e6"
+        hash: "cf0379de604b9bb33b4456cb89e09afd"
     }
     Frame {
         msec: 1680
-        hash: "8d74e52fca14ec36b266ace5113cac2b"
+        hash: "332e7a10d75c0d21a24fc8be34269629"
     }
     Key {
         type: 6
@@ -562,31 +562,31 @@ VisualTest {
     }
     Frame {
         msec: 1696
-        hash: "a33b648bc08e2b0db4e04a28dc7f64a2"
+        hash: "c07eb71d90e74393205338bc946c1e43"
     }
     Frame {
         msec: 1712
-        hash: "04af2732e95351448a3a4e5a12eb2c0d"
+        hash: "984477de7c103ff3aebc2634785dce09"
     }
     Frame {
         msec: 1728
-        hash: "72795cad18792504420251987d814cc5"
+        hash: "958f79dd7c57387042746df2ca01779e"
     }
     Frame {
         msec: 1744
-        hash: "46e3c02ca6ea9c831b276c6f0ef954db"
+        hash: "53bb3f0718d6333ca40dc279b6300b85"
     }
     Frame {
         msec: 1760
-        hash: "42173174a90d470901cd543e2bd57225"
+        hash: "c16877cb99997cc47f1fff5af1d22bd7"
     }
     Frame {
         msec: 1776
-        hash: "57e7d302246a27430b1e60fdbdfc368a"
+        hash: "dea3e1eb6c72f0d37398e3e301a23c19"
     }
     Frame {
         msec: 1792
-        hash: "896b150b47d87ec3d279ab149195758e"
+        hash: "6bb7918f0794e6a7cbdb8847cdcf6e35"
     }
     Key {
         type: 7
@@ -598,19 +598,19 @@ VisualTest {
     }
     Frame {
         msec: 1808
-        hash: "041240041c62b4cef6f329328eee2c6f"
+        hash: "6858cd874abb1ed2fec34862f76044fa"
     }
     Frame {
         msec: 1824
-        hash: "46e38ca8d4d827dc71719d662d433983"
+        hash: "47b546ea0d5b1d4573991d4738c37f4d"
     }
     Frame {
         msec: 1840
-        hash: "7d6ea4d357f0e916eaae3edd662bec9e"
+        hash: "6c9e636dee2bb5f2a72a2c08ab9fb970"
     }
     Frame {
         msec: 1856
-        hash: "b1214158b7f01fde56ec436baf88b98f"
+        hash: "42c2b2a7f41c88ae7bb19403e2460a17"
     }
     Key {
         type: 7
@@ -622,7 +622,7 @@ VisualTest {
     }
     Frame {
         msec: 1872
-        hash: "22b59737bb8ef5ffc78f1ef4a707d328"
+        hash: "80b7986af693b89dc4d4f9533dae85cb"
     }
     Key {
         type: 6
@@ -634,11 +634,11 @@ VisualTest {
     }
     Frame {
         msec: 1888
-        hash: "70b47f9af5373d4d5e0777eb169cbfe3"
+        hash: "631bea21dde9b7647f5843bc3513f3ba"
     }
     Frame {
         msec: 1904
-        hash: "d02ddd6f4b7169dcd114c519843eb855"
+        hash: "cc40335abbea0d589180096f7d8f5426"
     }
     Frame {
         msec: 1920
@@ -646,31 +646,31 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "5af4a21ba6e3b5e994557831d7063e92"
+        hash: "1c03b5384a889fe233eb1c6d14a55f36"
     }
     Frame {
         msec: 1952
-        hash: "97ef4122641ac4c49b9ef9a9dc1e5a0a"
+        hash: "7762cc4e6cf681311f5296de698c950b"
     }
     Frame {
         msec: 1968
-        hash: "7794188761d3efa4b47d4ab4c07208a3"
+        hash: "678eed1d1fec30b02156d690777397c1"
     }
     Frame {
         msec: 1984
-        hash: "4ca45c199693e767448016c4ccf1daaf"
+        hash: "96f51fee5c7baf78a3465420d63a9e5f"
     }
     Frame {
         msec: 2000
-        hash: "4ca45c199693e767448016c4ccf1daaf"
+        hash: "96f51fee5c7baf78a3465420d63a9e5f"
     }
     Frame {
         msec: 2016
-        hash: "4ca45c199693e767448016c4ccf1daaf"
+        hash: "96f51fee5c7baf78a3465420d63a9e5f"
     }
     Frame {
         msec: 2032
-        hash: "4ca45c199693e767448016c4ccf1daaf"
+        hash: "96f51fee5c7baf78a3465420d63a9e5f"
     }
     Key {
         type: 7
@@ -682,7 +682,7 @@ VisualTest {
     }
     Frame {
         msec: 2048
-        hash: "4ca45c199693e767448016c4ccf1daaf"
+        hash: "96f51fee5c7baf78a3465420d63a9e5f"
     }
     Key {
         type: 7
@@ -694,27 +694,27 @@ VisualTest {
     }
     Frame {
         msec: 2064
-        hash: "7794188761d3efa4b47d4ab4c07208a3"
+        hash: "678eed1d1fec30b02156d690777397c1"
     }
     Frame {
         msec: 2080
-        hash: "97ef4122641ac4c49b9ef9a9dc1e5a0a"
+        hash: "7762cc4e6cf681311f5296de698c950b"
     }
     Frame {
         msec: 2096
-        hash: "5af4a21ba6e3b5e994557831d7063e92"
+        hash: "1c03b5384a889fe233eb1c6d14a55f36"
     }
     Frame {
         msec: 2112
-        hash: "6f0f9bfa49f50ffd18ffe695cdc56d73"
+        hash: "2cd264339edc0338fc610e0d766425cc"
     }
     Frame {
         msec: 2128
-        hash: "d02ddd6f4b7169dcd114c519843eb855"
+        hash: "cc40335abbea0d589180096f7d8f5426"
     }
     Frame {
         msec: 2144
-        hash: "70b47f9af5373d4d5e0777eb169cbfe3"
+        hash: "631bea21dde9b7647f5843bc3513f3ba"
     }
     Key {
         type: 6
@@ -726,27 +726,27 @@ VisualTest {
     }
     Frame {
         msec: 2160
-        hash: "9e770dcd2f33ad157e86d08752458daf"
+        hash: "c5199c908df1f550d7c4f133eb926134"
     }
     Frame {
         msec: 2176
-        hash: "b6c660ffd14bb756f87adb5cf836e97f"
+        hash: "483eca22c50750e7591785ed60813d1f"
     }
     Frame {
         msec: 2192
-        hash: "c498c154fcf2d66fc0981150e575033c"
+        hash: "4091de379d8f6ccc7f19ea39f6c7993a"
     }
     Frame {
         msec: 2208
-        hash: "29277da2d1d6251e18ab89331d5df61d"
+        hash: "cd58c0d4f7248315a787542b0edcb4fb"
     }
     Frame {
         msec: 2224
-        hash: "3c7588de81cbfbba8735da74de220128"
+        hash: "458895f9ede4d56e0b851c6ed124405d"
     }
     Frame {
         msec: 2240
-        hash: "4fa61e0644ce0942a30f05ad8d3f13f6"
+        hash: "29a28a97fc78a1b01252b852fb0446e2"
     }
     Key {
         type: 7
@@ -758,31 +758,31 @@ VisualTest {
     }
     Frame {
         msec: 2256
-        hash: "3a90bb8b912d0be07e0e8b78407c54ff"
+        hash: "4fd9f22ad06e02b68319c298c2286e36"
     }
     Frame {
         msec: 2272
-        hash: "3d89454f0af4ab88ea67a075cb4e39b7"
+        hash: "a588e9dbeabd7519cd0cf2d26a123529"
     }
     Frame {
         msec: 2288
-        hash: "abdd589312402caea0b1c4f26ff6a1bf"
+        hash: "bb74f706477e277284fad50752f078b5"
     }
     Frame {
         msec: 2304
-        hash: "e6ab11dfb1965e94f5a42f2642ca0b30"
+        hash: "38f16a7deeaea6828edd15b00024fc19"
     }
     Frame {
         msec: 2320
-        hash: "c9fbfb63e19d1281b0c3a59504cd695c"
+        hash: "30c4aa33a6672f4df24186ad1e28bcf9"
     }
     Frame {
         msec: 2336
-        hash: "bc250ab3f5da66ecb0792a796b197149"
+        hash: "7f2ac0854ddbcca94a2ad160ead5d4d3"
     }
     Frame {
         msec: 2352
-        hash: "c5d26cd3ac3f87c77d716b912875b9de"
+        hash: "e1c083d0235ff5a2e002ce78f43009b0"
     }
     Key {
         type: 6
@@ -802,23 +802,23 @@ VisualTest {
     }
     Frame {
         msec: 2368
-        hash: "bbe9837039b7ea1dfab8ed30c8a15724"
+        hash: "eaee6483a2a4a0b09a8e40bb1785a498"
     }
     Frame {
         msec: 2384
-        hash: "836f9f207d8197f8e6e8e9c49f83aa4e"
+        hash: "26530bded6311640c4d3f6d1485fa7d3"
     }
     Frame {
         msec: 2400
-        hash: "235d20a347a0f7b331e707ad7de93f95"
+        hash: "e54102edbf6cc0c9a32b09858f760ee5"
     }
     Frame {
         msec: 2416
-        hash: "7f422b624488525aede06c69996fc583"
+        hash: "27434828de3ba8f6a3b83f042b70eb8b"
     }
     Frame {
         msec: 2432
-        hash: "664bef152c87b3eb6729d9b46bad750c"
+        hash: "fdf68e988b988d068ea78a5a09ef349e"
     }
     Key {
         type: 6
@@ -830,23 +830,23 @@ VisualTest {
     }
     Frame {
         msec: 2448
-        hash: "d32716cb4cb9fc8145029efb3fd1a32a"
+        hash: "0e1e9a2cf891cf65f30ead539becf408"
     }
     Frame {
         msec: 2464
-        hash: "17670e9d61ef2f9a0ec079b413ab546a"
+        hash: "46602c03632f6a47c9d523e1ea61baaf"
     }
     Frame {
         msec: 2480
-        hash: "6a3cbc70476d4e145a0e187ad7a73c52"
+        hash: "5c758ee2aa3f92b6506533f6d615bc20"
     }
     Frame {
         msec: 2496
-        hash: "aa0f4cf316026154c940261b4df848e3"
+        hash: "25edbdaae72e03426c9dfa75c08c33e6"
     }
     Frame {
         msec: 2512
-        hash: "2650d86c6aa82e4cc5e7ec4e2889f028"
+        hash: "a4bd11f15594932b996a069f3098c596"
     }
     Key {
         type: 7
@@ -858,23 +858,23 @@ VisualTest {
     }
     Frame {
         msec: 2528
-        hash: "ab392121c99d4f8f5a3622c26761a57e"
+        hash: "e4090b920ce2456149155f61fb586a6f"
     }
     Frame {
         msec: 2544
-        hash: "4f1c4006a84d794a7eaf9932a6f7d3ea"
+        hash: "ce71f4dc76f90fa300d715ed77e8a5a8"
     }
     Frame {
         msec: 2560
-        hash: "f6387eb0678a78894f607a7ff186bd19"
+        hash: "59414694d42a3942c4832fd7a3e93145"
     }
     Frame {
         msec: 2576
-        hash: "b14cb2545cb2cc055b914618d5086425"
+        hash: "1213fc9d9c1d58ceefc213a59f970679"
     }
     Frame {
         msec: 2592
-        hash: "e31ebced4421e9d5092950d373f9a4e9"
+        hash: "bbfa8471ab3fa5fc146946a6c8e0ce86"
     }
     Key {
         type: 6
@@ -886,15 +886,15 @@ VisualTest {
     }
     Frame {
         msec: 2608
-        hash: "b2177f1eed72624c4f6e4bd59902db16"
+        hash: "22a49c3b5234b4b7a2b935d58027f834"
     }
     Frame {
         msec: 2624
-        hash: "9ade9a8b436bb9481e8135b7342070ff"
+        hash: "7b81c14d5350fb55775c1cb0f3945c46"
     }
     Frame {
         msec: 2640
-        hash: "4bdbc37f8ecac1a8aae182cb3e6bf1fa"
+        hash: "8ebf266de0df228e47cc6e5a8758a6ea"
     }
     Key {
         type: 7
@@ -906,23 +906,23 @@ VisualTest {
     }
     Frame {
         msec: 2656
-        hash: "3bf69edaa0eec73246c52f310079a15d"
+        hash: "6344eb333dc28672f863bcb7ca5d6cfe"
     }
     Frame {
         msec: 2672
-        hash: "add80b7fde2865bb23ccb46a03b5604c"
+        hash: "8efc9b4a6c27b8918cba629a5a1c0f24"
     }
     Frame {
         msec: 2688
-        hash: "6259b8d763f468054f35c87f4ba47d30"
+        hash: "b586c24ce0c04391a9095c0ac4b7a05a"
     }
     Frame {
         msec: 2704
-        hash: "1dd94dcd8c7f651811f1b962a75962be"
+        hash: "191413fe51a6887ae92c135252fdeeae"
     }
     Frame {
         msec: 2720
-        hash: "f813c62008a3880d079cb1c0be9a03e1"
+        hash: "fc0b37abf12827af41e7037eab8ba5c8"
     }
     Key {
         type: 6
@@ -934,19 +934,19 @@ VisualTest {
     }
     Frame {
         msec: 2736
-        hash: "4e776b52bce5b0e0ee46f9feff684a90"
+        hash: "5efe28d02b93e094192d7fd6fe753acd"
     }
     Frame {
         msec: 2752
-        hash: "cd2c2b6e9d05b521214eeab29e89d7c4"
+        hash: "dadc1f7b14fbf9f8a174821c4197da46"
     }
     Frame {
         msec: 2768
-        hash: "8605360fcf3f24372463827a1d3f93c6"
+        hash: "124deac57a3eeaef4cb3c0c802bacc05"
     }
     Frame {
         msec: 2784
-        hash: "03b734ffb679f8718999c4e060a2febb"
+        hash: "e022a6d66a7b37d72885a7a7f6919433"
     }
     Key {
         type: 7
@@ -958,23 +958,23 @@ VisualTest {
     }
     Frame {
         msec: 2800
-        hash: "43e2020cd127ce541b54ba7814c9ba74"
+        hash: "5faa6543469753948b1636351d044329"
     }
     Frame {
         msec: 2816
-        hash: "9c1774f8ae01e37aac05d27567d3cec6"
+        hash: "a7dcf5a0b9bb00105eed173b498cb95c"
     }
     Frame {
         msec: 2832
-        hash: "6c4a7a200eba8b6c5c0b5b75d8a88811"
+        hash: "29ac83d169af2c74ffd134d771c88718"
     }
     Frame {
         msec: 2848
-        hash: "21d88afb0f05ace0710da47af275d827"
+        hash: "0a04648fdc90ec86fb55ad3a165573c4"
     }
     Frame {
         msec: 2864
-        hash: "42b56667390aa2db6d593b7af9a5021a"
+        hash: "d699c713ba939612f1e552e48db19b18"
     }
     Frame {
         msec: 2880
@@ -982,51 +982,51 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "5897cafae19f8842f53a54b75e36f22d"
+        hash: "adf564652cfae394869755ff2fe5b534"
     }
     Frame {
         msec: 2912
-        hash: "11cacddae5d5361b7e87696808ac2905"
+        hash: "d1453f663217ee45a8462b7d077d7f6a"
     }
     Frame {
         msec: 2928
-        hash: "2cc3dcb900ab2bffd52fb61fff108043"
+        hash: "9f1461d63ccc49f83e58245ba75685e1"
     }
     Frame {
         msec: 2944
-        hash: "8938b8c7254873197e409206c1c20ad4"
+        hash: "8cece1543e7e9190eefaa92c2024cbd1"
     }
     Frame {
         msec: 2960
-        hash: "e343d647f236969530d0b076c3375f1a"
+        hash: "555abf8bc3fdb1eef85b1e4bd54932a3"
     }
     Frame {
         msec: 2976
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 2992
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 3008
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 3024
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 3040
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 3056
-        hash: "5e39a0f9bdc45a7a288f59b7cbbf749d"
+        hash: "7fc65284b99fc548de0985d94a145fa7"
     }
     Frame {
         msec: 3072
-        hash: "e343d647f236969530d0b076c3375f1a"
+        hash: "555abf8bc3fdb1eef85b1e4bd54932a3"
     }
     Key {
         type: 6
@@ -1038,23 +1038,23 @@ VisualTest {
     }
     Frame {
         msec: 3088
-        hash: "ac4898002fdc5ea7894d741cac863c8d"
+        hash: "996da2eff9302908a55308dbcc8fb3c2"
     }
     Frame {
         msec: 3104
-        hash: "eda67cb2d32f3f605a74a01148f04c99"
+        hash: "6ccc70f6120acb53152b71bcf95514ca"
     }
     Frame {
         msec: 3120
-        hash: "13e84656ef70bf07e2a444d60ac933e1"
+        hash: "51a1b8e79d209643d55d4cecc6a70ed0"
     }
     Frame {
         msec: 3136
-        hash: "9d624eebe5824fc5d4a89a04f2d776a3"
+        hash: "944dc7026c6487838ede9ef94003ec90"
     }
     Frame {
         msec: 3152
-        hash: "2c7d542f60c68e16377d3c5afea0f4e3"
+        hash: "4abbd51b620ac4ea91af95bc2d0881d7"
     }
     Key {
         type: 7
@@ -1066,27 +1066,27 @@ VisualTest {
     }
     Frame {
         msec: 3168
-        hash: "7db8d678bd1890010b2a1b9bb732c17c"
+        hash: "ba721988a1708b8c0762d706820c48fc"
     }
     Frame {
         msec: 3184
-        hash: "6d6f4cc1193b73c65db893c3f983d9f0"
+        hash: "5dba56a5bb5f8a6539a0066af35c73b8"
     }
     Frame {
         msec: 3200
-        hash: "d4e8985ad4d14436a87db45585fca946"
+        hash: "bc3efeeebe7075cd09a6e57eef43d610"
     }
     Frame {
         msec: 3216
-        hash: "495b67926e9002a43e2d251b8c96564f"
+        hash: "0bd9f7de32b01d8144280bf252d9a18f"
     }
     Frame {
         msec: 3232
-        hash: "3b2dd937cfb6cd57884f3b813f3d4129"
+        hash: "29db710e47b13f26e2bf92568d52bf52"
     }
     Frame {
         msec: 3248
-        hash: "02a5902af43990021465a7df9d479982"
+        hash: "a27c65c0a49deb18b0766bba41a32e54"
     }
     Key {
         type: 6
@@ -1098,31 +1098,31 @@ VisualTest {
     }
     Frame {
         msec: 3264
-        hash: "5b14b471fffa401affc954871662e6a8"
+        hash: "484ee552e1a9c5eafcfe1ac583fcdffd"
     }
     Frame {
         msec: 3280
-        hash: "bbe03a2ea1e5b788c79d9551bd317a2d"
+        hash: "40b336a0e337b66d813089a82a88c712"
     }
     Frame {
         msec: 3296
-        hash: "10b49692f820311b8bfbc0f87c05e993"
+        hash: "b7a8d4b8bb2b83e4c886aa51c1a73895"
     }
     Frame {
         msec: 3312
-        hash: "928ee5d4ca3c31a879f82b5b4f6d1912"
+        hash: "43b3bf8425e7a6b7115d8e6a0bcfd677"
     }
     Frame {
         msec: 3328
-        hash: "9f3ea4149963d467be28fcf26a43e6d6"
+        hash: "e2ce168241b043db74867fe7ed6de956"
     }
     Frame {
         msec: 3344
-        hash: "f2ec87d7c4f6bbecc771270062e25d14"
+        hash: "0c713bbd7bb694d87f0fe14f87098b9b"
     }
     Frame {
         msec: 3360
-        hash: "f181b9aeccdecd486550c2a69e57a63f"
+        hash: "316f6bd365ca4b4f2e6fbf34a047e307"
     }
     Key {
         type: 7
@@ -1134,39 +1134,39 @@ VisualTest {
     }
     Frame {
         msec: 3376
-        hash: "ce871b1784464b56728eeb0140ad689c"
+        hash: "421fb8881fe7b300dcec0f44ff1743e3"
     }
     Frame {
         msec: 3392
-        hash: "8d1b19921c7ee633f423b3f8c1f07e6a"
+        hash: "e8376079434393467b47a56ff00efb2b"
     }
     Frame {
         msec: 3408
-        hash: "451973c72f86fc3425c31da3311d625c"
+        hash: "63259de84a6e07d42c9df94ec2a25920"
     }
     Frame {
         msec: 3424
-        hash: "64301801af58f7a9c5ea32c33eb988e2"
+        hash: "f9194d82b81f5ac58862c382caf5cf59"
     }
     Frame {
         msec: 3440
-        hash: "3406ff52f3829c56ff3b29558d6fd11c"
+        hash: "e185f2594f038532a37b351384dc97ea"
     }
     Frame {
         msec: 3456
-        hash: "0952802094d7d7f105d7f50f36c02530"
+        hash: "91edc3ca1e6c532bd92006a761073da2"
     }
     Frame {
         msec: 3472
-        hash: "daddc3aa8ae9970cc111e981adcdd9bb"
+        hash: "b47390495539756048ccc71047ebef7b"
     }
     Frame {
         msec: 3488
-        hash: "491e3241705cdc2917c6560cece6188e"
+        hash: "7c83d3bdb9abf8ab2cfe7f9464673a49"
     }
     Frame {
         msec: 3504
-        hash: "cefbdc87c704e72145e878fc944c621f"
+        hash: "b686f4013f45885ab794aba9ff491286"
     }
     Key {
         type: 7
@@ -1178,11 +1178,11 @@ VisualTest {
     }
     Frame {
         msec: 3520
-        hash: "3427e88f200a1ac2d4596cb2fec0ae66"
+        hash: "0c55d6ea330b7365825864d4bdacafcb"
     }
     Frame {
         msec: 3536
-        hash: "62eef650b45f3c2fa425d1bff88a01a7"
+        hash: "2bb72f191201572308e461021872fb4c"
     }
     Key {
         type: 7
@@ -1194,75 +1194,75 @@ VisualTest {
     }
     Frame {
         msec: 3552
-        hash: "9945cda3cf5c22d8c83b19b0f69e4e09"
+        hash: "81b04a84982698ee80d13d392742edd3"
     }
     Frame {
         msec: 3568
-        hash: "80fcd1194d1bc3e010ddc6ba224f3d40"
+        hash: "63f582dc2a9f707c1ec99f4285d13a84"
     }
     Frame {
         msec: 3584
-        hash: "59da897870a7e235a67defaff1f8f4e4"
+        hash: "f91cb29101f80f5dcb1e9e8c82e823b7"
     }
     Frame {
         msec: 3600
-        hash: "664bef152c87b3eb6729d9b46bad750c"
+        hash: "fdf68e988b988d068ea78a5a09ef349e"
     }
     Frame {
         msec: 3616
-        hash: "7f422b624488525aede06c69996fc583"
+        hash: "27434828de3ba8f6a3b83f042b70eb8b"
     }
     Frame {
         msec: 3632
-        hash: "235d20a347a0f7b331e707ad7de93f95"
+        hash: "e54102edbf6cc0c9a32b09858f760ee5"
     }
     Frame {
         msec: 3648
-        hash: "836f9f207d8197f8e6e8e9c49f83aa4e"
+        hash: "26530bded6311640c4d3f6d1485fa7d3"
     }
     Frame {
         msec: 3664
-        hash: "bbe9837039b7ea1dfab8ed30c8a15724"
+        hash: "eaee6483a2a4a0b09a8e40bb1785a498"
     }
     Frame {
         msec: 3680
-        hash: "c5d26cd3ac3f87c77d716b912875b9de"
+        hash: "e1c083d0235ff5a2e002ce78f43009b0"
     }
     Frame {
         msec: 3696
-        hash: "bc250ab3f5da66ecb0792a796b197149"
+        hash: "7f2ac0854ddbcca94a2ad160ead5d4d3"
     }
     Frame {
         msec: 3712
-        hash: "c9fbfb63e19d1281b0c3a59504cd695c"
+        hash: "30c4aa33a6672f4df24186ad1e28bcf9"
     }
     Frame {
         msec: 3728
-        hash: "e6ab11dfb1965e94f5a42f2642ca0b30"
+        hash: "38f16a7deeaea6828edd15b00024fc19"
     }
     Frame {
         msec: 3744
-        hash: "abdd589312402caea0b1c4f26ff6a1bf"
+        hash: "bb74f706477e277284fad50752f078b5"
     }
     Frame {
         msec: 3760
-        hash: "3d89454f0af4ab88ea67a075cb4e39b7"
+        hash: "a588e9dbeabd7519cd0cf2d26a123529"
     }
     Frame {
         msec: 3776
-        hash: "3a90bb8b912d0be07e0e8b78407c54ff"
+        hash: "4fd9f22ad06e02b68319c298c2286e36"
     }
     Frame {
         msec: 3792
-        hash: "4fa61e0644ce0942a30f05ad8d3f13f6"
+        hash: "29a28a97fc78a1b01252b852fb0446e2"
     }
     Frame {
         msec: 3808
-        hash: "3c7588de81cbfbba8735da74de220128"
+        hash: "458895f9ede4d56e0b851c6ed124405d"
     }
     Frame {
         msec: 3824
-        hash: "29277da2d1d6251e18ab89331d5df61d"
+        hash: "cd58c0d4f7248315a787542b0edcb4fb"
     }
     Frame {
         msec: 3840
@@ -1270,239 +1270,239 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "b6c660ffd14bb756f87adb5cf836e97f"
+        hash: "483eca22c50750e7591785ed60813d1f"
     }
     Frame {
         msec: 3872
-        hash: "9e770dcd2f33ad157e86d08752458daf"
+        hash: "c5199c908df1f550d7c4f133eb926134"
     }
     Frame {
         msec: 3888
-        hash: "4c9421ff4dc80e555ac5ba4a02d0c5be"
+        hash: "efaa5e4483ed9cfec792e8f270b5079e"
     }
     Frame {
         msec: 3904
-        hash: "dcbfc9f6300363d03aa869ce3d58e6fe"
+        hash: "7ffcff87e27dcb0be0047eb6fbcc9549"
     }
     Frame {
         msec: 3920
-        hash: "491f07f2498598cf57b368ff880f85f5"
+        hash: "04339417259ddee10134e1479729ae1b"
     }
     Frame {
         msec: 3936
-        hash: "ea356dc3ef6aa6ca67e58b7b2f6912e4"
+        hash: "0f1e6a0d9db7b6b8b874333682866ffa"
     }
     Frame {
         msec: 3952
-        hash: "8575a99b28bb5b8c2d01a5ed91f25d47"
+        hash: "66500c2cc3d69b9fb48dc46e384aca6d"
     }
     Frame {
         msec: 3968
-        hash: "7f83ba29fd27aa4817b7b84afbc8d6d7"
+        hash: "70d6b73499c36138bee63e07afb0b186"
     }
     Frame {
         msec: 3984
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4000
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4016
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4032
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4048
-        hash: "0173dd60a64da4c06fa9a398d2c98206"
+        hash: "c526315dd5eec117266c68a7b6b64a3f"
     }
     Frame {
         msec: 4064
-        hash: "7f83ba29fd27aa4817b7b84afbc8d6d7"
+        hash: "70d6b73499c36138bee63e07afb0b186"
     }
     Frame {
         msec: 4080
-        hash: "8575a99b28bb5b8c2d01a5ed91f25d47"
+        hash: "66500c2cc3d69b9fb48dc46e384aca6d"
     }
     Frame {
         msec: 4096
-        hash: "ea356dc3ef6aa6ca67e58b7b2f6912e4"
+        hash: "0f1e6a0d9db7b6b8b874333682866ffa"
     }
     Frame {
         msec: 4112
-        hash: "491f07f2498598cf57b368ff880f85f5"
+        hash: "04339417259ddee10134e1479729ae1b"
     }
     Frame {
         msec: 4128
-        hash: "dcbfc9f6300363d03aa869ce3d58e6fe"
+        hash: "7ffcff87e27dcb0be0047eb6fbcc9549"
     }
     Frame {
         msec: 4144
-        hash: "4c9421ff4dc80e555ac5ba4a02d0c5be"
+        hash: "efaa5e4483ed9cfec792e8f270b5079e"
     }
     Frame {
         msec: 4160
-        hash: "9e770dcd2f33ad157e86d08752458daf"
+        hash: "c5199c908df1f550d7c4f133eb926134"
     }
     Frame {
         msec: 4176
-        hash: "b6c660ffd14bb756f87adb5cf836e97f"
+        hash: "483eca22c50750e7591785ed60813d1f"
     }
     Frame {
         msec: 4192
-        hash: "c498c154fcf2d66fc0981150e575033c"
+        hash: "4091de379d8f6ccc7f19ea39f6c7993a"
     }
     Frame {
         msec: 4208
-        hash: "29277da2d1d6251e18ab89331d5df61d"
+        hash: "cd58c0d4f7248315a787542b0edcb4fb"
     }
     Frame {
         msec: 4224
-        hash: "3c7588de81cbfbba8735da74de220128"
+        hash: "458895f9ede4d56e0b851c6ed124405d"
     }
     Frame {
         msec: 4240
-        hash: "4fa61e0644ce0942a30f05ad8d3f13f6"
+        hash: "29a28a97fc78a1b01252b852fb0446e2"
     }
     Frame {
         msec: 4256
-        hash: "3a90bb8b912d0be07e0e8b78407c54ff"
+        hash: "4fd9f22ad06e02b68319c298c2286e36"
     }
     Frame {
         msec: 4272
-        hash: "3d89454f0af4ab88ea67a075cb4e39b7"
+        hash: "a588e9dbeabd7519cd0cf2d26a123529"
     }
     Frame {
         msec: 4288
-        hash: "abdd589312402caea0b1c4f26ff6a1bf"
+        hash: "bb74f706477e277284fad50752f078b5"
     }
     Frame {
         msec: 4304
-        hash: "e6ab11dfb1965e94f5a42f2642ca0b30"
+        hash: "38f16a7deeaea6828edd15b00024fc19"
     }
     Frame {
         msec: 4320
-        hash: "c9fbfb63e19d1281b0c3a59504cd695c"
+        hash: "30c4aa33a6672f4df24186ad1e28bcf9"
     }
     Frame {
         msec: 4336
-        hash: "bc250ab3f5da66ecb0792a796b197149"
+        hash: "7f2ac0854ddbcca94a2ad160ead5d4d3"
     }
     Frame {
         msec: 4352
-        hash: "c5d26cd3ac3f87c77d716b912875b9de"
+        hash: "e1c083d0235ff5a2e002ce78f43009b0"
     }
     Frame {
         msec: 4368
-        hash: "bbe9837039b7ea1dfab8ed30c8a15724"
+        hash: "eaee6483a2a4a0b09a8e40bb1785a498"
     }
     Frame {
         msec: 4384
-        hash: "836f9f207d8197f8e6e8e9c49f83aa4e"
+        hash: "26530bded6311640c4d3f6d1485fa7d3"
     }
     Frame {
         msec: 4400
-        hash: "235d20a347a0f7b331e707ad7de93f95"
+        hash: "e54102edbf6cc0c9a32b09858f760ee5"
     }
     Frame {
         msec: 4416
-        hash: "7f422b624488525aede06c69996fc583"
+        hash: "27434828de3ba8f6a3b83f042b70eb8b"
     }
     Frame {
         msec: 4432
-        hash: "664bef152c87b3eb6729d9b46bad750c"
+        hash: "fdf68e988b988d068ea78a5a09ef349e"
     }
     Frame {
         msec: 4448
-        hash: "59da897870a7e235a67defaff1f8f4e4"
+        hash: "f91cb29101f80f5dcb1e9e8c82e823b7"
     }
     Frame {
         msec: 4464
-        hash: "80fcd1194d1bc3e010ddc6ba224f3d40"
+        hash: "63f582dc2a9f707c1ec99f4285d13a84"
     }
     Frame {
         msec: 4480
-        hash: "9945cda3cf5c22d8c83b19b0f69e4e09"
+        hash: "81b04a84982698ee80d13d392742edd3"
     }
     Frame {
         msec: 4496
-        hash: "62eef650b45f3c2fa425d1bff88a01a7"
+        hash: "2bb72f191201572308e461021872fb4c"
     }
     Frame {
         msec: 4512
-        hash: "3427e88f200a1ac2d4596cb2fec0ae66"
+        hash: "0c55d6ea330b7365825864d4bdacafcb"
     }
     Frame {
         msec: 4528
-        hash: "cefbdc87c704e72145e878fc944c621f"
+        hash: "b686f4013f45885ab794aba9ff491286"
     }
     Frame {
         msec: 4544
-        hash: "491e3241705cdc2917c6560cece6188e"
+        hash: "7c83d3bdb9abf8ab2cfe7f9464673a49"
     }
     Frame {
         msec: 4560
-        hash: "daddc3aa8ae9970cc111e981adcdd9bb"
+        hash: "b47390495539756048ccc71047ebef7b"
     }
     Frame {
         msec: 4576
-        hash: "0952802094d7d7f105d7f50f36c02530"
+        hash: "91edc3ca1e6c532bd92006a761073da2"
     }
     Frame {
         msec: 4592
-        hash: "3406ff52f3829c56ff3b29558d6fd11c"
+        hash: "e185f2594f038532a37b351384dc97ea"
     }
     Frame {
         msec: 4608
-        hash: "64301801af58f7a9c5ea32c33eb988e2"
+        hash: "f9194d82b81f5ac58862c382caf5cf59"
     }
     Frame {
         msec: 4624
-        hash: "451973c72f86fc3425c31da3311d625c"
+        hash: "63259de84a6e07d42c9df94ec2a25920"
     }
     Frame {
         msec: 4640
-        hash: "8d1b19921c7ee633f423b3f8c1f07e6a"
+        hash: "e8376079434393467b47a56ff00efb2b"
     }
     Frame {
         msec: 4656
-        hash: "ce871b1784464b56728eeb0140ad689c"
+        hash: "421fb8881fe7b300dcec0f44ff1743e3"
     }
     Frame {
         msec: 4672
-        hash: "f181b9aeccdecd486550c2a69e57a63f"
+        hash: "316f6bd365ca4b4f2e6fbf34a047e307"
     }
     Frame {
         msec: 4688
-        hash: "f2ec87d7c4f6bbecc771270062e25d14"
+        hash: "0c713bbd7bb694d87f0fe14f87098b9b"
     }
     Frame {
         msec: 4704
-        hash: "9f3ea4149963d467be28fcf26a43e6d6"
+        hash: "e2ce168241b043db74867fe7ed6de956"
     }
     Frame {
         msec: 4720
-        hash: "928ee5d4ca3c31a879f82b5b4f6d1912"
+        hash: "43b3bf8425e7a6b7115d8e6a0bcfd677"
     }
     Frame {
         msec: 4736
-        hash: "10b49692f820311b8bfbc0f87c05e993"
+        hash: "b7a8d4b8bb2b83e4c886aa51c1a73895"
     }
     Frame {
         msec: 4752
-        hash: "bbe03a2ea1e5b788c79d9551bd317a2d"
+        hash: "40b336a0e337b66d813089a82a88c712"
     }
     Frame {
         msec: 4768
-        hash: "5b14b471fffa401affc954871662e6a8"
+        hash: "484ee552e1a9c5eafcfe1ac583fcdffd"
     }
     Frame {
         msec: 4784
-        hash: "02a5902af43990021465a7df9d479982"
+        hash: "a27c65c0a49deb18b0766bba41a32e54"
     }
     Frame {
         msec: 4800
@@ -1510,42 +1510,42 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "495b67926e9002a43e2d251b8c96564f"
+        hash: "0bd9f7de32b01d8144280bf252d9a18f"
     }
     Frame {
         msec: 4832
-        hash: "d4e8985ad4d14436a87db45585fca946"
+        hash: "bc3efeeebe7075cd09a6e57eef43d610"
     }
     Frame {
         msec: 4848
-        hash: "6d6f4cc1193b73c65db893c3f983d9f0"
+        hash: "5dba56a5bb5f8a6539a0066af35c73b8"
     }
     Frame {
         msec: 4864
-        hash: "7db8d678bd1890010b2a1b9bb732c17c"
+        hash: "ba721988a1708b8c0762d706820c48fc"
     }
     Frame {
         msec: 4880
-        hash: "2c7d542f60c68e16377d3c5afea0f4e3"
+        hash: "4abbd51b620ac4ea91af95bc2d0881d7"
     }
     Frame {
         msec: 4896
-        hash: "9d624eebe5824fc5d4a89a04f2d776a3"
+        hash: "944dc7026c6487838ede9ef94003ec90"
     }
     Frame {
         msec: 4912
-        hash: "13e84656ef70bf07e2a444d60ac933e1"
+        hash: "51a1b8e79d209643d55d4cecc6a70ed0"
     }
     Frame {
         msec: 4928
-        hash: "eda67cb2d32f3f605a74a01148f04c99"
+        hash: "6ccc70f6120acb53152b71bcf95514ca"
     }
     Frame {
         msec: 4944
-        hash: "ac4898002fdc5ea7894d741cac863c8d"
+        hash: "996da2eff9302908a55308dbcc8fb3c2"
     }
     Frame {
         msec: 4960
-        hash: "2e95c1966c94acccd2a44a6c2942d36d"
+        hash: "264f34128dfe563126b9f187c65df61e"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
index a4d7bef..57a1599 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
index a8aee18..d327d5b 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
index 799f422..c1e3dce 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml
index bbeb532..9a26f57 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml
@@ -6,11 +6,11 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 32
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Key {
         type: 6
@@ -22,83 +22,83 @@ VisualTest {
     }
     Frame {
         msec: 48
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 64
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 80
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 96
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 112
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 128
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 144
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 160
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 176
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 192
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 208
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 224
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 240
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 256
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 272
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 288
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 304
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 320
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 336
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Frame {
         msec: 352
-        hash: "3ea9888b1213bb799bdb01ed0eff2a78"
+        hash: "0e7c7dc19aab217751411568b58830ef"
     }
     Key {
         type: 6
@@ -110,23 +110,23 @@ VisualTest {
     }
     Frame {
         msec: 368
-        hash: "d070b6581fd109ce278cf4a8c41a6549"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 384
-        hash: "d070b6581fd109ce278cf4a8c41a6549"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 400
-        hash: "d070b6581fd109ce278cf4a8c41a6549"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 416
-        hash: "d070b6581fd109ce278cf4a8c41a6549"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 432
-        hash: "d070b6581fd109ce278cf4a8c41a6549"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Key {
         type: 7
@@ -138,27 +138,27 @@ VisualTest {
     }
     Frame {
         msec: 448
-        hash: "d070b6581fd109ce278cf4a8c41a6549"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 464
-        hash: "d070b6581fd109ce278cf4a8c41a6549"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 480
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 496
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 512
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 528
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Key {
         type: 7
@@ -170,43 +170,43 @@ VisualTest {
     }
     Frame {
         msec: 544
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 560
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 576
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 592
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 608
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 624
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 640
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 656
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 672
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Frame {
         msec: 688
-        hash: "6a80a729e85f8dab98155e115a4193cc"
+        hash: "d3151ba24f0011bf1add83377f32ec85"
     }
     Key {
         type: 6
@@ -218,23 +218,23 @@ VisualTest {
     }
     Frame {
         msec: 704
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 720
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 736
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 752
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 768
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Key {
         type: 7
@@ -246,23 +246,23 @@ VisualTest {
     }
     Frame {
         msec: 784
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 800
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 816
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 832
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Frame {
         msec: 848
-        hash: "fd47d9eaea89d6a731bdd70b39b2bc54"
+        hash: "6b7c333ce19fede43aee84cc66c4c1bc"
     }
     Key {
         type: 6
@@ -274,15 +274,15 @@ VisualTest {
     }
     Frame {
         msec: 864
-        hash: "b643c026fe7570505e72971d3b3f0ea2"
+        hash: "a5386e9b39daa0a5aad8a8cd5191909b"
     }
     Frame {
         msec: 880
-        hash: "b643c026fe7570505e72971d3b3f0ea2"
+        hash: "a5386e9b39daa0a5aad8a8cd5191909b"
     }
     Frame {
         msec: 896
-        hash: "b643c026fe7570505e72971d3b3f0ea2"
+        hash: "a5386e9b39daa0a5aad8a8cd5191909b"
     }
     Key {
         type: 7
@@ -294,15 +294,15 @@ VisualTest {
     }
     Frame {
         msec: 912
-        hash: "b643c026fe7570505e72971d3b3f0ea2"
+        hash: "a5386e9b39daa0a5aad8a8cd5191909b"
     }
     Frame {
         msec: 928
-        hash: "b643c026fe7570505e72971d3b3f0ea2"
+        hash: "a5386e9b39daa0a5aad8a8cd5191909b"
     }
     Frame {
         msec: 944
-        hash: "b643c026fe7570505e72971d3b3f0ea2"
+        hash: "a5386e9b39daa0a5aad8a8cd5191909b"
     }
     Frame {
         msec: 960
@@ -310,7 +310,7 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "cba83dfcd44e4ba3ea44dd8d84bde745"
+        hash: "a5386e9b39daa0a5aad8a8cd5191909b"
     }
     Key {
         type: 6
@@ -322,19 +322,19 @@ VisualTest {
     }
     Frame {
         msec: 992
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1008
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1024
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1040
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Key {
         type: 7
@@ -346,51 +346,51 @@ VisualTest {
     }
     Frame {
         msec: 1056
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1072
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1088
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1104
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1120
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1136
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1152
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1168
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1184
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1200
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1216
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Frame {
         msec: 1232
-        hash: "bca450bd2b1a46da72e0ba99a70c18ab"
+        hash: "f9149723166015ed066b794cf86b27d0"
     }
     Key {
         type: 6
@@ -402,15 +402,15 @@ VisualTest {
     }
     Frame {
         msec: 1248
-        hash: "55c33f786e6dc14b038dba96cc154859"
+        hash: "56dd8557435509e5a96c2f2907d474eb"
     }
     Frame {
         msec: 1264
-        hash: "55c33f786e6dc14b038dba96cc154859"
+        hash: "56dd8557435509e5a96c2f2907d474eb"
     }
     Frame {
         msec: 1280
-        hash: "55c33f786e6dc14b038dba96cc154859"
+        hash: "56dd8557435509e5a96c2f2907d474eb"
     }
     Key {
         type: 7
@@ -422,15 +422,15 @@ VisualTest {
     }
     Frame {
         msec: 1296
-        hash: "55c33f786e6dc14b038dba96cc154859"
+        hash: "56dd8557435509e5a96c2f2907d474eb"
     }
     Frame {
         msec: 1312
-        hash: "55c33f786e6dc14b038dba96cc154859"
+        hash: "56dd8557435509e5a96c2f2907d474eb"
     }
     Frame {
         msec: 1328
-        hash: "55c33f786e6dc14b038dba96cc154859"
+        hash: "56dd8557435509e5a96c2f2907d474eb"
     }
     Key {
         type: 6
@@ -442,39 +442,39 @@ VisualTest {
     }
     Frame {
         msec: 1344
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1360
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1376
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1392
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1408
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1424
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1440
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1456
-        hash: "693d9e7579752a748d4c8d7fcbd3c022"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Frame {
         msec: 1472
-        hash: "9be278fc6ebef108857a414ecb292b46"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Key {
         type: 7
@@ -486,7 +486,7 @@ VisualTest {
     }
     Frame {
         msec: 1488
-        hash: "9be278fc6ebef108857a414ecb292b46"
+        hash: "b311772a9bf92f4222b1c1c7ddbe96c4"
     }
     Key {
         type: 6
@@ -498,19 +498,19 @@ VisualTest {
     }
     Frame {
         msec: 1504
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1520
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1536
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1552
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Key {
         type: 7
@@ -522,27 +522,27 @@ VisualTest {
     }
     Frame {
         msec: 1568
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1584
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1600
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1616
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1632
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Frame {
         msec: 1648
-        hash: "b1c799fd9f4ebf097ec79448eb9b4a2c"
+        hash: "8feb240ad13e1e9d8392bfeb484261db"
     }
     Key {
         type: 6
@@ -554,23 +554,23 @@ VisualTest {
     }
     Frame {
         msec: 1664
-        hash: "46e977b7614ae6316a64106f6e5326c1"
+        hash: "cd240ccffd4b4a6304b47cfd1e55cf49"
     }
     Frame {
         msec: 1680
-        hash: "46e977b7614ae6316a64106f6e5326c1"
+        hash: "cd240ccffd4b4a6304b47cfd1e55cf49"
     }
     Frame {
         msec: 1696
-        hash: "46e977b7614ae6316a64106f6e5326c1"
+        hash: "cd240ccffd4b4a6304b47cfd1e55cf49"
     }
     Frame {
         msec: 1712
-        hash: "46e977b7614ae6316a64106f6e5326c1"
+        hash: "cd240ccffd4b4a6304b47cfd1e55cf49"
     }
     Frame {
         msec: 1728
-        hash: "46e977b7614ae6316a64106f6e5326c1"
+        hash: "cd240ccffd4b4a6304b47cfd1e55cf49"
     }
     Key {
         type: 6
@@ -582,7 +582,7 @@ VisualTest {
     }
     Frame {
         msec: 1744
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Key {
         type: 7
@@ -594,15 +594,15 @@ VisualTest {
     }
     Frame {
         msec: 1760
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Frame {
         msec: 1776
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Frame {
         msec: 1792
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Key {
         type: 7
@@ -614,19 +614,19 @@ VisualTest {
     }
     Frame {
         msec: 1808
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Frame {
         msec: 1824
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Frame {
         msec: 1840
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Frame {
         msec: 1856
-        hash: "2d7771008d9ec265f70d089bb8436e18"
+        hash: "437370a412fccbeee3d1f095e32c3584"
     }
     Key {
         type: 6
@@ -638,15 +638,15 @@ VisualTest {
     }
     Frame {
         msec: 1872
-        hash: "7d85b2d311514db5988e335110fb8352"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 1888
-        hash: "7d85b2d311514db5988e335110fb8352"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 1904
-        hash: "7d85b2d311514db5988e335110fb8352"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 1920
@@ -662,27 +662,27 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "7d85b2d311514db5988e335110fb8352"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 1952
-        hash: "7d85b2d311514db5988e335110fb8352"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 1968
-        hash: "7d85b2d311514db5988e335110fb8352"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 1984
-        hash: "9f4258905e76a6523e015701c3278cae"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 2000
-        hash: "9f4258905e76a6523e015701c3278cae"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Frame {
         msec: 2016
-        hash: "9f4258905e76a6523e015701c3278cae"
+        hash: "eb4a45722e365b103ff5423117236fd3"
     }
     Key {
         type: 6
@@ -694,11 +694,11 @@ VisualTest {
     }
     Frame {
         msec: 2032
-        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+        hash: "b53d0651627d008545e54063ceb8d689"
     }
     Frame {
         msec: 2048
-        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+        hash: "b53d0651627d008545e54063ceb8d689"
     }
     Key {
         type: 7
@@ -710,11 +710,11 @@ VisualTest {
     }
     Frame {
         msec: 2064
-        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+        hash: "b53d0651627d008545e54063ceb8d689"
     }
     Frame {
         msec: 2080
-        hash: "8a2cf6f27a40da75be9d9bcf88b4c022"
+        hash: "b53d0651627d008545e54063ceb8d689"
     }
     Key {
         type: 6
@@ -726,19 +726,19 @@ VisualTest {
     }
     Frame {
         msec: 2096
-        hash: "6c679da9b822fefef626c4308fdc9080"
+        hash: "173b36137940b37001750e02d434b8e8"
     }
     Frame {
         msec: 2112
-        hash: "6c679da9b822fefef626c4308fdc9080"
+        hash: "173b36137940b37001750e02d434b8e8"
     }
     Frame {
         msec: 2128
-        hash: "6c679da9b822fefef626c4308fdc9080"
+        hash: "173b36137940b37001750e02d434b8e8"
     }
     Frame {
         msec: 2144
-        hash: "6c679da9b822fefef626c4308fdc9080"
+        hash: "173b36137940b37001750e02d434b8e8"
     }
     Key {
         type: 6
@@ -758,19 +758,19 @@ VisualTest {
     }
     Frame {
         msec: 2160
-        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+        hash: "2e636a964b4a1ab74ad3e23399c2ae8c"
     }
     Frame {
         msec: 2176
-        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+        hash: "2e636a964b4a1ab74ad3e23399c2ae8c"
     }
     Frame {
         msec: 2192
-        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+        hash: "2e636a964b4a1ab74ad3e23399c2ae8c"
     }
     Frame {
         msec: 2208
-        hash: "81399b2d1ffa0a097f9d0eea0ccf26a5"
+        hash: "2e636a964b4a1ab74ad3e23399c2ae8c"
     }
     Key {
         type: 6
@@ -782,7 +782,7 @@ VisualTest {
     }
     Frame {
         msec: 2224
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Key {
         type: 7
@@ -794,23 +794,23 @@ VisualTest {
     }
     Frame {
         msec: 2240
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Frame {
         msec: 2256
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Frame {
         msec: 2272
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Frame {
         msec: 2288
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Frame {
         msec: 2304
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Key {
         type: 7
@@ -822,11 +822,11 @@ VisualTest {
     }
     Frame {
         msec: 2320
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Frame {
         msec: 2336
-        hash: "aebfaf936f9c4e0f856a2a2d1b2014ee"
+        hash: "631c6034372c2e7675ebce0ec415f230"
     }
     Key {
         type: 6
@@ -838,27 +838,27 @@ VisualTest {
     }
     Frame {
         msec: 2352
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2368
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2384
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2400
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2416
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2432
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Key {
         type: 7
@@ -870,19 +870,19 @@ VisualTest {
     }
     Frame {
         msec: 2448
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2464
-        hash: "1e9d2117d8392ea494d28f95ddb57213"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2480
-        hash: "a016e70b0f98846694ef3ae906faa346"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Frame {
         msec: 2496
-        hash: "a016e70b0f98846694ef3ae906faa346"
+        hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f"
     }
     Key {
         type: 6
@@ -894,15 +894,15 @@ VisualTest {
     }
     Frame {
         msec: 2512
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2528
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2544
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Key {
         type: 7
@@ -914,83 +914,83 @@ VisualTest {
     }
     Frame {
         msec: 2560
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2576
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2592
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2608
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2624
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2640
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2656
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2672
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2688
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2704
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2720
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2736
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2752
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2768
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2784
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2800
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2816
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2832
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2848
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2864
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2880
@@ -998,46 +998,46 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2912
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2928
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2944
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2960
-        hash: "818ad2e56a73599ae69ce5000d5b278f"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2976
-        hash: "147568112e60545f440f2109f918a59e"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 2992
-        hash: "147568112e60545f440f2109f918a59e"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 3008
-        hash: "147568112e60545f440f2109f918a59e"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 3024
-        hash: "147568112e60545f440f2109f918a59e"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 3040
-        hash: "147568112e60545f440f2109f918a59e"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
     Frame {
         msec: 3056
-        hash: "147568112e60545f440f2109f918a59e"
+        hash: "91ef7f08d8fec2e0d353b1bf5da99c41"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml
index fb56da6..4c402ea 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml
@@ -6,102 +6,102 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 32
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 48
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 64
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 80
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 96
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 112
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 128
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 144
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 160
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 176
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 192
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 208
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 224
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 240
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 256
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 272
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 288
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 304
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 320
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 336
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 352
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 368
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 384
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
     Frame {
         msec: 400
-        hash: "15c91702a80de73ac1abc3db9fa8ca09"
+        hash: "840c5f54c105f90c7b0c2254fee2e434"
     }
 }
-- 
cgit v0.12


From 7f8250ddb43275d59c6f9947eebc8e66642ea5f9 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 5 Nov 2010 09:32:19 +1000
Subject: Whitespace fixes

Supposed to be in the last commit - not really helpful if the filter
says something is wrong but pushes it anyways.
---
 .../qmlvisual/qdeclarativetextinput/hAlign.qml     | 24 +++++++++++-----------
 .../declarative/qmlvisual/shared/TestTextEdit.qml  |  2 +-
 .../declarative/qmlvisual/shared/TestTextInput.qml |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
index ad8db33..f36a752 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
@@ -6,35 +6,35 @@ Item{
     height:300;
     Column {
         //Because they have auto width, these three should look the same
-        TestTextInput { 
-            text: "Jackdaws love my big sphinx of quartz"; 
+        TestTextInput {
+            text: "Jackdaws love my big sphinx of quartz";
             horizontalAlignment: TextInput.AlignLeft;
         }
-        TestTextInput { 
-            text: "Jackdaws love my big sphinx of quartz"; 
+        TestTextInput {
+            text: "Jackdaws love my big sphinx of quartz";
             horizontalAlignment: TextInput.AlignHCenter;
         }
-        TestTextInput { 
-            text: "Jackdaws love my big sphinx of quartz"; 
+        TestTextInput {
+            text: "Jackdaws love my big sphinx of quartz";
             horizontalAlignment: TextInput.AlignRight;
         }
         Rectangle{ width: 600; height: 10; color: "pink" }
-        TestTextInput { 
+        TestTextInput {
             height: 30;
             width: 600;
-            text: "Jackdaws love my big sphinx of quartz"; 
+            text: "Jackdaws love my big sphinx of quartz";
             horizontalAlignment: TextInput.AlignLeft;
         }
-        TestTextInput { 
+        TestTextInput {
             height: 30;
             width: 600;
-            text: "Jackdaws love my big sphinx of quartz"; 
+            text: "Jackdaws love my big sphinx of quartz";
             horizontalAlignment: TextInput.AlignHCenter;
         }
-        TestTextInput { 
+        TestTextInput {
             height: 30;
             width: 600;
-            text: "Jackdaws love my big sphinx of quartz"; 
+            text: "Jackdaws love my big sphinx of quartz";
             horizontalAlignment: TextInput.AlignRight;
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
index fb35ae3..e19e418 100644
--- a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
+++ b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
@@ -7,7 +7,7 @@ TextEdit {
     font.family: fixedFont.name
     font.pixelSize: 12
     cursorDelegate: Rectangle {
-            width: 1; 
+            width: 1;
             color: "black";
             visible: edit.cursorVisible
     }
diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
index 8593218..e01c2c2 100644
--- a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
+++ b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
@@ -7,7 +7,7 @@ TextInput {
     font.family: fixedFont.name
     font.pixelSize: 12
     cursorDelegate: Rectangle {
-            width: 1; 
+            width: 1;
             color: "black";
             visible: parent.cursorVisible//bug that 'inp' doesn't seem to work?
     }
-- 
cgit v0.12


From 69a1fce88bb5f733895cc21758fd398bd650b7a6 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Fri, 5 Nov 2010 10:01:24 +1000
Subject: Fix synchronous dispatch in ICD in non-main threads.

ICD DBus signals always come in via the main thread. During synchronous
dispatch these signals were not being emitted when expected because no
event loop is running in the destination thread. Fixed by added a call
to QCoreApplication::sendPostedEvents(object, QEvent::MetaCall) in the
synchronous dispatch loop.

Task-number: QTBUG-15004
---
 src/plugins/bearer/icd/maemo_icd.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/bearer/icd/maemo_icd.cpp b/src/plugins/bearer/icd/maemo_icd.cpp
index 4f879e3..57ab0a8 100644
--- a/src/plugins/bearer/icd/maemo_icd.cpp
+++ b/src/plugins/bearer/icd/maemo_icd.cpp
@@ -508,6 +508,7 @@ uint IcdPrivate::state(QList<IcdStateResult>& state_results)
         mInterface.clear();
 	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
 	    mDBus->synchronousDispatch(1000);
+        QCoreApplication::sendPostedEvents(icd, QEvent::MetaCall);
 	}
 
         if (time(0)>(started+timeout_secs)) {
@@ -685,6 +686,7 @@ uint IcdPrivate::addrinfo(QList<IcdAddressInfoResult>& addr_results)
         mInterface.clear();
 	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
 	    mDBus->synchronousDispatch(1000);
+        QCoreApplication::sendPostedEvents(icd, QEvent::MetaCall);
 	}
 
         if (time(0)>(started+timeout_secs)) {
-- 
cgit v0.12


From 9615608afa7e0a62d1a444b699f40aeeaeaf41de Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Fri, 5 Nov 2010 11:08:31 +1000
Subject: Fix opening a network session multiple times in succession.

Don't try to open the network session if there is already an in progress
open request.
---
 src/plugins/bearer/icd/qnetworksession_impl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index 37434e3..8d0f587 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -679,7 +679,7 @@ void QNetworkSessionPrivateImpl::open()
     if (serviceConfig.isValid()) {
         lastError = QNetworkSession::OperationNotSupportedError;
         emit QNetworkSessionPrivate::error(lastError);
-    } else if (!isOpen) {
+    } else if (!opened) {
 	if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
 	    /* Caller is trying to connect to default IAP.
 	     * At this time we will not know the IAP details so we just
-- 
cgit v0.12


From f49aa13a1bb59eaebdb958305f479dc6e7c8e857 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 5 Nov 2010 11:19:05 +1000
Subject: Fix samegame text input focus

The real problem is QTBUG-15047, but by implementing SameGame in a
different way it gets worked around very nicely.

Task-number: QTBUG-14716
---
 demos/declarative/samegame/samegame.qml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index b66c5a6..ab49c04 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -92,9 +92,7 @@ Rectangle {
             enabled: nameInputDialog.initialWidth != 0
         }
 
-        onOpened: nameInputText.focus = true;
         onClosed: {
-            nameInputText.focus = false;
             if (nameInputText.text != "")
                 Logic.saveHighScore(nameInputText.text);
         }
@@ -116,7 +114,7 @@ Rectangle {
         TextInput {
             id: nameInputText
             anchors { verticalCenter: parent.verticalCenter; left: dialogText.right }
-            focus: false
+            focus: visible
             autoScroll: false
             maximumLength: 24
             onTextChanged: {
-- 
cgit v0.12


From ecd81dcc33e2a7ccff851e9437f73d4d54ef3dab Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 5 Nov 2010 11:38:18 +1000
Subject: Remove Snake demo from QtDemo

Snake now uses the runtime property, which we don't have in QtDemo.

Task-number: QTBUG-15048
---
 demos/qtdemo/xml/examples.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 27f72bb..b94d2b8 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -19,7 +19,6 @@
     <example filename="sub-attaq" name="Sub-attaq" />
     <example filename="spectrum" name="Spectrum Analyzer" />
     <example filename="declarative/minehunt" name="Minehunt"/>
-    <example filename="declarative/snake" name="Snake" executable="false" qml="true"/>
     <example filename="deform" name="Vector Deformation" />
     <example filename="books" name="Books" />
     <example filename="mainwindow" name="Main Window" />
-- 
cgit v0.12


From 3e30165c350b877bda74955446b0790d516c0490 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 5 Nov 2010 13:34:34 +1000
Subject: Don't allow flagging of flipped tiles in Minehunt

Task-number: QTBUG-4249
---
 demos/declarative/minehunt/minehunt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 709d945..aaaaaac 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -211,7 +211,7 @@ bool MinehuntGame::flip(int row, int col)
 bool MinehuntGame::flag(int row, int col)
 {
     TileData *t = tile(row, col);
-    if(!t || !playing)
+    if(!t || !playing || t->flipped())
         return false;
 
     t->setHasFlag(!t->hasFlag());
-- 
cgit v0.12


From b74024c0d80b7bb3adf0ceca4b307695bc6db6a1 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 5 Nov 2010 13:47:01 +1000
Subject: Fix minehunt.pro (minehunt is no longer a plugin)

Task-number: QTBUG-15011
Reviewed-by: Martin Jones
---
 demos/declarative/minehunt/minehunt.pro | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 753ca4e..8a7fdc5 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 TARGET  = minehunt
 QT += declarative
-CONFIG += qt plugin
 
 # Input
 HEADERS += minehunt.h
@@ -21,4 +20,4 @@ symbian:{
     qmlminehuntfiles.sources = MinehuntCore minehunt.qml
     DEPLOYMENT = qmlminehuntfiles
 }
- 
\ No newline at end of file
+ 
-- 
cgit v0.12


From c32ec4e928895a85aa10ce47a73c2bd439e7fc89 Mon Sep 17 00:00:00 2001
From: Charles Yin <charles.yin@nokia.com>
Date: Thu, 4 Nov 2010 12:30:46 +1000
Subject: More fix for QTBUG-14640:oci performance problem with qlonglong

1. OCINumber must be declared & initialized seperately, and the bound OCINumber
   values must be hold until the QOCIResultPrivate object is deleted.
2. More auto tests for this bug.
3. Add qulonglong support as well
4. Make the execBatch() works with longlong and ulonglong

Task-number:QTBUG-14640
Reviewed-by: Michael Goddard

Change-Id: I7d8bf1c44ce3aaa15ee85be325a5c98dc3ed3ce1
---
 src/sql/drivers/oci/qsql_oci.cpp        | 133 ++++++++++++++++++++++++++++++--
 tests/auto/qsqldatabase/tst_databases.h |   2 +-
 tests/auto/qsqlquery/tst_qsqlquery.cpp  | 121 ++++++++++++++++++++++++-----
 3 files changed, 227 insertions(+), 29 deletions(-)

diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index 2392a17..1bf59bf 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -112,7 +112,15 @@ typedef QVarLengthArray<ub2, 32> SizeArray;
 
 static QByteArray qMakeOraDate(const QDateTime& dt);
 static QDateTime qMakeDate(const char* oraDate);
+
+static QByteArray qMakeOCINumber(const qlonglong &ll, OCIError *err);
+static QByteArray qMakeOCINumber(const qulonglong& ull, OCIError* err);
+
+static qlonglong qMakeLongLong(const char* ociNumber, OCIError* err);
+static qulonglong qMakeULongLong(const char* ociNumber, OCIError* err);
+
 static QString qOraWarn(OCIError *err, int *errorCode = 0);
+
 #ifndef Q_CC_SUN
 static // for some reason, Sun CC can't use qOraWarning when it's declared static
 #endif
@@ -292,13 +300,27 @@ int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, in
                          SQLT_UIN, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
         break;
     case QVariant::LongLong:
+    {
+        QByteArray ba = qMakeOCINumber(val.toLongLong(), err);
         r = OCIBindByPos(sql, hbnd, err,
                            pos + 1,
-                           // if it's an out value, the data is already detached
-                           // so the const cast is safe.
-                           const_cast<void *>(data),
-                           sizeof(OCINumber),
+                           ba.data(),
+                           ba.size(),
                            SQLT_VNU, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
+        tmpStorage.append(ba);
+        break;
+    }
+    case QVariant::ULongLong:
+    {
+        QByteArray ba = qMakeOCINumber(val.toULongLong(), err);
+        r = OCIBindByPos(sql, hbnd, err,
+                           pos + 1,
+                           ba.data(),
+                           ba.size(),
+                           SQLT_VNU, indPtr, 0, 0, 0, 0, OCI_DEFAULT);
+        tmpStorage.append(ba);
+        break;
+    }
     case QVariant::Double:
         r = OCIBindByPos(sql, hbnd, err,
                          pos + 1,
@@ -394,7 +416,7 @@ int QOCIResultPrivate::bindValues(QVector<QVariant> &values, IndicatorArray &ind
 }
 
 // will assign out value and remove its temp storage.
-static void qOraOutValue(QVariant &value, QList<QByteArray> &storage)
+static void qOraOutValue(QVariant &value, QList<QByteArray> &storage, OCIError* err)
 {
     switch (value.type()) {
     case QVariant::Time:
@@ -406,6 +428,12 @@ static void qOraOutValue(QVariant &value, QList<QByteArray> &storage)
     case QVariant::DateTime:
         value = qMakeDate(storage.takeFirst());
         break;
+    case QVariant::LongLong:
+        value = qMakeLongLong(storage.takeFirst(), err);
+        break;
+    case QVariant::ULongLong:
+        value = qMakeULongLong(storage.takeFirst(), err);
+        break;
     case QVariant::String:
         value = QString(
                 reinterpret_cast<const QChar *>(storage.takeFirst().constData()));
@@ -423,7 +451,7 @@ void QOCIResultPrivate::outValues(QVector<QVariant> &values, IndicatorArray &ind
         if (!isOutValue(i))
             continue;
 
-        qOraOutValue(values[i], tmpStorage);
+        qOraOutValue(values[i], tmpStorage, err);
 
         QVariant::Type typ = values.at(i).type();
         if (indicators[i] == -1) // NULL
@@ -683,6 +711,56 @@ QByteArray qMakeOraDate(const QDateTime& dt)
     return ba;
 }
 
+/*!
+  \internal
+
+   Convert qlonglong to the internal Oracle OCINumber format.
+  */
+QByteArray qMakeOCINumber(const qlonglong& ll, OCIError* err)
+{
+    QByteArray ba(sizeof(OCINumber), 0);
+
+    OCINumberFromInt(err,
+                     &ll,
+                     sizeof(qlonglong),
+                     OCI_NUMBER_SIGNED,
+                     reinterpret_cast<OCINumber*>(ba.data()));
+    return ba;
+}
+
+/*!
+  \internal
+
+   Convert qulonglong to the internal Oracle OCINumber format.
+  */
+QByteArray qMakeOCINumber(const qulonglong& ull, OCIError* err)
+{
+    QByteArray ba(sizeof(OCINumber), 0);
+
+    OCINumberFromInt(err,
+                     &ull,
+                     sizeof(qlonglong),
+                     OCI_NUMBER_UNSIGNED,
+                     reinterpret_cast<OCINumber*>(ba.data()));
+    return ba;
+}
+
+qlonglong qMakeLongLong(const char* ociNumber, OCIError* err)
+{
+    qlonglong qll = 0;
+    OCINumberToInt(err, reinterpret_cast<const OCINumber *>(ociNumber), sizeof(qlonglong),
+                   OCI_NUMBER_SIGNED, &qll);
+    return qll;
+}
+
+qulonglong qMakeULongLong(const char* ociNumber, OCIError* err)
+{
+    qulonglong qull = 0;
+    OCINumberToInt(err, reinterpret_cast<const OCINumber *>(ociNumber), sizeof(qulonglong),
+                   OCI_NUMBER_UNSIGNED, &qull);
+    return qull;
+}
+
 QDateTime qMakeDate(const char* oraDate)
 {
     int century = uchar(oraDate[0]);
@@ -1267,6 +1345,16 @@ bool QOCICols::execBatch(QOCIResultPrivate *d, QVector<QVariant> &boundValues, b
                 col.maxLen = sizeof(uint);
                 break;
 
+            case QVariant::LongLong:
+                col.bindAs = SQLT_VNU;
+                col.maxLen = sizeof(OCINumber);
+                break;
+
+            case QVariant::ULongLong:
+                col.bindAs = SQLT_VNU;
+                col.maxLen = sizeof(OCINumber);
+                break;
+
             case QVariant::Double:
                 col.bindAs = SQLT_FLT;
                 col.maxLen = sizeof(double);
@@ -1338,6 +1426,22 @@ bool QOCICols::execBatch(QOCIResultPrivate *d, QVector<QVariant> &boundValues, b
                         *reinterpret_cast<uint*>(dataPtr) = val.toUInt();
                         break;
 
+                    case QVariant::LongLong:
+                    {
+                        columns[i].lengths[row] = columns[i].maxLen;
+                        const QByteArray ba = qMakeOCINumber(val.toLongLong(), d->err);
+                        Q_ASSERT(ba.size() == int(columns[i].maxLen));
+                        memcpy(dataPtr, ba.constData(), columns[i].maxLen);
+                        break;
+                    }
+                    case QVariant::ULongLong:
+                    {
+                        columns[i].lengths[row] = columns[i].maxLen;
+                        const QByteArray ba = qMakeOCINumber(val.toULongLong(), d->err);
+                        Q_ASSERT(ba.size() == int(columns[i].maxLen));
+                        memcpy(dataPtr, ba.constData(), columns[i].maxLen);
+                        break;
+                    }
                     case QVariant::Double:
                          columns[i].lengths[row] = columns[i].maxLen;
                          *reinterpret_cast<double*>(dataPtr) = val.toDouble();
@@ -1445,7 +1549,7 @@ bool QOCICols::execBatch(QOCIResultPrivate *d, QVector<QVariant> &boundValues, b
 
         QVariant::Type tp = boundValues.at(i).type();
         if (tp != QVariant::List) {
-            qOraOutValue(boundValues[i], tmpStorage);
+            qOraOutValue(boundValues[i], tmpStorage, d->err);
             if (*columns[i].indicators == -1)
                 boundValues[i] = QVariant(tp);
             continue;
@@ -1475,6 +1579,21 @@ bool QOCICols::execBatch(QOCIResultPrivate *d, QVector<QVariant> &boundValues, b
                     (*list)[r] =  *reinterpret_cast<uint*>(data + r * columns[i].maxLen);
                     break;
 
+                case SQLT_VNU:
+                {
+                    switch (boundValues.at(i).type()) {
+                    case QVariant::LongLong:
+                        (*list)[r] =  qMakeLongLong(data + r * columns[i].maxLen, d->err);
+                        break;
+                    case QVariant::ULongLong:
+                        (*list)[r] =  qMakeULongLong(data + r * columns[i].maxLen, d->err);
+                        break;
+                    default:
+                        break;
+                    }
+                    break;
+                }
+
                 case SQLT_FLT:
                     (*list)[r] =  *reinterpret_cast<double*>(data + r * columns[i].maxLen);
                     break;
diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h
index 5837719..80535df 100644
--- a/tests/auto/qsqldatabase/tst_databases.h
+++ b/tests/auto/qsqldatabase/tst_databases.h
@@ -208,7 +208,7 @@ public:
 //         addDb( "QOCI8", "//horsehead.nokia.troll.no:1521/ustest.troll.no", "scott", "tiger", "" ); // Oracle 9i on horsehead
 //         addDb( "QOCI8", "//iceblink.nokia.troll.no:1521/ice.troll.no", "scott", "tiger", "" ); // Oracle 8 on iceblink (not currently working)
 //         addDb( "QOCI", "//silence.nokia.troll.no:1521/testdb", "scott", "tiger" ); // Oracle 10g on silence
-//         addDb( "QOCI", "//oracle10g-nokia.trolltech.com.au:1521/XE", "scott", "tiger" ); // Oracle 10gexpress on xen
+//         addDb( "QOCI", "//bq-oracle10g.apac.nokia.com:1521/XE", "scott", "tiger" ); // Oracle 10gexpress
 
 //      This requires a local ODBC data source to be configured( pointing to a MySql database )
 //         addDb( "QODBC", "mysqlodbc", "troll", "trond" );
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index 5367bd6..b4a3e08 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -139,6 +139,8 @@ private slots:
     void oraClob();
     void oraLong_data() { generic_data("QOCI"); }
     void oraLong();
+    void oraOCINumber_data() { generic_data("QOCI"); }
+    void oraOCINumber();
     void outValuesDB2_data() { generic_data("QDB2"); }
     void outValuesDB2();
     void storedProceduresIBase_data() {generic_data("QIBASE"); }
@@ -211,8 +213,7 @@ private slots:
     void QTBUG_5765();
     void QTBUG_14132_data() { generic_data("QOCI"); }
     void QTBUG_14132();
-    void QTBUG_14640_data() { generic_data("QOCI"); }
-    void QTBUG_14640();
+
     void sqlite_constraint_data() { generic_data("QSQLITE"); }
     void sqlite_constraint();
 
@@ -332,7 +333,7 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
                << qTableName( "task_250026", __FILE__ )
                << qTableName( "task_234422", __FILE__ )
                << qTableName("test141895", __FILE__)
-               << qTableName("qtest_QTBUG14640", __FILE__);
+               << qTableName("qtest_oraOCINumber", __FILE__);
 
     if ( db.driverName().startsWith("QPSQL") )
         tablenames << qTableName("task_233829", __FILE__);
@@ -2950,11 +2951,11 @@ void tst_QSqlQuery::QTBUG_14132()
                         begin \n\
                         outStr := 'OUTSTRING'; \n\
                         end;"));
-    QString outValue = "XXXXXXXXX";
-    q.prepare("CALL "+procedureName+"(?)");
-    q.addBindValue(outValue, QSql::Out);
+    QString placeholder = "XXXXXXXXX";
+    QVERIFY(q.prepare("CALL "+procedureName+"(?)"));
+    q.addBindValue(placeholder, QSql::Out);
     QVERIFY_SQL(q, exec());
-    QCOMPARE(outValue, QLatin1String("OUTSTRING"));
+    QCOMPARE(q.boundValue(0).toString(), QLatin1String("OUTSTRING"));
 }
 
 void tst_QSqlQuery::QTBUG_5251()
@@ -3104,30 +3105,108 @@ void tst_QSqlQuery::QTBUG_5765()
     QCOMPARE(q.value(0).toInt(), 123);
 }
 
-void tst_QSqlQuery::QTBUG_14640()
+void tst_QSqlQuery::oraOCINumber()
 {
     QFETCH( QString, dbName );
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
-    const QString qtest_QTBUG14640(qTableName("qtest_QTBUG14640", __FILE__));
+    const QString qtest_oraOCINumber(qTableName("qtest_oraOCINumber", __FILE__));
 
     QSqlQuery q( db );
     q.setForwardOnly( true );
-    QVERIFY_SQL( q, exec( "create table " + qtest_QTBUG14640 +
-                            " (col1 number, col2 number)" ) );
-    QVERIFY_SQL( q, exec( "insert into " + qtest_QTBUG14640 + " values (1, 1111)" ) );
-    QVERIFY_SQL( q, exec( "insert into " + qtest_QTBUG14640 + " values (2, 2222)" ) );
-    QVERIFY_SQL( q, exec( "insert into " + qtest_QTBUG14640 + " values (3, 3333)" ) );
-
-    QString sqlStr = "select * from " + qtest_QTBUG14640 +  " where col1 == :bindValue0 AND col2 == :bindValue1";
-    q.prepare(sqlStr);
-    q.bindValue(":bindValue0", qlonglong(1), QSql::In);
-    q.bindValue(":bindValue1", qlonglong(1111), QSql::In);
+    QVERIFY_SQL( q, exec( "create table " + qtest_oraOCINumber +
+                            " (col1 number(20), col2 number(20))" ) );
+    QVERIFY(q.prepare("insert into " + qtest_oraOCINumber + " values (?, ?)"));
+    QVariantList col1Values;
+    QVariantList col2Values;
+    col1Values << (qulonglong)(1)
+               << (qulonglong)(0)
+               << (qulonglong)(INT_MAX)
+               << (qulonglong)(UINT_MAX)
+               << (qulonglong)(LONG_MAX)
+               << (qulonglong)(ULONG_MAX)
+               << (qulonglong)(LLONG_MAX)
+               << (qulonglong)(ULLONG_MAX);
+
+    col2Values << (qlonglong)(1)
+               << (qlonglong)(0)
+               << (qlonglong)(-1)
+               << (qlonglong)(LONG_MAX)
+               << (qlonglong)(LONG_MIN)
+               << (qlonglong)(ULONG_MAX)
+               << (qlonglong)(LLONG_MAX)
+               << (qlonglong)(LLONG_MIN);
+
+    q.addBindValue(col1Values);
+    q.addBindValue(col2Values);
+    QVERIFY(q.execBatch());
+    QString sqlStr = "select * from " + qtest_oraOCINumber +  " where col1 = :bindValue0 AND col2 = :bindValue1";
+    QVERIFY(q.prepare(sqlStr));
+
+    q.bindValue(":bindValue0", (qulonglong)(1), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(1), QSql::InOut);
+
+    QVERIFY_SQL( q, exec() );
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  qulonglong(1));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(1));
+
+    q.bindValue(":bindValue0", (qulonglong)(0), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(0), QSql::InOut);
+    QVERIFY_SQL( q, exec() );
+
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  (qulonglong)(0));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(0));
+
+    q.bindValue(":bindValue0", (qulonglong)(INT_MAX), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(-1), QSql::InOut);
+    QVERIFY_SQL( q, exec() );
+
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  (qulonglong)(INT_MAX));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(-1));
+
+    q.bindValue(":bindValue0", (qulonglong)(UINT_MAX), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(LONG_MAX), QSql::InOut);
+    QVERIFY_SQL( q, exec() );
+
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  (qulonglong)(UINT_MAX));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(LONG_MAX));
+
+    q.bindValue(":bindValue0", (qulonglong)(LONG_MAX), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(LONG_MIN), QSql::InOut);
+    QVERIFY_SQL( q, exec() );
+
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  (qulonglong)(LONG_MAX));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(LONG_MIN));
+
+    q.bindValue(":bindValue0", (qulonglong)(ULONG_MAX), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(ULONG_MAX), QSql::InOut);
     QVERIFY_SQL( q, exec() );
 
     QVERIFY( q.next() );
-    QCOMPARE(q.boundValue( 0 ).toLongLong(),  qlonglong(1));
-    QCOMPARE(q.boundValue( 1 ).toLongLong(),  qlonglong(1111));
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  (qulonglong)(ULONG_MAX));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(ULONG_MAX));
+
+    q.bindValue(":bindValue0", (qulonglong)(LLONG_MAX), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(LLONG_MAX), QSql::InOut);
+    QVERIFY_SQL( q, exec() );
+
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  (qulonglong)(LLONG_MAX));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(LLONG_MAX));
+
+    q.bindValue(":bindValue0", (qulonglong)(ULLONG_MAX), QSql::InOut);
+    q.bindValue(":bindValue1", (qlonglong)(LLONG_MIN), QSql::InOut);
+    QVERIFY_SQL( q, exec() );
+
+    QVERIFY( q.next() );
+    QCOMPARE(q.boundValue( 0 ).toULongLong(),  (qulonglong)(ULLONG_MAX));
+    QCOMPARE(q.boundValue( 1 ).toLongLong(),  (qlonglong)(LLONG_MIN));
+
 }
 
 void tst_QSqlQuery::sqlite_constraint()
-- 
cgit v0.12


From d2c204a93f30238c705209e65e2e8bce148825cd Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Thu, 4 Nov 2010 18:07:44 +1000
Subject: Image bounding rect should always include the area being painted

This didn't always happend with fillMode PreserveAspectCrop,
resulting in drawing artifacts.

Task-number: QT-3933
Reviewed-by: Martin Jones
---
 .../graphicsitems/qdeclarativeimage.cpp            |  27 +++++++-
 .../graphicsitems/qdeclarativeimage_p.h            |   1 +
 .../declarative/qdeclarativeimage/data/rect.png    | Bin 0 -> 171 bytes
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    |  74 +++++++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeimage/data/rect.png

diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 1f1e93d..3b08a9b 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -259,8 +259,10 @@ void QDeclarativeImage::setFillMode(FillMode mode)
     \qmlproperty real Image::paintedHeight
 
     These properties hold the size of the image that is actually painted.
-    In most cases it is the same as \c width and \c height, but when using a \c fillMode like
-    \c PreserveAspectFit \c paintedWidth or \c paintedHeight can be smaller than \c width and \c height.
+    In most cases it is the same as \c width and \c height, but when using a 
+    \c fillMode \c PreserveAspectFit or \c fillMode \c PreserveAspectCrop 
+    \c paintedWidth or \c paintedHeight can be smaller or larger than 
+    \c width and \c height of the Image element.
 */
 qreal QDeclarativeImage::paintedWidth() const
 {
@@ -399,6 +401,19 @@ void QDeclarativeImage::updatePaintedGeometry()
         if (heightValid() && !widthValid()) {
             setImplicitWidth(d->paintedWidth);
         }
+    } else if (d->fillMode == PreserveAspectCrop) {
+        if (!d->pix.width() || !d->pix.height())
+            return;
+        qreal widthScale = width() / qreal(d->pix.width());
+        qreal heightScale = height() / qreal(d->pix.height());
+        if (widthScale < heightScale) {
+            widthScale = heightScale;
+        } else if(heightScale < widthScale) {
+            heightScale = widthScale;
+        }
+
+        d->paintedHeight = heightScale * qreal(d->pix.height());
+        d->paintedWidth = widthScale * qreal(d->pix.width());
     } else {
         d->paintedWidth = width();
         d->paintedHeight = height();
@@ -412,6 +427,12 @@ void QDeclarativeImage::geometryChanged(const QRectF &newGeometry, const QRectF
     updatePaintedGeometry();
 }
 
+QRectF QDeclarativeImage::boundingRect() const
+{
+    Q_D(const QDeclarativeImage);
+    return QRectF(0, 0, qMax(d->mWidth, d->paintedWidth), qMax(d->mHeight, d->paintedHeight));
+}
+
 /*!
     \qmlproperty url Image::source
 
@@ -496,7 +517,7 @@ void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWi
             }
             if (clip()) {
                 p->save();
-                p->setClipRect(boundingRect(), Qt::IntersectClip);
+                p->setClipRect(QRectF(0, 0, d->mWidth, d->mHeight), Qt::IntersectClip);
             }
             scale.scale(widthScale, heightScale);
             QTransform old = p->transform();
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h
index c8bb30b..0e8034e 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h
@@ -76,6 +76,7 @@ public:
     qreal paintedHeight() const;
 
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+    QRectF boundingRect() const;
 
 Q_SIGNALS:
     void fillModeChanged();
diff --git a/tests/auto/declarative/qdeclarativeimage/data/rect.png b/tests/auto/declarative/qdeclarativeimage/data/rect.png
new file mode 100644
index 0000000..d564a2d
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeimage/data/rect.png differ
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index f1e026f..bf779ad 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -80,6 +80,8 @@ private slots:
     void preserveAspectRatio();
     void smooth();
     void svg();
+    void geometry();
+    void geometry_data();
     void big();
     void tiling_QTBUG_6716();
     void noLoading();
@@ -288,6 +290,78 @@ void tst_qdeclarativeimage::svg()
     delete obj;
 }
 
+void tst_qdeclarativeimage::geometry_data()
+{
+    QTest::addColumn<QString>("fillMode");
+    QTest::addColumn<bool>("explicitWidth");
+    QTest::addColumn<bool>("explicitHeight");
+    QTest::addColumn<double>("itemWidth");
+    QTest::addColumn<double>("paintedWidth");
+    QTest::addColumn<double>("boundingWidth");
+    QTest::addColumn<double>("itemHeight");
+    QTest::addColumn<double>("paintedHeight");
+    QTest::addColumn<double>("boundingHeight");
+
+    // tested image has width 200, height 100
+
+    // bounding rect and item rect are equal with fillMode PreserveAspectFit, painted rect may be smaller if the aspect ratio doesn't match
+    QTest::newRow("PreserveAspectFit") << "PreserveAspectFit" << false << false << 200.0 << 200.0 << 200.0 << 100.0 << 100.0 << 100.0;
+    QTest::newRow("PreserveAspectFit explicit width 300") << "PreserveAspectFit" << true << false << 300.0 << 200.0 << 300.0 << 100.0 << 100.0 << 100.0;
+    QTest::newRow("PreserveAspectFit explicit height 400") << "PreserveAspectFit" << false << true << 200.0 << 200.0 << 200.0 << 400.0 << 100.0 << 400.0;
+    QTest::newRow("PreserveAspectFit explicit width 300, height 400") << "PreserveAspectFit" << true << true << 300.0 << 300.0 << 300.0 << 400.0 << 150.0 << 400.0;
+
+    // bounding rect and painted rect are equal with fillMode PreserveAspectCrop, item rect may be smaller if the aspect ratio doesn't match
+    QTest::newRow("PreserveAspectCrop") << "PreserveAspectCrop" << false << false << 200.0 << 200.0 << 200.0 << 100.0 << 100.0 << 100.0;
+    QTest::newRow("PreserveAspectCrop explicit width 300") << "PreserveAspectCrop" << true << false << 300.0 << 300.0 << 300.0 << 100.0 << 150.0 << 150.0;
+    QTest::newRow("PreserveAspectCrop explicit height 400") << "PreserveAspectCrop" << false << true << 200.0 << 800.0 << 800.0 << 400.0 << 400.0 << 400.0;
+    QTest::newRow("PreserveAspectCrop explicit width 300, height 400") << "PreserveAspectCrop" << true << true << 300.0 << 800.0 << 800.0 << 400.0 << 400.0 << 400.0;
+
+    // bounding rect, painted rect and item rect are equal in stretching and tiling images
+    QStringList fillModes;
+    fillModes << "Stretch" << "Tile" << "TileVertically" << "TileHorizontally";
+    foreach (QString fillMode, fillModes) {
+        QTest::newRow(fillMode.toLatin1()) << fillMode << false << false << 200.0 << 200.0 << 200.0 << 100.0 << 100.0 << 100.0;
+        QTest::newRow(QString(fillMode + " explicit width 300").toLatin1()) << fillMode << true << false << 300.0 << 300.0 << 300.0 << 100.0 << 100.0 << 100.0;
+        QTest::newRow(QString(fillMode + " explicit height 400").toLatin1()) << fillMode << false << true << 200.0 << 200.0 << 200.0 << 400.0 << 400.0 << 400.0;
+        QTest::newRow(QString(fillMode + " explicit width 300, height 400").toLatin1()) << fillMode << true << true << 300.0 << 300.0 << 300.0 << 400.0 << 400.0 << 400.0;
+    }
+}
+
+void tst_qdeclarativeimage::geometry()
+{
+    QFETCH(QString, fillMode);
+    QFETCH(bool, explicitWidth);
+    QFETCH(bool, explicitHeight);
+    QFETCH(double, itemWidth);
+    QFETCH(double, itemHeight);
+    QFETCH(double, paintedWidth);
+    QFETCH(double, paintedHeight);
+    QFETCH(double, boundingWidth);
+    QFETCH(double, boundingHeight);
+
+    QString src = QUrl::fromLocalFile(SRCDIR "/data/rect.png").toString();
+    QString componentStr = "import QtQuick 1.0\nImage { source: \"" + src + "\"; fillMode: Image." + fillMode + "; ";
+
+    if (explicitWidth)
+        componentStr.append("width: 300; ");
+    if (explicitHeight)
+        componentStr.append("height: 400; ");
+    componentStr.append("}");
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->width(), itemWidth);
+    QCOMPARE(obj->paintedWidth(), paintedWidth);
+    QCOMPARE(obj->boundingRect().width(), boundingWidth);
+
+    QCOMPARE(obj->height(), itemHeight);
+    QCOMPARE(obj->paintedHeight(), paintedHeight);
+    QCOMPARE(obj->boundingRect().height(), boundingHeight);
+    delete obj;
+}
+
 void tst_qdeclarativeimage::big()
 {
     // If the JPEG loader does not implement scaling efficiently, it would
-- 
cgit v0.12


From e7d505e35666393ea965e41c59742f609344e858 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 1 Nov 2010 17:05:18 +0100
Subject: Fixed event starvation with pointer events on Symbian.

The CEikonEnv active object is used by Symbian to indicate that new
window server events are available, in this case pointer events.
Since this object was being controlled by Symbian, it was not subject
to Qt's round robin queue. In a case where the event handler for the
pointer event would take very long, it was possible for the active
object to be completed again before the previous handler was
finished, causing it to be called in a loop.

This was fixed by making a new Qt-owned class as a subclass of
CEikonEnv, and in its RunL, make sure that the object follows the
round-robin queue.

Because the round robin code is located in a subclass of CEikonEnv
that we own, the fix will have no effect if Qt is loaded after the
Eikon framework (such as a Qt plugin in a non-Qt app).

Task:     QT-4077
RevBy:    mread
AutoTest: N/A, system events
---
 src/corelib/kernel/qeventdispatcher_symbian.cpp |  9 ++--
 src/corelib/kernel/qeventdispatcher_symbian_p.h |  4 +-
 src/gui/kernel/qapplication_s60.cpp             |  2 +-
 src/gui/kernel/qeventdispatcher_s60.cpp         | 66 +++++++++++++++++++++++++
 src/gui/kernel/qeventdispatcher_s60_p.h         | 24 +++++++++
 5 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index d8cc344..bb9bd01 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -975,9 +975,7 @@ bool QEventDispatcherSymbian::sendPostedEvents()
 
 inline void QEventDispatcherSymbian::addDeferredActiveObject(QActiveObject *object)
 {
-    if (m_deferredActiveObjects.isEmpty()) {
-        m_completeDeferredAOs->complete();
-    }
+    queueDeferredActiveObjectsCompletion();
     m_deferredActiveObjects.append(object);
 }
 
@@ -986,6 +984,11 @@ inline void QEventDispatcherSymbian::removeDeferredActiveObject(QActiveObject *o
     m_deferredActiveObjects.removeAll(object);
 }
 
+void QEventDispatcherSymbian::queueDeferredActiveObjectsCompletion()
+{
+    m_completeDeferredAOs->complete();
+}
+
 void QEventDispatcherSymbian::reactivateDeferredActiveObjects()
 {
     while (!m_deferredActiveObjects.isEmpty()) {
diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h
index 1486db5..3615996 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian_p.h
+++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h
@@ -247,7 +247,9 @@ public:
 
     void addDeferredActiveObject(QActiveObject *object);
     void removeDeferredActiveObject(QActiveObject *object);
-    void reactivateDeferredActiveObjects();
+    void queueDeferredActiveObjectsCompletion();
+    // Can be overridden to activate local active objects too, but do call baseclass!
+    virtual void reactivateDeferredActiveObjects();
 
     inline int iterationCount() const { return m_iterationCount; }
 
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 5ff2fd4..7c2ab29 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1425,7 +1425,7 @@ void qt_init(QApplicationPrivate * /* priv */, int)
         TInt err = CApaCommandLine::GetCommandLineFromProcessEnvironment(commandLine);
         // After this construction, CEikonEnv will be available from CEikonEnv::Static().
         // (much like our qApp).
-        CEikonEnv* coe = new CEikonEnv;
+        QtEikonEnv* coe = new QtEikonEnv;
         //not using QT_TRAP_THROWING, because coe owns the cleanupstack so it can't be pushed there.
         if(err == KErrNone)
             TRAP(err, coe->ConstructAppFromCommandLineL(factory,*commandLine));
diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/kernel/qeventdispatcher_s60.cpp
index bc787b8..77ebd0d 100644
--- a/src/gui/kernel/qeventdispatcher_s60.cpp
+++ b/src/gui/kernel/qeventdispatcher_s60.cpp
@@ -45,6 +45,62 @@
 
 QT_BEGIN_NAMESPACE
 
+QtEikonEnv::QtEikonEnv()
+    : m_lastIterationCount(0)
+    , m_savedStatusCode(KRequestPending)
+    , m_hasAlreadyRun(false)
+{
+}
+
+QtEikonEnv::~QtEikonEnv()
+{
+}
+
+void QtEikonEnv::RunL()
+{
+    QEventDispatcherS60 *dispatcher = qobject_cast<QEventDispatcherS60 *>(QAbstractEventDispatcher::instance());
+    if (!dispatcher) {
+        CEikonEnv::RunL();
+        return;
+    }
+
+    if (m_lastIterationCount != dispatcher->iterationCount()) {
+        m_hasAlreadyRun = false;
+        m_lastIterationCount = dispatcher->iterationCount();
+    }
+
+    if (m_hasAlreadyRun) {
+        // Fool the active scheduler into believing we are still waiting for events.
+        // The window server thinks we are not, however.
+        m_savedStatusCode = iStatus.Int();
+        iStatus = KRequestPending;
+        SetActive();
+        dispatcher->queueDeferredActiveObjectsCompletion();
+    } else {
+        m_hasAlreadyRun = true;
+        CEikonEnv::RunL();
+    }
+}
+
+void QtEikonEnv::DoCancel()
+{
+    complete();
+
+    CEikonEnv::DoCancel();
+}
+
+void QtEikonEnv::complete()
+{
+    if (m_hasAlreadyRun) {
+        if (m_savedStatusCode != KRequestPending) {
+            TRequestStatus *status = &iStatus;
+            QEventDispatcherSymbian::RequestComplete(status, m_savedStatusCode);
+            m_savedStatusCode = KRequestPending;
+        }
+        m_hasAlreadyRun = false;
+    }
+}
+
 QEventDispatcherS60::QEventDispatcherS60(QObject *parent)
     : QEventDispatcherSymbian(parent),
       m_noInputEvents(false)
@@ -127,4 +183,14 @@ void QEventDispatcherS60::removeInputEventsForWidget(QObject *object)
     }
 }
 
+// reimpl
+void QEventDispatcherS60::reactivateDeferredActiveObjects()
+{
+    if (S60->qtOwnsS60Environment) {
+        static_cast<QtEikonEnv *>(CCoeEnv::Static())->complete();
+    }
+
+    QEventDispatcherSymbian::reactivateDeferredActiveObjects();
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qeventdispatcher_s60_p.h b/src/gui/kernel/qeventdispatcher_s60_p.h
index d2f327c..c14fef0 100644
--- a/src/gui/kernel/qeventdispatcher_s60_p.h
+++ b/src/gui/kernel/qeventdispatcher_s60_p.h
@@ -56,8 +56,30 @@
 #include <private/qeventdispatcher_symbian_p.h>
 #include "qt_s60_p.h"
 
+#include <eikenv.h>
+
 QT_BEGIN_NAMESPACE
 
+class QEventDispatcherS60;
+
+class QtEikonEnv : public CEikonEnv
+{
+public:
+    QtEikonEnv();
+    ~QtEikonEnv();
+
+    // from CActive.
+    void RunL();
+    void DoCancel();
+
+    void complete();
+
+private:
+    int m_lastIterationCount;
+    TInt m_savedStatusCode;
+    bool m_hasAlreadyRun;
+};
+
 class Q_GUI_EXPORT QEventDispatcherS60 : public QEventDispatcherSymbian
 {
     Q_OBJECT
@@ -73,6 +95,8 @@ public:
 
     void saveInputEvent(QSymbianControl *control, QWidget *widget, QInputEvent *event);
 
+    void reactivateDeferredActiveObjects();
+
 private:
     bool sendDeferredInputEvents();
 
-- 
cgit v0.12


From e6ad4d01e1ff483f5ed81168ffa4500deaf69954 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 1 Nov 2010 19:38:20 +0100
Subject: Fixed test after the fix to QT-4077.

Since the events are balanced now, we need to give them time to get
through.

RevBy:    Trust me
---
 tests/auto/qinputcontext/tst_qinputcontext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp
index 7811a53..5a258a9 100644
--- a/tests/auto/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp
@@ -158,8 +158,8 @@ public:
     }
 
     // For some reason, the test fails if using processEvents instead of an event loop
-    // with a zero timer to quit it, so use the timer.
-#define KEY_WAIT 0
+    // with a timer to quit it, so use the timer.
+#define KEY_WAIT 10
 
     void replay(QWidget *w)
     {
-- 
cgit v0.12


From 89a26ec7ecb758b635087899418eeb703138c482 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Fri, 5 Nov 2010 13:22:20 +0100
Subject: Hide the cursor in the tested text edit

Hiding the cursor will make the image comparison more robust. This fixes
the sporadic test fail we saw on some machines - every time the blinking
cursor was visible, the test failed.

Reviewed-by: Robert Griebl
---
 tests/auto/qtextedit/tst_qtextedit.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 321aa22..d1832d8 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -2163,6 +2163,9 @@ void tst_QTextEdit::noWrapBackgrounds()
     QTextEdit edit;
     edit.setLineWrapMode(QTextEdit::NoWrap);
 
+    // hide the cursor in order to make the image comparison below reliable
+    edit.setCursorWidth(0);
+
     QTextFrame *root = edit.document()->rootFrame();
     QTextFrameFormat frameFormat = root->frameFormat();
     frameFormat.setLeftMargin(2);
@@ -2178,8 +2181,6 @@ void tst_QTextEdit::noWrapBackgrounds()
     layout->addWidget(&edit);
     topLevel.show();
 
-    QTest::qWait(1000);
-
     QImage img = QPixmap::grabWidget(edit.viewport()).toImage();
     QCOMPARE(img, img.mirrored(true, false));
 }
-- 
cgit v0.12


From d4cad3c2f3fdbf6a1bda926582fb8ad4b6f08666 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Fri, 5 Nov 2010 14:11:30 +0100
Subject: tst_qnetworkreply: One more HTTP test using setReadBufferSize()

Task-number: QTBUG-13431
---
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 52 ++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index d21428b..bef1e7e6 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -297,6 +297,8 @@ private Q_SLOTS:
 
     void qtbug4121unknownAuthentication();
 
+    void qtbug13431replyThrottling();
+
     // NOTE: This test must be last!
     void parentingRepliesToTheApp();
 };
@@ -4643,6 +4645,56 @@ void tst_QNetworkReply::qtbug4121unknownAuthentication()
     QCOMPARE(reply->error(), QNetworkReply::AuthenticationRequiredError);
 }
 
+class QtBug13431Helper : public QObject {
+    Q_OBJECT
+public:
+    QNetworkReply* m_reply;
+    QTimer m_dlTimer;
+public slots:
+    void replyFinished(QNetworkReply*) {
+        QTestEventLoop::instance().exitLoop();
+    }
+
+    void onReadAndReschedule() {
+        const qint64 bytesReceived = m_reply->bytesAvailable();
+        if (bytesReceived) {
+           QByteArray data = m_reply->read(bytesReceived);
+           // reschedule read
+           const int millisecDelay = static_cast<int>(bytesReceived * 1000 / m_reply->readBufferSize());
+           m_dlTimer.start(millisecDelay);
+        }
+        else {
+           // reschedule read
+           m_dlTimer.start(200);
+        }
+    }
+};
+
+void tst_QNetworkReply::qtbug13431replyThrottling()
+{
+    QtBug13431Helper helper;
+
+    QNetworkAccessManager nam;
+    connect(&nam, SIGNAL(finished(QNetworkReply*)), &helper, SLOT(replyFinished(QNetworkReply*)));
+
+    // Download a bigger file
+    QNetworkRequest netRequest(QUrl("http://qt-test-server/qtest/bigfile"));
+    helper.m_reply = nam.get(netRequest);
+    // Set the throttle
+    helper.m_reply->setReadBufferSize(36000);
+
+    // Schedule a timer that tries to read
+
+    connect(&helper.m_dlTimer, SIGNAL(timeout()), &helper, SLOT(onReadAndReschedule()));
+    helper.m_dlTimer.setSingleShot(true);
+    helper.m_dlTimer.start(0);
+
+    QTestEventLoop::instance().enterLoop(30);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+    QVERIFY(helper.m_reply->isFinished());
+    QCOMPARE(helper.m_reply->error(), QNetworkReply::NoError);
+}
+
 
 
 // NOTE: This test must be last testcase in tst_qnetworkreply!
-- 
cgit v0.12


From 74d593de47d264e2bfa77f01df4af540f9462c19 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Fri, 5 Nov 2010 15:03:06 +0100
Subject: tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute

---
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index bef1e7e6..a986438 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -299,6 +299,8 @@ private Q_SLOTS:
 
     void qtbug13431replyThrottling();
 
+    void httpWithNoCredentialUsage();
+
     // NOTE: This test must be last!
     void parentingRepliesToTheApp();
 };
@@ -4695,6 +4697,33 @@ void tst_QNetworkReply::qtbug13431replyThrottling()
     QCOMPARE(helper.m_reply->error(), QNetworkReply::NoError);
 }
 
+void tst_QNetworkReply::httpWithNoCredentialUsage()
+{
+    QNetworkRequest request(QUrl("http://httptest:httptest@" + QtNetworkSettings::serverName() + "/qtest/protected/cgi-bin/md5sum.cgi"));
+    // Do not use credentials
+    request.setAttribute(QNetworkRequest::AuthenticationReuseAttribute, QNetworkRequest::Manual);
+    QNetworkAccessManager manager;
+    QNetworkReplyPtr reply = manager.get(request);
+
+    qRegisterMetaType<QNetworkReply*>("QNetworkReply*");
+    qRegisterMetaType<QAuthenticator*>("QAuthenticator*");
+    QSignalSpy authSpy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)));
+    QSignalSpy finishedSpy(&manager, SIGNAL(finished(QNetworkReply*)));
+    qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
+    QSignalSpy errorSpy(reply, SIGNAL(error(QNetworkReply::NetworkError)));
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    // We check if authenticationRequired was emitted, however we do not anything in it so it should be 401
+    QCOMPARE(authSpy.count(), 1);
+    QCOMPARE(finishedSpy.count(), 1);
+    QCOMPARE(errorSpy.count(), 1);
+
+    QCOMPARE(reply->error(), QNetworkReply::AuthenticationRequiredError);
+}
+
 
 
 // NOTE: This test must be last testcase in tst_qnetworkreply!
-- 
cgit v0.12


From 5fffdfb33379210ef37a68ae4257e693f7181c48 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 5 Nov 2010 16:23:34 +0100
Subject: Revert "Use qtmain.lib to provide entry point for all Symbian
 applications"

This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334.

It breaks massively on the symbian/linux-armcc mkspec. Will find a
different solution.
---
 mkspecs/common/symbian/symbian.conf           |  3 +--
 mkspecs/features/symbian/default_post.prf     |  3 +++
 mkspecs/features/symbian/symbian_building.prf | 20 +++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 6d1f708..decec14 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -79,6 +79,7 @@ QMAKE_LIBS_OPENGL_ES2_QT = -llibglesv2 -lcone -lws32
 QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
 QMAKE_LIBS_THREAD       = -llibpthread
 QMAKE_LIBS_COMPAT       = 
+QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon -leikcoctl
 
 exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
@@ -126,8 +127,6 @@ QT_ARCH               = symbian
 
 load(qt_config)
 
-QMAKE_LIBS_QT_ENTRY     = -lqtmain$${QT_LIBINFIX}.lib
-
 # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
 QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
 QT_IMPORTS_BASE_DIR = /resource/qt/imports
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 348c366..0564e9b 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -3,6 +3,9 @@ load(default_post)
 contains(TEMPLATE, ".*app") {
     contains(CONFIG, stdbinary) {
         QMAKE_LIBS +=
+    } else:contains(QT, gui):contains(CONFIG,qt) {
+        S60MAIN_LIBS = -leuser
+        QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
     } else {
         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     }
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 20bc3a3..1a51cb2 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -187,16 +187,26 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
     linux-armcc: {
         QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
         QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
-        QMAKE_LIBS -= $$QMAKE_LIBS_QT_ENTRY
-        QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
+        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
+            QMAKE_LIBS -= -lqtmain$${QT_LIBINFIX}.lib
+            QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib
+        } else {
+            QMAKE_LIBS -= -llibcrt0.lib
+            QMAKE_LIBS += -llibcrt0.lib
+        }
     } else :linux-gcce {
         # notice that we can't merge these as ordering of arguments is important.
         QMAKE_LIBS += \
             -l:eexe.lib \
             -l:usrt2_2.lib
-        modified_entry = $$replace(QMAKE_LIBS_QT_ENTRY, "^-l", "-l:")
-        QMAKE_LIBS -= $$modified_entry
-        QMAKE_LIBS += $$modified_entry
+        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
+            QMAKE_LIBS -= -l:qtmain$${QT_LIBINFIX}.lib
+            QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib
+        } else {
+            QMAKE_LIBS -= -l:libcrt0.lib
+            QMAKE_LIBS -= -l:libcrt0_gcce.lib
+            QMAKE_LIBS += -l:libcrt0_gcce.lib
+        }
         QMAKE_LIBS += \
             -l:dfpaeabi.dso \
             -l:drtaeabi.dso \
-- 
cgit v0.12


From 00b2c14a9031023da89484aea1483fd0fb7be863 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Fri, 5 Nov 2010 16:36:57 +0100
Subject: Doc: Updated the configuration file to use the Qt 4.7 style sheets.

---
 tools/qdoc3/doc/qdoc-manual.qdocconf | 253 ++++++++++++++++++++++++++++++-----
 1 file changed, 219 insertions(+), 34 deletions(-)

diff --git a/tools/qdoc3/doc/qdoc-manual.qdocconf b/tools/qdoc3/doc/qdoc-manual.qdocconf
index 26fd09c..1e7ff01 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdocconf
+++ b/tools/qdoc3/doc/qdoc-manual.qdocconf
@@ -1,7 +1,7 @@
 project          = QDoc
 description      = QDoc3 Manual
 
-indexes          = $QTDIR/doc/html/qt.index
+indexes          = ../../../doc/html/qt.index
 
 outputdir        = html
 
@@ -9,41 +9,226 @@ sources          = qdoc-manual.qdoc
 sourcedirs       = $PWD
 
 exampledirs     += $PWD \
-                   $QTDIR/examples
+                   ../../../examples
 
 imagedirs       += images
 
 extraimages.HTML = qt-logo
 
-HTML.stylesheets = classic.css
-
-HTML.style       = "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }\n" \
-                   "a:link { color: #004faf; text-decoration: none }\n" \
-                   "a:visited { color: #672967; text-decoration: none }\n" \
-                   "td.postheader { font-family: sans-serif }\n" \
-                   "tr.address { font-family: sans-serif }\n" \
-                   "body { background: #ffffff; color: black; }"
-
-HTML.postheader  = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"5\" width=\"100%\">\n" \
-                   "<tr>\n" \
-                   "<td align=\"left\" valign=\"top\" width=\"32\">" \
-                   "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
-                   "</td>\n" \
-                   "<td class=\"postheader\" valign=\"center\">" \
-                   "<a href=\"01-qdoc-manual.html\">" \
-                   "<font color=\"#004faf\">Home: QDoc Manual</font></a>&nbsp;&middot;" \
-                   "<a href=\"http://qt.nokia.com/doc/4.7\">" \
-                   "<font color=\"#004faf\"> Qt Reference Documentation</font></a>" \
-                   "</td>\n" \
-                   "</tr></table>"
-
-HTML.footer     = "<p /><address><hr /><div align=\"center\">\n" \
-                  "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                  "<td width=\"40%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
-                  "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
-                  "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
-                  "</tr></table></div></address>"
-
-spurious        += "Missing '\\}'" 
-spurious        += "Cannot use .*"
-spurious        += "Unexpected .*"
+HTML.stylesheets        =  style/style.css \
+                           style/OfflineStyle.css \
+                           style/style_ie7.css \
+                           style/style_ie8.css \
+                           style/style_ie6.css
+
+HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
+                          "    <div class=\"content\"> \n" \
+                          "    <div id=\"nav-logo\">\n" \
+                          "      <a href=\"index.html\">Home</a></div>\n" \
+                          "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+                          "    <div id=\"narrowsearch\"></div>\n" \
+                          "    <div id=\"nav-topright\">\n" \
+                          "      <ul>\n" \
+                          "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
+                          "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
+                          "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+                          "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+                          "          DOC</a></li>\n" \
+                          "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+                          "      </ul>\n" \
+                          "    </div>\n" \
+                          "    <div id=\"shortCut\">\n" \
+                          "      <ul>\n" \
+                          "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
+                          "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
+                          "        </a></li>\n" \
+                          "      </ul>\n" \
+                          "     </div>\n" \
+                          " <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
+                          "                         <li><a href=\"#\">API Lookup</a> \n" \
+                          "                                 <ul> \n" \
+                          "                                         <li><a href=\"classes.html\">Class index</a></li> \n" \
+                          "           <li><a href=\"functions.html\">Function index</a></li> \n" \
+                          "           <li><a href=\"modules.html\">Modules</a></li> \n" \
+                          "           <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+                          "           <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
+                          "           <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+                          "                     </ul> \n" \
+                          "                         </li> \n" \
+                          "                         <li><a href=\"#\">Qt Topics</a> \n" \
+                          "                                 <ul> \n" \
+                          "                                            <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
+                          "                                            <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
+                          "                                            <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
+                          "                                            <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
+                          "                                            <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
+                          "                                            <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
+                          "                                            <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
+                          "                      </ul> \n" \
+                          "                                 </li> \n" \
+                          "                                 <li><a href=\"#\">Examples</a> \n" \
+                          "                                         <ul> \n" \
+                          "                               <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+                          "                               <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+                          "                               <li><a href=\"demos.html\">Demos</a></li> \n" \
+                          "                               <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+                          "                        </ul> \n" \
+                          "                                         </li> \n" \
+                          "                                 </ul> \n" \
+                          "    </div>\n" \
+                          "  </div>\n" \
+                          "  <div class=\"wrapper\">\n" \
+                          "    <div class=\"hd\">\n" \
+                          "      <span></span>\n" \
+                          "    </div>\n" \
+                          "    <div class=\"bd group\">\n" \
+                          "      <div class=\"sidebar\">\n" \
+                          "        <div class=\"searchlabel\">\n" \
+                          "          Search index:</div>\n" \
+                          "        <div class=\"search\" id=\"sidebarsearch\">\n" \
+                          "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+                          "            <fieldset>\n" \
+                          "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+                          " <div id=\"resultdialog\"> \n" \
+                          " <a href=\"#\" id=\"resultclose\">Close</a> \n" \
+                          " <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
+                          " <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> \n" \
+                          " <ul id=\"resultlist\" class=\"all\"> \n" \
+                          " </ul> \n" \
+                          " </div> \n" \
+                          "            </fieldset>\n" \
+                          "          </form>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+                          "          <h2 title=\"API Lookup\"><span></span>\n" \
+                          "            API Lookup</h2>\n" \
+                          "          <div  id=\"list001\" class=\"list\">\n" \
+                          "          <ul id=\"ul001\" >\n" \
+                          "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global Declarations</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+                          "            </ul> \n" \
+                          "          </div>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"box bottombar\" id=\"topics\">\n" \
+                          "          <h2 title=\"Qt Topics\"><span></span>\n" \
+                          "            Qt Topics</h2>\n" \
+                          "          <div id=\"list002\" class=\"list\">\n" \
+                          "            <ul id=\"ul002\" >\n" \
+                          "                           <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
+                          "            </ul>  \n" \
+                          "          </div>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"box\" id=\"examples\">\n" \
+                          "          <h2 title=\"Examples\"><span></span>\n" \
+                          "            Examples</h2>\n" \
+                          "          <div id=\"list003\" class=\"list\">\n" \
+                          "        <ul id=\"ul003\">\n" \
+                          "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+                          "            </ul> \n" \
+                          "          </div>\n" \
+                          "        </div>\n" \
+                          "      </div>\n" \
+                          "      <div class=\"wrap\">\n" \
+                          "        <div class=\"toolbar\">\n" \
+                          "          <div class=\"breadcrumb toolblock\">\n" \
+                          "            <ul>\n" \
+                          "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+                          "              <!--  Bread crumbs goes here -->\n"
+
+HTML.postpostheader     = "            </ul>\n" \
+                          "          </div>\n" \
+                          "          <div class=\"toolbuttons toolblock\">\n" \
+                          "            <ul>\n" \
+                          "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+                          "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+                          "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+                          "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+                          "                <span>Print</span></a></li>\n" \
+                          "            </ul>\n" \
+                          "        </div>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"content mainContent\">\n"
+
+HTML.footer             = "" \
+                          "        <div class=\"feedback t_button\">\n" \
+                          "          [+] Documentation Feedback</div>\n" \
+                          "      </div>\n" \
+                          "    </div>\n" \
+                          "    </div> \n" \
+                          "    <div class=\"ft\">\n" \
+                          "      <span></span>\n" \
+                          "    </div>\n" \
+                          "  </div> \n" \
+                          "  <div class=\"footer\">\n" \
+                          "    <p>\n" \
+                          "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+                          "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+                          "      in Finland and/or other countries worldwide.</p>\n" \
+                          "    <p>\n" \
+                          "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+                          "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+                          "    <br />\n" \
+                          "    <p>\n" \
+                          "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+                          "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+                          "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+                          "    <p>\n" \
+                          "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+                          "      Free Documentation License version 1.3</a>\n" \
+                          "      as published by the Free Software Foundation.</p>\n" \
+                          "  </div>\n" \
+                          "  <div id=\"feedbackBox\">\n" \
+                          "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+                          "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+                          "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
+                          "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
+                          "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
+                          "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+                          "    </form>\n" \
+                          "  </div>\n" \
+                          "  <div id=\"blurpage\">\n" \
+                          "  </div>\n" 
+
+# This stuff is used by the Qt 4.7 doc format.
+scriptdirs              = ../../../doc/src/template/scripts
+styledirs               = ../../../doc/src/template/style
+
+scripts.HTML		= functions.js \
+			  narrow.js \
+			  superfish.js \
+			  jquery.js
+
+styles.HTML		= style.css \
+			  narrow.css \
+			  superfish.css \
+			  superfish_skin.css \
+			  style_ie6.css \
+			  style_ie7.css \
+			  style_ie8.css
+
+# Files not referenced in any qdoc file (last four are needed by qtdemo)
+# See also extraimages.HTML
+qhp.Qt.extraFiles          = scripts/functions.js \
+                             scripts/jquery.js \
+                             scripts/narrow.js \
+                             scripts/superfish.js \
+                             style/narrow.css \
+                             style/superfish.css \
+                             style/style_ie6.css \
+                             style/style_ie7.css \
+                             style/style_ie8.css \
+                             style/style.css
+
-- 
cgit v0.12


From afa9d82702cbce1a23f951ed045d038f1d16b417 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Mon, 8 Nov 2010 10:12:10 +1000
Subject: Update QtOpenVg def files for bug QT-3589

---
 src/s60installs/bwins/QtOpenVGu.def | 1 +
 src/s60installs/eabi/QtOpenVGu.def  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/s60installs/bwins/QtOpenVGu.def b/src/s60installs/bwins/QtOpenVGu.def
index a67725e..87b9c7f 100644
--- a/src/s60installs/bwins/QtOpenVGu.def
+++ b/src/s60installs/bwins/QtOpenVGu.def
@@ -175,4 +175,5 @@ EXPORTS
 	?createPixmapForImage@QVGPixmapData@@IAEXAAVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@_N@Z @ 174 NONAME ; void QVGPixmapData::createPixmapForImage(class QImage &, class QFlags<enum Qt::ImageConversionFlag>, bool)
 	?fromData@QVGPixmapData@@UAE_NPBEIPBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 175 NONAME ; bool QVGPixmapData::fromData(unsigned char const *, unsigned int, char const *, class QFlags<enum Qt::ImageConversionFlag>)
 	?fromImageReader@QVGPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 176 NONAME ; void QVGPixmapData::fromImageReader(class QImageReader *, class QFlags<enum Qt::ImageConversionFlag>)
+	?canVgWritePixels@QVGPaintEngine@@ABE_NABVQImage@@@Z @ 177 NONAME ; bool QVGPaintEngine::canVgWritePixels(class QImage const &) const
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index 99942b8..e1828c1 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -205,4 +205,5 @@ EXPORTS
 	_ZN13QVGPixmapData20createPixmapForImageER6QImage6QFlagsIN2Qt19ImageConversionFlagEEb @ 204 NONAME
 	_ZN13QVGPixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 205 NONAME
 	_ZN13QVGPixmapData8fromFileERK7QStringPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 206 NONAME
+	_ZNK14QVGPaintEngine16canVgWritePixelsERK6QImage @ 207 NONAME
 
-- 
cgit v0.12


From 465d2c6356bdfd70bd28c6ec53191e73682b06c1 Mon Sep 17 00:00:00 2001
From: juhvu <qt-info@nokia.com>
Date: Mon, 8 Nov 2010 11:43:53 +1000
Subject: Task-number: QTBUG-15059 Removed implicit QtGui linking from
 qsymbianbearer plugin as it is not needed.

---
 src/plugins/bearer/symbian/symbian.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri
index e874945..8d92f57 100644
--- a/src/plugins/bearer/symbian/symbian.pri
+++ b/src/plugins/bearer/symbian/symbian.pri
@@ -1,7 +1,7 @@
 TARGET = qsymbianbearer
 include(../../qpluginbase.pri)
 
-QT += network
+QT = core network
 
 HEADERS += ../symbianengine.h \
            ../qnetworksession_impl.h
-- 
cgit v0.12


From 0f1599edcc8624682efb9514bb9b4ac0519c7017 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Mon, 8 Nov 2010 13:34:05 +1000
Subject: Text alignment is broken with multi-line text and implicit size.

Also add some visual tests for multi-line text elememts.

Task-number: QTBUG-15018
---
 src/declarative/graphicsitems/qdeclarativetext.cpp |  58 +++++++++++++++----
 .../qmlvisual/qdeclarativetext/font/TestText.qml   |  13 +++++
 .../font/data-MAC/plaintext3.0.png                 | Bin 0 -> 53503 bytes
 .../qdeclarativetext/font/data-MAC/plaintext3.qml  |  11 ++++
 .../qdeclarativetext/font/data/plaintext3.0.png    | Bin 0 -> 53503 bytes
 .../qdeclarativetext/font/data/plaintext3.qml      |  11 ++++
 .../qmlvisual/qdeclarativetext/font/plaintext3.qml |  62 +++++++++++++++++++++
 7 files changed, 143 insertions(+), 12 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/TestText.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 84f276e..615c619 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -285,35 +285,56 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
 {
     // ### text layout handling should be profiled and optimized as needed
     // what about QStackTextEngine engine(tmp, d->font.font()); QTextLayout textLayout(&engine);
-
     Q_Q(QDeclarativeText);
     layout.setCacheEnabled(true);
 
     qreal height = 0;
+    qreal widthUsed = 0;
     qreal lineWidth = 0;
 
-    QTextOption textOption = layout.textOption();
-    textOption.setWrapMode(QTextOption::NoWrap);
-    textOption.setAlignment(Qt::Alignment(hAlign));
-
-    // if the item has an explicit width, we set the line width and enable wrapping
-    if (q->widthValid()) {
+    //set manual width
+    if ((wrapMode != QDeclarativeText::NoWrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid())
         lineWidth = q->width();
-        textOption.setWrapMode(QTextOption::WrapMode(wrapMode));
-    }
 
+    QTextOption textOption = layout.textOption();
+    textOption.setWrapMode(QTextOption::WrapMode(wrapMode));
     layout.setTextOption(textOption);
+
     layout.beginLayout();
-    while (1) {
+    forever {
         QTextLine line = layout.createLine();
         if (!line.isValid())
             break;
 
-        line.setLineWidth(lineWidth);
+        if (lineWidth)
+            line.setLineWidth(lineWidth);
+    }
+    layout.endLayout();
+
+    for (int i = 0; i < layout.lineCount(); ++i) {
+        QTextLine line = layout.lineAt(i);
+        widthUsed = qMax(widthUsed, line.naturalTextWidth());
+    }
+
+    qreal layoutWidth = q->widthValid() ? q->width() : widthUsed;
+
+    qreal x = 0;
+    for (int i = 0; i < layout.lineCount(); ++i) {
+        QTextLine line = layout.lineAt(i);
         line.setPosition(QPointF(0, height));
         height += line.height();
+
+        if (!cacheAllTextAsImage) {
+            if (hAlign == QDeclarativeText::AlignLeft) {
+                x = 0;
+            } else if (hAlign == QDeclarativeText::AlignRight) {
+                x = layoutWidth - line.naturalTextWidth();
+            } else if (hAlign == QDeclarativeText::AlignHCenter) {
+                x = (layoutWidth - line.naturalTextWidth()) / 2;
+            }
+            line.setPosition(QPointF(x, line.y()));
+        }
     }
-    layout.endLayout();
 
     return layout.boundingRect().toAlignedRect().size();
 }
@@ -327,6 +348,19 @@ QPixmap QDeclarativeTextPrivate::textLayoutImage(bool drawStyle)
     //do layout
     QSize size = layedOutTextSize;
 
+    qreal x = 0;
+    for (int i = 0; i < layout.lineCount(); ++i) {
+        QTextLine line = layout.lineAt(i);
+        if (hAlign == QDeclarativeText::AlignLeft) {
+            x = 0;
+        } else if (hAlign == QDeclarativeText::AlignRight) {
+            x = size.width() - line.naturalTextWidth();
+        } else if (hAlign == QDeclarativeText::AlignHCenter) {
+            x = (size.width() - line.naturalTextWidth()) / 2;
+        }
+        line.setPosition(QPointF(x, line.y()));
+    }
+
     //paint text
     QPixmap img(size);
     if (!size.isEmpty()) {
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/TestText.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/TestText.qml
new file mode 100644
index 0000000..690cb15
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/TestText.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0
+
+Text {
+    id: testText
+
+    property color bcolor: "blue"
+
+    text: "The quick brown fox\njumps over\nthe lazy dog."
+    font.family: "Helvetica"
+    font.pointSize: 16
+
+    Rectangle { id: borderr; color: "transparent"; border.color: bcolor; anchors.fill: parent; opacity: 0.2 }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
new file mode 100644
index 0000000..0d3c672
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.qml
new file mode 100644
index 0000000..13f413a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext3.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.0.png
new file mode 100644
index 0000000..0d3c672
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.qml
new file mode 100644
index 0000000..13f413a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext3.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml
new file mode 100644
index 0000000..087dfbe
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml
@@ -0,0 +1,62 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: main
+    width: 800; height: 600
+
+
+    Grid {
+        x: 4; y: 4
+        spacing: 8
+        columns: 4
+
+        Column {
+            spacing: 4
+            TestText { }
+            TestText { horizontalAlignment: Text.AlignHCenter }
+            TestText { horizontalAlignment: Text.AlignRight }
+        }
+
+        Column {
+            spacing: 4
+            TestText { wrapMode: Text.Wrap }
+            TestText { horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap }
+            TestText { horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap }
+        }
+
+        Column {
+            spacing: 4
+            TestText { wrapMode: Text.Wrap; elide: Text.ElideRight }
+            TestText { horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap; elide: Text.ElideRight }
+            TestText { horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap; elide: Text.ElideRight }
+        }
+
+        Column {
+            spacing: 4
+            TestText { width: 230; wrapMode: Text.Wrap; elide: Text.ElideRight }
+            TestText { width: 230; horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap; elide: Text.ElideRight }
+            TestText { width: 230; horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap; elide: Text.ElideRight }
+        }
+
+        Column {
+            spacing: 4
+            TestText { width: 120; wrapMode: Text.Wrap; elide: Text.ElideRight }
+            TestText { width: 120; horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap; elide: Text.ElideRight }
+            TestText { width: 120; horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap; elide: Text.ElideRight }
+        }
+
+        Column {
+            spacing: 4
+            TestText { width: 120; wrapMode: Text.Wrap }
+            TestText { width: 120; horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap }
+            TestText { width: 120; horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap }
+        }
+
+        Column {
+            spacing: 4
+            TestText { width: 120 }
+            TestText { width: 120; horizontalAlignment: Text.AlignHCenter }
+            TestText { width: 120; horizontalAlignment: Text.AlignRight }
+        }
+    }
+}
-- 
cgit v0.12


From 16316f170fde30b91ed884a95d5910bd4de63782 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 8 Nov 2010 14:12:57 +1000
Subject: Don't use stdint.h in our headers since it is a C99 header. This
 caused problems in user applications depending upon the order of inlcusion
 and/or defining __STDC_LIMIT_MACROS.  stdint.h is also not present in msvc,
 but is present in mingw.  Switch to using quintptr.

Task-number: QTBUG-14691
Task-number: QTBUG-13953
Reviewed-by: Bea Lam
---
 src/declarative/qml/qdeclarativeprivate.h  |  5 +----
 src/declarative/qml/qmetaobjectbuilder.cpp | 12 ++++--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index d45ddbc..388c92e 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -55,9 +55,6 @@
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
-#ifndef Q_OS_WIN
-#include <stdint.h>
-#endif
 
 QT_BEGIN_HEADER
 
@@ -105,7 +102,7 @@ namespace QDeclarativePrivate
     template<class From, class To>
     struct StaticCastSelectorClass<From, To, sizeof(int)>
     {
-        static inline int cast() { return int(reinterpret_cast<intptr_t>(static_cast<To *>(reinterpret_cast<From *>(0x10000000)))) - 0x10000000; }
+        static inline int cast() { return int(reinterpret_cast<quintptr>(static_cast<To *>(reinterpret_cast<From *>(0x10000000)))) - 0x10000000; }
     };
 
     template<class From, class To>
diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index 58f8811..dfe89f8 100644
--- a/src/declarative/qml/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
@@ -41,10 +41,6 @@
 
 #include "private/qmetaobjectbuilder_p.h"
 
-#ifndef Q_OS_WIN
-#include <stdint.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -1264,8 +1260,8 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
     char *str = reinterpret_cast<char *>(buf + size);
     if (buf) {
         if (relocatable) {
-            meta->d.stringdata = reinterpret_cast<const char *>((intptr_t)size);
-            meta->d.data = reinterpret_cast<uint *>((intptr_t)pmetaSize);
+            meta->d.stringdata = reinterpret_cast<const char *>((quintptr)size);
+            meta->d.data = reinterpret_cast<uint *>((quintptr)pmetaSize);
         } else {
             meta->d.stringdata = str;
             meta->d.data = reinterpret_cast<uint *>(data);
@@ -1502,8 +1498,8 @@ void QMetaObjectBuilder::fromRelocatableData(QMetaObject *output,
     const char *buf = data.constData();
     const QMetaObject *dataMo = reinterpret_cast<const QMetaObject *>(buf);
 
-    intptr_t stringdataOffset = (intptr_t)dataMo->d.stringdata;
-    intptr_t dataOffset = (intptr_t)dataMo->d.data;
+    quintptr stringdataOffset = (quintptr)dataMo->d.stringdata;
+    quintptr dataOffset = (quintptr)dataMo->d.data;
 
     output->d.superdata = superclass;
     output->d.stringdata = buf + stringdataOffset;
-- 
cgit v0.12


From c9860f3336536bfb11c685dd25f6333409fda508 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Mon, 8 Nov 2010 15:22:12 +1000
Subject: Export QDeclarativeDebugHelper on Symbian for QTBUG-13762

Reviewed-by: Martin Jones
Task-number: QTBUG-13762
---
 src/declarative/debugger/qdeclarativedebughelper_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h
index a1ac23d..fcd7115 100644
--- a/src/declarative/debugger/qdeclarativedebughelper_p.h
+++ b/src/declarative/debugger/qdeclarativedebughelper_p.h
@@ -55,7 +55,7 @@ class QDeclarativeEngine;
 
 // Helper methods to access private API through a stable interface
 // This is used in the qmljsdebugger library of QtCreator.
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugHelper
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
 {
 public:
     static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
-- 
cgit v0.12


From d3f8374c9e980b9e74cde2ee6cba8dd8312e5ac4 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 8 Nov 2010 10:49:37 +0100
Subject: Added missing def file symbol.

---
 src/s60installs/eabi/QtCoreu.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index eb53dca..aefbe1f 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3713,4 +3713,5 @@ EXPORTS
 	_ZrsR11QDataStreamR12QEasingCurve @ 3712 NONAME
 	_Z26qt_symbian_SetupThreadHeapiR24SStdEpocThreadCreateInfo @ 3713 NONAME
 	_ZN24QAbstractDeclarativeData17objectNameChangedE @ 3714 NONAME DATA 4
+	_ZN23QEventDispatcherSymbian36queueDeferredActiveObjectsCompletionEv @ 3715 NONAME
 
-- 
cgit v0.12


From e8b10f2239a15e8d0ad1b676b7f03d03543efc67 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 5 Nov 2010 16:20:00 +0200
Subject: Allow pkg_prerules and pkg_postrules to be targeted to separate files

Pkg_prerules and pkg_postrules can now be targeted to apply only to
main template pkg, installer pkg, or stub pkg file using
.main, .installer, or .stub suffix on the variable.

Also clarified documentation of these variables.

Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: a537137fffd72d153a35828228c00567a563e787

Task-number: QTBUG-15068
Task-number: QTBUG-13159
Reviewed-by: axis

Conflicts:

	doc/src/development/qmake-manual.qdoc
	doc/src/snippets/code/doc_src_qmake-manual.qdoc
---
 doc/src/development/qmake-manual.qdoc           |  31 +++-
 doc/src/snippets/code/doc_src_qmake-manual.qdoc |   5 +
 qmake/generators/symbian/symbiancommon.cpp      | 235 ++++++++++++++++--------
 qmake/generators/symbian/symbiancommon.h        |  11 ++
 4 files changed, 197 insertions(+), 85 deletions(-)

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d65967d..a520838 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1394,12 +1394,16 @@
     On the Symbian platform, generic PKG file content can also be specified with this
     variable. You can use either \c pkg_prerules or \c pkg_postrules to 
     pass raw data to PKG file. The strings in \c pkg_prerules are added before
-    package-body and \c pkg_postrules after. The strings defined in 
-    \c pkg_postrules or \c pkg_prerules are not parsed by qmake, so they 
-    should be in a format understood by Symbian package generation tools. 
+    package-body and \c pkg_postrules after. \c pkg_prerules is used for
+    defining vendor information, dependencies, custom package headers, and the
+    like, while \c pkg_postrules is used for custom file deployment and
+    embedded sis directives.
+    The strings defined in \c pkg_postrules or \c pkg_prerules are not parsed
+    by qmake, so they should be in a format understood by Symbian package
+    generation tools.
     Please consult the Symbian platform documentation for correct syntax.
 
-    For example, to deploy DLL and add a new dependency: 
+    For example, to deploy DLL and add a new dependency:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 140
 
@@ -1415,13 +1419,28 @@
     \o localized and unique vendor, for example \BR
         %{"Vendor-EN", ..., "Vendor-FR"}
         :"Unique vendor name"
-    \endlist    
+    \endlist
 
-    If you decide to override any of these statements, you need to pay 
+    If you decide to override any of these statements, you need to pay
     attention that also other statements stay valid. For example if you
     override languages statement, you must override also package-header
     statement and all other statements which are language specific.
 
+    On the Symbian platform, three separate PKG files are generated:
+
+    \list
+    \o <app>_template.pkg - For application SIS file. Rules suffix: \c{.main}
+    \o <app>_installer.pkg - For smart installer SIS file. Rules suffix: \c{.installer}
+    \o <app>_stub.pkg - For ROM stubs. Rules suffix: \c{.stub}
+    \endlist
+
+    \c pkg_prerules and \c pkg_postrules given without rules suffix will
+    intelligently apply to each of these files, but rules can also be
+    targeted to only one of above files by appending listed rules suffix
+    to the variable name:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 153
+
     On the Symbian platform, the \c default_deployment item specifies
     default platform and package dependencies. Those dependencies can be
     selectively disabled if alternative dependencies need to be defined
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 8c35c3f..379d081 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1009,3 +1009,8 @@ my_exports = \
     "bar.h /epoc32/include/mylib/bar.h"
 BLD_INF_RULES.prj_exports += my_exports
 //! [152]
+
+//! [153]
+my_note.pkg_postrules.installer = "\"myinstallnote.txt\" - \"\", FILETEXT, TEXTCONTINUE"
+DEPLOYMENT += my_note
+//! [153]
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 6fea8fd..3183e27 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -204,44 +204,71 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
     tw << headerComment.arg(wrapperPkgFilename).arg(dateStr);
     ts << headerComment.arg(stubPkgFileName).arg(dateStr);
 
-    // Construct QStringList from pkg_prerules since we need search it before printed to file
-    // Note: Though there can't be more than one language or header line, use stringlists
+    QStringList commonRawPreRules;
+    QStringList mainRawPreRules;
+    QStringList instRawPreRules;
+    QStringList stubRawPreRules;
+
+    // Though there can't be more than one language or header line, use stringlists
     // in case user wants comments to go with the rules.
-    QStringList rawPkgPreRules;
+    // Note that it makes no sense to have file specific language or header rules,
+    // except what is provided for installer header via "DEPLOYMENT.installer_header" variable,
+    // because stub and main headers should always match. Vendor rules are similarly limited to
+    // make code cleaner as it is unlikely anyone will want different vendor in different files.
     QStringList languageRules;
     QStringList headerRules;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_prerules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line mmp statements
-            if (pkgrulesValue.isEmpty()) {
-                if (pkgrulesItem.startsWith("&"))
-                    languageRules << pkgrulesItem;
-                else if (pkgrulesItem.startsWith("#"))
-                    headerRules << pkgrulesItem;
-                else
-                    rawPkgPreRules << pkgrulesItem;
-            } else {
-                if (containsStartWithItem('&', pkgrulesValue)) {
-                    foreach(QString pkgrule, pkgrulesValue) {
-                        languageRules << pkgrule;
-                    }
-                } else if (containsStartWithItem('#', pkgrulesValue)) {
-                    foreach(QString pkgrule, pkgrulesValue) {
-                        headerRules << pkgrule;
-                    }
-                } else {
-                    foreach(QString pkgrule, pkgrulesValue) {
-                        rawPkgPreRules << pkgrule;
-                    }
-                }
-            }
+    QStringList vendorRules;
+
+    QStringList commonRawPostRules;
+    QStringList mainRawPostRules;
+    QStringList instRawPostRules;
+    QStringList stubRawPostRules;
+
+    QStringList failList; // Used for detecting incorrect usage
+
+    QString emptySuffix;
+    QString mainSuffix(".main");
+    QString instSuffix(".installer");
+    QString stubSuffix(".stub");
+
+    foreach(QString item, project->values("DEPLOYMENT")) {
+        parsePreRules(item, emptySuffix, &commonRawPreRules, &languageRules, &headerRules, &vendorRules);
+        parsePreRules(item, mainSuffix, &mainRawPreRules, &failList, &failList, &failList);
+        parsePreRules(item, instSuffix, &instRawPreRules, &failList, &failList, &failList);
+        parsePreRules(item, stubSuffix, &stubRawPreRules, &failList, &failList, &failList);
+
+        parsePostRules(item, emptySuffix, &commonRawPostRules);
+        parsePostRules(item, mainSuffix, &mainRawPostRules);
+        parsePostRules(item, instSuffix, &instRawPostRules);
+        parsePostRules(item, stubSuffix, &stubRawPostRules);
+    }
+
+    if (!failList.isEmpty()) {
+        fprintf(stderr, "Warning: Custom language, header, or vendor definitions are not "
+                "supported by file specific pkg_prerules.* variables.\n"
+                "Use plain pkg_prerules and/or DEPLOYMENT.installer_header for customizing "
+                "these items.\n");
+    }
+
+    foreach(QString item, commonRawPreRules) {
+        if (item.startsWith("(")) {
+            // Only regular pkg file should have package dependencies
+            mainRawPreRules << item;
+        } else if (item.startsWith("[")) {
+            // stub pkg file should not have platform dependencies
+            mainRawPreRules << item;
+            instRawPreRules << item;
+        } else {
+            mainRawPreRules << item;
+            instRawPreRules << item;
+            stubRawPreRules << item;
         }
     }
 
-    // Apply some defaults if specific data does not exist in PKG pre-rules
+    // Currently common postrules only go to main
+    mainRawPostRules << commonRawPostRules;
 
+    // Apply some defaults if specific data does not exist in PKG pre-rules
     if (languageRules.isEmpty()) {
         // language, (*** hardcoded to english atm, should be parsed from TRANSLATIONS)
         languageRules << "; Language\n&EN\n\n";
@@ -313,49 +340,38 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
         ts << headerRules.join("\n") << endl;
     }
 
-    // Localized vendor name
-    QString vendorName;
-    if (!containsStartWithItem('%', rawPkgPreRules)) {
-        vendorName += "; Localised Vendor name\n%{\"Vendor\"}\n\n";
+    // Vendor name
+    if (!containsStartWithItem('%', vendorRules)) {
+        vendorRules << "; Default localized vendor name\n%{\"Vendor\"}\n\n";
     }
-
-    // Unique vendor name
-    if (!containsStartWithItem(':', rawPkgPreRules)) {
-        vendorName += "; Unique Vendor name\n:\"Vendor\"\n\n";
+    if (!containsStartWithItem(':', vendorRules)) {
+        vendorRules << "; Default unique vendor name\n:\"Vendor\"\n\n";
     }
 
-    t << vendorName;
-    tw << vendorName;
-    ts << vendorName;
+    t << vendorRules.join("\n") << endl;
+    tw << vendorRules.join("\n") << endl;
+    ts << vendorRules.join("\n") << endl;
 
     // PKG pre-rules - these are added before actual file installations i.e. SIS package body
-    if (rawPkgPreRules.size()) {
-        QString comment = "\n; Manual PKG pre-rules from PRO files\n";
+    QString comment = "\n; Manual PKG pre-rules from PRO files\n";
+
+    if (mainRawPreRules.size()) {
         t << comment;
+        t << mainRawPreRules.join("\n") << endl;
+    }
+    if (instRawPreRules.size()) {
         tw << comment;
+        tw << instRawPreRules.join("\n") << endl;
+    }
+    if (stubRawPreRules.size()) {
         ts << comment;
-
-        foreach(QString item, rawPkgPreRules) {
-            // Only regular pkg file should have package dependencies
-            if (item.startsWith("(")) {
-                t << item << endl;
-            }
-            // stub pkg file should not have platform dependencies
-            else if (item.startsWith("[")) {
-                t << item << endl;
-                tw << item << endl;
-            }
-            else {
-                t << item << endl;
-                ts << item << endl;
-                tw << item << endl;
-            }
-        }
-        t << endl;
-        ts << endl;
-        tw << endl;
+        ts << stubRawPreRules.join("\n") << endl;
     }
 
+    t << endl;
+    tw << endl;
+    ts << endl;
+
     // Begin Manufacturer block
     if (!project->values("DEPLOYMENT.manufacturers").isEmpty()) {
         QString manufacturerStr("IF ");
@@ -481,21 +497,19 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
     ts << endl;
 
     // PKG post-rules - these are added after actual file installations i.e. SIS package body
-    t << "; Manual PKG post-rules from PRO files" << endl;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_postrules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line statements
-            if (pkgrulesValue.isEmpty()) {
-                t << pkgrulesItem << endl;
-            } else {
-                foreach(QString pkgrule, pkgrulesValue) {
-                    t << pkgrule << endl;
-                }
-            }
-            t << endl;
-        }
+    comment = "; Manual PKG post-rules from PRO files\n";
+
+    if (mainRawPostRules.size()) {
+        t << comment;
+        t << mainRawPostRules.join("\n") << endl;
+    }
+    if (instRawPostRules.size()) {
+        tw << comment;
+        tw << instRawPostRules.join("\n") << endl;
+    }
+    if (stubRawPostRules.size()) {
+        ts << comment;
+        ts << stubRawPostRules.join("\n") << endl;
     }
 
     // Close Manufacturer block
@@ -1037,3 +1051,66 @@ void SymbianCommonGenerator::fillQt2S60LangMapTable()
     qt2S60LangMapTable.insert("ny", "SC");            //Chewa                         //
 }
 
+void SymbianCommonGenerator::parsePreRules(const QString &deploymentVariable,
+                                           const QString &variableSuffix,
+                                           QStringList *rawRuleList,
+                                           QStringList *languageRuleList,
+                                           QStringList *headerRuleList,
+                                           QStringList *vendorRuleList)
+{
+    QMakeProject *project = generator->project;
+    foreach(QString pkgrulesItem, project->values(deploymentVariable + ".pkg_prerules" + variableSuffix)) {
+        QStringList pkgrulesValue = project->values(pkgrulesItem);
+        // If there is no stringlist defined for a rule, use rule name directly
+        // This is convenience for defining single line statements
+        if (pkgrulesValue.isEmpty()) {
+            if (pkgrulesItem.startsWith("&"))
+                *languageRuleList << pkgrulesItem;
+            else if (pkgrulesItem.startsWith("#"))
+                *headerRuleList << pkgrulesItem;
+            else if (pkgrulesItem.startsWith("%") || pkgrulesItem.startsWith(":"))
+                *vendorRuleList << pkgrulesItem;
+            else
+                *rawRuleList << pkgrulesItem;
+        } else {
+            if (containsStartWithItem('&', pkgrulesValue)) {
+                foreach(QString pkgrule, pkgrulesValue) {
+                    *languageRuleList << pkgrule;
+                }
+            } else if (containsStartWithItem('#', pkgrulesValue)) {
+                foreach(QString pkgrule, pkgrulesValue) {
+                    *headerRuleList << pkgrule;
+                }
+            } else if (containsStartWithItem('%', pkgrulesValue)
+                       || containsStartWithItem(':', pkgrulesValue)) {
+                foreach(QString pkgrule, pkgrulesValue) {
+                    *vendorRuleList << pkgrule;
+                }
+            } else {
+                foreach(QString pkgrule, pkgrulesValue) {
+                    *rawRuleList << pkgrule;
+                }
+            }
+        }
+    }
+}
+
+void SymbianCommonGenerator::parsePostRules(const QString &deploymentVariable,
+                                            const QString &variableSuffix,
+                                            QStringList *rawRuleList)
+{
+    QMakeProject *project = generator->project;
+    foreach(QString pkgrulesItem, project->values(deploymentVariable + ".pkg_postrules" + variableSuffix)) {
+        QStringList pkgrulesValue = project->values(pkgrulesItem);
+        // If there is no stringlist defined for a rule, use rule name directly
+        // This is convenience for defining single line statements
+        if (pkgrulesValue.isEmpty()) {
+            *rawRuleList << pkgrulesItem;
+        } else {
+            foreach(QString pkgrule, pkgrulesValue) {
+                *rawRuleList << pkgrule;
+            }
+        }
+    }
+}
+
diff --git a/qmake/generators/symbian/symbiancommon.h b/qmake/generators/symbian/symbiancommon.h
index dae1e4a..80f2079 100644
--- a/qmake/generators/symbian/symbiancommon.h
+++ b/qmake/generators/symbian/symbiancommon.h
@@ -86,6 +86,17 @@ protected:
     QStringList symbianLangCodesFromTsFiles();
     void fillQt2S60LangMapTable();
 
+    void parsePreRules(const QString &deploymentVariable,
+                       const QString &variableSuffix,
+                       QStringList *rawRuleList,
+                       QStringList *languageRuleList,
+                       QStringList *headerRuleList,
+                       QStringList *vendorRuleList);
+    void parsePostRules(const QString &deploymentVariable,
+                        const QString &variableSuffix,
+                        QStringList *rawRuleList);
+
+
 protected:
     MakefileGenerator *generator;
 
-- 
cgit v0.12


From 70770a2e4fc7581f56a39f7b8b89dd5782cd29c0 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 5 Nov 2010 16:45:39 +0200
Subject: Make default application deployment removable

Default application deployment was hard coded in qmake, so it was
impossible to replace with custom deployment. Now the default deployment
is generated via .prf files and is removable.

Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 494ce0dac35c7ade0ce78589878597a7ca912864

Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: axis

Conflicts:

	qmake/generators/symbian/symbiancommon.cpp
---
 doc/src/development/qmake-manual.qdoc           | 16 +++++
 doc/src/snippets/code/doc_src_qmake-manual.qdoc |  4 ++
 mkspecs/common/symbian/symbian.conf             |  2 +-
 mkspecs/features/symbian/application_icon.prf   | 49 ++++++++++-----
 mkspecs/features/symbian/default_post.prf       |  9 +--
 qmake/generators/symbian/symbiancommon.cpp      | 82 +------------------------
 6 files changed, 61 insertions(+), 101 deletions(-)

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index a520838..278822e 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1458,6 +1458,22 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141
 
+    On the Symbian platform, a default deployment is generated for all
+    application projects. You can modify the autogenerated default
+    deployment via following \c DEPLOYMENT variable values:
+
+    \list
+    \o default_bin_deployment - Application executable
+    \o default_resource_deployment - Application resources, including icon
+    \o default_reg_deployment - Application registration file
+    \endlist
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 154
+
+    This will entirely remove the default application deployment.
+
     On the Symbian platform, you can use \c{DEPLOYMENT.installer_header}
     variable to generate smart installer wrapper for your application.
     If you specify just UID of the installer package as the value, then
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 379d081..20d8d45 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1014,3 +1014,7 @@ BLD_INF_RULES.prj_exports += my_exports
 my_note.pkg_postrules.installer = "\"myinstallnote.txt\" - \"\", FILETEXT, TEXTCONTINUE"
 DEPLOYMENT += my_note
 //! [153]
+
+//! [154]
+DEPLOYMENT -= default_bin_deployment default_resource_deployment default_reg_deployment
+//! [154]
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index decec14..2fb799d 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -202,7 +202,7 @@ pkg_platform_dependencies = \
     "[0x20032DE7],0,0,0,{\"S60ProductID\"}" \
     " "
 
-DEPLOYMENT += default_deployment
+DEPLOYMENT += default_deployment default_bin_deployment default_resource_deployment default_reg_deployment
 
 defineReplace(symbianRemoveSpecialCharacters) {
     # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters and
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index 9a9395a..39f10fb 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -1,21 +1,39 @@
 load(data_caging_paths)
 
-# If no_icon keyword exist, the S60 UI app is just made hidden. This because S60 app FW
-# requires the registration resource file to exist always
-contains( CONFIG, no_icon ) {
-    symbian:RSS_RULES += "hidden = KAppIsHidden;"
-    CONFIG -= no_icon
-} else {
-# There is no point in compiling the MIF icon if no_icon CONFIGS is set
-    !isEmpty(ICON) {
+contains(CONFIG, no_icon) {
+    # If no_icon keyword exist, the S60 UI app is just made hidden. This because S60 app FW
+    # requires the registration resource file to exist always
+    contains(QT, gui):contains(CONFIG, qt) {
+        symbian:RSS_RULES += "hidden = KAppIsHidden;"
+        CONFIG -= no_icon
+    }
+}
+
+!contains(CONFIG, no_icon) {
+    baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET))
+    symbian-abld|symbian-sbsv2 {
+        resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
+        regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
+    } else {
+        isEmpty(DESTDIR) {
+            resourceZDir = .
+        } else {
+            resourceZDir = $$DESTDIR
+        }
+        regZDir = $$resourceZDir
+    }
 
+    default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.rsc
+    default_resource_deployment.path = $$APP_RESOURCE_DIR
+    default_reg_deployment.sources += $$regZDir/$${baseTarget}_reg.rsc
+    default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
+
+    !isEmpty(ICON) {
         !count(ICON, 1) {
             ICON = $$first(ICON)
             warning("Only first icon specified in ICON variable is used: $$ICON")
         }
 
-        baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET))
-
         # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
         !symbian-sbsv2 {
             # Absolute path required for shadow builds.
@@ -27,13 +45,10 @@ contains( CONFIG, no_icon ) {
             ICON_backslashed = $$ICON
 
             symbian-abld {
+                # ${ZDIR} is defined in Makefile
                 mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
             } else {
-                isEmpty(DESTDIR) {
-                    mifIconZDir = .
-                } else {
-                    mifIconZDir = $$DESTDIR
-                }
+                mifIconZDir = $$resourceZDir
             }
 
             # Extra compiler rules for mifconv
@@ -54,5 +69,9 @@ contains( CONFIG, no_icon ) {
         # Rules to use generated MIF file from symbian resources
         RSS_RULES.number_of_icons = $$size(ICON_backslashed)
         RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif
+
+        default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.mif
     }
 }
+
+
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 0564e9b..362bd6c 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -9,6 +9,11 @@ contains(TEMPLATE, ".*app") {
     } else {
         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     }
+
+    default_bin_deployment.sources += $$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+    default_bin_deployment.path += /sys/bin
+
+    load(application_icon.prf)
 }
 contains(TEMPLATE, lib): {
     contains(CONFIG, staticlib)|contains(CONFIG, static): {
@@ -26,10 +31,6 @@ contains(TEMPLATE, lib): {
     MMP_RULES -= EXPORTUNFROZEN
 }
 
-contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG,qt) {
-    load(application_icon.prf)
-}
-
 isEmpty(TARGET.UID3):TARGET.UID3 = $$generate_uid("$${OUT_PWD}/$${TARGET}")
 isEmpty(TARGET.UID2) {
     contains(CONFIG, stdbinary) {
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 3183e27..c0a6626 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -383,87 +383,7 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
         t << manufacturerStr << endl;
     }
 
-    // Install paths on the phone *** should be dynamic at some point
-    QString installPathBin = "!:\\sys\\bin";
-    QString installPathResource = "!:\\resource\\apps";
-    QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
-
-    // Find location of builds
-    QString destDirBin;
-    QString destDirResource;
-    QString destDirRegResource;
-    if (epocBuild) {
-        destDirBin = QString("%1epoc32/release/$(PLATFORM)/$(TARGET)").arg(epocRoot());
-        destDirResource = QString("%1epoc32/data/z/resource/apps").arg(epocRoot());
-        destDirRegResource = QString("%1epoc32/data/z/private/10003a3f/import/apps").arg(epocRoot());
-    } else {
-        destDirBin = project->first("DESTDIR");
-        if (destDirBin.isEmpty())
-            destDirBin = ".";
-        else if (destDirBin.endsWith('/') || destDirBin.endsWith('\\'))
-            destDirBin.chop(1);
-        destDirResource = destDirBin;
-        destDirRegResource = destDirBin;
-    }
-
-    if (targetType == TypeExe) {
-        // deploy .exe file
-        t << "; Executable and default resource files" << endl;
-        QString exeFile = fixedTarget + ".exe";
-        t << QString("\"%1/%2\" - \"%3\\%4\"")
-             .arg(destDirBin)
-             .arg(exeFile)
-             .arg(installPathBin)
-             .arg(exeFile) << endl;
-        ts << QString("\"\" - \"%1\\%2\"")
-             .arg(romPath(installPathBin))
-             .arg(exeFile) << endl;
-
-        // deploy rsc & reg_rsc file
-        if (!project->isActiveConfig("no_icon")) {
-            t << QString("\"%1/%2\" - \"%3\\%4\"")
-                 .arg(destDirResource)
-                 .arg(fixedTarget + ".rsc")
-                 .arg(installPathResource)
-                 .arg(fixedTarget + ".rsc") << endl;
-            ts << QString("\"\" - \"%1\\%2\"")
-                 .arg(romPath(installPathResource))
-                 .arg(fixedTarget + ".rsc") << endl;
-
-            t << QString("\"%1/%2\" - \"%3\\%4\"")
-                 .arg(destDirRegResource)
-                 .arg(fixedTarget + "_reg.rsc")
-                 .arg(installPathRegResource)
-                 .arg(fixedTarget + "_reg.rsc") << endl;
-            ts << QString("\"\" - \"%1\\%2\"")
-                 .arg(romPath(installPathRegResource))
-                 .arg(fixedTarget + "_reg.rsc") << endl;
-
-            if (!iconFile.isEmpty())  {
-                if (epocBuild) {
-                    t << QString("\"%1epoc32/data/z%2\" - \"!:%3\"")
-                         .arg(epocRoot())
-                         .arg(iconFile)
-                         .arg(QString(iconFile).replace('/', '\\')) << endl << endl;
-                    ts << QString("\"\" - \"%1\"")
-                         .arg(romPath(QString(iconFile).replace('/', '\\'))) << endl << endl;
-                } else {
-                    QDir mifIconDir(project->first("DESTDIR"));
-                    QFileInfo mifIcon(mifIconDir.relativeFilePath(project->first("TARGET")));
-                    QString mifIconFileName = mifIcon.fileName();
-                    mifIconFileName.append(".mif");
-                    t << QString("\"%1/%2\" - \"!:%3\"")
-                         .arg(mifIcon.path())
-                         .arg(mifIconFileName)
-                         .arg(QString(iconFile).replace('/', '\\')) << endl << endl;
-                    ts << QString("\"\" - \"%1\"")
-                         .arg(romPath(QString(iconFile).replace('/', '\\'))) << endl << endl;
-                }
-            }
-        }
-    }
-
-    // deploy any additional DEPLOYMENT  files
+    // deploy files specified by DEPLOYMENT variable
     QString remoteTestPath;
     QString zDir;
     remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
-- 
cgit v0.12


From f6d645b54dd11ac8d12da12751a88e831e3f3415 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 5 Oct 2010 17:20:29 +0300
Subject: Added .flags modifier support for DEPLOYMENT items in Symbian

The .flags modifier can be used to specify pkg flags for files.

For example, to make default application run after install:

  default_bin_deployment.flags += FR RI

For example, to show a note at installation time:

  notedep.sources = install_note.txt
  notedep.flags = FT TC
  DEPLOYMENT += notedep

See Symbian package file format documentation for exact supported
flag values.

Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 50b2477e6ffd64a0730cc5c0f0a6190b1a6b5861

Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: Janne Anttila
---
 doc/src/development/qmake-manual.qdoc                | 17 +++++++++++++++++
 doc/src/snippets/code/doc_src_qmake-manual.qdoc      |  7 +++++++
 .../generators/symbian/initprojectdeploy_symbian.cpp | 20 ++++++++++++++------
 qmake/generators/symbian/initprojectdeploy_symbian.h |  6 +++++-
 qmake/generators/symbian/symbiancommon.cpp           | 20 ++++++++++++++++++--
 5 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 278822e..883c9d8 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1474,6 +1474,23 @@
 
     This will entirely remove the default application deployment.
 
+    On the Symbian platform, you can specify file specific install options
+    with \c{.flags} modifier. Please consult the Symbian platform documentation
+    for supported options.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 155
+
+    This will show a message box that gives user an option to cancel the
+    installation and then automatically runs the application after
+    installation is complete.
+
+    \note Automatically running the applications after install may require signing
+    the package with better than self-signed certificate, depending on the phone model.
+    Additionally, some tools such as Runonphone may not work properly with sis
+    packages that automatically run the application upon install.
+
     On the Symbian platform, you can use \c{DEPLOYMENT.installer_header}
     variable to generate smart installer wrapper for your application.
     If you specify just UID of the installer package as the value, then
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 20d8d45..a5bc1f3 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1018,3 +1018,10 @@ DEPLOYMENT += my_note
 //! [154]
 DEPLOYMENT -= default_bin_deployment default_resource_deployment default_reg_deployment
 //! [154]
+
+//! [155]
+default_bin_deployment.flags += FILERUN RUNINSTALL
+dep_note.sources = install_note.txt
+dep_note.flags = FILETEXT TEXTEXIT
+DEPLOYMENT += dep_note
+//! [155]
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 5963773..22a4a82 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -253,6 +253,8 @@ void initProjectDeploySymbian(QMakeProject* project,
             continue;
         }
 
+        QStringList flags = project->values(item + ".flags");
+
         foreach(QString source, project->values(item + ".sources")) {
             source = Option::fixPathToLocalOS(source);
             QString nameFilter;
@@ -284,13 +286,15 @@ void initProjectDeploySymbian(QMakeProject* project,
                                     Option::fixPathToLocalOS(targetPath.absolutePath() + "/" + info.fileName(),
                                     false, true),
                                     fixPathToEpocOS(devicePath.left(2) + QLatin1String(SYSBIN_DIR "/")
-                                    + info.fileName())));
+                                    + info.fileName()),
+                                    flags));
                             } else {
                                 deploymentList.append(CopyItem(
                                     Option::fixPathToLocalOS(targetPath.absolutePath() + "/" + info.fileName(),
                                     false, true),
                                     fixPathToEpocOS(deploymentDrive + QLatin1String("/" SYSBIN_DIR "/")
-                                    + info.fileName())));
+                                    + info.fileName()),
+                                    flags));
                             }
                         }
                         if (isPlugin(info, devicePath)) {
@@ -301,7 +305,8 @@ void initProjectDeploySymbian(QMakeProject* project,
                         // Generate deployment even if file doesn't exist, as this may be the case
                         // when generating .pkg files.
                         deploymentList.append(CopyItem(Option::fixPathToLocalOS(info.absoluteFilePath()),
-                                                       fixPathToEpocOS(devicePath + "/" + info.fileName())));
+                                                       fixPathToEpocOS(devicePath + "/" + info.fileName()),
+                                                       flags));
                         continue;
                     }
                 }
@@ -328,12 +333,14 @@ void initProjectDeploySymbian(QMakeProject* project,
                                 deploymentList.append(CopyItem(
                                     Option::fixPathToLocalOS(absoluteItemPath + "/" + iterator.fileName()),
                                     fixPathToEpocOS(devicePath.left(2) + QLatin1String(SYSBIN_DIR "/")
-                                    + iterator.fileName())));
+                                    + iterator.fileName()),
+                                    flags));
                             } else {
                                 deploymentList.append(CopyItem(
                                     Option::fixPathToLocalOS(absoluteItemPath + "/" + iterator.fileName()),
                                     fixPathToEpocOS(deploymentDrive + QLatin1String("/" SYSBIN_DIR "/")
-                                    + iterator.fileName())));
+                                    + iterator.fileName()),
+                                    flags));
                             }
                         }
                         createPluginStub(info, devicePath + "/" + absoluteItemPath.right(diffSize),
@@ -343,7 +350,8 @@ void initProjectDeploySymbian(QMakeProject* project,
                         deploymentList.append(CopyItem(
                             Option::fixPathToLocalOS(absoluteItemPath + "/" + iterator.fileName()),
                             fixPathToEpocOS(devicePath + "/" + absoluteItemPath.right(diffSize)
-                            + "/" + iterator.fileName())));
+                            + "/" + iterator.fileName()),
+                            flags));
                     }
                 }
             }
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.h b/qmake/generators/symbian/initprojectdeploy_symbian.h
index 2653d2a..bc17b04 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.h
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.h
@@ -56,9 +56,13 @@
 
 struct CopyItem
 {
-    CopyItem(const QString& f, const QString& t) : from(f) , to(t) { }
+    CopyItem(const QString& f, const QString& t)
+        : from(f) , to(t) { }
+    CopyItem(const QString& f, const QString& t, const QStringList& l)
+        : from(f) , to(t), flags(l) { }
     QString from;
     QString to;
+    QStringList flags;
 };
 typedef QList<CopyItem> DeploymentList;
 
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index c0a6626..5e8bc4a 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -397,6 +397,15 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
     for (int i = 0; i < depList.size(); ++i)  {
         QString from = depList.at(i).from;
         QString to = depList.at(i).to;
+        QString flags;
+        bool showOnlyFile = false;
+        foreach(QString flag, depList.at(i).flags) {
+            if (flag == QLatin1String("FT")
+                || flag == QLatin1String("FILETEXT")) {
+                showOnlyFile = true;
+            }
+            flags.append(QLatin1Char(',')).append(flag);
+        }
 
         if (epocBuild) {
             // Deploy anything not already deployed from under epoc32 instead from under
@@ -410,8 +419,15 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
             }
         }
 
-        t << QString("\"%1\" - \"%2\"").arg(from.replace('\\','/')).arg(to) << endl;
-        ts << QString("\"\" - \"%1\"").arg(romPath(to)) << endl;
+        // Files with "FILETEXT"/"FT" flag are meant for showing only at installation time
+        // and therefore do not belong to the stub package and will not install the file into phone.
+        if (showOnlyFile)
+            to.clear();
+        else
+            ts << QString("\"\" - \"%1\"").arg(romPath(to)) << endl;
+
+        t << QString("\"%1\" - \"%2\"%3").arg(from.replace('\\','/')).arg(to).arg(flags) << endl;
+
     }
     t << endl;
     ts << endl;
-- 
cgit v0.12


From e00354a40db497fe35fde7055521c2246e7a3e7c Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 7 Oct 2010 15:36:45 +0300
Subject: Implement support for DEPLOYMENT.display_name in Symbian

The default package name and the default name that appears in
the application menu is derived from the TARGET variable.
Often the default is not optimal for displaying to end user.
To set a better display name for these purposes DEPLOYMENT.display_name
variable can now be used.

Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 9cb24d1c4b7359ec84708ba770050de720b50cdf

Task-number: QTBUG-15068
Task-number: QTBUG-14280
Reviewed-by: Janne Anttila
---
 doc/src/development/qmake-manual.qdoc           |  7 +++++++
 doc/src/snippets/code/doc_src_qmake-manual.qdoc |  4 ++++
 qmake/generators/symbian/symbiancommon.cpp      | 21 ++++++++++++++-------
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 883c9d8..6531d25 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1491,6 +1491,13 @@
     Additionally, some tools such as Runonphone may not work properly with sis
     packages that automatically run the application upon install.
 
+    On the Symbian platform, the default package name and the default name that
+    appears in application menu is derived from the \c TARGET variable.
+    Often the default is not optimal for displaying to end user. To set a better
+    display name for these purposes, use \c{DEPLOYMENT.display_name} variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 156
+
     On the Symbian platform, you can use \c{DEPLOYMENT.installer_header}
     variable to generate smart installer wrapper for your application.
     If you specify just UID of the installer package as the value, then
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index a5bc1f3..4f74e9c 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1025,3 +1025,7 @@ dep_note.sources = install_note.txt
 dep_note.flags = FILETEXT TEXTEXIT
 DEPLOYMENT += dep_note
 //! [155]
+
+//! [156]
+DEPLOYMENT.display_name = My Qt App
+//! [156]
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 5e8bc4a..0938b58 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -320,7 +320,9 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
 
     // Package header
     QString sisHeader = "; SIS header: name, uid, version\n#{\"%1\"},(%2),%3\n\n";
-    QString visualTarget = generator->escapeFilePath(project->first("TARGET"));
+    QString visualTarget = project->values("DEPLOYMENT.display_name").join(" ");
+    if (visualTarget.isEmpty())
+        visualTarget = generator->escapeFilePath(project->first("TARGET"));
 
     visualTarget = removePathSeparators(visualTarget);
     QString wrapperTarget = visualTarget + " installer";
@@ -641,6 +643,11 @@ void SymbianCommonGenerator::writeLocFile(QStringList &symbianLangCodes)
     if (ft.open(QIODevice::WriteOnly)) {
         generatedFiles << ft.fileName();
         QTextStream t(&ft);
+
+        QString displayName = generator->project->values("DEPLOYMENT.display_name").join(" ");
+        if (displayName.isEmpty())
+            displayName = generator->escapeFilePath(generator->project->first("TARGET"));
+
         t << "// ============================================================================" << endl;
         t << "// * Generated by qmake (" << qmake_version() << ") (Qt " QT_VERSION_STR ") on: ";
         t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
@@ -649,16 +656,16 @@ void SymbianCommonGenerator::writeLocFile(QStringList &symbianLangCodes)
         t << "// ============================================================================" << endl;
         t << endl;
         t << "#ifdef LANGUAGE_SC" << endl;
-        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
+        t << "#define STRING_r_short_caption \"" << displayName  << "\"" << endl;
+        t << "#define STRING_r_caption \"" << displayName  << "\"" << endl;
         foreach(QString lang, symbianLangCodes) {
             t << "#elif defined LANGUAGE_" << lang << endl;
-            t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-            t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
+            t << "#define STRING_r_short_caption \"" << displayName  << "\"" << endl;
+            t << "#define STRING_r_caption \"" << displayName  << "\"" << endl;
         }
         t << "#else" << endl;
-        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
+        t << "#define STRING_r_short_caption \"" << displayName  << "\"" << endl;
+        t << "#define STRING_r_caption \"" << displayName  << "\"" << endl;
         t << "#endif" << endl;
     } else {
         PRINT_FILE_CREATE_ERROR(filename);
-- 
cgit v0.12


From e5345aa59d6573abb39b50285b63aafcddd9f13b Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 4 Nov 2010 09:47:08 +0200
Subject: Make qmake to pass all UTF-8 characters unchanged through parser.

QMakeProject::parse() calls QString::simplified(), which assumes any
byte 0xA0 in multibyte UTF-8 characters is a space character (0x00A0 is
unicode character NBSP [non-breaking space]) and replaces those bytes
with regular space, corrupting the UTF-8 string.

Fixed by temporarily changing all 0xA0 bytes in parser input to another
non-space character 0x01A0. This is safe replacement as qmake doesn't
accept unicode .pro files, so there should never be actual NBSP or the
replacement 0x01A0 characters in a valid .pro file.

Note that there are a couple of more uses of QString::simplified() in
qmake, but those do not deal with strings that need to be UTF-8
compatible as far as I can tell, so no need to touch them.

Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 15a7626480b64d85992bed819fe6052e0c5c8fa9

Task-number: QTBUG-15068
Task-number: QTBUG-14357
Reviewed-by: Oswald Buddenhagen
---
 qmake/project.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 427bea3..fe08b7b 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -677,7 +677,23 @@ QMakeProject::reset()
 bool
 QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place, int numLines)
 {
-    QString s = t.simplified();
+    // To preserve the integrity of any UTF-8 characters in .pro file, temporarily replace the
+    // non-breaking space (0xA0) characters with another non-space character, so that
+    // QString::simplified() call will not replace it with space.
+    // Note: There won't be any two byte characters in .pro files, so 0x10A0 should be a safe
+    // replacement character.
+    static QChar nbsp(0xA0);
+    static QChar nbspFix(0x01A0);
+    QString s;
+    if (t.indexOf(nbsp) != -1) {
+        s = t;
+        s.replace(nbsp, nbspFix);
+        s = s.simplified();
+        s.replace(nbspFix, nbsp);
+    } else {
+        s = t.simplified();
+    }
+
     int hash_mark = s.indexOf("#");
     if(hash_mark != -1) //good bye comments
         s = s.left(hash_mark);
-- 
cgit v0.12


From b78ec7dcd8b13a76703baefff1731d3f345392cc Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Mon, 8 Nov 2010 11:10:53 +0100
Subject: fix memleak in test

---
 tests/auto/qtextdocument/tst_qtextdocument.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp
index 808299b..23f6a6c 100644
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp
@@ -2054,6 +2054,7 @@ void tst_QTextDocument::clonePreservesIndentWidth()
     doc->setIndentWidth(42);
     QTextDocument *clone = doc->clone();
     QCOMPARE(clone->indentWidth(), qreal(42));
+    delete clone;
 }
 
 void tst_QTextDocument::blockCount()
-- 
cgit v0.12


From ee958e086847e2131f9b746e5c6de4491ae1f44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 8 Nov 2010 10:05:28 +0100
Subject: Prevented race condition on texture destruction.

When texture destruction was triggered from a different thread, we
posted a signal to the QGLSignalProxy. However, before the signal is
delivered the corresponding QGLContext might be destroyed in the main
thread. We need to post a signal to a QObject which is destroyed when
the QGLContext is destroyed instead, to prevent trying to access an
invalid QGLContext pointer.

Task-number: QT-4238
Reviewed-by: Gunnar Sletta
---
 src/opengl/qgl.cpp         | 11 +++++++++++
 src/opengl/qgl.h           |  1 +
 src/opengl/qgl_p.h         | 30 ++++++++++++++++++++----------
 tests/auto/qgl/tst_qgl.cpp |  8 ++++++--
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 84cfa97..ed9753e 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1642,12 +1642,23 @@ const QGLContext *qt_gl_transfer_context(const QGLContext *ctx)
         return 0;
 }
 
+QGLContextPrivate::QGLContextPrivate(QGLContext *context)
+    : internal_context(false)
+    , q_ptr(context)
+{
+    group = new QGLContextGroup(context);
+    texture_destroyer = new QGLTextureDestroyer;
+    texture_destroyer->moveToThread(qApp->thread());
+}
+
 QGLContextPrivate::~QGLContextPrivate()
 {
     if (!group->m_refs.deref()) {
         Q_ASSERT(group->context() == q_ptr);
         delete group;
     }
+
+    delete texture_destroyer;
 }
 
 void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format)
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index f85cad5..9ae619d 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -428,6 +428,7 @@ private:
     friend class QGLSharedResourceGuard;
     friend class QGLPixmapBlurFilter;
     friend class QGLExtensions;
+    friend class QGLTexture;
     friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags();
 #ifdef Q_WS_MAC
 public:
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 18b2765..4742bdb 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -317,6 +317,7 @@ private:
 };
 
 class QGLTexture;
+class QGLTextureDestroyer;
 
 // This probably needs to grow to GL_MAX_VERTEX_ATTRIBS, but 3 is ok for now as that's
 // all the GL2 engine uses:
@@ -326,7 +327,7 @@ class QGLContextPrivate
 {
     Q_DECLARE_PUBLIC(QGLContext)
 public:
-    explicit QGLContextPrivate(QGLContext *context) : internal_context(false), q_ptr(context) {group = new QGLContextGroup(context);}
+    explicit QGLContextPrivate(QGLContext *context);
     ~QGLContextPrivate();
     QGLTexture *bindTexture(const QImage &image, GLenum target, GLint format,
                             QGLContext::BindOptions options);
@@ -417,6 +418,7 @@ public:
     GLuint current_fbo;
     GLuint default_fbo;
     QPaintEngine *active_engine;
+    QGLTextureDestroyer *texture_destroyer;
 
     bool vertexAttributeArraysEnabledState[QT_GL_VERTEX_ARRAY_TRACKED_COUNT];
 
@@ -476,25 +478,20 @@ private:
     QGLContext *m_ctx;
 };
 
-// ### make QGLContext a QObject in 5.0 and remove the proxy stuff
-class Q_OPENGL_EXPORT QGLSignalProxy : public QObject
+class QGLTextureDestroyer : public QObject
 {
     Q_OBJECT
 public:
-    QGLSignalProxy() : QObject() {
+    QGLTextureDestroyer() : QObject() {
         qRegisterMetaType<GLuint>("GLuint");
         connect(this, SIGNAL(freeTexture(QGLContext *, QPixmapData *, GLuint)),
                 this, SLOT(freeTexture_slot(QGLContext *, QPixmapData *, GLuint)));
     }
-    void emitAboutToDestroyContext(const QGLContext *context) {
-        emit aboutToDestroyContext(context);
-    }
     void emitFreeTexture(QGLContext *context, QPixmapData *boundPixmap, GLuint id) {
         emit freeTexture(context, boundPixmap, id);
     }
-    static QGLSignalProxy *instance();
+
 Q_SIGNALS:
-    void aboutToDestroyContext(const QGLContext *context);
     void freeTexture(QGLContext *context, QPixmapData *boundPixmap, GLuint id);
 
 private slots:
@@ -518,6 +515,19 @@ private slots:
     }
 };
 
+// ### make QGLContext a QObject in 5.0 and remove the proxy stuff
+class Q_OPENGL_EXPORT QGLSignalProxy : public QObject
+{
+    Q_OBJECT
+public:
+    void emitAboutToDestroyContext(const QGLContext *context) {
+        emit aboutToDestroyContext(context);
+    }
+    static QGLSignalProxy *instance();
+Q_SIGNALS:
+    void aboutToDestroyContext(const QGLContext *context);
+};
+
 class QGLTexture {
 public:
     QGLTexture(QGLContext *ctx = 0, GLuint tx_id = 0, GLenum tx_target = GL_TEXTURE_2D,
@@ -537,7 +547,7 @@ public:
 #if !defined(Q_WS_X11)
             QPixmapData *boundPixmap = 0;
 #endif
-            QGLSignalProxy::instance()->emitFreeTexture(context, boundPixmap, id);
+            context->d_ptr->texture_destroyer->emitFreeTexture(context, boundPixmap, id);
         }
      }
 
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 4220b45..e38bf42 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -2335,8 +2335,10 @@ public:
     Widget()
         : iterations(0)
         , display(0)
+        , producer(new Producer)
     {
         startTimer(400);
+        connect(this, SIGNAL(destroyed()), producer, SLOT(deleteLater()));
     }
 
     int iterations;
@@ -2348,15 +2350,15 @@ protected:
 
         delete display;
         display = new DisplayWidget(this);
-        connect(&producer, SIGNAL(imageReady(const QImage &)), display, SLOT(setImage(const QImage &)));
+        connect(producer, SIGNAL(imageReady(const QImage &)), display, SLOT(setImage(const QImage &)));
 
         display->setGeometry(rect());
         display->show();
     }
 
 private:
-    Producer producer;
     DisplayWidget *display;
+    Producer *producer;
 };
 
 }
@@ -2369,6 +2371,8 @@ void tst_QGL::threadImages()
     while (widget->iterations <= 5) {
         qApp->processEvents();
     }
+
+    delete widget;
 }
 
 class tst_QGLDummy : public QObject
-- 
cgit v0.12


From 2da8d40ac2c7de25d811bac0befaef577a696065 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Mon, 8 Nov 2010 14:02:28 +0100
Subject: QNAM: Remove dead waitForDownstreamReadyRead() code

Reviewed-by: Thiago Macieira
---
 src/network/access/qnetworkaccessbackend_p.h         |  1 -
 src/network/access/qnetworkaccesscachebackend.cpp    |  6 ------
 src/network/access/qnetworkaccesscachebackend_p.h    |  1 -
 .../access/qnetworkaccessdebugpipebackend.cpp        |  6 ------
 .../access/qnetworkaccessdebugpipebackend_p.h        |  1 -
 src/network/access/qnetworkaccessfilebackend.cpp     |  6 ------
 src/network/access/qnetworkaccessfilebackend_p.h     |  1 -
 src/network/access/qnetworkaccessftpbackend.cpp      | 17 -----------------
 src/network/access/qnetworkaccessftpbackend_p.h      |  1 -
 src/network/access/qnetworkaccesshttpbackend.cpp     | 20 --------------------
 src/network/access/qnetworkaccesshttpbackend_p.h     |  1 -
 11 files changed, 61 deletions(-)

diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h
index 4fe6de6..7faa5cb 100644
--- a/src/network/access/qnetworkaccessbackend_p.h
+++ b/src/network/access/qnetworkaccessbackend_p.h
@@ -115,7 +115,6 @@ public:
     virtual bool start();
 #endif
     virtual void closeDownstreamChannel() = 0;
-    virtual bool waitForDownstreamReadyRead(int msecs) = 0;
 
     // slot-like:
     virtual void downstreamReadyWrite();
diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp
index 73491a9..597cbef 100644
--- a/src/network/access/qnetworkaccesscachebackend.cpp
+++ b/src/network/access/qnetworkaccesscachebackend.cpp
@@ -132,12 +132,6 @@ void QNetworkAccessCacheBackend::closeUpstreamChannel()
     Q_ASSERT_X(false, Q_FUNC_INFO, "This function show not have been called!");
 }
 
-bool QNetworkAccessCacheBackend::waitForDownstreamReadyRead(int)
-{
-    Q_ASSERT_X(false, Q_FUNC_INFO , "This function show not have been called!");
-    return false;
-}
-
 bool QNetworkAccessCacheBackend::waitForUpstreamBytesWritten(int)
 {
     Q_ASSERT_X(false, Q_FUNC_INFO, "This function show not have been called!");
diff --git a/src/network/access/qnetworkaccesscachebackend_p.h b/src/network/access/qnetworkaccesscachebackend_p.h
index df001ab..995c875 100644
--- a/src/network/access/qnetworkaccesscachebackend_p.h
+++ b/src/network/access/qnetworkaccesscachebackend_p.h
@@ -69,7 +69,6 @@ public:
     void open();
     void closeDownstreamChannel();
     void closeUpstreamChannel();
-    bool waitForDownstreamReadyRead(int msecs);
     bool waitForUpstreamBytesWritten(int msecs);
 
     void upstreamReadyRead();
diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp
index cd077e7..5f99f84 100644
--- a/src/network/access/qnetworkaccessdebugpipebackend.cpp
+++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp
@@ -278,12 +278,6 @@ void QNetworkAccessDebugPipeBackend::socketConnected()
 {
 }
 
-bool QNetworkAccessDebugPipeBackend::waitForDownstreamReadyRead(int ms)
-{
-    Q_UNUSED(ms);
-    qCritical("QNetworkAccess: Debug pipe backend does not support waitForReadyRead()");
-    return false;
-}
 
 #endif
 
diff --git a/src/network/access/qnetworkaccessdebugpipebackend_p.h b/src/network/access/qnetworkaccessdebugpipebackend_p.h
index 58a4fd0..918a813 100644
--- a/src/network/access/qnetworkaccessdebugpipebackend_p.h
+++ b/src/network/access/qnetworkaccessdebugpipebackend_p.h
@@ -71,7 +71,6 @@ public:
 
     virtual void open();
     virtual void closeDownstreamChannel();
-    virtual bool waitForDownstreamReadyRead(int msecs);
 
     virtual void downstreamReadyWrite();
 
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 4560153..65f19ca 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -203,12 +203,6 @@ void QNetworkAccessFileBackend::closeDownstreamChannel()
     }
 }
 
-bool QNetworkAccessFileBackend::waitForDownstreamReadyRead(int)
-{
-    Q_ASSERT(operation() == QNetworkAccessManager::GetOperation);
-    return readMoreFromFile();
-}
-
 void QNetworkAccessFileBackend::downstreamReadyWrite()
 {
     Q_ASSERT_X(operation() == QNetworkAccessManager::GetOperation, "QNetworkAccessFileBackend",
diff --git a/src/network/access/qnetworkaccessfilebackend_p.h b/src/network/access/qnetworkaccessfilebackend_p.h
index 6df8710..d1dbe8d 100644
--- a/src/network/access/qnetworkaccessfilebackend_p.h
+++ b/src/network/access/qnetworkaccessfilebackend_p.h
@@ -69,7 +69,6 @@ public:
 
     virtual void open();
     virtual void closeDownstreamChannel();
-    virtual bool waitForDownstreamReadyRead(int msecs);
 
     virtual void downstreamReadyWrite();
 
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 1a59011..d1a18d3 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -182,23 +182,6 @@ void QNetworkAccessFtpBackend::closeDownstreamChannel()
 #endif
 }
 
-bool QNetworkAccessFtpBackend::waitForDownstreamReadyRead(int ms)
-{
-    if (!ftp)
-        return false;
-
-    if (ftp->bytesAvailable()) {
-        ftpReadyRead();
-        return true;
-    }
-
-    if (ms == 0)
-        return false;
-
-    qCritical("QNetworkAccess: FTP backend does not support waitForReadyRead()");
-    return false;
-}
-
 void QNetworkAccessFtpBackend::downstreamReadyWrite()
 {
     if (state == Transferring && ftp && ftp->bytesAvailable())
diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h
index 737fa72..8a2bfc3 100644
--- a/src/network/access/qnetworkaccessftpbackend_p.h
+++ b/src/network/access/qnetworkaccessftpbackend_p.h
@@ -87,7 +87,6 @@ public:
 
     virtual void open();
     virtual void closeDownstreamChannel();
-    virtual bool waitForDownstreamReadyRead(int msecs);
 
     virtual void downstreamReadyWrite();
 
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 2a0daf8..80b05a4 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -674,26 +674,6 @@ void QNetworkAccessHttpBackend::closeDownstreamChannel()
     // this indicates that the user closed the stream while the reply isn't finished yet
 }
 
-bool QNetworkAccessHttpBackend::waitForDownstreamReadyRead(int msecs)
-{
-    Q_ASSERT(http);
-
-    if (httpReply->bytesAvailable()) {
-        readFromHttp();
-        return true;
-    }
-
-    if (msecs == 0) {
-        // no bytes available in the socket and no waiting
-        return false;
-    }
-
-    // ### FIXME
-    qCritical("QNetworkAccess: HTTP backend does not support waitForReadyRead()");
-    return false;
-}
-
-
 void QNetworkAccessHttpBackend::downstreamReadyWrite()
 {
     readFromHttp();
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index 568b2ee..5de3429 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -79,7 +79,6 @@ public:
 
     virtual void open();
     virtual void closeDownstreamChannel();
-    virtual bool waitForDownstreamReadyRead(int msecs);
 
     virtual void downstreamReadyWrite();
     virtual void setDownstreamLimited(bool b);
-- 
cgit v0.12


From a3a84a872bb731d375a431626ccfcde5a660dd72 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Mon, 8 Nov 2010 14:08:13 +0100
Subject: QNAM: Remove dead waitForUpstreamBytesWritten() code

---
 src/network/access/qnetworkaccesscachebackend.cpp | 6 ------
 src/network/access/qnetworkaccesscachebackend_p.h | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp
index 597cbef..e78694e 100644
--- a/src/network/access/qnetworkaccesscachebackend.cpp
+++ b/src/network/access/qnetworkaccesscachebackend.cpp
@@ -132,12 +132,6 @@ void QNetworkAccessCacheBackend::closeUpstreamChannel()
     Q_ASSERT_X(false, Q_FUNC_INFO, "This function show not have been called!");
 }
 
-bool QNetworkAccessCacheBackend::waitForUpstreamBytesWritten(int)
-{
-    Q_ASSERT_X(false, Q_FUNC_INFO, "This function show not have been called!");
-    return false;
-}
-
 void QNetworkAccessCacheBackend::upstreamReadyRead()
 {
     Q_ASSERT_X(false, Q_FUNC_INFO, "This function show not have been called!");
diff --git a/src/network/access/qnetworkaccesscachebackend_p.h b/src/network/access/qnetworkaccesscachebackend_p.h
index 995c875..32581d5 100644
--- a/src/network/access/qnetworkaccesscachebackend_p.h
+++ b/src/network/access/qnetworkaccesscachebackend_p.h
@@ -69,7 +69,6 @@ public:
     void open();
     void closeDownstreamChannel();
     void closeUpstreamChannel();
-    bool waitForUpstreamBytesWritten(int msecs);
 
     void upstreamReadyRead();
     void downstreamReadyWrite();
-- 
cgit v0.12


From 5657b8f13bd6ef456a1da7ae08a2924e256b8ea3 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 8 Nov 2010 15:18:11 +0100
Subject: Started using qtmain.lib for all Qt applications, also corelib ones.

This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.

Task:     QTBUG-14735
RevBy:    Miikka Heikkinen
---
 config.tests/symbian/audio/audio.pro          |  1 +
 config.tests/symbian/simple/simple.pro        |  1 +
 mkspecs/common/symbian/symbian.conf           |  5 ++++-
 mkspecs/features/symbian/default_post.prf     |  7 +++----
 mkspecs/features/symbian/symbian_building.prf | 25 ++++++++++++++-----------
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/config.tests/symbian/audio/audio.pro b/config.tests/symbian/audio/audio.pro
index b2a1986..b496341 100644
--- a/config.tests/symbian/audio/audio.pro
+++ b/config.tests/symbian/audio/audio.pro
@@ -6,4 +6,5 @@ INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common
 INCLUDEPATH += $${EPOCROOT}epoc32/include/platform
 
 LIBS += -lmmfdevsound
+CONFIG -= qt
 QT =
diff --git a/config.tests/symbian/simple/simple.pro b/config.tests/symbian/simple/simple.pro
index fa086c9..9c60d62 100644
--- a/config.tests/symbian/simple/simple.pro
+++ b/config.tests/symbian/simple/simple.pro
@@ -1,4 +1,5 @@
 TEMPLATE = app
+CONFIG -= qt
 QT = 
 SOURCES += main.cpp
 
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 2fb799d..69188a8 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -79,7 +79,6 @@ QMAKE_LIBS_OPENGL_ES2_QT = -llibglesv2 -lcone -lws32
 QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
 QMAKE_LIBS_THREAD       = -llibpthread
 QMAKE_LIBS_COMPAT       = 
-QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon -leikcoctl
 
 exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
@@ -127,6 +126,10 @@ QT_ARCH               = symbian
 
 load(qt_config)
 
+QMAKE_LIBS_QT_ENTRY     = -lqtmain$${QT_LIBINFIX}.lib
+QMAKE_LIBS_NO_QT_ENTRY  = -llibcrt0.lib
+QMAKE_LIBS_NO_QT_ENTRY_GCCE  = -llibcrt0_gcce.lib
+
 # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
 QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
 QT_IMPORTS_BASE_DIR = /resource/qt/imports
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 362bd6c..b62bf98 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -3,11 +3,10 @@ load(default_post)
 contains(TEMPLATE, ".*app") {
     contains(CONFIG, stdbinary) {
         QMAKE_LIBS +=
-    } else:contains(QT, gui):contains(CONFIG,qt) {
-        S60MAIN_LIBS = -leuser
-        QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
-    } else {
+    } else:contains(CONFIG,qt) {
         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
+    } else {
+        QMAKE_LIBS += $$QMAKE_LIBS_NO_QT_ENTRY
     }
 
     default_bin_deployment.sources += $$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 1a51cb2..0cedaa0 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -187,25 +187,28 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
     linux-armcc: {
         QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
         QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
-        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
-            QMAKE_LIBS -= -lqtmain$${QT_LIBINFIX}.lib
-            QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib
+        contains(CONFIG, "qt") {
+            QMAKE_LIBS -= $$QMAKE_LIBS_QT_ENTRY
+            QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
         } else {
-            QMAKE_LIBS -= -llibcrt0.lib
-            QMAKE_LIBS += -llibcrt0.lib
+            QMAKE_LIBS -= $$QMAKE_LIBS_NO_QT_ENTRY
+            QMAKE_LIBS += $$QMAKE_LIBS_NO_QT_ENTRY
         }
     } else :linux-gcce {
         # notice that we can't merge these as ordering of arguments is important.
         QMAKE_LIBS += \
             -l:eexe.lib \
             -l:usrt2_2.lib
-        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
-            QMAKE_LIBS -= -l:qtmain$${QT_LIBINFIX}.lib
-            QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib
+        contains(CONFIG, "qt") {
+            modified_entry = $$replace(QMAKE_LIBS_QT_ENTRY, "^-l", "-l:")
+            QMAKE_LIBS -= $$modified_entry
+            QMAKE_LIBS += $$modified_entry
         } else {
-            QMAKE_LIBS -= -l:libcrt0.lib
-            QMAKE_LIBS -= -l:libcrt0_gcce.lib
-            QMAKE_LIBS += -l:libcrt0_gcce.lib
+            modified_entry = $$replace(QMAKE_LIBS_NO_QT_ENTRY, "^-l", "-l:")
+            QMAKE_LIBS -= $$modified_entry
+            modified_entry = $$replace(QMAKE_LIBS_NO_QT_ENTRY_GCCE, "^-l", "-l:")
+            QMAKE_LIBS -= $$modified_entry
+            QMAKE_LIBS += $$modified_entry
         }
         QMAKE_LIBS += \
             -l:dfpaeabi.dso \
-- 
cgit v0.12


From 626f13421baf258407f03e3bf21ed67138d55ea4 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 8 Nov 2010 15:03:05 +0100
Subject: Don't crash if QScriptClass property getter returns an invalid value

It's possible that a class claims to have a property of a given name
(i.e. queryProperty() returns true), but returns an invalid value
for that property. In that case we should silently convert the value
to undefined, otherwise the value may wreak havoc in JS.

This is a regression from Qt 4.5 (pre-JavaScriptCore-based), which
had this check.

Task-number: QTBUG-15079
Reviewed-by: Jedrzej Nowacki
---
 src/script/bridge/qscriptclassobject.cpp     | 12 ++++++++++++
 tests/auto/qscriptclass/tst_qscriptclass.cpp | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp
index dd229f1..228e755 100644
--- a/src/script/bridge/qscriptclassobject.cpp
+++ b/src/script/bridge/qscriptclassobject.cpp
@@ -78,6 +78,12 @@ bool ClassObjectDelegate::getOwnPropertySlot(QScriptObject* object,
         scriptObject, scriptName, QScriptClass::HandlesReadAccess, &id);
     if (flags & QScriptClass::HandlesReadAccess) {
         QScriptValue value = m_scriptClass->property(scriptObject, scriptName, id);
+        if (!value.isValid()) {
+            // The class claims to have the property, but returned an invalid
+            // value. Silently convert to undefined to avoid the invalid value
+            // "escaping" into JS.
+            value = QScriptValue(QScriptValue::UndefinedValue);
+        }
         slot.setValue(engine->scriptValueToJSCValue(value));
         return true;
     }
@@ -119,6 +125,12 @@ bool ClassObjectDelegate::getOwnPropertyDescriptor(QScriptObject *object,
         attribs |= pflags & QScriptValue::UserRange;
         // Rather than calling the getter, we could return an access descriptor here.
         QScriptValue value = m_scriptClass->property(scriptObject, scriptName, id);
+        if (!value.isValid()) {
+            // The class claims to have the property, but returned an invalid
+            // value. Silently convert to undefined to avoid the invalid value
+            // "escaping" into JS.
+            value = QScriptValue(QScriptValue::UndefinedValue);
+        }
         descriptor.setDescriptor(engine->scriptValueToJSCValue(value), attribs);
         return true;
     }
diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp
index b4dbe73..da6c76f 100644
--- a/tests/auto/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp
@@ -66,6 +66,7 @@ public:
 private slots:
     void newInstance();
     void getAndSetProperty();
+    void getProperty_invalidValue();
     void enumerate();
     void extension();
 };
@@ -741,6 +742,26 @@ void tst_QScriptClass::getAndSetProperty()
     QVERIFY(!obj1.property(bar).isValid());
 }
 
+void tst_QScriptClass::getProperty_invalidValue()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.addCustomProperty(eng.toStringHandle("foo"), QScriptClass::HandlesReadAccess,
+                          /*id=*/0, QScriptValue::ReadOnly, QScriptValue());
+    QScriptValue obj = eng.newObject(&cls);
+
+    QVERIFY(obj.property("foo").isUndefined());
+
+    eng.globalObject().setProperty("obj", obj);
+    QVERIFY(eng.evaluate("obj.hasOwnProperty('foo'))").toBool());
+    // The JS environment expects that a valid value is returned,
+    // otherwise we could crash.
+    QVERIFY(eng.evaluate("obj.foo").isUndefined());
+    QVERIFY(eng.evaluate("obj.foo + ''").isString());
+    QVERIFY(eng.evaluate("Object.getOwnPropertyDescriptor(obj, 'foo').value").isUndefined());
+    QVERIFY(eng.evaluate("Object.getOwnPropertyDescriptor(obj, 'foo').value +''").isString());
+}
+
 void tst_QScriptClass::enumerate()
 {
     QScriptEngine eng;
-- 
cgit v0.12


From 1dab1be81c2f295736f196a9d56ce4facb59fe64 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 8 Nov 2010 16:13:54 +0100
Subject: Fixed deployment for symbian/linux-armcc when using shadow builds.

RevBy:    Miikka Heikkinen
---
 mkspecs/features/symbian/application_icon.prf | 8 +++++---
 mkspecs/features/symbian/default_post.prf     | 8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index 39f10fb..6e1aa8e 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -15,10 +15,12 @@ contains(CONFIG, no_icon) {
         resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
         regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
     } else {
-        isEmpty(DESTDIR) {
-            resourceZDir = .
-        } else {
+        contains(DESTDIR, "/.*") {
             resourceZDir = $$DESTDIR
+        } else:isEmpty(DESTDIR) {
+            resourceZDir = $$OUT_PWD
+        } else {
+            resourceZDir = $$OUT_PWD/$$DESTDIR
         }
         regZDir = $$resourceZDir
     }
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index b62bf98..d9ff03d 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -9,7 +9,13 @@ contains(TEMPLATE, ".*app") {
         QMAKE_LIBS += $$QMAKE_LIBS_NO_QT_ENTRY
     }
 
-    default_bin_deployment.sources += $$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+    contains(DESTDIR, "/.*") {
+        default_bin_deployment.sources += $$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+    } else:isEmpty(DESTDIR) {
+        default_bin_deployment.sources += $$OUT_PWD/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+    } else {
+        default_bin_deployment.sources += $$OUT_PWD/$$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+    }
     default_bin_deployment.path += /sys/bin
 
     load(application_icon.prf)
-- 
cgit v0.12


From a98b9daa4cd1341ee0ce6d2cf859666db9ebda59 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Mon, 8 Nov 2010 17:23:27 +0100
Subject: QNAM: Do not need QNetworkSession in AlwaysCache load mode

Move the creation code to the top of QNAM::createRequest()
to avoid setting up a QNetworkSession when it is not needed.

Reviewed-by: ogoffart
---
 src/network/access/qnetworkaccessbackend.cpp | 12 ------------
 src/network/access/qnetworkaccessmanager.cpp | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index 0a0987a..05eb6cb 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -88,18 +88,6 @@ QNetworkAccessBackendFactory::~QNetworkAccessBackendFactory()
 QNetworkAccessBackend *QNetworkAccessManagerPrivate::findBackend(QNetworkAccessManager::Operation op,
                                                                  const QNetworkRequest &request)
 {
-    QNetworkRequest::CacheLoadControl mode =
-        static_cast<QNetworkRequest::CacheLoadControl>(
-            request.attribute(QNetworkRequest::CacheLoadControlAttribute,
-                              QNetworkRequest::PreferNetwork).toInt());
-    if (mode == QNetworkRequest::AlwaysCache
-        && (op == QNetworkAccessManager::GetOperation
-        || op == QNetworkAccessManager::HeadOperation)) {
-        QNetworkAccessBackend *backend = new QNetworkAccessCacheBackend;
-        backend->manager = this;
-        return backend;
-    }
-
     if (!factoryDataShutdown) {
         QMutexLocker locker(&factoryData()->mutex);
         QNetworkAccessBackendFactoryData::ConstIterator it = factoryData()->constBegin(),
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index e5f4d5a..effd79e 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -54,6 +54,7 @@
 #include "qnetworkaccessfilebackend_p.h"
 #include "qnetworkaccessdatabackend_p.h"
 #include "qnetworkaccessdebugpipebackend_p.h"
+#include "qnetworkaccesscachebackend_p.h"
 #include "qfilenetworkreply_p.h"
 
 #include "QtCore/qbuffer.h"
@@ -970,6 +971,26 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
         return new QFileNetworkReply(this, req, op);
     }
 
+    // A request with QNetworkRequest::AlwaysCache does not need any bearer management
+    QNetworkRequest::CacheLoadControl mode =
+        static_cast<QNetworkRequest::CacheLoadControl>(
+            req.attribute(QNetworkRequest::CacheLoadControlAttribute,
+                              QNetworkRequest::PreferNetwork).toInt());
+    if (mode == QNetworkRequest::AlwaysCache
+        && (op == QNetworkAccessManager::GetOperation
+        || op == QNetworkAccessManager::HeadOperation)) {
+        // FIXME Implement a QNetworkReplyCacheImpl instead, see QTBUG-15106
+        QNetworkReplyImpl *reply = new QNetworkReplyImpl(this);
+        QNetworkReplyImplPrivate *priv = reply->d_func();
+        priv->manager = this;
+        priv->backend = new QNetworkAccessCacheBackend();
+        priv->backend->manager = this->d_func();
+        priv->backend->setParent(reply);
+        priv->backend->reply = priv;
+        priv->setup(op, req, outgoingData);
+        return reply;
+    }
+
 #ifndef QT_NO_BEARERMANAGEMENT
     // Return a disabled network reply if network access is disabled.
     // Except if the scheme is empty or file://.
-- 
cgit v0.12


From 285855b8fbbdc7ad428a0c66f6c4469d97e55769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 8 Nov 2010 17:33:49 +0100
Subject: Fixed text rendering bug in raster engine when opacity != 1.0.

If opacity is updated independently from the pen properties sometimes
the raster engine's fast_text flag would not be updated correctly,
causing it to use a rendering path which doesn't support alpha.

Reviewed-by: Robin Burchell
Reviewed-by: Andreas Kling
---
 src/gui/painting/qpaintengine_raster.cpp |  4 +++-
 tests/auto/qpainter/tst_qpainter.cpp     | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 161ced5..89202ac 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -875,9 +875,10 @@ void QRasterPaintEngine::updateState()
     if (s->dirty & DirtyTransform)
         updateMatrix(s->matrix);
 
-    if (s->dirty & (DirtyPen|DirtyCompositionMode)) {
+    if (s->dirty & (DirtyPen|DirtyCompositionMode|DirtyOpacity)) {
         const QPainter::CompositionMode mode = s->composition_mode;
         s->flags.fast_text = (s->penData.type == QSpanData::Solid)
+                       && s->intOpacity == 256
                        && (mode == QPainter::CompositionMode_Source
                            || (mode == QPainter::CompositionMode_SourceOver
                                && qAlpha(s->penData.solid.color) == 255));
@@ -901,6 +902,7 @@ void QRasterPaintEngine::opacityChanged()
     s->fillFlags |= DirtyOpacity;
     s->strokeFlags |= DirtyOpacity;
     s->pixmapFlags |= DirtyOpacity;
+    s->dirty |= DirtyOpacity;
     s->intOpacity = (int) (s->opacity * 256);
 }
 
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index ff9bf1c..83ff9a9 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -256,6 +256,7 @@ private slots:
     void drawPointScaled();
 
     void QTBUG14614_gradientCacheRaceCondition();
+    void drawTextOpacity();
 
 private:
     void fillData();
@@ -4576,6 +4577,30 @@ void tst_QPainter::QTBUG14614_gradientCacheRaceCondition()
         producers[i].wait();
 }
 
+void tst_QPainter::drawTextOpacity()
+{
+    QImage image(32, 32, QImage::Format_RGB32);
+    image.fill(0xffffffff);
+
+    QPainter p(&image);
+    p.setPen(QColor("#6F6F6F"));
+    p.setOpacity(0.5);
+    p.drawText(5, 30, QLatin1String("Qt"));
+    p.end();
+
+    QImage copy = image;
+    image.fill(0xffffffff);
+
+    p.begin(&image);
+    p.setPen(QColor("#6F6F6F"));
+    p.drawLine(-10, -10, -1, -1);
+    p.setOpacity(0.5);
+    p.drawText(5, 30, QLatin1String("Qt"));
+    p.end();
+
+    QCOMPARE(image, copy);
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"
-- 
cgit v0.12


From 38f7873d8f3104ede6f7e70392f2e1ba2970b508 Mon Sep 17 00:00:00 2001
From: Anders Bakken <agbakken@gmail.com>
Date: Mon, 8 Nov 2010 16:56:39 +0000
Subject: Fix some painting issues in QDirectFBPaintEngine

Inspired/rewrite of Denis Oliver Kropp's merge request
(http://qt.gitorious.org/qt/qt/merge_requests/874)

When blitting premultiplied source surfaces one has to set
DSBLIT_SRC_PREMULTIPLY.

This also reverts the erroneous 6acbf6dce98903310023284e27a65c19f9a829bc

Merge-request: 903
Reviewed-by: Donald Carr <donald.carr@nokia.com>
---
 .../gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index 4869eba..d5697e0 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -55,6 +55,7 @@
 #include <private/qpixmap_raster_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
 
+
 QT_BEGIN_NAMESPACE
 
 class SurfaceCache;
@@ -112,7 +113,7 @@ public:
     static inline int cacheCost(const QImage &img) { return img.width() * img.height() * img.depth() / 8; }
 #endif
 
-    void prepareForBlit(bool alpha);
+    void prepareForBlit(IDirectFBSurface *surface);
 
     IDirectFBSurface *surface;
 
@@ -616,7 +617,7 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image,
 #if !defined QT_NO_DIRECTFB_PREALLOCATED || defined QT_DIRECTFB_IMAGECACHE
     bool release;
     IDirectFBSurface *imgSurface = d->getSurface(image, &release);
-    d->prepareForBlit(QDirectFBScreen::hasAlphaChannel(imgSurface));
+    d->prepareForBlit(imgSurface);
     CLIPPED_PAINT(d->blit(r, imgSurface, sr));
     if (release) {
 #if (Q_DIRECTFB_VERSION >= 0x010000)
@@ -655,8 +656,8 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap,
             QRasterPaintEngine::drawImage(r, *img, sr);
         } else {
             QDirectFBPaintEnginePrivate::unlock(dfbData);
-            d->prepareForBlit(pixmap.hasAlphaChannel());
             IDirectFBSurface *s = dfbData->directFBSurface();
+            d->prepareForBlit(s);
             CLIPPED_PAINT(d->blit(r, s, sr));
         }
     }
@@ -978,7 +979,7 @@ void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode m
         break;
     case QPainter::CompositionMode_SourceOver:
         compositionModeStatus &= ~PorterDuff_AlwaysBlend;
-        surface->SetPorterDuff(surface, DSPD_NONE);
+        surface->SetPorterDuff(surface, DSPD_SRC_OVER);
         break;
     case QPainter::CompositionMode_DestinationOver:
         surface->SetPorterDuff(surface, DSPD_DST_OVER);
@@ -1031,13 +1032,18 @@ void QDirectFBPaintEnginePrivate::setRenderHints(QPainter::RenderHints hints)
     }
 }
 
-void QDirectFBPaintEnginePrivate::prepareForBlit(bool alpha)
+void QDirectFBPaintEnginePrivate::prepareForBlit(IDirectFBSurface *s)
 {
-    DFBSurfaceBlittingFlags blittingFlags = alpha ? DSBLIT_BLEND_ALPHACHANNEL : DSBLIT_NOFX;
+    DFBSurfaceBlittingFlags blittingFlags = DSBLIT_NOFX;
+    if (QDirectFBScreen::isPremultiplied(QDirectFBScreen::getImageFormat(s)))
+        blittingFlags |= DSBLIT_SRC_PREMULTIPLY;
+    if (QDirectFBScreen::hasAlphaChannel(s))
+        blittingFlags |= DSBLIT_BLEND_ALPHACHANNEL;
     if (opacity != 255) {
         blittingFlags |= DSBLIT_BLEND_COLORALPHA;
+        surface->SetColor(surface, 0xff, 0xff, 0xff, opacity);
     }
-    surface->SetColor(surface, 0xff, 0xff, 0xff, opacity);
+
     surface->SetBlittingFlags(surface, blittingFlags);
 }
 
@@ -1154,13 +1160,13 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
 
     QPointF offset = off;
     Q_ASSERT(transform.type() <= QTransform::TxScale);
-    prepareForBlit(pixmap.hasAlphaChannel());
     QPixmapData *data = pixmap.pixmapData();
     Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
     QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
+    IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
+    prepareForBlit(sourceSurface);
     QDirectFBPaintEnginePrivate::unlock(dfbData);
     const QSize pixmapSize = dfbData->size();
-    IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
     if (transform.isScaling()) {
         Q_ASSERT(supportsStretchBlit());
         Q_ASSERT(qMin(transform.m11(), transform.m22()) >= 0);
-- 
cgit v0.12


From 551a8648b93055afa92c2938af5cede7495fd7f5 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Mon, 8 Nov 2010 19:26:13 +0300
Subject: fix build on mingw

> data.cpp:2: error: 'ushort' does not name a type
> data.cpp:1133: error: 'ushort' does not name a type
and lot of
> data.cpp:1276: error: too many initializers for 'StringCollection'

when the issue with ushort is fixed (by including qglobal.h, for example)
a bunch of some new build errors occurs:
> data.cpp:4: error: 'stringCollectionData' was declared 'extern' and later 'static'
> data.h:54: error: previous declaration of 'stringCollectionData'
> data.cpp:1131: error: redefinition of 'struct StringCollection'
> data.h:48: error: previous definition of 'struct StringCollection'
> data.cpp:1136: error: invalid type in declaration before '=' token
> data.cpp:1136: error: conflicting declaration 'int stringCollection []'
> data.h:55: error: 'stringCollection' has a previous declaration as 'StringCollection stringCollection []
> data.cpp:1279: error: 'stringCollectionCount' was declared 'extern' and later 'static'
> data.h:56: error: previous declaration of 'stringCollectionCount'

Merge-request: 910
Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
---
 tests/benchmarks/corelib/tools/qstring/data.cpp        | 18 +++++++-----------
 tests/benchmarks/corelib/tools/qstring/data.h          |  7 ++++++-
 tests/benchmarks/corelib/tools/qstring/generatelist.pl |  5 ++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/benchmarks/corelib/tools/qstring/data.cpp b/tests/benchmarks/corelib/tools/qstring/data.cpp
index 6d1a069..a674336 100644
--- a/tests/benchmarks/corelib/tools/qstring/data.cpp
+++ b/tests/benchmarks/corelib/tools/qstring/data.cpp
@@ -1,5 +1,7 @@
+#include "data.h"
+
 // This is a generated file - DO NOT EDIT
-static const ushort stringCollectionData[] __attribute__((aligned(16))) = { 
+const ushort stringCollectionData[] __attribute__((aligned(16))) = {
     // #0
     65535,
          99, 111, 109, 112, 105, 108, 101, 114, 32, 118, 101, 114, 115, 105, 111, 110, 115, 47,
@@ -1123,15 +1125,9 @@ static const ushort stringCollectionData[] __attribute__((aligned(16))) = {
     65535,
          84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61,
     65535,65534,65533, // 5216
-
-
 };
-static struct StringCollection
-{
-    int len;
-    int offset1, offset2;
-    ushort align1, align2;
-} stringCollection[] = {
+
+const struct StringCollection stringCollection[] = {
     {18, 1, 29, 3666, 106},     // #0
     {18, 53, 77, 106, 1978},     // #1
     {20, 97, 125, 2850, 3210},     // #2
@@ -1274,8 +1270,8 @@ static struct StringCollection
     {12, 5153, 5169, 130, 2930},     // #139
     {12, 5185, 5201, 242, 2930},     // #140
 };
-static const int stringCollectionCount = 141;
-static const int stringCollectionMaxLen = 51;
+const int stringCollectionCount = 141;
+const int stringCollectionMaxLen = 51;
 // average comparison length: 12.0922
 // cache-line crosses: 6 (2.1%)
 // alignment histogram:
diff --git a/tests/benchmarks/corelib/tools/qstring/data.h b/tests/benchmarks/corelib/tools/qstring/data.h
index c7a7467..ce733fb 100644
--- a/tests/benchmarks/corelib/tools/qstring/data.h
+++ b/tests/benchmarks/corelib/tools/qstring/data.h
@@ -39,6 +39,9 @@
 **
 ****************************************************************************/
 
+#ifndef DATA_H
+#define DATA_H
+
 #include <qglobal.h>
 
 struct StringCollection
@@ -49,5 +52,7 @@ struct StringCollection
 };
 
 extern const ushort stringCollectionData[];
-extern StringCollection stringCollection[];
+extern const StringCollection stringCollection[];
 extern const int stringCollectionCount;
+
+#endif // DATA_H
diff --git a/tests/benchmarks/corelib/tools/qstring/generatelist.pl b/tests/benchmarks/corelib/tools/qstring/generatelist.pl
index d027adb..8c8eb20 100644
--- a/tests/benchmarks/corelib/tools/qstring/generatelist.pl
+++ b/tests/benchmarks/corelib/tools/qstring/generatelist.pl
@@ -160,11 +160,10 @@ while (1) {
     $totalsize += $len;
     $maxlen = $len if $len > $maxlen;
 }
-print "\n};\n";
+print "};\n";
 close IN;
 
-print "struct StringCollection stringCollection[] = {\n";
-
+print "const struct StringCollection stringCollection[] = {\n";
 for $i (0..$count-1) {
     print "    {",
         $data[$i]->{len}, ", ",
-- 
cgit v0.12


From e00af84cc9230df411981d2f3b9296b61d5d1c50 Mon Sep 17 00:00:00 2001
From: Anders Bakken <agbakken@gmail.com>
Date: Mon, 8 Nov 2010 14:12:25 -0800
Subject: DFB: Make sure QPixmap::hasAlpha is respected

An IDirectFBSurface can have an alpha channel for an opaque QPixmap.
This change will make sure we don't blend unless QPixmap::hasAlpha
returns true.

Merge-request: 913
Reviewed-by: Donald Carr <donald.carr@nokia.com>
---
 .../gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 34 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index d5697e0..c16a242 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -113,7 +113,11 @@ public:
     static inline int cacheCost(const QImage &img) { return img.width() * img.height() * img.depth() / 8; }
 #endif
 
-    void prepareForBlit(IDirectFBSurface *surface);
+    enum BlitFlag {
+        HasAlpha = 0x1,
+        Premultiplied = 0x2
+    };
+    void prepareForBlit(uint blitFlags);
 
     IDirectFBSurface *surface;
 
@@ -617,7 +621,12 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image,
 #if !defined QT_NO_DIRECTFB_PREALLOCATED || defined QT_DIRECTFB_IMAGECACHE
     bool release;
     IDirectFBSurface *imgSurface = d->getSurface(image, &release);
-    d->prepareForBlit(imgSurface);
+    uint blitFlags = 0;
+    if (image.hasAlphaChannel())
+        blitFlags |= QDirectFBPaintEnginePrivate::HasAlpha;
+    if (QDirectFBScreen::isPremultiplied(image.format()))
+        blitFlags |= QDirectFBPaintEnginePrivate::Premultiplied;
+    d->prepareForBlit(blitFlags);
     CLIPPED_PAINT(d->blit(r, imgSurface, sr));
     if (release) {
 #if (Q_DIRECTFB_VERSION >= 0x010000)
@@ -657,7 +666,13 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap,
         } else {
             QDirectFBPaintEnginePrivate::unlock(dfbData);
             IDirectFBSurface *s = dfbData->directFBSurface();
-            d->prepareForBlit(s);
+            uint blitFlags = 0;
+            if (pixmap.hasAlphaChannel())
+                blitFlags |= QDirectFBPaintEnginePrivate::HasAlpha;
+            if (QDirectFBScreen::isPremultiplied(dfbData->pixelFormat()))
+                blitFlags |= QDirectFBPaintEnginePrivate::Premultiplied;
+
+            d->prepareForBlit(blitFlags);
             CLIPPED_PAINT(d->blit(r, s, sr));
         }
     }
@@ -1032,12 +1047,12 @@ void QDirectFBPaintEnginePrivate::setRenderHints(QPainter::RenderHints hints)
     }
 }
 
-void QDirectFBPaintEnginePrivate::prepareForBlit(IDirectFBSurface *s)
+void QDirectFBPaintEnginePrivate::prepareForBlit(uint flags)
 {
     DFBSurfaceBlittingFlags blittingFlags = DSBLIT_NOFX;
-    if (QDirectFBScreen::isPremultiplied(QDirectFBScreen::getImageFormat(s)))
+    if (flags & Premultiplied)
         blittingFlags |= DSBLIT_SRC_PREMULTIPLY;
-    if (QDirectFBScreen::hasAlphaChannel(s))
+    if (flags & HasAlpha)
         blittingFlags |= DSBLIT_BLEND_ALPHACHANNEL;
     if (opacity != 255) {
         blittingFlags |= DSBLIT_BLEND_COLORALPHA;
@@ -1164,7 +1179,12 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
     Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
     QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
     IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
-    prepareForBlit(sourceSurface);
+    uint blitFlags = 0;
+    if (dfbData->hasAlphaChannel())
+        blitFlags |= HasAlpha;
+    if (QDirectFBScreen::isPremultiplied(dfbData->pixelFormat()))
+        blitFlags |= Premultiplied;
+    prepareForBlit(blitFlags);
     QDirectFBPaintEnginePrivate::unlock(dfbData);
     const QSize pixmapSize = dfbData->size();
     if (transform.isScaling()) {
-- 
cgit v0.12


From 82c6a18bf017bb705ac5950d3ade86a492d64a0e Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Tue, 9 Nov 2010 09:00:13 +1000
Subject: Fix QtQuick import.

---
 tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml b/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml
index 5eccdda..7f9ddbf 100644
--- a/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     width: 1024
-- 
cgit v0.12


From 6330e20da815890a5282dbe7ce9c2363e4b4c3b4 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Tue, 9 Nov 2010 09:16:29 +1000
Subject: Fix QML ecmascript autotest.

---
 .../qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
index 0a933e8..090c948 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
@@ -1,13 +1,14 @@
 import Qt.test 1.0
 
 MyQmlObject {
+    id: obj
     property alias c1: myConstants.c1
     property alias c2: myConstants.c2
     property int c3: 0
 
     objectProperty: ConstantsOverrideBindings { 
         id: myConstants 
-        c2: c3
+        c2: obj.c3
     }
 
 }
-- 
cgit v0.12


From a55c13c52822f337cc4ad708881fd54d3a1bbb1d Mon Sep 17 00:00:00 2001
From: juhvu <qt-info@nokia.com>
Date: Tue, 9 Nov 2010 10:45:18 +1000
Subject: Removed implicity QtGui linking from icd.pro as it is not needed.

Task-number: QTBUG-15059
---
 src/plugins/bearer/icd/icd.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro
index 464cc1c..6700cda 100644
--- a/src/plugins/bearer/icd/icd.pro
+++ b/src/plugins/bearer/icd/icd.pro
@@ -1,7 +1,7 @@
 TARGET = qicdbearer
 include(../../qpluginbase.pri)
 
-QT += network dbus
+QT = core network dbus
 
 QMAKE_CXXFLAGS *= $$QT_CFLAGS_DBUS $$QT_CFLAGS_CONNSETTINGS
 LIBS += $$QT_LIBS_CONNSETTINGS
-- 
cgit v0.12


From bb8f085611f4cb91b7bde7220d407948edcc572c Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Tue, 9 Nov 2010 11:19:01 +1000
Subject: get rid of dependency on QtGui

Task-number: QTBUG-15059
Reviewed-by: trustme
---
 src/plugins/bearer/corewlan/corewlan.pro       |  2 +-
 src/plugins/bearer/corewlan/qcorewlanengine.mm | 85 +++++++++++++++-----------
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index 922a501..9cb3955 100644
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -1,7 +1,7 @@
 TARGET = qcorewlanbearer
 include(../../qpluginbase.pri)
 
-QT = core gui network
+QT = core network
 LIBS += -framework Foundation -framework SystemConfiguration
 
 contains(QT_CONFIG, corewlan) {
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 844e38b..9946b17 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -64,12 +64,17 @@
 #include <Foundation/NSLock.h>
 
 #include <SystemConfiguration/SCNetworkConfiguration.h>
-#include <private/qt_cocoa_helpers_mac_p.h>
 #include "private/qcore_mac_p.h"
 
 #include <net/if.h>
 #include <ifaddrs.h>
 
+inline QString qt_NSStringToQString(const NSString *nsstr)
+{ return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
+
+inline NSString *qt_QStringToNSString(const QString &qstr)
+{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
+
 
 @interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject
 {
@@ -93,11 +98,12 @@
 - (id) init
 {
     [locker lock];
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
     notificationCenter = [NSNotificationCenter defaultCenter];
     currentInterface = [CWInterface interfaceWithName:nil];
     [notificationCenter addObserver:self selector:@selector(notificationHandler:) name:kCWPowerDidChangeNotification object:nil];
     [locker unlock];
+    [autoreleasepool release];
     return self;
 }
 
@@ -161,10 +167,10 @@ void QScanThread::quit()
 
 void QScanThread::run()
 {
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
     QStringList found;
     mutex.lock();
-    CWInterface *currentInterface = [CWInterface interfaceWithName:qt_mac_QStringToNSString(interfaceName)];
+    CWInterface *currentInterface = [CWInterface interfaceWithName:qt_QStringToNSString(interfaceName)];
     mutex.unlock();
 
     if([currentInterface power]) {
@@ -182,14 +188,14 @@ void QScanThread::run()
             for(uint row=0; row < [apArray count]; row++ ) {
                 apNetwork = [apArray objectAtIndex:row];
 
-                const QString networkSsid = qt_mac_NSStringToQString([apNetwork ssid]);
+                const QString networkSsid = qt_NSStringToQString([apNetwork ssid]);
                 const QString id = QString::number(qHash(QLatin1String("corewlan:") + networkSsid));
                 found.append(id);
 
                 QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Undefined;
                 bool known = isKnownSsid(networkSsid);
                 if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) {
-                    if( networkSsid == qt_mac_NSStringToQString( [currentInterface ssid])) {
+                    if( networkSsid == qt_NSStringToQString( [currentInterface ssid])) {
                         state = QNetworkConfiguration::Active;
                     }
                 }
@@ -232,7 +238,7 @@ void QScanThread::run()
             }
 
             if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) {
-                if( networkSsid == qt_mac_NSStringToQString([currentInterface ssid])) {
+                if( networkSsid == qt_NSStringToQString([currentInterface ssid])) {
                     state = QNetworkConfiguration::Active;
                 }
             }
@@ -251,6 +257,7 @@ void QScanThread::run()
         }
     }
     emit networksChanged();
+    [autoreleasepool release];
 }
 
 QStringList QScanThread::foundNetwork(const QString &id, const QString &name, const QNetworkConfiguration::StateFlags state, const QString &interfaceName, const QNetworkConfiguration::Purpose purpose)
@@ -290,7 +297,7 @@ void QScanThread::getUserConfigurations()
 {
     QMutexLocker locker(&mutex);
 
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
     userProfiles.clear();
 
     NSArray *wifiInterfaces = [CWInterface supportedInterfaces];
@@ -310,10 +317,10 @@ void QScanThread::getUserConfigurations()
 
             NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"];
             for(NSString *ssidkey in thisSsidarray) {
-                QString thisSsid = qt_mac_NSStringToQString(ssidkey);
+                QString thisSsid = qt_NSStringToQString(ssidkey);
                 if(!userProfiles.contains(thisSsid)) {
                     QMap <QString,QString> map;
-                    map.insert(thisSsid, qt_mac_NSStringToQString(nsInterfaceName));
+                    map.insert(thisSsid, qt_NSStringToQString(nsInterfaceName));
                     userProfiles.insert(thisSsid, map);
                 }
             }
@@ -322,7 +329,7 @@ void QScanThread::getUserConfigurations()
 
         // 802.1X user profiles
         QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist";
-        NSDictionary* eapDict = [[[NSDictionary alloc] initWithContentsOfFile:qt_mac_QStringToNSString(userProfilePath)] autorelease];
+        NSDictionary* eapDict = [[[NSDictionary alloc] initWithContentsOfFile:qt_QStringToNSString(userProfilePath)] autorelease];
         if(eapDict != nil) {
             NSString *profileStr= @"Profiles";
             NSString *nameStr = @"UserDefinedName";
@@ -341,15 +348,15 @@ void QScanThread::getUserConfigurations()
                         QString ssid;
                         for(int i = 0; i < dictSize; i++) {
                             if([nameStr isEqualToString:keys[i]]) {
-                                networkName = qt_mac_NSStringToQString(objects[i]);
+                                networkName = qt_NSStringToQString(objects[i]);
                             }
                             if([networkSsidStr isEqualToString:keys[i]]) {
-                                ssid = qt_mac_NSStringToQString(objects[i]);
+                                ssid = qt_NSStringToQString(objects[i]);
                             }
                             if(!userProfiles.contains(networkName)
                                 && !ssid.isEmpty()) {
                                 QMap<QString,QString> map;
-                                map.insert(ssid, qt_mac_NSStringToQString(nsInterfaceName));
+                                map.insert(ssid, qt_NSStringToQString(nsInterfaceName));
                                 userProfiles.insert(networkName, map);
                             }
                         }
@@ -358,6 +365,7 @@ void QScanThread::getUserConfigurations()
             }
         }
     }
+    [autoreleasepool release];
 }
 
 QString QScanThread::getSsidFromNetworkName(const QString &name)
@@ -434,7 +442,7 @@ QCoreWlanEngine::~QCoreWlanEngine()
 void QCoreWlanEngine::initialize()
 {
     QMutexLocker locker(&mutex);
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
 
     if([[CWInterface supportedInterfaces] count] > 0 && !listener) {
         listener = [[QT_MANGLE_NAMESPACE(QNSListener) alloc] init];
@@ -446,6 +454,7 @@ void QCoreWlanEngine::initialize()
     storeSession = NULL;
 
     startNetworkChangeLoop();
+    [autoreleasepool release];
 }
 
 
@@ -466,11 +475,11 @@ bool QCoreWlanEngine::hasIdentifier(const QString &id)
 void QCoreWlanEngine::connectToId(const QString &id)
 {
     QMutexLocker locker(&mutex);
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
     QString interfaceString = getInterfaceFromId(id);
 
     CWInterface *wifiInterface =
-        [CWInterface interfaceWithName: qt_mac_QStringToNSString(interfaceString)];
+        [CWInterface interfaceWithName: qt_QStringToNSString(interfaceString)];
 
     if ([wifiInterface power]) {
         NSError *err = nil;
@@ -488,9 +497,9 @@ void QCoreWlanEngine::connectToId(const QString &id)
             NSArray *array = [CW8021XProfile allUser8021XProfiles];
 
             for (NSUInteger i = 0; i < [array count]; ++i) {
-                const QString networkNameHashCheck = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString([[array objectAtIndex:i] userDefinedName])));
+                const QString networkNameHashCheck = QString::number(qHash(QLatin1String("corewlan:") + qt_NSStringToQString([[array objectAtIndex:i] userDefinedName])));
 
-                const QString ssidHash = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString([[array objectAtIndex:i] ssid])));
+                const QString ssidHash = QString::number(qHash(QLatin1String("corewlan:") + qt_NSStringToQString([[array objectAtIndex:i] ssid])));
 
                 if (id == networkNameHashCheck || id == ssidHash) {
                     const QString thisName = scanThread->getSsidFromNetworkName(id);
@@ -523,7 +532,7 @@ void QCoreWlanEngine::connectToId(const QString &id)
                                         [NSNumber numberWithBool:YES], kCWScanKeyMerge,
                                         [NSNumber numberWithInt:kCWScanTypeFast], kCWScanKeyScanType,
                                         [NSNumber numberWithInteger:100], kCWScanKeyRestTime,
-                                        qt_mac_QStringToNSString(wantedSsid), kCWScanKeySSID,
+                                        qt_QStringToNSString(wantedSsid), kCWScanKeySSID,
                                         nil];
 
         NSArray *scanArray = [wifiInterface scanForNetworksWithParameters:scanParameters error:&err];
@@ -532,7 +541,7 @@ void QCoreWlanEngine::connectToId(const QString &id)
             for(uint row=0; row < [scanArray count]; row++ ) {
                 CWNetwork *apNetwork = [scanArray objectAtIndex:row];
 
-                if(wantedSsid == qt_mac_NSStringToQString([apNetwork ssid])) {
+                if(wantedSsid == qt_NSStringToQString([apNetwork ssid])) {
 
                     if(!using8021X) {
                         SecKeychainAttribute attributes[3];
@@ -599,18 +608,19 @@ void QCoreWlanEngine::connectToId(const QString &id)
                             return;
                         }
                     } else {
-                        qDebug() <<"associate ERROR"<<  qt_mac_NSStringToQString([err localizedDescription ]);
+                        qDebug() <<"associate ERROR"<<  qt_NSStringToQString([err localizedDescription ]);
                     }
                 }
             } //end scan network
         } else {
-            qDebug() <<"scan ERROR"<<  qt_mac_NSStringToQString([err localizedDescription ]);
+            qDebug() <<"scan ERROR"<<  qt_NSStringToQString([err localizedDescription ]);
         }
         emit connectionError(id, InterfaceLookupError);
     }
 
     locker.unlock();
     emit connectionError(id, InterfaceLookupError);
+    [autoreleasepool release];
 }
 
 void QCoreWlanEngine::disconnectFromId(const QString &id)
@@ -618,10 +628,10 @@ void QCoreWlanEngine::disconnectFromId(const QString &id)
     QMutexLocker locker(&mutex);
 
     QString interfaceString = getInterfaceFromId(id);
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
 
     CWInterface *wifiInterface =
-        [CWInterface interfaceWithName: qt_mac_QStringToNSString(interfaceString)];
+        [CWInterface interfaceWithName: qt_QStringToNSString(interfaceString)];
 
     [wifiInterface disassociate];
     if ([[wifiInterface interfaceState]intValue] != kCWInterfaceStateInactive) {
@@ -629,6 +639,7 @@ void QCoreWlanEngine::disconnectFromId(const QString &id)
         emit connectionError(id, DisconnectionError);
         locker.relock();
     }
+    [autoreleasepool release];
 }
 
 void QCoreWlanEngine::requestUpdate()
@@ -641,27 +652,30 @@ void QCoreWlanEngine::doRequestUpdate()
 {
     QMutexLocker locker(&mutex);
 
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
 
     NSArray *wifiInterfaces = [CWInterface supportedInterfaces];
     for (uint row = 0; row < [wifiInterfaces count]; ++row) {
-            scanThread->interfaceName = qt_mac_NSStringToQString([wifiInterfaces objectAtIndex:row]);
+            scanThread->interfaceName = qt_NSStringToQString([wifiInterfaces objectAtIndex:row]);
             scanThread->start();
     }
     locker.unlock();
+    [autoreleasepool release];
 }
 
 bool QCoreWlanEngine::isWifiReady(const QString &wifiDeviceName)
 {
     QMutexLocker locker(&mutex);
-
+    bool haswifi = false;
     if(hasWifi) {
-        QMacCocoaAutoReleasePool pool;
-        CWInterface *defaultInterface = [CWInterface interfaceWithName: qt_mac_QStringToNSString(wifiDeviceName)];
-        if([defaultInterface power])
-            return true;
+        NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
+        CWInterface *defaultInterface = [CWInterface interfaceWithName: qt_QStringToNSString(wifiDeviceName)];
+        if([defaultInterface power]) {
+            haswifi = true;
+        }
+        [autoreleasepool release];
     }
-    return false;
+    return haswifi;
 }
 
 
@@ -853,7 +867,7 @@ quint64 QCoreWlanEngine::bytesReceived(const QString &id)
 quint64 QCoreWlanEngine::startTime(const QString &id)
 {
     QMutexLocker locker(&mutex);
-    QMacCocoaAutoReleasePool pool;
+    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
     quint64 timestamp = 0;
 
     NSString *filePath = @"/Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist";
@@ -884,7 +898,7 @@ quint64 QCoreWlanEngine::startTime(const QString &id)
                 bool ok = false;
                 for(int i = 0; i < dictSize; i++) {
                     if([ssidStr isEqualToString:keys[i]]) {
-                        const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i])));
+                        const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_NSStringToQString(objects[i])));
                         if(ident == id) {
                             ok = true;
                         }
@@ -900,6 +914,7 @@ quint64 QCoreWlanEngine::startTime(const QString &id)
             }
         }
     }
+    [autoreleasepool release];
     return timestamp;
 }
 
-- 
cgit v0.12


From 9b24932eba2b204852c4f2b35e05bd7d9d47ccea Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 9 Nov 2010 12:40:48 +1000
Subject: Fix Rectangle painting at small sizes. We require a minimum size of
 5x5 for the border image caching to work.

Task-number: QTBUG-15135
Reviewed-by: Michael Brasser
---
 src/declarative/graphicsitems/qdeclarativerectangle.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 1ffd3bd..fc3954f 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -477,7 +477,8 @@ void QDeclarativeRectangle::drawRect(QPainter &p)
 {
     Q_D(QDeclarativeRectangle);
     if ((d->gradient && d->gradient->gradient())
-        || d->radius > width()/2 || d->radius > height()/2) {
+        || d->radius > width()/2 || d->radius > height()/2
+        || width() < 3 || height() < 3) {
         // XXX This path is still slower than the image path
         // Image path won't work for gradients or invalid radius though
         bool oldAA = p.testRenderHint(QPainter::Antialiasing);
-- 
cgit v0.12


From 736a73ac2d05bcc811ee8eaeb6aa7a026d6b018a Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 9 Nov 2010 14:33:16 +1000
Subject: Fix Text::elide docs.

Reviewed-by: Michael Brasser
---
 src/declarative/graphicsitems/qdeclarativetext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 615c619..82c444e 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -1063,7 +1063,7 @@ void QDeclarativeText::setTextFormat(TextFormat format)
     Set this property to elide parts of the text fit to the Text item's width.
     The text will only elide if an explicit width has been set.
 
-    This property cannot be used with wrapping enabled or with rich text.
+    This property cannot be used with multi-line text or with rich text.
 
     Eliding can be:
     \list
-- 
cgit v0.12


From 58f8196fceaf375d8a5736e0505330be24bcebfa Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 9 Nov 2010 17:48:29 +1000
Subject: doc

---
 examples/declarative/cppextensions/plugins/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/declarative/cppextensions/plugins/README b/examples/declarative/cppextensions/plugins/README
index fe519f8..95e0eea 100644
--- a/examples/declarative/cppextensions/plugins/README
+++ b/examples/declarative/cppextensions/plugins/README
@@ -5,5 +5,5 @@ by a C++ plugin (providing the "Time" type), and by QML files (providing the
 To run:
 
   make install
-  qml -I . plugins.qml
+  qmlviewer -I . plugins.qml
 
-- 
cgit v0.12


From 8aee86b8ce4700f48b8a30752cb2293860957bb7 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Tue, 9 Nov 2010 09:20:36 +0100
Subject: Fix GC-related crash in QScriptValue::setData()

Yet another missing API shim.
When converting the QScriptValue to JSC, a JSCell may be allocated,
which can cause the GC to trigger.
If an identifier (JSC::Identifier) is then garbage collected, the
destructor will try to remove itself from the currentIdentifierTable().
Because the API shim was missing, the identifier table was 0.
It's difficult to create a bulletproof test for this case, but the
attached test is a best effort (it crashes on my machine without the
fix).

Task-number: QTBUG-15144
Reviewed-by: Jedrzej Nowacki
---
 src/script/api/qscriptvalue.cpp              |  1 +
 tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 13 +++++++++++++
 tests/auto/qscriptvalue/tst_qscriptvalue.h   |  1 +
 3 files changed, 15 insertions(+)

diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index f494106..e40458b 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -2036,6 +2036,7 @@ void QScriptValue::setData(const QScriptValue &data)
     Q_D(QScriptValue);
     if (!d || !d->isObject())
         return;
+    QScript::APIShim shim(d->engine);
     JSC::JSValue other = d->engine->scriptValueToJSCValue(data);
     if (d->jscValue.inherits(&QScriptObject::info)) {
         QScriptObject *scriptObject = static_cast<QScriptObject*>(JSC::asObject(d->jscValue));
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 639df36..53e2699 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -2253,6 +2253,19 @@ void tst_QScriptValue::getSetData()
     QVERIFY(!object.data().isValid());
 }
 
+void tst_QScriptValue::setData_QTBUG15144()
+{
+    QScriptEngine eng;
+    QScriptValue obj = eng.newObject();
+    for (int i = 0; i < 10000; ++i) {
+        // Create an object with property 'fooN' on it, and immediately kill
+        // the reference to the object so it and the property name become garbage.
+        eng.evaluate(QString::fromLatin1("o = {}; o.foo%0 = 10; o = null;").arg(i));
+        // Setting the data will cause a JS string to be allocated, which could
+        // trigger a GC. This should not cause a crash.
+        obj.setData("foodfight");
+    }
+}
 class TestScriptClass : public QScriptClass
 {
 public:
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h
index 462749a..aa6bc6c 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h
@@ -216,6 +216,7 @@ private slots:
     void getSetProperty();
     void arrayElementGetterSetter();
     void getSetData();
+    void setData_QTBUG15144();
     void getSetScriptClass();
     void call();
     void construct();
-- 
cgit v0.12


From 55911952c7b195e36614372d084c473202ab1c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Tue, 9 Nov 2010 10:53:43 +0100
Subject: Fixed tst_qwidget::testContentsPropagation auto-test failure.

Some auto-tests render into a QPixmap and check the result against
QPixmap::grabWidget(). Change acc1a2bd5520369c made grabWidget() render
into a QImage to be able to preserve background transparency. Instead,
to avoid breaking various auto-tests, we can use a QPixmap and fill it
with transparent if the widget's isOpaque flag is not set.

Task-number: QTBUG-14945
Reviewed-by: Kim
---
 src/gui/image/qpixmap.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 290c0f0..c5d9a7e 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1101,11 +1101,13 @@ QPixmap QPixmap::grabWidget(QWidget * widget, const QRect &rect)
     if (!r.intersects(widget->rect()))
         return QPixmap();
 
-    QImage res(r.size(), QImage::Format_ARGB32_Premultiplied);
-    res.fill(0);
+    QPixmap res(r.size());
+    if (!qt_widget_private(widget)->isOpaque)
+        res.fill(Qt::transparent);
+
     widget->d_func()->render(&res, QPoint(), r, QWidget::DrawWindowBackground
                              | QWidget::DrawChildren | QWidget::IgnoreMask, true);
-    return QPixmap::fromImage(res);
+    return res;
 }
 
 /*!
-- 
cgit v0.12


From 0a56b91991a4cce23634173eda4c5bafcd53230b Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 9 Nov 2010 12:39:14 +0100
Subject: Make operator QRectF const
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows us to convert a QGLRect to a QRectF also in const functions.
Function is inline and private, no ABI break.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
index 46029b9..b8c1018 100644
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
+++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
@@ -93,7 +93,7 @@ struct QGLRect
     GLfloat right;
     GLfloat bottom;
 
-    operator QRectF() {return QRectF(left, top, right-left, bottom-top);}
+    operator QRectF() const {return QRectF(left, top, right-left, bottom-top);}
 };
 
 class QGL2PEXVertexArray
-- 
cgit v0.12


From 3df77bed668febf207591b88bebd73e4a17c8f23 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Tue, 9 Nov 2010 12:59:11 +0100
Subject: Doc: Fixing typo

---
 src/multimedia/audio/qaudiooutput_win32_p.cpp              | 2 +-
 src/opengl/gl2paintengineex/qglengineshadermanager_p.h     | 2 +-
 src/opengl/qgl_egl.cpp                                     | 2 +-
 src/opengl/qgl_x11egl.cpp                                  | 2 +-
 src/opengl/qpixmapdata_x11gl_egl.cpp                       | 4 ++--
 src/plugins/bearer/symbian/qnetworksession_impl.cpp        | 2 +-
 src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 4 ++--
 src/qt3support/canvas/q3canvas.cpp                         | 2 +-
 src/qt3support/text/q3richtext.cpp                         | 2 +-
 src/scripttools/debugging/qscriptdebuggeragent.cpp         | 6 +++---
 src/xmlpatterns/data/qabstractfloat.cpp                    | 2 +-
 src/xmlpatterns/data/qatomicvalue.cpp                      | 2 +-
 src/xmlpatterns/data/qschematime_p.h                       | 2 +-
 src/xmlpatterns/schema/qxsdschemaparser.cpp                | 8 ++++----
 src/xmlpatterns/schema/qxsdschemaparser_setup.cpp          | 2 +-
 src/xmlpatterns/schema/qxsdstatemachine_p.h                | 4 ++--
 src/xmlpatterns/type/qtypechecker.cpp                      | 2 +-
 tools/linguist/linguist/mainwindow.cpp                     | 4 ++--
 tools/linguist/linguist/printout.cpp                       | 2 +-
 tools/qdoc3/tokenizer.h                                    | 2 +-
 20 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index 1f304e3..1b054e5 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -586,7 +586,7 @@ bool QAudioOutputPrivate::deviceReady()
                 }
             }
             if ( out < l) {
-                // Didnt write all data
+                // Didn't write all data
                 audioSource->seek(audioSource->pos()-(l-out));
             }
 	    if(startup)
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index 92cf108..536b44a 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -72,7 +72,7 @@
     The position shaders for brushes look scary. This is because many of the
     calculations which logically belong in the fragment shader have been moved
     into the vertex shader to improve performance. This is why the position
-    calculation is in a seperate shader. Not only does it calculate the
+    calculation is in a separate shader. Not only does it calculate the
     position, but it also calculates some data to be passed to the fragment
     shader as a varying. It is optimal to move as much of the calculation as
     possible into the vertex shader as this is executed less often.
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index 27f7ad9..8902099 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -88,7 +88,7 @@ void qt_eglproperties_set_glformat(QEglProperties& eglProperties, const QGLForma
     // put in the list before 32-bit configs. So, to make sure 16-bit is preffered over 32-bit,
     // we must set the red/green/blue sizes to zero. This has an unfortunate consequence that
     // if the application sets the red/green/blue size to 5/6/5 on the QGLFormat, they will
-    // probably get a 32-bit config, even when there's an RGB565 config avaliable. Oh well.
+    // probably get a 32-bit config, even when there's an RGB565 config available. Oh well.
 
     // Now normalize the values so -1 becomes 0
     redSize   = redSize   > 0 ? redSize   : 0;
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 9d28de0..d33ea56 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -377,7 +377,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pixmap, cons
         checkedForEglImageTFP = true;
 
         // We need to be able to create an EGLImage from a native pixmap, which was split
-        // into a seperate EGL extension, EGL_KHR_image_pixmap. It is possible to have
+        // into a separate EGL extension, EGL_KHR_image_pixmap. It is possible to have
         // eglCreateImageKHR & eglDestroyImageKHR without support for pixmaps, so we must
         // check we have the EGLImage from pixmap functionality.
         if (QEgl::hasExtension("EGL_KHR_image") || QEgl::hasExtension("EGL_KHR_image_pixmap")) {
diff --git a/src/opengl/qpixmapdata_x11gl_egl.cpp b/src/opengl/qpixmapdata_x11gl_egl.cpp
index 2c11a0b..5cbc836 100644
--- a/src/opengl/qpixmapdata_x11gl_egl.cpp
+++ b/src/opengl/qpixmapdata_x11gl_egl.cpp
@@ -93,7 +93,7 @@ public:
             if (rgbConfig == argbConfig)
                 argbContext = rgbContext;
 
-            // Otherwise, create a seperate context to be used for ARGB pixmaps:
+            // Otherwise, create a separate context to be used for ARGB pixmaps:
             if (!argbContext) {
                 argbContext = new QEglContext;
                 argbContext->setConfig(argbConfig);
@@ -314,7 +314,7 @@ QPaintEngine* QX11GLPixmapData::paintEngine() const
         Q_ASSERT(ctx->d_func()->eglContext == 0);
         ctx->d_func()->eglContext = hasAlphaChannel() ? sharedContexts()->argbContext : sharedContexts()->rgbContext;
 
-        // While we use a seperate QGLContext for each pixmap, the underlying QEglContext is
+        // While we use a separate QGLContext for each pixmap, the underlying QEglContext is
         // the same. So we must use a "fake" QGLContext and fool the texture cache into thinking
         // each pixmap's QGLContext is sharing with this central one. The only place this is
         // going to fail is where we the underlying EGL RGB and ARGB contexts aren't sharing.
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 85723ce..c5a39e1 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -1078,7 +1078,7 @@ void QNetworkSessionPrivateImpl::RunL()
             TInt error = KErrNone;
             QNetworkConfiguration newActiveConfig = activeConfiguration();
             if (!newActiveConfig.isValid()) {
-                // RConnection startup was successfull but no configuration
+                // RConnection startup was successful but no configuration
                 // was found. That indicates that user has chosen to create a
                 // new WLAN configuration (from scan results), but that new
                 // configuration does not have access to Internet (Internet
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index a633e2f..073d722 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -83,7 +83,7 @@ QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const
 QPixmapData *QMeeGoGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
 {
     // Long story short: without this it's possible to hit an 
-    // unitialized paintDevice due to a Qt bug too complex to even 
+    // uninitialized paintDevice due to a Qt bug too complex to even 
     // explain here... not to mention fix without going crazy. 
     // MDK
     QGLShareContextScope ctx(qt_gl_share_widget()->context());
@@ -301,4 +301,4 @@ bool qt_meego_live_texture_release(QPixmap *pixmap, QImage *image)
 Qt::HANDLE qt_meego_live_texture_get_handle(QPixmap *pixmap)
 {
     return QMeeGoGraphicsSystem::getLiveTextureHandle(pixmap);
-}
\ No newline at end of file
+}
diff --git a/src/qt3support/canvas/q3canvas.cpp b/src/qt3support/canvas/q3canvas.cpp
index 959c435..1b4706d 100644
--- a/src/qt3support/canvas/q3canvas.cpp
+++ b/src/qt3support/canvas/q3canvas.cpp
@@ -1030,7 +1030,7 @@ void Q3Canvas::setUpdatePeriod(int ms)
 
     The advance takes place in two phases. In phase 0, the
     Q3CanvasItem::advance() function of each Q3CanvasItem::animated()
-    canvas item is called with paramater 0. Then all these canvas
+    canvas item is called with parameter 0. Then all these canvas
     items are called again, with parameter 1. In phase 0, the canvas
     items should not change position, merely examine other items on
     the canvas for which special processing is required, such as
diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp
index d82d0f0..e24eeb5 100644
--- a/src/qt3support/text/q3richtext.cpp
+++ b/src/qt3support/text/q3richtext.cpp
@@ -2914,7 +2914,7 @@ QString Q3TextDocument::selectedText(int id, bool asRichText) const
         }
     }
     // ### workaround for plain text export until we get proper
-    // mime types: turn unicode line seperators into the more
+    // mime types: turn unicode line separators into the more
     // widely understood \n. Makes copy and pasting code snipplets
     // from within Assistent possible
     QChar* uc = (QChar*) s.unicode();
diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp
index 551f6c3..9362639 100644
--- a/src/scripttools/debugging/qscriptdebuggeragent.cpp
+++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp
@@ -116,7 +116,7 @@ QScriptDebuggerAgent::~QScriptDebuggerAgent()
 /*!
   Instructs the agent to perform a "step into" operation.  This
   function returns immediately. The agent will report step completion
-  at a later time, i.e. when script statements are evaluted.
+  at a later time, i.e. when script statements are evaluated.
 */
 void QScriptDebuggerAgent::enterStepIntoMode(int count)
 {
@@ -129,7 +129,7 @@ void QScriptDebuggerAgent::enterStepIntoMode(int count)
 /*!
   Instructs the agent to perform a "step over" operation.  This
   function returns immediately. The agent will report step completion
-  at a later time, i.e. when script statements are evaluted.
+  at a later time, i.e. when script statements are evaluated.
 */
 void QScriptDebuggerAgent::enterStepOverMode(int count)
 {
@@ -146,7 +146,7 @@ void QScriptDebuggerAgent::enterStepOverMode(int count)
 /*!
   Instructs the agent to perform a "step out" operation.  This
   function returns immediately. The agent will report step completion
-  at a later time, i.e. when script statements are evaluted.
+  at a later time, i.e. when script statements are evaluated.
 */
 void QScriptDebuggerAgent::enterStepOutMode()
 {
diff --git a/src/xmlpatterns/data/qabstractfloat.cpp b/src/xmlpatterns/data/qabstractfloat.cpp
index d3384fe..9f0e4e0 100644
--- a/src/xmlpatterns/data/qabstractfloat.cpp
+++ b/src/xmlpatterns/data/qabstractfloat.cpp
@@ -118,7 +118,7 @@ bool AbstractFloat<isDouble>::isEqual(const xsDouble a, const xsDouble b)
         return qIsInf(a) && internalSignbit(a) == internalSignbit(b);
     else
     {
-        /* Preferrably, we would use std::numeric_limits<xsDouble>::espilon(), but
+        /* Preferably, we would use std::numeric_limits<xsDouble>::espilon(), but
          * we cannot since we cannot depend on the STL. The small xs:double value below,
          * was extracted by printing the std::numeric_limits<xsDouble>::epsilon() using
          * gdb. */
diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp
index c4f3578..ecc78bf 100644
--- a/src/xmlpatterns/data/qatomicvalue.cpp
+++ b/src/xmlpatterns/data/qatomicvalue.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 /**
  * @file
- * @short Contains the implementation for AtomicValue. The defintion is in qitem_p.h.
+ * @short Contains the implementation for AtomicValue. The definition is in qitem_p.h.
  */
 
 using namespace QPatternist;
diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h
index bd63714..bff065b 100644
--- a/src/xmlpatterns/data/qschematime_p.h
+++ b/src/xmlpatterns/data/qschematime_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:time type.
      *
-     * The header file for this class was orignally called Time.h, but this
+     * The header file for this class was originally called Time.h, but this
      * clashed with a system header on MinGW.
      *
      * @author Frans Englich <frans.englich@nokia.com>
diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp
index fd0b95c..585cf12 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp
@@ -914,7 +914,7 @@ void XsdSchemaParser::parseRedefine()
                 redefinedType->setWxsSuperType(contextType);
 
                 // 3) remove the base type resolving job from the resolver as
-                //    we have set the base type here explicitely
+                //    we have set the base type here explicitly
                 m_parserContext->resolver()->removeSimpleRestrictionBase(redefinedType);
 
                 // 4) add the redefined type to the schema
@@ -963,7 +963,7 @@ void XsdSchemaParser::parseRedefine()
                 redefinedType->setWxsSuperType(contextType);
 
                 // 3) remove the base type resolving job from the resolver as
-                //    we have set the base type here explicitely
+                //    we have set the base type here explicitly
                 m_parserContext->resolver()->removeComplexBaseType(redefinedType);
 
                 // 4) add the redefined type to the schema
@@ -5781,7 +5781,7 @@ QString XsdSchemaParser::readNamespaceAttribute(const QString &attributeName, co
 
 SchemaType::DerivationConstraints XsdSchemaParser::readDerivationConstraintAttribute(const SchemaType::DerivationConstraints &allowedConstraints, const char *elementName)
 {
-    // first convert the flags into strings for easier comparision
+    // first convert the flags into strings for easier comparison
     QSet<QString> allowedContent;
     if (allowedConstraints & SchemaType::RestrictionConstraint)
         allowedContent.insert(QString::fromLatin1("restriction"));
@@ -5844,7 +5844,7 @@ SchemaType::DerivationConstraints XsdSchemaParser::readDerivationConstraintAttri
 
 NamedSchemaComponent::BlockingConstraints XsdSchemaParser::readBlockingConstraintAttribute(const NamedSchemaComponent::BlockingConstraints &allowedConstraints, const char *elementName)
 {
-    // first convert the flags into strings for easier comparision
+    // first convert the flags into strings for easier comparison
     QSet<QString> allowedContent;
     if (allowedConstraints & NamedSchemaComponent::RestrictionConstraint)
         allowedContent.insert(QString::fromLatin1("restriction"));
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp b/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
index 88e5f93..dc4730e 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
@@ -53,7 +53,7 @@ using namespace QPatternist;
  * This page describes how to use DFAs for validating that the XML child tags of an
  * XML parent tag occur in the right order.
  *
- * To validate the occurence of XML tags one need a regular expression that describes
+ * To validate the occurrence of XML tags one need a regular expression that describes
  * which tags can appear how often in what context. For example the regular expression
  * of the global <em>attribute</em> tag in XML Schema is (annotation?, simpleType?).
  * That means the <em>attribute</em> tag can contain an <em>annotation</em> tag followed
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h
index 294eb50..62c6ab0 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h
@@ -138,7 +138,7 @@ namespace QPatternist
             /**
              * Continues execution of the machine with the given input @p transition.
              *
-             * @return @c true if the transition was successfull, @c false otherwise.
+             * @return @c true if the transition was successful, @c false otherwise.
              */
             bool proceed(TransitionType transition);
 
@@ -154,7 +154,7 @@ namespace QPatternist
              * @note To use this method, inputEqualsTransition must be implemented
              *       to find the right transition to use.
              *
-             * @return @c true if the transition was successfull, @c false otherwise.
+             * @return @c true if the transition was successful, @c false otherwise.
              */
             template <typename InputType>
             bool proceed(InputType input);
diff --git a/src/xmlpatterns/type/qtypechecker.cpp b/src/xmlpatterns/type/qtypechecker.cpp
index 879fe0e..73f83b7 100644
--- a/src/xmlpatterns/type/qtypechecker.cpp
+++ b/src/xmlpatterns/type/qtypechecker.cpp
@@ -168,7 +168,7 @@ Expression::Ptr TypeChecker::verifyType(const Expression::Ptr &operand,
 
     /* Since we haven't exited yet, it means that the operandType is a super type
      * of reqType, and that there hence is a path down to it through the
-     * type hierachy -- but that doesn't neccessarily mean that a up-cast(down the
+     * type hierachy -- but that doesn't necessarily mean that a up-cast(down the
      * hierarchy) would succeed. */
 
     Expression::Ptr result(operand);
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 18baa24..1189b99 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -2498,8 +2498,8 @@ void MainWindow::updateDanger(const MultiDataIndex &index, bool verbose)
             }
 
             if (m_ui.actionPlaceMarkerMatches->isChecked()) {
-                // Stores the occurence count of the place markers in the map placeMarkerIndexes.
-                // i.e. the occurence count of %1 is stored at placeMarkerIndexes[1],
+                // Stores the occurrence count of the place markers in the map placeMarkerIndexes.
+                // i.e. the occurrence count of %1 is stored at placeMarkerIndexes[1],
                 // count of %2 is stored at placeMarkerIndexes[2] etc.
                 // In the first pass, it counts all place markers in the sourcetext.
                 // In the second pass it (de)counts all place markers in the translation.
diff --git a/tools/linguist/linguist/printout.cpp b/tools/linguist/linguist/printout.cpp
index 581dc00..7ec6875 100644
--- a/tools/linguist/linguist/printout.cpp
+++ b/tools/linguist/linguist/printout.cpp
@@ -130,7 +130,7 @@ void PrintOut::addBox(int percent, const QString &text, Style style, Qt::Alignme
     cp.rect.setSize(QSize(cp.rect.width() + wd, qMax(cp.rect.height(), ht)));
 }
 
-// use init if inital vsize should be calculated (first breakPage call)
+// use init if initial vsize should be calculated (first breakPage call)
 void PrintOut::breakPage(bool init)
 {
     static const int LeftAlign = Qt::AlignLeft | Qt::AlignTop;
diff --git a/tools/qdoc3/tokenizer.h b/tools/qdoc3/tokenizer.h
index af617f1..1b33f6f 100644
--- a/tools/qdoc3/tokenizer.h
+++ b/tools/qdoc3/tokenizer.h
@@ -145,7 +145,7 @@ class Tokenizer
         int ch = getch();
         if (ch == EOF)
             return EOF;
-        // cast explicitily to make sure the value of ch 
+        // cast explicitly to make sure the value of ch 
         // is in range [0..255] to avoid assert messages 
         // when using debug CRT that checks its input.
         return int(uint(uchar(ch))); 
-- 
cgit v0.12


From 83fb9c38d3f176b132138675be64ab477e72fe88 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Tue, 9 Nov 2010 13:00:25 +0100
Subject: Doc: Fixing typo

---
 src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 073d722..67d760c 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -83,7 +83,7 @@ QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const
 QPixmapData *QMeeGoGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
 {
     // Long story short: without this it's possible to hit an 
-    // uninitialized paintDevice due to a Qt bug too complex to even 
+    // uninitialized paintDevice due to a Qt bug too complex to even
     // explain here... not to mention fix without going crazy. 
     // MDK
     QGLShareContextScope ctx(qt_gl_share_widget()->context());
-- 
cgit v0.12


From e48f03a052eaa5c175b373091a65238fa7755ed4 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Tue, 9 Nov 2010 12:25:36 +0100
Subject: Fixed wrong include path in multimedia.

RevBy:    Miikka Heikkinen
---
 src/multimedia/audio/audio.pri | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri
index ae28a26..7b2f9ad 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
@@ -42,8 +42,8 @@ mac {
     wince*:LIBS += -lcoredll
 
 } else:symbian {
-    INCLUDEPATH += /epoc32/include/mmf/common
-    INCLUDEPATH += /epoc32/include/mmf/server
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server
 
     HEADERS += $$PWD/qaudio_symbian_p.h \
                $$PWD/qaudiodeviceinfo_symbian_p.h \
-- 
cgit v0.12


From 7c59ffa73a569cb18acb05a1ee6c566f4878a1e2 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@nokia.com>
Date: Tue, 9 Nov 2010 14:21:38 +0100
Subject: Fixed random crash in QGestureManager.

When the cachedGestures are cleaned, the Gestures should be removed in all QSets first, before the Delete.

Task: QT-4013
Reviewed By: Frederik Gladhorn
---
 src/gui/kernel/qgesturemanager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 6dd8127..5e9a0cb 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -171,6 +171,10 @@ void QGestureManager::cleanupCachedGestures(QObject *target, Qt::GestureType typ
             foreach (QGesture *g, gestures) {
                 m_deletedRecognizers.remove(g);
                 m_gestureToRecognizer.remove(g);
+                m_maybeGestures.remove(g);
+                m_activeGestures.remove(g);
+                m_gestureOwners.remove(g);
+                m_gestureTargets.remove(g);
             }
 
             qDeleteAll(gestures);
-- 
cgit v0.12


From 594420567e7bfbf4f7bce0845eaf4f7d7a1e9380 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Tue, 9 Nov 2010 15:57:24 +0100
Subject: Doc: Fixing typo

---
 qmake/generators/symbian/symbiancommon.cpp    | 4 ++--
 src/declarative/qml/qdeclarativeparser_p.h    | 2 +-
 src/gui/egl/qegl.cpp                          | 4 ++--
 src/gui/graphicsview/qgraphicsproxywidget.cpp | 2 +-
 src/gui/graphicsview/qgraphicssceneevent.cpp  | 2 +-
 src/gui/graphicsview/qgraphicswidget.cpp      | 2 +-
 src/gui/image/qimage_ssse3.cpp                | 2 +-
 src/gui/image/qxpmhandler.cpp                 | 2 +-
 src/gui/itemviews/qabstractitemview.cpp       | 6 +++---
 src/gui/itemviews/qtableview.cpp              | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 6fea8fd..6cc9fe4 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -742,7 +742,7 @@ void SymbianCommonGenerator::readRssRules(QString &numberOfIcons,
                     newValues << itemList.join("\n");
                 }
             }
-            // Verify thet there is exactly one value in RSS_TAG_NBROFICONS
+            // Verify that there is exactly one value in RSS_TAG_NBROFICONS
             if (newKey == RSS_TAG_NBROFICONS) {
                 if (newValues.count() == 1) {
                     numberOfIcons = newValues[0];
@@ -751,7 +751,7 @@ void SymbianCommonGenerator::readRssRules(QString &numberOfIcons,
                             RSS_RULES_BASE, RSS_TAG_NBROFICONS);
                     continue;
                 }
-            // Verify thet there is exactly one value in RSS_TAG_ICONFILE
+            // Verify that there is exactly one value in RSS_TAG_ICONFILE
             } else if (newKey == RSS_TAG_ICONFILE) {
                 if (newValues.count() == 1) {
                     iconFile = newValues[0];
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h
index b4753df..77184c2 100644
--- a/src/declarative/qml/qdeclarativeparser_p.h
+++ b/src/declarative/qml/qdeclarativeparser_p.h
@@ -356,7 +356,7 @@ namespace QDeclarativeParser
         // True if the setting of this property will be deferred.  Set by the
         // QDeclarativeCompiler
         bool isDeferred;
-        // True if this property is a value-type psuedo-property
+        // True if this property is a value-type pseudo-property
         bool isValueTypeSubProperty;
 
         LocationSpan location;
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index af3b79a..9b41909 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -210,7 +210,7 @@ EGLConfig QEgl::defaultConfig(int devType, API api, ConfigOptions options)
     else
         configId = qgetenv("QT_GL_EGL_CONFIG");
     if (!configId.isEmpty()) {
-        // Overriden, so get the EGLConfig for the specified config ID:
+        // Overridden, so get the EGLConfig for the specified config ID:
         EGLint properties[] = {
             EGL_CONFIG_ID, (EGLint)configId.toInt(),
             EGL_NONE
@@ -267,7 +267,7 @@ EGLConfig QEgl::defaultConfig(int devType, API api, ConfigOptions options)
         configAttribs.setValue(EGL_STENCIL_SIZE, 1);
         configAttribs.setValue(EGL_SAMPLE_BUFFERS, 1);
 #ifndef QT_OPENGL_ES_2
-        // Aditionally, the GL1 engine likes to have a depth buffer for clipping
+        // Additionally, the GL1 engine likes to have a depth buffer for clipping
         configAttribs.setValue(EGL_DEPTH_SIZE, 1);
 #endif
     }
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp
index 320395e..e0eb3bb 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
@@ -1508,7 +1508,7 @@ int QGraphicsProxyWidget::type() const
   Creates a proxy widget for the given \a child of the widget
   contained in this proxy.
 
-  This function makes it possible to aquire proxies for
+  This function makes it possible to acquire proxies for
   non top-level widgets. For instance, you can embed a dialog,
   and then transform only one of its widgets.
 
diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp
index a0ecd4c..d9ff655 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.cpp
+++ b/src/gui/graphicsview/qgraphicssceneevent.cpp
@@ -1629,7 +1629,7 @@ QGraphicsSceneMoveEvent::~QGraphicsSceneMoveEvent()
 }
 
 /*!
-    Returns the old position (i.e., the position immediatly before the widget
+    Returns the old position (i.e., the position immediately before the widget
     was moved).
 
     \sa newPos(), QGraphicsItem::setPos()
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 4a733be..e48f9a7 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -450,7 +450,7 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
     bottom.
 
     Contents margins are used by the assigned layout to define the placement
-    of subwidgets and layouts. Margins are particularily useful for widgets
+    of subwidgets and layouts. Margins are particularly useful for widgets
     that constrain subwidgets to only a section of its own geometry. For
     example, a group box with a layout will place subwidgets inside its frame,
     but below the title.
diff --git a/src/gui/image/qimage_ssse3.cpp b/src/gui/image/qimage_ssse3.cpp
index 9aed011..836d7b0 100644
--- a/src/gui/image/qimage_ssse3.cpp
+++ b/src/gui/image/qimage_ssse3.cpp
@@ -54,7 +54,7 @@ Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, con
 {
     quint32 *const end = dst + len;
 
-    // Prologue, align dst to 16 bytes. The alignement is done on dst because it has 4 store()
+    // Prologue, align dst to 16 bytes. The alignment is done on dst because it has 4 store()
     // for each 3 load() of src.
     const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast<quintptr>(dst) >> 2) & 0x3)) & 0x3;
     const int prologLength = qMin(len, offsetToAlignOn16Bytes);
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index b97afd3..453100c 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -766,7 +766,7 @@ static bool qt_get_named_xpm_rgb(const char *name_no_space, QRgb *rgb)
 {
     XPMRGBData x;
     x.name = name_no_space;
-    // Funtion bsearch() is supposed to be
+    // Function bsearch() is supposed to be
     // void *bsearch(const void *key, const void *base, ...
     // So why (char*)? Are there broken bsearch() declarations out there?
     XPMRGBData *r = (XPMRGBData *)bsearch((char *)&x, (char *)xpmRgbTbl, xpmRgbTblSize,
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 95e92c9..7b81761 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -1166,7 +1166,7 @@ QAbstractItemView::EditTriggers QAbstractItemView::editTriggers() const
     \property QAbstractItemView::verticalScrollMode
     \brief how the view scrolls its contents in the vertical direction
 
-    This property controlls how the view scroll its contents vertically.
+    This property controls how the view scroll its contents vertically.
     Scrolling can be done either per pixel or per item.
 */
 
@@ -1192,7 +1192,7 @@ QAbstractItemView::ScrollMode QAbstractItemView::verticalScrollMode() const
     \property QAbstractItemView::horizontalScrollMode
     \brief how the view scrolls its contents in the horizontal direction
 
-    This property controlls how the view scroll its contents horizontally.
+    This property controls how the view scroll its contents horizontally.
     Scrolling can be done either per pixel or per item.
 */
 
@@ -1275,7 +1275,7 @@ bool QAbstractItemView::hasAutoScroll() const
     \property QAbstractItemView::autoScrollMargin
     \brief the size of the area when auto scrolling is triggered
 
-    This property controlls the size of the area at the edge of the viewport that
+    This property controls the size of the area at the edge of the viewport that
     triggers autoscrolling. The default value is 16 pixels.
 */
 void QAbstractItemView::setAutoScrollMargin(int margin)
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp
index 4492e53..dc45854 100644
--- a/src/gui/itemviews/qtableview.cpp
+++ b/src/gui/itemviews/qtableview.cpp
@@ -114,7 +114,7 @@ void QSpanCollection::updateSpan(QSpanCollection::Span *span, int old_height)
         }
     } else if (old_height > span->height()) {
         //remove the span from all the subspans lists that intersect the columns not covered anymore
-        Index::iterator it_y = index.lowerBound(-qMax(span->bottom(), span->top())); //qMax usefull if height is 0
+        Index::iterator it_y = index.lowerBound(-qMax(span->bottom(), span->top())); //qMax useful if height is 0
         Q_ASSERT(it_y != index.end()); //it_y must exist since the span is in the list
         while (-it_y.key() <= span->top() + old_height -1) {
             if (-it_y.key() > span->bottom()) {
@@ -1411,7 +1411,7 @@ void QTableView::paintEvent(QPaintEvent *event)
         }
 
         if (showGrid) {
-            // Find the bottom right (the last rows/coloumns might be hidden)
+            // Find the bottom right (the last rows/columns might be hidden)
             while (verticalHeader->isSectionHidden(verticalHeader->logicalIndex(bottom))) --bottom;
             QPen old = painter.pen();
             painter.setPen(gridPen);
-- 
cgit v0.12


From 2ec60d5a71a560460c884be36de8fbad467fb69d Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Tue, 9 Nov 2010 17:32:15 +0100
Subject: Clear X11 structure before use

This squelches valgrind warnings about uninitialized reads

Task-number: QT-3973
Reviewed-by: Robert Griebl
---
 src/gui/kernel/qmotifdnd_x11.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp
index 3334455..3b79129 100644
--- a/src/gui/kernel/qmotifdnd_x11.cpp
+++ b/src/gui/kernel/qmotifdnd_x11.cpp
@@ -385,7 +385,10 @@ static void DndReadSourceProperty(Display * dpy,
 static void DndWriteReceiverProperty(Display * dpy, Window window,
                                      unsigned char protocol_style)
 {
-    DndReceiverProp receiver_prop ;
+    DndReceiverProp receiver_prop;
+
+    // squelch potential valgrind errors about uninitialized reads
+    memset(&receiver_prop, 0, sizeof(receiver_prop));
 
     receiver_prop.byte_order = DndByteOrder() ;
     receiver_prop.protocol_version = DND_PROTOCOL_VERSION;
-- 
cgit v0.12


From 11ac612190b7bd637ede068d2fe8063021a2a0eb Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 10 Nov 2010 09:30:06 +1000
Subject: Document TextInput::select(start,end)

Task-number: QTBUG-15162
---
 .../graphicsitems/qdeclarativetextinput.cpp        | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 2348478..0deacf8 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -460,10 +460,9 @@ QRect QDeclarativeTextInput::cursorRectangle() const
     text edit.
 
     Note that if selectionStart == selectionEnd then there is no current
-    selection. If you attempt to set selectionStart to a value outside of
-    the current text, selectionStart will not be changed.
+    selection.
 
-    \sa selectionEnd, cursorPosition, selectedText
+    \sa selectionEnd, cursorPosition, selectedText, select()
 */
 int QDeclarativeTextInput::selectionStart() const
 {
@@ -479,10 +478,9 @@ int QDeclarativeTextInput::selectionStart() const
     text edit.
 
     Note that if selectionStart == selectionEnd then there is no current
-    selection. If you attempt to set selectionEnd to a value outside of
-    the current text, selectionEnd will not be changed.
+    selection.
 
-    \sa selectionStart, cursorPosition, selectedText
+    \sa selectionStart, cursorPosition, selectedText, select()
 */
 int QDeclarativeTextInput::selectionEnd() const
 {
@@ -490,6 +488,19 @@ int QDeclarativeTextInput::selectionEnd() const
     return d->lastSelectionEnd;
 }
 
+/*!
+    \qmlmethod void TextInput::select(int start, int end)
+
+    Causes the text from \a start to \a end to be selected.
+
+    If either start or end is out of range, the selection is not changed.
+
+    After calling this, selectionStart will become the lesser
+    and selectionEnd will become the greater (regardless of the order passed
+    to this method).
+
+    \sa selectionStart, selectionEnd
+*/
 void QDeclarativeTextInput::select(int start, int end)
 {
     Q_D(QDeclarativeTextInput);
-- 
cgit v0.12


From bfd87980bdc3d835723f429a3e4dbe2d884bca27 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Tue, 9 Nov 2010 16:42:10 +1000
Subject: Fix potential buffer overrun in QAudioInput windows implementation.

Don't write more than len bytes to the output buffer.

Task-number: QTBUG-14549 QTBUG-8578
Reviewed-by: Derick Hawcroft
---
 src/multimedia/audio/qaudioinput_win32_p.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 1cde159..0ec2492 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -400,9 +400,12 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
 		    resuming = false;
                 }
             } else {
+                l = qMin<qint64>(len, waveBlocks[header].dwBytesRecorded);
                 // push mode
-                memcpy(p,waveBlocks[header].lpData,waveBlocks[header].dwBytesRecorded);
-                l = waveBlocks[header].dwBytesRecorded;
+                memcpy(p, waveBlocks[header].lpData, l);
+
+                len -= l;
+
 #ifdef DEBUG_AUDIO
                 qDebug()<<"IN: "<<waveBlocks[header].dwBytesRecorded<<", OUT: "<<l;
 #endif
@@ -457,7 +460,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
 
         mutex.lock();
         if(!pullMode) {
-	    if(l+period_size > len && waveFreeBlockCount == buffer_size/period_size)
+            if(len < period_size || waveFreeBlockCount == buffer_size/period_size)
 	        done = true;
 	} else {
 	    if(waveFreeBlockCount == buffer_size/period_size)
@@ -568,7 +571,7 @@ bool QAudioInputPrivate::deviceReady()
 
     if(pullMode) {
         // reads some audio data and writes it to QIODevice
-        read(0,0);
+        read(0, buffer_size);
     } else {
         // emits readyRead() so user will call read() on QIODevice to get some audio data
 	InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
-- 
cgit v0.12


From e3f1268e63064a54215051cf91d5f6b8c8bd4f0f Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Tue, 9 Nov 2010 16:30:32 +1000
Subject: Fix potential buffer overrun in ALSA QAudioInput implementation.

Don't write more than the supplied max buffer size to the output buffer.

Task-number: QTBUG-14549 QTBUG-8578
Reviewed-by: Derick Hawcroft
---
 src/multimedia/audio/qaudioinput_alsa_p.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
index ddafa3d..5265915 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
@@ -482,19 +482,18 @@ int QAudioInputPrivate::bytesReady() const
 
 qint64 QAudioInputPrivate::read(char* data, qint64 len)
 {
-    Q_UNUSED(len)
-
     // Read in some audio data and write it to QIODevice, pull mode
     if ( !handle )
         return 0;
 
-    bytesAvailable = checkBytesReady();
+    // bytesAvaiable is saved as a side effect of checkBytesReady().
+    int bytesToRead = checkBytesReady();
 
-    if (bytesAvailable < 0) {
+    if (bytesToRead < 0) {
         // bytesAvailable as negative is error code, try to recover from it.
-        xrun_recovery(bytesAvailable);
-        bytesAvailable = checkBytesReady();
-        if (bytesAvailable < 0) {
+        xrun_recovery(bytesToRead);
+        bytesToRead = checkBytesReady();
+        if (bytesToRead < 0) {
             // recovery failed must stop and set error.
             close();
             errorState = QAudio::IOError;
@@ -504,9 +503,11 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
         }
     }
 
+    bytesToRead = qMin<qint64>(len, bytesToRead);
+    bytesToRead -= bytesToRead % period_size;
     int count=0, err = 0;
     while(count < 5) {
-        int chunks = bytesAvailable/period_size;
+        int chunks = bytesToRead/period_size;
         int frames = chunks*period_frames;
         if(frames > (int)buffer_frames)
             frames = buffer_frames;
@@ -554,6 +555,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
                     emit stateChanged(deviceState);
                 }
             } else {
+                bytesAvailable -= err;
                 totalTimeValue += err;
                 resuming = false;
                 if (deviceState != QAudio::ActiveState) {
@@ -566,6 +568,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
 
         } else {
             memcpy(data,audioBuffer,err);
+            bytesAvailable -= err;
             totalTimeValue += err;
             resuming = false;
             if (deviceState != QAudio::ActiveState) {
@@ -661,7 +664,7 @@ bool QAudioInputPrivate::deviceReady()
 {
     if(pullMode) {
         // reads some audio data and writes it to QIODevice
-        read(0,0);
+        read(0, buffer_size);
     } else {
         // emits readyRead() so user will call read() on QIODevice to get some audio data
         InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
-- 
cgit v0.12


From cb1f6d24e0c834d633720102c7e8edc9801196fb Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 10 Nov 2010 10:17:34 +1000
Subject: Document that Transitions are exclusive.

Task-number: QTBUG-15183
---
 src/declarative/util/qdeclarativetransition.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index 478c7f4..c8bc7b3 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -86,12 +86,16 @@ QT_BEGIN_NAMESPACE
     Item {
         ...
         transitions: [
-            Transition { ... },
+            Transition { to: "state1" ... },
             Transition { ... }
         ]
     }
     \endqml
 
+    If multiple Transitions are specified, only a single (best-matching) Transition will be applied for any particular
+    state change. In the example above, when changing to \c state1, the first transition will be used, rather
+    than the more generic second transition.
+
     If a state change has a Transition that matches the same property as a
     \l Behavior, the Transition animation overrides the \l Behavior for that
     state change.
-- 
cgit v0.12


From cd1a69ec3e27a4b6c0df692ec5bdbc9b789c74b4 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 10 Nov 2010 14:26:08 +1000
Subject: Flickable does not reposition its content when it is resized. Call
 fixup() after Flickable resize to ensure contents are within bounds.

Task-number: QTBUG-15173
Reviewed-by: Bea Lam
---
 src/declarative/graphicsitems/qdeclarativeflickable.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 01a8585..90cf9ed 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1029,6 +1029,13 @@ void QDeclarativeFlickable::geometryChanged(const QRectF &newGeometry,
             d->contentItem->setWidth(width());
             emit contentWidthChanged();
         }
+        // Make sure that we're entirely in view.
+        if (!d->pressed && !d->movingHorizontally && !d->movingVertically) {
+            int oldDuration = d->fixupDuration;
+            d->fixupDuration = 0;
+            d->fixupX();
+            d->fixupDuration = oldDuration;
+        }
     }
     if (newGeometry.height() != oldGeometry.height()) {
         if (yflick())
@@ -1037,6 +1044,13 @@ void QDeclarativeFlickable::geometryChanged(const QRectF &newGeometry,
             d->contentItem->setHeight(height());
             emit contentHeightChanged();
         }
+        // Make sure that we're entirely in view.
+        if (!d->pressed && !d->movingHorizontally && !d->movingVertically) {
+            int oldDuration = d->fixupDuration;
+            d->fixupDuration = 0;
+            d->fixupY();
+            d->fixupDuration = oldDuration;
+        }
     }
 
     if (changed)
-- 
cgit v0.12


From 339f3d9ca43987dc2dba022ec964fa43c702cb12 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Wed, 10 Nov 2010 10:50:50 +0100
Subject: Fixed a shell syntax error in configure

When you have EPOCROOT environment variable, but compiling for desktop
Linux, the configure script showed a shell syntax error and failed to set
the install prefix, making "install" target to install to the build
directory.

Task-number: QTBUG-15008
Reviewed-by: axis
Reviewed-by: Oswald Buddenhagen
---
 configure | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 1b2abf4..a238300 100755
--- a/configure
+++ b/configure
@@ -3314,12 +3314,9 @@ if [ -z "$QT_INSTALL_PREFIX" ]; then
         if [ "$PLATFORM" != "$XPLATFORM" ]; then
             QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}"
         fi
-    elif [ -d "$EPOCROOT" ]; then
-        case "$XPLATFORM" in *symbian*)
-            QT_INSTALL_PREFIX="$EPOCROOT/epoc32/"
-            QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/"
-            ;;
-        esac
+    elif [ -d "$EPOCROOT" ] && echo $XPLATFORM | grep symbian > /dev/null; then
+        QT_INSTALL_PREFIX="$EPOCROOT/epoc32/"
+        QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/"
     else
         QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION
     fi
-- 
cgit v0.12


From 7e1a598296e89e498fd0c27fc0951f059d1e6ffe Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Wed, 10 Nov 2010 11:10:00 +0100
Subject: fix tst_headers

Fix the generator and the generated file to ensure that the string
"generated" appears in the first line.
---
 tests/benchmarks/corelib/tools/qstring/data.cpp        | 3 ++-
 tests/benchmarks/corelib/tools/qstring/generatelist.pl | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/benchmarks/corelib/tools/qstring/data.cpp b/tests/benchmarks/corelib/tools/qstring/data.cpp
index a674336..d44a796 100644
--- a/tests/benchmarks/corelib/tools/qstring/data.cpp
+++ b/tests/benchmarks/corelib/tools/qstring/data.cpp
@@ -1,6 +1,7 @@
+// This is a generated file - DO NOT EDIT
+
 #include "data.h"
 
-// This is a generated file - DO NOT EDIT
 const ushort stringCollectionData[] __attribute__((aligned(16))) = {
     // #0
     65535,
diff --git a/tests/benchmarks/corelib/tools/qstring/generatelist.pl b/tests/benchmarks/corelib/tools/qstring/generatelist.pl
index 8c8eb20..48a8518 100644
--- a/tests/benchmarks/corelib/tools/qstring/generatelist.pl
+++ b/tests/benchmarks/corelib/tools/qstring/generatelist.pl
@@ -103,9 +103,10 @@ sub printUshortArray($$$) {
     return ($offset + $headpadding, $offset + $headpadding + $len + $tailpadding);
 }
 
+print "// This is a generated file - DO NOT EDIT\n\n";
+
 print "#include \"data.h\"\n\n";
 
-print "// This is a generated file - DO NOT EDIT\n";
 print "const ushort stringCollectionData[] __attribute__((aligned(64))) = {\n";
 $count = 0;
 $offset = 0;
-- 
cgit v0.12


From 722d25d7a4fb0bc64d5bceae40019c7a8f3a9251 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Tue, 9 Nov 2010 16:44:55 +0000
Subject: Use $${EPOCROOT} variable rather than absolute paths in .pro files

Task-number: QTBUG-15156
Reviewed-by: Miikka Heikkinen
---
 src/plugins/phonon/mmf/mmf.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index ac11188..691fc80 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -18,7 +18,7 @@ symbian {
 	# This is necessary because both epoc32/include and Phonon contain videoplayer.h.
 	# By making /epoc32/include the first SYSTEMINCLUDE, we ensure that
 	# '#include <videoplayer.h>' picks up the Symbian header, as intended.
-	PREPEND_INCLUDEPATH = /epoc32/include
+	PREPEND_INCLUDEPATH = $${EPOCROOT}epoc32/include
 
 	PREPEND_INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty
 
-- 
cgit v0.12


From 8d88491d44fdbad7e9d6ea618f14b5230e03d6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Wed, 10 Nov 2010 11:05:04 +0100
Subject: Fixed tst_qpixmap::grabWidget autotest failure on QWS.

We need to use the same rendering to compute the expected pixmap as used
in QPixmap::grabWidget(), or the results will look different on a 16-bit
display, as QPixmap::fromImage(ARGB32_Premultiplied_image) will get a
different internal image format compared to QPixmap pixmap(size);
pixmap.fill(Qt::transparent);

Reviewed-by: Kim
---
 tests/auto/qpixmap/tst_qpixmap.cpp | 54 ++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index a733d56..51e6cf5 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -812,33 +812,43 @@ void tst_QPixmap::drawBitmap()
 
 void tst_QPixmap::grabWidget()
 {
-    QWidget widget;
-    QImage image(128, 128, QImage::Format_ARGB32_Premultiplied);
-    for (int row = 0; row < image.height(); ++row) {
-        QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(row));
-        for (int col = 0; col < image.width(); ++col)
-            line[col] = qRgba(rand() & 255, row, col, 127);
-    }
+    for (int opaque = 0; opaque < 2; ++opaque) {
+        QWidget widget;
+        QImage image(128, 128, opaque ? QImage::Format_RGB32 : QImage::Format_ARGB32_Premultiplied);
+        for (int row = 0; row < image.height(); ++row) {
+            QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(row));
+            for (int col = 0; col < image.width(); ++col)
+                line[col] = qRgba(rand() & 255, row, col, opaque ? 255 : 127);
+        }
 
-    QPalette pal = widget.palette();
-    pal.setBrush(QPalette::Window, QBrush(image));
-    widget.setPalette(pal);
-    widget.resize(128, 128);
+        QPalette pal = widget.palette();
+        pal.setBrush(QPalette::Window, QBrush(image));
+        widget.setPalette(pal);
+        widget.resize(128, 128);
 
-    QPixmap expected = QPixmap::fromImage(QImage(image.scanLine(64) + 64 * 4, 64, 64, image.bytesPerLine(), image.format()));
-    QPixmap actual = QPixmap::grabWidget(&widget, QRect(64, 64, 64, 64));
-    QVERIFY(lenientCompare(actual, expected));
+        QPixmap expected(64, 64);
+        if (!opaque)
+            expected.fill(Qt::transparent);
 
-    actual = QPixmap::grabWidget(&widget, 64, 64);
-    QVERIFY(lenientCompare(actual, expected));
+        QPainter p(&expected);
+        p.translate(-64, -64);
+        p.drawTiledPixmap(0, 0, 128, 128, pal.brush(QPalette::Window).texture(), 0, 0);
+        p.end();
 
-    // Make sure a widget that is not yet shown is grabbed correctly.
-    QTreeWidget widget2;
-    actual = QPixmap::grabWidget(&widget2);
-    widget2.show();
-    expected = QPixmap::grabWidget(&widget2);
+        QPixmap actual = QPixmap::grabWidget(&widget, QRect(64, 64, 64, 64));
+        QVERIFY(lenientCompare(actual, expected));
 
-    QVERIFY(lenientCompare(actual, expected));
+        actual = QPixmap::grabWidget(&widget, 64, 64);
+        QVERIFY(lenientCompare(actual, expected));
+
+        // Make sure a widget that is not yet shown is grabbed correctly.
+        QTreeWidget widget2;
+        actual = QPixmap::grabWidget(&widget2);
+        widget2.show();
+        expected = QPixmap::grabWidget(&widget2);
+
+        QVERIFY(lenientCompare(actual, expected));
+    }
 }
 
 void tst_QPixmap::grabWindow()
-- 
cgit v0.12


From 7cc777265b5d6c5e87c86283b4061f2632952a8c Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Wed, 10 Nov 2010 14:42:24 +0100
Subject: QDeclarativeDebug: Keep source information when changing an
 expression

Copy over the source code location of an expression when it is changed throu
the debugging facilities. This enables JavaScript breakpoints to be hit even
after the source code of the function has changed.

Task-number: QTCREATORBUG-2824
Reviewed-by: Kai Koehne
---
 src/declarative/qml/qdeclarativeenginedebug.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index ed28185..bffe681 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -502,7 +502,8 @@ void QDeclarativeEngineDebugServer::setBinding(int objectId,
             property.write(expression);
         } else if (hasValidSignal(object, propertyName)) {
             QDeclarativeExpression *declarativeExpression = new QDeclarativeExpression(context, object, expression.toString());
-            QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression);
+            QDeclarativeExpression *oldExpression = QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression);
+            declarativeExpression->setSourceLocation(oldExpression->sourceFile(), oldExpression->lineNumber());
         } else if (property.isProperty()) {
             QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context);
             binding->setTarget(property);
-- 
cgit v0.12


From d3a6103783b161d6d35a00cb50fef50e73b6a4b6 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 10 Nov 2010 22:35:50 +0100
Subject: remove pointless assignment of deprecated variable

---
 tools/qconfig/qconfig.pro | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/qconfig/qconfig.pro b/tools/qconfig/qconfig.pro
index efbfcf2..171924f 100644
--- a/tools/qconfig/qconfig.pro
+++ b/tools/qconfig/qconfig.pro
@@ -6,5 +6,4 @@ build_all:!build_pass {
 }
 HEADERS		= feature.h featuretreemodel.h graphics.h
 SOURCES		= main.cpp feature.cpp featuretreemodel.cpp
-INTERFACES	=
 TARGET		= qconfig
-- 
cgit v0.12


From 9637cb4f7c88594d5018c97072f77a19d737a302 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 11 Nov 2010 08:25:08 +0100
Subject: Trailing whitespace fixes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/qmeegoextensions.cpp     | 12 ++++++------
 src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 12 ++++++------
 src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h   |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
index 611c962..44c1eee 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
@@ -78,7 +78,7 @@ EGLNativeSharedImageTypeNOK QMeeGoExtensions::eglCreateSharedImageNOK(EGLDisplay
 {
     if (! hasImageShared)
         qFatal("EGL_NOK_image_shared not found but trying to use capability!");
-        
+
     return _eglCreateSharedImageNOK(dpy, image, props);
 }
 
@@ -128,7 +128,7 @@ void QMeeGoExtensions::initialize()
 {
     QGLContext *ctx = (QGLContext *) QGLContext::currentContext();
     qt_resolve_eglimage_gl_extensions(ctx);
-    
+
     if (QEgl::hasExtension("EGL_NOK_image_shared")) {
         qDebug("MeegoGraphics: found EGL_NOK_image_shared");
         _eglQueryImageNOK = (eglQueryImageNOKFunc) eglGetProcAddress("eglQueryImageNOK");
@@ -136,15 +136,15 @@ void QMeeGoExtensions::initialize()
         _eglDestroySharedImageNOK = (eglDestroySharedImageNOKFunc) eglGetProcAddress("eglDestroySharedImageNOK");
         _eglLockSurfaceKHR = (eglLockSurfaceKHRFunc) eglGetProcAddress("eglLockSurfaceKHR");
         _eglUnlockSurfaceKHR = (eglUnlockSurfaceKHRFunc) eglGetProcAddress("eglUnlockSurfaceKHR");
-        
+
         Q_ASSERT(_eglQueryImageNOK && _eglCreateSharedImageNOK && _eglDestroySharedImageNOK);
         hasImageShared = true;
     }
-    
+
     if (QEgl::hasExtension("EGL_NOK_surface_scaling")) {
         qDebug("MeegoGraphics: found EGL_NOK_surface_scaling");
         _eglSetSurfaceScalingNOK = (eglSetSurfaceScalingNOKFunc) eglGetProcAddress("eglSetSurfaceScalingNOK");
-        
+
         Q_ASSERT(_eglSetSurfaceScalingNOK);
         hasSurfaceScaling = true;
     }
@@ -153,7 +153,7 @@ void QMeeGoExtensions::initialize()
         qDebug("MeegoGraphics: found EGL_KHR_lock_surface2");
         _eglLockSurfaceKHR = (eglLockSurfaceKHRFunc) eglGetProcAddress("eglLockSurfaceKHR");
         _eglUnlockSurfaceKHR = (eglUnlockSurfaceKHRFunc) eglGetProcAddress("eglUnlockSurfaceKHR");
-         
+
         Q_ASSERT(_eglLockSurfaceKHR && _eglUnlockSurfaceKHR);
         hasLockSurface = true;
     }
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 67d760c..02e1143 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -87,7 +87,7 @@ QPixmapData *QMeeGoGraphicsSystem::createPixmapData(QPixmapData::PixelType type)
     // explain here... not to mention fix without going crazy. 
     // MDK
     QGLShareContextScope ctx(qt_gl_share_widget()->context());
- 
+
     return new QRasterPixmapData(type);
 }
 
@@ -103,8 +103,8 @@ QPixmapData *QMeeGoGraphicsSystem::createPixmapData(QPixmapData *origin)
 
         if (QMeeGoPixmapData::sharedImagesMap.contains(rawResource))
             return new QMeeGoPixmapData();
-    } 
-        
+    }
+
     return new QRasterPixmapData(origin->pixelType());
 }
 
@@ -155,7 +155,7 @@ QPixmapData *QMeeGoGraphicsSystem::pixmapDataFromEGLSharedImage(Qt::HANDLE handl
         qFatal("For egl shared images, the soft image has to be ARGB32_Premultiplied or RGB32");
         return NULL;
     }
-    
+
     if (QMeeGoGraphicsSystem::meeGoRunning()) {
         QMeeGoPixmapData *pmd = new QMeeGoPixmapData;
         pmd->fromEGLSharedImage(handle, softImage);
@@ -177,9 +177,9 @@ QPixmapData *QMeeGoGraphicsSystem::pixmapDataFromEGLSharedImage(Qt::HANDLE handl
 void QMeeGoGraphicsSystem::updateEGLSharedImagePixmap(QPixmap *pixmap)
 {
     QMeeGoPixmapData *pmd = (QMeeGoPixmapData *) pixmap->pixmapData();
-    
+
     // Basic sanity check to make sure this is really a QMeeGoPixmapData...
-    if (pmd->classId() != QPixmapData::OpenGLClass) 
+    if (pmd->classId() != QPixmapData::OpenGLClass)
         qFatal("Trying to updated EGLSharedImage pixmap but it's not really a shared image pixmap!");
 
     pmd->updateFromSoftImage();
diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
index 1d647f0..cb123da 100644
--- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
+++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
@@ -50,16 +50,16 @@ public:
     QMeeGoLivePixmapData(int w, int h, QImage::Format format);
     QMeeGoLivePixmapData(Qt::HANDLE h);
     ~QMeeGoLivePixmapData();
-    
+
     QPixmapData *createCompatiblePixmapData() const;
     bool scroll(int dx, int dy, const QRect &rect);
 
     void initializeThroughEGLImage();
-        
+
     QImage* lock();
     bool release(QImage *img);
     Qt::HANDLE handle();
-    
+
     EGLSurface getSurfaceForBackingPixmap();
     void destroySurfaceForPixmapData(QPixmapData* pmd);
 
-- 
cgit v0.12


From d964fa923394ba50fa26d36c2c39bf4ac1fda78f Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 11 Nov 2010 08:25:09 +0100
Subject: Added MeeGo graphicssystem entry points for KHR_fence_sync.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 .../graphicssystems/meego/qmeegoextensions.cpp     | 56 +++++++++++++++++++++-
 .../graphicssystems/meego/qmeegoextensions.h       | 22 +++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
index 44c1eee..fd17d491d 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
@@ -47,6 +47,7 @@ bool QMeeGoExtensions::initialized = false;
 bool QMeeGoExtensions::hasImageShared = false;
 bool QMeeGoExtensions::hasSurfaceScaling = false;
 bool QMeeGoExtensions::hasLockSurface = false;
+bool QMeeGoExtensions::hasFenceSync = false;
 
 /* Extension funcs */
 
@@ -54,8 +55,12 @@ typedef EGLBoolean (EGLAPIENTRY *eglQueryImageNOKFunc)(EGLDisplay, EGLImageKHR,
 typedef EGLNativeSharedImageTypeNOK (EGLAPIENTRY *eglCreateSharedImageNOKFunc)(EGLDisplay, EGLImageKHR, EGLint*);
 typedef EGLBoolean (EGLAPIENTRY *eglDestroySharedImageNOKFunc)(EGLDisplay, EGLNativeSharedImageTypeNOK);
 typedef EGLBoolean (EGLAPIENTRY *eglSetSurfaceScalingNOKFunc)(EGLDisplay, EGLSurface, EGLint, EGLint, EGLint, EGLint);
-typedef EGLBoolean (EGLAPIENTRY *eglLockSurfaceKHRFunc)(EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
-typedef EGLBoolean (EGLAPIENTRY *eglUnlockSurfaceKHRFunc)(EGLDisplay display, EGLSurface surface);
+typedef EGLBoolean (EGLAPIENTRY *eglLockSurfaceKHRFunc)(EGLDisplay, EGLSurface, const EGLint*);
+typedef EGLBoolean (EGLAPIENTRY *eglUnlockSurfaceKHRFunc)(EGLDisplay, EGLSurface);
+typedef EGLSyncKHR (EGLAPIENTRY *eglCreateSyncKHRFunc)(EGLDisplay, EGLenum, const EGLint*);
+typedef EGLBoolean (EGLAPIENTRY *eglDestroySyncKHRFunc)(EGLDisplay, EGLSyncKHR);
+typedef EGLint (EGLAPIENTRY *eglClientWaitSyncKHRFunc)(EGLDisplay, EGLSyncKHR, EGLint, EGLTimeKHR);
+typedef EGLBoolean (EGLAPIENTRY *eglGetSyncAttribKHRFunc)(EGLDisplay, EGLSyncKHR, EGLint, EGLint*);
 
 static eglQueryImageNOKFunc _eglQueryImageNOK = 0;
 static eglCreateSharedImageNOKFunc _eglCreateSharedImageNOK = 0;
@@ -63,6 +68,10 @@ static eglDestroySharedImageNOKFunc _eglDestroySharedImageNOK = 0;
 static eglSetSurfaceScalingNOKFunc _eglSetSurfaceScalingNOK = 0;
 static eglLockSurfaceKHRFunc _eglLockSurfaceKHR = 0;
 static eglUnlockSurfaceKHRFunc _eglUnlockSurfaceKHR = 0;
+static eglCreateSyncKHRFunc _eglCreateSyncKHR = 0;
+static eglDestroySyncKHRFunc _eglDestroySyncKHR = 0;
+static eglClientWaitSyncKHRFunc _eglClientWaitSyncKHR = 0;
+static eglGetSyncAttribKHRFunc _eglGetSyncAttribKHR = 0;
 
 /* Public */
 
@@ -122,6 +131,38 @@ bool QMeeGoExtensions::eglUnlockSurfaceKHR(EGLDisplay display, EGLSurface surfac
     return _eglUnlockSurfaceKHR(display, surface);
 }
 
+EGLSyncKHR QMeeGoExtensions::eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list)
+{
+    if (! hasFenceSync)
+        qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
+
+    return _eglCreateSyncKHR(dpy, type, attrib_list);
+}
+
+bool QMeeGoExtensions::eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync)
+{
+    if (! hasFenceSync)
+        qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
+
+    return _eglDestroySyncKHR(dpy, sync);
+}
+
+EGLint QMeeGoExtensions::eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout)
+{
+    if (! hasFenceSync)
+        qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
+
+    return _eglClientWaitSyncKHR(dpy, sync, flags, timeout);
+}
+
+EGLBoolean QMeeGoExtensions::eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value)
+{
+    if (! hasFenceSync)
+        qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
+
+    return _eglGetSyncAttribKHR(dpy, sync, attribute, value);
+}
+
 /* Private */
 
 void QMeeGoExtensions::initialize()
@@ -157,5 +198,16 @@ void QMeeGoExtensions::initialize()
         Q_ASSERT(_eglLockSurfaceKHR && _eglUnlockSurfaceKHR);
         hasLockSurface = true;
     }
+
+    if (QEgl::hasExtension("EGL_KHR_fence_sync")) {
+        qDebug("MeegoGraphics: found EGL_KHR_fence_sync");
+        _eglCreateSyncKHR = (eglCreateSyncKHRFunc) eglGetProcAddress("eglCreateSyncKHR");
+        _eglDestroySyncKHR = (eglDestroySyncKHRFunc) eglGetProcAddress("eglDestroySyncKHR");
+        _eglClientWaitSyncKHR = (eglClientWaitSyncKHRFunc) eglGetProcAddress("eglClientWaitSyncKHR");
+        _eglGetSyncAttribKHR = (eglGetSyncAttribKHRFunc) eglGetProcAddress("eglGetSyncAttribKHR");
+
+        Q_ASSERT(_eglCreateSyncKHR && _eglDestroySyncKHR && _eglClientWaitSyncKHR && _eglGetSyncAttribKHR);
+        hasFenceSync = true;
+    }
 }
 
diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.h b/src/plugins/graphicssystems/meego/qmeegoextensions.h
index 9e78caf..49a1e30 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.h
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.h
@@ -77,6 +77,23 @@ typedef void* EGLNativeSharedImageTypeNOK;
 #define EGL_WRITE_SURFACE_BIT_KHR 0x0002
 #endif
 
+#ifndef EGL_SYNC_FENCE_KHR
+#define EGL_SYNC_FENCE_KHR 0x30F9
+#define EGL_SYNC_TYPE_KHR 0x30F7
+#define EGL_SYNC_STATUS_KHR 0x30F1
+#define EGL_SYNC_CONDITION_KHR 0x30F8
+#define EGL_SIGNALED_KHR 0x30F2
+#define EGL_UNSIGNALED_KHR 0x30F3
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR 0x30F0
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR 0x0001
+#define EGL_FOREVER_KHR 0xFFFFFFFFFFFFFFFFull
+#define EGL_TIMEOUT_EXPIRED_KHR 0x30F5
+#define EGL_CONDITION_SATISFIED_KHR 0x30F6
+#define EGL_NO_SYNC_KHR ((EGLSyncKHR)0)
+typedef void* EGLSyncKHR;
+typedef khronos_utime_nanoseconds_t EGLTimeKHR;
+#endif
+
 /* Class */
 
 class QMeeGoExtensions
@@ -90,6 +107,10 @@ public:
     static bool eglSetSurfaceScalingNOK(EGLDisplay dpy, EGLSurface surface, int x, int y, int width, int height);
     static bool eglLockSurfaceKHR(EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
     static bool eglUnlockSurfaceKHR(EGLDisplay display, EGLSurface surface);
+    static EGLSyncKHR eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+    static bool eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync);
+    static EGLint eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+    static EGLBoolean eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
 
 private:
     static void initialize();
@@ -98,6 +119,7 @@ private:
     static bool hasImageShared;
     static bool hasSurfaceScaling;
     static bool hasLockSurface;
+    static bool hasFenceSync;
 };
 
 #endif
-- 
cgit v0.12


From 8d6c8e95f47e6be3f8db85adc2412d55a6915ac4 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 11 Nov 2010 08:25:09 +0100
Subject: Plugin-side support for creating/destroying/waiting on fence sync.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 .../graphicssystems/meego/qmeegographicssystem.cpp | 38 ++++++++++++++++++----
 .../graphicssystems/meego/qmeegographicssystem.h   |  9 +++--
 .../graphicssystems/meego/qmeegolivepixmapdata.cpp | 12 +++++--
 .../graphicssystems/meego/qmeegolivepixmapdata.h   |  3 +-
 4 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 02e1143..063af13 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -82,9 +82,9 @@ QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const
 
 QPixmapData *QMeeGoGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
 {
-    // Long story short: without this it's possible to hit an 
-    // uninitialized paintDevice due to a Qt bug too complex to even
-    // explain here... not to mention fix without going crazy. 
+    // Long story short: without this it's possible to hit an
+    // unitialized paintDevice due to a Qt bug too complex to even
+    // explain here... not to mention fix without going crazy.
     // MDK
     QGLShareContextScope ctx(qt_gl_share_widget()->context());
 
@@ -218,10 +218,10 @@ QPixmapData* QMeeGoGraphicsSystem::pixmapDataFromLiveTextureHandle(Qt::HANDLE ha
     return new QMeeGoLivePixmapData(handle);
 }
 
-QImage* QMeeGoGraphicsSystem::lockLiveTexture(QPixmap* pixmap)
+QImage* QMeeGoGraphicsSystem::lockLiveTexture(QPixmap* pixmap, void* fenceSync)
 {
     QMeeGoLivePixmapData *pixmapData = static_cast<QMeeGoLivePixmapData*>(pixmap->data_ptr().data());
-    return pixmapData->lock();
+    return pixmapData->lock(fenceSync);
 }
 
 bool QMeeGoGraphicsSystem::releaseLiveTexture(QPixmap *pixmap, QImage *image)
@@ -236,6 +236,20 @@ Qt::HANDLE QMeeGoGraphicsSystem::getLiveTextureHandle(QPixmap *pixmap)
     return pixmapData->handle();
 }
 
+void* QMeeGoGraphicsSystem::createFenceSync()
+{
+    QGLShareContextScope ctx(qt_gl_share_widget()->context());
+    QMeeGoExtensions::ensureInitialized();
+    return QMeeGoExtensions::eglCreateSyncKHR(QEgl::display(), EGL_SYNC_FENCE_KHR, NULL);
+}
+
+void QMeeGoGraphicsSystem::destroyFenceSync(void *fenceSync)
+{
+    QGLShareContextScope ctx(qt_gl_share_widget()->context());
+    QMeeGoExtensions::ensureInitialized();
+    QMeeGoExtensions::eglDestroySyncKHR(QEgl::display(), fenceSync);
+}
+
 /* C API */
 
 int qt_meego_image_to_egl_shared_image(const QImage &image)
@@ -288,9 +302,9 @@ QPixmapData* qt_meego_pixmapdata_from_live_texture_handle(Qt::HANDLE handle)
     return QMeeGoGraphicsSystem::pixmapDataFromLiveTextureHandle(handle);
 }
 
-QImage* qt_meego_live_texture_lock(QPixmap *pixmap)
+QImage* qt_meego_live_texture_lock(QPixmap *pixmap, void *fenceSync)
 {
-    return QMeeGoGraphicsSystem::lockLiveTexture(pixmap);
+    return QMeeGoGraphicsSystem::lockLiveTexture(pixmap, fenceSync);
 }
 
 bool qt_meego_live_texture_release(QPixmap *pixmap, QImage *image)
@@ -302,3 +316,13 @@ Qt::HANDLE qt_meego_live_texture_get_handle(QPixmap *pixmap)
 {
     return QMeeGoGraphicsSystem::getLiveTextureHandle(pixmap);
 }
+
+void* qt_meego_create_fence_sync(void)
+{
+    return QMeeGoGraphicsSystem::createFenceSync();
+}
+
+void qt_meego_destroy_fence_sync(void* fs)
+{
+    return QMeeGoGraphicsSystem::destroyFenceSync(fs);
+}
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.h b/src/plugins/graphicssystems/meego/qmeegographicssystem.h
index 2697f0f..1e50f00 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.h
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.h
@@ -69,10 +69,13 @@ public:
 
     static QPixmapData *pixmapDataWithNewLiveTexture(int w, int h, QImage::Format format);
     static QPixmapData *pixmapDataFromLiveTextureHandle(Qt::HANDLE handle);
-    static QImage *lockLiveTexture(QPixmap* pixmap);
+    static QImage *lockLiveTexture(QPixmap* pixmap, void* fenceSync);
     static bool releaseLiveTexture(QPixmap *pixmap, QImage *image);
     static Qt::HANDLE getLiveTextureHandle(QPixmap *pixmap);
 
+    static void* createFenceSync();
+    static void destroyFenceSync(void* fenceSync);
+
 private:
     static bool meeGoRunning();
     static EGLSurface getSurfaceForLiveTexturePixmap(QPixmap *pixmap);
@@ -95,9 +98,11 @@ extern "C" {
     Q_DECL_EXPORT void qt_meego_set_translucent(bool translucent);    
     Q_DECL_EXPORT QPixmapData* qt_meego_pixmapdata_with_new_live_texture(int w, int h, QImage::Format format);
     Q_DECL_EXPORT QPixmapData* qt_meego_pixmapdata_from_live_texture_handle(Qt::HANDLE handle);
-    Q_DECL_EXPORT QImage* qt_meego_live_texture_lock(QPixmap *pixmap);
+    Q_DECL_EXPORT QImage* qt_meego_live_texture_lock(QPixmap *pixmap, void *fenceSync);
     Q_DECL_EXPORT bool qt_meego_live_texture_release(QPixmap *pixmap, QImage *image);
     Q_DECL_EXPORT Qt::HANDLE qt_meego_live_texture_get_handle(QPixmap *pixmap);
+    Q_DECL_EXPORT void* qt_meego_create_fence_sync(void);
+    Q_DECL_EXPORT void qt_meego_destroy_fence_sync(void* fs);
 }
 
 #endif 
diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
index 405b765..3ef35e1 100644
--- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "qmeegolivepixmapdata.h"
-#include "qmeegoextensions.h"
 #include "qmeegorasterpixmapdata.h"
 #include <private/qimage_p.h>
 #include <private/qwindowsurface_gl_p.h>
@@ -171,11 +170,18 @@ QPixmapData *QMeeGoLivePixmapData::createCompatiblePixmapData() const
     return new QMeeGoRasterPixmapData(pixelType());
 }
 
-QImage* QMeeGoLivePixmapData::lock()
+QImage* QMeeGoLivePixmapData::lock(EGLSyncKHR fenceSync)
 {
     QGLShareContextScope ctx(qt_gl_share_widget()->context());
     QMeeGoExtensions::ensureInitialized();
 
+    if (fenceSync) {
+        QMeeGoExtensions::eglClientWaitSyncKHR(QEgl::display(),
+                                               fenceSync,
+                                               EGL_SYNC_FLUSH_COMMANDS_BIT_KHR,
+                                               EGL_FOREVER_KHR);
+    }
+
     void *data = 0;
     int pitch = 0;
     EGLSurface surface = 0;
@@ -229,7 +235,7 @@ Qt::HANDLE QMeeGoLivePixmapData::handle()
 
 bool QMeeGoLivePixmapData::scroll(int dx, int dy, const QRect &rect)
 {
-    lock();
+    lock(NULL);
 
     if (!lockedImage.isNull())
         qt_scrollRectInImage(lockedImage, rect, QPoint(dx, dy));
diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
index cb123da..2c6854e 100644
--- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
+++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
@@ -43,6 +43,7 @@
 #define MLIVEPIXMAPDATA_H
 
 #include <private/qpixmapdata_gl_p.h>
+#include "qmeegoextensions.h"
 
 class QMeeGoLivePixmapData : public QGLPixmapData
 {
@@ -56,7 +57,7 @@ public:
 
     void initializeThroughEGLImage();
 
-    QImage* lock();
+    QImage* lock(EGLSyncKHR fenceSync);
     bool release(QImage *img);
     Qt::HANDLE handle();
 
-- 
cgit v0.12


From 4e7eb76cb231fc5a8b0deb67a87c45f6760e44bb Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 11 Nov 2010 08:25:10 +0100
Subject: Helper-side support for QMeeGoFenceSync.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 .../qmeegographicssystemhelper/qmeegofencesync.cpp |  79 ++++++++++++++++
 tools/qmeegographicssystemhelper/qmeegofencesync.h | 101 +++++++++++++++++++++
 .../qmeegographicssystemhelper/qmeegofencesync_p.h |  60 ++++++++++++
 .../qmeegographicssystemhelper.pro                 |   4 +-
 .../qmeegolivepixmap.cpp                           |   9 +-
 .../qmeegographicssystemhelper/qmeegolivepixmap.h  |   7 +-
 tools/qmeegographicssystemhelper/qmeegoruntime.cpp |  29 +++++-
 tools/qmeegographicssystemhelper/qmeegoruntime.h   |   4 +-
 8 files changed, 282 insertions(+), 11 deletions(-)
 create mode 100644 tools/qmeegographicssystemhelper/qmeegofencesync.cpp
 create mode 100644 tools/qmeegographicssystemhelper/qmeegofencesync.h
 create mode 100644 tools/qmeegographicssystemhelper/qmeegofencesync_p.h

diff --git a/tools/qmeegographicssystemhelper/qmeegofencesync.cpp b/tools/qmeegographicssystemhelper/qmeegofencesync.cpp
new file mode 100644
index 0000000..499e102
--- /dev/null
+++ b/tools/qmeegographicssystemhelper/qmeegofencesync.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmeegofencesync.h"
+#include "qmeegofencesync_p.h"
+#include "qmeegoruntime.h"
+
+/* QMeeGoFenceSyncPrivate */
+
+QMeeGoFenceSyncPrivate::QMeeGoFenceSyncPrivate() : syncObject(NULL)
+{
+}
+
+QMeeGoFenceSyncPrivate::~QMeeGoFenceSyncPrivate()
+{
+    if (syncObject) {
+        QMeeGoRuntime::destroyFenceSync(syncObject);
+        syncObject = NULL;
+    }
+}
+
+/* QMeeGoFenceSync */
+
+QMeeGoFenceSync::QMeeGoFenceSync(QWidget *parent) : QObject(parent), d_ptr(new QMeeGoFenceSyncPrivate())
+{
+    Q_D(QMeeGoFenceSync);
+    d->q_ptr = this;
+}
+
+QMeeGoFenceSync::~QMeeGoFenceSync()
+{
+}
+
+void QMeeGoFenceSync::setSyncPoint()
+{
+    Q_D(QMeeGoFenceSync);
+    if (d->syncObject)
+        QMeeGoRuntime::destroyFenceSync(d->syncObject);
+
+    d->syncObject = QMeeGoRuntime::createFenceSync();
+}
diff --git a/tools/qmeegographicssystemhelper/qmeegofencesync.h b/tools/qmeegographicssystemhelper/qmeegofencesync.h
new file mode 100644
index 0000000..2d3f5c5
--- /dev/null
+++ b/tools/qmeegographicssystemhelper/qmeegofencesync.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMEEGOFENCESYNC_H
+#define QMEEGOFENCESYNC_H
+
+#include <QWidget>
+
+class QMeeGoFenceSyncPrivate;
+
+//! A synchronization helper for GL pipeline.
+/*!
+ Fence syncs provide a mechanism for synchronizing access to certain GL primitives
+ and make it possible for the application developer to be sure that a certain point
+ in the GL processing pipeline has been already executed before continuing operation.
+
+ Currently fence syncs are only useful in conjunction with QMeeGoLivePixmaps.
+ \code
+ ...
+ // In your paint/expose event:
+ QImage *image = livePixmap->lock(&someGlobalFenceSync);
+ // Modify the image...
+ livePixmap->release(image);
+
+ painter->drawPixmap(0, 0, *livePixmap);
+ someGlobalFenceSync.setSyncPoint();
+ ...
+ \endcode
+
+ Assuming the paint/expose events come repeatedly, the lock operation
+ will block till the previous event completed painting the livePixmap.
+*/
+
+class Q_DECL_EXPORT QMeeGoFenceSync : public QObject
+{
+public:
+    //! Constructs a new fence sync.
+    /*!
+     The fence sync is created without a sync point. You need to set the sync point manually.
+    */
+    QMeeGoFenceSync(QWidget *parent = 0);
+
+    //! Destructor for the fence sync.
+    virtual ~QMeeGoFenceSync();
+
+    //! Sets the fence sync.
+    /*!
+      The fence sync synchronization point should be set after all drawing has been scheduled.
+      Setting a synchronization point always overrides the previous point -- whetver is was
+      used (waited upon) or not.
+    */
+    void setSyncPoint();
+
+private:
+    Q_DISABLE_COPY(QMeeGoFenceSync)
+    Q_DECLARE_PRIVATE(QMeeGoFenceSync)
+
+protected:
+    QScopedPointer<QMeeGoFenceSyncPrivate> d_ptr; //! Private bits.
+    friend class QMeeGoLivePixmap;
+};
+
+#endif
diff --git a/tools/qmeegographicssystemhelper/qmeegofencesync_p.h b/tools/qmeegographicssystemhelper/qmeegofencesync_p.h
new file mode 100644
index 0000000..8a5d26e
--- /dev/null
+++ b/tools/qmeegographicssystemhelper/qmeegofencesync_p.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmeegofencesync.h"
+
+#ifndef QMEEGOFENCESYNC_P_H
+#define QMEEGOFENCESYNC_P_H
+
+class QMeeGoFenceSyncPrivate
+{
+public:
+    Q_DECLARE_PUBLIC(QMeeGoFenceSync);
+    QMeeGoFenceSyncPrivate();
+
+    virtual ~QMeeGoFenceSyncPrivate();
+
+    void* syncObject;
+
+    QMeeGoFenceSync *q_ptr;
+};
+
+#endif
diff --git a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro
index 7412fc3..161a31b 100644
--- a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro
+++ b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro
@@ -6,5 +6,5 @@ include(../../src/qbase.pri)
 QT += gui
 INCLUDEPATH += '../../src/plugins/graphicssystems/meego'
 
-HEADERS = qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h
-SOURCES = qmeegographicssystemhelper.cpp qmeegooverlaywidget.cpp qmeegoruntime.cpp qmeegolivepixmap.cpp qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h
+HEADERS = qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h qmeegofencesync.h qmeegofencesync_p.h
+SOURCES = qmeegographicssystemhelper.cpp qmeegooverlaywidget.cpp qmeegoruntime.cpp qmeegolivepixmap.cpp qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h qmeegofencesync.h qmeegofencesync_p.h qmeegofencesync.cpp
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
index d43efe2..9700581f 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
@@ -41,6 +41,7 @@
 
 #include "qmeegolivepixmap.h"
 #include "qmeegolivepixmap_p.h"
+#include "qmeegofencesync_p.h"
 #include "qmeegoruntime.h"
 
 /* QMeeGoLivePixmapPrivate */
@@ -102,10 +103,12 @@ QMeeGoLivePixmap::~QMeeGoLivePixmap()
 {
 }
 
-QImage* QMeeGoLivePixmap::lock()
+QImage* QMeeGoLivePixmap::lock(QMeeGoFenceSync *fenceSync)
 {
-    return QMeeGoRuntime::lockLiveTexture(this);
-
+    if (fenceSync)
+        return QMeeGoRuntime::lockLiveTexture(this, fenceSync->d_func()->syncObject);
+    else
+        return QMeeGoRuntime::lockLiveTexture(this, NULL);
 }
 
 void QMeeGoLivePixmap::release(QImage *img)
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
index 7be2c4b..51b5976 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
@@ -43,6 +43,7 @@
 #define QMEEGOLIVEPIXMAP_H
 
 #include <QPixmap>
+#include "qmeegofencesync.h"
 
 class QMeeGoLivePixmapPrivate;
 class QSharedMemory;
@@ -82,8 +83,12 @@ public:
     //! Locks the access to the pixmap. 
     /*! 
      The returned image can be used for direct access.
+     You can optionally specify a fence sync to wait upon before unlocking. When
+     you specify a fence sync, you can be sure that this function will return only
+     when the previsouly set QMeeGoFenceSync synchronization point has been executed/passed
+     by the GL processing pipeline.
      */
-    QImage* lock();
+    QImage* lock(QMeeGoFenceSync *fenceSync = NULL);
     
     //! Unlocks the access to the pixmap. 
     /*! 
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
index ac627e5..2d3ee3c 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
@@ -60,9 +60,11 @@ typedef void (*QMeeGoSetSurfaceScalingFunc) (int x, int y, int w, int h);
 typedef void (*QMeeGoSetTranslucentFunc) (bool translucent);
 typedef QPixmapData* (*QMeeGoPixmapDataWithNewLiveTextureFunc) (int w, int h, QImage::Format format);
 typedef QPixmapData* (*QMeeGoPixmapDataFromLiveTextureHandleFunc) (Qt::HANDLE h);
-typedef QImage* (*QMeeGoLiveTextureLockFunc) (QPixmap*);
+typedef QImage* (*QMeeGoLiveTextureLockFunc) (QPixmap*, void* fenceSync);
 typedef bool (*QMeeGoLiveTextureReleaseFunc) (QPixmap*, QImage *i);
 typedef Qt::HANDLE (*QMeeGoLiveTextureGetHandleFunc) (QPixmap*);
+typedef void* (*QMeeGoCreateFenceSyncFunc) (void);
+typedef void (*QMeeGoDestroyFenceSyncFunc) (void *fs);
 
 static QMeeGoImageToEglSharedImageFunc qt_meego_image_to_egl_shared_image = NULL;
 static QMeeGoPixmapDataFromEglSharedImageFunc qt_meego_pixmapdata_from_egl_shared_image = NULL;
@@ -77,6 +79,8 @@ static QMeeGoPixmapDataFromLiveTextureHandleFunc qt_meego_pixmapdata_from_live_t
 static QMeeGoLiveTextureLockFunc qt_meego_live_texture_lock = NULL;
 static QMeeGoLiveTextureReleaseFunc qt_meego_live_texture_release = NULL;
 static QMeeGoLiveTextureGetHandleFunc qt_meego_live_texture_get_handle = NULL;
+static QMeeGoCreateFenceSyncFunc qt_meego_create_fence_sync = NULL;
+static QMeeGoDestroyFenceSyncFunc qt_meego_destroy_fence_sync = NULL;
 
 void QMeeGoRuntime::initialize()
 {
@@ -103,12 +107,15 @@ void QMeeGoRuntime::initialize()
         qt_meego_live_texture_lock = (QMeeGoLiveTextureLockFunc) library.resolve("qt_meego_live_texture_lock");
         qt_meego_live_texture_release = (QMeeGoLiveTextureReleaseFunc) library.resolve("qt_meego_live_texture_release");
         qt_meego_live_texture_get_handle = (QMeeGoLiveTextureGetHandleFunc) library.resolve("qt_meego_live_texture_get_handle");
+        qt_meego_create_fence_sync = (QMeeGoCreateFenceSyncFunc) library.resolve("qt_meego_create_fence_sync");
+        qt_meego_destroy_fence_sync = (QMeeGoDestroyFenceSyncFunc) library.resolve("qt_meego_destroy_fence_sync");
 
         if (qt_meego_image_to_egl_shared_image && qt_meego_pixmapdata_from_egl_shared_image && 
             qt_meego_pixmapdata_with_gl_texture && qt_meego_destroy_egl_shared_image && qt_meego_update_egl_shared_image_pixmap && 
             qt_meego_set_surface_fixed_size && qt_meego_set_surface_scaling && qt_meego_set_translucent && 
             qt_meego_pixmapdata_with_new_live_texture && qt_meego_pixmapdata_from_live_texture_handle &&
-            qt_meego_live_texture_lock && qt_meego_live_texture_release && qt_meego_live_texture_get_handle)
+            qt_meego_live_texture_lock && qt_meego_live_texture_release && qt_meego_live_texture_get_handle &&
+            qt_meego_create_fence_sync && qt_meego_destroy_fence_sync)
         {
             qDebug("Successfully resolved MeeGo graphics system: %s %s\n", qPrintable(libraryPrivate->fileName), qPrintable(libraryPrivate->fullVersion));
         } else {
@@ -191,11 +198,11 @@ QPixmapData* QMeeGoRuntime::pixmapDataFromLiveTextureHandle(Qt::HANDLE h)
     return qt_meego_pixmapdata_from_live_texture_handle(h);
 }
 
-QImage* QMeeGoRuntime::lockLiveTexture(QPixmap *p)
+QImage* QMeeGoRuntime::lockLiveTexture(QPixmap *p, void* fenceSync)
 {
     ENSURE_INITIALIZED;
     Q_ASSERT(qt_meego_live_texture_lock);
-    return qt_meego_live_texture_lock(p);
+    return qt_meego_live_texture_lock(p, fenceSync);
 }
 
 bool QMeeGoRuntime::releaseLiveTexture(QPixmap *p, QImage *i)
@@ -211,3 +218,17 @@ Qt::HANDLE QMeeGoRuntime::getLiveTextureHandle(QPixmap *pixmap)
     Q_ASSERT(qt_meego_live_texture_get_handle);
     return qt_meego_live_texture_get_handle(pixmap);
 }
+
+void* QMeeGoRuntime::createFenceSync()
+{
+    ENSURE_INITIALIZED;
+    Q_ASSERT(qt_meego_create_fence_sync);
+    return qt_meego_create_fence_sync();
+}
+
+void QMeeGoRuntime::destroyFenceSync(void *fs)
+{
+    ENSURE_INITIALIZED;
+    Q_ASSERT(qt_meego_destroy_fence_sync);
+    qt_meego_destroy_fence_sync(fs);
+}
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.h b/tools/qmeegographicssystemhelper/qmeegoruntime.h
index 6b34836..be6ff6b 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.h
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.h
@@ -57,9 +57,11 @@ public:
     static void setTranslucent(bool translucent);
     static QPixmapData* pixmapDataWithNewLiveTexture(int w, int h, QImage::Format format);
     static QPixmapData* pixmapDataFromLiveTextureHandle(Qt::HANDLE h);
-    static QImage* lockLiveTexture(QPixmap *pixmap);
+    static QImage* lockLiveTexture(QPixmap *pixmap, void *fenceSync);
     static bool releaseLiveTexture(QPixmap *pixmap, QImage *image);
     static Qt::HANDLE getLiveTextureHandle(QPixmap *pixmap);
+    static void* createFenceSync();
+    static void destroyFenceSync(void *fs);
 
 private:
     static bool initialized;
-- 
cgit v0.12


From 86d39d4a6bfe1c7371b2a27a996db1c5ee601e91 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 11 Nov 2010 08:25:11 +0100
Subject: Removed call to glFinish, obsoleted by fence syncs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
index 3ef35e1..16096c9 100644
--- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
@@ -220,7 +220,6 @@ bool QMeeGoLivePixmapData::release(QImage* /*img*/)
 
     if (QMeeGoExtensions::eglUnlockSurfaceKHR(QEgl::display(), getSurfaceForBackingPixmap())) {
         lockedImage = QImage();
-        glFinish();
         return true;
     } else {
         lockedImage = QImage();
-- 
cgit v0.12


From 6ff64751994001f90bc82cb7fd25a0c20e8966eb Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Thu, 11 Nov 2010 08:25:11 +0100
Subject: Coding style: bang cleanup.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 .../graphicssystems/meego/qmeegoextensions.cpp       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
index fd17d491d..dff80a4 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.cpp
@@ -85,7 +85,7 @@ void QMeeGoExtensions::ensureInitialized()
 
 EGLNativeSharedImageTypeNOK QMeeGoExtensions::eglCreateSharedImageNOK(EGLDisplay dpy, EGLImageKHR image, EGLint *props)
 {
-    if (! hasImageShared)
+    if (!hasImageShared)
         qFatal("EGL_NOK_image_shared not found but trying to use capability!");
 
     return _eglCreateSharedImageNOK(dpy, image, props);
@@ -93,7 +93,7 @@ EGLNativeSharedImageTypeNOK QMeeGoExtensions::eglCreateSharedImageNOK(EGLDisplay
 
 bool QMeeGoExtensions::eglQueryImageNOK(EGLDisplay dpy, EGLImageKHR image, EGLint prop, EGLint *v)
 {
-    if (! hasImageShared)
+    if (!hasImageShared)
         qFatal("EGL_NOK_image_shared not found but trying to use capability!");
 
     return _eglQueryImageNOK(dpy, image, prop, v);
@@ -101,7 +101,7 @@ bool QMeeGoExtensions::eglQueryImageNOK(EGLDisplay dpy, EGLImageKHR image, EGLin
 
 bool QMeeGoExtensions::eglDestroySharedImageNOK(EGLDisplay dpy, EGLNativeSharedImageTypeNOK img)
 {
-    if (! hasImageShared)
+    if (!hasImageShared)
         qFatal("EGL_NOK_image_shared not found but trying to use capability!");
 
     return _eglDestroySharedImageNOK(dpy, img);
@@ -109,7 +109,7 @@ bool QMeeGoExtensions::eglDestroySharedImageNOK(EGLDisplay dpy, EGLNativeSharedI
 
 bool QMeeGoExtensions::eglSetSurfaceScalingNOK(EGLDisplay dpy, EGLSurface surface, int x, int y, int width, int height)
 {
-    if (! hasSurfaceScaling)
+    if (!hasSurfaceScaling)
         qFatal("EGL_NOK_surface_scaling not found but trying to use capability!");
 
    return _eglSetSurfaceScalingNOK(dpy, surface, x, y, width, height);
@@ -117,7 +117,7 @@ bool QMeeGoExtensions::eglSetSurfaceScalingNOK(EGLDisplay dpy, EGLSurface surfac
 
 bool QMeeGoExtensions::eglLockSurfaceKHR(EGLDisplay display, EGLSurface surface, const EGLint *attrib_list)
 {
-    if (! hasLockSurface)
+    if (!hasLockSurface)
         qFatal("EGL_KHR_lock_surface2 not found but trying to use capability!");
 
     return _eglLockSurfaceKHR(display, surface, attrib_list);
@@ -125,7 +125,7 @@ bool QMeeGoExtensions::eglLockSurfaceKHR(EGLDisplay display, EGLSurface surface,
 
 bool QMeeGoExtensions::eglUnlockSurfaceKHR(EGLDisplay display, EGLSurface surface)
 {
-    if (! hasLockSurface)
+    if (!hasLockSurface)
         qFatal("EGL_KHR_lock_surface2 not found but trying to use capability!");
 
     return _eglUnlockSurfaceKHR(display, surface);
@@ -133,7 +133,7 @@ bool QMeeGoExtensions::eglUnlockSurfaceKHR(EGLDisplay display, EGLSurface surfac
 
 EGLSyncKHR QMeeGoExtensions::eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list)
 {
-    if (! hasFenceSync)
+    if (!hasFenceSync)
         qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
 
     return _eglCreateSyncKHR(dpy, type, attrib_list);
@@ -141,7 +141,7 @@ EGLSyncKHR QMeeGoExtensions::eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, cons
 
 bool QMeeGoExtensions::eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync)
 {
-    if (! hasFenceSync)
+    if (!hasFenceSync)
         qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
 
     return _eglDestroySyncKHR(dpy, sync);
@@ -149,7 +149,7 @@ bool QMeeGoExtensions::eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync)
 
 EGLint QMeeGoExtensions::eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout)
 {
-    if (! hasFenceSync)
+    if (!hasFenceSync)
         qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
 
     return _eglClientWaitSyncKHR(dpy, sync, flags, timeout);
@@ -157,7 +157,7 @@ EGLint QMeeGoExtensions::eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, E
 
 EGLBoolean QMeeGoExtensions::eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value)
 {
-    if (! hasFenceSync)
+    if (!hasFenceSync)
         qFatal("EGL_KHR_fence_sync not found but trying to use capability!");
 
     return _eglGetSyncAttribKHR(dpy, sync, attribute, value);
-- 
cgit v0.12


From 5feca34327eb661cc84e1d6f79052dcdbc1a09c4 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Wed, 10 Nov 2010 15:19:14 +0000
Subject: SSL: Fix crashes/hangs when retrieving CA certificates

Added error handling to the certificate retrieval thread
Made the certificate retrieval thread process critical (so if it crashes
the process will crash instead of hang)
Filter the certificate list to only fetch CA certificates which are in
X.509 format (symbian also allows WAP formats, but Qt does not support
these).
Put the TPtr8 for asynch function parameter in the class data so it does
not go out of scope while the function is in progress. Previously it was
on the stack so it could be corrupted before the certificate server had
finished using it.

Task-number: QTBUG-15005
Task-number: QTBUG-15126
Reviewed-by: Markus Goetz
---
 src/network/ssl/qsslsocket_openssl.cpp | 75 ++++++++++++++++++++++++++--------
 src/network/ssl/qsslsocket_openssl_p.h |  1 +
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 2910538..426b07a 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -51,6 +51,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qdiriterator.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qmutex.h>
@@ -574,7 +575,7 @@ void QSslSocketPrivate::resetDefaultCiphers()
 #if defined(Q_OS_SYMBIAN)
 
 CSymbianCertificateRetriever::CSymbianCertificateRetriever() : CActive(CActive::EPriorityStandard),
-        iSequenceError(KErrNone)
+    iCertificatePtr(0,0,0), iSequenceError(KErrNone)
 {
 }
 
@@ -618,6 +619,11 @@ void CSymbianCertificateRetriever::doThreadEntryL()
     iCertStore = CUnifiedCertStore::NewLC(qt_s60GetRFs(), EFalse);
     iCertFilter = CCertAttributeFilter::NewLC();
 
+    // only interested in CA certs
+    iCertFilter->SetOwnerType(ECACertificate);
+    // only interested in X.509 format (we don't support WAP formats)
+    iCertFilter->SetFormat(EX509Certificate);
+
     // Kick off the sequence by initializing the cert store
     iState = Initializing;
     iCertStore->Initialize(iStatus);
@@ -637,6 +643,7 @@ void CSymbianCertificateRetriever::doThreadEntryL()
 
 TInt CSymbianCertificateRetriever::ThreadEntryPoint(TAny* aParams)
 {
+    User::SetCritical(User::EProcessCritical);
     CTrapCleanup* cleanupStack = CTrapCleanup::New();
 
     CSymbianCertificateRetriever* self = (CSymbianCertificateRetriever*) aParams;
@@ -658,7 +665,17 @@ void CSymbianCertificateRetriever::ConstructL()
 
 void CSymbianCertificateRetriever::DoCancel()
 {
-    // We never cancel the sequence
+    switch(iState) {
+    case Initializing:
+        iCertStore->CancelInitialize();
+        break;
+    case Listing:
+        iCertStore->CancelList();
+        break;
+    case RetrievingCertificates:
+        iCertStore->CancelGetCert();
+        break;
+    }
 }
 
 TInt CSymbianCertificateRetriever::RunError(TInt aError)
@@ -671,37 +688,51 @@ TInt CSymbianCertificateRetriever::RunError(TInt aError)
 
 void CSymbianCertificateRetriever::GetCertificateL()
 {
-    CCTCertInfo* certInfo = iCertInfos[iCurrentCertIndex];
-    iCertificateData.resize(certInfo->Size());
-    TPtr8 des((TUint8*)iCertificateData.data(), 0, iCertificateData.size());
-    iCertStore->Retrieve(*certInfo, des, iStatus);
-    iState = RetrievingCertificates;
-    SetActive();
+    if (iCurrentCertIndex < iCertInfos.Count()) {
+        CCTCertInfo* certInfo = iCertInfos[iCurrentCertIndex++];
+        iCertificateData = QByteArray();
+        QT_TRYCATCH_LEAVING(iCertificateData.resize(certInfo->Size()));
+        iCertificatePtr.Set((TUint8*)iCertificateData.data(), 0, iCertificateData.size());
+#ifdef QSSLSOCKET_DEBUG
+        qDebug() << "getting " << qt_TDesC2QString(certInfo->Label()) << " size=" << certInfo->Size();
+        qDebug() << "format=" << certInfo->CertificateFormat();
+        qDebug() << "ownertype=" << certInfo->CertificateOwnerType();
+        qDebug() << "type=" << hex << certInfo->Type().iUid;
+#endif
+        iCertStore->Retrieve(*certInfo, iCertificatePtr, iStatus);
+        iState = RetrievingCertificates;
+        SetActive();
+    } else {
+        //reached end of list
+        CActiveScheduler::Stop();
+    }
 }
 
 void CSymbianCertificateRetriever::RunL()
 {
+#ifdef QSSLSOCKET_DEBUG
+    qDebug() << "CSymbianCertificateRetriever::RunL status " << iStatus.Int() << " count " << iCertInfos.Count() << " index " << iCurrentCertIndex;
+#endif
     switch (iState) {
     case Initializing:
+        User::LeaveIfError(iStatus.Int()); // initialise fail means pointless to continue
         iState = Listing;
         iCertStore->List(iCertInfos, *iCertFilter, iStatus);
         SetActive();
         break;
 
     case Listing:
+        User::LeaveIfError(iStatus.Int()); // listing fail means pointless to continue
         iCurrentCertIndex = 0;
         GetCertificateL();
         break;
 
     case RetrievingCertificates:
-        iCertificates->append(iCertificateData);
-        iCertificateData = QByteArray();
-        iCurrentCertIndex++;
-        if (iCurrentCertIndex < iCertInfos.Count())
-            GetCertificateL();
+        if (iStatus.Int() == KErrNone)
+            iCertificates->append(iCertificateData);
         else
-            // Stop the scheduler to return to the thread entry function
-            CActiveScheduler::Stop();
+            qWarning() << "CSymbianCertificateRetriever: failed to retreive a certificate, error " << iStatus.Int();
+        GetCertificateL();
         break;
     }
 }
@@ -710,6 +741,10 @@ void CSymbianCertificateRetriever::RunL()
 QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
 {
     ensureInitialized();
+#ifdef QSSLSOCKET_DEBUG
+    QElapsedTimer timer;
+    timer.start();
+#endif
     QList<QSslCertificate> systemCerts;
 #if defined(Q_OS_MAC)
     CFArrayRef cfCerts;
@@ -808,10 +843,18 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
     retriever->GetCertificates(certs);
     foreach (const QByteArray &encodedCert, certs) {
         QSslCertificate cert(encodedCert, QSsl::Der);
-        if (!cert.isNull())
+        if (!cert.isNull()) {
+#ifdef QSSLSOCKET_DEBUG
+            qDebug() << "imported certificate: " << cert.issuerInfo(QSslCertificate::CommonName);
+#endif
             systemCerts.append(cert);
+        }
     }
 #endif
+#ifdef QSSLSOCKET_DEBUG
+    qDebug() << "systemCaCertificates retrieval time " << timer.elapsed() << "ms";
+    qDebug() << "imported " << systemCerts.count() << " certificates";
+#endif
 
     return systemCerts;
 }
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index dec98ae..b59a6c9 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -165,6 +165,7 @@ private:
     CCertAttributeFilter* iCertFilter;
     TInt iCurrentCertIndex;
     QByteArray iCertificateData;
+    TPtr8 iCertificatePtr;
     QList<QByteArray>* iCertificates;
     TInt iSequenceError;
 };
-- 
cgit v0.12


From ea2caa8ce983f069eeeba0957b9db6b20baf82b2 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Wed, 10 Nov 2010 16:43:20 +0000
Subject: Doc: update symbian capabilities regarding SSL

Testing shows some CA certs require ReadUserData depending which part
of the database they are stored in. Updated docs to reflect this.

Reviewed-by: Markus Goetz
---
 doc/src/platforms/platform-notes.qdoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index dbedc1d..9c5f3c8 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -739,6 +739,9 @@
             \o \c AllFiles when \l{http://developer.symbian.org/wiki/index.php/Capabilities_%28Symbian_Signed%29/AllFiles_Capability}{accessing specific areas.}
     \row    \o QtNetwork
             \o \c NetworkServices is basically always required for this module.
+            \o \c ReadUserData is required to include all the phone's SSL certificates in the system's default CA certificate list
+                  (for example those added by the user or stored in the SIM card),
+                  without this capability only the CA certs built into the phone are used.
     \row    \o QtMultiMedia
             \o \c UserEnvironment if QAudioInput is used.
     \endtable
-- 
cgit v0.12


From 644df27056fcd697713fe2338e6743e0fd067011 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Wed, 10 Nov 2010 16:45:29 +0000
Subject: SSL: Fix for capabilities in QSslCertificate auto test

They were in wrong section of the file due to editing error and
therefore ignored.

Reviewed-by: Markus Goetz
---
 tests/auto/qsslcertificate/qsslcertificate.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/qsslcertificate/qsslcertificate.pro
index d7671ea..b04dde3 100644
--- a/tests/auto/qsslcertificate/qsslcertificate.pro
+++ b/tests/auto/qsslcertificate/qsslcertificate.pro
@@ -24,5 +24,6 @@ wince*: {
   DEFINES += SRCDIR=\\\".\\\"
 } else:!symbian {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
-   TARGET.CAPABILITY = NetworkServices
 }
+
+symbian:TARGET.CAPABILITY = NetworkServices ReadUserData
-- 
cgit v0.12